node-opcua-address-space 2.176.0 → 2.178.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-address-space",
-    "version": "2.176.0",
+    "version": "2.178.0",
     "description": "pure nodejs OPCUA SDK - module address-space",
     "main": "./dist/src/index_current.js",
     "types": "./dist/source/index.d.ts",
@@ -18,38 +18,38 @@
         "fix:tsconfig": "node ../../code_gen/extract-modules.js tsconfig_base.json"
     },
     "dependencies": {
-        "@types/semver": "7.7.1",
+        "@types/semver": "7.8.0",
         "chalk": "4.1.2",
         "dequeue": "^1.0.5",
-        "node-opcua-address-space-base": "2.176.0",
+        "node-opcua-address-space-base": "2.178.0",
         "node-opcua-assert": "2.175.6",
-        "node-opcua-basic-types": "2.176.0",
+        "node-opcua-basic-types": "2.177.0",
         "node-opcua-binary-stream": "2.176.0",
-        "node-opcua-client-dynamic-extension-object": "2.176.0",
+        "node-opcua-client-dynamic-extension-object": "2.178.0",
         "node-opcua-constants": "2.176.0",
-        "node-opcua-crypto": "5.4.0",
-        "node-opcua-data-access": "2.176.0",
-        "node-opcua-data-model": "2.176.0",
-        "node-opcua-data-value": "2.176.0",
+        "node-opcua-crypto": "5.6.0",
+        "node-opcua-data-access": "2.177.0",
+        "node-opcua-data-model": "2.177.0",
+        "node-opcua-data-value": "2.177.0",
         "node-opcua-date-time": "2.176.0",
         "node-opcua-debug": "2.175.6",
         "node-opcua-enum": "2.176.0",
-        "node-opcua-extension-object": "2.176.0",
-        "node-opcua-factory": "2.176.0",
-        "node-opcua-nodeid": "2.176.0",
-        "node-opcua-nodeset-ua": "2.176.0",
-        "node-opcua-numeric-range": "2.176.0",
+        "node-opcua-extension-object": "2.177.0",
+        "node-opcua-factory": "2.177.0",
+        "node-opcua-nodeid": "2.177.0",
+        "node-opcua-nodeset-ua": "2.178.0",
+        "node-opcua-numeric-range": "2.177.0",
         "node-opcua-object-registry": "2.175.6",
-        "node-opcua-pseudo-session": "2.176.0",
-        "node-opcua-service-browse": "2.176.0",
-        "node-opcua-service-call": "2.176.0",
-        "node-opcua-service-history": "2.176.0",
-        "node-opcua-service-translate-browse-path": "2.176.0",
-        "node-opcua-service-write": "2.176.0",
+        "node-opcua-pseudo-session": "2.178.0",
+        "node-opcua-service-browse": "2.177.0",
+        "node-opcua-service-call": "2.177.0",
+        "node-opcua-service-history": "2.177.0",
+        "node-opcua-service-translate-browse-path": "2.177.0",
+        "node-opcua-service-write": "2.177.0",
         "node-opcua-status-code": "2.176.0",
-        "node-opcua-types": "2.176.0",
+        "node-opcua-types": "2.177.0",
         "node-opcua-utils": "2.176.0",
-        "node-opcua-variant": "2.176.0",
+        "node-opcua-variant": "2.177.0",
         "node-opcua-xml2json": "2.176.0",
         "semver": "^7.8.5",
         "thenify-ex": "4.4.0",
@@ -60,9 +60,9 @@
         "node-opcua-benchmarker": "2.176.0",
         "node-opcua-leak-detector": "2.175.6",
         "node-opcua-nodesets": "2.175.3",
-        "node-opcua-packet-analyzer": "2.176.0",
-        "node-opcua-schemas": "2.176.0",
-        "node-opcua-service-filter": "2.176.0",
+        "node-opcua-packet-analyzer": "2.177.0",
+        "node-opcua-schemas": "2.177.0",
+        "node-opcua-service-filter": "2.178.0",
         "node-opcua-test-fixtures": "2.175.1"
     },
     "author": "Etienne Rossignon",
