+
+
+
+
+
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index dedd2010..00000000
--- a/AUTHORS
+++ /dev/null
@@ -1,4 +0,0 @@
-Peter Winzell
-Magnus Gunnarsson <>
-Ulf Björkengren <>
-Sanjeev B.A.
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index cd7fb67a..00000000
--- a/Dockerfile
+++ /dev/null
@@ -1,131 +0,0 @@
-# (C) 2021 Mitsubishi Electric Automotive Europe B.V.
-#
-# All files and artifacts in the repository at https://github.com/MEAE-GOT/WAII
-# are licensed under the provisions of the license provided by the LICENSE file in this repository.
-
-#ARG GO_VERSION=1.16
-ARG VSSTREE_NAME="vss_vissv2.binary"
-ARG BUILD_IMAGE="golang:latest"
-#${GO_VERSION}-bullseye"
-ARG RUNTIME_IMAGE="debian:bullseye-slim"
-
-#----------------------Builder-----------------------
-FROM ${BUILD_IMAGE} AS builder
-ARG VSSTREE_NAME
-WORKDIR /build
-#2021-09-03:: not used since moved away from alpine in favor of debian,
- #install gcc and std lib
- #RUN apk add --no-cache gcc musl-dev git
-
-#add bin folder to store the compiled files
-RUN mkdir bin
-
-#copy the content of the server and utils dir and .mod/.sum files to builder
-COPY server/ .
-COPY utils ./utils
-COPY go.mod go.sum ./
-
-#copy cert info from testCredGen to path expected by w3c server
-COPY testCredGen/ca transport_sec/ca
-COPY testCredGen/server transport_sec/server
-COPY testCredGen/client transport_sec/client
-
-#remove these since these arent currently buildable and shouldnt be included
-RUN rm -rf test
-RUN rm -rf signal_broker
-RUN rm hist_ctrl_client.go
-
-#clean up unused dependencies
-RUN go mod tidy
-#compile all projects and place the executables in the bin folder
-RUN go build -v -o ./bin ./...
-
-# 2021-09-03:: add and compile the ccs-w3c ovds client
-RUN git clone https://github.com/GENIVI/ccs-w3c-client.git
-RUN cd ccs-w3c-client/ovds && go mod tidy && go build -v -o /build/bin ./...
-#RUN echo $(ls -lah bin)
-#----------------------DONE with builder-----------------------
-
-
-#----------------------runtime-----------------------
-FROM ${RUNTIME_IMAGE} AS runtime
-RUN apt-get update && apt-get upgrade -y
-RUN apt-get update && apt-get install -y net-tools iproute2 iputils-ping
-RUN apt-get autoclean -y
-RUN apt-get autoremove -y
-COPY --from=builder /build/transport_sec/ ../transport_sec/.
-#----------------------DONE with runtime-----------------------
-
-
-#----------------------server_core-----------------------
-FROM runtime AS server_core
-ARG VSSTREE_NAME
-WORKDIR /app
-COPY --from=builder /build/bin/server_core .
-COPY --from=builder /build/server_core/${VSSTREE_NAME} .
-RUN ["/bin/bash","-c","/app/server_core --dryrun"]
-ENTRYPOINT ["/app/server_core"]
-#----------------------DONE with server_core-----------------------
-
-#----------------------at_server-----------------------
-FROM runtime AS at_server
-ARG VSSTREE_NAME
-WORKDIR /app
-COPY --from=builder /build/bin/at_server .
-COPY --from=builder /build/at_server/${VSSTREE_NAME} .
-#copy *.json (purpose/scope) maybe these should be moved to
-#config folder and mounted so that they can be changed without
-#rebuilding the docker image
-COPY --from=builder /build/at_server/purposelist.json .
-COPY --from=builder /build/at_server/scopelist.json .
-ENTRYPOINT ["/app/at_server"]
-#----------------------DONE with at_server-----------------------
-
-#----------------------agt_server-----------------------
-FROM runtime AS agt_server
-WORKDIR /app
-COPY --from=builder /build/bin/agt_server .
-ENTRYPOINT ["/app/agt_server"]
-#----------------------DONE with agt_server-----------------------
-
-#----------------------service_mgr-----------------------
-FROM runtime AS service_mgr
-WORKDIR /app
-RUN mkdir -p /tmp/vissv2/
-COPY --from=builder /build/bin/service_mgr .
-#this copy can be problematic since it generated by server_core at runtime
-#20210219 fix added in service_mgr to handle the missing file more gracefully :)
-ENTRYPOINT ["/app/service_mgr -uds &> ./logs/$service-log.txt"]
-#----------------------DONE with service_mgr-----------------------
-
-#----------------------http_mgr-----------------------
-FROM runtime AS http_mgr
-WORKDIR /app
-COPY --from=builder /build/bin/http_mgr .
-ENTRYPOINT ["/app/http_mgr"]
-#----------------------DONE with http_mgr-----------------------
-
-#----------------------ws_mgr-----------------------
-FROM runtime AS ws_mgr
-WORKDIR /app
-COPY --from=builder /build/bin/ws_mgr .
-ENTRYPOINT ["/app/ws_mgr"]
-#----------------------DONE with ws_mgr-----------------------
-
-#----------------------mqtt_mgr-----------------------
-FROM runtime AS mqtt_mgr
-WORKDIR /app
-COPY --from=builder /build/bin/mqtt_mgr .
-ENTRYPOINT ["/app/mqtt_mgr"]
-#----------------------DONE with mqtt_mgr-----------------------
-
-#----------------------tls_client-----------------------
-FROM runtime AS tls_client
-WORKDIR /app
-COPY --from=builder /build/bin/client .
-COPY --from=server_core /vsspathlist.json .
-#2021-09-06 transport_sec path is different for ccs-client so
-#adding a symbolic link
-RUN ln -s ../transport_sec/ transport_sec
-ENTRYPOINT ["/app/client"]
-#----------------------DONE with tls_client-----------------------
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index c12698b3..00000000
--- a/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 Mitsubishi Electric Automotive Europe BV
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/README.md b/README.md
deleted file mode 100644
index cb0c2edc..00000000
--- a/README.md
+++ /dev/null
@@ -1,256 +0,0 @@
-**(C) 2023 Ford Motor Company**
-**(C) 2019 Volvo Cars**
-**(C) 2019 Geotab Inc**
-**(C) 2019 Mitsubishi Electric Automotive**
-
-All files and artifacts in this repository are licensed under the provisions of the license provided by the LICENSE file in this repository.
-
-# W3C Automotive Interface Implementation - WAII (pronounced wy-ee)
-This project implements the W3C VISS v2 specification under development at W3C Automotive Working Group.
-
-
-# Starting and building the server
-
-This project requires Go version 1.13 or above, make sure your GOROOT and GOPATH are correctly configured. Since this project uses Go modules all dependencies will automatically download when building the project the first time.
-
-The server consist of the software components shown below:
- - Core server
- - HTTP manager
- - Websocket manager
- - MQTT manager
- - gRPC manager
- - Vehicle service manager
- - Access Grant token server
- - Access Token server
-
-hese used to be built as separate processes that communicated over the Websockets protocol.
-This model is available on the "multi-process" branch. To start them there is a shell script, please check the README for details of it.
-
-On the master branch these coponents are today implemented as threads within a single process, to build it
-
-move to the ./server/vissv2 directory,
-
-issue $ go build
-
-and the start it ./vissv2server
-
-The server may be started with a few different command line flags, append --help to get more info about them.
-
-There are a couple of client implementation written in Go, use the same build and start pattern for them.
-The clients written in JS starts by clicking on them from a file browser.
-
-To speed up the first time build you can run the command below in ./ and ./server directory
-
-```bash
-$ go mod tidy
-```
-
-To update the dependencies to latest run
-
-```bash
-$ go get -u ./...
-```
-
-If working with a fix or investigating something in a dependency, you can have a local fork by adding a replace directive in the go.mod file, see below examples.
-
-```
-replace example.com/some/dependency => example.com/some/dependency v1.2.3
-replace example.com/original/import/path => /your/forked/import/path
-replace example.com/project/foo => ../foo
-```
-
-Testing if your fix builds is often easiest to do by the command
-$ go build
-in the directory of the fixed go file.
-
-For more information see https://github.com/golang/go/wiki/Modules#when-should-i-use-the-replace-directive
-
-Make sure not to push modified go.mod, go.sum files since that would probably break the master branch.
-
-### Multi-process vs single-process server implementation
-The components mentioned above that together realizes the server is available in two different implementations:
-- Components are built and deployed as separate processes/binaries, and communicate using Websocket.
-- Components are built and deployed as threads within one common process/binary, and communicate using Go channels.
-
-These implementations are found at the branches multi-process and single-process, respectively.
-The master branch is a fork from the single-process branch.
-
-### Using Docker-Compose to launch a W3CServer instance
-
-The W3C server can also be built and launched using docker and docker-compose please follow below links to install docker and docker-compose
-
-https://docs.docker.com/install/linux/docker-ce/ubuntu/
-https://docs.docker.com/compose/install/
-
-to launch use
-
-```bash
-$ docker-compose up -d
-Starting w3c_vehiclesignalinterfaceimpl_servercore_1 ... done
-Starting w3c_vehiclesignalinterfaceimpl_servicemgr_1 ... done
-Starting w3c_vehiclesignalinterfaceimpl_wsmgr_1 ... done
-Starting w3c_vehiclesignalinterfaceimpl_httpmgr_1 ... done
-```
-to stop use
-
-```bash
-$ docker-compose down
-Stopping w3c_vehiclesignalinterfaceimpl_servicemgr_1 ... done
-Stopping w3c_vehiclesignalinterfaceimpl_httpmgr_1 ... done
-Stopping w3c_vehiclesignalinterfaceimpl_wsmgr_1 ... done
-Stopping w3c_vehiclesignalinterfaceimpl_servercore_1 ... done
-Removing w3c_vehiclesignalinterfaceimpl_servicemgr_1 ... done
-Removing w3c_vehiclesignalinterfaceimpl_httpmgr_1 ... done
-Removing w3c_vehiclesignalinterfaceimpl_wsmgr_1 ... done
-Removing w3c_vehiclesignalinterfaceimpl_servercore_1 ... done
-```
-
-if server needs to be rebuilt due to src code modifications
-
-```bash
-$ docker-compose up -d --force-recreate --build
-```
-all log files are stored in a docker volume to find the local path for viewing the logs use the docker inspect command to find the Mountpoint
-```bash
-$ docker volume ls
-DRIVER VOLUME NAME
-local w3c_vehiclesignalinterfaceimpl_logdata
-$ docker volume inspect w3c_vehiclesignalinterfaceimpl_logdata
-[
- {
- "CreatedAt": "2019-12-12T15:32:13+01:00",
- "Driver": "local",
- "Labels": {
- "com.docker.compose.project": "w3c_vehiclesignalinterfaceimpl",
- "com.docker.compose.version": "1.25.1-rc1",
- "com.docker.compose.volume": "logdata"
- },
- "Mountpoint": "/var/lib/docker/volumes/w3c_vehiclesignalinterfaceimpl_logdata/_data",
- "Name": "w3c_vehiclesignalinterfaceimpl_logdata",
- "Options": null,
- "Scope": "local"
- }
-]
-
-```
-
-
-# 1. server
-
-The server directories contain an implementation of a server acording to the W3C W3C VISS v2 spec, and should align with the project common software architecture, see below.
-Significant deviations should be documented in the README.md file.
-
-# 2. client
-The client directories has as a prime target testing of the server implementations. The local README.md file should provide information about client scope and usage.
-
-## Web Client Integration
-A Web Client written in JS developed by NICS Lab is integrated for testing purposes. It supports AGT, AT and VISS requests. It is also able to generate and store Cryptographic Keys that can be used in the Long Term flow and provides a storage and visualizer for Tokens received.
-
-The WebSocket Handler serves the web client in the URL /webclient. Because of that, it can be accessed in any Web Browser supporting the used libraries in: http://viss-server-url:websocket-port/webclient.
-
-More information about the Web Client can be found in https://github.com/nicslabdev/viss-web-client.
-
-Since the Web Client is included as a submodule, in order to use it, submodules in the project must be initialized:
-```
- $ git submodule init
- $ git submodule update
-```
-The version of the Web Client used is the latest tested. In order to use the latest version of the Web Client avaliable on github, the flag remote must be used to fetch and ensure that the latest commit of the Web Client repository is used.
-```
- $ git submodule update --recursive --remote
-```
-
-The client can also be accessed in "https://nicslabdev.github.io/viss-web-client/". In order to use the web client provided in that link, CORS policies in the VISS server should be configured to allow requests from that URL.
-
-# Development Process
-
-We will follow a simple process where work packages are create as issues labeled as an implementation issue. The name of the issue is also the name of the branch which is used for implementation. A pull request is created when the task is finished to push the changes to the main branch.
-
-1) Create implementation issue
-2) Branch using the name of the issue
-3) Implement and test
-4) Merge main to local Branch
-5) Create PR
-6) Gate keepers review and push to main branch.
- - current gate keepers: (@MagnusGun,@UlfBj,@PeterWinzell)
-
-
-# Project common software architecture
-The server functionality has a complexity level that warrants some thoughts on how a good software architecture could look like.
-Figure 1 is the current proposal on this.
-
-*Fig 1. Software architecture overview
-
-The design tries to meet the following requirements:
-- Abstract the details of how the service managers access the data that is represented in the tree.
-- Support straightforward addition of further transport protocols.
-- Support straightforward addition of further service managers.
-- Support both the case of a singleton server through which all access goes, and the option of distributed servers that a client can access directly, after the initial service discovery.
-The following describes the components shown in Figure 1.
-## Transport managers and interface.
-The transport manager is responsible for that the W3C VISS v2 client-server communication is carried out according to the transport protocol the manager implements. The payload being communicated shall have the format specified in the W3C VISS v2 TRANSPORT document. A transport manager acts as a proxy between a client and the Server core, see Figure 2. The payload communicated over the Transport interface shall be identical regardless of which Transport manager the Core server communicates with. This payload shall therefore follow the format for the Websocket transport as specified in W3C VISS v2 TRANSPORT. This means that all transport managers except the Websocket transport manager must reformat the payload communicated over their respective transport protocol. The transport interface is divided into two components, a registration interface, and a data channel interface. The registration interface is used by a transport manager to register itself with the Server core. The data channel interface is used for exchanging the requests, responses, and notifications between the communication end points. The data channel must support bidirectional asynchronous communication, and should support both local and remote transport manager deployment.
-At the registration with the core server the transport manager receives a transport manager Id. It must then include this in all payloads forwarded to the core server, for the core server to use in its payload routing. The transport manager must also include a client Id in the payload, to enable its own routing to different app-clients. These Ids must not be part of the payload returned to the app-clients.
-
-*Fig 2. Transport SwA closeup
-## Tree manager and interface
-The tree representing the accessible data points is found on the GENIVI VSS Github. There is also found a basic tree manager from which the basis of this tree manager is cloned.
-The tree manager abstracts the details of the tree, e. g. its format, which through the VSS tool support can be e. g. JSON, CSV, or c-native (c.f. VSS). It provides a method for searching the tree, to verify that a given path has a match in the tree, or to find all paths matching a path including wild cards. It also supports access to node internal data associated to a node reference provided by a previous search.
-
-*Fig 3. Tree SwA closeup
-## Service managers and interface
-Although the service manager internal design is anticipated to substantially differ between OEMs, the internal design in this project follows the architecture of the GENIVI CCS project with a "state storage" component as the interface that the service manager interacts with. The service manager interface described here should however be common for all implementations. A service manager must first register with the Server core, in which it provides the path from tree root to the node that is the root node of the branches 'owned' by this service manager. This means that the existing tree must already be populated with the branches of this service manager. A possible later extension is to allow the service manager to provide new branches to be added to the tree. Another extension could be for the service manager to also provide information whether it supports direct client access (distributed server solution), or not. But this is not supported in the current version. The service manager acts as the server in the data channel communication with the server core, so it shall provide the server core with port number and URL path at the registration.
-The service interface payload shall follow the same format as the transport protocol. However, client requests related to authorize and service discovery actions terminate at the Server core, and should not be issued at this interface, i. e. only requests related to get/set/subscribe/unsubscribe should be communicated here. App-client requests may lead to requests on multiple data points, which shall be resolved by the server core, and over this interface be replaced by an array of fully qualified paths. The subsequent response, or subscription notification, shall contain data from all nodes addressed in the array.
-The service interface is divided into two components, a registration interface, and a data channel interface. The registration interface is used by a service manager to register itself with the Server core. The data channel interface is used for exchanging the requests, responses, and notifications between the communication end points. The data channel must support bidirectional asynchronous communication, and should support both local and remote service manager deployment.
-In this design it is the state-storage responsibility to map the VSS path expressions to whatever vehicle internal addressing scheme that is required to execute the requested data access. It is the responsibility of the service manager to interpret the filter instructions in a subscription request, and make sure these are followed in subsequent notifications to the client.
-
-*Fig 4. Service SwA closeup
-## Server core
-The Server core is the like the spider in the net, tying it all together. Its main tasks are:
- 1. Handle registrations by transport managers and service managers.
- 2. Payload analysis.
- 3. Message routing.
- 4. Access restriction management.
- 5. Service discovery response.
-#### 1. Payload analysis
-As not all messages shall lead to a forwarded request to a related service manager, the Server core must analyze the requested action, and act according to it.
-#### 2. Message routing
-The Server core must keep track of from which transport manager a request message was received, in order to return the response to the same transport manager. The core server therefore provides the transport manager with an Id at the registration, which it then will embed in all requests forwarded to the server core. As the transport manager itself needs to route payloads back to respective app-client, it also embeds a client Id in the payload. These two Ids shall follow the payload to the service manager, which then must embed it in its responses and notifications sent back to the core server. It is the responsibility of the transport manager to remove the Ids before returning payloads to an app-client.
-#### 3. Access restriction management
-The Server core shall always check a tree node for which a client is requesting access to find out whether there is access restrictions tied to it. If so, it shall act as described in the VISSv2 CORE document.
-The authorization solution used in this project may not meet the security robustness required in a real life deployment. It shall however follow the access control model as described in the VISSvs specification.
-#### 4. Service discovery response
-The response of a service discovery client request shall contain a JSON formatted tree containing all nodes under the tree node pointed to by the path. It is the responsibility of the Server core to use the tree interface to read node data for all nodes of this sub-tree, and format it into a JSON tree object to be returned to the client.
-
-*Fig 2. Server core SwA closeup
-
-# Server configurations
-
-## VSS tree
-The vehicle signals that the W3C VISS v2 server manages are defined in the "vss_W3C VISS v2.cnative" file in the server_core directory. New cnative files containing the latest verision on the VSS repo can be generated by cloning the Vehicle Signal Specification repo, and then issuing a "make cnative" command, see Tools usage.
-To use other formats. e. g. JSON, the vssparserutilities.c found in the c_native directory at the VSS Tools repo would have to implemented for that format (instead of the cnative format that it currently implements). The major parts to be reimplemented are the file read/write methods, and the "atomic" data access methods. Other methods, like the search method use these atomic methods for actual data access. This file would then have to replace the current vssparserutilities.c in the server_core directory.
-
-## VSS data sources
-The service manager implementation tries to open the file "statestorage.db" in the service_mgr directory. If this file exists, the service manager will then try to read the signals being addressed by the paths in client requests from this file. The file is an SQL database containing a table with a column for VSS paths, and a column for the data associated with the path. If there is no match, or if the database file was not found at server startup, then the service manager will instead generate a dummy value to be returned in the response. Dummy values are always an integer in the range from 0 to 999, from a counter that is incremented every 37 msec.
-New statestorage.db files can be generated by cloning the CCS-W3C-Client repo, and then run the statestorage manager, see the statestorage directory. It is then important that the "vsspathlist.json" file being read by the statestorage manager is copied from the server directoy of this repo, where it becomes generated by the W3C VISS v2 server at startup (from the data in the "vss_W3C VISS v2.cnative" file, and that the new statestorage database is populated with actual data, either in real time when running the W3C VISS v2 server, or preloaded with static data. The statestorage architecture allows one or more "feeders" to write data into the database, and also provides a translation table that can be preloaded for translating from a "non-VSS" address space to the VSS addres space (=VSS paths).
-
-## Payload encoding
-A reference payload encoding is implemented that compresses the W3C VISS v2 transport payloads with a ratio of around 450% to 700%.
-The encoding is currently only possible to activate over the WebSocket transport protocol, but it would also be possible to invoke over the HTTP protocol.
-To invoke it a client must set the sub-protocol to "W3C VISS v2c", in JS something like
-```
- socket = new WebSocket("ws://url-to-server:8080", "W3C VISS v2c");
-```
-For unencoded WebSocket sessions, the sub-protocol shall be set to "W3C VISS v2", or left out completely.
-The encoding uses both a lookup table to replace known data (paths, and other fixed key-values), removal of rule-based JSON reserved characters, and binary compression of actual data.
-The mechanism of using the sub-protocol parameter to invoke encoding scheme can easily be extended to use other compression schemes.
-For more information about the reference encoding, see README in the utils directory.
-
-## Access control
-The access control model in the W3C VISS v2 specification is supported, with the exception of the authentication step.
-The implementation would not pass a security check, for eample the shared key for token signature verification is hardcoded with a redable text as value.
-The access control model architecture is shown below.
-
-More information about how the Access Control is performed can be found in the agt_server and at_server README. The WebClient README also includes information about how the Access Control is performed.
-The README in the client/client-1.0/Javascript directory describes the requests a client must issue first to the Access Grant Token server,
-and then to the Access Token server in order to obtain an Access token.
-HTML client implementations for respective access can also be found in the directory.
diff --git a/W3CServer.sh b/W3CServer.sh
deleted file mode 100755
index 1f7c8d92..00000000
--- a/W3CServer.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-
-services=(vissv2server agt_server)
-#services=(agt_server)
-#services=(vissv2server)
-
-usage() {
- # echo "usage: $0 startme|stopme|configureme" >&2
- echo "usage: $0 startme|stopme" >&2
- echo "usage: Optional parameter: sqlite|redis|none" >&2
-}
-
-startme() {
- for service in "${services[@]}"; do
- echo "Starting $service"
- mkdir -p logs
- screen -S $service -dm bash -c "pushd server/$service && go build && mkdir -p logs && ./$service &> ./logs/$service-log.txt && popd"
- done
- screen -list
-}
-
-stopme() {
- for service in "${services[@]}"; do
- echo "Stopping $service"
- screen -X -S $service quit
- #killall -9 $service
- done
- sleep 1
- screen -wipe
-}
-
-#configureme() {
-#ln -s /WAII/server/Go/server-1.0/vendor/utils $GOPATH/src/utils
-#}
-
-if [ $# -ne 1 ] && [ $# -ne 2 ]
-then
- usage $0
- exit 1
-fi
-
-case "$1" in
- startme)
- stopme
- startme $# $2;;
- stopme)
- stopme
- ;;
- #configureme)
- # configureme
- # ;;
- *)
- usage
- exit 1
- ;;
-esac
diff --git a/build-system/index.html b/build-system/index.html
new file mode 100644
index 00000000..0cd61ede
--- /dev/null
+++ b/build-system/index.html
@@ -0,0 +1,567 @@
+
+
+
+
+
+
+
+
+
+
+
+ VISSv2 Build System :: W3C VISSv2 Reference Implementation
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/categories/index.xml b/categories/index.xml
new file mode 100644
index 00000000..70b93e4c
--- /dev/null
+++ b/categories/index.xml
@@ -0,0 +1,10 @@
+
+
+
+ Categories on W3C VISSv2 Reference Implementation
+ https://w3c.github.io/automotive-viss2/categories/
+ Recent content in Categories on W3C VISSv2 Reference Implementation
+ Hugo -- gohugo.io
+ en-us
+
+
diff --git a/client/client-1.0/Javascript/README.md b/client/client-1.0/Javascript/README.md
deleted file mode 100644
index f8705bb1..00000000
--- a/client/client-1.0/Javascript/README.md
+++ /dev/null
@@ -1,67 +0,0 @@
-**(C) 2019 Volvo Cars**
-**(C) 2020 Geotab Inc**
-
-# Project: WAII: client/client-1.0
-
-Client implementations for communication with the server found at the server/server-1.0 directory.
-The functionality in the W3C VISS v2 specs shall be supported, with features such as:
- HTTP and WebSockets transport protocols
--- Queries
--- Access control
-The clients can be executed either locally on the same machine as the server, or remotely on a different machine.
-The project plans to deploy a publicly accessible server, allowing interested testers to skip building the GO based server.
-The client examples in this directory could then just be opened in any browser.
-Current limitations:
-- The following client limitations are due to server limitations.
-- The transport protocols are not the secure versions of Websockets and HTTP.
-- Max twenty parallel app-clients for the Websocket protocol, any number for HTTP.
-- Access control is implemented with the following restrictions.
--- Client authentication is not implemented, and always returns a successful verification.
-- Responses for error cases may not be completely according to spec.
-- If the server does not find a statestorage DB in its directory from where a value can be read, then the server returns a dummy value.
--- The dummy valu is read from a counter [0-999] that is incremented every 47 msec..
-- Set requests do not lead to an update with the provided value.
-
-The available clients are:
-- httpclient.html // uses the HTTP protocol to communicate with the W3C VISS v2 server. Payload encoding not invoked.
-- wsclient_uncompressed.html // uses the Websocket protocol to communicate with the W3C VISS v2 server. Payload encoding not invoked.
-- wsclient_compressed.html // uses the Websocket protocol to communicate with the W3C VISS v2 server. Payload encoding invoked.
-- agtclient.html // uses the Websocket protocol to communicate with the Access Grant server.
-- atclient.html // uses the Websocket protocol to communicate with the Access token server.
-
-The appclient_commands.txt file contains some example payloads that a client may use. Depending on the VSS tree used by the W3C VISS v2 server,
-the paths used in the examples may not address existing nodes in the tree.
-
-## Build instructions:
-If the server to be used is not the one deployed by the project for public access, see below, then it must be built first, see build instructions in the root directory.
-The HTML clients found here can be opened in any browser.
-
-## Usage instructions:
-Before issuing any requests to the server, the server IP address (or domain name) must be set.
-Even if the server runs on the same machine the machine outbound IP must be set, followed by a click on the Server IP button.
-If the server to be used is the one deployed by the project for public access, then the URL is:
-!!!Deployment details not yet resolved. Will be shown here when available!!!
-After the server URL is set, then requests can be issued to the server.
-For request examples, see the file appclient_commands.txt that contains request examples for both Websockets and HTTP transport protocols.
-The VSS paths shown in the examples can be replaced by any path that the VSS tree at the VSS Github project supports (https://github.com/GENIVI/vehicle_signal_specification).
-
-The W3C VISS v2 access control model describes two authorization servers, the Access Grant Token (AGT) server, and the Access Token (AT) server.
-To obtain an Access Grant token the agtclient.html can be used. The IP address is the same as for the W3C VISS v2 server, the path is "agtserver",
-and the request to the agtserver must be a JSON formatted message with the following format
-{"vin":"XXX", "context":"Independent+OEM+Cloud", "proof":"ABC", "key":"DEF"}
-where the "vin" value can be replaced by any (fictious) VIN number, the "context" value with any role triplet that the W3C VISS v2 spec supports,
- the "proof" value with anything as authentication is not implemented.
- If a "key" parameter is included, to initiate a Long Term Flow, it may have any value as it is currently not used.
-The response contains the Access Grant Token, that is used as input in the following request to the AT server.
-To issue this request, the atclient.html can be opened in a browser, input the same IP address, and as path "atserver", then the request to the AT server shall have the following JSON format:
-{"token":"ag-token", "purpose":"short-name-from-purpose-list", "pop":"GHI"}
-where the "token" value is the token received from the AGT server,
-the "purpose" value must be a short name on the Purpose list (where only "fuel-status" is available as an example).
-The "pop" parameter shall only be included if a "key" parameter was included in the AGT request, the value can be anything as it is currently not used.
-If the AGT token is verified as valid, which it should be if it comes from the AGT server, the response contains the AT token that can then be used in requests to the W3C VISS v2 server.
-The access control model implements the Access control selection model described in the W3C VISS v2 specification,so to enable testing of access control, the VSS tree must be updated with access control metadata. This is done by adding the key-value pair "validate:X" to a node in a vspec file,
-where X must be either "write-only" or "read-write".
-This can be inserted into any node, also branch nodes, in which case the access control is inherited by all nodes being descendants of that node.
-E.g if in the branch node "Body" the metadata "validate:read-write" is inserted, then all signals in the subtree having "Vehicle.Body" as the root will require a token with ReadWrite scope for any read or write requests.
-Please see the W3C W3C VISS v2 CORE spec, Access Control chapter for more info.
-
diff --git a/client/client-1.0/Javascript/agtclient.html b/client/client-1.0/Javascript/agtclient.html
deleted file mode 100644
index 7f6eb85e..00000000
--- a/client/client-1.0/Javascript/agtclient.html
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
AGT client example
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/client/client-1.0/Javascript/appclient_commands.txt b/client/client-1.0/Javascript/appclient_commands.txt
deleted file mode 100644
index 8a6285c8..00000000
--- a/client/client-1.0/Javascript/appclient_commands.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-// Five HTML clients are available for testing purposes
- - httpclient.html // HTTP(S) requests to VISSv2 server
- - wsclient_uncompressed.html // WS(S) requests to VISSv2 server
- - wsclient_compressed.html // WS(S) requests to VISSv2 server, using an experimental compression algorithm
- - agtclient.html // HTTP requests to Access Grant Token server
- - agclient.html // HTTP requests to Access Token server
-
- // Websocket request examples
-Get request:
-{"action":"get","path":"Vehicle/Cabin/Door/Row1/Right/IsOpen","requestId":"232"}
-{"action":"get","path":"Vehicle.Acceleration.Longitudinal","requestId":"233"}
-
-Get request for historic data:
-{"action":"get","path":"Vehicle.Acceleration.Longitudinal","filter":{"type":"history","parameter":"P2DT12H"},"requestId":"234"}
-
-Get request with search:
-{"action":"get","path":"Vehicle/Cabin/Door","filter":{"type":"paths","parameter":"*.*.IsOpen"},"requestId":"235"}
-{"action":"get","path":"Vehicle.ADAS.ABS","filter":{"type":"paths","parameter":"*"},"requestId":"236"}
-{"action":"get","path":"Vehicle/ADAS","filter":{"type":"paths","parameter":["ABS/*","CruiseControl/Error"]},"requestId":"237"}
-
-
-Get request with AT token (XXX must be replaced with actual token):
-{"action":"get","path":"Vehicle/ADAS/CruiseControl/Error","authorization":"XXX","requestId":"241"}
-{"action":"get","path":"Vehicle.Body.BodyType","authorization":"XXX","requestId":"243"}
-
-Metadata request:
-{"action":"get","path":"Vehicle/ADAS/ABS","filter":{"type":"static-metadata","parameter":""},"requestId":"244"}
-{"action":"get","path":"Vehicle","filter":{"type":"dynamic-metadata","parameter":"server_capabilities"},"requestId":"244"}
-{"action":"get","path":"Vehicle/ADAS","filter":[{"type":"paths","parameter":["ABS/*","CruiseControl/Error"]},{"type":"dynamic-metadata","parameter":"availability"}],"requestId":"237"}
-
-Set request:
-{"action":"set", "path":"Vehicle/Cabin/Door/Row1/Right/IsOpen", "value":"999", "requestId":"245"}
-
-Subscribe request:
-{"action":"subscribe","path":"Vehicle/Cabin/Door/Row1/Right/IsOpen","filter":{"type":"timebased","parameter":{"period":"3000"}},"requestId":"246"}
-{"action":"subscribe","path":"Vehicle.Cabin.Door.Row1.Right.IsOpen","filter":{"type":"change","parameter":{"logic-op":"ne", "diff":"0"}},"requestId":"247"}
-{"action":"subscribe","path":"Vehicle/Cabin/Door/Row1/Right/IsOpen","filter":{"type":"range","parameter":{"logic-op":"gt","boundary":"500"}},"requestId":"255"}
-{"action":"subscribe","path":"Vehicle/Cabin/Door/Row1/Right/IsOpen","filter":{"type":"range","parameter":[{"logic-op":"gt","boundary":"500"},{"logic-op":"lt","boundary":"510"}]},"requestId":"265"}
-{"action":"subscribe","path":"Vehicle.Powertrain.Transmission.Speed","filter":{"type":"curvelog","parameter":{"maxerr":"2","bufsize":"100"}},"requestId":"275"}
-{"action":"subscribe","path":"Vehicle","filter":[{"type":"paths","parameter":["CurrentLocation.Latitude", "CurrentLocation.Longitude"]}, {"type":"curvelog","parameter":{"maxerr":"0.00001","bufsize":"100"}}],"requestId":"285"}
-
-Unsubscribe request:
-{"action":"unsubscribe","subscriptionId":"1","requestId":"240"}
-
-
-
-// HTTP request examples
-
-Get request:
-HTTP GET
-URL: Vehicle/Cabin/Door/Row1/Right/IsOpen
-URL: Vehicle.Acceleration.Longitudinal
-
-Get request with search:
-HTTP GET
-URL: Vehicle/Cabin?filter={"type":"paths", "parameter":["Door/*/*/IsOpen", "Convertible/Status"]}
-URL: Vehicle.ADAS?filter={"type":"paths", "parameter":["ABS.*", "CruiseControl.Error"]}
-
-Get request for historic data:
-HTTP GET
-URL: Vehicle.Acceleration.Longitudinal?filter={"type":"history", "parameter":"P2DT12H"}
-
-Set request:
-HTTP POST
-URL: Vehicle.Acceleration.Longitudinal
-Payload: 0.123
-
-Service discovery request:
-HTTP GET
-URL: Vehicle/ADAS/ABS?filter={"type":"static-metadata", "parameter":""}
-
-// ********* Access control testing *************
-// requires that a binary VSS file has been generated with "validate" tags added into vspec file(s).
-
-// AGTserver POST input:
-
-agtserver
-{"vin":"GEO001", "context":"Independent+OEM+Cloud", "proof":"ABC", "key":"DEF"} // "key" may be omitted
-
-
-// ATserver POST input:
-
-atserver
-{"token":"ag-token", "purpose":"fuel-status", "pop":"GHI"} // pop included only if a key was present in AGT request, token value must be replaced by the AG token, purpose must be on the Purpose list
-
-//VISSv2 server request for fuel-status use case:
-wsclient_uncompressed.html:
-{"action":"get","path":"Vehicle.Powertrain.FuelSystem","filter":{"type":"paths","parameter":["Level","Range"]},"authorization":"at","requestId":"235"}
-// where "at" is the Access Token from ATS request
-http_client.html:
-URL: Vehicle/Cabin/Door/Row1/Right/IsOpen
-Access token: from ATS request
-
diff --git a/client/client-1.0/Javascript/atclient.html b/client/client-1.0/Javascript/atclient.html
deleted file mode 100644
index 464f6344..00000000
--- a/client/client-1.0/Javascript/atclient.html
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/client/client-1.0/README.md b/client/client-1.0/README.md
deleted file mode 100644
index ea8a9518..00000000
--- a/client/client-1.0/README.md
+++ /dev/null
@@ -1,30 +0,0 @@
-**(C) 2021 Geotab Inc**
-
-# Compression client
-
-The compression client is a client for testing the experimental compression solutions that are supported by the VISSv2 server.
-If the client is started without any command argument the following is shown:
-
[-v|--vissv2Url] is required
-usage: print [-h|--help] -v|--vissv2Url "<value>" [-p|--protocol (http|ws)]
- [-c|--compression (prop|pbl1|pbl2)] [--logfile] [--loglevel
- (trace|debug|info|warn|error|fatal|panic)]
-
- Prints provided string to stdout
-
-Arguments:
-
- -h --help Print help information
- -v --vissv2Url IP/url to VISSv2 server
- -p --protocol Protocol must be either http or websocket. Default: ws
- -c --compression Compression must be either proprietary or protobuf level 1
- or 2. Default: pbl1
- --logfile outputs to logfile in ./logs folder
- --loglevel changes log output level. Default: info
-
-Depending on the -c argument the client will run in one of the three compression variants supported (see README in utils directory),
-and it will set the websocket subprotocol accordingly to signal to the server which variant to use.
-
-The file requests.json contains the requests that the client have available for sending to the server. This file can be updated with additional requests.
-The client presents the requests on the terminal window with an integer index in front. Enter the index for the request to be issued, and the client will then present the JSON payload sizes, the compressed sizes, and the compression ratio=(len(json)*100)/len(compressed) for the request and response.
-If a subscribe request is issued, the client will continue to show the received notification information as above, until it receives a RETURN key user input, which will lead to that it issues an unsubscribe request, and then waits for new user input.
-The user input zero (0) terminates the client.
diff --git a/client/client-1.0/compress_client/README.md b/client/client-1.0/compress_client/README.md
deleted file mode 100644
index 884c7dc5..00000000
--- a/client/client-1.0/compress_client/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-**(C) 2021 Geotab Inc**
-
-# Compression client
-
-The compression client is a client for testing the experimental compression solutions that are supported by the VISSv2 server.
-If the client is started without any command argument the following is shown:
-
[-v|--vissv2Url] is required
-usage: print [-h|--help] -v|--vissv2Url "<value>" [-p|--protocol (http|ws)]
- [-c|--compression (prop|pbl1|pbl2)] [--logfile] [--loglevel
- (trace|debug|info|warn|error|fatal|panic)]
-
- Prints provided string to stdout
-
-Arguments:
-
- -h --help Print help information
- -v --vissv2Url IP/url to VISSv2 server
- -p --protocol Protocol must be either http or websocket. Default: ws
- -c --compression Compression must be either proprietary or protobuf level 1
- or 2. Default: pbl1
- --logfile outputs to logfile in ./logs folder
- --loglevel changes log output level. Default: info
-
-Depending on the -c argument the client will run in one of the three compression variants supported (see README in utils directory),
-and it will set the websocket subprotocol accordingly to signal to the server which variant to use.
-
-The file requests.json contains the requests that the client have available for sending to the server. This file can be updated with additional requests.
-The client presents the requests on the terminal window with an integer index in front. Enter the index for the request to be issued, and the client will then present the JSON payload sizes, the compressed sizes, and the compression ratio=(len(json)*100)/len(compressed) for the request and response.
-If a subscribe request is issued, the client will continue to show the received notification information as above, until it receives a RETURN key user input, which will lead to that it issues an unsubscribe request, and then waits for new user input.
-The user input zero (0) terminates the client.
-Protobuf level 2 compression requres that the file vsspathlist.json is present in the startup directory.
-It is created by the VISSv2 server at startup, and can be found in the ./server directory.
diff --git a/client/client-1.0/compress_client/compress_client.go b/client/client-1.0/compress_client/compress_client.go
deleted file mode 100644
index efc6efef..00000000
--- a/client/client-1.0/compress_client/compress_client.go
+++ /dev/null
@@ -1,302 +0,0 @@
-/**
-* (C) 2022 Geotab Inc
-*
-* All files and artifacts in the repository at https://github.com/w3c/automotive-viss2
-* are licensed under the provisions of the license provided by the LICENSE file in this repository.
-*
-**/
-
-package main
-
-import (
- "crypto/tls"
- "crypto/x509"
- "encoding/json"
- "flag"
- "io/ioutil"
-// "net/http"
- "net/url"
- "os"
- "strconv"
- "strings"
-
- "fmt"
- "time"
-
- "github.com/akamensky/argparse"
- "github.com/gorilla/websocket"
- "github.com/w3c/automotive-viss2/utils"
-)
-
-var commandNumber string
-
-var clientCert tls.Certificate
-var caCertPool x509.CertPool
-
-var vissv2Url string
-var protocol string
-var compression string
-
-type RequestList struct {
- Request []string
-}
-
-var requestList RequestList
-
-func pathToUrl(path string) string {
- var url string = strings.Replace(path, ".", "/", -1)
- return "/" + url
-}
-
-func jsonToStructList(jsonList string) int {
- var reqList map[string]interface{}
- err := json.Unmarshal([]byte(jsonList), &reqList)
- if err != nil {
- utils.Error.Printf("jsonToStructList:error jsonList=%s", jsonList)
- return 0
- }
- switch vv := reqList["request"].(type) {
- case []interface{}:
-// utils.Info.Println(jsonList, "is an array:, len=",strconv.Itoa(len(vv)))
- requestList.Request = make([]string, len(vv))
- for i := 0 ; i < len(vv) ; i++ {
- requestList.Request[i] = retrieveRequest(vv[i].(map[string]interface{}))
- }
- case map[string]interface{}:
-// utils.Info.Println(jsonList, "is a map:")
- requestList.Request = make([]string, 1)
- requestList.Request[0] = retrieveRequest(vv)
- default:
-// utils.Info.Println(vv, "is of an unknown type")
- }
- return len(requestList.Request)
-}
-
-func retrieveRequest(jsonRequest map[string]interface{}) string {
- request, err := json.Marshal(jsonRequest)
- if err != nil {
- utils.Error.Print("retrieveRequest(): JSON array encode failed. ", err)
- return ""
- }
- return string(request)
-}
-
-func createListFromFile(fname string) int {
- data, err := ioutil.ReadFile(fname)
- if err != nil {
- fmt.Printf("Error reading file=%s", fname)
- return 0
- }
- return jsonToStructList(string(data))
-}
-
-func initVissV2WebSocket(compression string) *websocket.Conn {
- scheme := "ws"
- portNum := "8080"
- if secConfig.TransportSec == "yes" {
- scheme = "wss"
- portNum = secConfig.WsSecPort
- websocket.DefaultDialer.TLSClientConfig = &tls.Config{
- Certificates: []tls.Certificate{clientCert},
- RootCAs: &caCertPool,
- }
- }
- var addr = flag.String("addr", vissv2Url+":"+portNum, "http service address")
- dataSessionUrl := url.URL{Scheme: scheme, Host: *addr, Path: ""}
- subProtocol := make([]string, 1)
- subProtocol[0] = "VISSv2" + compression
- dialer := websocket.Dialer{
- HandshakeTimeout: time.Second,
- ReadBufferSize: 1024,
- WriteBufferSize: 1024,
- Subprotocols: subProtocol,
- }
- conn, _, err := dialer.Dial(dataSessionUrl.String(), nil)
- if err != nil {
- fmt.Printf("Data session dial error:%s\n", err)
- os.Exit(-1)
- }
- return conn
-}
-
-func getResponse(conn *websocket.Conn, request []byte) []byte {
- err := conn.WriteMessage(websocket.BinaryMessage, request)
- if err != nil {
- fmt.Printf("Request error:%s\n", err)
- return nil
- }
- _, msg, err := conn.ReadMessage()
- if err != nil {
- fmt.Printf("Response error: %s\n", err)
- return nil
- }
- return msg
-}
-
-func performCommand(commandNumber int, conn *websocket.Conn, optionChannel chan string) {
- fmt.Printf("Request: %s\n", requestList.Request[commandNumber])
- if (compression != "prop") {
- performPbCommand(commandNumber, conn, optionChannel)
- } else {
- compressedRequest := utils.CompressMessage([]byte(requestList.Request[commandNumber]))
- fmt.Printf("JSON request size= %d, Compressed request size=%d\n", len(requestList.Request[commandNumber]), len(compressedRequest))
- fmt.Printf("Compression= %d%\n", (100*len(requestList.Request[commandNumber])) / len(compressedRequest))
- compressedResponse := getResponse(conn, compressedRequest)
- jsonResponse := string(utils.DecompressMessage([]byte(compressedResponse)))
- fmt.Printf("Response: %s\n", jsonResponse)
- fmt.Printf("JSON response size= %d, Compressed response size=%d\n", len(jsonResponse), len(compressedResponse))
- fmt.Printf("Compression= %d%\n", (100*len(jsonResponse)) / len(compressedResponse))
- if (strings.Contains(requestList.Request[commandNumber], "subscribe") == true) {
- for {
- _, msg, err := conn.ReadMessage()
- if err != nil {
- fmt.Printf("Notification error: %s\n", err)
- return
- }
- jsonNotification := string(utils.DecompressMessage(msg))
- fmt.Printf("Notification: %s\n", jsonNotification)
- fmt.Printf("JSON notification size= %d, Compressed notification size=%d\n", len(jsonNotification), len(msg))
- fmt.Printf("Compression= %d%\n", (100*len(jsonNotification)) / len(msg))
- select {
- case <- optionChannel:
- // issue unsubscribe request
- subscriptionId := utils.ExtractSubscriptionId(jsonResponse)
- unsubReq := `{"action":"unsubscribe", "subscriptionId":"` + subscriptionId + `"}`
- compressedUnsubReq := utils.CompressMessage([]byte(unsubReq))
- getResponse(conn, compressedUnsubReq)
- return
- default:
- }
- }
- }
- }
-}
-
-func performPbCommand(commandNumber int, conn *websocket.Conn, optionChannel chan string) {
- compressedRequest := utils.JsonToProtobuf(requestList.Request[commandNumber], convertToCompression(compression))
- fmt.Printf("JSON request size= %d, Protobuf request size=%d\n", len(requestList.Request[commandNumber]), len(compressedRequest))
- fmt.Printf("Compression= %d%\n", (100*len(requestList.Request[commandNumber])) / len(compressedRequest))
- compressedResponse := getResponse(conn, compressedRequest)
- jsonResponse := utils.ProtobufToJson(compressedResponse, convertToCompression(compression))
- fmt.Printf("Response: %s\n", jsonResponse)
- fmt.Printf("JSON response size= %d, Protobuf response size=%d\n", len(jsonResponse), len(compressedResponse))
- fmt.Printf("Compression= %d%\n", (100*len(jsonResponse)) / len(compressedResponse))
- if (strings.Contains(requestList.Request[commandNumber], "subscribe") == true) {
- for {
- _, msg, err := conn.ReadMessage()
- if err != nil {
- fmt.Printf("Notification error: %s\n", err)
- return
- }
- jsonNotification := utils.ProtobufToJson(msg, convertToCompression(compression))
- fmt.Printf("Notification: %s\n", jsonNotification)
- fmt.Printf("JSON notification size= %d, Protobuf notification size=%d\n", len(jsonNotification), len(msg))
- fmt.Printf("Compression= %d%\n", (100*len(jsonNotification)) / len(msg))
- select {
- case <- optionChannel:
- // issue unsubscribe request
- subscriptionId := utils.ExtractSubscriptionId(jsonResponse)
- unsubReq := `{"action":"unsubscribe", "subscriptionId":"` + subscriptionId + `"}`
- pbUnsubReq := utils.JsonToProtobuf(unsubReq, convertToCompression(compression))
- getResponse(conn, pbUnsubReq)
- return
- default:
- }
- }
- }
-}
-
-func convertToCompression(compression string) utils.Compression {
- switch compression {
- case "prop": return utils.PROPRIETARY
- case "pbl1": return utils.PB_LEVEL1
- case "pbl2": return utils.PB_LEVEL2
- }
- return utils.NONE
-}
-
-func displayOptions() {
- fmt.Printf("\n\nSelect one of the following numbers:\n")
- fmt.Printf("0: Exit program\n")
- for i := 0 ; i < len(requestList.Request) ; i++ {
- fmt.Printf("%d: %s\n", i+1, requestList.Request[i])
- }
- fmt.Printf("In the case of an ongoing subscription session, a RETURN key input will lead to unsubscribe.\n")
- fmt.Printf("\nOption number selected: ")
-}
-
-func readOption(optionChannel chan string) {
- for {
- fmt.Scanf("%s", &commandNumber)
- optionChannel <- commandNumber
- }
-}
-
-func main() {
- // Create new parser object
- parser := argparse.NewParser("print", "Prints provided string to stdout")
-
- // Create flags
- url_vissv2 := parser.String("v", "vissv2Url", &argparse.Options{Required: true, Help: "IP/url to VISSv2 server"})
- prot := parser.Selector("p", "protocol", []string{"http", "ws"}, &argparse.Options{Required: false,
- Help: "Protocol must be either http or websocket", Default:"ws"})
- comp := parser.Selector("c", "compression", []string{"prop", "pbl1", "pbl2"}, &argparse.Options{Required: false,
- Help: "Compression must be either proprietary or protobuf level 1 or 2", Default:"pbl1"})
- logFile := parser.Flag("", "logfile", &argparse.Options{Required: false, Help: "outputs to logfile in ./logs folder"})
- logLevel := parser.Selector("", "loglevel", []string{"trace", "debug", "info", "warn", "error", "fatal", "panic"}, &argparse.Options{
- Required: false,
- Help: "changes log output level",
- Default: "info"})
-
- // Parse input
- err := parser.Parse(os.Args)
- if err != nil {
- fmt.Print(parser.Usage(err))
- //exits due to required info not provided by user
- os.Exit(1)
- }
-
- //conversion since parsed flags are of *string type and not string
- vissv2Url = *url_vissv2
- protocol = *prot
- compression = *comp
-
- utils.InitLog("pb_client-log.txt", "./logs", *logFile, *logLevel)
-
- readTransportSecConfig()
- utils.Info.Printf("secConfig.TransportSec=%s", secConfig.TransportSec)
- if secConfig.TransportSec == "yes" {
- caCertPool = *prepareTransportSecConfig()
- }
-
- if createListFromFile("requests.json") == 0 {
- fmt.Printf("Failed in creating list from requests.json")
- os.Exit(1)
- }
-
- if (utils.InitCompression("vsspathlist.json") != true) {
- fmt.Printf("Failed in creating list from vsspathlist.json")
- os.Exit(1)
- }
-
- conn := initVissV2WebSocket(compression)
-
- optionChannel := make(chan string)
- go readOption(optionChannel)
-
- for {
- displayOptions()
- select {
- case commandNumber = <- optionChannel:
- if (commandNumber == "0") {
- return
- }
- }
- cNo, err := strconv.Atoi(commandNumber)
- if (err != nil) {
- fmt.Printf("Selected option not supported\n")
- continue
- }
- performCommand(cNo-1, conn, optionChannel)
- }
-}
diff --git a/client/client-1.0/compress_client/requests.json b/client/client-1.0/compress_client/requests.json
deleted file mode 100755
index 1f24a75e..00000000
--- a/client/client-1.0/compress_client/requests.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{"request":[{"action":"get","path":"Vehicle/Cabin/Door/Row1/Right/IsOpen","requestId":"232"},{"action":"get","path":"Vehicle.Acceleration.Longitudinal","requestId":"233"},
-{"action":"get","path":"Vehicle/ADAS","filter":{"type":"paths","parameter":["ABS/*","CruiseControl/Error"]},"requestId":"237"},
-{"action":"subscribe","path":"Vehicle/Cabin/Door/Row1/Right/IsOpen","filter":{"type":"timebased","parameter":{"period":"3"}},"requestId":"246"}]}
diff --git a/client/client-1.0/compress_client/transportSec.go b/client/client-1.0/compress_client/transportSec.go
deleted file mode 100644
index 5c108a32..00000000
--- a/client/client-1.0/compress_client/transportSec.go
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
-* (C) 2021 Geotab Inc
-*
-* All files and artifacts in the repository at https://github.com/GENIVI/ccs-w3c-client
-* are licensed under the provisions of the license provided by the LICENSE file in this repository.
-*
-**/
-
-package main
-
-import (
- "encoding/json"
- "io/ioutil"
- "fmt"
- "os"
- "crypto/tls"
- "crypto/x509"
-)
-
-
-var trSecConfigPath string = "transport_sec/" // relative path to the directory containing the transportSec.json file
-type SecConfig struct {
- TransportSec string `json:"transportSec"`// "yes" or "no"
- HttpSecPort string `json:"httpSecPort"`// HTTPS port number
- WsSecPort string `json:"wsSecPort"`// WSS port number
- MqttSecPort string `json:"mqttSecPort"`// MQTTS port number
- AgtsSecPort string `json:"agtsSecPort"`// AGTS port number
- AtsSecPort string `json:"atsSecPort"`// ATS port number
- CaSecPath string `json:"caSecPath"`// relative path from the directory containing the transportSec.json file
- ServerSecPath string `json:"serverSecPath"`// relative path from the directory containing the transportSec.json file
- ServerCertOpt string `json:"serverCertOpt"`// one of "NoClientCert"/"ClientCertNoVerification"/"ClientCertVerification"
- ClientSecPath string `json:"clientSecPath"`// relative path from the directory containing the transportSec.json file
-}
-var secConfig SecConfig
-
-func readTransportSecConfig() {
- data, err := ioutil.ReadFile(trSecConfigPath + "transportSec.json")
- if err != nil {
- fmt.Printf("ReadTransportSecConfig():%stransportSec.json error=%s", trSecConfigPath, err)
- secConfig.TransportSec = "no"
- return
- }
- err = json.Unmarshal(data, &secConfig)
- if err != nil {
- fmt.Printf("ReadTransportSecConfig():Error unmarshal transportSec.json=%s", err)
- secConfig.TransportSec = "no"
- return
- }
- fmt.Printf("ReadTransportSecConfig():secConfig.TransportSec=%s", secConfig.TransportSec)
-}
-
-func prepareTransportSecConfig() *x509.CertPool{
- var err error
- clientCertFile := trSecConfigPath + secConfig.ClientSecPath + "client.crt"
- clientKeyFile := trSecConfigPath + secConfig.ClientSecPath + "client.key"
-
- clientCert, err = tls.LoadX509KeyPair(clientCertFile, clientKeyFile)
- if err != nil {
- fmt.Printf("Error creating x509 keypair from client cert file %s and client key file %s\n", clientCertFile, clientKeyFile)
- os.Exit(1)
- }
- caCert, err := ioutil.ReadFile(trSecConfigPath + secConfig.CaSecPath + "Root.CA.crt")
- if err != nil {
- fmt.Printf("Error opening cert file %s, Error: %s", trSecConfigPath + secConfig.CaSecPath + "Root.CA.crt", err)
- os.Exit(1)
- }
- caCertPool := x509.NewCertPool()
- caCertPool.AppendCertsFromPEM(caCert)
- return caCertPool
-}
-
diff --git a/client/client-1.0/compress_client/transport_sec/README.md b/client/client-1.0/compress_client/transport_sec/README.md
deleted file mode 100644
index cb8d8cbd..00000000
--- a/client/client-1.0/compress_client/transport_sec/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-The client can be configured to use the secure HTTPS and WSS transport protocols in its communication with the VISSv2 server.
-This is achieved by setting the "transportSec" parameter to "yes" in the transportSec.json file,
-and copying the CA cert and client cert and key from your local repo of https://github.com/MEAE-GOT/W3C_VehicleSignalInterfaceImpl,
-where they are supposedly previously generated.
-This shall be copied into directories named transport_sec/ca, and transport_sec/client, respectively,
-if the existing path parameters in the transportSec.json file are used. These can be updated to point to other directories.
-For more information about the credentials generation, see https://github.com/MEAE-GOT/W3C_VehicleSignalInterfaceImpl/testCredGen/README.md.
-
diff --git a/client/client-1.0/compress_client/transport_sec/ca/README.md b/client/client-1.0/compress_client/transport_sec/ca/README.md
deleted file mode 100644
index ff980942..00000000
--- a/client/client-1.0/compress_client/transport_sec/ca/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-The CA cert file is stored here, unless the path configured in transportSec.json is updated to point to a different directory.
-
diff --git a/client/client-1.0/compress_client/transport_sec/client/README.md b/client/client-1.0/compress_client/transport_sec/client/README.md
deleted file mode 100644
index 8a916ee7..00000000
--- a/client/client-1.0/compress_client/transport_sec/client/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-The client cert and key files are stored here, unless the path configured in transportSec.json is updated to point to a different directory.
-
diff --git a/client/client-1.0/compress_client/transport_sec/transportSec.json b/client/client-1.0/compress_client/transport_sec/transportSec.json
deleted file mode 100644
index 1951d4be..00000000
--- a/client/client-1.0/compress_client/transport_sec/transportSec.json
+++ /dev/null
@@ -1,3 +0,0 @@
-
-{"transportSec" : "no", "wsSecPort": "6443", "caSecPath": "ca/", "serverSecPath": "", "serverCertOpt": "ClientCertVerification", "clientSecPath": "client/"}
-
diff --git a/client/client-1.0/csv_client/csv_client.go b/client/client-1.0/csv_client/csv_client.go
deleted file mode 100644
index 623988f5..00000000
--- a/client/client-1.0/csv_client/csv_client.go
+++ /dev/null
@@ -1,467 +0,0 @@
-/**
-* (C) 2022 Geotab Inc
-*
-* All files and artifacts in the repository at https://github.com/w3c/automotive-viss2
-* are licensed under the provisions of the license provided by the LICENSE file in this repository.
-*
-**/
-
-package main
-
-import (
- "crypto/tls"
- "crypto/x509"
- "encoding/json"
- "flag"
- "io/ioutil"
-// "net/http"
- "net/url"
- "os"
- "strconv"
- "strings"
-
- "fmt"
- "time"
-
- "github.com/akamensky/argparse"
- "github.com/gorilla/websocket"
- "github.com/w3c/automotive-viss2/utils"
-)
-
-var commandNumber string
-
-var clientCert tls.Certificate
-var caCertPool x509.CertPool
-
-var vissv2Url string
-var protocol string
-var compression string
-
-type RequestList struct {
- Request []string
-}
-
-var requestList RequestList
-
-func pathToUrl(path string) string {
- var url string = strings.Replace(path, ".", "/", -1)
- return "/" + url
-}
-
-func jsonToStructList(jsonList string) int {
- var reqList map[string]interface{}
- err := json.Unmarshal([]byte(jsonList), &reqList)
- if err != nil {
- utils.Error.Printf("jsonToStructList:error jsonList=%s", jsonList)
- return 0
- }
- switch vv := reqList["request"].(type) {
- case []interface{}:
-// utils.Info.Println(jsonList, "is an array:, len=",strconv.Itoa(len(vv)))
- requestList.Request = make([]string, len(vv))
- for i := 0 ; i < len(vv) ; i++ {
- requestList.Request[i] = retrieveRequest(vv[i].(map[string]interface{}))
- }
- case map[string]interface{}:
-// utils.Info.Println(jsonList, "is a map:")
- requestList.Request = make([]string, 1)
- requestList.Request[0] = retrieveRequest(vv)
- default:
-// utils.Info.Println(vv, "is of an unknown type")
- }
- return len(requestList.Request)
-}
-
-func retrieveRequest(jsonRequest map[string]interface{}) string {
- request, err := json.Marshal(jsonRequest)
- if err != nil {
- utils.Error.Print("retrieveRequest(): JSON array encode failed. ", err)
- return ""
- }
- return string(request)
-}
-
-func createListFromFile(fname string) int {
- data, err := ioutil.ReadFile(fname)
- if err != nil {
- fmt.Printf("Error reading file=%s", fname)
- return 0
- }
- return jsonToStructList(string(data))
-}
-
-func initVissV2WebSocket(compression string) *websocket.Conn {
- scheme := "ws"
- portNum := "8080"
- if secConfig.TransportSec == "yes" {
- scheme = "wss"
- portNum = secConfig.WsSecPort
- websocket.DefaultDialer.TLSClientConfig = &tls.Config{
- Certificates: []tls.Certificate{clientCert},
- RootCAs: &caCertPool,
- }
- }
- var addr = flag.String("addr", vissv2Url+":"+portNum, "http service address")
- dataSessionUrl := url.URL{Scheme: scheme, Host: *addr, Path: ""}
- subProtocol := make([]string, 1)
- subProtocol[0] = "VISSv2" + compression
- dialer := websocket.Dialer{
- HandshakeTimeout: time.Second,
- ReadBufferSize: 1024,
- WriteBufferSize: 1024,
- Subprotocols: subProtocol,
- }
- conn, _, err := dialer.Dial(dataSessionUrl.String(), nil)
- if err != nil {
- fmt.Printf("Data session dial error:%s\n", err)
- os.Exit(-1)
- }
- return conn
-}
-
-func getResponse(conn *websocket.Conn, request []byte) []byte {
- err := conn.WriteMessage(websocket.BinaryMessage, request)
- if err != nil {
- fmt.Printf("Request error:%s\n", err)
- return nil
- }
- _, msg, err := conn.ReadMessage()
- if err != nil {
- fmt.Printf("Response error: %s\n", err)
- return nil
- }
- return msg
-}
-
-func performCommand(commandNumber int, conn *websocket.Conn, optionChannel chan string, unsubChannel chan string) {
- fmt.Printf("Request: %s\n", requestList.Request[commandNumber])
- if (compression == "pbl1" || compression == "pbl2") {
- performPbCommand(commandNumber, conn, optionChannel)
- } else if (compression == "prop") {
- performPropCommand(commandNumber, conn, optionChannel)
- } else {
- performNoneCommand(commandNumber, conn, optionChannel, unsubChannel)
- }
-}
-
-func performNoneCommand(commandNumber int, conn *websocket.Conn, optionChannel chan string, unsubChannel chan string) {
- fmt.Printf("Compression is not applied. If subscribe request is issued, response data will be saved in the file data.csv\n")
-
- jsonResponse := string(getResponse(conn, []byte(requestList.Request[commandNumber])))
- fmt.Printf("Response: %s\n", jsonResponse)
- if (strings.Contains(requestList.Request[commandNumber], "subscribe") == true) {
- subscriptionId := utils.ExtractSubscriptionId(jsonResponse)
- unsubReq := `{"action":"unsubscribe", "subscriptionId":"` + subscriptionId + `"}`
- unsubChannel <- unsubReq
- maxArrayLen := 10000
- valArray := make([]string, maxArrayLen)
- tsArray := make([]string, maxArrayLen)
- sessionDone := false
- arrayIndex := 0
- finalIterations := -1
- for {
- _, msg, err := conn.ReadMessage()
- if err != nil {
- fmt.Printf("Notification error: %s\n", err)
- return
- }
- jsonNotification := string(msg)
- if (strings.Contains(jsonNotification, "unsubscribe") == true) {
- fmt.Printf("Response: %s\n", jsonNotification)
- sessionDone = true
- finalIterations = 1 // 2 more iteration if last buffer has saved dp(s). If not, change to 1.
- } else {
- finalIterations--
- fmt.Printf("Notification: %s\n", jsonNotification)
- if arrayIndex < maxArrayLen {
- arrayIndex = storeinArrays(jsonNotification, valArray, tsArray, arrayIndex)
- } else {
- fmt.Printf("Maximum number of datapoints are saved. Recording terminated.\n")
- }
- }
- if (sessionDone == true && finalIterations == 0) {
- fmt.Printf("Number of datapoints saved: %d\n", arrayIndex)
- saveInCsv(valArray, tsArray, arrayIndex)
- return
- }
- }
- } else { // get request
- fmt.Printf("Response: %s\n", jsonResponse)
- }
-}
-
-/* TODO: Current impl only supports notifications that do not contain data arrays ([]data).
-* To support data[] (multiple signals in the notification), arrayIndex would need to be an array, and tsArray/valArray would have to be 2-dim arrays
-*/
-func storeinArrays(jsonNotification string, valArray []string, tsArray []string, arrayIndex int) int { // can be any of the four response formats that VISSv2 specifies...
- var notificationMap = make(map[string]interface{})
- utils.MapRequest(jsonNotification, ¬ificationMap)
- return processDataLevel1(notificationMap["data"], valArray, tsArray, arrayIndex)
-}
-
-func processDataLevel1(dataObject interface{}, valArray []string, tsArray []string, arrayIndex int) int { // data or []data level
- switch vv := dataObject.(type) {
- case []interface{}: // []data
-// utils.Info.Println(dataObject, "is an array:, len=", strconv.Itoa(len(vv)))
- arrayIndex = processDataLevel2(vv, valArray, tsArray, arrayIndex)
- case map[string]interface{}:
-// utils.Info.Println(dataObject, "is a map:")
- arrayIndex = processDataLevel3(vv, valArray, tsArray, arrayIndex)
- default:
- utils.Info.Println(dataObject, "is of an unknown type")
- }
- return arrayIndex
-}
-
-func processDataLevel2(dataArray []interface{}, valArray []string, tsArray []string, arrayIndex int) int { // []data level
- for k, v := range dataArray {
- switch vv := v.(type) {
- case map[string]interface{}:
-// utils.Info.Println(k, "is a map:")
- arrayIndex = processDataLevel3(vv, valArray, tsArray, arrayIndex)
- default:
- utils.Info.Println(k, "is of an unknown type")
- }
- }
- return arrayIndex
-}
-
-func processDataLevel3(data map[string]interface{}, valArray []string, tsArray []string, arrayIndex int) int { // inside data, dp or []dp level
- for k, v := range data {
- switch vv := v.(type) {
- case []interface{}: // []dp
-// utils.Info.Println(vv, "is an array:, len=", strconv.Itoa(len(vv)))
- arrayIndex = processDataLevel4(vv, valArray, tsArray, arrayIndex)
- case map[string]interface{}:
-// utils.Info.Println(k, "is a map:")
- arrayIndex = processDataLevel5(vv, valArray, tsArray, arrayIndex)
- case string: // path
-// utils.Info.Println(k, "is string", vv)
- default:
- utils.Info.Println(k, "is of an unknown type")
- }
- }
- return arrayIndex
-}
-
-
-func processDataLevel4(dpArray []interface{}, valArray []string, tsArray []string, arrayIndex int) int { // []dp level
- for k, v := range dpArray {
- switch vv := v.(type) {
- case map[string]interface{}:
-// utils.Info.Println(k, "is a map:")
- arrayIndex = processDataLevel5(vv, valArray, tsArray, arrayIndex)
- default:
- utils.Info.Println(k, "is of an unknown type")
- }
- }
- return arrayIndex
-}
-
-func processDataLevel5(dp map[string]interface{}, valArray []string, tsArray []string, arrayIndex int) int { // inside dp level
- for k, v := range dp {
- switch vv := v.(type) {
- case string:
-// utils.Info.Println(k, "is string", vv)
- if k == "value" {
- valArray[arrayIndex] = vv
- } else if k == "ts" {
- tsArray[arrayIndex] = vv
- }
- default:
- utils.Info.Println(k, "is of an unknown type")
- }
- }
- return arrayIndex + 1
-}
-
-func saveInCsv(valArray []string, tsArray []string, arrayIndex int) {
- treeFp, err := os.OpenFile("data.csv", os.O_RDWR|os.O_CREATE, 0755)
- if (err != nil) {
- fmt.Printf("Could not open data.csv for writing.\n")
- return
- }
- for i := 0 ; i < arrayIndex ; i++ {
- treeFp.Write([]byte(tsArray[i]))
- treeFp.Write([]byte(", "))
- }
- treeFp.Write([]byte("\n"))
-
- for i := 0 ; i < arrayIndex ; i++ {
- treeFp.Write([]byte(valArray[i]))
- treeFp.Write([]byte(", "))
- }
- treeFp.Write([]byte("\n"))
-
- treeFp.Close()
-}
-
-func performPropCommand(commandNumber int, conn *websocket.Conn, optionChannel chan string) {
- compressedRequest := utils.CompressMessage([]byte(requestList.Request[commandNumber]))
- fmt.Printf("JSON request size= %d, Compressed request size=%d\n", len(requestList.Request[commandNumber]), len(compressedRequest))
- fmt.Printf("Compression= %d%\n", (100*len(requestList.Request[commandNumber])) / len(compressedRequest))
- compressedResponse := getResponse(conn, compressedRequest)
- jsonResponse := string(utils.DecompressMessage([]byte(compressedResponse)))
- fmt.Printf("Response: %s\n", jsonResponse)
- fmt.Printf("JSON response size= %d, Compressed response size=%d\n", len(jsonResponse), len(compressedResponse))
- fmt.Printf("Compression= %d%\n", (100*len(jsonResponse)) / len(compressedResponse))
- if (strings.Contains(requestList.Request[commandNumber], "subscribe") == true) {
- for {
- _, msg, err := conn.ReadMessage()
- if err != nil {
- fmt.Printf("Notification error: %s\n", err)
- return
- }
- jsonNotification := string(utils.DecompressMessage(msg))
- fmt.Printf("Notification: %s\n", jsonNotification)
- fmt.Printf("JSON notification size= %d, Compressed notification size=%d\n", len(jsonNotification), len(msg))
- fmt.Printf("Compression= %d%\n", (100*len(jsonNotification)) / len(msg))
- select {
- case <- optionChannel:
- // issue unsubscribe request
- subscriptionId := utils.ExtractSubscriptionId(jsonResponse)
- unsubReq := `{"action":"unsubscribe", "subscriptionId":"` + subscriptionId + `"}`
- compressedUnsubReq := utils.CompressMessage([]byte(unsubReq))
- getResponse(conn, compressedUnsubReq)
- return
- default:
- }
- }
- }
-}
-
-func performPbCommand(commandNumber int, conn *websocket.Conn, optionChannel chan string) {
- compressedRequest := utils.JsonToProtobuf(requestList.Request[commandNumber], convertToCompression(compression))
- fmt.Printf("JSON request size= %d, Protobuf request size=%d\n", len(requestList.Request[commandNumber]), len(compressedRequest))
- fmt.Printf("Compression= %d%\n", (100*len(requestList.Request[commandNumber])) / len(compressedRequest))
- compressedResponse := getResponse(conn, compressedRequest)
- jsonResponse := utils.ProtobufToJson(compressedResponse, convertToCompression(compression))
- fmt.Printf("Response: %s\n", jsonResponse)
- fmt.Printf("JSON response size= %d, Protobuf response size=%d\n", len(jsonResponse), len(compressedResponse))
- fmt.Printf("Compression= %d%\n", (100*len(jsonResponse)) / len(compressedResponse))
- if (strings.Contains(requestList.Request[commandNumber], "subscribe") == true) {
- for {
- _, msg, err := conn.ReadMessage()
- if err != nil {
- fmt.Printf("Notification error: %s\n", err)
- return
- }
- jsonNotification := utils.ProtobufToJson(msg, convertToCompression(compression))
- fmt.Printf("Notification: %s\n", jsonNotification)
- fmt.Printf("JSON notification size= %d, Protobuf notification size=%d\n", len(jsonNotification), len(msg))
- fmt.Printf("Compression= %d%\n", (100*len(jsonNotification)) / len(msg))
- select {
- case <- optionChannel:
- // issue unsubscribe request
- subscriptionId := utils.ExtractSubscriptionId(jsonResponse)
- unsubReq := `{"action":"unsubscribe", "subscriptionId":"` + subscriptionId + `"}`
- pbUnsubReq := utils.JsonToProtobuf(unsubReq, convertToCompression(compression))
- getResponse(conn, pbUnsubReq)
- return
- default:
- }
- }
- }
-}
-
-func convertToCompression(compression string) utils.Compression {
- switch compression {
- case "prop": return utils.PROPRIETARY
- case "pbl1": return utils.PB_LEVEL1
- case "pbl2": return utils.PB_LEVEL2
- }
- return utils.NONE
-}
-
-func displayOptions() {
- fmt.Printf("\n\nSelect one of the following numbers:\n")
- fmt.Printf("0: Exit program\n")
- for i := 0 ; i < len(requestList.Request) ; i++ {
- fmt.Printf("%d: %s\n", i+1, requestList.Request[i])
- }
- fmt.Printf("In the case of an ongoing subscription session, to unsubscribe please input the character 'q'.\n")
- fmt.Printf("\nOption number selected: ")
-}
-
-func readOption(conn *websocket.Conn, optionChannel chan string, unsubChannel chan string) {
- for {
- fmt.Scanf("%s", &commandNumber)
- if (commandNumber == "q") {
- unsubReq := <-unsubChannel
- fmt.Printf("Unsubscribe request: %s\n", unsubReq)
- getResponse(conn, []byte(unsubReq))
-
- }
- optionChannel <- commandNumber
- }
-}
-
-func main() {
- // Create new parser object
- parser := argparse.NewParser("print", "Prints provided string to stdout")
-
- // Create flags
- url_vissv2 := parser.String("v", "vissv2Url", &argparse.Options{Required: true, Help: "IP/url to VISSv2 server"})
- prot := parser.Selector("p", "protocol", []string{"http", "ws"}, &argparse.Options{Required: false,
- Help: "Protocol must be either http or websocket", Default:"ws"})
- comp := parser.Selector("c", "compression", []string{"none", "prop", "pbl1", "pbl2"}, &argparse.Options{Required: false,
- Help: "Compression must be either proprietary or protobuf level 1 or 2", Default:"none"})
- logFile := parser.Flag("", "logfile", &argparse.Options{Required: false, Help: "outputs to logfile in ./logs folder"})
- logLevel := parser.Selector("", "loglevel", []string{"trace", "debug", "info", "warn", "error", "fatal", "panic"}, &argparse.Options{
- Required: false,
- Help: "changes log output level",
- Default: "info"})
-
- // Parse input
- err := parser.Parse(os.Args)
- if err != nil {
- fmt.Print(parser.Usage(err))
- //exits due to required info not provided by user
- os.Exit(1)
- }
-
- //conversion since parsed flags are of *string type and not string
- vissv2Url = *url_vissv2
- protocol = *prot
- compression = *comp
-
- utils.InitLog("pb_client-log.txt", "./logs", *logFile, *logLevel)
-
- readTransportSecConfig()
- utils.Info.Printf("secConfig.TransportSec=%s", secConfig.TransportSec)
- if secConfig.TransportSec == "yes" {
- caCertPool = *prepareTransportSecConfig()
- }
-
- if createListFromFile("requests.json") == 0 {
- fmt.Printf("Failed in creating list from requests.json")
- os.Exit(1)
- }
-
- if (compression != "none" && utils.InitCompression("vsspathlist.json") != true) {
- fmt.Printf("Failed in creating list from vsspathlist.json")
- os.Exit(1)
- }
-
- conn := initVissV2WebSocket(compression)
-
- unsubChannel := make(chan string, 1)
- optionChannel := make(chan string)
- go readOption(conn, optionChannel, unsubChannel)
-
- for {
- displayOptions()
- select {
- case commandNumber = <- optionChannel:
- if (commandNumber == "0") {
- return
- }
- }
- cNo, err := strconv.Atoi(commandNumber)
- if (err != nil) {
- fmt.Printf("Selected option not supported\n")
- continue
- }
- performCommand(cNo-1, conn, optionChannel, unsubChannel)
- }
-}
diff --git a/client/client-1.0/csv_client/requests.json b/client/client-1.0/csv_client/requests.json
deleted file mode 100755
index 9314fb1f..00000000
--- a/client/client-1.0/csv_client/requests.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{"request":[{"action":"get","path":"Vehicle/Cabin/Door/Row1/Right/IsOpen","requestId":"232"},{"action":"get","path":"Vehicle.Acceleration.Longitudinal","requestId":"233"},
-{"action":"get","path":"Vehicle/ADAS","filter":{"type":"paths","parameter":["ABS/*","CruiseControl/Error"]},"requestId":"237"},
-{"action":"subscribe","path":"Vehicle/Cabin/Door/Row1/Right/IsOpen","filter":{"type":"timebased","parameter":{"period":"3"}},"requestId":"246"},
-{"action":"subscribe","path":"Vehicle.Speed","filter":{"type":"curvelog","parameter":{"maxerr":"2","bufsize":"20"}},"requestId":"275"},
-{"action":"subscribe","path":"Vehicle.Speed","filter":{"type":"curvelog","parameter":{"maxerr":"1","bufsize":"5"}},"requestId":"277"},
-{"action":"subscribe","path":"Vehicle","filter":[{"type":"paths","parameter":["CurrentLocation.Latitude", "CurrentLocation.Longitude"]}, {"type":"curvelog","parameter":{"maxerr":"0.00001","bufsize":"20"}}],"requestId":"285"}
-]}
diff --git a/client/client-1.0/csv_client/transportSec.go b/client/client-1.0/csv_client/transportSec.go
deleted file mode 100644
index 5c108a32..00000000
--- a/client/client-1.0/csv_client/transportSec.go
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
-* (C) 2021 Geotab Inc
-*
-* All files and artifacts in the repository at https://github.com/GENIVI/ccs-w3c-client
-* are licensed under the provisions of the license provided by the LICENSE file in this repository.
-*
-**/
-
-package main
-
-import (
- "encoding/json"
- "io/ioutil"
- "fmt"
- "os"
- "crypto/tls"
- "crypto/x509"
-)
-
-
-var trSecConfigPath string = "transport_sec/" // relative path to the directory containing the transportSec.json file
-type SecConfig struct {
- TransportSec string `json:"transportSec"`// "yes" or "no"
- HttpSecPort string `json:"httpSecPort"`// HTTPS port number
- WsSecPort string `json:"wsSecPort"`// WSS port number
- MqttSecPort string `json:"mqttSecPort"`// MQTTS port number
- AgtsSecPort string `json:"agtsSecPort"`// AGTS port number
- AtsSecPort string `json:"atsSecPort"`// ATS port number
- CaSecPath string `json:"caSecPath"`// relative path from the directory containing the transportSec.json file
- ServerSecPath string `json:"serverSecPath"`// relative path from the directory containing the transportSec.json file
- ServerCertOpt string `json:"serverCertOpt"`// one of "NoClientCert"/"ClientCertNoVerification"/"ClientCertVerification"
- ClientSecPath string `json:"clientSecPath"`// relative path from the directory containing the transportSec.json file
-}
-var secConfig SecConfig
-
-func readTransportSecConfig() {
- data, err := ioutil.ReadFile(trSecConfigPath + "transportSec.json")
- if err != nil {
- fmt.Printf("ReadTransportSecConfig():%stransportSec.json error=%s", trSecConfigPath, err)
- secConfig.TransportSec = "no"
- return
- }
- err = json.Unmarshal(data, &secConfig)
- if err != nil {
- fmt.Printf("ReadTransportSecConfig():Error unmarshal transportSec.json=%s", err)
- secConfig.TransportSec = "no"
- return
- }
- fmt.Printf("ReadTransportSecConfig():secConfig.TransportSec=%s", secConfig.TransportSec)
-}
-
-func prepareTransportSecConfig() *x509.CertPool{
- var err error
- clientCertFile := trSecConfigPath + secConfig.ClientSecPath + "client.crt"
- clientKeyFile := trSecConfigPath + secConfig.ClientSecPath + "client.key"
-
- clientCert, err = tls.LoadX509KeyPair(clientCertFile, clientKeyFile)
- if err != nil {
- fmt.Printf("Error creating x509 keypair from client cert file %s and client key file %s\n", clientCertFile, clientKeyFile)
- os.Exit(1)
- }
- caCert, err := ioutil.ReadFile(trSecConfigPath + secConfig.CaSecPath + "Root.CA.crt")
- if err != nil {
- fmt.Printf("Error opening cert file %s, Error: %s", trSecConfigPath + secConfig.CaSecPath + "Root.CA.crt", err)
- os.Exit(1)
- }
- caCertPool := x509.NewCertPool()
- caCertPool.AppendCertsFromPEM(caCert)
- return caCertPool
-}
-
diff --git a/client/client-1.0/csv_client/transport_sec/README.md b/client/client-1.0/csv_client/transport_sec/README.md
deleted file mode 100644
index cb8d8cbd..00000000
--- a/client/client-1.0/csv_client/transport_sec/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-The client can be configured to use the secure HTTPS and WSS transport protocols in its communication with the VISSv2 server.
-This is achieved by setting the "transportSec" parameter to "yes" in the transportSec.json file,
-and copying the CA cert and client cert and key from your local repo of https://github.com/MEAE-GOT/W3C_VehicleSignalInterfaceImpl,
-where they are supposedly previously generated.
-This shall be copied into directories named transport_sec/ca, and transport_sec/client, respectively,
-if the existing path parameters in the transportSec.json file are used. These can be updated to point to other directories.
-For more information about the credentials generation, see https://github.com/MEAE-GOT/W3C_VehicleSignalInterfaceImpl/testCredGen/README.md.
-
diff --git a/client/client-1.0/csv_client/transport_sec/ca/README.md b/client/client-1.0/csv_client/transport_sec/ca/README.md
deleted file mode 100644
index ff980942..00000000
--- a/client/client-1.0/csv_client/transport_sec/ca/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-The CA cert file is stored here, unless the path configured in transportSec.json is updated to point to a different directory.
-
diff --git a/client/client-1.0/csv_client/transport_sec/client/README.md b/client/client-1.0/csv_client/transport_sec/client/README.md
deleted file mode 100644
index 8a916ee7..00000000
--- a/client/client-1.0/csv_client/transport_sec/client/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-The client cert and key files are stored here, unless the path configured in transportSec.json is updated to point to a different directory.
-
diff --git a/client/client-1.0/csv_client/transport_sec/transportSec.json b/client/client-1.0/csv_client/transport_sec/transportSec.json
deleted file mode 100644
index 05c8c26e..00000000
--- a/client/client-1.0/csv_client/transport_sec/transportSec.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "transportSec": "no",
- "wsSecPort": "6443",
- "caSecPath": "ca/",
- "serverSecPath": "",
- "serverCertOpt": "ClientCertVerification",
- "clientSecPath": "client/"
-}
diff --git a/client/client-1.0/grpc_client/README.md b/client/client-1.0/grpc_client/README.md
deleted file mode 100644
index 5359833e..00000000
--- a/client/client-1.0/grpc_client/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-**(C) 2023 Ford Motor Company**
-
-# gRPC client
-
-To build:
-
-$ go build
-
-To run:
-
-./grpc_client
-
-The gRPC client UI provides a choice of four different request that can be issued:
-
-```
-{"action":"get","path":"Vehicle/Cabin/Door/Row1/Right/IsOpen","requestId":"232"}
-{"action":"subscribe","path":"Vehicle/Cabin/Door/Row1/Right/IsOpen","filter":{"type":"timebased","parameter":{"period":"3000"}},"requestId":"246"}
-{"action":"unsubscribe","subscriptionId":"1","requestId":"240"}
-{"action":"set", "path":"Vehicle/Cabin/Door/Row1/Right/IsOpen", "value":"999", "requestId":"245"}
-```
-
-These can be issued multiple times, but there is a limitation in that the unsubscribe has a static subscriptionID that only applies to the first started subscription.
diff --git a/client/client-1.0/grpc_client/grpc_client.go b/client/client-1.0/grpc_client/grpc_client.go
deleted file mode 100644
index 933356ce..00000000
--- a/client/client-1.0/grpc_client/grpc_client.go
+++ /dev/null
@@ -1,155 +0,0 @@
-/**
-* (C) 2023 Ford Motor Company
-*
-* All files and artifacts in the repository at https://github.com/w3c/automotive-viss2
-* are licensed under the provisions of the license provided by the LICENSE file in this repository.
-*
-**/
-package main
-
-import (
- "fmt"
- "context"
- "time"
- "os"
- "crypto/tls"
- "crypto/x509"
- "google.golang.org/grpc/credentials"
- "github.com/akamensky/argparse"
- utils "github.com/w3c/automotive-viss2/utils"
- pb "github.com/w3c/automotive-viss2/grpc_pb"
- "google.golang.org/grpc"
-)
-
-var clientCert tls.Certificate
-var caCertPool x509.CertPool
-
-const (
- address = "localhost:"
- name = "VISSv2-gRPC-client"
-)
-
-var grpcCompression utils.Compression
-
-var commandList []string
-
-func initCommandList() {
- commandList = make([]string, 4)
- commandList[0] = `{"action":"get","path":"Vehicle/Cabin/Door/Row1/Right/IsOpen","requestId":"232"}`
- commandList[1] = `{"action":"subscribe","path":"Vehicle/Cabin/Door/Row1/Right/IsOpen","filter":{"type":"timebased","parameter":{"period":"3000"}},"requestId":"246"}`
- commandList[2] = `{"action":"unsubscribe","subscriptionId":"1","requestId":"240"}`
- commandList[3] = `{"action":"set", "path":"Vehicle/Cabin/Door/Row1/Right/IsOpen", "value":"999", "requestId":"245"}`
-}
-
-func noStreamCall(commandIndex int) {
- var conn *grpc.ClientConn
- var err error
- if secConfig.TransportSec == "yes" {
- config := &tls.Config {
- Certificates: []tls.Certificate{clientCert},
- RootCAs: &caCertPool,
- }
- tlsCredentials := credentials.NewTLS(config)
- portNo := secConfig.GrpcSecPort
- conn, err = grpc.Dial(address + portNo, grpc.WithTransportCredentials(tlsCredentials), grpc.WithBlock())
- } else {
- conn, err = grpc.Dial(address + "5000", grpc.WithInsecure(), grpc.WithBlock())
- }
- if err != nil {
- fmt.Printf("did not connect: %v", err)
- return
- }
- defer conn.Close()
- client := pb.NewVISSv2Client(conn)
-
- ctx, cancel := context.WithTimeout(context.Background(), time.Second)
- defer cancel()
- vssRequest := commandList[commandIndex]
- var vssResponse string
- if commandIndex == 0 {
- pbRequest := utils.GetRequestJsonToPb(vssRequest, grpcCompression)
- pbResponse, _ := client.GetRequest(ctx, pbRequest)
- vssResponse = utils.GetResponsePbToJson(pbResponse, grpcCompression)
- } else if commandIndex == 2 {
- pbRequest := utils.UnsubscribeRequestJsonToPb(vssRequest, grpcCompression)
- pbResponse, _ := client.UnsubscribeRequest(ctx, pbRequest)
- vssResponse = utils.UnsubscribeResponsePbToJson(pbResponse, grpcCompression)
- } else {
- pbRequest := utils.SetRequestJsonToPb(vssRequest, grpcCompression)
- pbResponse, _ := client.SetRequest(ctx, pbRequest)
- vssResponse = utils.SetResponsePbToJson(pbResponse, grpcCompression)
- }
- if err != nil {
- fmt.Printf("Error when issuing request=:%s", vssRequest)
- } else {
- fmt.Printf("Received response:%s", vssResponse)
- }
-}
-
-func streamCall(commandIndex int) {
- conn, err := grpc.Dial(address, grpc.WithInsecure(), grpc.WithBlock())
- if err != nil {
- fmt.Printf("did not connect: %v", err)
- return
- }
- defer conn.Close()
- client := pb.NewVISSv2Client(conn)
-
- ctx, cancel := context.WithCancel(context.Background())
- defer cancel()
- vssRequest := commandList[commandIndex]
- pbRequest := utils.SubscribeRequestJsonToPb(vssRequest, grpcCompression)
- stream, err := client.SubscribeRequest(ctx, pbRequest)
- for {
- pbResponse, err := stream.Recv()
- vssResponse := utils.SubscribeStreamPbToJson(pbResponse, grpcCompression)
- if err != nil {
- fmt.Printf("Error=%v when issuing request=:%s", err, vssRequest)
- } else {
- fmt.Printf("Received response:%s\n", vssResponse)
- }
- }
-}
-
-func main() {
- // Create new parser object
- parser := argparse.NewParser("print", "gRPC client")
- // Create string flag
- logFile := parser.Flag("", "logfile", &argparse.Options{Required: false, Help: "outputs to logfile in ./logs folder"})
- logLevel := parser.Selector("", "loglevel", []string{"trace", "debug", "info", "warn", "error", "fatal", "panic"}, &argparse.Options{
- Required: false,
- Help: "changes log output level",
- Default: "info"})
-
- // Parse input
- err := parser.Parse(os.Args)
- if err != nil {
- fmt.Print(parser.Usage(err))
- }
-
- utils.InitLog("grpc_client-log.txt", "./logs", *logFile, *logLevel)
- grpcCompression = utils.PB_LEVEL1
- readTransportSecConfig()
- utils.Info.Printf("secConfig.TransportSec=%s", secConfig.TransportSec)
- if secConfig.TransportSec == "yes" {
- caCertPool = *prepareTransportSecConfig()
- }
- initCommandList()
-
- fmt.Printf("Command indicies: 0=GET, 1=SUBSCRIBE, 2=UNSUBSCRIBE, 3=SET, any other value terminates.\n")
- var commandIndex int
- for {
- fmt.Printf("\nCommand index [0-3]:")
- fmt.Scanf("%d", &commandIndex)
- if (commandIndex < 0 || commandIndex > 3) {
- break
- }
- fmt.Printf("Command:%s", commandList[commandIndex])
- if (commandIndex == 1) { // subscribe
- go streamCall(commandIndex)
- } else {
- go noStreamCall(commandIndex)
- }
- time.Sleep(1 * time.Second)
- }
-}
diff --git a/client/client-1.0/grpc_client/transportSec.go b/client/client-1.0/grpc_client/transportSec.go
deleted file mode 100644
index e51acd44..00000000
--- a/client/client-1.0/grpc_client/transportSec.go
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
-* (C) 2021 Geotab Inc
-*
-* All files and artifacts in the repository at https://github.com/GENIVI/ccs-w3c-client
-* are licensed under the provisions of the license provided by the LICENSE file in this repository.
-*
-**/
-
-package main
-
-import (
- "encoding/json"
- "io/ioutil"
- "fmt"
- "os"
- "crypto/tls"
- "crypto/x509"
-)
-
-
-var trSecConfigPath string = "transport_sec/" // relative path to the directory containing the transportSec.json file
-type SecConfig struct {
- TransportSec string `json:"transportSec"`// "yes" or "no"
- HttpSecPort string `json:"httpSecPort"`// HTTPS port number
- WsSecPort string `json:"wsSecPort"`// WSS port number
- MqttSecPort string `json:"mqttSecPort"`// MQTTS port number
- GrpcSecPort string `json:"grpcSecPort"` // gRPC port number
- AgtsSecPort string `json:"agtsSecPort"`// AGTS port number
- AtsSecPort string `json:"atsSecPort"`// ATS port number
- CaSecPath string `json:"caSecPath"`// relative path from the directory containing the transportSec.json file
- ServerSecPath string `json:"serverSecPath"`// relative path from the directory containing the transportSec.json file
- ServerCertOpt string `json:"serverCertOpt"`// one of "NoClientCert"/"ClientCertNoVerification"/"ClientCertVerification"
- ClientSecPath string `json:"clientSecPath"`// relative path from the directory containing the transportSec.json file
-}
-var secConfig SecConfig
-
-func readTransportSecConfig() {
- data, err := ioutil.ReadFile(trSecConfigPath + "transportSec.json")
- if err != nil {
- fmt.Printf("ReadTransportSecConfig():%stransportSec.json error=%s", trSecConfigPath, err)
- secConfig.TransportSec = "no"
- return
- }
- err = json.Unmarshal(data, &secConfig)
- if err != nil {
- fmt.Printf("ReadTransportSecConfig():Error unmarshal transportSec.json=%s", err)
- secConfig.TransportSec = "no"
- return
- }
- fmt.Printf("ReadTransportSecConfig():secConfig.TransportSec=%s", secConfig.TransportSec)
-}
-
-func prepareTransportSecConfig() *x509.CertPool{
- var err error
- clientCertFile := trSecConfigPath + secConfig.ClientSecPath + "client.crt"
- clientKeyFile := trSecConfigPath + secConfig.ClientSecPath + "client.key"
-
- clientCert, err = tls.LoadX509KeyPair(clientCertFile, clientKeyFile)
- if err != nil {
- fmt.Printf("Error creating x509 keypair from client cert file %s and client key file %s\n", clientCertFile, clientKeyFile)
- os.Exit(1)
- }
- caCert, err := ioutil.ReadFile(trSecConfigPath + secConfig.CaSecPath + "Root.CA.crt")
- if err != nil {
- fmt.Printf("Error opening cert file %s, Error: %s", trSecConfigPath + secConfig.CaSecPath + "Root.CA.crt", err)
- os.Exit(1)
- }
- caCertPool := x509.NewCertPool()
- caCertPool.AppendCertsFromPEM(caCert)
- return caCertPool
-}
-
diff --git a/client/client-1.0/grpc_client/transport_sec/README.md b/client/client-1.0/grpc_client/transport_sec/README.md
deleted file mode 100644
index 2ae6440e..00000000
--- a/client/client-1.0/grpc_client/transport_sec/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-The client can be configured to use the secure HTTPS, WSS or gRPC transport protocols in its communication with the VISSv2 server.
-This is achieved by setting the "transportSec" parameter to "yes" in the transportSec.json file,
-and copying the CA cert and client cert and key from your local repo of https://github.com/MEAE-GOT/W3C_VehicleSignalInterfaceImpl,
-where they are supposedly previously generated.
-This shall be copied into directories named transport_sec/ca, and transport_sec/client, respectively,
-if the existing path parameters in the transportSec.json file are used. These can be updated to point to other directories.
-For more information about the credentials generation, see https://github.com/MEAE-GOT/W3C_VehicleSignalInterfaceImpl/testCredGen/README.md.
-
diff --git a/client/client-1.0/grpc_client/transport_sec/ca/README.md b/client/client-1.0/grpc_client/transport_sec/ca/README.md
deleted file mode 100644
index ff980942..00000000
--- a/client/client-1.0/grpc_client/transport_sec/ca/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-The CA cert file is stored here, unless the path configured in transportSec.json is updated to point to a different directory.
-
diff --git a/client/client-1.0/grpc_client/transport_sec/client/README.md b/client/client-1.0/grpc_client/transport_sec/client/README.md
deleted file mode 100644
index 8a916ee7..00000000
--- a/client/client-1.0/grpc_client/transport_sec/client/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-The client cert and key files are stored here, unless the path configured in transportSec.json is updated to point to a different directory.
-
diff --git a/client/client-1.0/grpc_client/transport_sec/client/client.ext b/client/client-1.0/grpc_client/transport_sec/client/client.ext
deleted file mode 100644
index 9e348e31..00000000
--- a/client/client-1.0/grpc_client/transport_sec/client/client.ext
+++ /dev/null
@@ -1,8 +0,0 @@
-authorityKeyIdentifier=keyid,issuer
-basicConstraints=CA:FALSE
-keyUsage = digitalSignature, nonRepudiation, keyEncipherment, dataEncipherment
-subjectAltName = @alt_names
-
-[alt_names]
-DNS.1 = localhost
-
diff --git a/client/client-1.0/grpc_client/transport_sec/transportSec.json b/client/client-1.0/grpc_client/transport_sec/transportSec.json
deleted file mode 100644
index 1b83095e..00000000
--- a/client/client-1.0/grpc_client/transport_sec/transportSec.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "transportSec": "no",
- "grpcSecPort": "5443",
- "caSecPath": "ca/",
- "serverSecPath": "",
- "serverCertOpt": "ClientCertVerification",
- "clientSecPath": "client/"
-}
diff --git a/client/client-1.0/mqtt_client/README.md b/client/client-1.0/mqtt_client/README.md
deleted file mode 100644
index 829549d5..00000000
--- a/client/client-1.0/mqtt_client/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-**(C) 2021 Geotab Inc**
-
-# MQTT client
-
-The MQTT client is a rudimentary implementation to allow testing VISS v2 request/response communication over MQTT using the proposed application level protocol that is described in the server/mqtt_mgr directory.
-The MQTT client is started as shown below
-$ ./mqtt_mgr VIN
-where VIN is the VIN number associated to the VSS path "Vehicle.VehicleIdentification.VIN".
-This VIN should probably only be used in test cases like this, otherwise a "pseudo-VIN" is probably more appropriate from a privacy point of view.
-In the current implementation the VISSv2 server mqtt manager reads the VIN using the path above, and then issues a subcribe on the topic "VIN/Vehicle". This topic must be known by the MQTT client for the protocol to work.
-In the current server implementation a random dummy value is returned if the service manager at start up does not find a "statestorage.db" database, AND that this database has a value stored for the addressed path. So, to simplify testing with the MQTT client, it is recommended that a statestorage.db is created, with at least a value, plus corresponding timestamp, written into it. Then this value is what shall be used when starting as mentioned above.
-To create such a statestorage database, please clone the ccs-w3-client repo, and follow the instructions statestorage directory.
-
diff --git a/client/client-1.0/mqtt_client/mqtt_client.go b/client/client-1.0/mqtt_client/mqtt_client.go
deleted file mode 100644
index 498232bc..00000000
--- a/client/client-1.0/mqtt_client/mqtt_client.go
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
-* (C) 2021 Mitsubishi Electrics Automotive
-* (C) 2021 Geotab
-*
-* All files and artifacts in the repository at https://github.com/w3c/automotive-viss2
-* are licensed under the provisions of the license provided by the LICENSE file in this repository.
-*
-**/
-package main
-
-import (
- "fmt"
- "os"
- "time"
-
- "github.com/akamensky/argparse"
- MQTT "github.com/eclipse/paho.mqtt.golang"
- "github.com/w3c/automotive-viss2/utils"
-)
-
-var uniqueTopicName string
-
-func getBrokerSocket(isSecure bool) string {
- // FVTAddr := os.Getenv("MQTT_BROKER_ADDR")
- FVTAddr := "test.mosquitto.org" // does it work for testing?
- // FVTAddr := "mqtt.flespi.io"
- if FVTAddr == "" {
- FVTAddr = "127.0.0.1"
- }
- if isSecure == true {
- return "ssl://" + FVTAddr + ":8883"
- }
- return "tcp://" + FVTAddr + ":1883"
-}
-
-var publishHandler MQTT.MessageHandler = func(client MQTT.Client, msg MQTT.Message) {
- fmt.Printf("Topic=%s\n", msg.Topic())
- fmt.Printf("Payload=%s\n", string(msg.Payload()))
-}
-
-func mqttSubscribe(brokerSocket string, topic string) {
- fmt.Printf("mqttSubscribe:Topic=%s\n", topic)
- opts := MQTT.NewClientOptions().AddBroker(brokerSocket)
- opts.SetDefaultPublishHandler(publishHandler)
-
- c := MQTT.NewClient(opts)
- if token := c.Connect(); token.Wait() && token.Error() != nil {
- panic(token.Error())
- }
- if token := c.Subscribe(topic, 0, nil); token.Wait() && token.Error() != nil {
- utils.Error.Println(token.Error())
- os.Exit(1)
- }
-}
-
-func publishMessage(brokerSocket string, topic string, payload string) {
- fmt.Printf("publishMessage:Topic=%s, Payload=%s\n", topic, payload)
- opts := MQTT.NewClientOptions().AddBroker(brokerSocket)
-
- c := MQTT.NewClient(opts)
- if token := c.Connect(); token.Wait() && token.Error() != nil {
- utils.Error.Println(token.Error())
- os.Exit(1)
- }
- token := c.Publish(topic, 0, false, payload)
- token.Wait()
- c.Disconnect(250)
-}
-
-func subscribeVissV2Response(brokerSocket string) {
- mqttSubscribe(brokerSocket, uniqueTopicName)
-}
-
-func publishVissV2Request(brokerSocket string, vin string, request string) {
- payload := `{"topic":"` + uniqueTopicName + `", "request":` + request + `}`
- publishMessage(brokerSocket, "/"+vin+"/Vehicle", payload)
-}
-
-func main() {
- parser := argparse.NewParser("print", "mqtt client")
- // Create string flag
- logFile := parser.Flag("", "logfile", &argparse.Options{Required: false, Help: "outputs to logfile in ./logs folder"})
- logLevel := parser.Selector("", "loglevel", []string{"trace", "debug", "info", "warn", "error", "fatal", "panic"}, &argparse.Options{
- Required: false,
- Help: "changes log output level",
- Default: "info"})
- vin := parser.String("", "vin", &argparse.Options{
- Required: true,
- Help: "VIN Number",
- Default: "ULFB0"})
- // Parse input
- err := parser.Parse(os.Args)
- if err != nil {
- fmt.Print(parser.Usage(err))
- }
-
- //utils.TransportErrorMessage = "MQTT client-finalizeResponse: JSON encode failed.\n"
- utils.InitLog("mqtt-client-log.txt", "./logs", *logFile, *logLevel)
-
- brokerSocket := getBrokerSocket(false)
-
- var request string
- i := 0
- continueLoop := true
- fmt.Printf("\nSet unique topic name:")
- fmt.Scanf("%s", &uniqueTopicName)
- subscribeVissV2Response(brokerSocket)
- for continueLoop {
- fmt.Printf("\nVISSv2-request (or q to quit):")
- fmt.Scanf("%s", &request)
- switch request[0] {
- case 'q':
- continueLoop = false
- default:
- publishVissV2Request(brokerSocket, *vin, request)
- }
- i++
- if i == 25 {
- fmt.Printf("Max number of requests reached. Goodbye.\n")
- continueLoop = false
- }
- time.Sleep(2 * time.Second)
- }
-}
diff --git a/client/client-1.0/requests.json b/client/client-1.0/requests.json
deleted file mode 100755
index 7c132104..00000000
--- a/client/client-1.0/requests.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"request":[{"action":"get","path":"Vehicle/Cabin/Door/Row1/Right/IsOpen","requestId":"232"},
-{"action":"get","path":"Incorrect/Path","requestId":"1957"},
-{"action":"get","path":"Vehicle.Acceleration.Longitudinal","requestId":"233"},
-{"action":"get","path":"Vehicle/ADAS","filter":{"type":"paths","parameter":["ABS/*","CruiseControl/Error"]},"requestId":"237"},
-{"action":"set", "path":"Vehicle/Cabin/Door/Row1/Right/IsOpen", "value":"999", "requestId":"245"},
-{"action":"subscribe","path":"Vehicle/Cabin/Door/Row1/Right/IsOpen","filter":{"type":"timebased","parameter":{"period":"3"}},"requestId":"246"}]}
diff --git a/client/client-1.0/simple_client.go b/client/client-1.0/simple_client.go
deleted file mode 100644
index 6cc421c0..00000000
--- a/client/client-1.0/simple_client.go
+++ /dev/null
@@ -1,259 +0,0 @@
-/**
-* (C) 2023 Ford Motor Company
-* (C) 2022 Geotab Inc
-*
-* All files and artifacts in the repository at https://github.com/w3c/automotive-viss2
-* are licensed under the provisions of the license provided by the LICENSE file in this repository.
-*
-**/
-
-package main
-
-import (
- "crypto/tls"
- "crypto/x509"
- "encoding/json"
- "flag"
- "io/ioutil"
-// "net/http"
- "net/url"
- "os"
- "strconv"
- "strings"
-
- "fmt"
- "time"
-
- "github.com/akamensky/argparse"
- "github.com/gorilla/websocket"
- "github.com/w3c/automotive-viss2/utils"
-)
-
-var commandNumber string
-
-var clientCert tls.Certificate
-var caCertPool x509.CertPool
-
-var vissv2Url string
-var protocol string
-
-type RequestList struct {
- Request []string
-}
-
-var requestList RequestList
-
-func pathToUrl(path string) string {
- var url string = strings.Replace(path, ".", "/", -1)
- return "/" + url
-}
-
-func jsonToStructList(jsonList string) int {
- var reqList map[string]interface{}
- err := json.Unmarshal([]byte(jsonList), &reqList)
- if err != nil {
- utils.Error.Printf("jsonToStructList:error jsonList=%s", jsonList)
- return 0
- }
- switch vv := reqList["request"].(type) {
- case []interface{}:
-// utils.Info.Println(jsonList, "is an array:, len=",strconv.Itoa(len(vv)))
- requestList.Request = make([]string, len(vv))
- for i := 0 ; i < len(vv) ; i++ {
- requestList.Request[i] = retrieveRequest(vv[i].(map[string]interface{}))
- }
- case map[string]interface{}:
-// utils.Info.Println(jsonList, "is a map:")
- requestList.Request = make([]string, 1)
- requestList.Request[0] = retrieveRequest(vv)
- default:
-// utils.Info.Println(vv, "is of an unknown type")
- }
- return len(requestList.Request)
-}
-
-func retrieveRequest(jsonRequest map[string]interface{}) string {
- request, err := json.Marshal(jsonRequest)
- if err != nil {
- utils.Error.Print("retrieveRequest(): JSON array encode failed. ", err)
- return ""
- }
- return string(request)
-}
-
-func createListFromFile(fname string) int {
- data, err := ioutil.ReadFile(fname)
- if err != nil {
- fmt.Printf("Error reading file=%s", fname)
- return 0
- }
- return jsonToStructList(string(data))
-}
-
-func initVissV2WebSocket() *websocket.Conn {
- scheme := "ws"
- portNum := "8080"
- if secConfig.TransportSec == "yes" {
- scheme = "wss"
- portNum = secConfig.WsSecPort
- websocket.DefaultDialer.TLSClientConfig = &tls.Config{
- Certificates: []tls.Certificate{clientCert},
- RootCAs: &caCertPool,
- }
- }
- var addr = flag.String("addr", vissv2Url+":"+portNum, "http service address")
- dataSessionUrl := url.URL{Scheme: scheme, Host: *addr, Path: ""}
- subProtocol := make([]string, 1)
- subProtocol[0] = "VISSv2"
- dialer := websocket.Dialer{
- HandshakeTimeout: time.Second,
- ReadBufferSize: 1024,
- WriteBufferSize: 1024,
- Subprotocols: subProtocol,
- }
- conn, _, err := dialer.Dial(dataSessionUrl.String(), nil)
- if err != nil {
- fmt.Printf("Data session dial error:%s\n", err)
- os.Exit(1)
- }
- return conn
-}
-
-func getResponse(conn *websocket.Conn, request []byte) (string, int) {
- start := time.Now()
- err := conn.WriteMessage(websocket.BinaryMessage, request)
- if err != nil {
- fmt.Printf("Request error:%s\n", err)
- return "", 0
- }
- _, msg, err := conn.ReadMessage()
- stop := time.Now()
- elapsed := stop.Sub(start)
- roundtripTime := int(elapsed/1000) // nsec -> usec
- if err != nil {
- fmt.Printf("Response error: %s\n", err)
- return "", 0
- }
- return string(msg), roundtripTime
-}
-
-func performCommand(commandNumber int, conn *websocket.Conn, optionChannel chan string) int {
- if (commandNumber > len(requestList.Request)) {
- fmt.Printf("Termination due to invalid command.\n")
- os.Exit(1)
- }
- fmt.Printf("Request: %s\n", requestList.Request[commandNumber])
- request := []byte(requestList.Request[commandNumber])
- jsonResponse, roundtripTime := getResponse(conn, request)
- fmt.Printf("Response: %s\n", jsonResponse)
- if (strings.Contains(requestList.Request[commandNumber], "subscribe") == true) {
- for {
- _, msg, err := conn.ReadMessage()
- if err != nil {
- fmt.Printf("Notification error: %s\n", err)
- return 0
- }
- jsonNotification := string(msg)
- fmt.Printf("Notification: %s\n", jsonNotification)
- select {
- case <- optionChannel:
- // issue unsubscribe request
- subscriptionId := utils.ExtractSubscriptionId(jsonResponse)
- unsubReq := `{"action":"unsubscribe", "subscriptionId":"` + subscriptionId + `"}`
- _, roundtripTime = getResponse(conn, []byte(unsubReq))
- return roundtripTime
- default:
- }
- }
- }
- return roundtripTime
-}
-
-func displayOptions() {
- fmt.Printf("\n\nSelect one of the following numbers:\n")
- fmt.Printf("0: Exit program\n")
- for i := 0 ; i < len(requestList.Request) ; i++ {
- fmt.Printf("%d: %s\n", i+1, requestList.Request[i])
- }
- fmt.Printf("In the case of an ongoing subscription session, a RETURN key input will lead to unsubscribe.\n")
- fmt.Printf("\nOption number selected: ")
-}
-
-func readOption(optionChannel chan string) {
- for {
- fmt.Scanf("%s", &commandNumber)
- optionChannel <- commandNumber
- }
-}
-
-func main() {
- // Create new parser object
- parser := argparse.NewParser("print", "Prints provided string to stdout")
-
- // Create flags
- url_vissv2 := parser.String("v", "vissv2Url", &argparse.Options{Required: true, Help: "IP/url to VISSv2 server"})
- prot := parser.Selector("p", "protocol", []string{"http", "ws"}, &argparse.Options{Required: false,
- Help: "Protocol must be either http or websocket", Default:"ws"})
- logFile := parser.Flag("", "logfile", &argparse.Options{Required: false, Help: "outputs to logfile in ./logs folder"})
- logLevel := parser.Selector("", "loglevel", []string{"trace", "debug", "info", "warn", "error", "fatal", "panic"}, &argparse.Options{
- Required: false,
- Help: "changes log output level",
- Default: "info"})
-
- // Parse input
- err := parser.Parse(os.Args)
- if err != nil {
- fmt.Print(parser.Usage(err))
- //exits due to required info not provided by user
- os.Exit(1)
- }
-
- //conversion since parsed flags are of *string type and not string
- vissv2Url = *url_vissv2
- protocol = *prot
-
- utils.InitLog("pb_client-log.txt", "./logs", *logFile, *logLevel)
-
- readTransportSecConfig()
- utils.Info.Printf("secConfig.TransportSec=%s", secConfig.TransportSec)
- if secConfig.TransportSec == "yes" {
- caCertPool = *prepareTransportSecConfig()
- }
-
- if createListFromFile("requests.json") == 0 {
- fmt.Printf("Failed in creating list from requests.json")
- os.Exit(1)
- }
-
-/* if (utils.InitCompression("vsspathlist.json") != true) {
- fmt.Printf("Failed in creating list from vsspathlist.json")
- os.Exit(1)
- }*/
-
- conn := initVissV2WebSocket()
-
- optionChannel := make(chan string)
- go readOption(optionChannel)
-
- iterations := 0
- sumRT := 0
- for {
- displayOptions()
- select {
- case commandNumber = <- optionChannel:
- if (commandNumber == "0") {
- return
- }
- }
- cNo, err := strconv.Atoi(commandNumber)
- if (err != nil) {
- fmt.Printf("Selected option not supported\n")
- continue
- }
- roundtripTime := performCommand(cNo-1, conn, optionChannel)
- sumRT += roundtripTime
- iterations++
- fmt.Printf("Request-response roundtrip time=%d usec\n", roundtripTime)
- fmt.Printf("Average roundtrip time=%d usec, %d iterations\n", sumRT/iterations, iterations)
- }
-}
diff --git a/client/client-1.0/transportSec.go b/client/client-1.0/transportSec.go
deleted file mode 100644
index 5c108a32..00000000
--- a/client/client-1.0/transportSec.go
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
-* (C) 2021 Geotab Inc
-*
-* All files and artifacts in the repository at https://github.com/GENIVI/ccs-w3c-client
-* are licensed under the provisions of the license provided by the LICENSE file in this repository.
-*
-**/
-
-package main
-
-import (
- "encoding/json"
- "io/ioutil"
- "fmt"
- "os"
- "crypto/tls"
- "crypto/x509"
-)
-
-
-var trSecConfigPath string = "transport_sec/" // relative path to the directory containing the transportSec.json file
-type SecConfig struct {
- TransportSec string `json:"transportSec"`// "yes" or "no"
- HttpSecPort string `json:"httpSecPort"`// HTTPS port number
- WsSecPort string `json:"wsSecPort"`// WSS port number
- MqttSecPort string `json:"mqttSecPort"`// MQTTS port number
- AgtsSecPort string `json:"agtsSecPort"`// AGTS port number
- AtsSecPort string `json:"atsSecPort"`// ATS port number
- CaSecPath string `json:"caSecPath"`// relative path from the directory containing the transportSec.json file
- ServerSecPath string `json:"serverSecPath"`// relative path from the directory containing the transportSec.json file
- ServerCertOpt string `json:"serverCertOpt"`// one of "NoClientCert"/"ClientCertNoVerification"/"ClientCertVerification"
- ClientSecPath string `json:"clientSecPath"`// relative path from the directory containing the transportSec.json file
-}
-var secConfig SecConfig
-
-func readTransportSecConfig() {
- data, err := ioutil.ReadFile(trSecConfigPath + "transportSec.json")
- if err != nil {
- fmt.Printf("ReadTransportSecConfig():%stransportSec.json error=%s", trSecConfigPath, err)
- secConfig.TransportSec = "no"
- return
- }
- err = json.Unmarshal(data, &secConfig)
- if err != nil {
- fmt.Printf("ReadTransportSecConfig():Error unmarshal transportSec.json=%s", err)
- secConfig.TransportSec = "no"
- return
- }
- fmt.Printf("ReadTransportSecConfig():secConfig.TransportSec=%s", secConfig.TransportSec)
-}
-
-func prepareTransportSecConfig() *x509.CertPool{
- var err error
- clientCertFile := trSecConfigPath + secConfig.ClientSecPath + "client.crt"
- clientKeyFile := trSecConfigPath + secConfig.ClientSecPath + "client.key"
-
- clientCert, err = tls.LoadX509KeyPair(clientCertFile, clientKeyFile)
- if err != nil {
- fmt.Printf("Error creating x509 keypair from client cert file %s and client key file %s\n", clientCertFile, clientKeyFile)
- os.Exit(1)
- }
- caCert, err := ioutil.ReadFile(trSecConfigPath + secConfig.CaSecPath + "Root.CA.crt")
- if err != nil {
- fmt.Printf("Error opening cert file %s, Error: %s", trSecConfigPath + secConfig.CaSecPath + "Root.CA.crt", err)
- os.Exit(1)
- }
- caCertPool := x509.NewCertPool()
- caCertPool.AppendCertsFromPEM(caCert)
- return caCertPool
-}
-
diff --git a/client/client-1.0/transport_sec/README.md b/client/client-1.0/transport_sec/README.md
deleted file mode 100644
index cb8d8cbd..00000000
--- a/client/client-1.0/transport_sec/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-The client can be configured to use the secure HTTPS and WSS transport protocols in its communication with the VISSv2 server.
-This is achieved by setting the "transportSec" parameter to "yes" in the transportSec.json file,
-and copying the CA cert and client cert and key from your local repo of https://github.com/MEAE-GOT/W3C_VehicleSignalInterfaceImpl,
-where they are supposedly previously generated.
-This shall be copied into directories named transport_sec/ca, and transport_sec/client, respectively,
-if the existing path parameters in the transportSec.json file are used. These can be updated to point to other directories.
-For more information about the credentials generation, see https://github.com/MEAE-GOT/W3C_VehicleSignalInterfaceImpl/testCredGen/README.md.
-
diff --git a/client/client-1.0/transport_sec/ca/README.md b/client/client-1.0/transport_sec/ca/README.md
deleted file mode 100644
index ff980942..00000000
--- a/client/client-1.0/transport_sec/ca/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-The CA cert file is stored here, unless the path configured in transportSec.json is updated to point to a different directory.
-
diff --git a/client/client-1.0/transport_sec/client/README.md b/client/client-1.0/transport_sec/client/README.md
deleted file mode 100644
index 8a916ee7..00000000
--- a/client/client-1.0/transport_sec/client/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-The client cert and key files are stored here, unless the path configured in transportSec.json is updated to point to a different directory.
-
diff --git a/client/client-1.0/transport_sec/transportSec.json b/client/client-1.0/transport_sec/transportSec.json
deleted file mode 100644
index 1951d4be..00000000
--- a/client/client-1.0/transport_sec/transportSec.json
+++ /dev/null
@@ -1,3 +0,0 @@
-
-{"transportSec" : "no", "wsSecPort": "6443", "caSecPath": "ca/", "serverSecPath": "", "serverCertOpt": "ClientCertVerification", "clientSecPath": "client/"}
-
diff --git a/client/index.html b/client/index.html
new file mode 100644
index 00000000..6005d0a6
--- /dev/null
+++ b/client/index.html
@@ -0,0 +1,570 @@
+
+
+
+
+
+
+
+
+
+
+
+ VISSv2 Clients :: W3C VISSv2 Reference Implementation
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
` elements.\n\nbody {\n margin: 0; // 1\n font-family: $font-family-base;\n font-size: $font-size-base;\n font-weight: $font-weight-base;\n line-height: $line-height-base;\n color: $body-color;\n text-align: left; // 3\n background-color: $body-bg; // 2\n}\n\n// Suppress the focus outline on elements that cannot be accessed via keyboard.\n// This prevents an unwanted focus outline from appearing around elements that\n// might still respond to pointer events.\n//\n// Credit: https://github.com/suitcss/base\n[tabindex=\"-1\"]:focus {\n outline: 0 !important;\n}\n\n\n// Content grouping\n//\n// 1. Add the correct box sizing in Firefox.\n// 2. Show the overflow in Edge and IE.\n\nhr {\n box-sizing: content-box; // 1\n height: 0; // 1\n overflow: visible; // 2\n}\n\n\n//\n// Typography\n//\n\n// Remove top margins from headings\n//\n// By default, `
`-`
` all receive top and bottom margins. We nuke the top\n// margin for easier control within type scales as it avoids margin collapsing.\n// stylelint-disable selector-list-comma-newline-after\nh1, h2, h3, h4, h5, h6 {\n margin-top: 0;\n margin-bottom: $headings-margin-bottom;\n}\n// stylelint-enable selector-list-comma-newline-after\n\n// Reset margins on paragraphs\n//\n// Similarly, the top margin on `
`s get reset. However, we also reset the\n// bottom margin to use `rem` units instead of `em`.\np {\n margin-top: 0;\n margin-bottom: $paragraph-margin-bottom;\n}\n\n// Abbreviations\n//\n// 1. Remove the bottom border in Firefox 39-.\n// 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.\n// 3. Add explicit cursor to indicate changed behavior.\n// 4. Duplicate behavior to the data-* attribute for our tooltip plugin\n\nabbr[title],\nabbr[data-original-title] { // 4\n text-decoration: underline; // 2\n text-decoration: underline dotted; // 2\n cursor: help; // 3\n border-bottom: 0; // 1\n}\n\naddress {\n margin-bottom: 1rem;\n font-style: normal;\n line-height: inherit;\n}\n\nol,\nul,\ndl {\n margin-top: 0;\n margin-bottom: 1rem;\n}\n\nol ol,\nul ul,\nol ul,\nul ol {\n margin-bottom: 0;\n}\n\ndt {\n font-weight: $dt-font-weight;\n}\n\ndd {\n margin-bottom: .5rem;\n margin-left: 0; // Undo browser default\n}\n\nblockquote {\n margin: 0 0 1rem;\n}\n\ndfn {\n font-style: italic; // Add the correct font style in Android 4.3-\n}\n\n// stylelint-disable font-weight-notation\nb,\nstrong {\n font-weight: bolder; // Add the correct font weight in Chrome, Edge, and Safari\n}\n// stylelint-enable font-weight-notation\n\nsmall {\n font-size: 80%; // Add the correct font size in all browsers\n}\n\n//\n// Prevent `sub` and `sup` elements from affecting the line height in\n// all browsers.\n//\n\nsub,\nsup {\n position: relative;\n font-size: 75%;\n line-height: 0;\n vertical-align: baseline;\n}\n\nsub { bottom: -.25em; }\nsup { top: -.5em; }\n\n\n//\n// Links\n//\n\na {\n color: $link-color;\n text-decoration: $link-decoration;\n background-color: transparent; // Remove the gray background on active links in IE 10.\n -webkit-text-decoration-skip: objects; // Remove gaps in links underline in iOS 8+ and Safari 8+.\n\n @include hover {\n color: $link-hover-color;\n text-decoration: $link-hover-decoration;\n }\n}\n\n// And undo these styles for placeholder links/named anchors (without href)\n// which have not been made explicitly keyboard-focusable (without tabindex).\n// It would be more straightforward to just use a[href] in previous block, but that\n// causes specificity issues in many other styles that are too complex to fix.\n// See https://github.com/twbs/bootstrap/issues/19402\n\na:not([href]):not([tabindex]) {\n color: inherit;\n text-decoration: none;\n\n @include hover-focus {\n color: inherit;\n text-decoration: none;\n }\n\n &:focus {\n outline: 0;\n }\n}\n\n\n//\n// Code\n//\n\n// stylelint-disable font-family-no-duplicate-names\npre,\ncode,\nkbd,\nsamp {\n font-family: monospace, monospace; // Correct the inheritance and scaling of font size in all browsers.\n font-size: 1em; // Correct the odd `em` font sizing in all browsers.\n}\n// stylelint-enable font-family-no-duplicate-names\n\npre {\n // Remove browser default top margin\n margin-top: 0;\n // Reset browser default of `1em` to use `rem`s\n margin-bottom: 1rem;\n // Don't allow content to break outside\n overflow: auto;\n // We have @viewport set which causes scrollbars to overlap content in IE11 and Edge, so\n // we force a non-overlapping, non-auto-hiding scrollbar to counteract.\n -ms-overflow-style: scrollbar;\n}\n\n\n//\n// Figures\n//\n\nfigure {\n // Apply a consistent margin strategy (matches our type styles).\n margin: 0 0 1rem;\n}\n\n\n//\n// Images and content\n//\n\nimg {\n vertical-align: middle;\n border-style: none; // Remove the border on images inside links in IE 10-.\n}\n\nsvg:not(:root) {\n overflow: hidden; // Hide the overflow in IE\n}\n\n\n//\n// Tables\n//\n\ntable {\n border-collapse: collapse; // Prevent double borders\n}\n\ncaption {\n padding-top: $table-cell-padding;\n padding-bottom: $table-cell-padding;\n color: $text-muted;\n text-align: left;\n caption-side: bottom;\n}\n\nth {\n // Matches default `
` alignment by inheriting from the ``, or the\n // closest parent with a set `text-align`.\n text-align: inherit;\n}\n\n\n//\n// Forms\n//\n\nlabel {\n // Allow labels to use `margin` for spacing.\n display: inline-block;\n margin-bottom: .5rem;\n}\n\n// Remove the default `border-radius` that macOS Chrome adds.\n//\n// Details at https://github.com/twbs/bootstrap/issues/24093\nbutton {\n border-radius: 0;\n}\n\n// Work around a Firefox/IE bug where the transparent `button` background\n// results in a loss of the default `button` focus styles.\n//\n// Credit: https://github.com/suitcss/base/\nbutton:focus {\n outline: 1px dotted;\n outline: 5px auto -webkit-focus-ring-color;\n}\n\ninput,\nbutton,\nselect,\noptgroup,\ntextarea {\n margin: 0; // Remove the margin in Firefox and Safari\n font-family: inherit;\n font-size: inherit;\n line-height: inherit;\n}\n\nbutton,\ninput {\n overflow: visible; // Show the overflow in Edge\n}\n\nbutton,\nselect {\n text-transform: none; // Remove the inheritance of text transform in Firefox\n}\n\n// 1. Prevent a WebKit bug where (2) destroys native `audio` and `video`\n// controls in Android 4.\n// 2. Correct the inability to style clickable types in iOS and Safari.\nbutton,\nhtml [type=\"button\"], // 1\n[type=\"reset\"],\n[type=\"submit\"] {\n -webkit-appearance: button; // 2\n}\n\n// Remove inner border and padding from Firefox, but don't restore the outline like Normalize.\nbutton::-moz-focus-inner,\n[type=\"button\"]::-moz-focus-inner,\n[type=\"reset\"]::-moz-focus-inner,\n[type=\"submit\"]::-moz-focus-inner {\n padding: 0;\n border-style: none;\n}\n\ninput[type=\"radio\"],\ninput[type=\"checkbox\"] {\n box-sizing: border-box; // 1. Add the correct box sizing in IE 10-\n padding: 0; // 2. Remove the padding in IE 10-\n}\n\n\ninput[type=\"date\"],\ninput[type=\"time\"],\ninput[type=\"datetime-local\"],\ninput[type=\"month\"] {\n // Remove the default appearance of temporal inputs to avoid a Mobile Safari\n // bug where setting a custom line-height prevents text from being vertically\n // centered within the input.\n // See https://bugs.webkit.org/show_bug.cgi?id=139848\n // and https://github.com/twbs/bootstrap/issues/11266\n -webkit-appearance: listbox;\n}\n\ntextarea {\n overflow: auto; // Remove the default vertical scrollbar in IE.\n // Textareas should really only resize vertically so they don't break their (horizontal) containers.\n resize: vertical;\n}\n\nfieldset {\n // Browsers set a default `min-width: min-content;` on fieldsets,\n // unlike e.g. `
`s, which have `min-width: 0;` by default.\n // So we reset that to ensure fieldsets behave more like a standard block element.\n // See https://github.com/twbs/bootstrap/issues/12359\n // and https://html.spec.whatwg.org/multipage/#the-fieldset-and-legend-elements\n min-width: 0;\n // Reset the default outline behavior of fieldsets so they don't affect page layout.\n padding: 0;\n margin: 0;\n border: 0;\n}\n\n// 1. Correct the text wrapping in Edge and IE.\n// 2. Correct the color inheritance from `fieldset` elements in IE.\nlegend {\n display: block;\n width: 100%;\n max-width: 100%; // 1\n padding: 0;\n margin-bottom: .5rem;\n font-size: 1.5rem;\n line-height: inherit;\n color: inherit; // 2\n white-space: normal; // 1\n}\n\nprogress {\n vertical-align: baseline; // Add the correct vertical alignment in Chrome, Firefox, and Opera.\n}\n\n// Correct the cursor style of increment and decrement buttons in Chrome.\n[type=\"number\"]::-webkit-inner-spin-button,\n[type=\"number\"]::-webkit-outer-spin-button {\n height: auto;\n}\n\n[type=\"search\"] {\n // This overrides the extra rounded corners on search inputs in iOS so that our\n // `.form-control` class can properly style them. Note that this cannot simply\n // be added to `.form-control` as it's not specific enough. For details, see\n // https://github.com/twbs/bootstrap/issues/11586.\n outline-offset: -2px; // 2. Correct the outline style in Safari.\n -webkit-appearance: none;\n}\n\n//\n// Remove the inner padding and cancel buttons in Chrome and Safari on macOS.\n//\n\n[type=\"search\"]::-webkit-search-cancel-button,\n[type=\"search\"]::-webkit-search-decoration {\n -webkit-appearance: none;\n}\n\n//\n// 1. Correct the inability to style clickable types in iOS and Safari.\n// 2. Change font properties to `inherit` in Safari.\n//\n\n::-webkit-file-upload-button {\n font: inherit; // 2\n -webkit-appearance: button; // 1\n}\n\n//\n// Correct element displays\n//\n\noutput {\n display: inline-block;\n}\n\nsummary {\n display: list-item; // Add the correct display in all browsers\n cursor: pointer;\n}\n\ntemplate {\n display: none; // Add the correct display in IE\n}\n\n// Always hide an element with the `hidden` HTML attribute (from PureCSS).\n// Needed for proper display in IE 10-.\n[hidden] {\n display: none !important;\n}\n","/*!\n * Bootstrap Reboot v4.0.0 (https://getbootstrap.com)\n * Copyright 2011-2018 The Bootstrap Authors\n * Copyright 2011-2018 Twitter, Inc.\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)\n */\n*,\n*::before,\n*::after {\n box-sizing: border-box;\n}\n\nhtml {\n font-family: sans-serif;\n line-height: 1.15;\n -webkit-text-size-adjust: 100%;\n -ms-text-size-adjust: 100%;\n -ms-overflow-style: scrollbar;\n -webkit-tap-highlight-color: transparent;\n}\n\n@-ms-viewport {\n width: device-width;\n}\n\narticle, aside, dialog, figcaption, figure, footer, header, hgroup, main, nav, section {\n display: block;\n}\n\nbody {\n margin: 0;\n font-family: -apple-system, BlinkMacSystemFont, \"Segoe UI\", Roboto, \"Helvetica Neue\", Arial, sans-serif, \"Apple Color Emoji\", \"Segoe UI Emoji\", \"Segoe UI Symbol\";\n font-size: 1rem;\n font-weight: 400;\n line-height: 1.5;\n color: #212529;\n text-align: left;\n background-color: #fff;\n}\n\n[tabindex=\"-1\"]:focus {\n outline: 0 !important;\n}\n\nhr {\n box-sizing: content-box;\n height: 0;\n overflow: visible;\n}\n\nh1, h2, h3, h4, h5, h6 {\n margin-top: 0;\n margin-bottom: 0.5rem;\n}\n\np {\n margin-top: 0;\n margin-bottom: 1rem;\n}\n\nabbr[title],\nabbr[data-original-title] {\n text-decoration: underline;\n text-decoration: underline dotted;\n cursor: help;\n border-bottom: 0;\n}\n\naddress {\n margin-bottom: 1rem;\n font-style: normal;\n line-height: inherit;\n}\n\nol,\nul,\ndl {\n margin-top: 0;\n margin-bottom: 1rem;\n}\n\nol ol,\nul ul,\nol ul,\nul ol {\n margin-bottom: 0;\n}\n\ndt {\n font-weight: 700;\n}\n\ndd {\n margin-bottom: .5rem;\n margin-left: 0;\n}\n\nblockquote {\n margin: 0 0 1rem;\n}\n\ndfn {\n font-style: italic;\n}\n\nb,\nstrong {\n font-weight: bolder;\n}\n\nsmall {\n font-size: 80%;\n}\n\nsub,\nsup {\n position: relative;\n font-size: 75%;\n line-height: 0;\n vertical-align: baseline;\n}\n\nsub {\n bottom: -.25em;\n}\n\nsup {\n top: -.5em;\n}\n\na {\n color: #007bff;\n text-decoration: none;\n background-color: transparent;\n -webkit-text-decoration-skip: objects;\n}\n\na:hover {\n color: #0056b3;\n text-decoration: underline;\n}\n\na:not([href]):not([tabindex]) {\n color: inherit;\n text-decoration: none;\n}\n\na:not([href]):not([tabindex]):hover, a:not([href]):not([tabindex]):focus {\n color: inherit;\n text-decoration: none;\n}\n\na:not([href]):not([tabindex]):focus {\n outline: 0;\n}\n\npre,\ncode,\nkbd,\nsamp {\n font-family: monospace, monospace;\n font-size: 1em;\n}\n\npre {\n margin-top: 0;\n margin-bottom: 1rem;\n overflow: auto;\n -ms-overflow-style: scrollbar;\n}\n\nfigure {\n margin: 0 0 1rem;\n}\n\nimg {\n vertical-align: middle;\n border-style: none;\n}\n\nsvg:not(:root) {\n overflow: hidden;\n}\n\ntable {\n border-collapse: collapse;\n}\n\ncaption {\n padding-top: 0.75rem;\n padding-bottom: 0.75rem;\n color: #6c757d;\n text-align: left;\n caption-side: bottom;\n}\n\nth {\n text-align: inherit;\n}\n\nlabel {\n display: inline-block;\n margin-bottom: .5rem;\n}\n\nbutton {\n border-radius: 0;\n}\n\nbutton:focus {\n outline: 1px dotted;\n outline: 5px auto -webkit-focus-ring-color;\n}\n\ninput,\nbutton,\nselect,\noptgroup,\ntextarea {\n margin: 0;\n font-family: inherit;\n font-size: inherit;\n line-height: inherit;\n}\n\nbutton,\ninput {\n overflow: visible;\n}\n\nbutton,\nselect {\n text-transform: none;\n}\n\nbutton,\nhtml [type=\"button\"],\n[type=\"reset\"],\n[type=\"submit\"] {\n -webkit-appearance: button;\n}\n\nbutton::-moz-focus-inner,\n[type=\"button\"]::-moz-focus-inner,\n[type=\"reset\"]::-moz-focus-inner,\n[type=\"submit\"]::-moz-focus-inner {\n padding: 0;\n border-style: none;\n}\n\ninput[type=\"radio\"],\ninput[type=\"checkbox\"] {\n box-sizing: border-box;\n padding: 0;\n}\n\ninput[type=\"date\"],\ninput[type=\"time\"],\ninput[type=\"datetime-local\"],\ninput[type=\"month\"] {\n -webkit-appearance: listbox;\n}\n\ntextarea {\n overflow: auto;\n resize: vertical;\n}\n\nfieldset {\n min-width: 0;\n padding: 0;\n margin: 0;\n border: 0;\n}\n\nlegend {\n display: block;\n width: 100%;\n max-width: 100%;\n padding: 0;\n margin-bottom: .5rem;\n font-size: 1.5rem;\n line-height: inherit;\n color: inherit;\n white-space: normal;\n}\n\nprogress {\n vertical-align: baseline;\n}\n\n[type=\"number\"]::-webkit-inner-spin-button,\n[type=\"number\"]::-webkit-outer-spin-button {\n height: auto;\n}\n\n[type=\"search\"] {\n outline-offset: -2px;\n -webkit-appearance: none;\n}\n\n[type=\"search\"]::-webkit-search-cancel-button,\n[type=\"search\"]::-webkit-search-decoration {\n -webkit-appearance: none;\n}\n\n::-webkit-file-upload-button {\n font: inherit;\n -webkit-appearance: button;\n}\n\noutput {\n display: inline-block;\n}\n\nsummary {\n display: list-item;\n cursor: pointer;\n}\n\ntemplate {\n display: none;\n}\n\n[hidden] {\n display: none !important;\n}\n\n/*# sourceMappingURL=bootstrap-reboot.css.map */","// Variables\n//\n// Variables should follow the `$component-state-property-size` formula for\n// consistent naming. Ex: $nav-link-disabled-color and $modal-content-box-shadow-xs.\n\n\n//\n// Color system\n//\n\n// stylelint-disable\n$white: #fff !default;\n$gray-100: #f8f9fa !default;\n$gray-200: #e9ecef !default;\n$gray-300: #dee2e6 !default;\n$gray-400: #ced4da !default;\n$gray-500: #adb5bd !default;\n$gray-600: #6c757d !default;\n$gray-700: #495057 !default;\n$gray-800: #343a40 !default;\n$gray-900: #212529 !default;\n$black: #000 !default;\n\n$grays: () !default;\n$grays: map-merge((\n \"100\": $gray-100,\n \"200\": $gray-200,\n \"300\": $gray-300,\n \"400\": $gray-400,\n \"500\": $gray-500,\n \"600\": $gray-600,\n \"700\": $gray-700,\n \"800\": $gray-800,\n \"900\": $gray-900\n), $grays);\n\n$blue: #007bff !default;\n$indigo: #6610f2 !default;\n$purple: #6f42c1 !default;\n$pink: #e83e8c !default;\n$red: #dc3545 !default;\n$orange: #fd7e14 !default;\n$yellow: #ffc107 !default;\n$green: #28a745 !default;\n$teal: #20c997 !default;\n$cyan: #17a2b8 !default;\n\n$colors: () !default;\n$colors: map-merge((\n \"blue\": $blue,\n \"indigo\": $indigo,\n \"purple\": $purple,\n \"pink\": $pink,\n \"red\": $red,\n \"orange\": $orange,\n \"yellow\": $yellow,\n \"green\": $green,\n \"teal\": $teal,\n \"cyan\": $cyan,\n \"white\": $white,\n \"gray\": $gray-600,\n \"gray-dark\": $gray-800\n), $colors);\n\n$primary: $blue !default;\n$secondary: $gray-600 !default;\n$success: $green !default;\n$info: $cyan !default;\n$warning: $yellow !default;\n$danger: $red !default;\n$light: $gray-100 !default;\n$dark: $gray-800 !default;\n\n$theme-colors: () !default;\n$theme-colors: map-merge((\n \"primary\": $primary,\n \"secondary\": $secondary,\n \"success\": $success,\n \"info\": $info,\n \"warning\": $warning,\n \"danger\": $danger,\n \"light\": $light,\n \"dark\": $dark\n), $theme-colors);\n// stylelint-enable\n\n// Set a specific jump point for requesting color jumps\n$theme-color-interval: 8% !default;\n\n// The yiq lightness value that determines when the lightness of color changes from \"dark\" to \"light\". Acceptable values are between 0 and 255.\n$yiq-contrasted-threshold: 150 !default;\n\n// Customize the light and dark text colors for use in our YIQ color contrast function.\n$yiq-text-dark: $gray-900 !default;\n$yiq-text-light: $white !default;\n\n// Options\n//\n// Quickly modify global styling by enabling or disabling optional features.\n\n$enable-caret: true !default;\n$enable-rounded: true !default;\n$enable-shadows: false !default;\n$enable-gradients: false !default;\n$enable-transitions: true !default;\n$enable-hover-media-query: false !default; // Deprecated, no longer affects any compiled CSS\n$enable-grid-classes: true !default;\n$enable-print-styles: true !default;\n\n\n// Spacing\n//\n// Control the default styling of most Bootstrap elements by modifying these\n// variables. Mostly focused on spacing.\n// You can add more entries to the $spacers map, should you need more variation.\n\n// stylelint-disable\n$spacer: 1rem !default;\n$spacers: () !default;\n$spacers: map-merge((\n 0: 0,\n 1: ($spacer * .25),\n 2: ($spacer * .5),\n 3: $spacer,\n 4: ($spacer * 1.5),\n 5: ($spacer * 3)\n), $spacers);\n\n// This variable affects the `.h-*` and `.w-*` classes.\n$sizes: () !default;\n$sizes: map-merge((\n 25: 25%,\n 50: 50%,\n 75: 75%,\n 100: 100%\n), $sizes);\n// stylelint-enable\n\n// Body\n//\n// Settings for the `` element.\n\n$body-bg: $white !default;\n$body-color: $gray-900 !default;\n\n// Links\n//\n// Style anchor elements.\n\n$link-color: theme-color(\"primary\") !default;\n$link-decoration: none !default;\n$link-hover-color: darken($link-color, 15%) !default;\n$link-hover-decoration: underline !default;\n\n// Paragraphs\n//\n// Style p element.\n\n$paragraph-margin-bottom: 1rem !default;\n\n\n// Grid breakpoints\n//\n// Define the minimum dimensions at which your layout will change,\n// adapting to different screen sizes, for use in media queries.\n\n$grid-breakpoints: (\n xs: 0,\n sm: 576px,\n md: 768px,\n lg: 992px,\n xl: 1200px\n) !default;\n\n@include _assert-ascending($grid-breakpoints, \"$grid-breakpoints\");\n@include _assert-starts-at-zero($grid-breakpoints);\n\n\n// Grid containers\n//\n// Define the maximum width of `.container` for different screen sizes.\n\n$container-max-widths: (\n sm: 540px,\n md: 720px,\n lg: 960px,\n xl: 1140px\n) !default;\n\n@include _assert-ascending($container-max-widths, \"$container-max-widths\");\n\n\n// Grid columns\n//\n// Set the number of columns and specify the width of the gutters.\n\n$grid-columns: 12 !default;\n$grid-gutter-width: 30px !default;\n\n// Components\n//\n// Define common padding and border radius sizes and more.\n\n$line-height-lg: 1.5 !default;\n$line-height-sm: 1.5 !default;\n\n$border-width: 1px !default;\n$border-color: $gray-300 !default;\n\n$border-radius: .25rem !default;\n$border-radius-lg: .3rem !default;\n$border-radius-sm: .2rem !default;\n\n$component-active-color: $white !default;\n$component-active-bg: theme-color(\"primary\") !default;\n\n$caret-width: .3em !default;\n\n$transition-base: all .2s ease-in-out !default;\n$transition-fade: opacity .15s linear !default;\n$transition-collapse: height .35s ease !default;\n\n\n// Fonts\n//\n// Font, line-height, and color for body text, headings, and more.\n\n// stylelint-disable value-keyword-case\n$font-family-sans-serif: -apple-system, BlinkMacSystemFont, \"Segoe UI\", Roboto, \"Helvetica Neue\", Arial, sans-serif, \"Apple Color Emoji\", \"Segoe UI Emoji\", \"Segoe UI Symbol\" !default;\n$font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, \"Liberation Mono\", \"Courier New\", monospace !default;\n$font-family-base: $font-family-sans-serif !default;\n// stylelint-enable value-keyword-case\n\n$font-size-base: 1rem !default; // Assumes the browser default, typically `16px`\n$font-size-lg: ($font-size-base * 1.25) !default;\n$font-size-sm: ($font-size-base * .875) !default;\n\n$font-weight-light: 300 !default;\n$font-weight-normal: 400 !default;\n$font-weight-bold: 700 !default;\n\n$font-weight-base: $font-weight-normal !default;\n$line-height-base: 1.5 !default;\n\n$h1-font-size: $font-size-base * 2.5 !default;\n$h2-font-size: $font-size-base * 2 !default;\n$h3-font-size: $font-size-base * 1.75 !default;\n$h4-font-size: $font-size-base * 1.5 !default;\n$h5-font-size: $font-size-base * 1.25 !default;\n$h6-font-size: $font-size-base !default;\n\n$headings-margin-bottom: ($spacer / 2) !default;\n$headings-font-family: inherit !default;\n$headings-font-weight: 500 !default;\n$headings-line-height: 1.2 !default;\n$headings-color: inherit !default;\n\n$display1-size: 6rem !default;\n$display2-size: 5.5rem !default;\n$display3-size: 4.5rem !default;\n$display4-size: 3.5rem !default;\n\n$display1-weight: 300 !default;\n$display2-weight: 300 !default;\n$display3-weight: 300 !default;\n$display4-weight: 300 !default;\n$display-line-height: $headings-line-height !default;\n\n$lead-font-size: ($font-size-base * 1.25) !default;\n$lead-font-weight: 300 !default;\n\n$small-font-size: 80% !default;\n\n$text-muted: $gray-600 !default;\n\n$blockquote-small-color: $gray-600 !default;\n$blockquote-font-size: ($font-size-base * 1.25) !default;\n\n$hr-border-color: rgba($black, .1) !default;\n$hr-border-width: $border-width !default;\n\n$mark-padding: .2em !default;\n\n$dt-font-weight: $font-weight-bold !default;\n\n$kbd-box-shadow: inset 0 -.1rem 0 rgba($black, .25) !default;\n$nested-kbd-font-weight: $font-weight-bold !default;\n\n$list-inline-padding: .5rem !default;\n\n$mark-bg: #fcf8e3 !default;\n\n$hr-margin-y: $spacer !default;\n\n\n// Tables\n//\n// Customizes the `.table` component with basic values, each used across all table variations.\n\n$table-cell-padding: .75rem !default;\n$table-cell-padding-sm: .3rem !default;\n\n$table-bg: transparent !default;\n$table-accent-bg: rgba($black, .05) !default;\n$table-hover-bg: rgba($black, .075) !default;\n$table-active-bg: $table-hover-bg !default;\n\n$table-border-width: $border-width !default;\n$table-border-color: $gray-300 !default;\n\n$table-head-bg: $gray-200 !default;\n$table-head-color: $gray-700 !default;\n\n$table-dark-bg: $gray-900 !default;\n$table-dark-accent-bg: rgba($white, .05) !default;\n$table-dark-hover-bg: rgba($white, .075) !default;\n$table-dark-border-color: lighten($gray-900, 7.5%) !default;\n$table-dark-color: $body-bg !default;\n\n\n// Buttons + Forms\n//\n// Shared variables that are reassigned to `$input-` and `$btn-` specific variables.\n\n$input-btn-padding-y: .375rem !default;\n$input-btn-padding-x: .75rem !default;\n$input-btn-line-height: $line-height-base !default;\n\n$input-btn-focus-width: .2rem !default;\n$input-btn-focus-color: rgba($component-active-bg, .25) !default;\n$input-btn-focus-box-shadow: 0 0 0 $input-btn-focus-width $input-btn-focus-color !default;\n\n$input-btn-padding-y-sm: .25rem !default;\n$input-btn-padding-x-sm: .5rem !default;\n$input-btn-line-height-sm: $line-height-sm !default;\n\n$input-btn-padding-y-lg: .5rem !default;\n$input-btn-padding-x-lg: 1rem !default;\n$input-btn-line-height-lg: $line-height-lg !default;\n\n$input-btn-border-width: $border-width !default;\n\n\n// Buttons\n//\n// For each of Bootstrap's buttons, define text, background, and border color.\n\n$btn-padding-y: $input-btn-padding-y !default;\n$btn-padding-x: $input-btn-padding-x !default;\n$btn-line-height: $input-btn-line-height !default;\n\n$btn-padding-y-sm: $input-btn-padding-y-sm !default;\n$btn-padding-x-sm: $input-btn-padding-x-sm !default;\n$btn-line-height-sm: $input-btn-line-height-sm !default;\n\n$btn-padding-y-lg: $input-btn-padding-y-lg !default;\n$btn-padding-x-lg: $input-btn-padding-x-lg !default;\n$btn-line-height-lg: $input-btn-line-height-lg !default;\n\n$btn-border-width: $input-btn-border-width !default;\n\n$btn-font-weight: $font-weight-normal !default;\n$btn-box-shadow: inset 0 1px 0 rgba($white, .15), 0 1px 1px rgba($black, .075) !default;\n$btn-focus-width: $input-btn-focus-width !default;\n$btn-focus-box-shadow: $input-btn-focus-box-shadow !default;\n$btn-disabled-opacity: .65 !default;\n$btn-active-box-shadow: inset 0 3px 5px rgba($black, .125) !default;\n\n$btn-link-disabled-color: $gray-600 !default;\n\n$btn-block-spacing-y: .5rem !default;\n\n// Allows for customizing button radius independently from global border radius\n$btn-border-radius: $border-radius !default;\n$btn-border-radius-lg: $border-radius-lg !default;\n$btn-border-radius-sm: $border-radius-sm !default;\n\n$btn-transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out !default;\n\n\n// Forms\n\n$input-padding-y: $input-btn-padding-y !default;\n$input-padding-x: $input-btn-padding-x !default;\n$input-line-height: $input-btn-line-height !default;\n\n$input-padding-y-sm: $input-btn-padding-y-sm !default;\n$input-padding-x-sm: $input-btn-padding-x-sm !default;\n$input-line-height-sm: $input-btn-line-height-sm !default;\n\n$input-padding-y-lg: $input-btn-padding-y-lg !default;\n$input-padding-x-lg: $input-btn-padding-x-lg !default;\n$input-line-height-lg: $input-btn-line-height-lg !default;\n\n$input-bg: $white !default;\n$input-disabled-bg: $gray-200 !default;\n\n$input-color: $gray-700 !default;\n$input-border-color: $gray-400 !default;\n$input-border-width: $input-btn-border-width !default;\n$input-box-shadow: inset 0 1px 1px rgba($black, .075) !default;\n\n$input-border-radius: $border-radius !default;\n$input-border-radius-lg: $border-radius-lg !default;\n$input-border-radius-sm: $border-radius-sm !default;\n\n$input-focus-bg: $input-bg !default;\n$input-focus-border-color: lighten($component-active-bg, 25%) !default;\n$input-focus-color: $input-color !default;\n$input-focus-width: $input-btn-focus-width !default;\n$input-focus-box-shadow: $input-btn-focus-box-shadow !default;\n\n$input-placeholder-color: $gray-600 !default;\n\n$input-height-border: $input-border-width * 2 !default;\n\n$input-height-inner: ($font-size-base * $input-btn-line-height) + ($input-btn-padding-y * 2) !default;\n$input-height: calc(#{$input-height-inner} + #{$input-height-border}) !default;\n\n$input-height-inner-sm: ($font-size-sm * $input-btn-line-height-sm) + ($input-btn-padding-y-sm * 2) !default;\n$input-height-sm: calc(#{$input-height-inner-sm} + #{$input-height-border}) !default;\n\n$input-height-inner-lg: ($font-size-lg * $input-btn-line-height-lg) + ($input-btn-padding-y-lg * 2) !default;\n$input-height-lg: calc(#{$input-height-inner-lg} + #{$input-height-border}) !default;\n\n$input-transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out !default;\n\n$form-text-margin-top: .25rem !default;\n\n$form-check-input-gutter: 1.25rem !default;\n$form-check-input-margin-y: .3rem !default;\n$form-check-input-margin-x: .25rem !default;\n\n$form-check-inline-margin-x: .75rem !default;\n$form-check-inline-input-margin-x: .3125rem !default;\n\n$form-group-margin-bottom: 1rem !default;\n\n$input-group-addon-color: $input-color !default;\n$input-group-addon-bg: $gray-200 !default;\n$input-group-addon-border-color: $input-border-color !default;\n\n$custom-control-gutter: 1.5rem !default;\n$custom-control-spacer-x: 1rem !default;\n\n$custom-control-indicator-size: 1rem !default;\n$custom-control-indicator-bg: $gray-300 !default;\n$custom-control-indicator-bg-size: 50% 50% !default;\n$custom-control-indicator-box-shadow: inset 0 .25rem .25rem rgba($black, .1) !default;\n\n$custom-control-indicator-disabled-bg: $gray-200 !default;\n$custom-control-label-disabled-color: $gray-600 !default;\n\n$custom-control-indicator-checked-color: $component-active-color !default;\n$custom-control-indicator-checked-bg: $component-active-bg !default;\n$custom-control-indicator-checked-disabled-bg: rgba(theme-color(\"primary\"), .5) !default;\n$custom-control-indicator-checked-box-shadow: none !default;\n\n$custom-control-indicator-focus-box-shadow: 0 0 0 1px $body-bg, $input-btn-focus-box-shadow !default;\n\n$custom-control-indicator-active-color: $component-active-color !default;\n$custom-control-indicator-active-bg: lighten($component-active-bg, 35%) !default;\n$custom-control-indicator-active-box-shadow: none !default;\n\n$custom-checkbox-indicator-border-radius: $border-radius !default;\n$custom-checkbox-indicator-icon-checked: str-replace(url(\"data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='#{$custom-control-indicator-checked-color}' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E\"), \"#\", \"%23\") !default;\n\n$custom-checkbox-indicator-indeterminate-bg: $component-active-bg !default;\n$custom-checkbox-indicator-indeterminate-color: $custom-control-indicator-checked-color !default;\n$custom-checkbox-indicator-icon-indeterminate: str-replace(url(\"data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='#{$custom-checkbox-indicator-indeterminate-color}' d='M0 2h4'/%3E%3C/svg%3E\"), \"#\", \"%23\") !default;\n$custom-checkbox-indicator-indeterminate-box-shadow: none !default;\n\n$custom-radio-indicator-border-radius: 50% !default;\n$custom-radio-indicator-icon-checked: str-replace(url(\"data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='#{$custom-control-indicator-checked-color}'/%3E%3C/svg%3E\"), \"#\", \"%23\") !default;\n\n$custom-select-padding-y: .375rem !default;\n$custom-select-padding-x: .75rem !default;\n$custom-select-height: $input-height !default;\n$custom-select-indicator-padding: 1rem !default; // Extra padding to account for the presence of the background-image based indicator\n$custom-select-line-height: $input-btn-line-height !default;\n$custom-select-color: $input-color !default;\n$custom-select-disabled-color: $gray-600 !default;\n$custom-select-bg: $white !default;\n$custom-select-disabled-bg: $gray-200 !default;\n$custom-select-bg-size: 8px 10px !default; // In pixels because image dimensions\n$custom-select-indicator-color: $gray-800 !default;\n$custom-select-indicator: str-replace(url(\"data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='#{$custom-select-indicator-color}' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E\"), \"#\", \"%23\") !default;\n$custom-select-border-width: $input-btn-border-width !default;\n$custom-select-border-color: $input-border-color !default;\n$custom-select-border-radius: $border-radius !default;\n\n$custom-select-focus-border-color: $input-focus-border-color !default;\n$custom-select-focus-box-shadow: inset 0 1px 2px rgba($black, .075), 0 0 5px rgba($custom-select-focus-border-color, .5) !default;\n\n$custom-select-font-size-sm: 75% !default;\n$custom-select-height-sm: $input-height-sm !default;\n\n$custom-select-font-size-lg: 125% !default;\n$custom-select-height-lg: $input-height-lg !default;\n\n$custom-file-height: $input-height !default;\n$custom-file-focus-border-color: $input-focus-border-color !default;\n$custom-file-focus-box-shadow: $input-btn-focus-box-shadow !default;\n\n$custom-file-padding-y: $input-btn-padding-y !default;\n$custom-file-padding-x: $input-btn-padding-x !default;\n$custom-file-line-height: $input-btn-line-height !default;\n$custom-file-color: $input-color !default;\n$custom-file-bg: $input-bg !default;\n$custom-file-border-width: $input-btn-border-width !default;\n$custom-file-border-color: $input-border-color !default;\n$custom-file-border-radius: $input-border-radius !default;\n$custom-file-box-shadow: $input-box-shadow !default;\n$custom-file-button-color: $custom-file-color !default;\n$custom-file-button-bg: $input-group-addon-bg !default;\n$custom-file-text: (\n en: \"Browse\"\n) !default;\n\n\n// Form validation\n$form-feedback-margin-top: $form-text-margin-top !default;\n$form-feedback-font-size: $small-font-size !default;\n$form-feedback-valid-color: theme-color(\"success\") !default;\n$form-feedback-invalid-color: theme-color(\"danger\") !default;\n\n\n// Dropdowns\n//\n// Dropdown menu container and contents.\n\n$dropdown-min-width: 10rem !default;\n$dropdown-padding-y: .5rem !default;\n$dropdown-spacer: .125rem !default;\n$dropdown-bg: $white !default;\n$dropdown-border-color: rgba($black, .15) !default;\n$dropdown-border-radius: $border-radius !default;\n$dropdown-border-width: $border-width !default;\n$dropdown-divider-bg: $gray-200 !default;\n$dropdown-box-shadow: 0 .5rem 1rem rgba($black, .175) !default;\n\n$dropdown-link-color: $gray-900 !default;\n$dropdown-link-hover-color: darken($gray-900, 5%) !default;\n$dropdown-link-hover-bg: $gray-100 !default;\n\n$dropdown-link-active-color: $component-active-color !default;\n$dropdown-link-active-bg: $component-active-bg !default;\n\n$dropdown-link-disabled-color: $gray-600 !default;\n\n$dropdown-item-padding-y: .25rem !default;\n$dropdown-item-padding-x: 1.5rem !default;\n\n$dropdown-header-color: $gray-600 !default;\n\n\n// Z-index master list\n//\n// Warning: Avoid customizing these values. They're used for a bird's eye view\n// of components dependent on the z-axis and are designed to all work together.\n\n$zindex-dropdown: 1000 !default;\n$zindex-sticky: 1020 !default;\n$zindex-fixed: 1030 !default;\n$zindex-modal-backdrop: 1040 !default;\n$zindex-modal: 1050 !default;\n$zindex-popover: 1060 !default;\n$zindex-tooltip: 1070 !default;\n\n// Navs\n\n$nav-link-padding-y: .5rem !default;\n$nav-link-padding-x: 1rem !default;\n$nav-link-disabled-color: $gray-600 !default;\n\n$nav-tabs-border-color: $gray-300 !default;\n$nav-tabs-border-width: $border-width !default;\n$nav-tabs-border-radius: $border-radius !default;\n$nav-tabs-link-hover-border-color: $gray-200 $gray-200 $nav-tabs-border-color !default;\n$nav-tabs-link-active-color: $gray-700 !default;\n$nav-tabs-link-active-bg: $body-bg !default;\n$nav-tabs-link-active-border-color: $gray-300 $gray-300 $nav-tabs-link-active-bg !default;\n\n$nav-pills-border-radius: $border-radius !default;\n$nav-pills-link-active-color: $component-active-color !default;\n$nav-pills-link-active-bg: $component-active-bg !default;\n\n// Navbar\n\n$navbar-padding-y: ($spacer / 2) !default;\n$navbar-padding-x: $spacer !default;\n\n$navbar-nav-link-padding-x: .5rem !default;\n\n$navbar-brand-font-size: $font-size-lg !default;\n// Compute the navbar-brand padding-y so the navbar-brand will have the same height as navbar-text and nav-link\n$nav-link-height: ($font-size-base * $line-height-base + $nav-link-padding-y * 2) !default;\n$navbar-brand-height: $navbar-brand-font-size * $line-height-base !default;\n$navbar-brand-padding-y: ($nav-link-height - $navbar-brand-height) / 2 !default;\n\n$navbar-toggler-padding-y: .25rem !default;\n$navbar-toggler-padding-x: .75rem !default;\n$navbar-toggler-font-size: $font-size-lg !default;\n$navbar-toggler-border-radius: $btn-border-radius !default;\n\n$navbar-dark-color: rgba($white, .5) !default;\n$navbar-dark-hover-color: rgba($white, .75) !default;\n$navbar-dark-active-color: $white !default;\n$navbar-dark-disabled-color: rgba($white, .25) !default;\n$navbar-dark-toggler-icon-bg: str-replace(url(\"data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-dark-color}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E\"), \"#\", \"%23\") !default;\n$navbar-dark-toggler-border-color: rgba($white, .1) !default;\n\n$navbar-light-color: rgba($black, .5) !default;\n$navbar-light-hover-color: rgba($black, .7) !default;\n$navbar-light-active-color: rgba($black, .9) !default;\n$navbar-light-disabled-color: rgba($black, .3) !default;\n$navbar-light-toggler-icon-bg: str-replace(url(\"data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-light-color}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E\"), \"#\", \"%23\") !default;\n$navbar-light-toggler-border-color: rgba($black, .1) !default;\n\n// Pagination\n\n$pagination-padding-y: .5rem !default;\n$pagination-padding-x: .75rem !default;\n$pagination-padding-y-sm: .25rem !default;\n$pagination-padding-x-sm: .5rem !default;\n$pagination-padding-y-lg: .75rem !default;\n$pagination-padding-x-lg: 1.5rem !default;\n$pagination-line-height: 1.25 !default;\n\n$pagination-color: $link-color !default;\n$pagination-bg: $white !default;\n$pagination-border-width: $border-width !default;\n$pagination-border-color: $gray-300 !default;\n\n$pagination-focus-box-shadow: $input-btn-focus-box-shadow !default;\n\n$pagination-hover-color: $link-hover-color !default;\n$pagination-hover-bg: $gray-200 !default;\n$pagination-hover-border-color: $gray-300 !default;\n\n$pagination-active-color: $component-active-color !default;\n$pagination-active-bg: $component-active-bg !default;\n$pagination-active-border-color: $pagination-active-bg !default;\n\n$pagination-disabled-color: $gray-600 !default;\n$pagination-disabled-bg: $white !default;\n$pagination-disabled-border-color: $gray-300 !default;\n\n\n// Jumbotron\n\n$jumbotron-padding: 2rem !default;\n$jumbotron-bg: $gray-200 !default;\n\n\n// Cards\n\n$card-spacer-y: .75rem !default;\n$card-spacer-x: 1.25rem !default;\n$card-border-width: $border-width !default;\n$card-border-radius: $border-radius !default;\n$card-border-color: rgba($black, .125) !default;\n$card-inner-border-radius: calc(#{$card-border-radius} - #{$card-border-width}) !default;\n$card-cap-bg: rgba($black, .03) !default;\n$card-bg: $white !default;\n\n$card-img-overlay-padding: 1.25rem !default;\n\n$card-group-margin: ($grid-gutter-width / 2) !default;\n$card-deck-margin: $card-group-margin !default;\n\n$card-columns-count: 3 !default;\n$card-columns-gap: 1.25rem !default;\n$card-columns-margin: $card-spacer-y !default;\n\n\n// Tooltips\n\n$tooltip-font-size: $font-size-sm !default;\n$tooltip-max-width: 200px !default;\n$tooltip-color: $white !default;\n$tooltip-bg: $black !default;\n$tooltip-border-radius: $border-radius !default;\n$tooltip-opacity: .9 !default;\n$tooltip-padding-y: .25rem !default;\n$tooltip-padding-x: .5rem !default;\n$tooltip-margin: 0 !default;\n\n$tooltip-arrow-width: .8rem !default;\n$tooltip-arrow-height: .4rem !default;\n$tooltip-arrow-color: $tooltip-bg !default;\n\n\n// Popovers\n\n$popover-font-size: $font-size-sm !default;\n$popover-bg: $white !default;\n$popover-max-width: 276px !default;\n$popover-border-width: $border-width !default;\n$popover-border-color: rgba($black, .2) !default;\n$popover-border-radius: $border-radius-lg !default;\n$popover-box-shadow: 0 .25rem .5rem rgba($black, .2) !default;\n\n$popover-header-bg: darken($popover-bg, 3%) !default;\n$popover-header-color: $headings-color !default;\n$popover-header-padding-y: .5rem !default;\n$popover-header-padding-x: .75rem !default;\n\n$popover-body-color: $body-color !default;\n$popover-body-padding-y: $popover-header-padding-y !default;\n$popover-body-padding-x: $popover-header-padding-x !default;\n\n$popover-arrow-width: 1rem !default;\n$popover-arrow-height: .5rem !default;\n$popover-arrow-color: $popover-bg !default;\n\n$popover-arrow-outer-color: fade-in($popover-border-color, .05) !default;\n\n\n// Badges\n\n$badge-font-size: 75% !default;\n$badge-font-weight: $font-weight-bold !default;\n$badge-padding-y: .25em !default;\n$badge-padding-x: .4em !default;\n$badge-border-radius: $border-radius !default;\n\n$badge-pill-padding-x: .6em !default;\n// Use a higher than normal value to ensure completely rounded edges when\n// customizing padding or font-size on labels.\n$badge-pill-border-radius: 10rem !default;\n\n\n// Modals\n\n// Padding applied to the modal body\n$modal-inner-padding: 1rem !default;\n\n$modal-dialog-margin: .5rem !default;\n$modal-dialog-margin-y-sm-up: 1.75rem !default;\n\n$modal-title-line-height: $line-height-base !default;\n\n$modal-content-bg: $white !default;\n$modal-content-border-color: rgba($black, .2) !default;\n$modal-content-border-width: $border-width !default;\n$modal-content-box-shadow-xs: 0 .25rem .5rem rgba($black, .5) !default;\n$modal-content-box-shadow-sm-up: 0 .5rem 1rem rgba($black, .5) !default;\n\n$modal-backdrop-bg: $black !default;\n$modal-backdrop-opacity: .5 !default;\n$modal-header-border-color: $gray-200 !default;\n$modal-footer-border-color: $modal-header-border-color !default;\n$modal-header-border-width: $modal-content-border-width !default;\n$modal-footer-border-width: $modal-header-border-width !default;\n$modal-header-padding: 1rem !default;\n\n$modal-lg: 800px !default;\n$modal-md: 500px !default;\n$modal-sm: 300px !default;\n\n$modal-transition: transform .3s ease-out !default;\n\n\n// Alerts\n//\n// Define alert colors, border radius, and padding.\n\n$alert-padding-y: .75rem !default;\n$alert-padding-x: 1.25rem !default;\n$alert-margin-bottom: 1rem !default;\n$alert-border-radius: $border-radius !default;\n$alert-link-font-weight: $font-weight-bold !default;\n$alert-border-width: $border-width !default;\n\n$alert-bg-level: -10 !default;\n$alert-border-level: -9 !default;\n$alert-color-level: 6 !default;\n\n\n// Progress bars\n\n$progress-height: 1rem !default;\n$progress-font-size: ($font-size-base * .75) !default;\n$progress-bg: $gray-200 !default;\n$progress-border-radius: $border-radius !default;\n$progress-box-shadow: inset 0 .1rem .1rem rgba($black, .1) !default;\n$progress-bar-color: $white !default;\n$progress-bar-bg: theme-color(\"primary\") !default;\n$progress-bar-animation-timing: 1s linear infinite !default;\n$progress-bar-transition: width .6s ease !default;\n\n// List group\n\n$list-group-bg: $white !default;\n$list-group-border-color: rgba($black, .125) !default;\n$list-group-border-width: $border-width !default;\n$list-group-border-radius: $border-radius !default;\n\n$list-group-item-padding-y: .75rem !default;\n$list-group-item-padding-x: 1.25rem !default;\n\n$list-group-hover-bg: $gray-100 !default;\n$list-group-active-color: $component-active-color !default;\n$list-group-active-bg: $component-active-bg !default;\n$list-group-active-border-color: $list-group-active-bg !default;\n\n$list-group-disabled-color: $gray-600 !default;\n$list-group-disabled-bg: $list-group-bg !default;\n\n$list-group-action-color: $gray-700 !default;\n$list-group-action-hover-color: $list-group-action-color !default;\n\n$list-group-action-active-color: $body-color !default;\n$list-group-action-active-bg: $gray-200 !default;\n\n\n// Image thumbnails\n\n$thumbnail-padding: .25rem !default;\n$thumbnail-bg: $body-bg !default;\n$thumbnail-border-width: $border-width !default;\n$thumbnail-border-color: $gray-300 !default;\n$thumbnail-border-radius: $border-radius !default;\n$thumbnail-box-shadow: 0 1px 2px rgba($black, .075) !default;\n\n\n// Figures\n\n$figure-caption-font-size: 90% !default;\n$figure-caption-color: $gray-600 !default;\n\n\n// Breadcrumbs\n\n$breadcrumb-padding-y: .75rem !default;\n$breadcrumb-padding-x: 1rem !default;\n$breadcrumb-item-padding: .5rem !default;\n\n$breadcrumb-margin-bottom: 1rem !default;\n\n$breadcrumb-bg: $gray-200 !default;\n$breadcrumb-divider-color: $gray-600 !default;\n$breadcrumb-active-color: $gray-600 !default;\n$breadcrumb-divider: \"/\" !default;\n\n\n// Carousel\n\n$carousel-control-color: $white !default;\n$carousel-control-width: 15% !default;\n$carousel-control-opacity: .5 !default;\n\n$carousel-indicator-width: 30px !default;\n$carousel-indicator-height: 3px !default;\n$carousel-indicator-spacer: 3px !default;\n$carousel-indicator-active-bg: $white !default;\n\n$carousel-caption-width: 70% !default;\n$carousel-caption-color: $white !default;\n\n$carousel-control-icon-width: 20px !default;\n\n$carousel-control-prev-icon-bg: str-replace(url(\"data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='#{$carousel-control-color}' viewBox='0 0 8 8'%3E%3Cpath d='M5.25 0l-4 4 4 4 1.5-1.5-2.5-2.5 2.5-2.5-1.5-1.5z'/%3E%3C/svg%3E\"), \"#\", \"%23\") !default;\n$carousel-control-next-icon-bg: str-replace(url(\"data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='#{$carousel-control-color}' viewBox='0 0 8 8'%3E%3Cpath d='M2.75 0l-1.5 1.5 2.5 2.5-2.5 2.5 1.5 1.5 4-4-4-4z'/%3E%3C/svg%3E\"), \"#\", \"%23\") !default;\n\n$carousel-transition: transform .6s ease !default;\n\n\n// Close\n\n$close-font-size: $font-size-base * 1.5 !default;\n$close-font-weight: $font-weight-bold !default;\n$close-color: $black !default;\n$close-text-shadow: 0 1px 0 $white !default;\n\n// Code\n\n$code-font-size: 87.5% !default;\n$code-color: $pink !default;\n\n$kbd-padding-y: .2rem !default;\n$kbd-padding-x: .4rem !default;\n$kbd-font-size: $code-font-size !default;\n$kbd-color: $white !default;\n$kbd-bg: $gray-900 !default;\n\n$pre-color: $gray-900 !default;\n$pre-scrollable-max-height: 340px !default;\n\n\n// Printing\n$print-page-size: a3 !default;\n$print-body-min-width: map-get($grid-breakpoints, \"lg\") !default;\n","// stylelint-disable indentation\n\n// Hover mixin and `$enable-hover-media-query` are deprecated.\n//\n// Origally added during our alphas and maintained during betas, this mixin was\n// designed to prevent `:hover` stickiness on iOS—an issue where hover styles\n// would persist after initial touch.\n//\n// For backward compatibility, we've kept these mixins and updated them to\n// always return their regular psuedo-classes instead of a shimmed media query.\n//\n// Issue: https://github.com/twbs/bootstrap/issues/25195\n\n@mixin hover {\n &:hover { @content; }\n}\n\n@mixin hover-focus {\n &:hover,\n &:focus {\n @content;\n }\n}\n\n@mixin plain-hover-focus {\n &,\n &:hover,\n &:focus {\n @content;\n }\n}\n\n@mixin hover-focus-active {\n &:hover,\n &:focus,\n &:active {\n @content;\n }\n}\n"]}
\ No newline at end of file
diff --git a/client/w3cDemo/css/bootstrap-reboot.min.css b/client/w3cDemo/css/bootstrap-reboot.min.css
deleted file mode 100644
index ced04682..00000000
--- a/client/w3cDemo/css/bootstrap-reboot.min.css
+++ /dev/null
@@ -1,8 +0,0 @@
-/*!
- * Bootstrap Reboot v4.0.0 (https://getbootstrap.com)
- * Copyright 2011-2018 The Bootstrap Authors
- * Copyright 2011-2018 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
- */*,::after,::before{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:transparent}@-ms-viewport{width:device-width}article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";font-size:1rem;font-weight:400;line-height:1.5;color:#212529;text-align:left;background-color:#fff}[tabindex="-1"]:focus{outline:0!important}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;border-bottom:0}address{margin-bottom:1rem;font-style:normal;line-height:inherit}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}dfn{font-style:italic}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#007bff;text-decoration:none;background-color:transparent;-webkit-text-decoration-skip:objects}a:hover{color:#0056b3;text-decoration:underline}a:not([href]):not([tabindex]){color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus,a:not([href]):not([tabindex]):hover{color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus{outline:0}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto;-ms-overflow-style:scrollbar}figure{margin:0 0 1rem}img{vertical-align:middle;border-style:none}svg:not(:root){overflow:hidden}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#6c757d;text-align:left;caption-side:bottom}th{text-align:inherit}label{display:inline-block;margin-bottom:.5rem}button{border-radius:0}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item;cursor:pointer}template{display:none}[hidden]{display:none!important}
-/*# sourceMappingURL=bootstrap-reboot.min.css.map */
\ No newline at end of file
diff --git a/client/w3cDemo/css/bootstrap-reboot.min.css.map b/client/w3cDemo/css/bootstrap-reboot.min.css.map
deleted file mode 100644
index 7212ab67..00000000
--- a/client/w3cDemo/css/bootstrap-reboot.min.css.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":["../../scss/bootstrap-reboot.scss","../../scss/_reboot.scss","dist/css/bootstrap-reboot.css","bootstrap-reboot.css","../../scss/mixins/_hover.scss"],"names":[],"mappings":"AAAA;;;;;;ACoBA,ECXA,QADA,SDeE,WAAA,WAGF,KACE,YAAA,WACA,YAAA,KACA,yBAAA,KACA,qBAAA,KACA,mBAAA,UACA,4BAAA,YAKA,cACE,MAAA,aAMJ,QAAA,MAAA,OAAA,WAAA,OAAA,OAAA,OAAA,OAAA,KAAA,IAAA,QACE,QAAA,MAWF,KACE,OAAA,EACA,YAAA,aAAA,CAAA,kBAAA,CAAA,UAAA,CAAA,MAAA,CAAA,gBAAA,CAAA,KAAA,CAAA,UAAA,CAAA,mBAAA,CAAA,gBAAA,CAAA,kBACA,UAAA,KACA,YAAA,IACA,YAAA,IACA,MAAA,QACA,WAAA,KACA,iBAAA,KEvBF,sBFgCE,QAAA,YASF,GACE,WAAA,YACA,OAAA,EACA,SAAA,QAaF,GAAA,GAAA,GAAA,GAAA,GAAA,GACE,WAAA,EACA,cAAA,MAQF,EACE,WAAA,EACA,cAAA,KChDF,0BD0DA,YAEE,gBAAA,UACA,wBAAA,UAAA,OAAA,gBAAA,UAAA,OACA,OAAA,KACA,cAAA,EAGF,QACE,cAAA,KACA,WAAA,OACA,YAAA,QCrDF,GDwDA,GCzDA,GD4DE,WAAA,EACA,cAAA,KAGF,MCxDA,MACA,MAFA,MD6DE,cAAA,EAGF,GACE,YAAA,IAGF,GACE,cAAA,MACA,YAAA,EAGF,WACE,OAAA,EAAA,EAAA,KAGF,IACE,WAAA,OAIF,EC1DA,OD4DE,YAAA,OAIF,MACE,UAAA,IAQF,IChEA,IDkEE,SAAA,SACA,UAAA,IACA,YAAA,EACA,eAAA,SAGF,IAAM,OAAA,OACN,IAAM,IAAA,MAON,EACE,MAAA,QACA,gBAAA,KACA,iBAAA,YACA,6BAAA,QG3LA,QH8LE,MAAA,QACA,gBAAA,UAUJ,8BACE,MAAA,QACA,gBAAA,KGvMA,oCAAA,oCH0ME,MAAA,QACA,gBAAA,KANJ,oCAUI,QAAA,EClEJ,KACA,ID2EA,IC1EA,KD8EE,YAAA,SAAA,CAAA,UACA,UAAA,IAIF,IAEE,WAAA,EAEA,cAAA,KAEA,SAAA,KAGA,mBAAA,UAQF,OAEE,OAAA,EAAA,EAAA,KAQF,IACE,eAAA,OACA,aAAA,KAGF,eACE,SAAA,OAQF,MACE,gBAAA,SAGF,QACE,YAAA,OACA,eAAA,OACA,MAAA,QACA,WAAA,KACA,aAAA,OAGF,GAGE,WAAA,QAQF,MAEE,QAAA,aACA,cAAA,MAMF,OACE,cAAA,EAOF,aACE,QAAA,IAAA,OACA,QAAA,IAAA,KAAA,yBC9GF,ODiHA,MC/GA,SADA,OAEA,SDmHE,OAAA,EACA,YAAA,QACA,UAAA,QACA,YAAA,QAGF,OCjHA,MDmHE,SAAA,QAGF,OCjHA,ODmHE,eAAA,KC7GF,aACA,cDkHA,OCpHA,mBDwHE,mBAAA,OCjHF,gCACA,+BACA,gCDmHA,yBAIE,QAAA,EACA,aAAA,KClHF,qBDqHA,kBAEE,WAAA,WACA,QAAA,EAIF,iBCrHA,2BACA,kBAFA,iBD+HE,mBAAA,QAGF,SACE,SAAA,KAEA,OAAA,SAGF,SAME,UAAA,EAEA,QAAA,EACA,OAAA,EACA,OAAA,EAKF,OACE,QAAA,MACA,MAAA,KACA,UAAA,KACA,QAAA,EACA,cAAA,MACA,UAAA,OACA,YAAA,QACA,MAAA,QACA,YAAA,OAGF,SACE,eAAA,SEnIF,yCDEA,yCDuIE,OAAA,KEpIF,cF4IE,eAAA,KACA,mBAAA,KExIF,4CDEA,yCD+IE,mBAAA,KAQF,6BACE,KAAA,QACA,mBAAA,OAOF,OACE,QAAA,aAGF,QACE,QAAA,UACA,OAAA,QAGF,SACE,QAAA,KErJF,SF2JE,QAAA","sourcesContent":["/*!\n * Bootstrap Reboot v4.0.0 (https://getbootstrap.com)\n * Copyright 2011-2018 The Bootstrap Authors\n * Copyright 2011-2018 Twitter, Inc.\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)\n */\n\n@import \"functions\";\n@import \"variables\";\n@import \"mixins\";\n@import \"reboot\";\n","// stylelint-disable at-rule-no-vendor-prefix, declaration-no-important, selector-no-qualifying-type, property-no-vendor-prefix\n\n// Reboot\n//\n// Normalization of HTML elements, manually forked from Normalize.css to remove\n// styles targeting irrelevant browsers while applying new styles.\n//\n// Normalize is licensed MIT. https://github.com/necolas/normalize.css\n\n\n// Document\n//\n// 1. Change from `box-sizing: content-box` so that `width` is not affected by `padding` or `border`.\n// 2. Change the default font family in all browsers.\n// 3. Correct the line height in all browsers.\n// 4. Prevent adjustments of font size after orientation changes in IE on Windows Phone and in iOS.\n// 5. Setting @viewport causes scrollbars to overlap content in IE11 and Edge, so\n// we force a non-overlapping, non-auto-hiding scrollbar to counteract.\n// 6. Change the default tap highlight to be completely transparent in iOS.\n\n*,\n*::before,\n*::after {\n box-sizing: border-box; // 1\n}\n\nhtml {\n font-family: sans-serif; // 2\n line-height: 1.15; // 3\n -webkit-text-size-adjust: 100%; // 4\n -ms-text-size-adjust: 100%; // 4\n -ms-overflow-style: scrollbar; // 5\n -webkit-tap-highlight-color: rgba(0, 0, 0, 0); // 6\n}\n\n// IE10+ doesn't honor `` in some cases.\n@at-root {\n @-ms-viewport {\n width: device-width;\n }\n}\n\n// stylelint-disable selector-list-comma-newline-after\n// Shim for \"new\" HTML5 structural elements to display correctly (IE10, older browsers)\narticle, aside, dialog, figcaption, figure, footer, header, hgroup, main, nav, section {\n display: block;\n}\n// stylelint-enable selector-list-comma-newline-after\n\n// Body\n//\n// 1. Remove the margin in all browsers.\n// 2. As a best practice, apply a default `background-color`.\n// 3. Set an explicit initial text-align value so that we can later use the\n// the `inherit` value on things like `
` elements.\n\nbody {\n margin: 0; // 1\n font-family: $font-family-base;\n font-size: $font-size-base;\n font-weight: $font-weight-base;\n line-height: $line-height-base;\n color: $body-color;\n text-align: left; // 3\n background-color: $body-bg; // 2\n}\n\n// Suppress the focus outline on elements that cannot be accessed via keyboard.\n// This prevents an unwanted focus outline from appearing around elements that\n// might still respond to pointer events.\n//\n// Credit: https://github.com/suitcss/base\n[tabindex=\"-1\"]:focus {\n outline: 0 !important;\n}\n\n\n// Content grouping\n//\n// 1. Add the correct box sizing in Firefox.\n// 2. Show the overflow in Edge and IE.\n\nhr {\n box-sizing: content-box; // 1\n height: 0; // 1\n overflow: visible; // 2\n}\n\n\n//\n// Typography\n//\n\n// Remove top margins from headings\n//\n// By default, `
`-`
` all receive top and bottom margins. We nuke the top\n// margin for easier control within type scales as it avoids margin collapsing.\n// stylelint-disable selector-list-comma-newline-after\nh1, h2, h3, h4, h5, h6 {\n margin-top: 0;\n margin-bottom: $headings-margin-bottom;\n}\n// stylelint-enable selector-list-comma-newline-after\n\n// Reset margins on paragraphs\n//\n// Similarly, the top margin on `
`s get reset. However, we also reset the\n// bottom margin to use `rem` units instead of `em`.\np {\n margin-top: 0;\n margin-bottom: $paragraph-margin-bottom;\n}\n\n// Abbreviations\n//\n// 1. Remove the bottom border in Firefox 39-.\n// 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.\n// 3. Add explicit cursor to indicate changed behavior.\n// 4. Duplicate behavior to the data-* attribute for our tooltip plugin\n\nabbr[title],\nabbr[data-original-title] { // 4\n text-decoration: underline; // 2\n text-decoration: underline dotted; // 2\n cursor: help; // 3\n border-bottom: 0; // 1\n}\n\naddress {\n margin-bottom: 1rem;\n font-style: normal;\n line-height: inherit;\n}\n\nol,\nul,\ndl {\n margin-top: 0;\n margin-bottom: 1rem;\n}\n\nol ol,\nul ul,\nol ul,\nul ol {\n margin-bottom: 0;\n}\n\ndt {\n font-weight: $dt-font-weight;\n}\n\ndd {\n margin-bottom: .5rem;\n margin-left: 0; // Undo browser default\n}\n\nblockquote {\n margin: 0 0 1rem;\n}\n\ndfn {\n font-style: italic; // Add the correct font style in Android 4.3-\n}\n\n// stylelint-disable font-weight-notation\nb,\nstrong {\n font-weight: bolder; // Add the correct font weight in Chrome, Edge, and Safari\n}\n// stylelint-enable font-weight-notation\n\nsmall {\n font-size: 80%; // Add the correct font size in all browsers\n}\n\n//\n// Prevent `sub` and `sup` elements from affecting the line height in\n// all browsers.\n//\n\nsub,\nsup {\n position: relative;\n font-size: 75%;\n line-height: 0;\n vertical-align: baseline;\n}\n\nsub { bottom: -.25em; }\nsup { top: -.5em; }\n\n\n//\n// Links\n//\n\na {\n color: $link-color;\n text-decoration: $link-decoration;\n background-color: transparent; // Remove the gray background on active links in IE 10.\n -webkit-text-decoration-skip: objects; // Remove gaps in links underline in iOS 8+ and Safari 8+.\n\n @include hover {\n color: $link-hover-color;\n text-decoration: $link-hover-decoration;\n }\n}\n\n// And undo these styles for placeholder links/named anchors (without href)\n// which have not been made explicitly keyboard-focusable (without tabindex).\n// It would be more straightforward to just use a[href] in previous block, but that\n// causes specificity issues in many other styles that are too complex to fix.\n// See https://github.com/twbs/bootstrap/issues/19402\n\na:not([href]):not([tabindex]) {\n color: inherit;\n text-decoration: none;\n\n @include hover-focus {\n color: inherit;\n text-decoration: none;\n }\n\n &:focus {\n outline: 0;\n }\n}\n\n\n//\n// Code\n//\n\n// stylelint-disable font-family-no-duplicate-names\npre,\ncode,\nkbd,\nsamp {\n font-family: monospace, monospace; // Correct the inheritance and scaling of font size in all browsers.\n font-size: 1em; // Correct the odd `em` font sizing in all browsers.\n}\n// stylelint-enable font-family-no-duplicate-names\n\npre {\n // Remove browser default top margin\n margin-top: 0;\n // Reset browser default of `1em` to use `rem`s\n margin-bottom: 1rem;\n // Don't allow content to break outside\n overflow: auto;\n // We have @viewport set which causes scrollbars to overlap content in IE11 and Edge, so\n // we force a non-overlapping, non-auto-hiding scrollbar to counteract.\n -ms-overflow-style: scrollbar;\n}\n\n\n//\n// Figures\n//\n\nfigure {\n // Apply a consistent margin strategy (matches our type styles).\n margin: 0 0 1rem;\n}\n\n\n//\n// Images and content\n//\n\nimg {\n vertical-align: middle;\n border-style: none; // Remove the border on images inside links in IE 10-.\n}\n\nsvg:not(:root) {\n overflow: hidden; // Hide the overflow in IE\n}\n\n\n//\n// Tables\n//\n\ntable {\n border-collapse: collapse; // Prevent double borders\n}\n\ncaption {\n padding-top: $table-cell-padding;\n padding-bottom: $table-cell-padding;\n color: $text-muted;\n text-align: left;\n caption-side: bottom;\n}\n\nth {\n // Matches default `
` alignment by inheriting from the ``, or the\n // closest parent with a set `text-align`.\n text-align: inherit;\n}\n\n\n//\n// Forms\n//\n\nlabel {\n // Allow labels to use `margin` for spacing.\n display: inline-block;\n margin-bottom: .5rem;\n}\n\n// Remove the default `border-radius` that macOS Chrome adds.\n//\n// Details at https://github.com/twbs/bootstrap/issues/24093\nbutton {\n border-radius: 0;\n}\n\n// Work around a Firefox/IE bug where the transparent `button` background\n// results in a loss of the default `button` focus styles.\n//\n// Credit: https://github.com/suitcss/base/\nbutton:focus {\n outline: 1px dotted;\n outline: 5px auto -webkit-focus-ring-color;\n}\n\ninput,\nbutton,\nselect,\noptgroup,\ntextarea {\n margin: 0; // Remove the margin in Firefox and Safari\n font-family: inherit;\n font-size: inherit;\n line-height: inherit;\n}\n\nbutton,\ninput {\n overflow: visible; // Show the overflow in Edge\n}\n\nbutton,\nselect {\n text-transform: none; // Remove the inheritance of text transform in Firefox\n}\n\n// 1. Prevent a WebKit bug where (2) destroys native `audio` and `video`\n// controls in Android 4.\n// 2. Correct the inability to style clickable types in iOS and Safari.\nbutton,\nhtml [type=\"button\"], // 1\n[type=\"reset\"],\n[type=\"submit\"] {\n -webkit-appearance: button; // 2\n}\n\n// Remove inner border and padding from Firefox, but don't restore the outline like Normalize.\nbutton::-moz-focus-inner,\n[type=\"button\"]::-moz-focus-inner,\n[type=\"reset\"]::-moz-focus-inner,\n[type=\"submit\"]::-moz-focus-inner {\n padding: 0;\n border-style: none;\n}\n\ninput[type=\"radio\"],\ninput[type=\"checkbox\"] {\n box-sizing: border-box; // 1. Add the correct box sizing in IE 10-\n padding: 0; // 2. Remove the padding in IE 10-\n}\n\n\ninput[type=\"date\"],\ninput[type=\"time\"],\ninput[type=\"datetime-local\"],\ninput[type=\"month\"] {\n // Remove the default appearance of temporal inputs to avoid a Mobile Safari\n // bug where setting a custom line-height prevents text from being vertically\n // centered within the input.\n // See https://bugs.webkit.org/show_bug.cgi?id=139848\n // and https://github.com/twbs/bootstrap/issues/11266\n -webkit-appearance: listbox;\n}\n\ntextarea {\n overflow: auto; // Remove the default vertical scrollbar in IE.\n // Textareas should really only resize vertically so they don't break their (horizontal) containers.\n resize: vertical;\n}\n\nfieldset {\n // Browsers set a default `min-width: min-content;` on fieldsets,\n // unlike e.g. `
` elements.\n\nbody {\n margin: 0; // 1\n font-family: $font-family-base;\n font-size: $font-size-base;\n font-weight: $font-weight-base;\n line-height: $line-height-base;\n color: $body-color;\n text-align: left; // 3\n background-color: $body-bg; // 2\n}\n\n// Suppress the focus outline on elements that cannot be accessed via keyboard.\n// This prevents an unwanted focus outline from appearing around elements that\n// might still respond to pointer events.\n//\n// Credit: https://github.com/suitcss/base\n[tabindex=\"-1\"]:focus {\n outline: 0 !important;\n}\n\n\n// Content grouping\n//\n// 1. Add the correct box sizing in Firefox.\n// 2. Show the overflow in Edge and IE.\n\nhr {\n box-sizing: content-box; // 1\n height: 0; // 1\n overflow: visible; // 2\n}\n\n\n//\n// Typography\n//\n\n// Remove top margins from headings\n//\n// By default, `
`-`
` all receive top and bottom margins. We nuke the top\n// margin for easier control within type scales as it avoids margin collapsing.\n// stylelint-disable selector-list-comma-newline-after\nh1, h2, h3, h4, h5, h6 {\n margin-top: 0;\n margin-bottom: $headings-margin-bottom;\n}\n// stylelint-enable selector-list-comma-newline-after\n\n// Reset margins on paragraphs\n//\n// Similarly, the top margin on `
`s get reset. However, we also reset the\n// bottom margin to use `rem` units instead of `em`.\np {\n margin-top: 0;\n margin-bottom: $paragraph-margin-bottom;\n}\n\n// Abbreviations\n//\n// 1. Remove the bottom border in Firefox 39-.\n// 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.\n// 3. Add explicit cursor to indicate changed behavior.\n// 4. Duplicate behavior to the data-* attribute for our tooltip plugin\n\nabbr[title],\nabbr[data-original-title] { // 4\n text-decoration: underline; // 2\n text-decoration: underline dotted; // 2\n cursor: help; // 3\n border-bottom: 0; // 1\n}\n\naddress {\n margin-bottom: 1rem;\n font-style: normal;\n line-height: inherit;\n}\n\nol,\nul,\ndl {\n margin-top: 0;\n margin-bottom: 1rem;\n}\n\nol ol,\nul ul,\nol ul,\nul ol {\n margin-bottom: 0;\n}\n\ndt {\n font-weight: $dt-font-weight;\n}\n\ndd {\n margin-bottom: .5rem;\n margin-left: 0; // Undo browser default\n}\n\nblockquote {\n margin: 0 0 1rem;\n}\n\ndfn {\n font-style: italic; // Add the correct font style in Android 4.3-\n}\n\n// stylelint-disable font-weight-notation\nb,\nstrong {\n font-weight: bolder; // Add the correct font weight in Chrome, Edge, and Safari\n}\n// stylelint-enable font-weight-notation\n\nsmall {\n font-size: 80%; // Add the correct font size in all browsers\n}\n\n//\n// Prevent `sub` and `sup` elements from affecting the line height in\n// all browsers.\n//\n\nsub,\nsup {\n position: relative;\n font-size: 75%;\n line-height: 0;\n vertical-align: baseline;\n}\n\nsub { bottom: -.25em; }\nsup { top: -.5em; }\n\n\n//\n// Links\n//\n\na {\n color: $link-color;\n text-decoration: $link-decoration;\n background-color: transparent; // Remove the gray background on active links in IE 10.\n -webkit-text-decoration-skip: objects; // Remove gaps in links underline in iOS 8+ and Safari 8+.\n\n @include hover {\n color: $link-hover-color;\n text-decoration: $link-hover-decoration;\n }\n}\n\n// And undo these styles for placeholder links/named anchors (without href)\n// which have not been made explicitly keyboard-focusable (without tabindex).\n// It would be more straightforward to just use a[href] in previous block, but that\n// causes specificity issues in many other styles that are too complex to fix.\n// See https://github.com/twbs/bootstrap/issues/19402\n\na:not([href]):not([tabindex]) {\n color: inherit;\n text-decoration: none;\n\n @include hover-focus {\n color: inherit;\n text-decoration: none;\n }\n\n &:focus {\n outline: 0;\n }\n}\n\n\n//\n// Code\n//\n\n// stylelint-disable font-family-no-duplicate-names\npre,\ncode,\nkbd,\nsamp {\n font-family: monospace, monospace; // Correct the inheritance and scaling of font size in all browsers.\n font-size: 1em; // Correct the odd `em` font sizing in all browsers.\n}\n// stylelint-enable font-family-no-duplicate-names\n\npre {\n // Remove browser default top margin\n margin-top: 0;\n // Reset browser default of `1em` to use `rem`s\n margin-bottom: 1rem;\n // Don't allow content to break outside\n overflow: auto;\n // We have @viewport set which causes scrollbars to overlap content in IE11 and Edge, so\n // we force a non-overlapping, non-auto-hiding scrollbar to counteract.\n -ms-overflow-style: scrollbar;\n}\n\n\n//\n// Figures\n//\n\nfigure {\n // Apply a consistent margin strategy (matches our type styles).\n margin: 0 0 1rem;\n}\n\n\n//\n// Images and content\n//\n\nimg {\n vertical-align: middle;\n border-style: none; // Remove the border on images inside links in IE 10-.\n}\n\nsvg:not(:root) {\n overflow: hidden; // Hide the overflow in IE\n}\n\n\n//\n// Tables\n//\n\ntable {\n border-collapse: collapse; // Prevent double borders\n}\n\ncaption {\n padding-top: $table-cell-padding;\n padding-bottom: $table-cell-padding;\n color: $text-muted;\n text-align: left;\n caption-side: bottom;\n}\n\nth {\n // Matches default `
` alignment by inheriting from the ``, or the\n // closest parent with a set `text-align`.\n text-align: inherit;\n}\n\n\n//\n// Forms\n//\n\nlabel {\n // Allow labels to use `margin` for spacing.\n display: inline-block;\n margin-bottom: .5rem;\n}\n\n// Remove the default `border-radius` that macOS Chrome adds.\n//\n// Details at https://github.com/twbs/bootstrap/issues/24093\nbutton {\n border-radius: 0;\n}\n\n// Work around a Firefox/IE bug where the transparent `button` background\n// results in a loss of the default `button` focus styles.\n//\n// Credit: https://github.com/suitcss/base/\nbutton:focus {\n outline: 1px dotted;\n outline: 5px auto -webkit-focus-ring-color;\n}\n\ninput,\nbutton,\nselect,\noptgroup,\ntextarea {\n margin: 0; // Remove the margin in Firefox and Safari\n font-family: inherit;\n font-size: inherit;\n line-height: inherit;\n}\n\nbutton,\ninput {\n overflow: visible; // Show the overflow in Edge\n}\n\nbutton,\nselect {\n text-transform: none; // Remove the inheritance of text transform in Firefox\n}\n\n// 1. Prevent a WebKit bug where (2) destroys native `audio` and `video`\n// controls in Android 4.\n// 2. Correct the inability to style clickable types in iOS and Safari.\nbutton,\nhtml [type=\"button\"], // 1\n[type=\"reset\"],\n[type=\"submit\"] {\n -webkit-appearance: button; // 2\n}\n\n// Remove inner border and padding from Firefox, but don't restore the outline like Normalize.\nbutton::-moz-focus-inner,\n[type=\"button\"]::-moz-focus-inner,\n[type=\"reset\"]::-moz-focus-inner,\n[type=\"submit\"]::-moz-focus-inner {\n padding: 0;\n border-style: none;\n}\n\ninput[type=\"radio\"],\ninput[type=\"checkbox\"] {\n box-sizing: border-box; // 1. Add the correct box sizing in IE 10-\n padding: 0; // 2. Remove the padding in IE 10-\n}\n\n\ninput[type=\"date\"],\ninput[type=\"time\"],\ninput[type=\"datetime-local\"],\ninput[type=\"month\"] {\n // Remove the default appearance of temporal inputs to avoid a Mobile Safari\n // bug where setting a custom line-height prevents text from being vertically\n // centered within the input.\n // See https://bugs.webkit.org/show_bug.cgi?id=139848\n // and https://github.com/twbs/bootstrap/issues/11266\n -webkit-appearance: listbox;\n}\n\ntextarea {\n overflow: auto; // Remove the default vertical scrollbar in IE.\n // Textareas should really only resize vertically so they don't break their (horizontal) containers.\n resize: vertical;\n}\n\nfieldset {\n // Browsers set a default `min-width: min-content;` on fieldsets,\n // unlike e.g. `
