node-opcua-server 2.59.0 → 2.60.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-server",
-    "version": "2.59.0",
+    "version": "2.60.0",
     "description": "pure nodejs OPCUA SDK - module -server",
     "scripts": {
         "build": "tsc -b",
@@ -14,61 +14,61 @@
     "dependencies": {
         "@ster5/global-mutex": "^1.1.1",
         "@types/underscore": "^1.11.3",
-        "async": "^3.2.1",
+        "async": "^3.2.2",
         "bonjour": "^3.5.0",
         "browser-process-hrtime": "^1.0.0",
         "dequeue": "^1.0.5",
         "lodash": "4.17.21",
-        "node-opcua-address-space": "2.59.0",
+        "node-opcua-address-space": "2.60.0",
         "node-opcua-assert": "2.55.0",
-        "node-opcua-basic-types": "2.57.0",
-        "node-opcua-certificate-manager": "2.57.0",
-        "node-opcua-client": "2.59.0",
-        "node-opcua-client-dynamic-extension-object": "2.59.0",
-        "node-opcua-common": "2.59.0",
+        "node-opcua-basic-types": "2.60.0",
+        "node-opcua-certificate-manager": "2.60.0",
+        "node-opcua-client": "2.60.0",
+        "node-opcua-client-dynamic-extension-object": "2.60.0",
+        "node-opcua-common": "2.60.0",
         "node-opcua-constants": "2.52.0",
         "node-opcua-crypto": "^1.7.4",
-        "node-opcua-data-model": "2.57.0",
-        "node-opcua-data-value": "2.59.0",
-        "node-opcua-date-time": "2.55.0",
-        "node-opcua-debug": "2.55.0",
+        "node-opcua-data-model": "2.60.0",
+        "node-opcua-data-value": "2.60.0",
+        "node-opcua-date-time": "2.60.0",
+        "node-opcua-debug": "2.60.0",
         "node-opcua-enum": "2.55.0",
-        "node-opcua-extension-object": "2.57.0",
-        "node-opcua-factory": "2.57.0",
+        "node-opcua-extension-object": "2.60.0",
+        "node-opcua-factory": "2.60.0",
         "node-opcua-hostname": "2.55.0",
-        "node-opcua-nodeid": "2.55.0",
+        "node-opcua-nodeid": "2.60.0",
         "node-opcua-nodesets": "2.57.0",
-        "node-opcua-numeric-range": "2.57.0",
-        "node-opcua-object-registry": "2.56.0",
-        "node-opcua-pki": "^2.12.0",
-        "node-opcua-secure-channel": "2.59.0",
-        "node-opcua-service-browse": "2.59.0",
-        "node-opcua-service-call": "2.59.0",
-        "node-opcua-service-discovery": "2.59.0",
-        "node-opcua-service-endpoints": "2.59.0",
-        "node-opcua-service-filter": "2.59.0",
-        "node-opcua-service-history": "2.59.0",
-        "node-opcua-service-node-management": "2.59.0",
-        "node-opcua-service-query": "2.59.0",
-        "node-opcua-service-read": "2.59.0",
-        "node-opcua-service-register-node": "2.59.0",
-        "node-opcua-service-secure-channel": "2.59.0",
-        "node-opcua-service-session": "2.59.0",
-        "node-opcua-service-subscription": "2.59.0",
-        "node-opcua-service-translate-browse-path": "2.59.0",
-        "node-opcua-service-write": "2.59.0",
+        "node-opcua-numeric-range": "2.60.0",
+        "node-opcua-object-registry": "2.60.0",
+        "node-opcua-pki": "^2.12.1",
+        "node-opcua-secure-channel": "2.60.0",
+        "node-opcua-service-browse": "2.60.0",
+        "node-opcua-service-call": "2.60.0",
+        "node-opcua-service-discovery": "2.60.0",
+        "node-opcua-service-endpoints": "2.60.0",
+        "node-opcua-service-filter": "2.60.0",
+        "node-opcua-service-history": "2.60.0",
+        "node-opcua-service-node-management": "2.60.0",
+        "node-opcua-service-query": "2.60.0",
+        "node-opcua-service-read": "2.60.0",
+        "node-opcua-service-register-node": "2.60.0",
+        "node-opcua-service-secure-channel": "2.60.0",
+        "node-opcua-service-session": "2.60.0",
+        "node-opcua-service-subscription": "2.60.0",
+        "node-opcua-service-translate-browse-path": "2.60.0",
+        "node-opcua-service-write": "2.60.0",
         "node-opcua-status-code": "2.56.0",
-        "node-opcua-types": "2.59.0",
-        "node-opcua-utils": "2.57.0",
-        "node-opcua-variant": "2.59.0"
+        "node-opcua-types": "2.60.0",
+        "node-opcua-utils": "2.60.0",
+        "node-opcua-variant": "2.60.0"
     },
     "devDependencies": {
-        "node-opcua-data-access": "2.59.0",
-        "node-opcua-leak-detector": "2.56.0",
+        "node-opcua-data-access": "2.60.0",
+        "node-opcua-leak-detector": "2.60.0",
         "node-opcua-test-helpers": "2.42.0",
-        "node-opcua-transport": "2.59.0",
+        "node-opcua-transport": "2.60.0",
         "should": "^13.2.3",
-        "sinon": "^11.1.2"
+        "sinon": "^12.0.1"
     },
     "author": "Etienne Rossignon",
     "license": "MIT",
@@ -85,5 +85,5 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "ea10265745d3d4b8af249a4e13288ad71232706f"
+    "gitHead": "56dc8584b9118ee2f3bfb0b2e9d456b609ccbac8"
 }

