node-opcua-address-space 2.187.0 → 2.187.1

package/impl/nodeid_manager.ts

@@ -242,13 +242,6 @@ export class NodeIdManager {
         };
 
         const buildUpName2 = (nodeId: NodeId, suffix: string) => {
-            // a parent registered under a name of its own (`X__2`) passes that name on to its members
-            if (nodeId.namespace === this.namespaceIndex && nodeId.identifierType === NodeIdType.NUMERIC) {
-                const registered = this._nameOfId.get(nodeId.value as number);
-                if (registered !== undefined) {
-                    return registered + suffix;
-                }
-            }
             const namespaceIndex = nodeId.namespace;
             let name = "";
             let n: BaseNode | null = this.addressSpace.findNode(nodeId);
@@ -257,6 +250,16 @@ export class NodeIdManager {
                 name = compose(e, name);
                 n = n.parentNodeId ? this.addressSpace.findNode(n.parentNodeId) : null;
             }
+            // a parent registered under a name of its own (`X__2`) passes that name on to its
+            // members. A parent hanging from another namespace is registered with that chain in
+            // front (`OPCBinary_TypeDictionary`), which its members never carry, as the
+            // ModelCompiler spells them (`TypeDictionary_NamespaceUri`)
+            if (nodeId.namespace === this.namespaceIndex && nodeId.identifierType === NodeIdType.NUMERIC) {
+                const registered = this._nameOfId.get(nodeId.value as number);
+                if (registered !== undefined && !(registered + suffix).endsWith(`_${name}`)) {
+                    return registered + suffix;
+                }
+            }
             return name;
         };
 

package/impl/ua_variable_impl.ts

@@ -256,6 +256,9 @@ export class UAVariableImpl<T extends UAVariableEvents & ListenerSignature<T> =
      */
     declare public _refreshFuncWrapsGetter?: boolean;
     declare public __waiting_callbacks?: CallbackT<DataValue>[];
+    // the variant types already found to fit the DataType below (bit k: DataType k), set on the first write
+    declare private _validatedForDataType?: NodeId;
+    declare private _validatedVariantTypes?: number;
     declare private __satisfy_waiting_callbacks?: (err: Error | null, dataValue?: DataValue) => void;
 
     get typeDefinitionObj(): UAVariableType {
@@ -1908,7 +1911,27 @@ export class UAVariableImpl<T extends UAVariableEvents & ListenerSignature<T> =
     }
 
     public _validate_DataType(variantDataType: DataType): boolean {
-        return validateDataTypeCorrectness(this.addressSpace, this.dataType, variantDataType, /* allow Nulls */ false, this.nodeId);
+        // every write of a Variable checks the same variant type against the same DataType: a check that
+        // passed is remembered while the DataType stays the same; a refusal is always checked again
+        const bit = variantDataType >= 0 && variantDataType < 31 ? 1 << variantDataType : 0;
+        if (bit && this._validatedForDataType === this.dataType && ((this._validatedVariantTypes ?? 0) & bit) !== 0) {
+            return true;
+        }
+        const valid = validateDataTypeCorrectness(
+            this.addressSpace,
+            this.dataType,
+            variantDataType,
+            /* allow Nulls */ false,
+            this.nodeId
+        );
+        if (valid && bit) {
+            if (this._validatedForDataType !== this.dataType) {
+                this._validatedForDataType = this.dataType;
+                this._validatedVariantTypes = 0;
+            }
+            this._validatedVariantTypes = (this._validatedVariantTypes ?? 0) | bit;
+        }
+        return valid;
     }
 
     public _internal_set_value(value: Variant): void {
@@ -2270,26 +2293,24 @@ type f3<T, D, R> = (this: T, data: D, callback: (err: Error | null, r?: R) => vo
 function turn_sync_to_async<T, D, R>(f: f1<T, D, R> | f2<T, D, R> | f3<T, D, R>, numberOfArgs: number): f3<T, D, R> {
     if (f.length <= numberOfArgs) {
         return function (this: T, data: D, callback: (err: Error | null, r?: R) => void) {
-            new Promise<R>((resolve, reject) => {
-                try {
-                    // const ff1 = f as f1<T, D, R>;
-                    const ff2 = f as f2<T, D, R>;
-                    const r: R | Promise<R> = ff2.call(this, data);
-                    if (r instanceof Promise) {
-                        r.then(resolve, reject);
-                    } else {
-                        resolve(r);
-                    }
-                } catch (err) {
-                    reject(err);
-                }
-            })
-                .then((r) => {
-                    callback(null, r);
-                })
-                .catch((err) => {
-                    callback(err as Error);
-                });
+            const ff2 = f as f2<T, D, R>;
+            let r: R | Promise<R>;
+            try {
+                r = ff2.call(this, data);
+            } catch (err) {
+                callback(err as Error);
+                return;
+            }
+            if (r instanceof Promise) {
+                r.then(
+                    (value) => callback(null, value),
+                    (err) => callback(err as Error)
+                );
+                return;
+            }
+            // a synchronous function answers at once: a Write of such Variables completes without waiting
+            // a turn per value, under one permission cache for the whole request
+            callback(null, r);
         };
     } else {
         assert(f.length === numberOfArgs + 1);

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "node-opcua-address-space",
     "type": "module",
-    "version": "2.187.0",
+    "version": "2.187.1",
     "description": "pure nodejs OPCUA SDK - module address-space",
     "main": "./dist/api/index.js",
     "types": "./dist/api/index.d.ts",
@@ -24,7 +24,7 @@
         "chalk": "6.0.1",
         "dequeue": "^1.0.5",
         "node-opcua-address-space-base": "2.187.0",
-        "node-opcua-address-space-store": "2.187.0",
+        "node-opcua-address-space-store": "2.187.1",
         "node-opcua-assert": "2.186.7",
         "node-opcua-basic-types": "2.187.0",
         "node-opcua-binary-stream": "2.187.0",
@@ -84,7 +84,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "3397e8ca2017b8592a50912b34c747f3da617763",
+    "gitHead": "706db482c6f77cd5c7c1f98f9f7cf1c5841a0161",
     "files": [
         "dist",
         "distHelpers",