node-opcua-client 2.166.0 → 2.168.0

package/dist/private/client_base_impl.js

@@ -8,32 +8,35 @@ exports.ClientBaseImpl = void 0;
  * @module node-opcua-client-private
  */
 // tslint:disable:no-unused-expression
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const async_1 = __importDefault(require("async"));
-const chalk_1 = __importDefault(require("chalk"));
+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 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");
 const node_opcua_common_1 = require("node-opcua-common");
 const web_1 = require("node-opcua-crypto/web");
 const node_opcua_date_time_1 = require("node-opcua-date-time");
 const node_opcua_debug_1 = require("node-opcua-debug");
-const node_opcua_common_2 = require("node-opcua-common");
 const node_opcua_hostname_1 = require("node-opcua-hostname");
 const node_opcua_secure_channel_1 = require("node-opcua-secure-channel");
 const node_opcua_service_discovery_1 = require("node-opcua-service-discovery");
 const node_opcua_service_endpoints_1 = require("node-opcua-service-endpoints");
 const node_opcua_service_secure_channel_1 = require("node-opcua-service-secure-channel");
+const node_opcua_service_session_1 = require("node-opcua-service-session");
 const node_opcua_status_code_1 = require("node-opcua-status-code");
 const node_opcua_utils_1 = require("node-opcua-utils");
-const node_opcua_certificate_manager_1 = require("node-opcua-certificate-manager");
-const node_opcua_service_session_1 = require("node-opcua-service-session");
 const client_base_1 = require("../client_base");
 const verify_1 = require("../verify");
 const debugLog = (0, node_opcua_debug_1.make_debugLog)(__filename);
 const doDebug = (0, node_opcua_debug_1.checkDebugFlag)(__filename);
 const errorLog = (0, node_opcua_debug_1.make_errorLog)(__filename);
 const warningLog = (0, node_opcua_debug_1.make_warningLog)(__filename);
+function makeCertificateThumbPrint(certificate) {
+    if (!certificate)
+        return null;
+    return (0, web_1.makeSHA1Thumbprint)(Array.isArray(certificate) ? certificate[0] : certificate);
+}
 const traceInternalState = false;
 const defaultConnectionStrategy = {
     initialDelay: 1000,
@@ -55,7 +58,7 @@ function __findEndpoint(endpointUrl, params, _callback) {
     };
     const securityMode = params.securityMode;
     const securityPolicy = params.securityPolicy;
-    const connectionStrategy = params.connectionStrategy;
+    const _connectionStrategy = params.connectionStrategy;
     const options = {
         applicationName: params.applicationName,
         applicationUri: params.applicationUri,
@@ -74,10 +77,12 @@ 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));
+            masterClient.listeners("backoff").forEach((handler) => {
+                client.on("backoff", handler);
+            });
             // c8 ignore next
             if (doDebug) {
                 client.on("backoff", (retryCount, delay) => {
@@ -86,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 +
@@ -95,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);
+                    err.message = `error in getEndpoints \n${err.message}`;
+                    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) {
@@ -117,20 +124,19 @@ function __findEndpoint(endpointUrl, params, _callback) {
                         selectedEndpoint = endpoint; // found it
                     }
                 }
-                innerCallback();
+                resolve();
             });
