node-opcua-server 2.128.0 → 2.129.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-server",
-    "version": "2.128.0",
+    "version": "2.129.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.128.0",
-        "node-opcua-address-space-base": "2.128.0",
+        "node-opcua-address-space": "2.129.0",
+        "node-opcua-address-space-base": "2.129.0",
         "node-opcua-assert": "2.120.0",
         "node-opcua-basic-types": "2.128.0",
         "node-opcua-binary-stream": "2.128.0",
-        "node-opcua-certificate-manager": "2.128.0",
-        "node-opcua-client": "2.128.0",
-        "node-opcua-client-dynamic-extension-object": "2.128.0",
-        "node-opcua-common": "2.128.0",
+        "node-opcua-certificate-manager": "2.129.0",
+        "node-opcua-client": "2.129.0",
+        "node-opcua-client-dynamic-extension-object": "2.129.0",
+        "node-opcua-common": "2.129.0",
         "node-opcua-constants": "2.125.0",
-        "node-opcua-crypto": "4.8.0",
+        "node-opcua-crypto": "4.9.2",
         "node-opcua-data-model": "2.128.0",
-        "node-opcua-data-value": "2.128.0",
+        "node-opcua-data-value": "2.129.0",
         "node-opcua-date-time": "2.128.0",
         "node-opcua-debug": "2.128.0",
         "node-opcua-extension-object": "2.128.0",
@@ -39,31 +39,31 @@
         "node-opcua-nodesets": "2.121.0",
         "node-opcua-numeric-range": "2.128.0",
         "node-opcua-object-registry": "2.128.0",
-        "node-opcua-secure-channel": "2.128.0",
-        "node-opcua-service-browse": "2.128.0",
-        "node-opcua-service-call": "2.128.0",
-        "node-opcua-service-discovery": "2.128.0",
-        "node-opcua-service-endpoints": "2.128.0",
-        "node-opcua-service-filter": "2.128.0",
-        "node-opcua-service-history": "2.128.0",
-        "node-opcua-service-node-management": "2.128.0",
-        "node-opcua-service-query": "2.128.0",
-        "node-opcua-service-read": "2.128.0",
-        "node-opcua-service-register-node": "2.128.0",
-        "node-opcua-service-secure-channel": "2.128.0",
-        "node-opcua-service-session": "2.128.0",
-        "node-opcua-service-subscription": "2.128.0",
-        "node-opcua-service-translate-browse-path": "2.128.0",
-        "node-opcua-service-write": "2.128.0",
+        "node-opcua-secure-channel": "2.129.0",
+        "node-opcua-service-browse": "2.129.0",
+        "node-opcua-service-call": "2.129.0",
+        "node-opcua-service-discovery": "2.129.0",
+        "node-opcua-service-endpoints": "2.129.0",
+        "node-opcua-service-filter": "2.129.0",
+        "node-opcua-service-history": "2.129.0",
+        "node-opcua-service-node-management": "2.129.0",
+        "node-opcua-service-query": "2.129.0",
+        "node-opcua-service-read": "2.129.0",
+        "node-opcua-service-register-node": "2.129.0",
+        "node-opcua-service-secure-channel": "2.129.0",
+        "node-opcua-service-session": "2.129.0",
+        "node-opcua-service-subscription": "2.129.0",
+        "node-opcua-service-translate-browse-path": "2.129.0",
+        "node-opcua-service-write": "2.129.0",
         "node-opcua-status-code": "2.128.0",
-        "node-opcua-transport": "2.128.0",
-        "node-opcua-types": "2.128.0",
+        "node-opcua-transport": "2.129.0",
+        "node-opcua-types": "2.129.0",
         "node-opcua-utils": "2.128.0",
