node-opcua-address-space 2.167.0 → 2.169.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-address-space",
-    "version": "2.167.0",
+    "version": "2.169.0",
     "description": "pure nodejs OPCUA SDK - module address-space",
     "main": "./dist/src/index_current.js",
     "types": "./dist/source/index.d.ts",
@@ -18,53 +18,51 @@
         "fix:tsconfig": "node ../../code_gen/extract-modules.js tsconfig_base.json"
     },
     "dependencies": {
-        "@types/lodash": "4.17.24",
         "@types/semver": "7.7.1",
         "chalk": "4.1.2",
         "dequeue": "^1.0.5",
-        "lodash": "4.17.23",
-        "node-opcua-address-space-base": "2.167.0",
+        "node-opcua-address-space-base": "2.169.0",
         "node-opcua-assert": "2.164.0",
-        "node-opcua-basic-types": "2.167.0",
-        "node-opcua-binary-stream": "2.167.0",
-        "node-opcua-client-dynamic-extension-object": "2.167.0",
+        "node-opcua-basic-types": "2.169.0",
+        "node-opcua-binary-stream": "2.169.0",
+        "node-opcua-client-dynamic-extension-object": "2.169.0",
         "node-opcua-constants": "2.157.0",
-        "node-opcua-crypto": "5.3.3",
-        "node-opcua-data-access": "2.167.0",
-        "node-opcua-data-model": "2.167.0",
-        "node-opcua-data-value": "2.167.0",
-        "node-opcua-date-time": "2.167.0",
-        "node-opcua-debug": "2.165.0",
-        "node-opcua-enum": "2.167.0",
-        "node-opcua-extension-object": "2.167.0",
-        "node-opcua-factory": "2.167.0",
-        "node-opcua-nodeid": "2.167.0",
-        "node-opcua-nodeset-ua": "2.167.0",
-        "node-opcua-numeric-range": "2.167.0",
-        "node-opcua-object-registry": "2.165.0",
-        "node-opcua-pseudo-session": "2.167.0",
-        "node-opcua-service-browse": "2.167.0",
-        "node-opcua-service-call": "2.167.0",
-        "node-opcua-service-history": "2.167.0",
-        "node-opcua-service-translate-browse-path": "2.167.0",
-        "node-opcua-service-write": "2.167.0",
-        "node-opcua-status-code": "2.167.0",
-        "node-opcua-types": "2.167.0",
-        "node-opcua-utils": "2.165.0",
-        "node-opcua-variant": "2.167.0",
-        "node-opcua-xml2json": "2.167.0",
+        "node-opcua-crypto": "5.3.5",
+        "node-opcua-data-access": "2.169.0",
+        "node-opcua-data-model": "2.169.0",
+        "node-opcua-data-value": "2.169.0",
+        "node-opcua-date-time": "2.169.0",
+        "node-opcua-debug": "2.168.0",
+        "node-opcua-enum": "2.169.0",
+        "node-opcua-extension-object": "2.169.0",
+        "node-opcua-factory": "2.169.0",
+        "node-opcua-nodeid": "2.169.0",
+        "node-opcua-nodeset-ua": "2.169.0",
+        "node-opcua-numeric-range": "2.169.0",
+        "node-opcua-object-registry": "2.169.0",
+        "node-opcua-pseudo-session": "2.169.0",
+        "node-opcua-service-browse": "2.169.0",
+        "node-opcua-service-call": "2.169.0",
+        "node-opcua-service-history": "2.169.0",
+        "node-opcua-service-translate-browse-path": "2.169.0",
+        "node-opcua-service-write": "2.169.0",
+        "node-opcua-status-code": "2.169.0",
+        "node-opcua-types": "2.169.0",
+        "node-opcua-utils": "2.169.0",
+        "node-opcua-variant": "2.169.0",
+        "node-opcua-xml2json": "2.169.0",
         "semver": "^7.7.4",
         "thenify-ex": "4.4.0",
         "xml-writer": "^1.7.0"
     },
     "devDependencies": {
         "humanize": "0.0.9",
-        "node-opcua-benchmarker": "2.167.0",
-        "node-opcua-leak-detector": "2.165.0",
+        "node-opcua-benchmarker": "2.169.0",
+        "node-opcua-leak-detector": "2.169.0",
         "node-opcua-nodesets": "2.163.1",
-        "node-opcua-packet-analyzer": "2.167.0",
-        "node-opcua-schemas": "2.167.0",
-        "node-opcua-service-filter": "2.167.0",
+        "node-opcua-packet-analyzer": "2.169.0",
+        "node-opcua-schemas": "2.169.0",
+        "node-opcua-service-filter": "2.169.0",
         "node-opcua-test-fixtures": "2.157.0"
     },
     "author": "Etienne Rossignon",
