node-opcua-client 2.167.0 → 2.169.0

package/dist/client_monitored_item.d.ts

@@ -1,10 +1,10 @@
 /**
  * @module node-opcua-client
  */
-import type { EventEmitter } from "events";
+import type { EventEmitter } from "node:events";
 import { type DataValue, TimestampsToReturn } from "node-opcua-data-value";
 import type { ReadValueIdOptions } from "node-opcua-service-read";
-import { type MonitoringParametersOptions } from "node-opcua-types";
+import type { MonitoringParametersOptions } from "node-opcua-types";
 import type { Variant } from "node-opcua-variant";
 import type { ClientMonitoredItemBase, ClientMonitoredItemOrGroupAction } from "./client_monitored_item_base";
 import type { ClientSubscription } from "./client_subscription";
@@ -15,6 +15,6 @@ export interface ClientMonitoredItem extends ClientMonitoredItemBase, ClientMoni
     on(event: "initialized", eventHandler: () => void): this;
     on(event: "err", eventHandler: (message: string) => void): this;
 }
-export declare class ClientMonitoredItem {
-    static create(subscription: ClientSubscription, itemToMonitor: ReadValueIdOptions, monitoringParameters: MonitoringParametersOptions, timestampsToReturn?: TimestampsToReturn): ClientMonitoredItem;
+export declare namespace ClientMonitoredItem {
+    let create: (subscription: ClientSubscription, itemToMonitor: ReadValueIdOptions, monitoringParameters: MonitoringParametersOptions, timestampsToReturn?: TimestampsToReturn) => ClientMonitoredItem;
 }

package/dist/client_monitored_item.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClientMonitoredItem = void 0;
 const node_opcua_data_value_1 = require("node-opcua-data-value");
-class ClientMonitoredItem {
-    static create(subscription, itemToMonitor, monitoringParameters, timestampsToReturn = node_opcua_data_value_1.TimestampsToReturn.Neither) {
+// eslint-disable-next-line @typescript-eslint/no-namespace
+var ClientMonitoredItem;
+(function (ClientMonitoredItem) {
+    ClientMonitoredItem.create = function (subscription, itemToMonitor, monitoringParameters, timestampsToReturn = node_opcua_data_value_1.TimestampsToReturn.Neither) {
         /* c8 ignore next*/
         throw new Error("unimplemented");
-    }
-}
-exports.ClientMonitoredItem = ClientMonitoredItem;
+    };
+})(ClientMonitoredItem || (exports.ClientMonitoredItem = ClientMonitoredItem = {}));
 //# sourceMappingURL=client_monitored_item.js.map

package/dist/client_monitored_item.js.map

@@ -1 +1 @@
-{"version":3,"file":"client_monitored_item.js","sourceRoot":"","sources":["../source/client_monitored_item.ts"],"names":[],"mappings":";;;AAKA,iEAA2E;AAmB3E,MAAa,mBAAmB;IACrB,MAAM,CAAC,MAAM,CAChB,YAAgC,EAChC,aAAiC,EACjC,oBAAiD,EACjD,qBAAyC,0CAAkB,CAAC,OAAO;QAEnE,mBAAmB;QACnB,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;IACrC,CAAC;CACJ;AAVD,kDAUC"}
+{"version":3,"file":"client_monitored_item.js","sourceRoot":"","sources":["../source/client_monitored_item.ts"],"names":[],"mappings":";;;AAKA,iEAA2E;AAmB3E,2DAA2D;AAC3D,IAAiB,mBAAmB,CAUnC;AAVD,WAAiB,mBAAmB;IACrB,0BAAM,GAAG,UAChB,YAAgC,EAChC,aAAiC,EACjC,oBAAiD,EACjD,qBAAyC,0CAAkB,CAAC,OAAO;QAEnE,mBAAmB;QACnB,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;IACrC,CAAC,CAAA;AACL,CAAC,EAVgB,mBAAmB,mCAAnB,mBAAmB,QAUnC"}

package/dist/client_monitored_item_base.d.ts

@@ -1,22 +1,22 @@
 /**
  * @module node-opcua-client
  */
-import type { EventEmitter } from "events";
-import { type AttributeIds } from "node-opcua-basic-types";
+import type { EventEmitter } from "node:events";
+import type { AttributeIds } from "node-opcua-basic-types";
 import type { QualifiedNameLike } from "node-opcua-data-model";
 import type { DataValue } from "node-opcua-data-value";
 import type { ExtensionObject } from "node-opcua-extension-object";
 import type { NodeId } from "node-opcua-nodeid";
 import type { NumericRange } from "node-opcua-numeric-range";
 import type { TimestampsToReturn } from "node-opcua-service-read";
-import type { MonitoredItemCreateResult, MonitoringMode, MonitoringParameters, MonitoringParametersOptions } from "node-opcua-service-subscription";
+import type { MonitoredItemCreateResult, MonitoredItemModifyResult, MonitoringMode, MonitoringParameters, MonitoringParametersOptions } from "node-opcua-service-subscription";
 import type { Callback, ErrorCallback, StatusCode } from "node-opcua-status-code";
 import type { Variant } from "node-opcua-variant";
 import type { ClientSubscription } from "./client_subscription";
 export interface ClientMonitoredItemOrGroupAction {
-    modify(parameters: MonitoringParametersOptions, timestampsToReturn?: TimestampsToReturn): Promise<StatusCode>;
-    modify(parameters: MonitoringParametersOptions, callback: Callback<StatusCode>): void;
-    modify(parameters: MonitoringParametersOptions, timestampsToReturn: TimestampsToReturn | null, callback: Callback<StatusCode>): void;
+    modify(parameters: MonitoringParametersOptions, timestampsToReturn?: TimestampsToReturn): Promise<MonitoredItemModifyResult>;
+    modify(parameters: MonitoringParametersOptions, callback: Callback<MonitoredItemModifyResult>): void;
+    modify(parameters: MonitoringParametersOptions, timestampsToReturn: TimestampsToReturn | null, callback: Callback<MonitoredItemModifyResult>): void;
     setMonitoringMode(monitoringMode: MonitoringMode): Promise<StatusCode>;
     setMonitoringMode(monitoringMode: MonitoringMode, callback: Callback<StatusCode>): void;
     terminate(): Promise<void>;
@@ -40,7 +40,7 @@ export interface ClientMonitoredItemBase {
     readonly subscription: ClientSubscription;
     readonly monitoringMode: MonitoringMode;
     readonly statusCode: StatusCode;
-    readonly monitoredItemId?: any;
+    readonly monitoredItemId?: number;
     readonly result?: MonitoredItemCreateResult;
     readonly filterResult?: ExtensionObject;
 }

package/dist/client_monitored_item_toolbox.d.ts

@@ -1,6 +1,6 @@
 import type { TimestampsToReturn } from "node-opcua-data-value";
 import { type MonitoredItemModifyResult, type MonitoringMode } from "node-opcua-service-subscription";
-import { type Callback, type ErrorCallback, type StatusCode } from "node-opcua-status-code";
+import type { Callback, ErrorCallback, StatusCode } from "node-opcua-status-code";
 import type { MonitoringParametersOptions } from "node-opcua-types";
 import type { ClientMonitoredItemBase } from "./client_monitored_item_base";
 import type { ClientSubscription } from "./client_subscription";
@@ -10,8 +10,8 @@ export interface ClientMonitoredItemBaseEx extends ClientMonitoredItemBase {
 /**
  * @internal
  */
-export declare class ClientMonitoredItemToolbox {
-    static _toolbox_monitor(subscription: ClientSubscription, timestampsToReturn: TimestampsToReturn, monitoredItems: ClientMonitoredItemBase[], done: ErrorCallback): void;
-    static _toolbox_modify(subscription: ClientSubscription, monitoredItems: ClientMonitoredItemBase[], parameters: MonitoringParametersOptions, timestampsToReturn: TimestampsToReturn, callback: Callback<MonitoredItemModifyResult[]>): void;
-    static _toolbox_setMonitoringMode(subscription: ClientSubscription, monitoredItems: ClientMonitoredItemBaseEx[], monitoringMode: MonitoringMode, callback: Callback<StatusCode[]>): void;
+export declare namespace ClientMonitoredItemToolbox {
+    function _toolbox_monitor(subscription: ClientSubscription, timestampsToReturn: TimestampsToReturn, monitoredItems: ClientMonitoredItemBase[], done: ErrorCallback): void;
+    function _toolbox_modify(subscription: ClientSubscription, monitoredItems: ClientMonitoredItemBase[], parameters: MonitoringParametersOptions, timestampsToReturn: TimestampsToReturn, callback: Callback<MonitoredItemModifyResult[]>): void;
+    function _toolbox_setMonitoringMode(subscription: ClientSubscription, monitoredItems: ClientMonitoredItemBaseEx[], monitoringMode: MonitoringMode, callback: Callback<StatusCode[]>): void;
 }

package/dist/client_monitored_item_toolbox.js

@@ -12,27 +12,24 @@ const node_opcua_assert_1 = require("node-opcua-assert");
 const node_opcua_debug_1 = require("node-opcua-debug");
 const node_opcua_service_subscription_1 = require("node-opcua-service-subscription");
 const debugLog = (0, node_opcua_debug_1.make_debugLog)(__filename);
-const doDebug = (0, node_opcua_debug_1.checkDebugFlag)(__filename);
+const _doDebug = (0, node_opcua_debug_1.checkDebugFlag)(__filename);
 /**
  * @internal
  */
-class ClientMonitoredItemToolbox {
-    static _toolbox_monitor(subscription, timestampsToReturn, monitoredItems, done) {
+var ClientMonitoredItemToolbox;
+(function (ClientMonitoredItemToolbox) {
+    function _toolbox_monitor(subscription, timestampsToReturn, monitoredItems, done) {
         (0, node_opcua_assert_1.assert)(typeof done === "function");
         // we expect subscription to be valid and have a valid session
         if (!subscription.hasSession) {
             const err0 = new Error("Invalid subscription");
-            if (done) {
-                return done(err0);
-            }
+            done(err0);
             return;
         }
         // may be the subscription has been terminated or is not fully initialize, in the meantime
         if (!subscription.isActive) {
             const err1 = new Error("Subscription has been terminated or is not fully initialized");
-            if (done) {
-                return done(err1);
-            }
+            done(err1);
             return;
         }
         const itemsToCreate = [];
@@ -40,7 +37,8 @@ class ClientMonitoredItemToolbox {
             const monitoredItemI = monitoredItem;
             const itemToCreate = monitoredItemI._prepare_for_monitoring();
             if (typeof itemToCreate.error === "string") {
-                return done(new Error(itemToCreate.error));
+                done(new Error(itemToCreate.error));
+                return;
             }
             itemsToCreate.push(itemToCreate);
         }
@@ -75,7 +73,8 @@ class ClientMonitoredItemToolbox {
             done(err ? err : undefined);
         });
     }
-    static _toolbox_modify(subscription, monitoredItems, parameters, timestampsToReturn, callback) {
+    ClientMonitoredItemToolbox._toolbox_monitor = _toolbox_monitor;
+    function _toolbox_modify(subscription, monitoredItems, parameters, timestampsToReturn, callback) {
         (0, node_opcua_assert_1.assert)(callback === undefined || typeof callback === "function");
         const itemsToModify = monitoredItems.map((monitoredItem) => {
             const clientHandle = monitoredItem.monitoringParameters.clientHandle;
@@ -98,22 +97,26 @@ class ClientMonitoredItemToolbox {
         session.modifyMonitoredItems(modifyMonitoredItemsRequest, (err, response) => {
             /* c8 ignore next */
             if (err) {
-                return callback(err);
+                callback(err);
+                return;
             }
             if (!response || !(response instanceof node_opcua_service_subscription_1.ModifyMonitoredItemsResponse)) {
-                return callback(new Error("internal error"));
+                callback(new Error("internal error"));
+                return;
             }
             response.results = response.results || [];
             (0, node_opcua_assert_1.assert)(response.results.length === monitoredItems.length);
             const res = response.results[0];
             /* c8 ignore next */
             if (response.results.length === 1 && res.statusCode.isNotGood()) {
-                return callback(new Error("Error" + res.statusCode.toString()));
+                callback(new Error(`Error${res.statusCode.toString()}`));
+                return;
             }
             callback(null, response.results);
         });
     }
-    static _toolbox_setMonitoringMode(subscription, monitoredItems, monitoringMode, callback) {
+    ClientMonitoredItemToolbox._toolbox_modify = _toolbox_modify;
+    function _toolbox_setMonitoringMode(subscription, monitoredItems, monitoringMode, callback) {
         const monitoredItemIds = monitoredItems.map((monitoredItem) => monitoredItem.monitoredItemId);
         const setMonitoringModeRequest = {
             monitoredItemIds,
@@ -124,16 +127,20 @@ class ClientMonitoredItemToolbox {
         (0, node_opcua_assert_1.assert)(session, "expecting a valid session attached to the subscription ");
         session.setMonitoringMode(setMonitoringModeRequest, (err, response) => {
             if (err) {
-                return callback(err);
+                callback(err);
+                return;
+            }
+            if (!response) {
+                callback(new Error("internal error"));
+                return;
             }
             monitoredItems.forEach((monitoredItem) => {
                 monitoredItem.internalSetMonitoringMode(monitoringMode);
             });
-            response = response;
             response.results = response.results || [];
             callback(null, response.results);
         });
     }
-}
-exports.ClientMonitoredItemToolbox = ClientMonitoredItemToolbox;
+    ClientMonitoredItemToolbox._toolbox_setMonitoringMode = _toolbox_setMonitoringMode;
+})(ClientMonitoredItemToolbox || (exports.ClientMonitoredItemToolbox = ClientMonitoredItemToolbox = {}));
 //# sourceMappingURL=client_monitored_item_toolbox.js.map

package/dist/client_monitored_item_toolbox.js.map

@@ -1 +1 @@
-{"version":3,"file":"client_monitored_item_toolbox.js","sourceRoot":"","sources":["../source/client_monitored_item_toolbox.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client_monitored_item_toolbox.js","sourceRoot":"","sources":["../source/client_monitored_item_toolbox.ts"],"names":[],"mappings":"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"}

package/dist/private/client_base_impl.js

@@ -11,7 +11,6 @@ exports.ClientBaseImpl = void 0;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const global_mutex_1 = require("@ster5/global-mutex");
-const async_1 = __importDefault(require("async"));
 const chalk_1 = __importDefault(require("chalk"));
 const node_opcua_assert_1 = require("node-opcua-assert");
 const node_opcua_certificate_manager_1 = require("node-opcua-certificate-manager");
@@ -78,8 +77,8 @@ function __findEndpoint(endpointUrl, params, _callback) {
     masterClient._tmpClient = client;
     let selectedEndpoint;
     const allEndpoints = [];
-    const tasks = [
-        (innerCallback) => {
+    const step1_connect = () => {
+        return new Promise((resolve, reject) => {
             // rebind backoff handler
             masterClient.listeners("backoff").forEach((handler) => {
                 client.on("backoff", handler);
@@ -92,7 +91,6 @@ function __findEndpoint(endpointUrl, params, _callback) {
             }
             client.connect(endpointUrl, (err) => {
                 if (err) {
-                    // let's improve the error message with meaningful info
                     err.message =
                         "Fail to connect to server at " +
                             endpointUrl +
@@ -101,19 +99,22 @@ function __findEndpoint(endpointUrl, params, _callback) {
                             err.message +
                             ")";
                     warningLog(err.message);
+                    return reject(err);
                 }
-                return innerCallback(err);
+                resolve();
             });
-        },
-        (innerCallback) => {
+        });
+    };
+    const step2_getEndpoints = () => {
+        return new Promise((resolve, reject) => {
             client.getEndpoints((err, endpoints) => {
                 if (err) {
                     err.message = `error in getEndpoints \n${err.message}`;
-                    return innerCallback(err);
+                    return reject(err);
                 }
                 // c8 ignore next
                 if (!endpoints) {
-                    return innerCallback(new Error("Internal Error"));
+                    return reject(new Error("Internal Error"));
                 }
                 for (const endpoint of endpoints) {
                     if (endpoint.securityMode === securityMode && endpoint.securityPolicyUri === securityPolicy) {
@@ -123,20 +124,19 @@ function __findEndpoint(endpointUrl, params, _callback) {
                         selectedEndpoint = endpoint; // found it
                     }
                 }
-                innerCallback();
-            });
-        },
-        (innerCallback) => {
-            client.disconnect(innerCallback);
-        }
-    ];
-    async_1.default.series(tasks, (err) => {
-        if (err) {
-            client.disconnect(() => {
-                callback(err);
+                resolve();
             });
-            return;
-        }
+        });
+    };
+    const step3_disconnect = () => {
+        return new Promise((resolve) => {
+            client.disconnect(() => resolve());
+        });
+    };
+    step1_connect()
+        .then(() => step2_getEndpoints())
+        .then(() => step3_disconnect())
+        .then(() => {
         if (!selectedEndpoint) {
             return callback(new Error("Cannot find an Endpoint matching " +
                 " security mode: " +
@@ -148,11 +148,12 @@ function __findEndpoint(endpointUrl, params, _callback) {
         if (doDebug) {
             debugLog(chalk_1.default.bgWhite.red("xxxxxxxxxxxxxxxxxxxxx => selected EndPoint = "), selectedEndpoint.toString());
         }
-        const result = {
-            endpoints: allEndpoints,
-            selectedEndpoint
-        };
-        callback(null, result);
+        callback(null, { endpoints: allEndpoints, selectedEndpoint });
+    })
+        .catch((err) => {
+        client.disconnect(() => {
+            callback(err);
+        });
     });
 }
 /**
@@ -160,7 +161,7 @@ function __findEndpoint(endpointUrl, params, _callback) {
  */
 async function _verify_serverCertificate(certificateManager, serverCertificate) {
     const status = await certificateManager.checkCertificate(serverCertificate);
-    if (status !== node_opcua_status_code_1.StatusCodes.Good) {
+    if (!status.isGood()) {
         // c8 ignore next
         if (doDebug) {
             // do it again for debug purposes
@@ -520,56 +521,61 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         secureChannel.protocolVersion = this.protocolVersion;
         this._secureChannel = secureChannel;
         this.emit("secure_channel_created", secureChannel);
-        async_1.default.series([
-            // ------------------------------------------------- STEP 2 : OpenSecureChannel
-            (innerCallback) => {
+        const step2_openSecureChannel = () => {
+            return new Promise((resolve, reject) => {
                 debugLog("_internal_create_secure_channel before secureChannel.create");
                 secureChannel.create(this.endpointUrl, (err) => {
                     debugLog("_internal_create_secure_channel after secureChannel.create");
                     if (!this._secureChannel) {
                         debugLog("_secureChannel has been closed during the transaction !");
-                        return innerCallback(new Error("Secure Channel Closed"));
+                        return reject(new Error("Secure Channel Closed"));
                     }
-                    if (!err) {
-                        this._install_secure_channel_event_handlers(secureChannel);
+                    if (err) {
+                        return reject(err);
                     }
-                    innerCallback(err);
+                    this._install_secure_channel_event_handlers(secureChannel);
+                    resolve();
                 });
-            },
-            // ------------------------------------------------- STEP 3 : GetEndpointsRequest
-            (innerCallback) => {
+            });
+        };
+        const step3_getEndpoints = () => {
+            return new Promise((resolve, reject) => {
                 (0, node_opcua_assert_1.assert)(this._secureChannel !== null);
                 if (!this.knowsServerEndpoint) {
                     this._setInternalState("connecting");
                     this.getEndpoints((err /*, endpoints?: EndpointDescription[]*/) => {
                         if (!this._secureChannel) {
                             debugLog("_secureChannel has been closed during the transaction ! (while getEndpoints)");
-                            return innerCallback(new Error("Secure Channel Closed"));
+                            return reject(new Error("Secure Channel Closed"));
                         }
-                        innerCallback(err ? err : undefined);
+                        if (err) {
+                            return reject(err);
+                        }
+                        resolve();
                     });
                 }
                 else {
                     // end points are already known
-                    innerCallback();
-                }
-            }
-        ], (err) => {
-            if (err) {
-                doDebug && debugLog(this.clientName, " : Inner create secure channel has failed", err.message);
-                if (this._secureChannel) {
-                    this._secureChannel.abortConnection(() => {
-                        this._destroy_secure_channel();
-                        callback(err);
-                    });
+                    resolve();
                 }
-                else {
+            });
+        };
+        step2_openSecureChannel()
+            .then(() => step3_getEndpoints())
+            .then(() => {
+            (0, node_opcua_assert_1.assert)(this._secureChannel !== null);
+            callback(null, secureChannel);
+        })
+            .catch((err) => {
+            doDebug && debugLog(this.clientName, " : Inner create secure channel has failed", err.message);
+            if (this._secureChannel) {
+                this._secureChannel.abortConnection(() => {
+                    this._destroy_secure_channel();
                     callback(err);
-                }
+                });
             }
             else {
-                (0, node_opcua_assert_1.assert)(this._secureChannel !== null);
-                callback(null, secureChannel);
+                callback(err);
             }
         });
     }
@@ -863,11 +869,9 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         if (args.length === 1) {
             if (typeof args[0] === "function") {
                 this.findServers({}, args[0]);
-                return void 0;
-            }
-            else {
-                throw new Error("Invalid arguments");
+                return;
             }
+            throw new Error("Invalid arguments");
         }
         const options = args[0];
         const callback = args[1];
@@ -889,11 +893,12 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
             response.servers = response.servers || [];
             callback(null, response.servers);
         });
+        return undefined;
     }
     findServersOnNetwork(...args) {
         if (args.length === 1) {
             this.findServersOnNetwork({}, args[0]);
-            return;
+            return undefined;
         }
         const options = args[0];
         const callback = args[1];
@@ -911,7 +916,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
             response.servers = response.servers || [];
             callback(null, response.servers);
         });
-        return;
+        return undefined;
     }
     _removeSession(session) {
         const index = this._sessions.indexOf(session);
@@ -1161,12 +1166,36 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
                 .catch((err1) => {
                 warningLog("[NODE-OPCUA-W25] client's server certificate verification has failed ", err1.message);
                 warningLog("                 clientCertificateManager.rootDir = ", this.clientCertificateManager.rootDir);
-                const f = (b) => `                 ${b.toString("base64").replace(/(.{80})/g, "$1\n                 ")}`;
                 const chain = (0, web_1.split_der)(endpoint.serverCertificate);
-                warningLog(`                  server certificate contains ${chain.length} elements`);
+                warningLog(`                 server certificate chain contains ${chain.length} element(s)`);
                 for (let i = 0; i < chain.length; i++) {
                     const c = chain[i];
-                    warningLog("certificate", i, `\n${f(c)}`);
+                    const thumbprint = (0, web_1.makeSHA1Thumbprint)(c).toString("hex");
+                    try {
+                        const { exploreCertificate } = require("node-opcua-crypto");
+                        const info = exploreCertificate(c);
+                        const tbs = info.tbsCertificate;
+                        const cn = tbs.subject?.commonName ?? "unknown";
+                        const issuerCN = tbs.issuer?.commonName ?? "unknown";
+                        const isCA = tbs.extensions?.basicConstraints?.cA === true;
+                        const isSelfSigned = JSON.stringify(tbs.subject) === JSON.stringify(tbs.issuer);
+                        const certType = isCA
+                            ? (isSelfSigned ? "Root CA" : "Intermediate CA")
+                            : (isSelfSigned ? "Application (self-signed)" : "Application (CA-signed)");
+                        const ski = tbs.extensions?.subjectKeyIdentifier ?? "-";
+                        const aki = tbs.extensions?.authorityKeyIdentifier?.keyIdentifier ?? "-";
+                        const notBefore = tbs.validity.notBefore.toISOString();
+                        const notAfter = tbs.validity.notAfter.toISOString();
+                        warningLog(`                 [${i + 1}/${chain.length}] "${cn}" (${certType})`);
+                        warningLog(`                   thumbprint: ${thumbprint}`);
+                        warningLog(`                   issuer:     "${issuerCN}"`);
+                        warningLog(`                   SKI:        ${ski}`);
+                        warningLog(`                   AKI:        ${aki}`);
+                        warningLog(`                   validity:   ${notBefore} → ${notAfter}`);
+                    }
+                    catch {
+                        warningLog(`                 [${i + 1}/${chain.length}] thumbprint: ${thumbprint} (details unavailable)`);
+                    }
                 }
                 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" +
@@ -1211,25 +1240,26 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
     }
     _close_pending_sessions(callback) {
         const sessions = [...this._sessions];
-        async_1.default.map(sessions, (session, next) => {
-            (0, node_opcua_assert_1.assert)(session._client === this);
-            // note: to prevent next to be call twice
-            let _next_already_call = false;
-            session.close((err) => {
-                if (_next_already_call) {
-                    return;
-                }
-                _next_already_call = true;
-                // We should not bother if we have an error here
-                // Session may fail to close , if they haven't been activate and forcefully closed by server
-                // in a attempt to preserve resources in the case of a DDOS attack for instance.
-                if (err) {
-                    const msg = session.authenticationToken ? session.authenticationToken.toString() : "";
-                    debugLog(` failing to close session ${msg}`);
-                }
-                next();
-            });
-        }, (err) => {
+        const closeAll = async () => {
+            for (const session of sessions) {
+                (0, node_opcua_assert_1.assert)(session._client === this);
+                await new Promise((resolve) => {
+                    let resolved = false;
+                    session.close((err) => {
+                        if (resolved)
+                            return;
+                        resolved = true;
+                        if (err) {
+                            const msg = session.authenticationToken ? session.authenticationToken.toString() : "";
+                            debugLog(` failing to close session ${msg}`);
+                        }
+                        resolve();
+                    });
+                });
+            }
+        };
+        closeAll()
+            .then(() => {
             // c8 ignore next
             if (this._sessions.length > 0) {
                 debugLog(this._sessions
@@ -1237,8 +1267,9 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
                     .join(" "));
             }
             (0, node_opcua_assert_1.assert)(this._sessions.length === 0, " failed to disconnect exiting sessions ");
-            callback(err || undefined);
-        });
+            callback();
+        })
+            .catch((err) => callback(err));
     }
     _install_secure_channel_event_handlers(secureChannel) {
         (0, node_opcua_assert_1.assert)(this instanceof ClientBaseImpl);