@@ -80,7 +80,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "a4569830a5a564a7ff3e8cf37c44fd35b3f72ac1",
+    "gitHead": "d0e850e5f7df80e14ceb6d8e092e793472965301",
     "files": [
         "dist",
         "distHelpers",

package/source/loader/load_nodeset2.ts

@@ -16,7 +16,7 @@ import type {
     UAVariable,
     UAVariableType
 } from "node-opcua-address-space-base";
-import { assert, renderError } from "node-opcua-assert";
+import { assert } from "node-opcua-assert";
 import { coerceBoolean, coerceByte, coerceInt32, StatusCodes } from "node-opcua-basic-types";
 import { DataTypeIds } from "node-opcua-constants";
 import {
@@ -1160,7 +1160,19 @@ function makeNodeSetParserEngine(addressSpace: IAddressSpace, options: NodeSetLo
                     chalk.green("DONE")
             );
 
-        async function performPostLoadingTasks(tasks: Task[]): Promise<void> {
+        /**
+         * run every queued post-loading task.
+         *
+         * A task that throws (typically: a `<Value>` in a third-party nodeset that does not
+         * match the declared DataType) is logged and skipped — it must NOT abort the remaining
+         * tasks nor the remaining stages of finalSteps(). Previously the failing task was
+         * re-run inside the catch block, the second throw escaped the loop, finalSteps() was
+         * abandoned and `ensureDatatypeExtracted` was never called: the address space was
+         * left half-initialised (no DataTypeManager) and any later use of a structured
+         * DataType failed with an opaque
+         * "Cannot read properties of undefined (reading 'getExtensionObjectConstructorFromDataType')".
+         */
+        async function performPostLoadingTasks(stage: string, tasks: Task[]): Promise<void> {
             for (const task of tasks) {
                 try {
                     await task(addressSpace1);
@@ -1168,9 +1180,11 @@ function makeNodeSetParserEngine(addressSpace: IAddressSpace, options: NodeSetLo
                     // c8 ignore next
                     // tslint:disable:no-console
                     if (types.isNativeError(err)) {
-                        errorLog(" performPostLoadingTasks Err  => ", err.message, "\n", err);
+                        errorLog(
+                            `[NODE-OPCUA-W36] generateAddressSpace: post-loading task failed during "${stage}" and was skipped: ${err.message}`
+                        );
+                        doDebug && debugLog(err);
                     }
-                    await task(addressSpace1);
                 }
             }
             tasks.splice(0);
@@ -1179,11 +1193,11 @@ function makeNodeSetParserEngine(addressSpace: IAddressSpace, options: NodeSetLo
             /// ----------------------------------------------------------------------------------------
             // perform post task
             doDebug && debugLog(chalk.bgGreenBright("Performing post loading tasks -------------------------------------------"));
-            await performPostLoadingTasks(postTasks);
+            await performPostLoadingTasks("post tasks", postTasks);
 
             doDebug &&
                 debugLog(chalk.bgGreenBright("Performing post loading task: Initializing Simple Variables ---------------------"));
-            await performPostLoadingTasks(postTasks0_InitializeVariable);
+            await performPostLoadingTasks("initializing simple variables", postTasks0_InitializeVariable);
 
             doDebug && debugLog(chalk.bgGreenBright("Performing DataType extraction -------------------------------------------"));
             assert(!addressSpace1.suspendBackReference);
@@ -1202,14 +1216,17 @@ function makeNodeSetParserEngine(addressSpace: IAddressSpace, options: NodeSetLo
             pendingSimpleTypeToRegister.splice(0);
 
             doDebug && debugLog(chalk.bgGreenBright("Performing post loading task: Decoding Pojo String (parsing XML objects) -"));
-            await performPostLoadingTasks(postTasks0_DecodePojoString);
+            await performPostLoadingTasks("decoding XML extension objects", postTasks0_DecodePojoString);
 
             doDebug &&
                 debugLog(chalk.bgGreenBright("Performing post loading task: Initializing Complex Variables ---------------------"));
-            await performPostLoadingTasks(postTasks1_InitializeVariable);
+            await performPostLoadingTasks("initializing complex variables", postTasks1_InitializeVariable);
 
             doDebug && debugLog(chalk.bgGreenBright("Performing post loading tasks: (assigning Extension Object to Variables) -"));
-            await performPostLoadingTasks(postTasks2_AssignedExtensionObjectToDataValue);
+            await performPostLoadingTasks(
+                "assigning extension objects to variables",
+                postTasks2_AssignedExtensionObjectToDataValue
+            );
 
             doDebug && debugLog(chalk.bgGreenBright("Performing post variable initialization ---------------------"));
             promoteObjectsAndVariables(addressSpace);
@@ -1218,7 +1235,13 @@ function makeNodeSetParserEngine(addressSpace: IAddressSpace, options: NodeSetLo
         try {
             await finalSteps();
         } catch (err) {
-            renderError(err);
+            // `renderError` was a no-op here, so a failure in the final steps (DataType extraction,
+            // promotion of objects/variables, ...) used to be silently swallowed and the caller was
+            // handed back a half-initialised address space. Surface it: log and re-throw so that
+            // generateAddressSpace() rejects.
+            const message = types.isNativeError(err) ? err.message : String(err);
+            errorLog(`[NODE-OPCUA-E30] generateAddressSpace: final post-loading steps failed: ${message}`);
+            throw err;
         }
     }
     async function addNodeSet(xmlData: string): Promise<void> {

package/src/address_space.ts

@@ -1028,7 +1028,15 @@ export class AddressSpace implements AddressSpacePrivate {
         }
         assert(_dataType.isSubtypeOf(this.findDataType("Structure")!));
         if (!_dataType._extensionObjectConstructor) {
-            const dataTypeManager = (this as any).$$extraDataTypeManager as ExtraDataTypeManager;
+            const addressSpacePriv: any = this as any;
+            if (!addressSpacePriv.$$extraDataTypeManager) {
+                throw new Error(
+                    `getExtensionObjectConstructor: cannot build a constructor for ${_dataType.browseName.toString()} (${_dataType.nodeId.toString()}): ` +
+                        "the DataType manager is not initialised. " +
+                        "Make sure generateAddressSpace() completed successfully and/or that ensureDatatypeExtracted(addressSpace) was awaited before using structured DataTypes."
+                );
+            }
+            const dataTypeManager = addressSpacePriv.$$extraDataTypeManager as ExtraDataTypeManager;
             _dataType._extensionObjectConstructor = dataTypeManager.getExtensionObjectConstructorFromDataType(
                 _dataType.nodeId
             ) as ExtensionObjectConstructorFuncWithSchema;