node-opcua-server 2.100.0 → 2.102.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-server",
-    "version": "2.100.0",
+    "version": "2.102.0",
     "description": "pure nodejs OPCUA SDK - module server",
     "scripts": {
         "build": "tsc -b",
@@ -17,19 +17,19 @@
         "chalk": "4.1.2",
         "dequeue": "^1.0.5",
         "lodash": "4.17.21",
-        "node-opcua-address-space": "2.100.0",
-        "node-opcua-address-space-base": "2.100.0",
+        "node-opcua-address-space": "2.102.0",
+        "node-opcua-address-space-base": "2.102.0",
         "node-opcua-assert": "2.98.1",
         "node-opcua-basic-types": "2.99.0",
         "node-opcua-binary-stream": "2.98.1",
         "node-opcua-certificate-manager": "2.99.0",
-        "node-opcua-client": "2.100.0",
-        "node-opcua-client-dynamic-extension-object": "2.99.0",
-        "node-opcua-common": "2.99.0",
+        "node-opcua-client": "2.102.0",
+        "node-opcua-client-dynamic-extension-object": "2.102.0",
+        "node-opcua-common": "2.102.0",
         "node-opcua-constants": "2.98.1",
         "node-opcua-crypto": "^2.1.2",
-        "node-opcua-data-model": "2.99.0",
-        "node-opcua-data-value": "2.99.0",
+        "node-opcua-data-model": "2.102.0",
+        "node-opcua-data-value": "2.102.0",
         "node-opcua-date-time": "2.99.0",
         "node-opcua-debug": "2.99.0",
         "node-opcua-extension-object": "2.99.0",
@@ -37,32 +37,32 @@
         "node-opcua-hostname": "2.98.1",
         "node-opcua-nodeid": "2.99.0",
         "node-opcua-nodesets": "2.99.0",
-        "node-opcua-numeric-range": "2.99.0",
+        "node-opcua-numeric-range": "2.102.0",
         "node-opcua-object-registry": "2.99.0",
-        "node-opcua-secure-channel": "2.99.0",
-        "node-opcua-service-browse": "2.99.0",
-        "node-opcua-service-call": "2.99.0",
-        "node-opcua-service-discovery": "2.99.0",
-        "node-opcua-service-endpoints": "2.99.0",
-        "node-opcua-service-filter": "2.100.0",
-        "node-opcua-service-history": "2.99.0",
-        "node-opcua-service-node-management": "2.99.0",
-        "node-opcua-service-query": "2.99.0",
-        "node-opcua-service-read": "2.99.0",
-        "node-opcua-service-register-node": "2.99.0",
-        "node-opcua-service-secure-channel": "2.99.0",
-        "node-opcua-service-session": "2.99.0",
-        "node-opcua-service-subscription": "2.99.0",
-        "node-opcua-service-translate-browse-path": "2.99.0",
-        "node-opcua-service-write": "2.99.0",
+        "node-opcua-secure-channel": "2.102.0",
+        "node-opcua-service-browse": "2.102.0",
+        "node-opcua-service-call": "2.102.0",
+        "node-opcua-service-discovery": "2.102.0",
+        "node-opcua-service-endpoints": "2.102.0",
+        "node-opcua-service-filter": "2.102.0",
+        "node-opcua-service-history": "2.102.0",
+        "node-opcua-service-node-management": "2.102.0",
+        "node-opcua-service-query": "2.102.0",
+        "node-opcua-service-read": "2.102.0",
+        "node-opcua-service-register-node": "2.102.0",
+        "node-opcua-service-secure-channel": "2.102.0",
+        "node-opcua-service-session": "2.102.0",
+        "node-opcua-service-subscription": "2.102.0",
+        "node-opcua-service-translate-browse-path": "2.102.0",
+        "node-opcua-service-write": "2.102.0",
         "node-opcua-status-code": "2.98.1",
-        "node-opcua-types": "2.99.0",
+        "node-opcua-types": "2.102.0",
         "node-opcua-utils": "2.98.1",
-        "node-opcua-variant": "2.99.0",
+        "node-opcua-variant": "2.102.0",
         "thenify": "^3.3.1"
     },
     "devDependencies": {
-        "node-opcua-data-access": "2.99.0",
+        "node-opcua-data-access": "2.102.0",
         "node-opcua-leak-detector": "2.99.0",
         "node-opcua-pki": "^3.0.2",
         "node-opcua-test-helpers": "2.98.1",
@@ -85,7 +85,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "e143ff72418bb3db8c0a2cb8d4b7e54a90521a73",
+    "gitHead": "07dcdd8e8c7f2b55544c6e23023093e35674829c",
     "files": [
         "dist",
         "source"

package/source/base_server.ts

@@ -5,6 +5,7 @@
 import * as fs from "fs";
 import * as path from "path";
 import * as os from "os";
+import { types } from "util";
 import * as async from "async";
 import * as chalk from "chalk";
 import { withLock } from "@ster5/global-mutex";
@@ -400,7 +401,7 @@ export class OPCUABaseServer extends OPCUASecureObject {
 
             let additional_messages = [];
             additional_messages.push("EXCEPTION CAUGHT WHILE PROCESSING REQUEST !!! " + request.schema.name);
-            if (err instanceof Error) {
+            if (types.isNativeError(err)) {
                 additional_messages.push(err.message);
                 if (err.stack) {
                     additional_messages = additional_messages.concat(err.stack.split("\n"));

package/source/opcua_server.ts

@@ -8,7 +8,7 @@
 
 import * as crypto from "crypto";
 import { EventEmitter } from "events";
-import { callbackify } from "util";
+import { callbackify, types } from "util";
 
 import * as async from "async";
 import * as chalk from "chalk";
@@ -168,7 +168,7 @@ import { RegisterServerManager } from "./register_server_manager";
 import { RegisterServerManagerHidden } from "./register_server_manager_hidden";
 import { RegisterServerManagerMDNSONLY } from "./register_server_manager_mdns_only";
 import { ServerCapabilitiesOptions } from "./server_capabilities";
-import { OPCUAServerEndPoint } from "./server_end_point";
+import { EndpointDescriptionEx, OPCUAServerEndPoint } from "./server_end_point";
 import { ClosingReason, CreateSessionOption, ServerEngine } from "./server_engine";
 import { ServerSession } from "./server_session";
 import { CreateMonitoredItemHook, DeleteMonitoredItemHook, Subscription } from "./server_subscription";
@@ -642,10 +642,10 @@ function validate_security_endpoint(
     if (endpoints.length === 0) {
         // we have a UrlMismatch here
         const ua_server = server.engine.addressSpace!.rootFolder.objects.server;
+        errorLog("Cannot find suitable endpoints in available endpoints. endpointUri =", request.endpointUrl);
         ua_server.raiseEvent("AuditUrlMismatchEventType", {
             endpointUrl: { dataType: DataType.String, value: request.endpointUrl }
         });
-        debugLog("Cannot find endpoint  in available endpoints with endpointUri", request.endpointUrl);
         if (OPCUAServer.requestExactEndpointUrl) {
             return { errCode: StatusCodes.BadServiceUnsupported };
         } else {
@@ -653,7 +653,7 @@ function validate_security_endpoint(
         }
     }
     // ignore restricted endpoints
-    endpoints = endpoints.filter((e: EndpointDescription) => !(e as any).restricted);
+    endpoints = endpoints.filter((e: EndpointDescription) => !(e as EndpointDescriptionEx).restricted);
 
     const endpoints_matching_security_mode = endpoints.filter((e: EndpointDescription) => {
         return e.securityMode === channel.securityMode;
@@ -1148,7 +1148,7 @@ export class OPCUAServer extends OPCUABaseServer {
             const hostname = getFullyQualifiedDomainName();
 
             endpointDefinitions.push({
-                port: options.port || 26543,
+                port: options.port  === undefined ? 26543 : options.port,
 
                 allowAnonymous: options.allowAnonymous,
                 alternateHostname: options.alternateHostname,
@@ -2257,7 +2257,7 @@ export class OPCUAServer extends OPCUABaseServer {
             } catch (err) {
                 warningLog(err);
                 // istanbul ignore next
-                if (err instanceof Error) {
+                if (types.isNativeError(err)) {
                     // istanbul ignore next
                     errorLog(
                         "Internal error in issuing response\nplease contact support@sterfive.com",
@@ -3526,7 +3526,7 @@ export class OPCUAServer extends OPCUABaseServer {
         }
         const hostname = getFullyQualifiedDomainName();
         endpointOptions.hostname = endpointOptions.hostname || hostname;
-        endpointOptions.port = endpointOptions.port || 26543;
+        endpointOptions.port = endpointOptions.port === undefined ? 26543 : endpointOptions.port ;
 
         /* istanbul ignore next */
         if (

package/source/register_server_manager_mdns_only.ts

@@ -43,10 +43,12 @@ export class RegisterServerManagerMDNSONLY extends EventEmitter implements IRegi
         }
         assert(this.server instanceof OPCUABaseServer);
 
+        const host = "TODO-find how to extract hostname";
         this.bonjour.announcedOnMulticastSubnetWithCallback({
             capabilities: this.server.capabilitiesForMDNS,
             name: this.server.serverInfo.applicationUri!,
             path: "/", // <- to do
+            host,
             port: this.server.endpoints[0].port
         }, ()=>{
             this.emit("serverRegistered");

package/source/server_end_point.ts

@@ -9,8 +9,8 @@ import * as chalk from "chalk";
 import * as async from "async";
 
 import { assert } from "node-opcua-assert";
-import { ICertificateManager, OPCUACertificateManager } from "node-opcua-certificate-manager";
-import { Certificate, convertPEMtoDER, makeSHA1Thumbprint, PrivateKey, PrivateKeyPEM, split_der } from "node-opcua-crypto";
+import { OPCUACertificateManager } from "node-opcua-certificate-manager";
+import { Certificate, makeSHA1Thumbprint, PrivateKey, split_der } from "node-opcua-crypto";
 import { checkDebugFlag, make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug";
 import { getFullyQualifiedDomainName, resolveFullyQualifiedDomainName } from "node-opcua-hostname";
 import {
@@ -20,7 +20,6 @@ import {
     ServerSecureChannelLayer,
     ServerSecureChannelParent,
     toURI,
-    AsymmetricAlgorithmSecurityHeader,
     IServerSessionBase,
     Message
 } from "node-opcua-secure-channel";
@@ -83,9 +82,8 @@ function extractChannelData(channel: ServerSecureChannelLayer): IChannelData {
 
 function dumpChannelInfo(channels: ServerSecureChannelLayer[]): void {
     function d(s: IServerSessionBase) {
-        return `[ status=${s.status} lastSeen=${s.clientLastContactTime.toFixed(0)}ms sessionName=${s.sessionName} timeout=${
-            s.sessionTimeout
-        } ]`;
+        return `[ status=${s.status} lastSeen=${s.clientLastContactTime.toFixed(0)}ms sessionName=${s.sessionName} timeout=${s.sessionTimeout
+            } ]`;
     }
     function dumpChannel(channel: ServerSecureChannelLayer): void {
         console.log("------------------------------------------------------");
@@ -381,7 +379,6 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
         }
         //
 
-        const port = this.port;
 
         // resource Path is a string added at the end of the url such as "/UA/Server"
         const resourcePath = (options.resourcePath || "").replace(/\\/g, "/");
@@ -389,7 +386,7 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
         assert(resourcePath.length === 0 || resourcePath.charAt(0) === "/", "resourcePath should start with /");
 
         const hostname = options.hostname || getFullyQualifiedDomainName();
-        const endpointUrl = `opc.tcp://${hostname}:${port}${resourcePath}`;
+        const endpointUrl = `opc.tcp://${hostname}:${this.port}${resourcePath}`;
 
         const endpoint_desc = this.getEndpointDescription(securityMode, securityPolicy, endpointUrl);
 
@@ -404,10 +401,7 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
         this._endpoints.push(
             _makeEndpointDescription({
                 collection: this._policy_deduplicator,
-                endpointUrl,
                 hostname,
-                port,
-
                 server: this.serverInfo,
                 serverCertificateChain: this.getCertificateChain(),
 
@@ -421,7 +415,7 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
                 securityPolicies: options.securityPolicies || [],
 
                 userTokenTypes
-            })
+            }, this)
         );
     }
 
@@ -511,16 +505,23 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
         this._server!.on("listening", () => {
             debugLog("server is listening");
         });
+
         this._server!.listen(
             this.port,
-            /*"::",*/ (err?: Error) => {
+            /*"::",*/(err?: Error) => {
                 // 'listening' listener
                 debugLog(chalk.green.bold("LISTENING TO PORT "), this.port, "err  ", err);
                 assert(!err, " cannot listen to port ");
                 this._started = true;
+                if (!this.port) {
+                    const add = this._server!.address()!;
+                    this.port = typeof add !== "string" ? add.port : this.port;
+
+                }
                 this._end_listen();
             }
         );
+
     }
 
     public killClientSockets(callback: (err?: Error) => void): void {
@@ -691,7 +692,7 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
             debugLog(
                 chalk.bgWhite.cyan(
                     "OPCUAServerEndPoint#_on_client_connection " +
-                        "SERVER END POINT IS PROBABLY SHUTTING DOWN !!! - Connection is refused"
+                    "SERVER END POINT IS PROBABLY SHUTTING DOWN !!! - Connection is refused"
                 )
             );
             socket.end();
@@ -701,7 +702,7 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
             console.log(
                 chalk.bgWhite.cyan(
                     "OPCUAServerEndPoint#_on_client_connection " +
-                        "The maximum number of connection has been reached - Connection is refused"
+                    "The maximum number of connection has been reached - Connection is refused"
                 )
             );
             const reason = "maxConnections reached (" + this.maxConnections + ")";
@@ -937,19 +938,11 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
 }
 
 interface MakeEndpointDescriptionOptions {
-    /**
-     * port number s
-     */
-    port: number;
 
     /**
      * @default  default hostname (default value will be full qualified domain name)
      */
     hostname: string;
-    /**
-     *
-     */
-    endpointUrl: string;
 
     serverCertificateChain: Certificate;
     /**
@@ -1000,7 +993,8 @@ interface MakeEndpointDescriptionOptions {
     noUserIdentityTokens?: boolean;
 }
 
-interface EndpointDescriptionEx extends EndpointDescription {
+export interface EndpointDescriptionEx extends EndpointDescription {
+    _parent: OPCUAServerEndPoint;
     restricted: boolean;
 }
 
@@ -1038,8 +1032,7 @@ function estimateSecurityLevel(securityMode: MessageSecurityMode, securityPolicy
 /**
  * @private
  */
-function _makeEndpointDescription(options: MakeEndpointDescriptionOptions): EndpointDescriptionEx {
-    assert(isFinite(options.port), "expecting a valid port number");
+function _makeEndpointDescription(options: MakeEndpointDescriptionOptions, parent: OPCUAServerEndPoint): EndpointDescriptionEx {
     assert(Object.prototype.hasOwnProperty.call(options, "serverCertificateChain"));
     assert(!Object.prototype.hasOwnProperty.call(options, "serverCertificate"));
     assert(!!options.securityMode); // s.MessageSecurityMode
@@ -1146,7 +1139,7 @@ function _makeEndpointDescription(options: MakeEndpointDescriptionOptions): Endp
     }
     // return the endpoint object
     const endpoint = new EndpointDescription({
-        endpointUrl: options.endpointUrl,
+        endpointUrl: '<to be evaluated at run time>',// options.endpointUrl,
 
         server: undefined, // options.server,
         serverCertificate: options.serverCertificateChain,
@@ -1158,9 +1151,16 @@ function _makeEndpointDescription(options: MakeEndpointDescriptionOptions): Endp
         securityLevel: options.securityLevel,
         transportProfileUri: default_transportProfileUri
     }) as EndpointDescriptionEx;
-
+    endpoint._parent = parent;
+   
+    // endpointUrl is dynamic as port number may be adjusted
+    // when the tcp socker start listening
     (endpoint as any).__defineGetter__("endpointUrl", () => {
-        return resolveFullyQualifiedDomainName(options.endpointUrl);
+        const port = endpoint._parent.port;
+        const resourcePath = options.resourcePath || "";
+        const hostname = options.hostname;
+        const endpointUrl = `opc.tcp://${hostname}:${port}${resourcePath}`;
+        return resolveFullyQualifiedDomainName(endpointUrl);
     });
 
     endpoint.server = options.server;

package/source/server_engine.ts

@@ -2,6 +2,7 @@
  * @module node-opcua-server
  */
 import { EventEmitter } from "events";
+import { types } from "util";
 import * as async from "async";
 import * as chalk from "chalk";
 import { assert } from "node-opcua-assert";
@@ -1353,7 +1354,7 @@ export class ServerEngine extends EventEmitter {
                         await node.onFirstBrowseAction();
                         node.onFirstBrowseAction = undefined;
                     } catch (err) {
-                        if (err instanceof Error) {
+                        if (types.isNativeError(err)) {
                             errorLog("onFirstBrowseAction method has failed", err.message);
                         }
                         errorLog(err);

package/source/user_manager.ts

@@ -1,3 +1,4 @@
+import { types } from "util";
 import { IUserManager, UARoleSet } from "node-opcua-address-space";
 import { NodeId } from "node-opcua-nodeid";
 import { IdentityMappingRuleType } from "node-opcua-types";
@@ -52,7 +53,7 @@ export class UAUserManager1 extends UAUserManagerBase {
         try {
             return this.options.getUserRoles(user);
         } catch (err) {
-            if (err instanceof Error) {
+            if (types.isNativeError(err)) {
                 errorLog(
                     "[NODE-OPCUA-E27] userManager provided getUserRoles method has thrown an exception, please fix your code! "
                 );
@@ -75,7 +76,7 @@ export class UAUserManager1 extends UAUserManagerBase {
                 const authorized = this.options.isValidUser!.call(session, username, password);
                 return authorized;
             } catch (err) {
-                if (err instanceof Error) {
+                if (types.isNativeError(err)) {
                     errorLog(
                         "[NODE-OPCUA-E26] userManager provided isValidUser method has thrown an exception, please fix your code!"
                     );