-        },
-        (innerCallback) => {
-            client.disconnect(innerCallback);
-        }
-    ];
-    async_1.default.series(tasks, (err) => {
-        if (err) {
-            client.disconnect(() => {
-                callback(err);
-            });
-            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: " +
@@ -142,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);
+        });
     });
 }
 /**
@@ -161,9 +168,9 @@ async function _verify_serverCertificate(certificateManager, serverCertificate)
             const status1 = await certificateManager.verifyCertificate(serverCertificate);
             debugLog(status1);
         }
-        warningLog("serverCertificate = ", (0, web_1.makeSHA1Thumbprint)(serverCertificate).toString("hex"));
+        warningLog("serverCertificate = ", makeCertificateThumbPrint(serverCertificate)?.toString("hex") || "none");
         warningLog("serverCertificate = ", serverCertificate.toString("base64"));
-        throw new Error("server Certificate verification failed with err " + status?.toString());
+        throw new Error(`server Certificate verification failed with err ${status?.toString()}`);
     }
 }
 const forceEndpointDiscoveryOnConnect = !!parseInt(process.env.NODEOPCUA_CLIENT_FORCE_ENDPOINT_DISCOVERY || "0", 10);
@@ -225,7 +232,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
      * true if the client is trying to reconnect to the server after a connection break.
      */
     get isReconnecting() {
-        return (!!(this._secureChannel && this._secureChannel.isConnecting) ||
+        return (!!this._secureChannel?.isConnecting ||
             this._internalState === "reconnecting_newchannel_connected" ||
             this._internalState === "reconnecting");
     }
@@ -304,6 +311,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         if (doDebug) {
             debugLog(chalk_1.default.cyan(`  Client ${this._instanceNumber} ${this.clientName} emitting `), chalk_1.default.magentaBright(eventName));
         }
+        // @ts-expect-error
         return super.emit(eventName, ...others);
     }
     constructor(options) {
@@ -313,7 +321,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         }
         options.privateKeyFile = options.privateKeyFile || options.clientCertificateManager.privateKey;
         options.certificateFile =
-            options.certificateFile || path_1.default.join(options.clientCertificateManager.rootDir, "own/certs/client_certificate.pem");
+            options.certificateFile || node_path_1.default.join(options.clientCertificateManager.rootDir, "own/certs/client_certificate.pem");
         super(options);
         this._setInternalState("uninitialized");
         this._instanceNumber = g_ClientCounter++;
@@ -335,7 +343,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         this.defaultSecureTokenLifetime = options.defaultSecureTokenLifetime || 600000;
         this.defaultTransactionTimeout = options.defaultTransactionTimeout;
         this.tokenRenewalInterval = options.tokenRenewalInterval || 0;
-        (0, node_opcua_assert_1.assert)(isFinite(this.tokenRenewalInterval) && this.tokenRenewalInterval >= 0);
+        (0, node_opcua_assert_1.assert)(Number.isFinite(this.tokenRenewalInterval) && this.tokenRenewalInterval >= 0);
         this.securityMode = (0, node_opcua_service_secure_channel_1.coerceMessageSecurityMode)(options.securityMode);
         this.securityPolicy = (0, node_opcua_secure_channel_1.coerceSecurityPolicy)(options.securityPolicy);
         this.serverCertificate = options.serverCertificate;
@@ -375,15 +383,13 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
             this._secureChannel = null;
             callback();
         });
