node-opcua-client 2.183.0 → 2.184.0

package/dist/private/client_base_impl.js

@@ -1,42 +1,36 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ClientBaseImpl = void 0;
 /**
  * @module node-opcua-client-private
  */
-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 node_opcua_crypto_1 = require("node-opcua-crypto");
-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_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_transport_1 = require("node-opcua-transport");
-const node_opcua_utils_1 = require("node-opcua-utils");
-const client_base_js_1 = require("../client_base.js");
-const verify_js_1 = require("../verify.js");
-const debugLog = (0, node_opcua_debug_1.make_debugLog)("client_base_impl");
-const doDebug = (0, node_opcua_debug_1.checkDebugFlag)("client_base_impl");
-const errorLog = (0, node_opcua_debug_1.make_errorLog)("client_base_impl");
-const warningLog = (0, node_opcua_debug_1.make_warningLog)("client_base_impl");
+import fs from "node:fs";
+import path from "node:path";
+import { withLock } from "@ster5/global-mutex";
+import chalk from "chalk";
+import { assert } from "node-opcua-assert";
+import { getDefaultCertificateManager } from "node-opcua-certificate-manager";
+import { InMemoryCertificateStore, makeApplicationUrn, makeSubject, OPCUASecureObject, resolvePrivateKeyProviderIfNeeded } from "node-opcua-common";
+import { PrivateKeyPassphraseRequiredError } from "node-opcua-crypto";
+import { exploreCertificate, makeSHA1Thumbprint, split_der } from "node-opcua-crypto/web";
+import { installPeriodicClockAdjustment, periodicClockAdjustment, uninstallPeriodicClockAdjustment } from "node-opcua-date-time";
+import { checkDebugFlag, make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug";
+import { getHostname } from "node-opcua-hostname";
+import { ClientSecureChannelLayer, coerceConnectionStrategy, coerceSecurityPolicy } from "node-opcua-secure-channel";
+import { FindServersOnNetworkRequest, FindServersOnNetworkResponse, FindServersRequest, FindServersResponse } from "node-opcua-service-discovery";
+import { GetEndpointsRequest, GetEndpointsResponse } from "node-opcua-service-endpoints";
+import { coerceMessageSecurityMode, MessageSecurityMode, ServiceFault } from "node-opcua-service-secure-channel";
+import { CloseSessionRequest } from "node-opcua-service-session";
+import { StatusCodes } from "node-opcua-status-code";
+import { makeReverseClientTransportFactory } from "node-opcua-transport";
+import { checkFileExistsAndIsNotEmpty, matchUri } from "node-opcua-utils";
+import { OPCUAClientBase } from "../client_base.js";
+import { performCertificateSanityCheck } from "../verify.js";
+const debugLog = make_debugLog("client_base_impl");
+const doDebug = checkDebugFlag("client_base_impl");
+const errorLog = make_errorLog("client_base_impl");
+const warningLog = make_warningLog("client_base_impl");
 function makeCertificateThumbPrint(certificate) {
     if (!certificate)
         return null;
-    return (0, web_1.makeSHA1Thumbprint)(Array.isArray(certificate) ? certificate[0] : certificate);
+    return makeSHA1Thumbprint(Array.isArray(certificate) ? certificate[0] : certificate);
 }
 const traceInternalState = false;
 const defaultConnectionStrategy = {
@@ -52,7 +46,7 @@ function __findEndpoint(endpointUrl, params, _callback) {
     const masterClient = this;
     doDebug && debugLog("findEndpoint : endpointUrl = ", endpointUrl);
     doDebug && debugLog(" params ", params);
-    (0, node_opcua_assert_1.assert)(!masterClient._tmpClient);
+    assert(!masterClient._tmpClient);
     const callback = (err, result) => {
         masterClient._tmpClient = undefined;
         _callback(err, result);
@@ -91,7 +85,7 @@ function __findEndpoint(endpointUrl, params, _callback) {
             masterClient.listeners("backoff").forEach((handler) => {
                 client.on("backoff", handler);
             });
-            // c8 ignore next
+            /* c8 ignore next */
             if (doDebug) {
                 client.on("backoff", (retryCount, delay) => {
                     debugLog("finding Endpoint => reconnecting ", " retry count", retryCount, " next attempt in ", delay / 1000, "seconds");
@@ -154,7 +148,7 @@ function __findEndpoint(endpointUrl, params, _callback) {
         }
         // c8 ignore next
         if (doDebug) {
-            debugLog(chalk_1.default.bgWhite.red("xxxxxxxxxxxxxxxxxxxxx => selected EndPoint = "), selectedEndpoint.toString());
+            debugLog(chalk.bgWhite.red("xxxxxxxxxxxxxxxxxxxxx => selected EndPoint = "), selectedEndpoint.toString());
         }
         callback(null, { endpoints: allEndpoints, selectedEndpoint });
     })
@@ -187,13 +181,13 @@ doDebug && debugLog("forceEndpointDiscoveryOnConnect = ", forceEndpointDiscovery
 class ClockAdjustment {
     constructor() {
         // c8 ignore next
-        doDebug && debugLog("installPeriodicClockAdjustment ", node_opcua_date_time_1.periodicClockAdjustment.timerInstallationCount);
-        (0, node_opcua_date_time_1.installPeriodicClockAdjustment)();
+        doDebug && debugLog("installPeriodicClockAdjustment ", periodicClockAdjustment.timerInstallationCount);
+        installPeriodicClockAdjustment();
     }
     dispose() {
-        (0, node_opcua_date_time_1.uninstallPeriodicClockAdjustment)();
+        uninstallPeriodicClockAdjustment();
         // c8 ignore next
-        doDebug && debugLog("uninstallPeriodicClockAdjustment ", node_opcua_date_time_1.periodicClockAdjustment.timerInstallationCount);
+        doDebug && debugLog("uninstallPeriodicClockAdjustment ", periodicClockAdjustment.timerInstallationCount);
     }
 }
 /*
@@ -219,7 +213,7 @@ let g_ClientCounter = 0;
 /**
  * @internal
  */
-class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
+export class ClientBaseImpl extends OPCUASecureObject {
     /**
      * total number of requests that been canceled due to timeout
      */
@@ -314,7 +308,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
     _setInternalState(internalState) {
         const previousState = this._internalState;
         if (doDebug || traceInternalState) {
-            (traceInternalState ? warningLog : debugLog)(chalk_1.default.cyan(`  Client ${this._instanceNumber} ${this.clientName} : _internalState from    `), chalk_1.default.yellow(previousState), "to", chalk_1.default.yellow(internalState));
+            (traceInternalState ? warningLog : debugLog)(chalk.cyan(`  Client ${this._instanceNumber} ${this.clientName} : _internalState from    `), chalk.yellow(previousState), "to", chalk.yellow(internalState));
         }
         if (this._internalState === "disconnecting" || this._internalState === "disconnected") {
             if (internalState === "reconnecting") {
@@ -326,7 +320,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
     emit(eventName, ...others) {
         // c8 ignore next
         if (doDebug) {
-            debugLog(chalk_1.default.cyan(`  Client ${this._instanceNumber} ${this.clientName} emitting `), chalk_1.default.magentaBright(eventName));
+            debugLog(chalk.cyan(`  Client ${this._instanceNumber} ${this.clientName} emitting `), chalk.magentaBright(eventName));
         }
         // @ts-expect-error
         return super.emit(eventName, ...others);
@@ -338,26 +332,26 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
             // In-memory path — use a lightweight in-memory store
             // when no cert manager was explicitly provided.
             if (!options.clientCertificateManager) {
-                options.clientCertificateManager = new node_opcua_common_1.InMemoryCertificateStore();
+                options.clientCertificateManager = new InMemoryCertificateStore();
             }
             super(options);
         }
         else {
             // Disk path — derive cert/key paths from certificate manager
             if (!options.clientCertificateManager) {
-                options.clientCertificateManager = (0, node_opcua_certificate_manager_1.getDefaultCertificateManager)("PKI");
+                options.clientCertificateManager = getDefaultCertificateManager("PKI");
             }
             const cm = options.clientCertificateManager;
             options.privateKeyFile = options.privateKeyFile || cm.privateKey;
-            options.certificateFile = options.certificateFile || node_path_1.default.join(cm.rootDir, "own/certs/client_certificate.pem");
+            options.certificateFile = options.certificateFile || path.join(cm.rootDir, "own/certs/client_certificate.pem");
             super(options);
         }
         this.#hasUserProvidedProvider = hasUserProvidedProvider;
         this._setInternalState("uninitialized");
         this._instanceNumber = g_ClientCounter++;
         this.applicationName = options.applicationName || "NodeOPCUA-Client";
-        (0, node_opcua_assert_1.assert)(!this.applicationName.match(/^locale=/), "applicationName badly converted from LocalizedText");
-        (0, node_opcua_assert_1.assert)(!this.applicationName.match(/urn:/), "applicationName should not be a URI");
+        assert(!this.applicationName.match(/^locale=/), "applicationName badly converted from LocalizedText");
+        assert(!this.applicationName.match(/urn:/), "applicationName should not be a URI");
         // we need to delay _applicationUri initialization
         this._applicationUri = options.applicationUri || this._getBuiltApplicationUri();
         if (!options.clientCertificateManager) {
@@ -376,9 +370,9 @@ 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)(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);
+        assert(Number.isFinite(this.tokenRenewalInterval) && this.tokenRenewalInterval >= 0);
+        this.securityMode = coerceMessageSecurityMode(options.securityMode);
+        this.securityPolicy = coerceSecurityPolicy(options.securityPolicy);
         this.serverCertificate = options.serverCertificate;
         this.keepSessionAlive = typeof options.keepSessionAlive === "boolean" ? options.keepSessionAlive : false;
         this.keepAliveInterval = options.keepAliveInterval;
@@ -387,7 +381,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         this._byteWritten = 0;
         this._transactionsPerformed = 0;
         this._timedOutRequestCount = 0;
-        this.connectionStrategy = (0, node_opcua_secure_channel_1.coerceConnectionStrategy)(options.connectionStrategy || defaultConnectionStrategy);
+        this.connectionStrategy = coerceConnectionStrategy(options.connectionStrategy || defaultConnectionStrategy);
         /***
          * @property keepPendingSessionsOnDisconnect²
          * @type {boolean}
@@ -430,7 +424,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
             callback(new Error("Cannot reconnect, server endpoint is unknown - this.knowsServerEndpoint = false"));
             return;
         }
-        (0, node_opcua_assert_1.assert)(this.knowsServerEndpoint);
+        assert(this.knowsServerEndpoint);
         this._setInternalState("reconnecting");
         this.emit("start_reconnection"); // send after callback
         const infiniteConnectionRetry = {
@@ -462,10 +456,10 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         };
         const _when_connected = (callback) => {
             this.emit("after_reconnection", null); // send after callback
-            (0, node_opcua_assert_1.assert)(this._secureChannel, "expecting a secureChannel here ");
+            assert(this._secureChannel, "expecting a secureChannel here ");
             // a new channel has be created and a new connection is established
             // c8 ignore next
-            doDebug && debugLog(chalk_1.default.bgWhite.red("ClientBaseImpl:  RECONNECTED                !!!"));
+            doDebug && debugLog(chalk.bgWhite.red("ClientBaseImpl:  RECONNECTED                !!!"));
             this._setInternalState("reconnecting_newchannel_connected");
             return callback();
         };
@@ -481,7 +475,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
                 const err = new Error("_internal_create_secure_channel failed, this._secureChannel is supposed to be null");
                 return _when_internal_error(err, callback);
             }
-            (0, node_opcua_assert_1.assert)(!this._secureChannel, "_attempt_to_recreate_secure_channel,  expecting this._secureChannel not to exist");
+            assert(!this._secureChannel, "_attempt_to_recreate_secure_channel,  expecting this._secureChannel not to exist");
             this._internal_create_secure_channel(infiniteConnectionRetry, (err) => {
                 if (err) {
                     // c8 ignore next
@@ -545,12 +539,12 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         _attempt_to_recreate_secure_channel(callback);
     }
     _internal_create_secure_channel(connectionStrategy, callback) {
-        (0, node_opcua_assert_1.assert)(this._secureChannel === null);
-        (0, node_opcua_assert_1.assert)(typeof this.endpointUrl === "string");
+        assert(this._secureChannel === null);
+        assert(typeof this.endpointUrl === "string");
         // c8 ignore next
         doDebug &&
             debugLog("_internal_create_secure_channel creating new ClientSecureChannelLayer _internalState =", this._internalState, this.clientName);
-        const secureChannel = new node_opcua_secure_channel_1.ClientSecureChannelLayer({
+        const secureChannel = new ClientSecureChannelLayer({
             connectionStrategy,
             defaultSecureTokenLifetime: this.defaultSecureTokenLifetime,
             parent: this,
@@ -594,7 +588,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         };
         const step3_getEndpoints = () => {
             return new Promise((resolve, reject) => {
-                (0, node_opcua_assert_1.assert)(this._secureChannel !== null);
+                assert(this._secureChannel !== null);
                 if (!this.knowsServerEndpoint) {
                     this._setInternalState("connecting");
                     this.getEndpoints((err /*, endpoints?: EndpointDescription[]*/) => {
@@ -618,7 +612,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         step2_openSecureChannel()
             .then(() => step3_getEndpoints())
             .then(() => {
-            (0, node_opcua_assert_1.assert)(this._secureChannel !== null);
+            assert(this._secureChannel !== null);
             callback(null, secureChannel);
         })
             .catch((err) => {
@@ -635,8 +629,8 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         });
     }
     static async createCertificate(clientCertificateManager, certificateFile, applicationName, applicationUri) {
-        if (!node_fs_1.default.existsSync(certificateFile)) {
-            const hostname = (0, node_opcua_hostname_1.getHostname)();
+        if (!fs.existsSync(certificateFile)) {
+            const hostname = getHostname();
             // this.serverInfo.applicationUri!;
             // Cast is safe: createDefaultCertificate only calls
             // this in the disk path, where the manager is always
@@ -647,13 +641,13 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
                 dns: [hostname],
                 // ip: await getIpAddresses(),
                 outputFile: certificateFile,
-                subject: (0, node_opcua_common_1.makeSubject)(applicationName, hostname),
+                subject: makeSubject(applicationName, hostname),
                 startDate: new Date(),
                 validity: 365 * 10 // 10 years
             });
         }
         // c8 ignore next
-        if (!node_fs_1.default.existsSync(certificateFile)) {
+        if (!fs.existsSync(certificateFile)) {
             throw new Error(` cannot locate certificate file ${certificateFile}`);
         }
     }
@@ -663,9 +657,9 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
             errorLog("Internal error : re-entrancy in createDefaultCertificate!");
         }
         this._inCreateDefaultCertificate = true;
-        if (!(0, node_opcua_utils_1.checkFileExistsAndIsNotEmpty)(this.certificateFile)) {
-            await (0, global_mutex_1.withLock)({ fileToLock: `${this.certificateFile}.mutex` }, async () => {
-                if ((0, node_opcua_utils_1.checkFileExistsAndIsNotEmpty)(this.certificateFile)) {
+        if (!checkFileExistsAndIsNotEmpty(this.certificateFile)) {
+            await withLock({ fileToLock: `${this.certificateFile}.mutex` }, async () => {
+                if (checkFileExistsAndIsNotEmpty(this.certificateFile)) {
                     // the file may have been created in between
                     return;
                 }
@@ -693,7 +687,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
     }
     _getBuiltApplicationUri() {
         if (!this._applicationUri) {
-            this._applicationUri = (0, node_opcua_common_1.makeApplicationUrn)((0, node_opcua_hostname_1.getHostname)(), this.applicationName);
+            this._applicationUri = makeApplicationUrn(getHostname(), this.applicationName);
         }
         return this._applicationUri;
     }
@@ -724,7 +718,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
                     "function" &&
                     this.clientCertificateManager.isPrivateKeyOpaque();
                 // c8 ignore next
-                if (!hasOpaqueKey && !node_fs_1.default.existsSync(this.privateKeyFile)) {
+                if (!hasOpaqueKey && !fs.existsSync(this.privateKeyFile)) {
                     throw new Error(` cannot locate private key file ${this.privateKeyFile}`);
                 }
                 // Resolve the (possibly passphrase-encrypted) private key once,
@@ -735,11 +729,11 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
                 // certificateKeyPairProvider, or when clientCertificateManager
                 // doesn't expose an async getPrivateKey() (e.g. a bare
                 // ICertificateStore).
-                await (0, node_opcua_common_1.resolvePrivateKeyProviderIfNeeded)(this, this.clientCertificateManager, this.#hasUserProvidedProvider);
+                await resolvePrivateKeyProviderIfNeeded(this, this.clientCertificateManager, this.#hasUserProvidedProvider);
             }
         }
         catch (err) {
-            if (err instanceof node_opcua_crypto_1.PrivateKeyPassphraseRequiredError) {
+            if (err instanceof PrivateKeyPassphraseRequiredError) {
                 throw new Error(`[NODE-OPCUA-E31] private key ${this.privateKeyFile} is encrypted; ` +
                     "set privateKeyPassphrase on the OPCUACertificateManager passed as clientCertificateManager");
             }
@@ -751,7 +745,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         // calls trustCertificate and verifyCertificate which each acquire
         // withLock2 internally, so an outer withLock2 would cause a deadlock
         // on the same file-based mutex.
-        await (0, verify_js_1.performCertificateSanityCheck)(this, "client", this.clientCertificateManager, this._getBuiltApplicationUri());
+        await performCertificateSanityCheck(this, "client", this.clientCertificateManager, this._getBuiltApplicationUri());
     }
     _internalState = "uninitialized";
     _handleUnrecoverableConnectionFailure(err, callback) {
@@ -761,7 +755,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         // synchronous throw out of _connectStep2 (e.g. an invalid SecureChannel config) lands here
         // WITHOUT the error-branch unregister ever running, which would otherwise leak the client.
         // unregister() is idempotent (a no-op when the client was never registered or already removed).
-        client_base_js_1.OPCUAClientBase.registry.unregister(this);
+        OPCUAClientBase.registry.unregister(this);
         this.emit("connection_failed", err);
         this._setInternalState("disconnected");
         callback(err);
@@ -771,7 +765,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         doDebug && debugLog(err.message);
         // see _handleUnrecoverableConnectionFailure: idempotent unregister guards against a leaked
         // client when a connect attempt fails before the error-branch unregister runs.
-        client_base_js_1.OPCUAClientBase.registry.unregister(this);
+        OPCUAClientBase.registry.unregister(this);
         this.emit("connection_failed", err);
         this._setInternalState("disconnected");
         callback(err);
@@ -786,13 +780,13 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
     connect(...args) {
         const endpointUrl = args[0];
         const callback = args[1];
-        (0, node_opcua_assert_1.assert)(typeof callback === "function", "expecting a callback");
+        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}`);
             callback(new Error("Invalid endpoint"));
             return;
         }
-        (0, node_opcua_assert_1.assert)(typeof endpointUrl === "string" && endpointUrl.length > 0);
+        assert(typeof endpointUrl === "string" && endpointUrl.length > 0);
         // c8 ignore next
         if (this._internalState !== "disconnected") {
             callback(new Error(`client#connect failed, as invalid internal state = ${this._internalState}`));
@@ -812,7 +806,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
                 return this._handleDisconnectionWhileConnecting(new Error("premature disconnection 1"), callback);
             }
             if (!this.serverCertificate &&
-                (forceEndpointDiscoveryOnConnect || this.securityMode !== node_opcua_service_secure_channel_1.MessageSecurityMode.None)) {
+                (forceEndpointDiscoveryOnConnect || this.securityMode !== MessageSecurityMode.None)) {
                 // c8 ignore next
                 doDebug && debugLog("Fetching certificates from endpoints");
                 this.fetchServerCertificate(endpointUrl, (err, adjustedEndpointUrl) => {
@@ -847,7 +841,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         const reverseConnect = args[0];
         const callback = args[args.length - 1];
         const expectation = (args.length >= 3 ? args[1] : undefined);
-        (0, node_opcua_assert_1.assert)(typeof callback === "function", "expecting a callback");
+        assert(typeof callback === "function", "expecting a callback");
         if (!reverseConnect) {
             callback(new Error("connectReverse expects a ClientReverseConnect instance"));
             return;
@@ -866,9 +860,9 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         // front via OPCUAClientOptions.serverCertificate. Reject early with a clear message rather than
         // letting the SecureChannel layer fail deep inside with an opaque error (which also used to leak
         // the client, since that failure path never reached the connect-failure unregister).
-        if (this.securityMode !== node_opcua_service_secure_channel_1.MessageSecurityMode.None && !this.serverCertificate) {
+        if (this.securityMode !== MessageSecurityMode.None && !this.serverCertificate) {
             callback(new Error("connectReverse: a secure connection (securityMode=" +
-                node_opcua_service_secure_channel_1.MessageSecurityMode[this.securityMode] +
+                MessageSecurityMode[this.securityMode] +
                 ") requires the server certificate to be supplied up front " +
                 "(OPCUAClientOptions.serverCertificate), because a reverse-connect client cannot dial the server to fetch it."));
             return;
@@ -879,7 +873,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         // EACH attempt so every attempt waits for the server to (re-)dial in. We keep the current
         // waiter registration so it can be cancelled on disconnect — otherwise a leaked waiter would
         // later hijack an incoming server socket on this (by-then disposed) transport.
-        this._transportFactory = (0, node_opcua_transport_1.makeReverseClientTransportFactory)(() => new Promise((resolve, reject) => {
+        this._transportFactory = makeReverseClientTransportFactory(() => new Promise((resolve, reject) => {
             // drop any stale waiter from a previous attempt before registering a new one
             this._reverseConnectRegistration?.cancel();
             this._reverseConnectRegistration = reverseConnect.waitForConnection(expectation, (err, accepted) => {
@@ -918,10 +912,10 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
      */
     _connectStep2(endpointUrl, callback) {
         // prevent illegal call to connect
-        (0, node_opcua_assert_1.assert)(this._secureChannel === null);
+        assert(this._secureChannel === null);
         this.endpointUrl = endpointUrl;
         this._clockAdjuster = this._clockAdjuster || new ClockAdjustment();
-        client_base_js_1.OPCUAClientBase.registry.register(this);
+        OPCUAClientBase.registry.register(this);
         // c8 ignore next
         doDebug && debugLog("__connectStep2 ", this._internalState);
         this._internal_create_secure_channel(this.connectionStrategy, (err) => {
@@ -929,22 +923,22 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
                 this._handleSuccessfulConnection(callback);
             }
             else {
-                client_base_js_1.OPCUAClientBase.registry.unregister(this);
+                OPCUAClientBase.registry.unregister(this);
                 if (this._clockAdjuster) {
                     this._clockAdjuster.dispose();
                     this._clockAdjuster = undefined;
                 }
                 // c8 ignore next
-                doDebug && debugLog(chalk_1.default.red("SecureChannel creation has failed with error :", err.message));
+                doDebug && debugLog(chalk.red("SecureChannel creation has failed with error :", err.message));
                 if (err.message.match(/ECONNABORTED/)) {
                     // c8 ignore next
-                    doDebug && debugLog(chalk_1.default.yellow(`- The client cannot to :${endpointUrl}. Connection has been aborted.`));
+                    doDebug && debugLog(chalk.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/)) {
                     // c8 ignore next
-                    doDebug && debugLog(chalk_1.default.yellow(`- The client cannot to :${endpointUrl}. Server is not reachable.`));
+                    doDebug && 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 = (" +
@@ -958,7 +952,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
                 }
                 else {
                     const fault = err.response;
-                    if (fault instanceof node_opcua_service_secure_channel_1.ServiceFault) {
+                    if (fault instanceof ServiceFault) {
                         // the server answered the OpenSecureChannel with a ServiceFault (Part 6 6.7.4):
                         // it refused the connection and said why - typically a client certificate it
                         // does not trust (BadSecurityChecksFailed) or that is out of date
@@ -995,10 +989,10 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
                 request.schema.name));
             return;
         }
-        (0, node_opcua_assert_1.assert)(this._secureChannel);
-        (0, node_opcua_assert_1.assert)(request);
-        (0, node_opcua_assert_1.assert)(request.requestHeader);
-        (0, node_opcua_assert_1.assert)(typeof callback === "function");
+        assert(this._secureChannel);
+        assert(request);
+        assert(request.requestHeader);
+        assert(typeof callback === "function");
         this._secureChannel.performMessageTransaction(request, callback);
     }
     /**
@@ -1007,9 +1001,9 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
 
      */
     findEndpointForSecurity(securityMode, securityPolicy) {
-        securityMode = (0, node_opcua_service_secure_channel_1.coerceMessageSecurityMode)(securityMode);
-        securityPolicy = (0, node_opcua_secure_channel_1.coerceSecurityPolicy)(securityPolicy);
-        (0, node_opcua_assert_1.assert)(this.knowsServerEndpoint, "Server end point are not known yet");
+        securityMode = coerceMessageSecurityMode(securityMode);
+        securityPolicy = coerceSecurityPolicy(securityPolicy);
+        assert(this.knowsServerEndpoint, "Server end point are not known yet");
         return this._serverEndpoints.find((endpoint) => {
             return endpoint.securityMode === securityMode && endpoint.securityPolicyUri === securityPolicy;
         });
@@ -1020,12 +1014,12 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
 
      */
     findEndpoint(endpointUrl, securityMode, securityPolicy) {
-        (0, node_opcua_assert_1.assert)(this.knowsServerEndpoint, "Server end point are not known yet");
+        assert(this.knowsServerEndpoint, "Server end point are not known yet");
         if (!this._serverEndpoints || this._serverEndpoints.length === 0) {
             return undefined;
         }
         return this._serverEndpoints.find((endpoint) => {
-            return ((0, node_opcua_utils_1.matchUri)(endpoint.endpointUrl, endpointUrl) &&
+            return (matchUri(endpoint.endpointUrl, endpointUrl) &&
                 endpoint.securityMode === securityMode &&
                 endpoint.securityPolicyUri === securityPolicy);
         });
@@ -1037,10 +1031,10 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         }
         const options = args[0];
         const callback = args[1];
-        (0, node_opcua_assert_1.assert)(typeof callback === "function");
+        assert(typeof callback === "function");
         options.localeIds = options.localeIds || [];
         options.profileUris = options.profileUris || [];
-        const request = new node_opcua_service_endpoints_1.GetEndpointsRequest({
+        const request = new GetEndpointsRequest({
             endpointUrl: options.endpointUrl || this.endpointUrl,
             localeIds: options.localeIds,
             profileUris: options.profileUris,
@@ -1055,7 +1049,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
             }
             this._serverEndpoints = [];
             // c8 ignore next
-            if (!response || !(response instanceof node_opcua_service_endpoints_1.GetEndpointsResponse)) {
+            if (!response || !(response instanceof GetEndpointsResponse)) {
                 callback(new Error("Internal Error"));
                 return;
             }
@@ -1083,7 +1077,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         }
         const options = args[0];
         const callback = args[1];
-        const request = new node_opcua_service_discovery_1.FindServersRequest({
+        const request = new FindServersRequest({
             endpointUrl: options.endpointUrl || this.endpointUrl,
             localeIds: options.localeIds || [],
             serverUris: options.serverUris || []
@@ -1094,7 +1088,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
                 return;
             }
             /* c8 ignore next */
-            if (!response || !(response instanceof node_opcua_service_discovery_1.FindServersResponse)) {
+            if (!response || !(response instanceof FindServersResponse)) {
                 callback(new Error("Internal Error"));
                 return;
             }
@@ -1110,14 +1104,14 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         }
         const options = args[0];
         const callback = args[1];
-        const request = new node_opcua_service_discovery_1.FindServersOnNetworkRequest(options);
+        const request = new FindServersOnNetworkRequest(options);
         this.performMessageTransaction(request, (err, response) => {
             if (err) {
                 callback(err);
                 return;
             }
             /* c8 ignore next */
-            if (!response || !(response instanceof node_opcua_service_discovery_1.FindServersOnNetworkResponse)) {
+            if (!response || !(response instanceof FindServersOnNetworkResponse)) {
                 callback(new Error("Internal Error"));
                 return;
             }
@@ -1134,22 +1128,22 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
             // assert(session._client === this);
             session._client = null;
         }
-        (0, node_opcua_assert_1.assert)(this._sessions.indexOf(session) === -1);
+        assert(this._sessions.indexOf(session) === -1);
     }
     _closeSession(session, deleteSubscriptions, callback) {
-        (0, node_opcua_assert_1.assert)(typeof callback === "function");
-        (0, node_opcua_assert_1.assert)(typeof deleteSubscriptions === "boolean");
+        assert(typeof callback === "function");
+        assert(typeof deleteSubscriptions === "boolean");
         // c8 ignore next
         if (!this._secureChannel) {
             return callback(null); // new Error("no channel"));
         }
-        (0, node_opcua_assert_1.assert)(this._secureChannel);
+        assert(this._secureChannel);
         if (!this._secureChannel.isValid()) {
             return callback(null);
         }
         // c8 ignore next
-        doDebug && debugLog(chalk_1.default.bgWhite.green("_closeSession ") + this._secureChannel.channelId);
-        const request = new node_opcua_service_session_1.CloseSessionRequest({
+        doDebug && debugLog(chalk.bgWhite.green("_closeSession ") + this._secureChannel.channelId);
+        const request = new CloseSessionRequest({
             deleteSubscriptions
         });
         session.performMessageTransaction(request, (err, response) => {
@@ -1162,23 +1156,23 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         });
     }
     closeSession(session, deleteSubscriptions, callback) {
-        (0, node_opcua_assert_1.assert)(typeof deleteSubscriptions === "boolean");
-        (0, node_opcua_assert_1.assert)(session);
-        (0, node_opcua_assert_1.assert)(session._client === this, "session must be attached to this");
+        assert(typeof deleteSubscriptions === "boolean");
+        assert(session);
+        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) => {
-            session.emitCloseEvent(node_opcua_status_code_1.StatusCodes.Good);
+            session.emitCloseEvent(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");
+            assert(this._sessions.indexOf(session) === -1);
+            assert(session._closed, "session must indicate it is closed");
             callback?.(err ? err : undefined);
         });
     }
     disconnect(...args) {
         const callback = args[0];
-        (0, node_opcua_assert_1.assert)(typeof callback === "function", "expecting a callback function here");
+        assert(typeof callback === "function", "expecting a callback function here");
         this._reconnectionIsCanceled = true;
         // cancel any outstanding reverse-connect waiter so it cannot later hijack an incoming
         // server socket on this (now disconnecting) client.
@@ -1215,7 +1209,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
             this._cancel_reconnection((err) => {
                 // c8 ignore next
                 doDebug && debugLog("ClientBaseImpl#disconnect reconnection has been canceled", this.applicationName);
-                (0, node_opcua_assert_1.assert)(!err, " why would this fail ?");
+                assert(!err, " why would this fail ?");
                 // sessions cannot be cancelled properly and must be discarded.
                 this.disconnect(callback);
             });
@@ -1250,8 +1244,8 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
             }
             this._sessions = [];
         }
-        (0, node_opcua_assert_1.assert)(this._sessions.length === 0, " attempt to disconnect a client with live sessions ");
-        client_base_js_1.OPCUAClientBase.registry.unregister(this);
+        assert(this._sessions.length === 0, " attempt to disconnect a client with live sessions ");
+        OPCUAClientBase.registry.unregister(this);
         if (this._clockAdjuster) {
             this._clockAdjuster.dispose();
             this._clockAdjuster = undefined;
@@ -1283,7 +1277,7 @@ 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 += `  securityMode.................. ${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`;
@@ -1318,8 +1312,8 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         return this._secureChannel?.getTransportSettings() || {};
     }
     _addSession(session) {
-        (0, node_opcua_assert_1.assert)(!session._client || session._client === this);
-        (0, node_opcua_assert_1.assert)(this._sessions.indexOf(session) === -1, "session already added");
+        assert(!session._client || session._client === this);
+        assert(this._sessions.indexOf(session) === -1, "session already added");
         session._client = this;
         this._sessions.push(session);
     }
@@ -1357,7 +1351,10 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
             privateKeyFile,
             clientCertificateManager: this.clientCertificateManager
         };
-        __findEndpoint.call(this, discoveryUrl, params, (err, result) => {
+        // through unknown: see the note in base_server.ts, `this` is ClientBaseImpl<Events> and
+        // Events could be a narrower subtype than the helper's parameter declares.
+        const self = this;
+        __findEndpoint.call(self, discoveryUrl, params, (err, result) => {
             if (err) {
                 callback(err);
                 return;
@@ -1372,13 +1369,13 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
             if (!endpoint) {
                 // no matching end point can be found ...
                 const err1 = new Error("cannot find endpoint for securityMode=" +
-                    node_opcua_service_secure_channel_1.MessageSecurityMode[this.securityMode] +
+                    MessageSecurityMode[this.securityMode] +
                     " policy = " +
                     this.securityPolicy);
                 callback(err1);
                 return;
             }
-            (0, node_opcua_assert_1.assert)(endpoint);
+            assert(endpoint);
             _verify_serverCertificate(this.clientCertificateManager, endpoint.serverCertificate)
                 .then(() => {
                 this.serverCertificate = endpoint.serverCertificate;
@@ -1389,13 +1386,13 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
                 if ("rootDir" in this.clientCertificateManager) {
                     warningLog("                 clientCertificateManager.rootDir = ", this.clientCertificateManager.rootDir);
                 }
-                const chain = (0, web_1.split_der)(endpoint.serverCertificate);
+                const chain = split_der(endpoint.serverCertificate);
                 warningLog(`                 server certificate chain contains ${chain.length} element(s)`);
                 for (let i = 0; i < chain.length; i++) {
                     const c = chain[i];
-                    const thumbprint = (0, web_1.makeSHA1Thumbprint)(c).toString("hex");
+                    const thumbprint = makeSHA1Thumbprint(c).toString("hex");
                     try {
-                        const info = (0, web_1.exploreCertificate)(c);
+                        const info = exploreCertificate(c);
                         const tbs = info.tbsCertificate;
                         const cn = tbs.subject?.commonName ?? "unknown";
                         const issuerCN = tbs.issuer?.commonName ?? "unknown";
@@ -1446,10 +1443,10 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
             // c8 ignore next
             if (doDebug) {
                 const h = `Client ${this._instanceNumber} ${this.clientName}`;
-                debugLog(chalk_1.default.cyan(`${h} byteWritten          = `), this._byteWritten);
-                debugLog(chalk_1.default.cyan(`${h} byteRead             = `), this._byteRead);
-                debugLog(chalk_1.default.cyan(`${h} transactions         = `), this._transactionsPerformed);
-                debugLog(chalk_1.default.cyan(`${h} timedOutRequestCount = `), this._timedOutRequestCount);
+                debugLog(chalk.cyan(`${h} byteWritten          = `), this._byteWritten);
+                debugLog(chalk.cyan(`${h} byteRead             = `), this._byteRead);
+                debugLog(chalk.cyan(`${h} transactions         = `), this._transactionsPerformed);
+                debugLog(chalk.cyan(`${h} timedOutRequestCount = `), this._timedOutRequestCount);
             }
         }
     }
@@ -1470,7 +1467,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         const sessions = [...this._sessions];
         const closeAll = async () => {
             for (const session of sessions) {
-                (0, node_opcua_assert_1.assert)(session._client === this);
+                assert(session._client === this);
                 await new Promise((resolve) => {
                     let resolved = false;
                     session.close((err) => {
@@ -1497,13 +1494,13 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
                         .map((s) => (s.authenticationToken ? s.authenticationToken.toString() : ""))
                         .join(" "));
             }
-            (0, node_opcua_assert_1.assert)(this._sessions.length === 0, " failed to disconnect exiting sessions ");
+            assert(this._sessions.length === 0, " failed to disconnect exiting sessions ");
             callback();
         })
             .catch((err) => callback(err));
     }
     _install_secure_channel_event_handlers(secureChannel) {
-        (0, node_opcua_assert_1.assert)(this instanceof ClientBaseImpl);
+        assert(this instanceof ClientBaseImpl);
         secureChannel.on("send_chunk", (chunk) => {
             /**
              * notify the observer that a message_chunk has been sent
@@ -1553,7 +1550,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
                 this._setInternalState("panic");
             }
             // c8 ignore next
-            doDebug && debugLog(chalk_1.default.yellow.bold(" ClientBaseImpl emitting close"), err?.message);
+            doDebug && debugLog(chalk.yellow.bold(" ClientBaseImpl emitting close"), err?.message);
             this._destroy_secure_channel();
             if (!err || !this.reconnectOnFailure) {
                 if (err) {
@@ -1661,13 +1658,13 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
                         // c8 ignore next
                         if (doDebug) {
                             debugLog("Disconnected following reconnection failure", err2.message);
-                            debugLog(`I will retry OPCUA client reconnection in ${client_base_js_1.OPCUAClientBase.retryDelay / 1000} seconds`);
+                            debugLog(`I will retry OPCUA client reconnection in ${OPCUAClientBase.retryDelay / 1000} seconds`);
                         }
                         this.#insideRepairConnection = false;
                         this.#shouldRepairAgain = false;
                         this._destroy_secure_channel();
                         // this._setInternalState("reconnecting_failed");
-                        setTimeout(() => this._repairConnection(), client_base_js_1.OPCUAClientBase.retryDelay);
+                        setTimeout(() => this._repairConnection(), OPCUAClientBase.retryDelay);
                         return;
                     }
                     else {
@@ -1687,7 +1684,7 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
     _finalReconnectionStep(callback) {
         // now delegate to upper class the
         if (this._on_connection_reestablished) {
-            (0, node_opcua_assert_1.assert)(typeof this._on_connection_reestablished === "function");
+            assert(typeof this._on_connection_reestablished === "function");
             this._on_connection_reestablished((err2) => {
                 callback(err2);
             });
@@ -1708,7 +1705,6 @@ class ClientBaseImpl extends node_opcua_common_1.OPCUASecureObject {
         throw new Error("Please override");
     }
 }
-exports.ClientBaseImpl = ClientBaseImpl;
 class TmpClient extends ClientBaseImpl {
     constructor(options) {
         options.clientName = `${options.clientName || ""}_TmpClient`;
@@ -1732,14 +1728,14 @@ class TmpClient extends ClientBaseImpl {
         });
     }
 }
-const thenify_ex_1 = require("thenify-ex");
-ClientBaseImpl.prototype.connect = (0, thenify_ex_1.withCallback)(ClientBaseImpl.prototype.connect);
-ClientBaseImpl.prototype.connectReverse = (0, thenify_ex_1.withCallback)(ClientBaseImpl.prototype.connectReverse);
-ClientBaseImpl.prototype.disconnect = (0, thenify_ex_1.withCallback)(ClientBaseImpl.prototype.disconnect);
-ClientBaseImpl.prototype.getEndpoints = (0, thenify_ex_1.withCallback)(ClientBaseImpl.prototype.getEndpoints);
-ClientBaseImpl.prototype.findServers = (0, thenify_ex_1.withCallback)(ClientBaseImpl.prototype.findServers);
-ClientBaseImpl.prototype.findServersOnNetwork = (0, thenify_ex_1.withCallback)(ClientBaseImpl.prototype.findServersOnNetwork);
-client_base_js_1.OPCUAClientBase.create = (options) => {
+import { withCallback } from "thenify-ex";
+ClientBaseImpl.prototype.connect = withCallback(ClientBaseImpl.prototype.connect);
+ClientBaseImpl.prototype.connectReverse = withCallback(ClientBaseImpl.prototype.connectReverse);
+ClientBaseImpl.prototype.disconnect = withCallback(ClientBaseImpl.prototype.disconnect);
+ClientBaseImpl.prototype.getEndpoints = withCallback(ClientBaseImpl.prototype.getEndpoints);
+ClientBaseImpl.prototype.findServers = withCallback(ClientBaseImpl.prototype.findServers);
+ClientBaseImpl.prototype.findServersOnNetwork = withCallback(ClientBaseImpl.prototype.findServersOnNetwork);
+OPCUAClientBase.create = (options) => {
     return new ClientBaseImpl(options);
 };
 //# sourceMappingURL=client_base_impl.js.map