node-opcua-client 2.183.1 → 2.184.0

package/dist/private/opcua_client_impl.js

@@ -1,36 +1,30 @@
-"use strict";
 /**
  * @module node-opcua-client-private
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OPCUAClientImpl = void 0;
-const node_crypto_1 = require("node:crypto");
-const node_util_1 = require("node:util");
-const chalk_1 = __importDefault(require("chalk"));
-const node_opcua_assert_1 = require("node-opcua-assert");
-const node_opcua_client_dynamic_extension_object_1 = require("node-opcua-client-dynamic-extension-object");
-const web_1 = require("node-opcua-crypto/web");
-const node_opcua_data_model_1 = require("node-opcua-data-model");
-const node_opcua_debug_1 = require("node-opcua-debug");
-const node_opcua_hostname_1 = require("node-opcua-hostname");
-const node_opcua_pseudo_session_1 = require("node-opcua-pseudo-session");
-const node_opcua_secure_channel_1 = require("node-opcua-secure-channel");
-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 opcua_client_js_1 = require("../opcua_client.js");
-const client_base_impl_js_1 = require("./client_base_impl.js");
-const client_session_impl_js_1 = require("./client_session_impl.js");
-const reconnection_js_1 = require("./reconnection/reconnection.js");
-const doDebug = (0, node_opcua_debug_1.checkDebugFlag)("opcua_client_impl");
-const debugLog = (0, node_opcua_debug_1.make_debugLog)("opcua_client_impl");
-const errorLog = (0, node_opcua_debug_1.make_errorLog)("opcua_client_impl");
-const warningLog = (0, node_opcua_debug_1.make_warningLog)("opcua_client_impl");
+import { createPublicKey } from "node:crypto";
+import { callbackify } from "node:util";
+import chalk from "chalk";
+import { assert } from "node-opcua-assert";
+import { DataTypeExtractStrategy } from "node-opcua-client-dynamic-extension-object";
+import { combine_der, exploreCertificate, extractPublicKeyFromCertificateSync, makePrivateKeyFromPem, toPem } from "node-opcua-crypto/web";
+import { LocalizedText } from "node-opcua-data-model";
+import { checkDebugFlag, make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug";
+import { extractFullyQualifiedDomainName } from "node-opcua-hostname";
+import { readNamespaceArray } from "node-opcua-pseudo-session";
+import { computeSignatureAsync, fromURI, getCryptoFactory, SecurityPolicy } from "node-opcua-secure-channel";
+import { ApplicationType, EndpointDescription, UserTokenType } from "node-opcua-service-endpoints";
+import { MessageSecurityMode } from "node-opcua-service-secure-channel";
+import { ActivateSessionRequest, ActivateSessionResponse, AnonymousIdentityToken, CreateSessionRequest, CreateSessionResponse, UserNameIdentityToken, X509IdentityToken } from "node-opcua-service-session";
+import { StatusCodes } from "node-opcua-status-code";
+import { isNullOrUndefined, matchUri, randomBytes } from "node-opcua-utils";
+import { OPCUAClient } from "../opcua_client.js";
+import { ClientBaseImpl } from "./client_base_impl.js";
+import { ClientSessionImpl } from "./client_session_impl.js";
+import { repair_client_sessions } from "./reconnection/reconnection.js";
+const doDebug = checkDebugFlag("opcua_client_impl");
+const debugLog = make_debugLog("opcua_client_impl");
+const errorLog = make_errorLog("opcua_client_impl");
+const warningLog = make_warningLog("opcua_client_impl");
 let x509PemPrivateKeyWarningEmitted = false;
 function warnOnceAboutX509PemPrivateKey() {
     if (x509PemPrivateKeyWarningEmitted) {
@@ -61,21 +55,21 @@ function verifyEndpointDescriptionMatches(_client, _responseServerEndpoints) {
     return true;
 }
 const hasDeprecatedSecurityPolicy = (userIdentity) => {
-    return (userIdentity.securityPolicyUri === node_opcua_secure_channel_1.SecurityPolicy.Basic128Rsa15 ||
-        userIdentity.securityPolicyUri === node_opcua_secure_channel_1.SecurityPolicy.Basic128);
+    return (userIdentity.securityPolicyUri === SecurityPolicy.Basic128Rsa15 ||
+        userIdentity.securityPolicyUri === SecurityPolicy.Basic128);
 };
 const ordered = [
     // obsolete
-    node_opcua_secure_channel_1.SecurityPolicy.Basic128Rsa15,
-    node_opcua_secure_channel_1.SecurityPolicy.Basic192Rsa15,
-    node_opcua_secure_channel_1.SecurityPolicy.Basic256,
-    node_opcua_secure_channel_1.SecurityPolicy.None,
-    node_opcua_secure_channel_1.SecurityPolicy.Basic128,
-    node_opcua_secure_channel_1.SecurityPolicy.Basic192,
-    node_opcua_secure_channel_1.SecurityPolicy.Basic256Rsa15,
-    node_opcua_secure_channel_1.SecurityPolicy.Basic256Sha256,
-    node_opcua_secure_channel_1.SecurityPolicy.Aes128_Sha256_RsaOaep,
-    node_opcua_secure_channel_1.SecurityPolicy.Aes256_Sha256_RsaPss
+    SecurityPolicy.Basic128Rsa15,
+    SecurityPolicy.Basic192Rsa15,
+    SecurityPolicy.Basic256,
+    SecurityPolicy.None,
+    SecurityPolicy.Basic128,
+    SecurityPolicy.Basic192,
+    SecurityPolicy.Basic256Rsa15,
+    SecurityPolicy.Basic256Sha256,
+    SecurityPolicy.Aes128_Sha256_RsaOaep,
+    SecurityPolicy.Aes256_Sha256_RsaPss
 ];
 const _compareSecurityPolicy = (a, b) => {
     if (a === b) {
@@ -108,9 +102,9 @@ function findUserTokenPolicy(endpointDescription, userTokenType) {
         r = r.filter((userIdentity) => !hasDeprecatedSecurityPolicy(userIdentity));
     }
     if (r.length > 1) {
-        if (endpointDescription.securityMode === node_opcua_service_secure_channel_1.MessageSecurityMode.SignAndEncrypt) {
+        if (endpointDescription.securityMode === MessageSecurityMode.SignAndEncrypt) {
             // no encryption will do if available
-            const unencrypted = r.find((userIdentity) => userIdentity.securityPolicyUri === node_opcua_secure_channel_1.SecurityPolicy.None || !userIdentity.securityPolicyUri);
+            const unencrypted = r.find((userIdentity) => userIdentity.securityPolicyUri === SecurityPolicy.None || !userIdentity.securityPolicyUri);
             if (unencrypted)
                 return unencrypted;
         }
@@ -121,11 +115,11 @@ function findUserTokenPolicy(endpointDescription, userTokenType) {
 }
 function createAnonymousIdentityToken(context) {
     const endpoint = context.endpoint;
-    const userTokenPolicy = findUserTokenPolicy(endpoint, node_opcua_service_endpoints_1.UserTokenType.Anonymous);
+    const userTokenPolicy = findUserTokenPolicy(endpoint, UserTokenType.Anonymous);
     if (!userTokenPolicy) {
         throw new Error("Cannot find ANONYMOUS user token policy in end point description");
     }
-    return new node_opcua_service_session_1.AnonymousIdentityToken({ policyId: userTokenPolicy.policyId });
+    return new AnonymousIdentityToken({ policyId: userTokenPolicy.policyId });
 }
 /**
  *
@@ -136,28 +130,28 @@ function createAnonymousIdentityToken(context) {
  */
 async function createX509IdentityToken(context, certificate, userKey) {
     const endpoint = context.endpoint;
-    (0, node_opcua_assert_1.assert)(endpoint instanceof node_opcua_service_endpoints_1.EndpointDescription);
-    const userTokenPolicy = findUserTokenPolicy(endpoint, node_opcua_service_endpoints_1.UserTokenType.Certificate);
-    // c8 ignore next
+    assert(endpoint instanceof EndpointDescription);
+    const userTokenPolicy = findUserTokenPolicy(endpoint, UserTokenType.Certificate);
+    /* c8 ignore next */
     if (!userTokenPolicy) {
         throw new Error("Cannot find Certificate (X509) user token policy in end point description");
     }
-    let securityPolicy = (0, node_opcua_secure_channel_1.fromURI)(userTokenPolicy.securityPolicyUri);
+    let securityPolicy = fromURI(userTokenPolicy.securityPolicyUri);
     // if the security policy is not specified we use the session security policy
-    if (securityPolicy === node_opcua_secure_channel_1.SecurityPolicy.Invalid) {
+    if (securityPolicy === SecurityPolicy.Invalid) {
         securityPolicy = context.securityPolicy;
     }
-    const userIdentityToken = new node_opcua_service_session_1.X509IdentityToken({
+    const userIdentityToken = new X509IdentityToken({
         certificateData: certificate,
         policyId: userTokenPolicy.policyId
     });
     const serverCertificate = context.serverCertificate;
-    (0, node_opcua_assert_1.assert)(serverCertificate instanceof Buffer);
+    assert(serverCertificate instanceof Buffer);
     const serverNonce = context.serverNonce || Buffer.alloc(0);
-    (0, node_opcua_assert_1.assert)(serverNonce instanceof Buffer);
+    assert(serverNonce instanceof Buffer);
     // see Release 1.02 155 OPC Unified Architecture, Part 4
-    const cryptoFactory = (0, node_opcua_secure_channel_1.getCryptoFactory)(securityPolicy);
-    // c8 ignore next
+    const cryptoFactory = getCryptoFactory(securityPolicy);
+    /* c8 ignore next */
     if (!cryptoFactory) {
         throw new Error(" Unsupported security Policy");
     }
@@ -192,15 +186,15 @@ async function createX509IdentityToken(context, certificate, userKey) {
     // The data to sign is created by appending the last serverNonce to the serverCertificate
     // The signature generated with the key associated with the User Certificate —
     // possibly produced inside an HSM/smartcard, when the user supplied keyOperations
-    const userTokenSignature = (await (0, node_opcua_secure_channel_1.computeSignatureAsync)(serverCertificate, serverNonce, userKey, securityPolicy));
+    const userTokenSignature = (await computeSignatureAsync(serverCertificate, serverNonce, userKey, securityPolicy));
     return { userIdentityToken, userTokenSignature };
 }
 function createUserNameIdentityToken(session, userName, password) {
     // assert(endpoint instanceof EndpointDescription);
-    (0, node_opcua_assert_1.assert)(userName === null || typeof userName === "string");
-    (0, node_opcua_assert_1.assert)(password === null || typeof password === "string");
+    assert(userName === null || typeof userName === "string");
+    assert(password === null || typeof password === "string");
     const endpoint = session.endpoint;
-    (0, node_opcua_assert_1.assert)(endpoint instanceof node_opcua_service_endpoints_1.EndpointDescription);
+    assert(endpoint instanceof EndpointDescription);
     /**
      * OPC Unified Architecture 1.0.4:  Part 4 155
      * Each UserIdentityToken allowed by an Endpoint shall have a UserTokenPolicy specified in the
@@ -210,21 +204,21 @@ function createUserNameIdentityToken(session, userName, password) {
      * is required.
      *
      */
-    const userTokenPolicy = findUserTokenPolicy(endpoint, node_opcua_service_endpoints_1.UserTokenType.UserName);
-    // c8 ignore next
+    const userTokenPolicy = findUserTokenPolicy(endpoint, UserTokenType.UserName);
+    /* c8 ignore next */
     if (!userTokenPolicy) {
         throw new Error("Cannot find USERNAME user token policy in end point description");
     }
-    let securityPolicy = (0, node_opcua_secure_channel_1.fromURI)(userTokenPolicy.securityPolicyUri);
+    let securityPolicy = fromURI(userTokenPolicy.securityPolicyUri);
     // if the security policy is not specified we use the session security policy
-    if (securityPolicy === node_opcua_secure_channel_1.SecurityPolicy.Invalid) {
+    if (securityPolicy === SecurityPolicy.Invalid) {
         securityPolicy = session.securityPolicy;
     }
     let identityToken;
     let serverCertificate = session.serverCertificate;
     // if server does not provide certificate use unencrypted password
     if (!serverCertificate || serverCertificate.length === 0) {
-        identityToken = new node_opcua_service_session_1.UserNameIdentityToken({
+        identityToken = new UserNameIdentityToken({
             encryptionAlgorithm: null,
             password: Buffer.from(password, "utf-8"),
             policyId: userTokenPolicy.policyId,
@@ -232,19 +226,19 @@ function createUserNameIdentityToken(session, userName, password) {
         });
         return identityToken;
     }
-    (0, node_opcua_assert_1.assert)(serverCertificate instanceof Buffer);
-    serverCertificate = (0, web_1.toPem)(serverCertificate, "CERTIFICATE");
-    const publicKey = (0, node_crypto_1.createPublicKey)((0, web_1.extractPublicKeyFromCertificateSync)(serverCertificate));
+    assert(serverCertificate instanceof Buffer);
+    serverCertificate = toPem(serverCertificate, "CERTIFICATE");
+    const publicKey = createPublicKey(extractPublicKeyFromCertificateSync(serverCertificate));
     const serverNonce = session.serverNonce || Buffer.alloc(0);
-    (0, node_opcua_assert_1.assert)(serverNonce instanceof Buffer);
+    assert(serverNonce instanceof Buffer);
     // If None is specified for the UserTokenPolicy and SecurityPolicy is None
     // then the password only contains the UTF-8 encoded password.
     // note: this means that password is sent in clear text to the server
     // note: OPCUA specification discourages use of unencrypted password
     //       but some old OPCUA server may only provide this policy and we
     //       still have to support in the client?
-    if (securityPolicy === node_opcua_secure_channel_1.SecurityPolicy.None) {
-        identityToken = new node_opcua_service_session_1.UserNameIdentityToken({
+    if (securityPolicy === SecurityPolicy.None) {
+        identityToken = new UserNameIdentityToken({
             encryptionAlgorithm: null,
             password: Buffer.from(password, "utf-8"),
             policyId: userTokenPolicy.policyId,
@@ -253,12 +247,12 @@ function createUserNameIdentityToken(session, userName, password) {
         return identityToken;
     }
     // see Release 1.02 155 OPC Unified Architecture, Part 4
-    const cryptoFactory = (0, node_opcua_secure_channel_1.getCryptoFactory)(securityPolicy);
-    // c8 ignore next
+    const cryptoFactory = getCryptoFactory(securityPolicy);
+    /* c8 ignore next */
     if (!cryptoFactory) {
         throw new Error(` Unsupported security Policy ${securityPolicy.toString()}`);
     }
-    identityToken = new node_opcua_service_session_1.UserNameIdentityToken({
+    identityToken = new UserNameIdentityToken({
         encryptionAlgorithm: cryptoFactory.asymmetricEncryptionAlgorithm,
         password: Buffer.from(password, "utf-8"),
         policyId: userTokenPolicy.policyId,
@@ -285,7 +279,7 @@ function _adjustRevisedSessionTimeout(revisedSessionTimeout, requestedTimeout) {
     }
     return revisedSessionTimeout;
 }
-class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
+export class OPCUAClientImpl extends ClientBaseImpl {
     static minimumRevisedSessionTimeout = 100.0;
     _retryCreateSessionTimer;
     static create(options) {
@@ -301,7 +295,7 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
     constructor(options) {
         options = options || {};
         super(options);
-        this.dataTypeExtractStrategy = options.dataTypeExtractStrategy || node_opcua_client_dynamic_extension_object_1.DataTypeExtractStrategy.Auto;
+        this.dataTypeExtractStrategy = options.dataTypeExtractStrategy || DataTypeExtractStrategy.Auto;
         // @property endpointMustExist {Boolean}
         // if set to true , create Session will only accept connection from server which endpoint_url has been reported
         // by GetEndpointsRequest.
@@ -313,7 +307,7 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
             warningLog("Warning: endpoint_must_exist is now deprecated, use endpointMustExist instead");
             options.endpointMustExist = options.endpoint_must_exist;
         }
-        this.endpointMustExist = (0, node_opcua_utils_1.isNullOrUndefined)(options.endpointMustExist) ? true : !!options.endpointMustExist;
+        this.endpointMustExist = isNullOrUndefined(options.endpointMustExist) ? true : !!options.endpointMustExist;
         this.requestedSessionTimeout = options.requestedSessionTimeout || 60000; // 1 minute
         this.___sessionName_counter = 0;
         this.endpoint = undefined;
@@ -326,11 +320,11 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
     // biome-ignore lint/suspicious/noExplicitAny: overload implementation
     createSession(...args) {
         if (args.length === 1) {
-            return this.createSession({ type: node_opcua_service_endpoints_1.UserTokenType.Anonymous }, args[0]);
+            return this.createSession({ type: UserTokenType.Anonymous }, args[0]);
         }
-        const userIdentityInfo = args[0] || { type: node_opcua_service_endpoints_1.UserTokenType.Anonymous };
+        const userIdentityInfo = args[0] || { type: UserTokenType.Anonymous };
         const callback = args[1];
-        (0, node_opcua_assert_1.assert)(typeof callback === "function");
+        assert(typeof callback === "function");
         this._createSession((err, session) => {
             if (err) {
                 callback(err);
@@ -363,7 +357,7 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
     // biome-ignore lint/suspicious/noExplicitAny: overload implementation
     createSession2(...args) {
         if (args.length === 1) {
-            return this.createSession2({ type: node_opcua_service_endpoints_1.UserTokenType.Anonymous }, args[0]);
+            return this.createSession2({ type: UserTokenType.Anonymous }, args[0]);
         }
         const userIdentityInfo = args[0];
         const callback = args[1];
@@ -393,7 +387,7 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
         const session = args[0];
         const userIdentityInfo = args[1];
         const callback = args[2];
-        (0, node_opcua_assert_1.assert)(typeof callback === "function");
+        assert(typeof callback === "function");
         session.changeUser(userIdentityInfo, callback);
     }
     closeSession(session, deleteSubscriptions, callback) {
@@ -412,7 +406,7 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
         };
     }
     toString() {
-        let str = client_base_impl_js_1.ClientBaseImpl.prototype.toString.call(this);
+        let str = ClientBaseImpl.prototype.toString.call(this);
         str += `  requestedSessionTimeout....... ${this.requestedSessionTimeout}\n`;
         str += `  endpointUrl................... ${this.endpointUrl}\n`;
         str += `  serverUri..................... ${this.serverUri}\n`;
@@ -442,13 +436,13 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
      * const create
      */
     static async createSession(endpointUrl, userIdentity, clientOptions) {
-        const client = opcua_client_js_1.OPCUAClient.create(clientOptions || {});
+        const client = OPCUAClient.create(clientOptions || {});
         await client.connect(endpointUrl);
         const session = await client.createSession2(userIdentity);
         // biome-ignore lint/suspicious/noExplicitAny: monkey patch close
         const oldClose = session.close;
         // biome-ignore lint/suspicious/noExplicitAny: monkey patch close
-        session.close = (0, thenify_ex_1.withCallback)((...args) => {
+        session.close = withCallback((...args) => {
             if (args.length === 1) {
                 return session.close(true, args[0]);
             }
@@ -470,10 +464,10 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
      * @returns
      */
     async withSessionAsync(connectionPoint, func) {
-        (0, node_opcua_assert_1.assert)(typeof func === "function");
-        (0, node_opcua_assert_1.assert)(func.length === 1, "expecting a single argument in func");
+        assert(typeof func === "function");
+        assert(func.length === 1, "expecting a single argument in func");
         const endpointUrl = typeof connectionPoint === "string" ? connectionPoint : connectionPoint.endpointUrl;
-        const userIdentity = typeof connectionPoint === "string" ? { type: node_opcua_service_endpoints_1.UserTokenType.Anonymous } : connectionPoint.userIdentity;
+        const userIdentity = typeof connectionPoint === "string" ? { type: UserTokenType.Anonymous } : connectionPoint.userIdentity;
         this.on("backoff", (count, delay) => {
             warningLog("cannot connect to ", endpointUrl, `attempt #${count}`, " retrying in ", delay);
         });
@@ -482,7 +476,7 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
             const session = await this.createSession2(userIdentity);
             let result;
             // always need this
-            await (0, node_opcua_pseudo_session_1.readNamespaceArray)(session);
+            await readNamespaceArray(session);
             try {
                 result = await func(session);
                 return result;
@@ -505,7 +499,7 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
     }
     async withSubscriptionAsync(connectionPoint, parameters, func) {
         return await this.withSessionAsync(connectionPoint, async (session) => {
-            (0, node_opcua_assert_1.assert)(session, " session must exist");
+            assert(session, " session must exist");
             const client1 = this;
             if (client1.beforeSubscriptionRecreate) {
                 await client1.beforeSubscriptionRecreate(session);
@@ -527,7 +521,7 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
     // biome-ignore lint/suspicious/noExplicitAny: overload implementation
     reactivateSession(session, callback) {
         const internalSession = session;
-        (0, node_opcua_assert_1.assert)(typeof callback === "function");
+        assert(typeof callback === "function");
         if (!this._secureChannel) {
             return callback?.(new Error(" client must be connected first"));
         }
@@ -536,11 +530,11 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
             return callback?.(new Error(" End point must exist " +
                 this._secureChannel?.endpointUrl +
                 "  securityMode = " +
-                node_opcua_service_secure_channel_1.MessageSecurityMode[this.securityMode] +
+                MessageSecurityMode[this.securityMode] +
                 "  securityPolicy = " +
                 this.securityPolicy));
         }
-        (0, node_opcua_assert_1.assert)(!internalSession._client || (0, node_opcua_utils_1.matchUri)(internalSession._client.endpointUrl, this.endpointUrl), "cannot reactivateSession on a different endpoint");
+        assert(!internalSession._client || matchUri(internalSession._client.endpointUrl, this.endpointUrl), "cannot reactivateSession on a different endpoint");
         const old_client = internalSession._client;
         // c8 ignore next
         doDebug && debugLog("OPCUAClientImpl#reactivateSession");
@@ -550,19 +544,19 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
                     // remove session from old client:
                     if (old_client) {
                         old_client._removeSession(internalSession);
-                        (0, node_opcua_assert_1.assert)(old_client._sessions.indexOf(internalSession) === -1);
+                        assert(old_client._sessions.indexOf(internalSession) === -1);
                     }
                     this._addSession(internalSession);
-                    (0, node_opcua_assert_1.assert)(internalSession._client === this);
-                    (0, node_opcua_assert_1.assert)(!internalSession._closed, "session should not vbe closed");
-                    (0, node_opcua_assert_1.assert)(this._sessions.indexOf(internalSession) !== -1);
+                    assert(internalSession._client === this);
+                    assert(!internalSession._closed, "session should not vbe closed");
+                    assert(this._sessions.indexOf(internalSession) !== -1);
                 }
                 callback?.();
             }
             else {
                 // c8 ignore next
                 if (doDebug) {
-                    debugLog(chalk_1.default.red.bgWhite("reactivateSession has failed !"), err.message);
+                    debugLog(chalk.red.bgWhite("reactivateSession has failed !"), err.message);
                 }
                 callback?.(err);
             }
@@ -574,7 +568,7 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
      */
     _on_connection_reestablished(callback) {
         super._on_connection_reestablished(( /*err?: Error*/) => {
-            (0, reconnection_js_1.repair_client_sessions)(this, callback);
+            repair_client_sessions(this, callback);
         });
     }
     /**
@@ -583,10 +577,10 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
      * @private
      */
     #createSession_step3(session, callback) {
-        (0, node_opcua_assert_1.assert)(typeof callback === "function");
-        (0, node_opcua_assert_1.assert)(this.serverUri !== undefined, ` must have a valid server URI ${this.serverUri}`);
-        (0, node_opcua_assert_1.assert)(this.endpointUrl !== undefined, " must have a valid server endpointUrl");
-        (0, node_opcua_assert_1.assert)(this.endpoint);
+        assert(typeof callback === "function");
+        assert(this.serverUri !== undefined, ` must have a valid server URI ${this.serverUri}`);
+        assert(this.endpointUrl !== undefined, " must have a valid server endpointUrl");
+        assert(this.endpoint);
         // c8 ignore next
         if (!this._secureChannel) {
             callback(new Error("Invalid channel"));
@@ -594,8 +588,8 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
         }
         const applicationUri = this._getApplicationUri();
         const applicationDescription = {
-            applicationName: new node_opcua_data_model_1.LocalizedText({ text: this.applicationName, locale: null }),
-            applicationType: node_opcua_service_endpoints_1.ApplicationType.Client,
+            applicationName: new LocalizedText({ text: this.applicationName, locale: null }),
+            applicationType: ApplicationType.Client,
             applicationUri,
             discoveryProfileUri: undefined,
             discoveryUrls: [],
@@ -604,10 +598,10 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
         };
         // note : do not confuse CreateSessionRequest.clientNonce with OpenSecureChannelRequest.clientNonce
         //        which are two different nonce, with different size (although they share the same name )
-        this.clientNonce = (0, node_opcua_utils_1.randomBytes)(32);
+        this.clientNonce = randomBytes(32);
         // recycle session name if already exists
         const sessionName = session.name;
-        const request = new node_opcua_service_session_1.CreateSessionRequest({
+        const request = new CreateSessionRequest({
             clientCertificate: this.getCertificate(),
             clientDescription: applicationDescription,
             clientNonce: this.clientNonce,
@@ -618,7 +612,7 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
             sessionName
         });
         // a client Nonce must be provided if security mode is set
-        (0, node_opcua_assert_1.assert)(this._secureChannel.securityMode === node_opcua_service_secure_channel_1.MessageSecurityMode.None || request.clientNonce !== null);
+        assert(this._secureChannel.securityMode === MessageSecurityMode.None || request.clientNonce !== null);
         this.performMessageTransaction(request, (err, response) => {
             /* c8 ignore next */
             if (err) {
@@ -634,13 +628,13 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
                 //                 return;
             }
             /* c8 ignore next */
-            if (!response || !(response instanceof node_opcua_service_session_1.CreateSessionResponse)) {
+            if (!response || !(response instanceof CreateSessionResponse)) {
                 return callback(new Error("internal error"));
             }
-            if (response.responseHeader.serviceResult === node_opcua_status_code_1.StatusCodes.BadTooManySessions) {
+            if (response.responseHeader.serviceResult === StatusCodes.BadTooManySessions) {
                 return callback(new Error(response.responseHeader.serviceResult.toString()));
             }
-            if (response.responseHeader.serviceResult !== node_opcua_status_code_1.StatusCodes.Good) {
+            if (response.responseHeader.serviceResult !== StatusCodes.Good) {
                 err = new Error(`Error ${response.responseHeader.serviceResult.name} ${response.responseHeader.serviceResult.description}`);
                 return callback(err);
             }
@@ -676,7 +670,7 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
      * @private
      */
     __createSession_step2(session, callback) {
-        (0, node_util_1.callbackify)(node_opcua_hostname_1.extractFullyQualifiedDomainName)(() => {
+        callbackify(extractFullyQualifiedDomainName)(() => {
             this.#createSession_step3(session, callback);
         });
     }
@@ -686,7 +680,7 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
      */
     _activateSession(session, userIdentityInfo, callback) {
         // see OPCUA Part 4 - $7.35
-        (0, node_opcua_assert_1.assert)(typeof callback === "function");
+        assert(typeof callback === "function");
         // c8 ignore next
         if (!this._secureChannel) {
             callback(new Error(" No secure channel"));
@@ -709,9 +703,9 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
         const serverCertificate = session.serverCertificate;
         // If the securityPolicyUri is None and none of the UserTokenPolicies requires encryption,
         // the Client shall ignore the ApplicationInstanceCertificate (serverCertificate)
-        (0, node_opcua_assert_1.assert)(serverCertificate === null || serverCertificate instanceof Buffer);
+        assert(serverCertificate === null || serverCertificate instanceof Buffer);
         const serverNonce = session.serverNonce;
-        (0, node_opcua_assert_1.assert)(!serverNonce || serverNonce instanceof Buffer);
+        assert(!serverNonce || serverNonce instanceof Buffer);
         // make sure session is attached to this client
         const _old_client = session._client;
         session._client = this;
@@ -743,7 +737,7 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
             const userTokenSignature = data.userTokenSignature;
             // TODO. fill the ActivateSessionRequest
             // see 5.6.3.2 Parameters OPC Unified Architecture, Part 4 30 Release 1.02
-            const request = new node_opcua_service_session_1.ActivateSessionRequest({
+            const request = new ActivateSessionRequest({
                 // This is a signature generated with the private key associated with the
                 // clientCertificate. The SignatureAlgorithm shall be the AsymmetricSignatureAlgorithm
                 // specified in the SecurityPolicy for the Endpoint. The SignatureData type is defined in 7.30.
@@ -791,7 +785,7 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
                 session.noteServerAnswer(err1, response);
                 if (!err1 && response && response.responseHeader.serviceResult.isGoodish()) {
                     /* c8 ignore next */
-                    if (!(response instanceof node_opcua_service_session_1.ActivateSessionResponse)) {
+                    if (!(response instanceof ActivateSessionResponse)) {
                         return callback(new Error("Internal Error"));
                     }
                     if (!validateServerNonce(response.serverNonce)) {
@@ -832,7 +826,7 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
         if (!current || current.length === 0) {
             return;
         }
-        const currentDer = Array.isArray(current) ? (0, web_1.combine_der)(current) : current;
+        const currentDer = Array.isArray(current) ? combine_der(current) : current;
         if (session.serverCertificate?.equals(currentDer)) {
             return;
         }
@@ -859,13 +853,13 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
         const certificate = this.getCertificate();
         let applicationUri;
         if (certificate) {
-            const e = (0, web_1.exploreCertificate)(certificate);
+            const e = exploreCertificate(certificate);
             if (e.tbsCertificate.extensions?.subjectAltName?.uniformResourceIdentifier) {
                 applicationUri = e.tbsCertificate.extensions.subjectAltName.uniformResourceIdentifier[0];
             }
             else {
                 errorLog("Certificate has no extensions.subjectAltName.uniformResourceIdentifier, ");
-                errorLog((0, web_1.toPem)(certificate, "CERTIFICATE"));
+                errorLog(toPem(certificate, "CERTIFICATE"));
                 applicationUri = this._getBuiltApplicationUri();
             }
         }
@@ -879,7 +873,7 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
      * @private
      */
     __resolveEndPoint() {
-        this.securityPolicy = this.securityPolicy || node_opcua_secure_channel_1.SecurityPolicy.None;
+        this.securityPolicy = this.securityPolicy || SecurityPolicy.None;
         let endpoint = this.findEndpoint(this._secureChannel?.endpointUrl || "", this.securityMode, this.securityPolicy);
         this.endpoint = endpoint;
         // this is explained here : see OPCUA Part 4 Version 1.02 $5.4.1 page 12:
@@ -889,7 +883,7 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
         if (!this.endpoint) {
             if (this.endpointMustExist) {
                 warningLog("OPCUAClientImpl#endpointMustExist = true and endpoint with url ", this._secureChannel?.endpointUrl, " cannot be found");
-                const infos = this._serverEndpoints.map((endpoint) => `${endpoint.endpointUrl} ${node_opcua_service_secure_channel_1.MessageSecurityMode[endpoint.securityMode]}, ${endpoint.securityPolicyUri} `);
+                const infos = this._serverEndpoints.map((endpoint) => `${endpoint.endpointUrl} ${MessageSecurityMode[endpoint.securityMode]}, ${endpoint.securityPolicyUri} `);
                 warningLog("Valid endpoints are ");
                 warningLog(`   ${infos.join("\n   ")}`);
                 return false;
@@ -913,31 +907,31 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
      * @private
      */
     _createSession(callback) {
-        (0, node_opcua_assert_1.assert)(typeof callback === "function");
-        (0, node_opcua_assert_1.assert)(this._secureChannel);
+        assert(typeof callback === "function");
+        assert(this._secureChannel);
         if (!this.__resolveEndPoint() || !this.endpoint) {
             /* c8 ignore next */
             if (this._serverEndpoints) {
                 warningLog("server endpoints =", this._serverEndpoints
                     .map((endpoint) => endpoint.endpointUrl +
                     " " +
-                    node_opcua_service_secure_channel_1.MessageSecurityMode[endpoint.securityMode] +
+                    MessageSecurityMode[endpoint.securityMode] +
                     " " +
                     endpoint.securityPolicyUri +
                     " " +
-                    endpoint.userIdentityTokens?.map((u) => node_opcua_service_endpoints_1.UserTokenType[u.tokenType]).join(","))
+                    endpoint.userIdentityTokens?.map((u) => UserTokenType[u.tokenType]).join(","))
                     .join("\n"));
             }
             return callback(new Error(" End point must exist " +
                 this._secureChannel?.endpointUrl +
                 "  securityMode = " +
-                node_opcua_service_secure_channel_1.MessageSecurityMode[this.securityMode] +
+                MessageSecurityMode[this.securityMode] +
                 "  securityPolicy = " +
                 this.securityPolicy));
         }
         this.serverUri = this.endpoint.server.applicationUri || "invalid application uri";
         this.endpointUrl = this._secureChannel?.endpointUrl || "";
-        const session = new client_session_impl_js_1.ClientSessionImpl(this);
+        const session = new ClientSessionImpl(this);
         session.name = this._nextSessionName();
         this.__createSession_step2(session, callback);
     }
@@ -948,7 +942,7 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
     computeClientSignature(channel, serverCertificate, serverNonce) {
         // through the opaque key-operations path: works whether the client's
         // application instance key is local or HSM/KMS-held
-        return (0, node_opcua_secure_channel_1.computeSignatureAsync)(serverCertificate, serverNonce || Buffer.alloc(0), this.getKeyOperations(), channel.securityPolicy);
+        return computeSignatureAsync(serverCertificate, serverNonce || Buffer.alloc(0), this.getKeyOperations(), channel.securityPolicy);
     }
     /**
      *
@@ -958,24 +952,24 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
         // biome-ignore lint/suspicious/noExplicitAny: user provided object that needs soft type coercion
         function coerceUserIdentityInfo(identityInfo) {
             if (!identityInfo) {
-                return { type: node_opcua_service_endpoints_1.UserTokenType.Anonymous };
+                return { type: UserTokenType.Anonymous };
             }
             if (Object.hasOwn(identityInfo, "type")) {
                 return identityInfo;
             }
             if (Object.hasOwn(identityInfo, "userName")) {
-                identityInfo.type = node_opcua_service_endpoints_1.UserTokenType.UserName;
+                identityInfo.type = UserTokenType.UserName;
                 return identityInfo;
             }
             if (Object.hasOwn(identityInfo, "certificateData")) {
-                identityInfo.type = node_opcua_service_endpoints_1.UserTokenType.Certificate;
+                identityInfo.type = UserTokenType.Certificate;
                 return identityInfo;
             }
-            identityInfo.type = node_opcua_service_endpoints_1.UserTokenType.Anonymous;
+            identityInfo.type = UserTokenType.Anonymous;
             return identityInfo;
         }
         userIdentityInfo = coerceUserIdentityInfo(userIdentityInfo);
-        (0, node_opcua_assert_1.assert)(typeof callback === "function");
+        assert(typeof callback === "function");
         if (null === userIdentityInfo) {
             return callback(null, {
                 userIdentityToken: null,
@@ -989,16 +983,16 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
         };
         try {
             switch (userIdentityInfo.type) {
-                case node_opcua_service_endpoints_1.UserTokenType.Anonymous:
+                case UserTokenType.Anonymous:
                     userIdentityToken = createAnonymousIdentityToken(context);
                     break;
-                case node_opcua_service_endpoints_1.UserTokenType.UserName: {
+                case UserTokenType.UserName: {
                     const userName = userIdentityInfo.userName || "";
                     const password = userIdentityInfo.password || "";
                     userIdentityToken = createUserNameIdentityToken(context, userName, password);
                     break;
                 }
-                case node_opcua_service_endpoints_1.UserTokenType.Certificate: {
+                case UserTokenType.Certificate: {
                     const certificate = userIdentityInfo.certificateData;
                     if (!userIdentityInfo.privateKey === !userIdentityInfo.keyOperations) {
                         return callback(new Error("CLIENT: a X509 user identity requires exactly one of 'privateKey' (PEM) or 'keyOperations'"));
@@ -1008,7 +1002,7 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
                     }
                     const userKey = userIdentityInfo.keyOperations
                         ? userIdentityInfo.keyOperations
-                        : (0, web_1.makePrivateKeyFromPem)(userIdentityInfo.privateKey);
+                        : makePrivateKeyFromPem(userIdentityInfo.privateKey);
                     createX509IdentityToken(context, certificate, userKey).then((x509Data) => callback(null, x509Data), (err) => callback(err));
                     return;
                 }
@@ -1026,8 +1020,7 @@ class OPCUAClientImpl extends client_base_impl_js_1.ClientBaseImpl {
         return callback(null, { userIdentityToken, userTokenSignature });
     }
 }
-exports.OPCUAClientImpl = OPCUAClientImpl;
-const thenify_ex_1 = require("thenify-ex");
+import { withCallback } from "thenify-ex";
 /**
 
  *
@@ -1045,16 +1038,16 @@ const thenify_ex_1 = require("thenify-ex");
  *     const session = client.createSession(userIdentityInfo);
  *
  */
-OPCUAClientImpl.prototype.createSession = (0, thenify_ex_1.withCallback)(OPCUAClientImpl.prototype.createSession);
-OPCUAClientImpl.prototype.createSession2 = (0, thenify_ex_1.withCallback)(OPCUAClientImpl.prototype.createSession2);
+OPCUAClientImpl.prototype.createSession = withCallback(OPCUAClientImpl.prototype.createSession);
+OPCUAClientImpl.prototype.createSession2 = withCallback(OPCUAClientImpl.prototype.createSession2);
 /**
  */
-OPCUAClientImpl.prototype.changeSessionIdentity = (0, thenify_ex_1.withCallback)(OPCUAClientImpl.prototype.changeSessionIdentity);
+OPCUAClientImpl.prototype.changeSessionIdentity = withCallback(OPCUAClientImpl.prototype.changeSessionIdentity);
 /**
  * @example
  *    const session  = await client.createSession();
  *    await client.closeSession(session);
  */
-OPCUAClientImpl.prototype.closeSession = (0, thenify_ex_1.withCallback)(OPCUAClientImpl.prototype.closeSession);
-OPCUAClientImpl.prototype.reactivateSession = (0, thenify_ex_1.withCallback)(OPCUAClientImpl.prototype.reactivateSession);
+OPCUAClientImpl.prototype.closeSession = withCallback(OPCUAClientImpl.prototype.closeSession);
+OPCUAClientImpl.prototype.reactivateSession = withCallback(OPCUAClientImpl.prototype.reactivateSession);
 //# sourceMappingURL=opcua_client_impl.js.map