-        "node-opcua-variant": "2.128.0",
+        "node-opcua-variant": "2.129.0",
         "thenify": "^3.3.1"
     },
     "devDependencies": {
-        "node-opcua-data-access": "2.128.0",
+        "node-opcua-data-access": "2.129.0",
         "node-opcua-leak-detector": "2.128.0",
         "node-opcua-test-helpers": "2.128.0",
         "underscore": "^1.13.6"
@@ -83,7 +83,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "67a73af6b831d8651a0e66ceb295f159cab4386b",
+    "gitHead": "8a1754350fb95a764e278d37a289f0c48ccb8c9d",
     "files": [
         "dist",
         "source"

package/source/i_channel_data.ts

@@ -3,9 +3,6 @@ import { AsymmetricAlgorithmSecurityHeader, MessageSecurityMode, SecurityPolicy
 export interface IChannelData {
     channelId: number | null;
     clientCertificate: Buffer | null;
-    clientNonce: Buffer | null;
-    clientSecurityHeader: any;
-    securityHeader: AsymmetricAlgorithmSecurityHeader | null;
     securityMode: MessageSecurityMode;
     securityPolicy: SecurityPolicy;
     timeout: number;

package/source/opcua_server.ts

@@ -317,7 +317,7 @@ function adjustSecurityPolicy(channel: ServerSecureChannelLayer, userTokenPolicy
 
     // if the security policy is not specified we use the session security policy
     if (securityPolicy === SecurityPolicy.Invalid) {
-        securityPolicy = fromURI((channel.clientSecurityHeader! as AsymmetricAlgorithmSecurityHeader).securityPolicyUri);
+        securityPolicy = fromURI(channel.securityPolicy);
         assert(securityPolicy !== SecurityPolicy.Invalid);
     }
     return securityPolicy;
@@ -671,7 +671,7 @@ function validate_security_endpoint(
         return { errCode: StatusCodes.BadSecurityModeRejected };
     }
     const endpoints_matching_security_policy = endpoints_matching_security_mode.filter((e: EndpointDescription) => {
-        return e.securityPolicyUri === channel.securityHeader!.securityPolicyUri;
+        return e.securityPolicyUri === channel!.securityPolicy;
     });
 
     if (endpoints_matching_security_policy.length === 0) {
@@ -1503,7 +1503,7 @@ export class OPCUAServer extends OPCUABaseServer {
         clientCertificate: Certificate,
         clientNonce: Nonce
     ): SignatureData | undefined {
-        return computeSignature(clientCertificate, clientNonce, this.getPrivateKey(), channel.messageBuilder!.securityPolicy);
+        return computeSignature(clientCertificate, clientNonce, this.getPrivateKey(), channel.securityPolicy);
     }
 
     /**
@@ -1518,12 +1518,10 @@ export class OPCUAServer extends OPCUABaseServer {
         channel: ServerSecureChannelLayer,
         clientSignature: SignatureData
     ): boolean {
-        const clientCertificate = channel.receiverCertificate!;
-        const securityPolicy = channel.messageBuilder!.securityPolicy;
+        const clientCertificate = channel.clientCertificate!;
+        const securityPolicy = channel.securityPolicy;
         const serverCertificate = this.getCertificate();
-
         const result = verifySignature(serverCertificate, session.nonce!, clientSignature, clientCertificate, securityPolicy);
-
         return result;
     }
 

package/source/server_end_point.ts

@@ -60,9 +60,6 @@ function extractChannelData(channel: ServerSecureChannelLayer): IChannelData {
     const {
         channelId,
         clientCertificate,
-        clientNonce,
-        clientSecurityHeader,
-        securityHeader,
         securityMode,
         securityPolicy,
         timeout,
@@ -72,9 +69,6 @@ function extractChannelData(channel: ServerSecureChannelLayer): IChannelData {
     const channelData: IChannelData = {
         channelId,
         clientCertificate,
-        clientNonce,
-        clientSecurityHeader,
-        securityHeader,
         securityMode,
         securityPolicy,
         timeout,
@@ -761,7 +755,7 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
                 timeout: this.timeout,
                 adjustTransportLimits: this.transportSettings?.adjustTransportLimits
             });
-
+     
             debugLog("channel Timeout = >", channel.timeout);
 
             socket.resume();

package/source/server_engine.ts

@@ -749,7 +749,7 @@ export class ServerEngine extends EventEmitter implements IAddressSpaceAccessor
      * @param options.nodeset_filename {String} - [option](default : 'mini.Node.Set2.xml' )
      * @param callback
      */
-    public initialize(options: OPCUAServerOptions, callback: () => void): void {
+    public initialize(options: OPCUAServerOptions, callback: (err?: Error | null) => void): void {
         assert(!this.addressSpace); // check that 'initialize' has not been already called
 
         this._internalState = "initializing";
@@ -773,7 +773,10 @@ export class ServerEngine extends EventEmitter implements IAddressSpaceAccessor
             assert(serverNamespace.index === 1);
         }
         // eslint-disable-next-line max-statements
-        generateAddressSpace(this.addressSpace, options.nodeset_filename, () => {
+        generateAddressSpace(this.addressSpace, options.nodeset_filename).catch((err) => {
+            console.log(err.message);
+            callback(err);
+        }).then(() => {
             /* istanbul ignore next */
             if (!this.addressSpace) {
                 throw new Error("Internal error");