node-opcua-client 2.126.0 → 2.127.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-client",
-    "version": "2.126.0",
+    "version": "2.127.0",
     "description": "pure nodejs OPCUA SDK - module client",
     "scripts": {
         "clean": "npx rimraf node_modules dist *.tsbuildinfo certificates",
@@ -17,12 +17,12 @@
         "@types/async": "^3.2.24",
         "async": "^3.2.5",
         "chalk": "4.1.2",
-        "node-opcua-alarm-condition": "2.126.0",
+        "node-opcua-alarm-condition": "2.127.0",
         "node-opcua-assert": "2.120.0",
         "node-opcua-basic-types": "2.126.0",
         "node-opcua-buffer-utils": "2.125.0",
         "node-opcua-certificate-manager": "2.125.0",
-        "node-opcua-client-dynamic-extension-object": "2.126.0",
+        "node-opcua-client-dynamic-extension-object": "2.127.0",
         "node-opcua-common": "2.126.0",
         "node-opcua-constants": "2.125.0",
         "node-opcua-crypto": "4.8.0",
@@ -35,7 +35,7 @@
         "node-opcua-nodeid": "2.125.0",
         "node-opcua-object-registry": "2.125.0",
         "node-opcua-pki": "4.10.0",
-        "node-opcua-pseudo-session": "2.126.0",
+        "node-opcua-pseudo-session": "2.127.0",
         "node-opcua-schemas": "2.126.0",
         "node-opcua-secure-channel": "2.126.0",
         "node-opcua-service-browse": "2.126.0",
@@ -62,7 +62,7 @@
         "@types/underscore": "^1.11.15",
         "dequeue": "^1.0.5",
         "mocha": "^10.4.0",
-        "node-opcua-address-space": "2.126.0",
+        "node-opcua-address-space": "2.127.0",
         "node-opcua-binary-stream": "2.125.0",
         "node-opcua-factory": "2.126.0",
         "node-opcua-leak-detector": "2.125.0",
@@ -91,7 +91,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "81b467f284c41813ab8caf17f6d20322d4734fdc",
+    "gitHead": "29da2933b3dbe51c9ca124a26655e346e6e9dcdc",
     "files": [
         "dist",
         "source"

package/source/private/client_base_impl.ts

@@ -199,10 +199,10 @@ function __findEndpoint(this: ClientBaseImpl, endpointUrl: string, params: FindE
             return callback(
                 new Error(
                     "Cannot find an Endpoint matching " +
-                        " security mode: " +
-                        securityMode.toString() +
-                        " policy: " +
-                        securityPolicy.toString()
+                    " security mode: " +
+                    securityMode.toString() +
+                    " policy: " +
+                    securityPolicy.toString()
                 )
             );
         }
@@ -634,8 +634,8 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
                             const newServerCertificate = this.serverCertificate!;
                             warningLog("new server certificate ", makeSHA1Thumbprint(newServerCertificate).toString("hex"));
 
-                            const sha1Old = makeSHA1Thumbprint(oldServerCertificate!);
-                            const sha1New = makeSHA1Thumbprint(newServerCertificate);
+                            const sha1Old = oldServerCertificate ? makeSHA1Thumbprint(oldServerCertificate!) : null;
+                            const sha1New = newServerCertificate ? makeSHA1Thumbprint(newServerCertificate) : null;
                             if (sha1Old === sha1New) {
                                 warningLog("server certificate has not changed, but was expected to have changed");
                                 return _failAndRetry(
@@ -824,8 +824,8 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
             // disconnect
             errorLog(
                 "[NODE-OPCUA-E08] initializeCM: clientCertificateManager is null\n" +
-                    "                 This happen when you disconnected the client, to free resources.\n" +
-                    "                 Please create a new OPCUAClient instance if you want to reconnect"
+                "                 This happen when you disconnected the client, to free resources.\n" +
+                "                 Please create a new OPCUAClient instance if you want to reconnect"
             );
             return;
         }
@@ -961,12 +961,12 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
                     debugLog(chalk.yellow("- The client cannot to :" + endpointUrl + ". Server is not reachable."));
                     err = new Error(
                         "The connection cannot be established with server " +
-                            endpointUrl +
-                            " .\n" +
-                            "Please check that the server is up and running or your network configuration.\n" +
-                            "Err = (" +
-                            err.message +
-                            ")"
+                        endpointUrl +
+                        " .\n" +
+                        "Please check that the server is up and running or your network configuration.\n" +
+                        "Err = (" +
+                        err.message +
+                        ")"
                     );
                     this._handleUnrecoverableConnectionFailure(err, callback);
                 } else if (err.message.match(/disconnecting/)) {
@@ -1001,9 +1001,9 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
             return callback(
                 new Error(
                     "performMessageTransaction: Invalid client state = " +
-                        this._internalState +
-                        " while performing a transaction " +
-                        request.schema.name
+                    this._internalState +
+                    " while performing a transaction " +
+                    request.schema.name
                 )
             );
         }
@@ -1427,9 +1427,9 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
                 // no matching end point can be found ...
                 const err1 = new Error(
                     "cannot find endpoint for securityMode=" +
-                        MessageSecurityMode[this.securityMode] +
-                        " policy = " +
-                        this.securityPolicy
+                    MessageSecurityMode[this.securityMode] +
+                    " policy = " +
+                    this.securityPolicy
                 );
                 return callback(err1);
             }
@@ -1453,7 +1453,7 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
                     if (chain.length > 1) {
                         warningLog(
                             "                 verify also that the issuer certificate is trusted and the issuer's certificate is present in the issuer.cert folder\n" +
-                                "                 of the client certificate manager located in ",
+                            "                 of the client certificate manager located in ",
                             this.clientCertificateManager.rootDir
                         );
                     } else {

package/source/private/i_private_client.ts

@@ -28,4 +28,6 @@ export interface IClientBase {
     getTransportSettings(): IBasicTransportSettings;
 
     isUnusable(): boolean;
+
+    beforeSubscriptionRecreate?: (session: ClientSession) => Promise<Error | undefined>
 }

package/source/private/opcua_client_impl.ts

@@ -54,7 +54,7 @@ import { AnonymousIdentity, UserIdentityInfo, UserIdentityInfoUserName, UserIden
 import { repair_client_sessions } from "./reconnection/reconnection";
 import { ClientBaseImpl } from "./client_base_impl";
 import { ClientSessionImpl } from "./client_session_impl";
-import { ClientSubscriptionImpl } from "./client_subscription_impl";
+import { IClientBase } from "./i_private_client";
 
 interface TokenAndSignature {
     userIdentityToken: UserIdentityToken | null;
@@ -108,7 +108,7 @@ const ordered: string[] = [
     SecurityPolicy.Basic256Sha256,
 
 
-    
+
     SecurityPolicy.Aes128_Sha256_RsaOaep,
     SecurityPolicy.Aes256_Sha256_RsaPss
 ];
@@ -655,6 +655,12 @@ export class OPCUAClientImpl extends ClientBaseImpl implements OPCUAClient {
     ): Promise<T> {
         return await this.withSessionAsync(connectionPoint, async (session: ClientSession) => {
             assert(session, " session must exist");
+
+            const client1 = this as IClientBase;
+            if (client1.beforeSubscriptionRecreate) {
+                await client1.beforeSubscriptionRecreate(session);
+            }
+
             const subscription = await session.createSubscription2(parameters);
             try {
                 const result = await func(session, subscription);
@@ -689,11 +695,11 @@ export class OPCUAClientImpl extends ClientBaseImpl implements OPCUAClient {
             return callback!(
                 new Error(
                     " End point must exist " +
-                        this._secureChannel!.endpointUrl +
-                        "  securityMode = " +
-                        MessageSecurityMode[this.securityMode] +
-                        "  securityPolicy = " +
-                        this.securityPolicy
+                    this._secureChannel!.endpointUrl +
+                    "  securityMode = " +
+                    MessageSecurityMode[this.securityMode] +
+                    "  securityPolicy = " +
+                    this.securityPolicy
                 )
             );
         }
@@ -1109,11 +1115,11 @@ export class OPCUAClientImpl extends ClientBaseImpl implements OPCUAClient {
             return callback(
                 new Error(
                     " End point must exist " +
-                        this._secureChannel!.endpointUrl +
-                        "  securityMode = " +
-                        MessageSecurityMode[this.securityMode] +
-                        "  securityPolicy = " +
-                        this.securityPolicy
+                    this._secureChannel!.endpointUrl +
+                    "  securityMode = " +
+                    MessageSecurityMode[this.securityMode] +
+                    "  securityPolicy = " +
+                    this.securityPolicy
                 )
             );
         }

package/source/private/reconnection/client_subscription_reconnection.ts

@@ -33,14 +33,13 @@ async function createMonitoredItemsAndRespectOperationalLimits(
 }
 
 async function adjustMonitoredItemNodeIds(subscription: ClientSubscription, oldMonitoredItems: any) {
-// to Do 
+    // to Do 
 }
 /**
  *  utility function to recreate new subscription
  *  @method recreateSubscriptionAndMonitoredItem
  */
-export async function recreateSubscriptionAndMonitoredItem(_subscription: ClientSubscription): Promise<void> 
-{
+export async function recreateSubscriptionAndMonitoredItem(_subscription: ClientSubscription): Promise<void> {
     debugLog("recreateSubscriptionAndMonitoredItem", _subscription.subscriptionId.toString());
 
     const subscription = _subscription as ClientSubscriptionImpl;
@@ -55,14 +54,14 @@ export async function recreateSubscriptionAndMonitoredItem(_subscription: Client
     subscription.publishEngine.unregisterSubscription(oldSubscriptionId);
 
     await promisify(__create_subscription)(subscription);
-    
-    const _err = _shouldNotContinue(subscription.session); 
-    if (_err) { throw _err;  }
+
+    const _err = _shouldNotContinue(subscription.session);
+    if (_err) { throw _err; }
 
     const test = subscription.publishEngine.getSubscription(subscription.subscriptionId);
 
     debugLog("recreating ", Object.keys(oldMonitoredItems).length, " monitored Items");
-                // re-create monitored items
+    // re-create monitored items
     const itemsToCreate: MonitoredItemCreateRequestOptions[] = [];
 
     await adjustMonitoredItemNodeIds(subscription, oldMonitoredItems);
@@ -91,8 +90,8 @@ export async function recreateSubscriptionAndMonitoredItem(_subscription: Client
     debugLog("Recreating ", itemsToCreate.length, " monitored items");
 
     const response = await createMonitoredItemsAndRespectOperationalLimits(
-                        session,
-                        createMonitorItemsRequest);
+        session,
+        createMonitorItemsRequest);
     const monitoredItemResults = response.results || [];
 
     let _errCount = 0;

package/source/private/reconnection/reconnection.ts

@@ -306,6 +306,24 @@ function repair_client_session_by_recreating_a_new_session(
                 );
             },
 
+            function beforeSubscriptionRepair(innerCallback: ErrorCallback) {
+                if (!client.beforeSubscriptionRecreate) {
+                    innerCallback();
+                    return;
+
+                }
+                client.beforeSubscriptionRecreate(newSession)
+                    .then((err) => {
+                        { const err = _shouldNotContinue(session); if (err) { return innerCallback(err); } }
+                        if (!err) {
+                            innerCallback();
+                        } else {
+                            innerCallback(err);
+                        }
+                    })
+                    .catch((err) => { innerCallback(err) });
+            },
+
             function attempt_subscription_transfer(innerCallback: ErrorCallback) {
                 // prettier-ignore
                 { const err = _shouldNotContinue(session); if (err) { return innerCallback(err); } }