node-opcua-server 2.58.0 → 2.62.0

package/source/server_end_point.ts

@@ -21,7 +21,8 @@ import {
     ServerSecureChannelParent,
     toURI,
     AsymmetricAlgorithmSecurityHeader,
-    IServerSessionBase
+    IServerSessionBase,
+    Message
 } from "node-opcua-secure-channel";
 import { UserTokenType } from "node-opcua-service-endpoints";
 import { EndpointDescription } from "node-opcua-service-endpoints";
@@ -747,7 +748,7 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
                 }
             });
 
-            channel.on("message", (message: any) => {
+            channel.on("message", (message: Message) => {
                 // forward
                 this.emit("message", message, channel, this);
             });
@@ -1001,10 +1002,12 @@ function estimateSecurityLevel(securityMode: MessageSecurityMode, securityPolicy
             return 4; // deprecated => low
         case SecurityPolicy.Basic256Rsa15:
             return 4 + offset;
+        case SecurityPolicy.Aes128_Sha256_RsaOaep:
+            return 5 + offset;
         case SecurityPolicy.Basic256Sha256:
             return 6 + offset;
-        case SecurityPolicy.Aes128_Sha256_RsaOaep:
-            return 1;
+        case SecurityPolicy.Aes256_Sha256_RsaPss:
+            return 7 + offset;
 
         default:
         case SecurityPolicy.None:
@@ -1047,65 +1050,31 @@ function _makeEndpointDescription(options: MakeEndpointDescriptionOptions): Endp
             });
         }
 
-        const onlyCertificateLessConnection =
-            options.onlyCertificateLessConnection === undefined ? false : options.onlyCertificateLessConnection;
-
-        if (!onlyCertificateLessConnection) {
-            if (options.securityPolicies.indexOf(SecurityPolicy.Basic256) >= 0) {
+        const a = (tokenType: UserTokenType, securityPolicy: SecurityPolicy, name: string) => {
+            if (options.securityPolicies.indexOf(securityPolicy) >= 0) {
                 userIdentityTokens.push({
-                    policyId: u("username_basic256"),
-                    tokenType: UserTokenType.UserName,
-
+                    policyId: u(name),
+                    tokenType,
                     issuedTokenType: null,
                     issuerEndpointUrl: null,
-                    securityPolicyUri: SecurityPolicy.Basic256
+                    securityPolicyUri: securityPolicy
                 });
             }
+        };
+        const onlyCertificateLessConnection =
+            options.onlyCertificateLessConnection === undefined ? false : options.onlyCertificateLessConnection;
 
-            if (options.securityPolicies.indexOf(SecurityPolicy.Basic128Rsa15) >= 0) {
-                userIdentityTokens.push({
-                    policyId: u("username_basic128Rsa15"),
-                    tokenType: UserTokenType.UserName,
-
-                    issuedTokenType: null,
-                    issuerEndpointUrl: null,
-                    securityPolicyUri: SecurityPolicy.Basic128Rsa15
-                });
-            }
-
-            if (options.securityPolicies.indexOf(SecurityPolicy.Basic256Sha256) >= 0) {
-                userIdentityTokens.push({
-                    policyId: u("username_basic256Sha256"),
-                    tokenType: UserTokenType.UserName,
-
-                    issuedTokenType: null,
-                    issuerEndpointUrl: null,
-                    securityPolicyUri: SecurityPolicy.Basic256Sha256
-                });
-            }
+        if (!onlyCertificateLessConnection) {
+            a(UserTokenType.UserName, SecurityPolicy.Basic256, "username_basic256");
+            a(UserTokenType.UserName, SecurityPolicy.Basic128Rsa15, "username_basic128Rsa15");
+            a(UserTokenType.UserName, SecurityPolicy.Basic256Sha256, "username_basic256Sha256");
+            a(UserTokenType.UserName, SecurityPolicy.Aes128_Sha256_RsaOaep, "username_aes128Sha256RsaOaep");
 
             // X509
-            if (options.securityPolicies.indexOf(SecurityPolicy.Basic256) >= 0) {
-                userIdentityTokens.push({
-                    policyId: u("certificate_basic256"),
-                    tokenType: UserTokenType.UserName,
-
-                    issuedTokenType: null,
-                    issuerEndpointUrl: null,
-                    securityPolicyUri: SecurityPolicy.Basic256
-                });
-            }
-            // Certificate
-            if (options.securityPolicies.indexOf(SecurityPolicy.Basic256Sha256) >= 0) {
-                userIdentityTokens.push({
-                    policyId: u("certificate_basic256Sha256"),
-                    tokenType: UserTokenType.Certificate,
-
-                    issuedTokenType: null,
-                    issuerEndpointUrl: null,
-                    securityPolicyUri: SecurityPolicy.Basic256Sha256
-                });
-            }
+            a(UserTokenType.Certificate, SecurityPolicy.Basic256, "certificate_basic256");
+            a(UserTokenType.Certificate, SecurityPolicy.Basic128Rsa15, "certificate_basic128Rsa15");
+            a(UserTokenType.Certificate, SecurityPolicy.Basic256Sha256, "certificate_basic256Sha256");
+            a(UserTokenType.Certificate, SecurityPolicy.Aes128_Sha256_RsaOaep, "certificate_aes128Sha256RsaOaep");
         }
     } else {
         // note:
@@ -1195,5 +1164,7 @@ const defaultSecurityPolicies = [
     SecurityPolicy.Basic128Rsa15,
     SecurityPolicy.Basic256,
     // xx UNUSED!!    SecurityPolicy.Basic256Rsa15,
-    SecurityPolicy.Basic256Sha256
+    SecurityPolicy.Basic256Sha256,
+    SecurityPolicy.Aes128_Sha256_RsaOaep
+    // NO USED YET SecurityPolicy.Aes256_Sha256_RsaPss
 ];

package/source/server_engine.ts

@@ -11,7 +11,6 @@ import {
     AddressSpace,
     BaseNode,
     bindExtObjArrayNode,
-    DataValueCallback,
     ensureDatatypeExtractedWithCallback,
     ensureObjectIsSecure,
     MethodFunctor,
@@ -229,8 +228,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 +472,6 @@ 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 +639,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,7 +814,6 @@ 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,
@@ -1076,36 +1072,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 +1158,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 +1228,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 +1715,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 +1874,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,14 +1897,16 @@ 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,
-            (obj: BaseNode, inner_callback: DataValueCallback) => {
+            objectArray,
+            (obj: BaseNode, inner_callback: CallbackT<DataValue>) => {
                 if (obj.nodeClass !== NodeClass.Variable) {
                     inner_callback(
                         null,
@@ -1920,7 +1916,18 @@ 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 +2094,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 +2139,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;
     }