@@ -82,7 +80,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "5decfa86ee53a36ecd3bb454e7bf6e3dd27c7a4e",
+    "gitHead": "82d570d3e95bea689cbbe30096279885c5282245",
     "files": [
         "dist",
         "distHelpers",

package/source/loader/namespace_post_step.ts

@@ -29,28 +29,37 @@ function parentIsObjectOrVariableType(node: UAVariable | UAObject): boolean {
 
 export async function promoteObjectAndVariablesInNamespace(namespace: INamespace): Promise<void> {
     const namespaceP = namespace as NamespacePrivate;
-    for (const a of namespaceP.nodeIterator()) {
-        if (a.nodeClass === NodeClass.Object || a.nodeClass === NodeClass.Variable) {
-            // skip object & variable that belong to a ObjectType or VariableType
-            const aa = a as UAObject | UAVariable;
-
-            if (aa.typeDefinition) {
-                const promoter = g_promotableObject.get(aa.typeDefinition.toString());
-                if (promoter) {
-                    if (promoter.onInstanceOnly && parentIsObjectOrVariableType(aa)) {
-                        continue;
-                    }
-                    const before = a.constructor.name;
-
-                    promoter.promoter(a as any);
-                    const after = a.constructor.name;
-                    // c8 ignore next
-                    if (doDebug) {
-                        debugLog(`promoting ${a.browseName.toString()} from ${before} to ${after}`);
-                    }
+
+    const promoteNode = (a: UAObject | UAVariable) => {
+        if (a.typeDefinition) {
+            const promoter = g_promotableObject.get(a.typeDefinition.toString());
+            if (promoter) {
+                if (promoter.onInstanceOnly && parentIsObjectOrVariableType(a)) {
+                    return;
+                }
+                const before = a.constructor.name;
+
+                promoter.promoter(a as any);
+                const after = a.constructor.name;
+                // c8 ignore next
+                if (doDebug) {
+                    debugLog(`promoting ${a.browseName.toString()} from ${before} to ${after}`);
                 }
             }
         }
+    };
+
+    // Promote variables first so that TwoStateVariables and other variable types
+    // are fully promoted before objects (like StateMachines or Alarms) that contain them.
+    for (const a of namespaceP.nodeIterator()) {
+        if (a.nodeClass === NodeClass.Variable) {
+            promoteNode(a as UAVariable);
+        }
+    }
+    for (const a of namespaceP.nodeIterator()) {
+        if (a.nodeClass === NodeClass.Object) {
+            promoteNode(a as UAObject);
+        }
     }
 }
 export async function promoteObjectsAndVariables(addressSpace: IAddressSpace): Promise<void> {

package/source/session_context.ts

@@ -207,13 +207,13 @@ export function makeRoles(roleIds: NodeIdLike[] | string | WellKnownRoles): Node
     }
     return roleIds.map((r) => resolveNodeId(r));
 }
+
 export class SessionContext implements ISessionContext {
     public static defaultContext = new SessionContext({});
 
     public object: UAObject | UAObjectType | undefined;
     public currentTime?: PreciseClock;
     public continuationPoints: Buffer[] = [];
-    public userIdentity?: string;
     public readonly session?: ISessionBase;
     public readonly server?: IServerBase;
 
@@ -252,6 +252,35 @@ export class SessionContext implements ISessionContext {
         }
     }
 
+    public toJSON(): Record<string, string | null> {
+        return {
+            userName: this.getUserName(),
+            clientApplicationUri: this.clientApplicationUri,
+            session: this.session ? this.session.getSessionId().toString() : null
+        };
+    }
+
+    public toString(): string {
+        if (this === SessionContext.defaultContext) {
+            return "SessionContext({ default })";
+        }
+        return `SessionContext({ userName: "${this.getUserName()}", session: ${this.session ? this.session.getSessionId().toString() : "none"} })`;
+    }
+
+    public [Symbol.for("nodejs.util.inspect.custom")](): string {
+        return this.toString();
+    }
+
+    public getUserName(): string {
+        if (!this.session) {
+            return "<unknown client user id>";
+        }
+        const userIdentityToken = this.session.userIdentityToken;
+        if (!userIdentityToken) {
+            return "<unknown client user id>";
+        }
+        return getUserName(userIdentityToken);
+    }
     /**
      * getCurrentUserRoles
      *