-        this.once("reconnection_canceled", () => {
-            /* empty */
-        });
     }
     _recreate_secure_channel(callback) {
         debugLog("_recreate_secure_channel... while internalState is", this._internalState);
         if (!this.knowsServerEndpoint) {
             debugLog("Cannot reconnect , server endpoint is unknown");
-            return callback(new Error("Cannot reconnect, server endpoint is unknown - this.knowsServerEndpoint = false"));
+            callback(new Error("Cannot reconnect, server endpoint is unknown - this.knowsServerEndpoint = false"));
+            return;
         }
         (0, node_opcua_assert_1.assert)(this.knowsServerEndpoint);
         this._setInternalState("reconnecting");
@@ -400,7 +406,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         const _when_reconnectionIsCanceled = (callback) => {
             doDebug && debugLog("attempt to recreate a new secure channel : suspended because reconnection is canceled !");
             this.emit("reconnection_canceled");
-            return callback(new Error("Reconnection has been canceled - " + this.clientName));
+            return callback(new Error(`Reconnection has been canceled - ${this.clientName}`));
         };
         const _failAndRetry = (err, message, callback) => {
             debugLog("failAndRetry; ", message);
@@ -442,17 +448,18 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
                         return _when_internal_error(err, callback);
                     }
                     if (err.message.match(/ECONNREFUSED|ECONNABORTED|ETIMEDOUT/)) {
-                        return _failAndRetry(err, "create secure channel failed with ECONNREFUSED|ECONNABORTED|ETIMEDOUT\n" + err.message, callback);
+                        return _failAndRetry(err, `create secure channel failed with ECONNREFUSED|ECONNABORTED|ETIMEDOUT\n${err.message}`, callback);
                     }
                     if (err.message.match("Backoff aborted.")) {
-                        return _failAndRetry(err, "cannot create secure channel (backoff aborted)", callback);
+                        _failAndRetry(err, "cannot create secure channel (backoff aborted)", callback);
+                        return;
                     }
-                    if (err.message.match("BadCertificateInvalid") ||
-                        err.message.match(/socket has been disconnected by third party/)) {
-                        // it is possible also that hte server has shutdown innapropriately the connection      
+                    if (err?.message.match("BadCertificateInvalid") ||
+                        err?.message.match(/socket has been disconnected by third party/)) {
+                        // it is possible also that hte server has shutdown innapropriately the connection
                         warningLog("the server certificate has changed,  we need to retrieve server certificate again: ", err.message);
                         const oldServerCertificate = this.serverCertificate;
-                        warningLog("old server certificate ", oldServerCertificate ? (0, web_1.makeSHA1Thumbprint)(oldServerCertificate).toString("hex") : "undefined");
+                        warningLog("old server certificate ", makeCertificateThumbPrint(oldServerCertificate)?.toString("hex") || "undefined");
                         // the server may have shut down the channel because its certificate
                         // has changed ....
                         // let request the server certificate again ....
@@ -461,9 +468,9 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
                                 return _failAndRetry(err1, "Failing to fetch new server certificate", callback);
                             }
                             const newServerCertificate = this.serverCertificate;
-                            warningLog("new server certificate ", (0, web_1.makeSHA1Thumbprint)(newServerCertificate).toString("hex"));
-                            const sha1Old = oldServerCertificate ? (0, web_1.makeSHA1Thumbprint)(oldServerCertificate) : null;
-                            const sha1New = newServerCertificate ? (0, web_1.makeSHA1Thumbprint)(newServerCertificate) : null;
+                            warningLog("new server certificate ", makeCertificateThumbPrint(newServerCertificate)?.toString("hex") || "none");
+                            const sha1Old = makeCertificateThumbPrint(oldServerCertificate)?.toString("hex") || null;
+                            const sha1New = makeCertificateThumbPrint(newServerCertificate)?.toString("hex") || null;
                             if (sha1Old === sha1New) {
                                 warningLog("server certificate has not changed, but was expected to have changed");
                                 return _failAndRetry(new Error("Server Certificate not changed"), "Failing to fetch new server certificate", callback);
@@ -514,61 +521,66 @@ 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"));
+                        }
+                        if (err) {
+                            return reject(err);
                         }
-                        innerCallback(err ? err : undefined);
+                        resolve();
                     });
                 }
                 else {
                     // end points are already known
-                    innerCallback();
+                    resolve();
                 }
