Upgrade dependencies, skip mbus tests under Windows, use Node 22 in CI (

#1302) * chore(deps): upgrade node-coap to version 1.4.0 * chore(deps): update @types/readable-stream in node-wot Co-Authored-By: Jan Romann <[email protected]> * chore(binding-mbus): upgrade node-mbus to version 2.2.4 * chore(binding-modbus): upgrade modbus-serial to version 8.0.17 * test(binding-modbus): use correct socketError event name * refactor: recreate package-lock.json Co-Authored-By: Jan Romann <[email protected]> * ci: add Node 22 to the CI matrix * test: skip mbus tests under windows --------- Co-authored-by: danielpeintner <[email protected]>
eclipse-thingweb · Jul 11, 2024 · fe9a15a · fe9a15a
1 parent 5e2b362
commit fe9a15a
Show file tree

Hide file tree

Showing 9 changed files with 2,399 additions and 1,044 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -19,7 +19,7 @@ jobs:
         strategy:
             matrix:
                 os: [macos-latest, ubuntu-latest, windows-latest]
-                node-version: [18.x, 20.x]
+                node-version: [18.x, 20.x, 22.x]
 
         timeout-minutes: 30
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -50,7 +50,7 @@
         "@types/chai-spies": "^1.0.4",
         "@types/mocha": "^9.0.0",
         "@types/node": "16.18.35",
-        "@types/readable-stream": "^2.3.13",
+        "@types/readable-stream": "^4.0.15",
         "@types/sinon": "10.0.2",
         "@typescript-eslint/eslint-plugin": "^6.7.3",
         "@typescript-eslint/parser": "^6.7.3",

diff --git a/packages/binding-coap/package.json b/packages/binding-coap/package.json
@@ -17,7 +17,7 @@
         "@node-wot/core": "0.8.15",
         "@node-wot/td-tools": "0.8.15",
         "@types/node": "16.18.35",
-        "coap": "^1.3.0",
+        "coap": "^1.4.0",
         "multicast-dns": "^7.2.5",
         "node-coap-client": "1.0.8",
         "rxjs": "5.5.11",

diff --git a/packages/binding-mbus/package.json b/packages/binding-mbus/package.json
@@ -16,7 +16,7 @@
     "dependencies": {
         "@node-wot/core": "0.8.15",
         "@node-wot/td-tools": "0.8.15",
-        "node-mbus": "^2.1.0",
+        "node-mbus": "^2.2.4",
         "wot-typescript-definitions": "0.8.0-SNAPSHOT.29"
     },
     "scripts": {

diff --git a/packages/binding-mbus/test/mbus-client-test.ts b/packages/binding-mbus/test/mbus-client-test.ts
@@ -45,7 +45,11 @@ describe("mbus client test", () => {
         /* nothing */
     });
 
-    it("should override form values with URL", () => {
+    it("should override form values with URL", function () {
+        if (process.platform === "win32") {
+            this.skip();
+        }
+
         const form: MBusForm = {
             href: "mbus+tcp://127.0.0.1:805/2?offset=2&timeout=5",
             "mbus:offset": 0,
@@ -69,7 +73,11 @@ describe("mbus client test", () => {
     });
 
     describe("read resource", () => {
-        it("should throw exception for missing offset", () => {
+        it("should throw exception for missing offset", function () {
+            if (process.platform === "win32") {
+                this.skip();
+            }
+
             const form: MBusForm = {
                 href: "mbus+tcp://127.0.0.1:805",
                 "mbus:unitID": 1,

diff --git a/packages/binding-mbus/test/mbus-connection-test.ts b/packages/binding-mbus/test/mbus-connection-test.ts
@@ -31,7 +31,11 @@ describe("mbus connection test", () => {
         /* nothing */
     });
 
-    it("should throw for timeout", () => {
+    it("should throw for timeout", function () {
+        if (process.platform === "win32") {
+            this.skip();
+        }
+
         const connection = new MBusConnection("127.0.0.1", 806, {
             connectionTimeout: 200,
             connectionRetryTime: 10,
@@ -41,7 +45,11 @@ describe("mbus connection test", () => {
     }).timeout(10000);
 
     describe("Operation", () => {
-        it("should throw with timeout", async () => {
+        it("should throw with timeout", async function () {
+            if (process.platform === "win32") {
+                this.skip();
+            }
+
             const form: MBusForm = {
                 href: "mbus+tcp://127.0.0.1:806",
                 "mbus:offset": 0,

diff --git a/packages/binding-modbus/package.json b/packages/binding-modbus/package.json
@@ -19,7 +19,7 @@
     "dependencies": {
         "@node-wot/core": "0.8.15",
         "@node-wot/td-tools": "0.8.15",
-        "modbus-serial": "8.0.3",
+        "modbus-serial": "^8.0.17",
         "rxjs": "5.5.11",
         "wot-typescript-definitions": "0.8.0-SNAPSHOT.29"
     },

diff --git a/packages/binding-modbus/test/test-modbus-server.ts b/packages/binding-modbus/test/test-modbus-server.ts
@@ -78,7 +78,7 @@ export default class ModbusServer {
 
     public start(): Promise<unknown> {
         return new Promise((resolve) => {
-            this.serverTCP.on("SocketError", (err: Error | null) => {
+            this.serverTCP.on("socketError", (err: Error | null) => {
                 // Handle socket error if needed, can be ignored
                 error("SocketError:", err?.toString());
             });