package/source/i_socket_data.ts

@@ -1,8 +1,8 @@
 export interface ISocketData {
     bytesRead: number;
     bytesWritten: number;
-    localAddress: string;
-    localPort: number;
+    localAddress?: string;
+    localPort?: number;
     remoteAddress?: string;
     remoteFamily?: string;
     remotePort?: number;

package/source/opcua_server.ts

@@ -1256,7 +1256,7 @@ export class OPCUAServer extends OPCUABaseServer {
      * ```
      * ```javascript
      *    // shutdown within 10 seconds
-     *    server.engine .shutdownReason = coerceLocalizedText("Shutdown for maintenance");
+     *    server.engine.shutdownReason = coerceLocalizedText("Shutdown for maintenance");
      *    server.shutdown(10000,function(err) {
      *    });
      *   ```
@@ -2207,6 +2207,7 @@ export class OPCUAServer extends OPCUABaseServer {
                 }
                 return channel.send_response("MSG", response1, message);
             } catch (err) {
+                // istanbul ignore next
                 if (err instanceof Error) {
                     // istanbul ignore next
                     errorLog(
@@ -2630,7 +2631,6 @@ export class OPCUAServer extends OPCUABaseServer {
                 // ask for a refresh of asynchronous variables
                 this.engine.refreshValues(request.nodesToRead, request.maxAge, (err?: Error | null) => {
                     assert(!err, " error not handled here , fix me");
-
                     results = this.engine.read(context, request);
 
                     assert(results[0].schema.name === "DataValue");

package/source/server_engine.ts

@@ -229,8 +229,8 @@ function getMonitoredItemsId(
     const callMethodResult = new CallMethodResult({
         statusCode: result.statusCode,
         outputArguments: [
-            { dataType: DataType.UInt32, arrayType: VariantArrayType.Array, value: new Uint32Array(result.serverHandles) },
-            { dataType: DataType.UInt32, arrayType: VariantArrayType.Array, value: new Uint32Array(result.clientHandles) }
+            { dataType: DataType.UInt32, arrayType: VariantArrayType.Array, value: result.serverHandles },
+            { dataType: DataType.UInt32, arrayType: VariantArrayType.Array, value: result.clientHandles }
         ]
     });
     callback(null, callMethodResult);
@@ -473,8 +473,7 @@ export class ServerEngine extends EventEmitter {
             this._orphanPublishEngine.shutdown();
         }
 
-        // xx console.log("xxxxxxxxx ServerEngine.shutdown must terminate "+ tokens.length," sessions");
-
+      
         for (const token of tokens) {
             this.closeSession(token, true, "Terminated");
         }
@@ -642,7 +641,7 @@ export class ServerEngine extends EventEmitter {
     public setServerState(serverState: ServerState): void {
         assert(serverState !== null && serverState !== undefined);
         this.addressSpace?.rootFolder?.objects?.server?.serverStatus?.state?.setValueFromSource({
-            dataType: DataType.UInt32,
+            dataType: DataType.Int32,
             value: serverState
         });
     }
@@ -817,8 +816,7 @@ export class ServerEngine extends EventEmitter {
 
             // TimeZoneDataType
             const timeZoneDataType = addressSpace.findDataType(resolveNodeId(DataTypeIds.TimeZoneDataType))!;
-            // xx console.log(timeZoneDataType.toString());
-
+        
             const timeZone = new TimeZoneDataType({
                 daylightSavingInOffset: /* boolean*/ false,
                 offset: /* int16 */ 0
@@ -1076,36 +1074,36 @@ export class ServerEngine extends EventEmitter {
                 // mainly for compliance
 
                 // The version number for the data type description. i=104
-                bindStandardScalar(VariableIds.DataTypeDescriptionType_DataTypeVersion, DataType.UInt16, () => {
-                    return 0.0;
+                bindStandardScalar(VariableIds.DataTypeDescriptionType_DataTypeVersion, DataType.String, () => {
+                    return "0";
                 });
 
                 const namingRuleDataTypeNode = addressSpace.findDataType(resolveNodeId(DataTypeIds.NamingRuleType))! as UADataType;
-                // xx console.log(nrt.toString());
+           
                 if (namingRuleDataTypeNode) {
                     const namingRuleType = (namingRuleDataTypeNode as any)._getEnumerationInfo().nameIndex; // getEnumeration("NamingRuleType");
                     if (!namingRuleType) {
                         throw new Error("Cannot find Enumeration definition for NamingRuleType");
                     }
                     // i=111
-                    bindStandardScalar(VariableIds.ModellingRuleType_NamingRule, DataType.UInt16, () => {
+                    bindStandardScalar(VariableIds.ModellingRuleType_NamingRule, DataType.Int32, () => {
                         return 0;
                     });
 
                     // i=112
-                    bindStandardScalar(VariableIds.ModellingRule_Mandatory_NamingRule, DataType.UInt16, () => {
+                    bindStandardScalar(VariableIds.ModellingRule_Mandatory_NamingRule, DataType.Int32, () => {
                         return namingRuleType.Mandatory ? namingRuleType.Mandatory.value : 0;
                     });
 
                     // i=113
-                    bindStandardScalar(VariableIds.ModellingRule_Optional_NamingRule, DataType.UInt16, () => {
+                    bindStandardScalar(VariableIds.ModellingRule_Optional_NamingRule, DataType.Int32, () => {
                         return namingRuleType.Optional ? namingRuleType.Optional.value : 0;
                     });
                     // i=114
-                    bindStandardScalar(VariableIds.ModellingRule_ExposesItsArray_NamingRule, DataType.UInt16, () => {
+                    bindStandardScalar(VariableIds.ModellingRule_ExposesItsArray_NamingRule, DataType.Int32, () => {
                         return namingRuleType.ExposesItsArray ? namingRuleType.ExposesItsArray.value : 0;
                     });
-                    bindStandardScalar(VariableIds.ModellingRule_MandatoryPlaceholder_NamingRule, DataType.UInt16, () => {
+                    bindStandardScalar(VariableIds.ModellingRule_MandatoryPlaceholder_NamingRule, DataType.Int32, () => {
                         return namingRuleType.MandatoryPlaceholder ? namingRuleType.MandatoryPlaceholder.value : 0;
                     });
                 }
@@ -1162,7 +1160,6 @@ export class ServerEngine extends EventEmitter {
                 if (samplingIntervalDiagnosticsArray) {
                     addressSpace.deleteNode(samplingIntervalDiagnosticsArray);
                     const s = serverDiagnosticsNode.getComponents();
-                    // xx console.log(s.map((x) => x.browseName.toString()).join(" "));
                 }
 
                 const subscriptionDiagnosticsArrayNode = serverDiagnosticsNode.getComponentByName(
@@ -1233,9 +1230,9 @@ export class ServerEngine extends EventEmitter {
                         node.onFirstBrowseAction = undefined;
                     } catch (err) {
                         if (err instanceof Error) {
-                            console.log("onFirstBrowseAction method has failed", err.message);
+                            errorLog("onFirstBrowseAction method has failed", err.message);
                         }
-                        console.log(err);
+                        errorLog(err);
                     }
                     assert(node.onFirstBrowseAction === undefined, "expansion can only be made once");
                 }
@@ -1720,7 +1717,6 @@ export class ServerEngine extends EventEmitter {
             }
             const subscription = session.publishEngine.getSubscriptionById(subscriptionId);
             if (subscription) {
-                // xx console.log("foundSubscription  ", subscriptionId, " in session", session.sessionName);
                 subscriptions.push(subscription);
             }
         });
@@ -1880,7 +1876,7 @@ export class ServerEngine extends EventEmitter {
         const referenceTime = new Date(Date.now() - maxAge);
 
         assert(callback instanceof Function);
-        const objectMap: any = {};
+        const objectMap: Record<string, BaseNode> = {};
         for (const nodeToRefresh of nodesToRefresh) {
             // only consider node  for which the caller wants to read the Value attribute
             // assuming that Value is requested if attributeId is missing,
@@ -1903,13 +1899,15 @@ export class ServerEngine extends EventEmitter {
 
             objectMap[key] = obj;
         }
-        if (Object.keys(objectMap).length === 0) {
+
+        const objectArray = Object.values(objectMap);
+        if (objectArray.length === 0) {
             // nothing to do
             return callback(null, []);
         }
         // perform all asyncRefresh in parallel
         async.map(
-            objectMap,
+            objectArray,
             (obj: BaseNode, inner_callback: DataValueCallback) => {
                 if (obj.nodeClass !== NodeClass.Variable) {
                     inner_callback(
@@ -1920,7 +1918,19 @@ export class ServerEngine extends EventEmitter {
                     );
                     return;
                 }
-                (obj as UAVariable).asyncRefresh(referenceTime, inner_callback);
+                try {
+                    (obj as UAVariable).asyncRefresh(referenceTime, (err, dataValue) => {
+                        inner_callback(err, dataValue);
+                    });
+                } catch (err) {
+
+                    // istanbul ignore next
+                    if (!(err instanceof Error)) {
+                        throw new Error("internal error");
+                    }
+                    errorLog("asyncRefresh internal error", err);
+                    inner_callback(err);
+                }
             },
             (err?: Error | null, arrResult?: (DataValue | undefined)[]) => {
                 callback(err || null, arrResult as DataValue[]);
@@ -2087,7 +2097,7 @@ export class ServerEngine extends EventEmitter {
                     "HistoryReadDetails " +
                     historyReadDetails.toString();
                 if (doDebug) {
-                    console.log(chalk.cyan("ServerEngine#_historyReadSingleNode "), chalk.white.bold(msg));
+                    debugLog(chalk.cyan("ServerEngine#_historyReadSingleNode "), chalk.white.bold(msg));
                 }
                 const err = new Error(msg);
                 // object has no historyRead method
@@ -2132,13 +2142,12 @@ export class ServerEngine extends EventEmitter {
         if (methodNode && methodNode.bindMethod) {
             methodNode.bindMethod(func);
         } else {
-            console.log(
+            warningLog(
                 chalk.yellow("WARNING:  cannot bind a method with id ") +
                     chalk.cyan(nodeId.toString()) +
                     chalk.yellow(". please check your nodeset.xml file or add this node programmatically")
             );
-
-            console.log(traceFromThisProjectOnly());
+            warningLog(traceFromThisProjectOnly());
         }
     }
 

package/source/server_session.ts

@@ -196,7 +196,7 @@ export class ServerSession extends EventEmitter implements ISubscriber, ISession
         assert(!this.sessionObject, " sessionObject has not been cleared !");
 
         this.parent = null as any as ServerEngine;
-        this.authenticationToken = NodeId.nullNodeId;
+        this.authenticationToken = new NodeId();
 
         if (this.publishEngine) {
             this.publishEngine.dispose();

package/source/server_subscription.ts

@@ -407,12 +407,12 @@ export interface GetMonitoredItemsResult {
      * array of serverHandles for all MonitoredItems of the subscription
      * identified by subscriptionId.
      */
-    serverHandles: number[];
+    serverHandles: Uint32Array;
     /**
      *  array of clientHandles for all MonitoredItems of the subscription
      *  identified by subscriptionId.
      */
-    clientHandles: number[];
+    clientHandles: Uint32Array;
     statusCode: StatusCode;
 }
 
@@ -790,7 +790,7 @@ export class Subscription extends EventEmitter {
         this._pending_notifications.clear();
         this._sent_notification_messages = [];
 
-        this.sessionId = NodeId.nullNodeId;
+        this.sessionId = new NodeId();
 
         this.$session = undefined;
         this.removeAllListeners();
@@ -1143,19 +1143,23 @@ export class Subscription extends EventEmitter {
      *
      */
     public getMonitoredItems(): GetMonitoredItemsResult {
+        const monitoredItems = Object.keys(this.monitoredItems);
+        const monitoredItemCount = monitoredItems.length;
         const result: GetMonitoredItemsResult = {
-            clientHandles: [] as number[],
-            serverHandles: [] as number[],
+            clientHandles: new Uint32Array(monitoredItemCount),
+            serverHandles: new Uint32Array(monitoredItemCount),
             statusCode: StatusCodes.Good
         };
-        for (const monitoredItemId of Object.keys(this.monitoredItems)) {
-            const monitoredItem = this.getMonitoredItem(parseInt(monitoredItemId, 10))!;
-            result.clientHandles.push(monitoredItem.clientHandle!);
+        for (let index = 0; index < monitoredItemCount; index++) {
+            const monitoredItemId = monitoredItems[index];
+            const serverHandle = parseInt(monitoredItemId, 10);
+            const monitoredItem = this.getMonitoredItem(serverHandle)!;
+            result.clientHandles[index] = monitoredItem.clientHandle;
             // TODO:  serverHandle is defined anywhere in the OPCUA Specification 1.02
             //        I am not sure what shall be reported for serverHandle...
             //        using monitoredItem.monitoredItemId instead...
             //        May be a clarification in the OPCUA Spec is required.
-            result.serverHandles.push(parseInt(monitoredItemId, 10));
+            result.serverHandles[index] = serverHandle;
         }
         return result;
     }