node-opcua-server 2.84.0 → 2.86.0

package/dist/opcua_server.js

@@ -484,92 +484,6 @@ const g_requestExactEndpointUrl = !!process.env.NODEOPCUA_SERVER_REQUEST_EXACT_E
  *
  */
 class OPCUAServer extends base_server_1.OPCUABaseServer {
-    constructor(options) {
-        super(options);
-        /**
-         * false if anonymous connection are not allowed
-         */
-        this.allowAnonymous = false;
-        this.allowAnonymous = false;
-        options = options || {};
-        this.options = options;
-        if (options.maxAllowedSessionNumber !== undefined) {
-            warningLog("[NODE-OPCUA-W21] maxAllowedSessionNumber property is now deprecated , please use serverCapabilities.maxSessions instead");
-            options.serverCapabilities = options.serverCapabilities || {};
-            options.serverCapabilities.maxSessions = options.maxAllowedSessionNumber;
-        }
-        /**
-         * @property maxConnectionsPerEndpoint
-         */
-        this.maxConnectionsPerEndpoint = options.maxConnectionsPerEndpoint || default_maxConnectionsPerEndpoint;
-        // build Info
-        const buildInfo = Object.assign(Object.assign({}, default_build_info), options.buildInfo);
-        // repair product name
-        buildInfo.productUri = buildInfo.productUri || this.serverInfo.productUri;
-        this.serverInfo.productUri = this.serverInfo.productUri || buildInfo.productUri;
-        this.userManager = (0, user_manager_1.makeUserManager)(options.userManager);
-        options.allowAnonymous = options.allowAnonymous === undefined ? true : !!options.allowAnonymous;
-        /**
-         * @property allowAnonymous
-         */
-        this.allowAnonymous = options.allowAnonymous;
-        this.discoveryServerEndpointUrl = options.discoveryServerEndpointUrl || "opc.tcp://%FQDN%:4840";
-        (0, node_opcua_assert_1.assert)(typeof this.discoveryServerEndpointUrl === "string");
-        this.serverInfo.applicationType = node_opcua_service_endpoints_1.ApplicationType.Server;
-        this.capabilitiesForMDNS = options.capabilitiesForMDNS || ["NA"];
-        this.registerServerMethod = options.registerServerMethod || RegisterServerMethod.HIDDEN;
-        _installRegisterServerManager(this);
-        if (!options.userCertificateManager) {
-            this.userCertificateManager = (0, node_opcua_certificate_manager_1.getDefaultCertificateManager)("UserPKI");
-        }
-        else {
-            this.userCertificateManager = options.userCertificateManager;
-        }
-        // note: we need to delay initialization of endpoint as certain resources
-        // such as %FQDN% might not be ready yet at this stage
-        this._delayInit = () => __awaiter(this, void 0, void 0, function* () {
-            /* istanbul ignore next */
-            if (!options) {
-                throw new Error("Internal Error");
-            }
-            // to check => this.serverInfo.applicationName = this.serverInfo.productName || buildInfo.productName;
-            // note: applicationUri is handled in a special way
-            this.engine = new server_engine_1.ServerEngine({
-                applicationUri: () => this.serverInfo.applicationUri,
-                buildInfo,
-                isAuditing: options.isAuditing,
-                serverCapabilities: options.serverCapabilities
-            });
-            this.objectFactory = new factory_1.Factory(this.engine);
-            const endpointDefinitions = options.alternateEndpoints || [];
-            const hostname = (0, node_opcua_hostname_1.getFullyQualifiedDomainName)();
-            endpointDefinitions.push({
-                port: options.port || 26543,
-                allowAnonymous: options.allowAnonymous,
-                alternateHostname: options.alternateHostname,
-                disableDiscovery: options.disableDiscovery,
-                hostname: options.hostname || hostname,
-                securityModes: options.securityModes,
-                securityPolicies: options.securityPolicies
-            });
-            // todo  should self.serverInfo.productUri  match self.engine.buildInfo.productUri ?
-            for (const endpointOptions of endpointDefinitions) {
-                const endPoint = this.createEndpointDescriptions(options, endpointOptions);
-                this.endpoints.push(endPoint);
-                endPoint.on("message", (message, channel) => {
-                    this.on_request(message, channel);
-                });
-                endPoint.on("error", (err) => {
-                    errorLog("OPCUAServer endpoint error", err);
-                    // set serverState to ServerState.Failed;
-                    this.engine.setServerState(node_opcua_common_1.ServerState.Failed);
-                    this.shutdown(() => {
-                        /* empty */
-                    });
-                });
-            }
-        });
-    }
     /**
      * total number of bytes written  by the server since startup
      */
@@ -664,6 +578,92 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
     get maxAllowedSessionNumber() {
         return this.engine.serverCapabilities.maxSessions;
     }
+    constructor(options) {
+        super(options);
+        /**
+         * false if anonymous connection are not allowed
+         */
+        this.allowAnonymous = false;
+        this.allowAnonymous = false;
+        options = options || {};
+        this.options = options;
+        if (options.maxAllowedSessionNumber !== undefined) {
+            warningLog("[NODE-OPCUA-W21] maxAllowedSessionNumber property is now deprecated , please use serverCapabilities.maxSessions instead");
+            options.serverCapabilities = options.serverCapabilities || {};
+            options.serverCapabilities.maxSessions = options.maxAllowedSessionNumber;
+        }
+        /**
+         * @property maxConnectionsPerEndpoint
+         */
+        this.maxConnectionsPerEndpoint = options.maxConnectionsPerEndpoint || default_maxConnectionsPerEndpoint;
+        // build Info
+        const buildInfo = Object.assign(Object.assign({}, default_build_info), options.buildInfo);
+        // repair product name
+        buildInfo.productUri = buildInfo.productUri || this.serverInfo.productUri;
+        this.serverInfo.productUri = this.serverInfo.productUri || buildInfo.productUri;
+        this.userManager = (0, user_manager_1.makeUserManager)(options.userManager);
+        options.allowAnonymous = options.allowAnonymous === undefined ? true : !!options.allowAnonymous;
+        /**
+         * @property allowAnonymous
+         */
+        this.allowAnonymous = options.allowAnonymous;
+        this.discoveryServerEndpointUrl = options.discoveryServerEndpointUrl || "opc.tcp://%FQDN%:4840";
+        (0, node_opcua_assert_1.assert)(typeof this.discoveryServerEndpointUrl === "string");
+        this.serverInfo.applicationType = node_opcua_service_endpoints_1.ApplicationType.Server;
+        this.capabilitiesForMDNS = options.capabilitiesForMDNS || ["NA"];
+        this.registerServerMethod = options.registerServerMethod || RegisterServerMethod.HIDDEN;
+        _installRegisterServerManager(this);
+        if (!options.userCertificateManager) {
+            this.userCertificateManager = (0, node_opcua_certificate_manager_1.getDefaultCertificateManager)("UserPKI");
+        }
+        else {
+            this.userCertificateManager = options.userCertificateManager;
+        }
+        // note: we need to delay initialization of endpoint as certain resources
+        // such as %FQDN% might not be ready yet at this stage
+        this._delayInit = () => __awaiter(this, void 0, void 0, function* () {
+            /* istanbul ignore next */
+            if (!options) {
+                throw new Error("Internal Error");
+            }
+            // to check => this.serverInfo.applicationName = this.serverInfo.productName || buildInfo.productName;
+            // note: applicationUri is handled in a special way
+            this.engine = new server_engine_1.ServerEngine({
+                applicationUri: () => this.serverInfo.applicationUri,
+                buildInfo,
+                isAuditing: options.isAuditing,
+                serverCapabilities: options.serverCapabilities
+            });
+            this.objectFactory = new factory_1.Factory(this.engine);
+            const endpointDefinitions = options.alternateEndpoints || [];
+            const hostname = (0, node_opcua_hostname_1.getFullyQualifiedDomainName)();
+            endpointDefinitions.push({
+                port: options.port || 26543,
+                allowAnonymous: options.allowAnonymous,
+                alternateHostname: options.alternateHostname,
+                disableDiscovery: options.disableDiscovery,
+                hostname: options.hostname || hostname,
+                securityModes: options.securityModes,
+                securityPolicies: options.securityPolicies
+            });
+            // todo  should self.serverInfo.productUri  match self.engine.buildInfo.productUri ?
+            for (const endpointOptions of endpointDefinitions) {
+                const endPoint = this.createEndpointDescriptions(options, endpointOptions);
+                this.endpoints.push(endPoint);
+                endPoint.on("message", (message, channel) => {
+                    this.on_request(message, channel);
+                });
+                endPoint.on("error", (err) => {
+                    errorLog("OPCUAServer endpoint error", err);
+                    // set serverState to ServerState.Failed;
+                    this.engine.setServerState(node_opcua_common_1.ServerState.Failed);
+                    this.shutdown(() => {
+                        /* empty */
+                    });
+                });
+            }
+        });
+    }
     initialize(...args) {
         const done = args[0];
         (0, node_opcua_assert_1.assert)(!this.initialized, "server is already initialized"); // already initialized ?
@@ -933,16 +933,17 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
                         break;
                 }
             }
