node-opcua-server 2.78.0 → 2.79.0

package/dist/opcua_server.js

@@ -271,15 +271,14 @@ function monitoredItem_read_and_record_value_async(self, context, oldValue, node
         callback(err, dataValue);
     });
 }
-function build_scanning_node_function(context, addressSpace, monitoredItem, itemToMonitor) {
-    (0, node_opcua_assert_1.assert)(context instanceof node_opcua_address_space_1.SessionContext);
+function build_scanning_node_function(addressSpace, itemToMonitor) {
     (0, node_opcua_assert_1.assert)(itemToMonitor instanceof node_opcua_service_read_1.ReadValueId);
     const node = addressSpace.findNode(itemToMonitor.nodeId);
     /* istanbul ignore next */
     if (!node) {
         errorLog(" INVALID NODE ID  , ", itemToMonitor.nodeId.toString());
         (0, node_opcua_debug_1.dump)(itemToMonitor);
-        return (oldData, callback) => {
+        return (_sessionContext, _oldData, callback) => {
             callback(null, new node_opcua_data_value_1.DataValue({
                 statusCode: node_opcua_status_code_1.StatusCodes.BadNodeIdUnknown,
                 value: { dataType: node_opcua_variant_1.DataType.Null, value: 0 }
@@ -291,11 +290,11 @@ function build_scanning_node_function(context, addressSpace, monitoredItem, item
         const monitoredItem_read_and_record_value_func = itemToMonitor.attributeId === node_opcua_data_model_1.AttributeIds.Value && typeof node.readValueAsync === "function"
             ? monitoredItem_read_and_record_value_async
             : monitoredItem_read_and_record_value;
-        return function func(oldDataValue, callback) {
+        return function func(sessionContext, oldDataValue, callback) {
             (0, node_opcua_assert_1.assert)(this instanceof monitored_item_1.MonitoredItem);
             (0, node_opcua_assert_1.assert)(oldDataValue instanceof node_opcua_data_value_1.DataValue);
             (0, node_opcua_assert_1.assert)(typeof callback === "function");
-            monitoredItem_read_and_record_value_func(this, context, oldDataValue, node, itemToMonitor, callback);
+            monitoredItem_read_and_record_value_func(this, sessionContext, oldDataValue, node, itemToMonitor, callback);
         };
     }
     else {
@@ -303,18 +302,18 @@ function build_scanning_node_function(context, addressSpace, monitoredItem, item
         // The filter is not used for these  Attributes. Any change in value for these  Attributes
         // causes a  Notification  to be  generated.
         // only record value when it has changed
-        return function func(oldDataValue, callback) {
+        return function func(sessionContext, oldDataValue, callback) {
             (0, node_opcua_assert_1.assert)(this instanceof monitored_item_1.MonitoredItem);
             (0, node_opcua_assert_1.assert)(oldDataValue instanceof node_opcua_data_value_1.DataValue);
             (0, node_opcua_assert_1.assert)(typeof callback === "function");
-            const newDataValue = node.readAttribute(null, itemToMonitor.attributeId);
+            const newDataValue = node.readAttribute(sessionContext, itemToMonitor.attributeId);
             callback(null, newDataValue);
         };
     }
 }
 function prepareMonitoredItem(context, addressSpace, monitoredItem) {
     const itemToMonitor = monitoredItem.itemToMonitor;
-    const readNodeFunc = build_scanning_node_function(context, addressSpace, monitoredItem, itemToMonitor);
+    const readNodeFunc = build_scanning_node_function(addressSpace, itemToMonitor);
     monitoredItem.samplingFunc = readNodeFunc;
 }
 function isMonitoringModeValid(monitoringMode) {
@@ -989,7 +988,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
                 return;
             }
             const length = buff.readUInt32LE(0) - serverNonce.length;
-            password = buff.slice(4, 4 + length).toString("utf-8");
+            password = buff.subarray(4, 4 + length).toString("utf-8");
         }
         this.userManager
             .isValidUser(session, userName, password)
@@ -1114,7 +1113,8 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
             // see Release 1.02  27  OPC Unified Architecture, Part 4
             const session = this.createSession({
                 clientDescription: request.clientDescription,
-                sessionTimeout: revisedSessionTimeout
+                sessionTimeout: revisedSessionTimeout,
+                server: this
             });
             session.endpoint = endpoint;
             (0, node_opcua_assert_1.assert)(session);
@@ -1325,7 +1325,6 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
                     return rejectConnection(this, node_opcua_status_code_1.StatusCodes.BadIdentityChangeNotSupported); // not sure about this code !
                 }
             }
-            moveSessionToChannel(session, channel);
         }
         else if (session.status === "screwed") {
             // session has been used before being activated => this should be detected and session should be dismissed.
@@ -1350,7 +1349,6 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
                 }
                 return rejectConnection(this, statusCode);
             }
-            session.userIdentityToken = request.userIdentityToken;
             // check if user access is granted
             this.isUserAuthorized(channel, session, request.userIdentityToken, (err1, authorized) => {
                 /* istanbul ignore next */
@@ -1361,6 +1359,10 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
                     return rejectConnection(this, node_opcua_status_code_1.StatusCodes.BadUserAccessDenied);
                 }
                 else {
+                    if (session.status === "active") {
+                        moveSessionToChannel(session, channel);
+                    }
+                    session.userIdentityToken = request.userIdentityToken;
                     // extract : OPC UA part 4 - 5.6.3
                     // Once used, a serverNonce cannot be used again. For that reason, the Server returns a new
                     // serverNonce each time the ActivateSession Service is called.
@@ -1368,12 +1370,6 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
                     session.status = "active";
                     response = new node_opcua_service_session_1.ActivateSessionResponse({ serverNonce: session.nonce });
                     channel.send_response("MSG", response, message);
-                    const userIdentityTokenPasswordRemoved = (userIdentityToken) => {
-                        const a = userIdentityToken.clone();
-                        // remove password
-                        a.password = "*************";
-                        return a;
-                    };
                     // send OPCUA Event Notification
                     // see part 5 : 6.4.3 AuditEventType
                     //              6.4.7 AuditSessionEventType
@@ -1381,42 +1377,9 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
                     (0, node_opcua_assert_1.assert)(session.nodeId); // sessionId
                     // xx assert(session.channel.clientCertificate instanceof Buffer);
                     (0, node_opcua_assert_1.assert)(session.sessionTimeout > 0);
-                    if (this.isAuditing) {
-                        this.raiseEvent("AuditActivateSessionEventType", {
-                            /* part 5 -  6.4.3 AuditEventType */
-                            actionTimeStamp: { dataType: "DateTime", value: new Date() },
-                            status: { dataType: "Boolean", value: true },
-                            serverId: { dataType: "String", value: "" },
-                            // ClientAuditEntryId contains the human-readable AuditEntryId defined in Part 3.
-                            clientAuditEntryId: { dataType: "String", value: "" },
-                            // The ClientUserId identifies the user of the client requesting an action.
-                            // The ClientUserId can be obtained from the UserIdentityToken passed in the
-                            // ActivateSession call.
-                            clientUserId: { dataType: "String", value: "cc" },
-                            sourceName: { dataType: "String", value: "Session/ActivateSession" },
-                            /* part 5 - 6.4.7 AuditSessionEventType */
-                            sessionId: { dataType: "NodeId", value: session.nodeId },
-                            /* part 5 - 6.4.10 AuditActivateSessionEventType */
-                            clientSoftwareCertificates: {
-                                arrayType: node_opcua_variant_2.VariantArrayType.Array,
-                                dataType: "ExtensionObject" /* SignedSoftwareCertificate */,
-                                value: []
-                            },
-                            // UserIdentityToken reflects the userIdentityToken parameter of the ActivateSession
-                            // Service call.
-                            // For Username/Password tokens the password should NOT be included.
-                            userIdentityToken: {
-                                dataType: "ExtensionObject" /*  UserIdentityToken */,
-                                value: userIdentityTokenPasswordRemoved(session.userIdentityToken)
-                            },
-                            // SecureChannelId shall uniquely identify the SecureChannel. The application shall
-                            // use the same identifier in all AuditEvents related to the Session Service Set
-                            // (AuditCreateSessionEventType, AuditActivateSessionEventType and their subtypes) and
-                            // the SecureChannel Service Set (AuditChannelEventType and its subtypes).
-                            secureChannelId: { dataType: "String", value: session.channel.channelId.toString() }
-                        });
-                    }
-                    this.emit("session_activated", session, userIdentityTokenPasswordRemoved);
+                    raiseAuditActivateSessionEventType.call(this, session);
+                    this.emit("session_activated", session, userIdentityTokenPasswordRemoved(session.userIdentityToken));
+                    session.resendMonitoredItemInitialValues();
                 }
             });
         });
@@ -1672,7 +1635,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
             // limit results to requestedMaxReferencesPerNode further so it never exceed a too big number
             const requestedMaxReferencesPerNode = Math.min(9876, request.requestedMaxReferencesPerNode);
             (0, node_opcua_assert_1.assert)(request.nodesToBrowse[0].schema.name === "BrowseDescription");
-            const context = new node_opcua_address_space_1.SessionContext({ session, server: this });
+            const context = session.sessionContext;
             const f = (0, util_1.callbackify)(this.engine.browseWithAutomaticExpansion).bind(this.engine);
             f(request.nodesToBrowse, context, (err, results) => {
                 // istanbul ignore next
@@ -1745,7 +1708,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
         const request = message.request;
         (0, node_opcua_assert_1.assert)(request instanceof node_opcua_service_read_1.ReadRequest);
         this._apply_on_SessionObject(node_opcua_service_read_1.ReadResponse, message, channel, (session, sendResponse, sendError) => {
-            const context = new node_opcua_address_space_1.SessionContext({ session, server: this });
+            const context = session.sessionContext;
             let response;
             let results = [];
             const timestampsToReturn = request.timestampsToReturn;
@@ -1819,7 +1782,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
                     return sendError(node_opcua_status_code_1.StatusCodes.BadTooManyOperations);
                 }
             }
-            const context = new node_opcua_address_space_1.SessionContext({ session, server: this });
+            const context = session.sessionContext;
             // ask for a refresh of asynchronous variables
             this.engine.refreshValues(request.nodesToRead, 0, (err) => {
                 (0, node_opcua_assert_1.assert)(!err, " error not handled here , fix me"); // TODO
@@ -1874,7 +1837,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
             for (const nodeToWrite of request.nodesToWrite) {
                 nodeToWrite.nodeId = session.resolveRegisteredNode(nodeToWrite.nodeId);
             }
-            const context = new node_opcua_address_space_1.SessionContext({ session, server: this });
+            const context = session.sessionContext;
             (0, node_opcua_assert_1.assert)(request.nodesToWrite[0].schema.name === "WriteValue");
             this.engine.write(context, request.nodesToWrite, (err, results) => {
                 if (err) {
@@ -1898,7 +1861,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
         const request = message.request;
         (0, node_opcua_assert_1.assert)(request instanceof node_opcua_service_subscription_1.CreateSubscriptionRequest);
         this._apply_on_SessionObject(node_opcua_service_subscription_1.CreateSubscriptionResponse, message, channel, (session, sendResponse, sendError) => {
-            const context = new node_opcua_address_space_1.SessionContext({ session, server: this });
+            const context = session.sessionContext;
             if (session.currentSubscriptionCount >= this.engine.serverCapabilities.maxSubscriptionsPerSession) {
                 return sendError(node_opcua_status_code_1.StatusCodes.BadTooManySubscriptions);
             }
@@ -2253,7 +2216,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
             }
             /* jshint validthis: true */
             const addressSpace = this.engine.addressSpace;
-            const context = new node_opcua_address_space_1.SessionContext({ session, server: this });
+            const context = session.sessionContext;
             async.map(request.methodsToCall, node_opcua_address_space_1.callMethodHelper.bind(null, context, addressSpace), (err, results) => {
                 /* istanbul ignore next */
                 if (err) {
@@ -2425,6 +2388,49 @@ OPCUAServer.fallbackSessionName = "Client didn't provide a meaningful sessionNam
  * @deprecated
  */
 OPCUAServer.deprectated_MAX_SUBSCRIPTION = 50;
+const userIdentityTokenPasswordRemoved = (userIdentityToken) => {
+    const a = userIdentityToken.clone();
+    // remove password
+    a.password = "*************";
+    return a;
+};
+function raiseAuditActivateSessionEventType(session) {
+    if (this.isAuditing) {
+        this.raiseEvent("AuditActivateSessionEventType", {
+            /* part 5 -  6.4.3 AuditEventType */
+            actionTimeStamp: { dataType: "DateTime", value: new Date() },
+            status: { dataType: "Boolean", value: true },
+            serverId: { dataType: "String", value: "" },
+            // ClientAuditEntryId contains the human-readable AuditEntryId defined in Part 3.
+            clientAuditEntryId: { dataType: "String", value: "" },
+            // The ClientUserId identifies the user of the client requesting an action.
+            // The ClientUserId can be obtained from the UserIdentityToken passed in the
+            // ActivateSession call.
+            clientUserId: { dataType: "String", value: "cc" },
+            sourceName: { dataType: "String", value: "Session/ActivateSession" },
+            /* part 5 - 6.4.7 AuditSessionEventType */
+            sessionId: { dataType: "NodeId", value: session.nodeId },
+            /* part 5 - 6.4.10 AuditActivateSessionEventType */
+            clientSoftwareCertificates: {
+                arrayType: node_opcua_variant_2.VariantArrayType.Array,
+                dataType: "ExtensionObject" /* SignedSoftwareCertificate */,
+                value: []
+            },
+            // UserIdentityToken reflects the userIdentityToken parameter of the ActivateSession
+            // Service call.
+            // For Username/Password tokens the password should NOT be included.
+            userIdentityToken: {
+                dataType: "ExtensionObject" /*  UserIdentityToken */,
+                value: userIdentityTokenPasswordRemoved(session.userIdentityToken)
+            },
+            // SecureChannelId shall uniquely identify the SecureChannel. The application shall
+            // use the same identifier in all AuditEvents related to the Session Service Set
+            // (AuditCreateSessionEventType, AuditActivateSessionEventType and their subtypes) and
+            // the SecureChannel Service Set (AuditChannelEventType and its subtypes).
+            secureChannelId: { dataType: "String", value: session.channel.channelId.toString() }
+        });
+    }
+}
 const opts = { multiArgs: false };
 OPCUAServer.prototype.start = thenify.withCallback(OPCUAServer.prototype.start, opts);
 OPCUAServer.prototype.initialize = thenify.withCallback(OPCUAServer.prototype.initialize, opts);