Feature/tether4

.github/workflows/npm-publish-github-packages.yml

@@ -18,9 +18,9 @@ jobs:
           node-version: 16
       - name: install
         run: npm install
-        working-directory: base_agent/js
+        working-directory: lib/js
       - run: npm run build
-        working-directory: base_agent/js
+        working-directory: lib/js
 
   publish-gpr:
     needs: build
@@ -35,8 +35,8 @@ jobs:
           node-version: 16
           registry-url: https://npm.pkg.github.com/
       - run: npm i
-        working-directory: base_agent/js
+        working-directory: lib/js
       - run: npm publish
-        working-directory: base_agent/js
+        working-directory: lib/js
         env:
           NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

.gitmodules

@@ -1,12 +1,12 @@
-[submodule "base_agent/cpp/libs/paho.mqtt.cpp"]
-	path = base_agent/cpp/libs/paho.mqtt.cpp
+[submodule "lib/cpp/libs/paho.mqtt.cpp"]
+	path = lib/cpp/libs/paho.mqtt.cpp
 	url = https://github.com/eclipse/paho.mqtt.cpp.git
-[submodule "base_agent/cpp/libs/paho.mqtt.c"]
-	path = base_agent/cpp/libs/paho.mqtt.c
+[submodule "lib/cpp/libs/paho.mqtt.c"]
+	path = lib/cpp/libs/paho.mqtt.c
 	url = https://github.com/eclipse/paho.mqtt.c.git
-[submodule "base_agent/cpp/libs/msgpack"]
-	path = base_agent/cpp/libs/msgpack
+[submodule "lib/cpp/libs/msgpack"]
+	path = lib/cpp/libs/msgpack
 	url = https://github.com/msgpack/msgpack-c.git
-[submodule "base_agent/cpp/libs/json"]
-	path = base_agent/cpp/libs/json
+[submodule "lib/cpp/libs/json"]
+	path = lib/cpp/libs/json
 	url = git@github.com:nlohmann/json.git

.vscode/launch.json

@@ -11,7 +11,7 @@
       "cargo": {
           "args": [
             "test", "--no-run", "--lib",
-            "--manifest-path", "${workspaceFolder}/base_agent/rs/Cargo.toml"
+            "--manifest-path", "${workspaceFolder}/lib/rust/Cargo.toml"
           ], // Cargo command line to build the debug target
           // "args": ["build", "--bin=foo"] is another possibility
           // "filter": { // Filter applied to compilation artifacts (optional)
@@ -25,11 +25,10 @@
     "type": "lldb",
     "request": "launch",
     "name": "Debug Tether Utils",
-    // "cwd": "${workspaceFolder}/utilities/tether-utils",
     "cargo": {
       "args": [
         "build",
-        "--manifest-path", "${workspaceFolder}/utilities/tether-utils/Cargo.toml"
+        "--manifest-path", "${workspaceFolder}/tether-utils/Cargo.toml"
       ]
     },
     "args": ["receive", "--plug.role=custom"]
@@ -41,20 +40,26 @@
     "skipFiles": [
       "<node_internals>/**"
     ],
-    "type": "pwa-node"
+    "type": "node"
   },
-    {
-      "type": "pwa-node",
-      "request": "launch",
-      "name": "Launch Program",
-      "skipFiles": [
-        "<node_internals>/**"
-      ],
-      "program": "${workspaceFolder}/src/index.ts",
-      "preLaunchTask": "tsc: build - tsconfig.json",
-      "outFiles": [
-        "${workspaceFolder}/dist/**/*.js"
-      ]
-    }
+  {
+    "name": "Debug NodeJS Base Agent Tests",
+    "type": "node",
+            "request": "launch",
+            "runtimeExecutable": "${workspaceRoot}/lib/js/node_modules/.bin/jest",
+            "args": [
+                "${fileBasenameNoExtension}",
+                "--runInBand",
+                "--watch",
+                "--coverage=false",
+                "--no-cache"
+            ],
+            "cwd": "${workspaceRoot}/lib/js",
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen",
+            "sourceMaps": true,
+
+  }
+
   ]
 }

.vscode/settings.json

@@ -92,8 +92,8 @@
   },
   "cmake.configureOnOpen": false,
   "rust-analyzer.linkedProjects": [
-    "${workspaceFolder}/base_agent/rs/Cargo.toml",
-    "${workspaceFolder}/utilities/tether-utils/Cargo.toml"
+    "${workspaceFolder}/lib/rust/Cargo.toml",
+    "${workspaceFolder}/tether-utils/Cargo.toml"
   ],
   "pylint.importStrategy": "fromEnvironment"
 }