-            if (node_opcua_status_code_1.StatusCodes.BadCertificateUntrusted === certificateStatus ||
-                node_opcua_status_code_1.StatusCodes.BadCertificateTimeInvalid === certificateStatus ||
-                node_opcua_status_code_1.StatusCodes.BadCertificateIssuerTimeInvalid === certificateStatus ||
-                node_opcua_status_code_1.StatusCodes.BadCertificateIssuerUseNotAllowed === certificateStatus ||
-                node_opcua_status_code_1.StatusCodes.BadCertificateIssuerRevocationUnknown === certificateStatus ||
-                node_opcua_status_code_1.StatusCodes.BadCertificateRevocationUnknown === certificateStatus ||
-                node_opcua_status_code_1.StatusCodes.BadCertificateRevoked === certificateStatus ||
-                node_opcua_status_code_1.StatusCodes.BadCertificateUseNotAllowed === certificateStatus ||
-                node_opcua_status_code_1.StatusCodes.BadSecurityChecksFailed === certificateStatus ||
-                node_opcua_status_code_1.StatusCodes.Good !== certificateStatus) {
+            if (certificateStatus &&
+                (node_opcua_status_code_1.StatusCodes.BadCertificateUntrusted.equals(certificateStatus) ||
+                    node_opcua_status_code_1.StatusCodes.BadCertificateTimeInvalid.equals(certificateStatus) ||
+                    node_opcua_status_code_1.StatusCodes.BadCertificateIssuerTimeInvalid.equals(certificateStatus) ||
+                    node_opcua_status_code_1.StatusCodes.BadCertificateIssuerUseNotAllowed.equals(certificateStatus) ||
+                    node_opcua_status_code_1.StatusCodes.BadCertificateIssuerRevocationUnknown.equals(certificateStatus) ||
+                    node_opcua_status_code_1.StatusCodes.BadCertificateRevocationUnknown.equals(certificateStatus) ||
+                    node_opcua_status_code_1.StatusCodes.BadCertificateRevoked.equals(certificateStatus) ||
+                    node_opcua_status_code_1.StatusCodes.BadCertificateUseNotAllowed.equals(certificateStatus) ||
+                    node_opcua_status_code_1.StatusCodes.BadSecurityChecksFailed.equals(certificateStatus) ||
+                    !node_opcua_status_code_1.StatusCodes.Good.equals(certificateStatus))) {
                 debugLog("isValidX509IdentityToken => certificateStatus = ", certificateStatus === null || certificateStatus === void 0 ? void 0 : certificateStatus.toString());
                 return callback(null, node_opcua_status_code_1.StatusCodes.BadIdentityTokenRejected);
             }
@@ -1271,7 +1272,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
         const authenticationToken = request.requestHeader.authenticationToken;
         const session = this.getSession(authenticationToken);
         function rejectConnection(server, statusCode) {
-            if (statusCode === node_opcua_status_code_1.StatusCodes.BadSessionIdInvalid) {
+            if (statusCode.equals(node_opcua_status_code_1.StatusCodes.BadSessionIdInvalid)) {
                 server.engine.incrementRejectedSessionCount();
             }
             else {
@@ -1342,7 +1343,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
         request.userIdentityToken = request.userIdentityToken || createAnonymousIdentityToken(session.endpoint);
         // check request.userIdentityToken is correct ( expected type and correctly formed)
         this.isValidUserIdentityToken(channel, session, request.userIdentityToken, request.userTokenSignature, session.endpoint, (err, statusCode) => {
-            if (statusCode !== node_opcua_status_code_1.StatusCodes.Good) {
+            if (!statusCode || statusCode.isNotGood()) {
                 /* istanbul ignore next */
                 if (!(statusCode && statusCode instanceof node_opcua_status_code_1.StatusCode)) {
                     return rejectConnection(this, node_opcua_status_code_1.StatusCodes.BadCertificateInvalid);
@@ -1462,7 +1463,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
                 debugLog(chalk.red.bold(errMessage), chalk.yellow(message.session_statusCode.toString()), response.constructor.name);
                 return sendResponse(response);
             }
-            (0, node_opcua_assert_1.assert)(message.session_statusCode === node_opcua_status_code_1.StatusCodes.Good);
+            (0, node_opcua_assert_1.assert)(message.session_statusCode.isGood());
             // OPC UA Specification 1.02 part 4 page 26
             // When a  Session  is terminated, all outstanding requests on the  Session  are aborted and
             // Bad_SessionClosed  StatusCodes  are returned to the  Client. In addition,   the  Server  deletes the entry
@@ -1636,34 +1637,23 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
             const requestedMaxReferencesPerNode = Math.min(9876, request.requestedMaxReferencesPerNode);
             (0, node_opcua_assert_1.assert)(request.nodesToBrowse[0].schema.name === "BrowseDescription");
             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
+            const browseAll = (nodesToBrowse, callack) => {
+                const f = (0, util_1.callbackify)(this.engine.browseWithAutomaticExpansion).bind(this.engine);
+                f(request.nodesToBrowse, context, callack);
+            };
+            // handle continuation point and requestedMaxReferencesPerNode
+            const maxBrowseContinuationPoints = this.engine.serverCapabilities.maxBrowseContinuationPoints;
+            (0, node_opcua_address_space_1.innerBrowse)({
+                browseAll,
+                context,
+                continuationPointManager: session.continuationPointManager,
+                requestedMaxReferencesPerNode,
+                maxBrowseContinuationPoints
+            }, request.nodesToBrowse, (err, results) => {
                 if (!results) {
-                    throw new Error("internal error : " + (err === null || err === void 0 ? void 0 : err.message));
+                    return sendError(node_opcua_status_code_1.StatusCodes.BadInternalError);
                 }
                 (0, node_opcua_assert_1.assert)(results[0].schema.name === "BrowseResult");
-                // handle continuation point and requestedMaxReferencesPerNode
-                const maxBrowseContinuationPoints = this.engine.serverCapabilities.maxBrowseContinuationPoints;
-                results = results.map((result) => {
-                    (0, node_opcua_assert_1.assert)(!result.continuationPoint);
-                    // istanbul ignore next
-                    if (!session.continuationPointManager) {
-                        return new node_opcua_types_1.BrowseResult({ statusCode: node_opcua_status_code_1.StatusCodes.BadNoContinuationPoints });
-                    }
-                    if (session.continuationPointManager.hasReachedMaximum(maxBrowseContinuationPoints)) {
-                        return new node_opcua_types_1.BrowseResult({ statusCode: node_opcua_status_code_1.StatusCodes.BadNoContinuationPoints });
-                    }
-                    const truncatedResult = session.continuationPointManager.registerReferences(requestedMaxReferencesPerNode, result.references || [], { continuationPoint: null });
-                    let { statusCode } = truncatedResult;
-                    const { continuationPoint, values } = truncatedResult;
-                    statusCode = result.statusCode;
-                    return new node_opcua_types_1.BrowseResult({
-                        statusCode,
-                        continuationPoint,
-                        references: values
-                    });
-                });
                 response = new node_opcua_service_browse_1.BrowseResponse({
                     diagnosticInfos: undefined,
                     results
@@ -1685,22 +1675,18 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
             if (!request.continuationPoints || request.continuationPoints.length === 0) {
                 return sendError(node_opcua_status_code_1.StatusCodes.BadNothingToDo);
             }
-            const results = request.continuationPoints
-                .map((continuationPoint, index) => session.continuationPointManager.getNextReferences(0, {
-                continuationPoint,
-                index,
-                releaseContinuationPoints: request.releaseContinuationPoints
-            }))
-                .map((r) => ({
-                continuationPoint: r.continuationPoint,
-                references: r.values,
-                statusCode: r.statusCode
-            }));
-            const response = new node_opcua_service_browse_1.BrowseNextResponse({
-                diagnosticInfos: undefined,
-                results
+            (0, node_opcua_address_space_1.innerBrowseNext)({
+                continuationPointManager: session.continuationPointManager
+            }, request.continuationPoints, request.releaseContinuationPoints, (err, results) => {
+                if (err) {
+                    return sendError(node_opcua_status_code_1.StatusCodes.BadInternalError);
+                }
+                const response = new node_opcua_service_browse_1.BrowseNextResponse({
+                    diagnosticInfos: undefined,
+                    results
+                });
+                sendResponse(response);
             });
-            sendResponse(response);
         });
     }
     // read services
@@ -2089,7 +2075,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
                 }
             }
             const { addResults, removeResults, statusCode } = subscription.setTriggering(triggeringItemId, linksToAdd, linksToRemove);
-            if (statusCode !== node_opcua_status_code_1.StatusCodes.Good) {
+            if (statusCode.isNotGood()) {
                 const response = new node_opcua_types_1.ServiceFault({ responseHeader: { serviceResult: statusCode } });
                 sendResponse(response);
             }