-            }
-        ], (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);
-                    });
-                }
-                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);
             }
         });
     }
     static async createCertificate(clientCertificateManager, certificateFile, applicationName, applicationUri) {
-        if (!fs_1.default.existsSync(certificateFile)) {
+        if (!node_fs_1.default.existsSync(certificateFile)) {
             const hostname = (0, node_opcua_hostname_1.getHostname)();
             // this.serverInfo.applicationUri!;
             await clientCertificateManager.createSelfSignedCertificate({
@@ -582,8 +594,8 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
             });
         }
         // c8 ignore next
-        if (!fs_1.default.existsSync(certificateFile)) {
-            throw new Error(" cannot locate certificate file " + certificateFile);
+        if (!node_fs_1.default.existsSync(certificateFile)) {
+            throw new Error(` cannot locate certificate file ${certificateFile}`);
         }
     }
     async createDefaultCertificate() {
@@ -593,7 +605,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         }
         this._inCreateDefaultCertificate = true;
         if (!(0, node_opcua_utils_1.checkFileExistsAndIsNotEmpty)(this.certificateFile)) {
-            await (0, global_mutex_1.withLock)({ fileToLock: this.certificateFile + ".mutex" }, async () => {
+            await (0, global_mutex_1.withLock)({ fileToLock: `${this.certificateFile}.mutex` }, async () => {
                 if ((0, node_opcua_utils_1.checkFileExistsAndIsNotEmpty)(this.certificateFile)) {
                     // the file may have been created in between
                     return;
@@ -603,15 +615,15 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
                 debugLog("privateKey      = ", this.privateKeyFile);
                 debugLog("                = ", this.clientCertificateManager.privateKey);
                 debugLog("certificateFile = ", this.certificateFile);
-                const certificate = this.getCertificate();
-                const privateKey = this.getPrivateKey();
+                const _certificate = this.getCertificate();
+                const _privateKey = this.getPrivateKey();
             });
         }
         this._inCreateDefaultCertificate = false;
     }
     _getBuiltApplicationUri() {
         if (!this._applicationUri) {
-            this._applicationUri = (0, node_opcua_common_2.makeApplicationUrn)((0, node_opcua_hostname_1.getHostname)(), this.applicationName);
+            this._applicationUri = (0, node_opcua_common_1.makeApplicationUrn)((0, node_opcua_hostname_1.getHostname)(), this.applicationName);
         }
         return this._applicationUri;
     }
@@ -627,8 +639,8 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         await this.clientCertificateManager.initialize();
         await this.createDefaultCertificate();
         // c8 ignore next
-        if (!fs_1.default.existsSync(this.privateKeyFile)) {
-            throw new Error(" cannot locate private key file " + this.privateKeyFile);
+        if (!node_fs_1.default.existsSync(this.privateKeyFile)) {
+            throw new Error(` cannot locate private key file ${this.privateKeyFile}`);
         }
         if (this.isUnusable())
             return;
@@ -643,13 +655,13 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         debugLog(err.message);
         this.emit("connection_failed", err);
         this._setInternalState("disconnected");
-        return callback(err);
+        callback(err);
     }
     _handleDisconnectionWhileConnecting(err, callback) {
         debugLog(err.message);
         this.emit("connection_failed", err);
         this._setInternalState("disconnected");
-        return callback(err);
+        callback(err);
     }
     _handleSuccessfulConnection(callback) {
         debugLog(" Connected successfully  to ", this.endpointUrl);
@@ -662,7 +674,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         const callback = args[1];
         (0, node_opcua_assert_1.assert)(typeof callback === "function", "expecting a callback");
         if (typeof endpointUrl !== "string" || endpointUrl.length <= 0) {
-            errorLog("[NODE-OPCUA-E03] OPCUAClient#connect expects a valid endpoint : " + endpointUrl);
+            errorLog(`[NODE-OPCUA-E03] OPCUAClient#connect expects a valid endpoint : ${endpointUrl}`);
             callback(new Error("Invalid endpoint"));
             return;
         }
@@ -696,7 +708,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
                     }
                     if (forceEndpointDiscoveryOnConnect) {
                         debugLog("connecting with adjusted endpoint : ", adjustedEndpointUrl, "  was =", endpointUrl);
-                        this._connectStep2(adjustedEndpointUrl, callback);
+                        this._connectStep2(adjustedEndpointUrl || "", callback);
                     }
                     else {
                         debugLog("connecting with endpoint : ", endpointUrl);
@@ -734,15 +746,13 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
                 }
                 debugLog(chalk_1.default.red("SecureChannel creation has failed with error :", err.message));
                 if (err.message.match(/ECONNABORTED/)) {
-                    debugLog(chalk_1.default.yellow("- The client cannot to :" + endpointUrl + ". Connection has been aborted."));
+                    debugLog(chalk_1.default.yellow(`- The client cannot to :${endpointUrl}. Connection has been aborted.`));
                     err = new Error("The connection has been aborted");
                     this._handleUnrecoverableConnectionFailure(err, callback);
                 }
                 else if (err.message.match(/ECONNREF/)) {
-                    debugLog(chalk_1.default.yellow("- The client cannot to :" + endpointUrl + ". Server is not reachable."));
-                    err = new Error("The connection cannot be established with server " +
-                        endpointUrl +
-                        " .\n" +
+                    debugLog(chalk_1.default.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 +
@@ -754,7 +764,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
                     this._handleDisconnectionWhileConnecting(err, callback);
                 }
                 else {
-                    err = new Error("The connection may have been rejected by server,\n" + "Err = (" + err.message + ")");
+                    err = new Error(`The connection may have been rejected by server,\n Err = (${err.message})`);
                     this._handleUnrecoverableConnectionFailure(err, callback);
                 }
             }
@@ -764,16 +774,18 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         if (!this._secureChannel) {
             // this may happen if the Server has closed the connection abruptly for some unknown reason
             // or if the tcp connection has been broken.
-            return callback(new Error("performMessageTransaction: No SecureChannel , connection may have been canceled abruptly by server"));
+            callback(new Error("performMessageTransaction: No SecureChannel , connection may have been canceled abruptly by server"));
+            return;
         }
         if (this._internalState !== "connected" &&
             this._internalState !== "reconnecting_newchannel_connected" &&
             this._internalState !== "connecting" &&
             this._internalState !== "reconnecting") {
-            return callback(new Error("performMessageTransaction: Invalid client state = " +
+            callback(new Error("performMessageTransaction: Invalid client state = " +
                 this._internalState +
                 " while performing a transaction " +
                 request.schema.name));
+            return;
         }
         (0, node_opcua_assert_1.assert)(this._secureChannel);
         (0, node_opcua_assert_1.assert)(request);
@@ -812,7 +824,8 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
     }
     getEndpoints(...args) {
         if (args.length === 1) {
-            return this.getEndpoints({}, args[0]);
+            this.getEndpoints({}, args[0]);
+            return;
         }
         const options = args[0];
         const callback = args[1];
@@ -829,29 +842,36 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         });
         this.performMessageTransaction(request, (err, response) => {
             if (err) {
-                return callback(err);
+                callback(err);
+                return;
             }
             this._serverEndpoints = [];
             // c8 ignore next
             if (!response || !(response instanceof node_opcua_service_endpoints_1.GetEndpointsResponse)) {
-                return callback(new Error("Internal Error"));
+                callback(new Error("Internal Error"));
+                return;
             }
-            if (response && response.endpoints) {
+            if (response?.endpoints) {
                 this._serverEndpoints = response.endpoints;
             }
             callback(null, this._serverEndpoints);
         });
+        return;
     }
     /**
      * @deprecated
      */
     getEndpointsRequest(options, callback) {
         warningLog("note: ClientBaseImpl#getEndpointsRequest is deprecated, use ClientBaseImpl#getEndpoints instead");
-        return this.getEndpoints(options, callback);
+        this.getEndpoints(options, callback);
     }
     findServers(...args) {
         if (args.length === 1) {
-            return this.findServers({}, args[0]);
+            if (typeof args[0] === "function") {
+                this.findServers({}, args[0]);
+                return;
+            }
+            throw new Error("Invalid arguments");
         }
         const options = args[0];
         const callback = args[1];
@@ -862,39 +882,46 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         });
         this.performMessageTransaction(request, (err, response) => {
             if (err) {
-                return callback(err);
+                callback(err);
+                return;
             }
             /* c8 ignore next */
             if (!response || !(response instanceof node_opcua_service_discovery_1.FindServersResponse)) {
-                return callback(new Error("Internal Error"));
+                callback(new Error("Internal Error"));
+                return;
             }
             response.servers = response.servers || [];
             callback(null, response.servers);
         });
+        return undefined;
     }
     findServersOnNetwork(...args) {
         if (args.length === 1) {
-            return this.findServersOnNetwork({}, args[0]);
+            this.findServersOnNetwork({}, args[0]);
+            return undefined;
         }
         const options = args[0];
         const callback = args[1];
         const request = new node_opcua_service_discovery_1.FindServersOnNetworkRequest(options);
         this.performMessageTransaction(request, (err, response) => {
             if (err) {
-                return callback(err);
+                callback(err);
+                return;
             }
             /* c8 ignore next */
             if (!response || !(response instanceof node_opcua_service_discovery_1.FindServersOnNetworkResponse)) {
-                return new Error("Internal Error");
+                callback(new Error("Internal Error"));
+                return;
             }
             response.servers = response.servers || [];
             callback(null, response.servers);
         });
+        return undefined;
     }
     _removeSession(session) {
         const index = this._sessions.indexOf(session);
         if (index >= 0) {
-            const s = this._sessions.splice(index, 1)[0];
+            const _s = this._sessions.splice(index, 1)[0];
             // assert(s === session);
             // assert(session._client === this);
             session._client = null;
@@ -925,23 +952,19 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
             }
         });
     }
-    closeSession(...args) {
-        const session = args[0];
-        const deleteSubscriptions = args[1];
-        const callback = args[2];
+    closeSession(session, deleteSubscriptions, callback) {
         (0, node_opcua_assert_1.assert)(typeof deleteSubscriptions === "boolean");
-        (0, node_opcua_assert_1.assert)(typeof callback === "function");
         (0, node_opcua_assert_1.assert)(session);
         (0, node_opcua_assert_1.assert)(session._client === this, "session must be attached to this");
         session._closed = true;
         // todo : send close session on secure channel
-        this._closeSession(session, deleteSubscriptions, (err, response) => {
+        this._closeSession(session, deleteSubscriptions, (err, _response) => {
             session.emitCloseEvent(node_opcua_status_code_1.StatusCodes.Good);
             this._removeSession(session);
             session.dispose();
             (0, node_opcua_assert_1.assert)(this._sessions.indexOf(session) === -1);
             (0, node_opcua_assert_1.assert)(session._closed, "session must indicate it is closed");
-            callback(err ? err : undefined);
+            callback?.(err ? err : undefined);
         });
     }
     // eslint-disable-next-line max-statements
@@ -951,12 +974,12 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         this._reconnectionIsCanceled = true;
         if (this._tmpClient) {
             warningLog("disconnecting client while tmpClient exists", this._tmpClient.clientName);
-            this._tmpClient.disconnect((err) => {
+            this._tmpClient.disconnect((_err) => {
                 this._tmpClient = undefined;
                 // retry disconnect on main client
                 this.disconnect(callback);
             });
-            return;
+            return undefined;
         }
         if (this._internalState === "disconnected" || this._internalState === "disconnecting") {
             if (this._internalState === "disconnecting") {
@@ -965,7 +988,8 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
             if (!this._reconnectionIsCanceled && this.isReconnecting) {
                 errorLog("Internal Error : _reconnectionIsCanceled should be true if isReconnecting is true");
             }
-            return callback();
+            callback();
+            return undefined;
         }
         debugLog("disconnecting client! (will set reconnectionIsCanceled to true");
         this._reconnectionIsCanceled = true;
@@ -979,7 +1003,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
                 // sessions cannot be cancelled properly and must be discarded.
                 this.disconnect(callback);
             });
-            return;
+            return undefined;
         }
         if (this._sessions.length && !this.keepPendingSessionsOnDisconnect) {
             debugLog("warning : disconnection : closing pending sessions");
@@ -988,7 +1012,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
             this._close_pending_sessions(( /*err*/) => {
                 this.disconnect(callback);
             });
-            return;
+            return undefined;
         }
         debugLog("Disconnecting !");
         this._setInternalState("disconnecting");
@@ -1030,6 +1054,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
             //    this.emit("close", null);
             callback();
         }
+        return undefined;
     }
     // override me !
     _on_connection_reestablished(callback) {
@@ -1037,35 +1062,32 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
     }
     toString() {
         let str = "\n";
-        str += "  defaultSecureTokenLifetime.... " + this.defaultSecureTokenLifetime + "\n";
-        str += "  securityMode.................. " + node_opcua_service_secure_channel_1.MessageSecurityMode[this.securityMode] + "\n";
-        str += "  securityPolicy................ " + this.securityPolicy.toString() + "\n";
-        str += "  certificate fingerprint....... " + (0, web_1.makeSHA1Thumbprint)(this.getCertificate()).toString("hex") + "\n";
-        str +=
-            "  server certificate fingerprint " +
-                (this.serverCertificate ? (0, web_1.makeSHA1Thumbprint)(this.serverCertificate).toString("hex") : "") +
-                "\n";
+        str += `  defaultSecureTokenLifetime.... ${this.defaultSecureTokenLifetime}\n`;
+        str += `  securityMode.................. ${node_opcua_service_secure_channel_1.MessageSecurityMode[this.securityMode]}\n`;
+        str += `  securityPolicy................ ${this.securityPolicy.toString()}\n`;
+        str += `  certificate fingerprint....... ${makeCertificateThumbPrint(this.getCertificate())?.toString("hex") || "none"}\n`;
+        str += `  server certificate fingerprint ${makeCertificateThumbPrint(this.serverCertificate)?.toString("hex") || "none"}\n`;
         // this.serverCertificate = options.serverCertificate || null + "\n";
-        str += "  keepSessionAlive.............. " + this.keepSessionAlive + "\n";
-        str += "  bytesRead..................... " + this.bytesRead + "\n";
-        str += "  bytesWritten.................. " + this.bytesWritten + "\n";
-        str += "  transactionsPerformed......... " + this.transactionsPerformed + "\n";
-        str += "  timedOutRequestCount.......... " + this.timedOutRequestCount + "\n";
+        str += `  keepSessionAlive.............. ${this.keepSessionAlive}\n`;
+        str += `  bytesRead..................... ${this.bytesRead}\n`;
+        str += `  bytesWritten.................. ${this.bytesWritten}\n`;
+        str += `  transactionsPerformed......... ${this.transactionsPerformed}\n`;
+        str += `  timedOutRequestCount.......... ${this.timedOutRequestCount}\n`;
         str += "  connectionStrategy." + "\n";
-        str += "        .maxRetry............... " + this.connectionStrategy.maxRetry + "\n";
-        str += "        .initialDelay........... " + this.connectionStrategy.initialDelay + "\n";
-        str += "        .maxDelay............... " + this.connectionStrategy.maxDelay + "\n";
-        str += "        .randomisationFactor.... " + this.connectionStrategy.randomisationFactor + "\n";
-        str += "  keepSessionAlive.............. " + this.keepSessionAlive + "\n";
-        str += "  applicationName............... " + this.applicationName + "\n";
-        str += "  applicationUri................ " + this._getBuiltApplicationUri() + "\n";
-        str += "  clientName.................... " + this.clientName + "\n";
-        str += "  reconnectOnFailure............ " + this.reconnectOnFailure + "\n";
-        str += "  isReconnecting................ " + this.isReconnecting + "\n";
-        str += "  (internal state).............. " + this._internalState + "\n";
-        str += "  sessions count................ " + this.getSessions().length + "\n";
+        str += `        .maxRetry............... ${this.connectionStrategy.maxRetry}\n`;
+        str += `        .initialDelay........... ${this.connectionStrategy.initialDelay}\n`;
+        str += `        .maxDelay............... ${this.connectionStrategy.maxDelay}\n`;
+        str += `        .randomisationFactor.... ${this.connectionStrategy.randomisationFactor}\n`;
+        str += `  keepSessionAlive.............. ${this.keepSessionAlive}\n`;
+        str += `  applicationName............... ${this.applicationName}\n`;
+        str += `  applicationUri................ ${this._getBuiltApplicationUri()}\n`;
+        str += `  clientName.................... ${this.clientName}\n`;
+        str += `  reconnectOnFailure............ ${this.reconnectOnFailure}\n`;
+        str += `  isReconnecting................ ${this.isReconnecting}\n`;
+        str += `  (internal state).............. ${this._internalState}\n`;
+        str += `  sessions count................ ${this.getSessions().length}\n`;
         if (this._secureChannel) {
-            str += "secureChannel:\n" + this._secureChannel.toString();
+            str += `secureChannel:\n${this._secureChannel.toString()}`;
         }
         return str;
     }
@@ -1073,7 +1095,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         return this._sessions;
     }
     getTransportSettings() {
-        return this._secureChannel.getTransportSettings();
+        return this._secureChannel?.getTransportSettings() || {};
     }
     _addSession(session) {
         (0, node_opcua_assert_1.assert)(!session._client || session._client === this);
@@ -1114,14 +1136,16 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
             privateKeyFile,
             clientCertificateManager: this.clientCertificateManager
         };
-        return __findEndpoint.call(this, discoveryUrl, params, (err, result) => {
+        __findEndpoint.call(this, discoveryUrl, params, (err, result) => {
             if (err) {
-                return callback(err);
+                callback(err);
+                return;
             }
             // c8 ignore next
             if (!result) {
                 const err1 = new Error("internal error");
-                return callback(err1);
+                callback(err1);
+                return;
             }
             const endpoint = result.selectedEndpoint;
             if (!endpoint) {
@@ -1130,23 +1154,24 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
                     node_opcua_service_secure_channel_1.MessageSecurityMode[this.securityMode] +
                     " policy = " +
                     this.securityPolicy);
-                return callback(err1);
+                callback(err1);
+                return;
             }
             (0, node_opcua_assert_1.assert)(endpoint);
             _verify_serverCertificate(this.clientCertificateManager, endpoint.serverCertificate)
                 .then(() => {
                 this.serverCertificate = endpoint.serverCertificate;
-                callback(null, endpoint.endpointUrl);
+                callback(null, endpoint.endpointUrl || "");
             })
                 .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 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`);
                 for (let i = 0; i < chain.length; i++) {
                     const c = chain[i];
-                    warningLog("certificate", i, "\n" + f(c));
+                    warningLog("certificate", i, `\n${f(c)}`);
                 }
                 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" +
@@ -1155,7 +1180,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
                 else {
                     warningLog("                 verify that the server certificate is trusted or that server certificate issuer's certificate is present in the issuer folder");
                 }
-                return callback(err1);
+                callback(err1);
             });
         });
     }
@@ -1191,25 +1216,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
@@ -1217,8 +1243,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);
-        });
+            callback();
+        })
+            .catch((err) => callback(err));
     }
     _install_secure_channel_event_handlers(secureChannel) {
         (0, node_opcua_assert_1.assert)(this instanceof ClientBaseImpl);
@@ -1258,7 +1285,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
             // secureChannel requests a new token
             debugLog("SecureChannel Security Token ", token.tokenId, "live time was =", token.revisedLifetime, " is about to expired , it's time to request a new token");
             // forward message to upper level
-            this.emit("lifetime_75", token, secureChannel);
+            this.emit("lifetime_75", token);
         });
         secureChannel.on("security_token_renewed", (token) => {
             // forward message to upper level
@@ -1275,7 +1302,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
                     /**
                      * @event connection_lost
                      */
-                    this.emit("connection_lost", err?.message); // instead of "close"
+                    this.emit("connection_lost"); // instead of "close"
                 }
                 // this is a normal close operation initiated by us
                 this.emit("close", err); // instead of "close"
@@ -1289,7 +1316,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
                     /**
                      * @event connection_lost
                      */
-                    this.emit("connection_lost", err?.message); // instead of "close"
+                    this.emit("connection_lost"); // instead of "close"
                     this._repairConnection();
                 }
             }
@@ -1408,10 +1435,10 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
      * @internal
      * @private
      */
-    __createSession_step2(session, callback) {
+    __createSession_step2(_session, _callback) {
         throw new Error("Please override");
     }
-    _activateSession(session, userIdentity, callback) {
+    _activateSession(_session, _userIdentity, _callback) {
         throw new Error("Please override");
     }
 }
@@ -1419,22 +1446,23 @@ exports.ClientBaseImpl = ClientBaseImpl;
 // tslint:disable-next-line: max-classes-per-file
 class TmpClient extends ClientBaseImpl {
     constructor(options) {
-        options.clientName = (options.clientName || "") + "_TmpClient";
+        options.clientName = `${options.clientName || ""}_TmpClient`;
         super(options);
     }
     connect(endpoint, callback) {
         debugLog("connecting to TmpClient");
         // c8 ignore next
         if (this._internalState !== "disconnected") {
-            callback(new Error("TmpClient#connect: invalid internal state = " + this._internalState));
+            callback?.(new Error(`TmpClient#connect: invalid internal state = ${this._internalState}`));
             return;
         }
         this._setInternalState("connecting");
         this._connectStep2(endpoint, (err) => {
             if (this.isUnusable()) {
-                return this._handleUnrecoverableConnectionFailure(new Error("premature disconnection 4"), callback);
+                this._handleUnrecoverableConnectionFailure(new Error("premature disconnection 4"), callback || (() => { }));
+                return;
             }
-            callback(err);
+            callback?.(err);
         });
     }
 }