Merge branch 'feature/https' of https://github.com/ki-do/test-things into feature/https

Author: Kirill Dorofeev

scripts/installDependencies.sh

@@ -1,8 +1,14 @@
 #!/bin/bash
 
+# Remove nested local node_modules to avoid shadowing workspace dependencies in CI.
+find things -type d -name node_modules -prune -exec rm -rf {} +
+
 # Install dependencies for npm workspaces packages
 npm ci
 
+npm --workspace ./util run clean
+npm --workspace ./util run build
+
 # Install dependencies for non-npm packages
 for protocol_directory in things/*/*/* ; do
     current_path="$(pwd)"

scripts/runTests.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
 # default to HTTP unless explicitly overridden.
+export HOSTNAME="127.0.0.1"
+export STACK_HOSTNAME="127.0.0.1"
 export PROTOCOL="${PROTOCOL:-http}"
-export HOSTNAME="${HOSTNAME:-127.0.0.1}"
-export STACK_HOSTNAME="${STACK_HOSTNAME:-127.0.0.1}"
 export WEB_PORT_OUT="${WEB_PORT_OUT:-80}"
 export EXTERNAL_PORT="${EXTERNAL_PORT:-80}"
 

things/calculator/mqtt/js/package.json

@@ -18,6 +18,7 @@
     "license": "EPL-2.0 OR W3C-20150513",
     "dependencies": {
         "dotenv": "^16.3.1",
+        "duplexify": "^4.1.2",
         "json-placeholder-replacer": "^1.0.35",
         "mqtt": "^4.3.8",
         "yallist": "^4.0.0",

util/dist/util.js

@@ -48,8 +48,9 @@ export const getInitiateMain = (mainCmd: string, cmdArgs: string[]): Promise<Thi
         const thingProcess = spawn(mainCmd, cmdArgs, {
             env: {
                 ...process.env,
+                HOSTNAME: "127.0.0.1",
+                STACK_HOSTNAME: "127.0.0.1",
                 PROTOCOL: process.env.PROTOCOL ?? "http",
-                HOSTNAME: process.env.HOSTNAME ?? "127.0.0.1",
                 PORT: process.env.PORT ?? derivedPort ?? "80",
                 EXTERNAL_PORT: process.env.EXTERNAL_PORT ?? derivedPort ?? "80",
             },