update opcua modules - remove unnecessary data transformation

eclipse-thingweb · Sep 7, 2023 · 7e3bcea · 7e3bcea
1 parent 949a7e1
commit 7e3bcea
Show file tree

Hide file tree

Showing 7 changed files with 2,218 additions and 1,521 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -47,6 +47,7 @@
         "@testdeck/mocha": "^0.1.2",
         "@types/chai": "^4.2.18",
         "@types/chai-as-promised": "^7.1.4",
+        "@types/lodash": "^4.14.197",
         "@types/mocha": "^9.0.0",
         "@types/node": "16.18.35",
         "@types/readable-stream": "^2.3.13",

diff --git a/packages/binding-opcua/package.json b/packages/binding-opcua/package.json
@@ -42,29 +42,28 @@
         "@node-wot/td-tools": "0.8.8",
         "ajv": "^8.11.0",
         "ajv-formats": "^2.1.1",
-        "node-opcua-address-space": "2.77.0",
-        "node-opcua-basic-types": "2.77.0",
-        "node-opcua-binary-stream": "2.77.0",
-        "node-opcua-buffer-utils": "2.77.0",
-        "node-opcua-client": "2.77.0",
-        "node-opcua-constants": "2.77.0",
-        "node-opcua-data-model": "2.77.0",
-        "node-opcua-data-value": "2.77.0",
-        "node-opcua-date-time": "2.77.0",
-        "node-opcua-debug": "2.77.0",
-        "node-opcua-extension-object": "2.77.0",
-        "node-opcua-factory": "2.77.0",
-        "node-opcua-json": "0.19.1",
-        "node-opcua-nodeid": "2.77.0",
-        "node-opcua-numeric-range": "2.77.0",
-        "node-opcua-pseudo-session": "2.77.0",
-        "node-opcua-pubsub-client": "0.19.1",
-        "node-opcua-service-browse": "2.77.0",
-        "node-opcua-service-translate-browse-path": "2.77.0",
-        "node-opcua-status-code": "2.77.0",
-        "node-opcua-types": "2.77.0",
-        "node-opcua-variant": "2.77.0",
-        "node-opcua": "2.77.0",
+        "node-opcua-address-space": "2.112.0",
+        "node-opcua-basic-types": "2.111.0",
+        "node-opcua-binary-stream": "2.110.0",
+        "node-opcua-buffer-utils": "2.110.0",
+        "node-opcua-client": "2.112.0",
+        "node-opcua-constants": "2.98.1",
+        "node-opcua-data-model": "2.112.0",
+        "node-opcua-data-value": "2.112.0",
+        "node-opcua-date-time": "2.111.0",
+        "node-opcua-debug": "2.110.0",
+        "node-opcua-extension-object": "2.112.0",
+        "node-opcua-factory": "2.112.0",
+        "node-opcua-json": "0.50.0",
+        "node-opcua-nodeid": "2.110.0",
+        "node-opcua-numeric-range": "2.112.0",
+        "node-opcua-pseudo-session": "2.112.0",
+        "node-opcua-service-browse": "2.112.0",
+        "node-opcua-service-translate-browse-path": "2.112.0",
+        "node-opcua-status-code": "2.110.0",
+        "node-opcua-types": "2.112.0",
+        "node-opcua-variant": "2.112.0",
+        "node-opcua": "2.112.0",
         "rxjs": "5.5.11"
     },
     "scripts": {

diff --git a/packages/binding-opcua/src/codec.ts b/packages/binding-opcua/src/codec.ts
@@ -266,7 +266,7 @@ export class OpcuaBinaryCodec implements ContentCodec {
         const binaryStream = new BinaryStream(bytes);
         const dataValue = new DataValue();
         dataValue.decode(binaryStream);
-        return JSON.parse(JSON.stringify(opcuaJsonEncodeDataValue(dataValue, true)));
+        return opcuaJsonEncodeDataValue(dataValue, true);
     }
 
     valueToBytes(

diff --git a/packages/binding-opcua/src/opcua-protocol-client.ts b/packages/binding-opcua/src/opcua-protocol-client.ts
@@ -48,7 +48,7 @@ import { schemaDataValue } from "./codec";
 import { FormElementProperty } from "wot-thing-description-types";
 import { opcuaJsonEncodeVariant } from "node-opcua-json";
 import { Argument, BrowseDescription, BrowseResult } from "node-opcua-types";
-import { isGoodish, ReferenceTypeIds } from "node-opcua";
+import { isGoodish2, ReferenceTypeIds } from "node-opcua";
 
 const { debug } = createLoggers("binding-opcua", "opcua-protocol-client");
 
@@ -308,7 +308,7 @@ export class OPCUAProtocolClient implements ProtocolClient {
             return statusCode;
         });
         debug(`writeResource: statusCode ${statusCode}`);
-        if (statusCode !== StatusCodes.Good && !isGoodish(statusCode)) {
+        if (statusCode !== StatusCodes.Good && !isGoodish2(statusCode, { treatUncertainAsBad: false })) {
             throw new Error("Error in OPCUA Write : " + statusCode.toString());
         }
     }

diff --git a/packages/binding-opcua/test/client-test.ts b/packages/binding-opcua/test/client-test.ts
@@ -40,9 +40,6 @@ describe("OPCUA Client", function () {
         const codecSerDes = ContentSerdes.get();
         codecSerDes.addCodec(new OpcuaJSONCodec());
     });
-    after(async () => {
-        await opcuaServer.shutdown();
-    });
 
     let client: OPCUAProtocolClient;
     before(async function () {
@@ -51,6 +48,10 @@ describe("OPCUA Client", function () {
     after(async () => {
         await client.stop();
     });
+    // server shall stop after client
+    after(async () => {
+        await opcuaServer.shutdown();
+    });
 
     [
         // 0

diff --git a/packages/binding-opcua/test/full-opcua-thing-test.ts b/packages/binding-opcua/test/full-opcua-thing-test.ts
@@ -308,6 +308,10 @@ describe("Full OPCUA Thing Test", () => {
         opcuaServer = await startServer();
         endpoint = opcuaServer.getEndpointUrl();
         debug(`endpoint =  ${endpoint}`);
+
+        // ajdust TD to endpoint
+        thingDescription.base = endpoint;
+        (thingDescription.opcua as unknown as { endpoint: string }).endpoint = endpoint;
     });
     after(async () => {
         await opcuaServer.shutdown();
@@ -327,20 +331,22 @@ describe("Full OPCUA Thing Test", () => {
         let temperature = 10;
         thing.setPropertyReadHandler("temperature", async () => temperature);
 
-        const expThing = thing as ExposedThing;
-        const readHandler = expThing.__propertyHandlers.get("temperature")?.readHandler;
-        if (!readHandler) {
-            expect.fail("must have a readHandler");
-        }
-        const temperatureCheck1 = await readHandler();
-        expect(temperatureCheck1).to.equal(10);
-
-        temperature = 100;
+        try {
+            const expThing = thing as ExposedThing;
+            const readHandler = expThing.__propertyHandlers.get("temperature")?.readHandler;
+            if (!readHandler) {
+                expect.fail("must have a readHandler");
+            }
+            const temperatureCheck1 = await readHandler();
+            expect(temperatureCheck1).to.equal(10);
 
-        const temperatureCheck2 = await readHandler();
-        expect(temperatureCheck2).to.equal(100);
+            temperature = 100;
 
-        await servient.shutdown();
+            const temperatureCheck2 = await readHandler();
+            expect(temperatureCheck2).to.equal(100);
+        } finally {
+            await servient.shutdown();
+        }
     });
 
     async function makeThing() {