node-opcua-client 2.178.0 → 2.180.0

package/dist/private/client_session_impl.js

@@ -7,8 +7,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClientSessionImpl = void 0;
+const node_events_1 = require("node:events");
 const chalk_1 = __importDefault(require("chalk"));
-const events_1 = require("events");
 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 node_opcua_data_model_1 = require("node-opcua-data-model");
@@ -34,11 +34,11 @@ const client_session_keepalive_manager_1 = require("../client_session_keepalive_
 const client_publish_engine_1 = require("./client_publish_engine");
 const client_subscription_impl_1 = require("./client_subscription_impl");
 const reconnection_1 = require("./reconnection/reconnection");
-const helpAPIChange = process.env.DEBUG && process.env.DEBUG.match(/API/);
+const helpAPIChange = process.env.DEBUG?.match(/API/);
 const debugLog = (0, node_opcua_debug_1.make_debugLog)(__filename);
 const doDebug = (0, node_opcua_debug_1.checkDebugFlag)(__filename);
 const warningLog = (0, node_opcua_debug_1.make_warningLog)(__filename);
-const errorLog = (0, node_opcua_debug_1.make_errorLog)(__filename);
+const _errorLog = (0, node_opcua_debug_1.make_errorLog)(__filename);
 let pendingTransactionMessageDisplayed = false;
 function coerceBrowseDescription(data) {
     if (typeof data === "string" || data instanceof node_opcua_nodeid_1.NodeId) {
@@ -52,9 +52,10 @@ function coerceBrowseDescription(data) {
         });
     }
     else {
-        data.nodeId = (0, node_opcua_nodeid_1.resolveNodeId)(data.nodeId);
-        data.referenceTypeId = data.referenceTypeId ? (0, node_opcua_nodeid_1.resolveNodeId)(data.referenceTypeId) : null;
-        return new node_opcua_service_browse_1.BrowseDescription(data);
+        const options = data;
+        options.nodeId = (0, node_opcua_nodeid_1.resolveNodeId)(options.nodeId);
+        options.referenceTypeId = options.referenceTypeId ? (0, node_opcua_nodeid_1.resolveNodeId)(options.referenceTypeId) : null;
+        return new node_opcua_service_browse_1.BrowseDescription(options);
     }
 }
 function coerceReadValueId(node) {
@@ -72,10 +73,30 @@ function coerceReadValueId(node) {
     }
 }
 const emptyUint32Array = new Uint32Array(0);
+/**
+ * attach the server side diagnostics to an error, so that a caller can inspect them without
+ * having to know how the channel delivered the failure.
+ *
+ * For a ServiceFault there is no `response` argument at all - the channel moved the decoded
+ * fault onto `err.response` - so fall back to it, otherwise the diagnostics of the most
+ * interesting case would always be dropped.
+ */
+function annotateWithDiagnostics(err, response) {
+    const annotatedError = err;
+    const source = response ?? annotatedError.response;
+    if (source?.responseHeader.serviceDiagnostics) {
+        annotatedError.serviceDiagnostics = source.responseHeader.serviceDiagnostics;
+    }
+    const responseWithDiagnosticInfos = source;
+    if (responseWithDiagnosticInfos?.diagnosticInfos) {
+        annotatedError.diagnosticsInfo = responseWithDiagnosticInfos.diagnosticInfos;
+    }
+    return annotatedError;
+}
 /**
  * @class ClientSession
  */
-class ClientSessionImpl extends events_1.EventEmitter {
+class ClientSessionImpl extends node_events_1.EventEmitter {
     static reconnectingElement = new WeakMap();
     timeout;
     authenticationToken;
@@ -120,6 +141,9 @@ class ClientSessionImpl extends events_1.EventEmitter {
         this.timeout = 0;
     }
     getTransportSettings() {
+        if (!this._client) {
+            throw new Error("session has been closed - no transport settings available");
+        }
         return this._client.getTransportSettings();
     }
     /**
@@ -128,6 +152,9 @@ class ClientSessionImpl extends events_1.EventEmitter {
      * @type {EndpointDescription}
      */
     get endpoint() {
+        if (!this._client?.endpoint) {
+            throw new Error("session has been closed - no endpoint available");
+        }
         return this._client.endpoint;
     }
     get subscriptionCount() {
@@ -163,18 +190,19 @@ class ClientSessionImpl extends events_1.EventEmitter {
         };
         if (!this._client || !this.userIdentityInfo) {
             warningLog("changeUser: invalid session");
-            return callback(null, node_opcua_status_code_1.StatusCodes.BadInternalError);
+            return callback?.(null, node_opcua_status_code_1.StatusCodes.BadInternalError);
         }
         const old_userIdentity = this.userIdentityInfo;
-        this._client._activateSession(this, userIdentityInfo, (err1, session2) => {
+        this._client._activateSession(this, userIdentityInfo, (err1, _session2) => {
             if (err1) {
                 this.userIdentityInfo = old_userIdentity;
                 warningLog("activate session error = ", err1.message);
-                return callback(null, node_opcua_status_code_1.StatusCodes.BadUserAccessDenied);
+                return callback?.(null, node_opcua_status_code_1.StatusCodes.BadUserAccessDenied);
             }
             this.userIdentityInfo = userIdentityInfo;
-            callback(null, node_opcua_status_code_1.StatusCodes.Good);
+            callback?.(null, node_opcua_status_code_1.StatusCodes.Good);
         });
+        return undefined;
     }
     /**
      * @internal
@@ -185,13 +213,13 @@ class ClientSessionImpl extends events_1.EventEmitter {
         const isArray = Array.isArray(arg0);
         const callback = args[1];
         (0, node_opcua_assert_1.assert)(typeof callback === "function");
-        (0, node_opcua_assert_1.assert)(isFinite(this.requestedMaxReferencesPerNode));
+        (0, node_opcua_assert_1.assert)(Number.isFinite(this.requestedMaxReferencesPerNode));
         const nodesToBrowse = (isArray ? arg0 : [arg0]).map(coerceBrowseDescription);
         const request = new node_opcua_service_browse_1.BrowseRequest({
             nodesToBrowse,
             requestedMaxReferencesPerNode: this.requestedMaxReferencesPerNode
         });
-        this.performMessageTransaction(request, (err, response) => {
+        return this.performMessageTransaction(request, (err, response) => {
             if (err) {
                 return callback(err);
             }
@@ -208,8 +236,8 @@ class ClientSessionImpl extends events_1.EventEmitter {
                         warningLog(chalk_1.default.yellow("warning") +
                             " BrowseResponse : the server didn't take into" +
                             " account our requestedMaxReferencesPerNode ");
-                        warningLog("        this.requestedMaxReferencesPerNode= " + this.requestedMaxReferencesPerNode);
-                        warningLog("        got " + r.references.length + "for " + nodesToBrowse[i].nodeId.toString());
+                        warningLog(`        this.requestedMaxReferencesPerNode= ${this.requestedMaxReferencesPerNode}`);
+                        warningLog(`        got ${r.references.length}for ${nodesToBrowse[i].nodeId.toString()}`);
                         warningLog("        continuationPoint ", r.continuationPoint);
                     }
                 }
@@ -232,7 +260,7 @@ class ClientSessionImpl extends events_1.EventEmitter {
             continuationPoints,
             releaseContinuationPoints
         });
-        this.performMessageTransaction(request, (err, response) => {
+        return this.performMessageTransaction(request, (err, response) => {
             /* c8 ignore next */
             if (err) {
                 return callback(err);
@@ -263,7 +291,7 @@ class ClientSessionImpl extends events_1.EventEmitter {
             nodesToRead,
             timestampsToReturn: node_opcua_service_read_1.TimestampsToReturn.Neither
         });
-        this.performMessageTransaction(request, (err, response) => {
+        return this.performMessageTransaction(request, (err, response) => {
             /* c8 ignore next */
             if (err) {
                 return callback(err);
@@ -294,9 +322,10 @@ class ClientSessionImpl extends events_1.EventEmitter {
             callback = args[4];
         }
         (0, node_opcua_assert_1.assert)(typeof callback === "function");
+        const cb = callback;
         // adjust parameters
         options.numValuesPerNode = options.numValuesPerNode || 0;
-        options.returnBounds = options.returnBounds || options.returnBounds === undefined ? true : false;
+        options.returnBounds = !!(options.returnBounds || options.returnBounds === undefined);
         options.isReadModified = options.isReadModified || false;
         options.timestampsToReturn = options.timestampsToReturn ?? node_opcua_service_read_1.TimestampsToReturn.Both;
         const arg0 = args[0];
@@ -331,18 +360,18 @@ class ClientSessionImpl extends events_1.EventEmitter {
         });
         request.nodesToRead = request.nodesToRead || [];
         (0, node_opcua_assert_1.assert)(nodes.length === request.nodesToRead.length);
-        this.historyRead(request, (err, response) => {
+        return this.historyRead(request, (err, response) => {
             /* c8 ignore next */
             if (err) {
-                return callback(err);
+                return cb(err);
             }
             /* c8 ignore next */
             if (!response || !(response instanceof node_opcua_service_history_1.HistoryReadResponse)) {
-                return callback(new Error("Internal Error"));
+                return cb(new Error("Internal Error"));
             }
             response.results = response.results || [];
             (0, node_opcua_assert_1.assert)(nodes.length === response.results.length);
-            callback(null, isArray ? response.results : response.results[0]);
+            cb(null, isArray ? response.results : response.results[0]);
         });
     }
     historyRead(request, callback) {
@@ -350,7 +379,7 @@ class ClientSessionImpl extends events_1.EventEmitter {
         if (!callback) {
             throw new Error("expecting a callback");
         }
-        this.performMessageTransaction(request, (err, response) => {
+        return this.performMessageTransaction(request, (err, response) => {
             /* c8 ignore next */
             if (err) {
                 return callback(err);
@@ -379,7 +408,7 @@ class ClientSessionImpl extends events_1.EventEmitter {
         });
     }
     readAggregateValue(arg0, startTime, endTime, aggregateFn, processingInterval, ...args) {
-        const callback = typeof args[0] === "function" ? args[0] : args[1];
+        const callback = (typeof args[0] === "function" ? args[0] : args[1]);
         (0, node_opcua_assert_1.assert)(typeof callback === "function");
         const defaultAggregateFunction = {
             percentDataBad: 100,
@@ -388,7 +417,7 @@ class ClientSessionImpl extends events_1.EventEmitter {
             useServerCapabilitiesDefaults: true,
             useSlopedExtrapolation: false
         };
-        const aggregateConfiguration = typeof args[0] === "function" ? defaultAggregateFunction : args[0];
+        const aggregateConfiguration = (typeof args[0] === "function" ? defaultAggregateFunction : args[0]);
         const isArray = Array.isArray(arg0);
         const nodesToRead = isArray
             ? arg0
@@ -410,8 +439,8 @@ class ClientSessionImpl extends events_1.EventEmitter {
             releaseContinuationPoints: false,
             timestampsToReturn: node_opcua_service_read_1.TimestampsToReturn.Both
         });
-        (0, node_opcua_assert_1.assert)(nodesToRead.length === request.nodesToRead.length);
-        this.performMessageTransaction(request, (err, response) => {
+        (0, node_opcua_assert_1.assert)(nodesToRead.length === request.nodesToRead?.length);
+        return this.performMessageTransaction(request, (err, response) => {
             /* c8 ignore next */
             if (err) {
                 return callback(err);
@@ -439,7 +468,7 @@ class ClientSessionImpl extends events_1.EventEmitter {
         const callback = args[1];
         (0, node_opcua_assert_1.assert)(typeof callback === "function");
         const request = new node_opcua_service_write_1.WriteRequest({ nodesToWrite });
-        this.performMessageTransaction(request, (err, response) => {
+        return this.performMessageTransaction(request, (err, response) => {
             /* c8 ignore next */
             if (err) {
                 return callback(err, response);
@@ -468,7 +497,7 @@ class ClientSessionImpl extends events_1.EventEmitter {
             nodeId: this.resolveNodeId(nodeId),
             value: new node_opcua_data_value_1.DataValue({ value })
         });
-        this.write(nodeToWrite, (err, statusCode) => {
+        return this.write(nodeToWrite, (err, statusCode) => {
             /* c8 ignore next */
             if (err) {
                 return callback(err);
@@ -502,7 +531,8 @@ class ClientSessionImpl extends events_1.EventEmitter {
         /* c8 ignore next */
         if (helpAPIChange) {
             // the read method deprecation detection and warning
-            if (!((0, node_opcua_utils_1.getFunctionParameterNames)(callback)[1] === "dataValues" || (0, node_opcua_utils_1.getFunctionParameterNames)(callback)[1] === "dataValue")) {
+            if (!((0, node_opcua_utils_1.getFunctionParameterNames)(callback)[1] === "dataValues" ||
+                (0, node_opcua_utils_1.getFunctionParameterNames)(callback)[1] === "dataValue")) {
                 warningLog(chalk_1.default.red("[NODE-OPCUA-E04] the ClientSession#read  API has changed !!, please fix the client code"));
                 warningLog(chalk_1.default.red("   replace ..:"));
                 warningLog(chalk_1.default.cyan("   session.read(nodesToRead,function(err,nodesToRead,results) {}"));
@@ -510,21 +540,23 @@ class ClientSessionImpl extends events_1.EventEmitter {
                 warningLog(chalk_1.default.cyan("   session.read(nodesToRead,function(err,dataValues) {}"));
                 warningLog("");
                 warningLog(chalk_1.default.yellow("please make sure to refactor your code and check that " +
-                    "the second argument of your callback function is named"), chalk_1.default.cyan("dataValue" + (isArray ? "s" : "")));
+                    "the second argument of your callback function is named"), chalk_1.default.cyan(`dataValue${isArray ? "s" : ""}`));
                 warningLog(chalk_1.default.cyan("to make this exception disappear"));
                 throw new Error("ERROR ClientSession#read  API has changed !!, please fix the client code");
             }
         }
         // coerce nodeIds
         for (const node of nodesToRead) {
-            node.nodeId = this.resolveNodeId(node.nodeId);
+            if (node.nodeId) {
+                node.nodeId = this.resolveNodeId(node.nodeId);
+            }
         }
         const request = new node_opcua_service_read_1.ReadRequest({
             maxAge,
             nodesToRead,
             timestampsToReturn: node_opcua_service_read_1.TimestampsToReturn.Both
         });
-        this.performMessageTransaction(request, (err, response) => {
+        return this.performMessageTransaction(request, (err, response) => {
             /* c8 ignore next */
             if (err) {
                 return callback(err, response);
@@ -534,7 +566,7 @@ class ClientSessionImpl extends events_1.EventEmitter {
                 return callback(new Error("Internal Error"));
             }
             // perform ExtensionObject resolution
-            (0, node_opcua_client_dynamic_extension_object_1.promoteOpaqueStructure)(this, response.results)
+            (0, node_opcua_client_dynamic_extension_object_1.promoteOpaqueStructure)(this, response.results || [])
                 .then(() => {
                 response.results = response.results || /* c8 ignore next */ [];
                 callback(null, isArray ? response.results : response.results[0]);
@@ -546,19 +578,19 @@ class ClientSessionImpl extends events_1.EventEmitter {
     }
     emitCloseEvent(statusCode) {
         if (!this._closeEventHasBeenEmitted) {
-            debugLog("ClientSession#emitCloseEvent");
+            // c8 ignore next
+            doDebug && debugLog("ClientSession#emitCloseEvent");
             this._closeEventHasBeenEmitted = true;
             this.emit("session_closed", statusCode);
         }
     }
     createSubscription(options, callback) {
-        this._defaultRequest(node_opcua_service_subscription_1.CreateSubscriptionRequest, node_opcua_service_subscription_1.CreateSubscriptionResponse, options, callback);
+        return this._defaultRequest(node_opcua_service_subscription_1.CreateSubscriptionRequest, node_opcua_service_subscription_1.CreateSubscriptionResponse, options, callback);
     }
     createSubscription2(...args) {
         const createSubscriptionRequest = args[0];
         let callback = args[1];
         const subscription = new client_subscription_impl_1.ClientSubscriptionImpl(this, createSubscriptionRequest);
-        // tslint:disable-next-line:no-empty
         subscription.on("error", (err) => {
             if (callback) {
                 callback(err);
@@ -572,32 +604,33 @@ class ClientSessionImpl extends events_1.EventEmitter {
                 callback = null;
             }
         });
+        return undefined;
     }
     deleteSubscriptions(options, callback) {
-        this._defaultRequest(node_opcua_service_subscription_1.DeleteSubscriptionsRequest, node_opcua_service_subscription_1.DeleteSubscriptionsResponse, options, callback);
+        return this._defaultRequest(node_opcua_service_subscription_1.DeleteSubscriptionsRequest, node_opcua_service_subscription_1.DeleteSubscriptionsResponse, options, callback);
     }
     setTriggering(request, callback) {
-        this._defaultRequest(node_opcua_service_subscription_1.SetTriggeringRequest, node_opcua_service_subscription_1.SetTriggeringResponse, request, callback);
+        return this._defaultRequest(node_opcua_service_subscription_1.SetTriggeringRequest, node_opcua_service_subscription_1.SetTriggeringResponse, request, callback);
     }
     /**
      */
     transferSubscriptions(options, callback) {
-        this._defaultRequest(node_opcua_service_subscription_1.TransferSubscriptionsRequest, node_opcua_service_subscription_1.TransferSubscriptionsResponse, options, callback);
+        return this._defaultRequest(node_opcua_service_subscription_1.TransferSubscriptionsRequest, node_opcua_service_subscription_1.TransferSubscriptionsResponse, options, callback);
     }
     createMonitoredItems(options, callback) {
-        this._defaultRequest(node_opcua_service_subscription_1.CreateMonitoredItemsRequest, node_opcua_service_subscription_1.CreateMonitoredItemsResponse, options, callback);
+        return this._defaultRequest(node_opcua_service_subscription_1.CreateMonitoredItemsRequest, node_opcua_service_subscription_1.CreateMonitoredItemsResponse, options, callback);
     }
     modifyMonitoredItems(options, callback) {
-        this._defaultRequest(node_opcua_service_subscription_1.ModifyMonitoredItemsRequest, node_opcua_service_subscription_1.ModifyMonitoredItemsResponse, options, callback);
+        return this._defaultRequest(node_opcua_service_subscription_1.ModifyMonitoredItemsRequest, node_opcua_service_subscription_1.ModifyMonitoredItemsResponse, options, callback);
     }
     /**
      *
      */
     modifySubscription(options, callback) {
-        this._defaultRequest(node_opcua_service_subscription_1.ModifySubscriptionRequest, node_opcua_service_subscription_1.ModifySubscriptionResponse, options, callback);
+        return this._defaultRequest(node_opcua_service_subscription_1.ModifySubscriptionRequest, node_opcua_service_subscription_1.ModifySubscriptionResponse, options, callback);
     }
     setMonitoringMode(options, callback) {
-        this._defaultRequest(node_opcua_service_subscription_1.SetMonitoringModeRequest, node_opcua_service_subscription_1.SetMonitoringModeResponse, options, callback);
+        return this._defaultRequest(node_opcua_service_subscription_1.SetMonitoringModeRequest, node_opcua_service_subscription_1.SetMonitoringModeResponse, options, callback);
     }
     /**
      */
@@ -630,7 +663,7 @@ class ClientSessionImpl extends events_1.EventEmitter {
             publishingEnabled,
             subscriptionIds
         });
-        this._defaultRequest(node_opcua_service_subscription_1.SetPublishingModeRequest, node_opcua_service_subscription_1.SetPublishingModeResponse, options, (err, response) => {
+        return this._defaultRequest(node_opcua_service_subscription_1.SetPublishingModeRequest, node_opcua_service_subscription_1.SetPublishingModeResponse, options, (err, response) => {
             /* c8 ignore next */
             if (err) {
                 return callback(err);
@@ -653,7 +686,7 @@ class ClientSessionImpl extends events_1.EventEmitter {
         const callback = args[1];
         (0, node_opcua_assert_1.assert)(typeof callback === "function");
         const request = new node_opcua_service_translate_browse_path_1.TranslateBrowsePathsToNodeIdsRequest({ browsePaths });
-        this.performMessageTransaction(request, (err, response) => {
+        return this.performMessageTransaction(request, (err, response) => {
             /* c8 ignore next */
             if (err) {
                 return callback(err, response);
@@ -667,28 +700,36 @@ class ClientSessionImpl extends events_1.EventEmitter {
         });
     }
     channelId() {
-        return this._client !== null && this._client._secureChannel !== null && this._client._secureChannel.isOpened()
-            ? this._client._secureChannel.channelId
-            : -1;
+        const secureChannel = this._client?._secureChannel;
+        return secureChannel?.isOpened() ? secureChannel.channelId : -1;
     }
     isChannelValid() {
         /* c8 ignore next */
         if (!this._client) {
-            debugLog(chalk_1.default.red("Warning SessionClient is null ?"));
+            // c8 ignore next
+            doDebug && debugLog(chalk_1.default.red("Warning SessionClient is null ?"));
         }
-        return this._client !== null && this._client._secureChannel !== null && this._client._secureChannel.isOpened();
+        return !!this._client?._secureChannel?.isOpened();
     }
     performMessageTransaction(request, callback) {
         if (!this._client) {
             // session may have been closed by user ... but is still in used !!
-            return callback(new Error("Session has been closed and should not be used to perform a transaction anymore"));
+            callback(new Error("Session has been closed and should not be used to perform a transaction anymore"));
+            return;
         }
         if (request instanceof node_opcua_service_subscription_1.PublishRequest ||
             request instanceof node_opcua_types_1.ActivateSessionRequest ||
             request instanceof node_opcua_types_1.CloseSessionRequest) {
-            return this._performMessageTransaction(request, callback);
+            this._performMessageTransaction(request, callback);
+            return;
         }
-        if (this._reconnecting.pendingTransactions.length > 0) {
+        // Hold the transaction only while the channel is genuinely down and a repair is under
+        // way. The repair restores the session *after* the secure channel is back up
+        // (_repairConnection: _recreate_secure_channel, then _finalReconnectionStep), so its own
+        // traffic - including the plain Read that readOperationLimits issues - always sees a
+        // valid channel and passes straight through. Queueing on "reconnecting" alone would
+        // park the repair's requests behind the repair that is waiting for them.
+        if (!this.isChannelValid() && (this._reconnecting.reconnecting || this._client.isReconnecting)) {
             /* c8 ignore next */
             if (this._reconnecting.pendingTransactions.length > 10) {
                 if (!pendingTransactionMessageDisplayed) {
@@ -698,7 +739,9 @@ class ClientSessionImpl extends events_1.EventEmitter {
                 }
             }
             else if (this._reconnecting.pendingTransactions.length > 3) {
-                debugLog(chalk_1.default.yellow("Warning : your client is sending multiple requests simultaneously to the server", request.constructor.name));
+                // c8 ignore next
+                doDebug &&
+                    debugLog(chalk_1.default.yellow("Warning : your client is sending multiple requests simultaneously to the server", request.constructor.name));
             }
             this._reconnecting.pendingTransactions.push({ request, callback });
             return;
@@ -709,78 +752,113 @@ class ClientSessionImpl extends events_1.EventEmitter {
         attemptCount > 0 &&
             warningLog("reprocessRequest => ", request.constructor.name, this._reconnecting.pendingTransactions.length);
         this._performMessageTransaction(request, (err, response) => {
-            if (err && err.message.match(/BadSessionIdInvalid/) && request.constructor.name !== "ActivateSessionRequest") {
+            if (err?.message.match(/BadSessionIdInvalid/) && request.constructor.name !== "ActivateSessionRequest") {
                 warningLog("Transaction on Invalid Session ", request.constructor.name, err.message, "isReconnecting?=", this.isReconnecting, "q=", this._reconnecting.pendingTransactions.length);
                 request.requestHeader.requestHandle = node_opcua_secure_channel_1.requestHandleNotSetValue;
                 if (this.isReconnecting) {
-                    this.once("session_restored", () => {
-                        warningLog("redoing", request.constructor.name, this.isReconnecting);
-                        this.#reprocessRequest(attemptCount + 1, request, callback);
-                    });
+                    // Hand it back to the queue rather than parking it on a one-shot
+                    // session_restored listener: that event is emitted only when a repair
+                    // succeeds, so a repair that gave up - or a dispose, which drops every
+                    // listener - left the caller waiting for an answer that could never come.
+                    // flushPendingTransactions is called on every exit from a repair, so the
+                    // transaction is always resolved one way or the other.
+                    // c8 ignore next
+                    doDebug && debugLog("holding for replay after repair:", request.constructor.name, "attempt", attemptCount);
+                    this._reconnecting.pendingTransactions.push({ request, callback });
                 }
                 else {
                     this.#_recreate_session_and_reperform_transaction(request, callback);
                 }
                 return;
             }
+            // the queue is owned by flushPendingTransactions, which the repair calls on every
+            // exit: draining one entry from here would send it before the session is restored,
+            // and would race with that flush.
             callback(err, response);
-            const length = this._reconnecting.pendingTransactions.length; // record length before callback is called !
-            if (length > 0) {
-                debugLog("reprocessRequest => ", this._reconnecting.pendingTransactions.length, " transaction(s) left in queue");
-                // tslint:disable-next-line: no-shadowed-variable
-                const { request, callback } = this._reconnecting.pendingTransactions.shift();
-                this.#reprocessRequest(0, request, callback);
-            }
         });
     }
+    /**
+     * record that the server has answered.
+     *
+     * A transaction that failed on a timeout or on a broken channel comes back with no response
+     * at all and must not refresh lastResponseReceivedTime, or the keep-alive manager would never
+     * notice that the server is gone (see #1569). A ServiceFault does count - the round trip
+     * completed - but the channel reports it as an Error carrying the decoded fault on
+     * err.response, so the response argument alone does not tell the two cases apart.
+     *
+     * @internal
+     */
+    /**
+     * resolve every transaction that was held while the connection was down: replay them when the
+     * session is usable again, fail them when the repair gave up.
+     *
+     * Every exit from a repair must call this, otherwise a held caller waits for an answer that
+     * can never come - and the session is disposed with a queue that nobody drained.
+     *
+     * @internal
+     */
+    flushPendingTransactions(err) {
+        const heldTransactions = this._reconnecting.pendingTransactions.splice(0);
+        if (heldTransactions.length === 0) {
+            return;
+        }
+        // c8 ignore next
+        doDebug && debugLog("flushPendingTransactions", heldTransactions.length, err ? `failing: ${err.message}` : "replaying");
+        pendingTransactionMessageDisplayed = false;
+        for (const pending of heldTransactions) {
+            if (err) {
+                pending.callback(err);
+            }
+            else {
+                this.#reprocessRequest(0, pending.request, pending.callback);
+            }
+        }
+    }
+    noteServerAnswer(err, response) {
+        if (response || err?.response) {
+            this.lastResponseReceivedTime = new Date();
+        }
+    }
     _performMessageTransaction(request, callback) {
         (0, node_opcua_assert_1.assert)(typeof callback === "function");
         /* c8 ignore next */
         if (!this._client) {
             // session may have been closed by user ... but is still in used !!
-            return callback(new Error("Session has been closed and should not be used to perform a transaction anymore"));
+            callback(new Error("Session has been closed and should not be used to perform a transaction anymore"));
+            return;
         }
         if (!this.isChannelValid()) {
             // the secure channel is broken, may be the server has crashed or the network cable has been disconnected
             // for a long time
             // we may need to queue this transaction, as a secure token may be being reprocessed
-            debugLog(chalk_1.default.bgWhite.red("!!! Performing transaction on invalid channel !!! ", request.constructor.name));
-            return callback(new Error("Invalid Channel BadConnectionClosed"));
+            // c8 ignore next
+            doDebug && debugLog(chalk_1.default.bgWhite.red("!!! Performing transaction on invalid channel !!! ", request.constructor.name));
+            callback(new Error("Invalid Channel BadConnectionClosed"));
+            return;
         }
         // is this stuff useful?
         if (request.requestHeader) {
+            if (!this.authenticationToken) {
+                throw new Error("internal error: authenticationToken should be set on an active session");
+            }
             request.requestHeader.authenticationToken = this.authenticationToken;
         }
         this.lastRequestSentTime = new Date();
         this._client.performMessageTransaction(request, (err, response) => {
-            this.lastResponseReceivedTime = new Date();
-            /* c8 ignore next */
+            this.noteServerAnswer(err, response);
             if (err) {
-                if (response && response.responseHeader.serviceDiagnostics) {
-                    err.serviceDiagnostics = response.responseHeader.serviceDiagnostics;
-                }
-                if (response && response.diagnosticInfos) {
-                    err.diagnosticsInfo = response.diagnosticInfos;
-                }
-                return callback(err);
+                return callback(annotateWithDiagnostics(err, response));
             }
             /* c8 ignore next */
             if (!response) {
                 return callback(new Error("internal Error"));
             }
-            /* c8 ignore next */
             if (response.responseHeader.serviceResult.isNot(node_opcua_status_code_1.StatusCodes.Good)) {
-                err = new Error(" ServiceResult is " +
+                const serviceResultError = new Error(" ServiceResult is " +
                     response.responseHeader.serviceResult.toString() +
                     " request was " +
                     request.constructor.name);
-                if (response && response.responseHeader.serviceDiagnostics) {
-                    err.serviceDiagnostics = response.responseHeader.serviceDiagnostics;
-                }
-                if (response && response.diagnosticInfos) {
-                    err.diagnosticsInfo = response.diagnosticInfos;
-                }
-                return callback(err, response);
+                return callback(annotateWithDiagnostics(serviceResultError, response), response);
             }
             return callback(null, response);
         });
@@ -811,7 +889,12 @@ class ClientSessionImpl extends events_1.EventEmitter {
      */
     evaluateRemainingLifetime() {
         const now = Date.now();
-        const expiryTime = this.lastRequestSentTime.getTime() + this.timeout;
+        // anchored on the last answer, not the last send: the server restarts its session
+        // watchdog when it *receives* a request, and the only proof the client has that a
+        // request arrived is an answer coming back. Anchoring on the send made this return a
+        // full lifetime throughout an outage - a client that keeps trying keeps refreshing the
+        // send timestamp - which is precisely when the caller needs the truth (see #1569).
+        const expiryTime = this.lastResponseReceivedTime.getTime() + this.timeout;
         return Math.max(0, expiryTime - now);
     }
     _terminatePublishEngine() {
@@ -825,7 +908,7 @@ class ClientSessionImpl extends events_1.EventEmitter {
      * @param args
      */
     close(...args) {
-        if (arguments.length === 1) {
+        if (args.length === 1) {
             return this.close(true, args[0]);
         }
         const deleteSubscription = args[0];
@@ -834,15 +917,18 @@ class ClientSessionImpl extends events_1.EventEmitter {
         (0, node_opcua_assert_1.assert)(typeof deleteSubscription === "boolean");
         /* c8 ignore next */
         if (!this._client) {
-            debugLog("ClientSession#close : warning, client is already closed");
+            // c8 ignore next
+            doDebug && debugLog("ClientSession#close : warning, client is already closed");
             return callback(); // already close ?
         }
         (0, node_opcua_assert_1.assert)(this._client);
         this._terminatePublishEngine();
         this._client.closeSession(this, deleteSubscription, (err) => {
-            debugLog("session Close err ", err ? err.message : "null");
+            // c8 ignore next
+            doDebug && debugLog("session Close err ", err ? err.message : "null");
             callback();
         });
+        return undefined;
     }
     /**
 
@@ -857,7 +943,9 @@ class ClientSessionImpl extends events_1.EventEmitter {
      */
     call(...args) {
         const isArray = Array.isArray(args[0]);
-        const methodsToCall = isArray ? args[0] : [args[0]];
+        const methodsToCall = isArray
+            ? args[0]
+            : [args[0]];
         (0, node_opcua_assert_1.assert)(Array.isArray(methodsToCall));
         const callback = args[1];
         // Note : The client has no explicit address space and therefore will struggle to
@@ -867,7 +955,7 @@ class ClientSessionImpl extends events_1.EventEmitter {
         //           - load a fake address space to have some thing to query on our end
         // const request = this._client.factory.constructObjectId("CallRequest",{ methodsToCall: methodsToCall});
         const request = new node_opcua_service_call_1.CallRequest({ methodsToCall });
-        this.performMessageTransaction(request, (err, response) => {
+        return this.performMessageTransaction(request, (err, response) => {
             /* c8 ignore next */
             if (err) {
                 return callback(err);
@@ -876,10 +964,11 @@ class ClientSessionImpl extends events_1.EventEmitter {
             if (!response || !(response instanceof node_opcua_service_call_1.CallResponse)) {
                 return callback(new Error("internal error"));
             }
-            response.results = response.results || [];
-            promoteOpaqueStructureForCall(this, response.results)
+            const results = response.results || [];
+            response.results = results;
+            promoteOpaqueStructureForCall(this, results)
                 .then(() => {
-                callback(null, isArray ? response.results : response.results[0]);
+                callback(null, isArray ? results : results[0]);
             })
                 .catch((err) => {
                 callback(err);
@@ -901,7 +990,7 @@ class ClientSessionImpl extends events_1.EventEmitter {
             methodId: (0, node_opcua_nodeid_1.coerceNodeId)("ns=0;i=11492"), // MethodIds.Server_GetMonitoredItems;
             objectId: (0, node_opcua_nodeid_1.coerceNodeId)("ns=0;i=2253") // ObjectId.Server
         });
-        this.call(methodsToCall, (err, result) => {
+        return this.call(methodsToCall, (err, result) => {
             /* c8 ignore next */
             if (err) {
                 return callback(err);
@@ -940,7 +1029,7 @@ class ClientSessionImpl extends events_1.EventEmitter {
         (0, node_opcua_assert_1.assert)(typeof callback === "function");
         return (0, node_opcua_pseudo_session_1.getArgumentDefinitionHelper)(this, methodId)
             .then((result) => {
-            callback(null, result);
+            callback?.(null, result);
         })
             .catch((err) => {
             callback(err);
@@ -954,7 +1043,7 @@ class ClientSessionImpl extends events_1.EventEmitter {
         const request = new node_opcua_service_register_node_1.RegisterNodesRequest({
             nodesToRegister: nodesToRegister.map((n) => this.resolveNodeId(n))
         });
-        this.performMessageTransaction(request, (err, response) => {
+        return this.performMessageTransaction(request, (err, response) => {
             /* c8 ignore next */
             if (err) {
                 return callback(err);
@@ -975,7 +1064,7 @@ class ClientSessionImpl extends events_1.EventEmitter {
         const request = new node_opcua_service_register_node_1.UnregisterNodesRequest({
             nodesToUnregister: nodesToUnregister.map((n) => this.resolveNodeId(n))
         });
-        this.performMessageTransaction(request, (err, response) => {
+        return this.performMessageTransaction(request, (err, response) => {
             /* c8 ignore next */
             if (err) {
                 return callback(err);
@@ -992,7 +1081,7 @@ class ClientSessionImpl extends events_1.EventEmitter {
         const callback = args[1];
         (0, node_opcua_assert_1.assert)(typeof callback === "function");
         const request = new node_opcua_service_query_1.QueryFirstRequest(queryFirstRequest);
-        this.performMessageTransaction(request, (err, response) => {
+        return this.performMessageTransaction(request, (err, response) => {
             /* c8 ignore next */
             if (err) {
                 return callback(err);
@@ -1038,11 +1127,8 @@ class ClientSessionImpl extends events_1.EventEmitter {
         this.stopKeepAliveManager();
         this.removeAllListeners();
         //
-        const privateThis = this;
-        if (!(!privateThis.pendingTransactions || privateThis.pendingTransactions.length === 0)) {
-            // tslint:disable-next-line: no-console
-            warningLog("dispose when pendingTransactions is not empty ");
-        }
+        // never strand a held caller: the session is going away, so nothing will ever replay them
+        this.flushPendingTransactions(new Error("Session has been disposed while the transaction was waiting for reconnection"));
     }
     toString() {
         const now = Date.now();
@@ -1050,33 +1136,33 @@ class ClientSessionImpl extends events_1.EventEmitter {
         const lap2 = now - this.lastResponseReceivedTime.getTime();
         const timeoutDelay = this.timeout - lap1;
         const timeoutInfo = timeoutDelay < 0
-            ? chalk_1.default.red(" expired since " + -timeoutDelay / 1000 + " seconds")
-            : chalk_1.default.green(" timeout in " + timeoutDelay / 1000 + " seconds");
+            ? chalk_1.default.red(` expired since ${-timeoutDelay / 1000} seconds`)
+            : chalk_1.default.green(` timeout in ${timeoutDelay / 1000} seconds`);
         let str = "";
-        str += " name..................... " + this.name;
-        str += "\n sessionId................ " + this.sessionId.toString();
-        str += "\n authenticationToken...... " + (this.authenticationToken ? this.authenticationToken.toString() : "");
-        str += "\n timeout.................. " + this.timeout + "ms" + timeoutInfo;
-        str += "\n serverNonce.............. " + (this.serverNonce ? this.serverNonce.toString("hex") : "");
-        str += "\n serverCertificate........ " + (0, node_opcua_utils_1.buffer_ellipsis)(this.serverCertificate);
-        str += "\n serverSignature.......... " + this.serverSignature;
-        str += "\n lastRequestSentTime...... " + new Date(this.lastRequestSentTime).toISOString() + "  (" + lap1 + ")";
-        str += "\n lastResponseReceivedTime. " + new Date(this.lastResponseReceivedTime).toISOString() + " (" + lap2 + ")";
-        str += "\n isReconnecting........... " + this.isReconnecting;
-        str += "\n isValidChannel........... " + this.isChannelValid() + " has been closed  " + this.hasBeenClosed();
-        str += "\n channelId................ " + this.channelId();
-        str += "\n remaining life time...... " + this.evaluateRemainingLifetime();
-        str += "\n subscription count....... " + this.subscriptionCount;
-        if (this._client && this._client._secureChannel) {
+        str += ` name..................... ${this.name}`;
+        str += `\n sessionId................ ${this.sessionId.toString()}`;
+        str += `\n authenticationToken...... ${this.authenticationToken ? this.authenticationToken?.toString() : ""}`;
+        str += `\n timeout.................. ${this.timeout}ms${timeoutInfo}`;
+        str += `\n serverNonce.............. ${this.serverNonce ? this.serverNonce?.toString("hex") : ""}`;
+        str += `\n serverCertificate........ ${(0, node_opcua_utils_1.buffer_ellipsis)(this.serverCertificate)}`;
+        str += `\n serverSignature.......... ${this.serverSignature}`;
+        str += `\n lastRequestSentTime...... ${new Date(this.lastRequestSentTime).toISOString()}  (${lap1})`;
+        str += `\n lastResponseReceivedTime. ${new Date(this.lastResponseReceivedTime).toISOString()} (${lap2})`;
+        str += `\n isReconnecting........... ${this.isReconnecting}`;
+        str += `\n isValidChannel........... ${this.isChannelValid()} has been closed  ${this.hasBeenClosed()}`;
+        str += `\n channelId................ ${this.channelId()}`;
+        str += `\n remaining life time...... ${this.evaluateRemainingLifetime()}`;
+        str += `\n subscription count....... ${this.subscriptionCount}`;
+        if (this._client?._secureChannel) {
             if (this._client._secureChannel.activeSecurityToken) {
-                str += "\n reviseTokenLifetime...... " + this._client._secureChannel.activeSecurityToken.revisedLifetime;
+                str += `\n reviseTokenLifetime...... ${this._client._secureChannel.activeSecurityToken.revisedLifetime}`;
             }
         }
-        str += "\n keepAlive ................ " + this._keepAliveManager ? true : false;
         if (this._keepAliveManager) {
-            str += "\n keepAlive checkInterval.. " + this._keepAliveManager.checkInterval + " ms";
-            str += "\n (defaultTransportTimeout)." + node_opcua_secure_channel_1.ClientSecureChannelLayer.defaultTransportTimeout + " ms";
-            str += "\n session timeout           " + this.timeout + " ms";
+            str += `\n keepAlive ................ ${this._keepAliveManager}`;
+            str += `\n keepAlive checkInterval.. ${this._keepAliveManager.checkInterval} ms`;
+            str += `\n (defaultTransportTimeout).${node_opcua_secure_channel_1.ClientSecureChannelLayer.defaultTransportTimeout} ms`;
+            str += `\n session timeout           ${this.timeout} ms`;
         }
         return str;
     }
@@ -1094,12 +1180,15 @@ class ClientSessionImpl extends events_1.EventEmitter {
             .catch((err) => {
             callback(err);
         });
+        return undefined;
     }
     getNamespaceIndex(namespaceUri) {
         (0, node_opcua_assert_1.assert)(this.$$namespaceArray, "please make sure that readNamespaceArray has been called");
+        if (!this.$$namespaceArray) {
+            throw new Error("please make sure that readNamespaceArray has been called");
+        }
         return this.$$namespaceArray.indexOf(namespaceUri);
     }
-    // tslint:disable:no-empty
     // ---------------------------------------- Alarm & condition stub
     disableCondition() {
         /** empty */
@@ -1109,19 +1198,19 @@ class ClientSessionImpl extends events_1.EventEmitter {
     }
     addCommentCondition(_conditionId, _eventId, _comment, _callback) {
         /** empty */
+        return undefined;
     }
     confirmCondition(_conditionId, _eventId, _comment, _callback) {
         /** empty */
+        return undefined;
     }
     acknowledgeCondition(_conditionId, _eventId, _comment, _callback) {
         /** empty */
+        return undefined;
     }
-    /**
-     * @deprecated
-     * @private
-     */
     findMethodId(_nodeId, _methodName, _callback) {
         /** empty */
+        return undefined;
     }
     _callMethodCondition(_methodName, _conditionId, _eventId, _comment, _callback) {
         /** empty */
@@ -1143,6 +1232,9 @@ class ClientSessionImpl extends events_1.EventEmitter {
     }
     _defaultRequest(requestClass, _responseClass, options, callback) {
         (0, node_opcua_assert_1.assert)(typeof callback === "function");
+        if (!callback) {
+            throw new Error("_defaultRequest: expecting a callback function here");
+        }
         const request = options instanceof requestClass ? options : new requestClass(options);
         /* c8 ignore next */
         if (doDebug) {
@@ -1150,19 +1242,23 @@ class ClientSessionImpl extends events_1.EventEmitter {
         }
         /* c8 ignore next */
         if (this._closeEventHasBeenEmitted) {
-            debugLog("ClientSession#_defaultRequest => session has been closed !!", request.toString());
+            // c8 ignore next
+            doDebug && debugLog("ClientSession#_defaultRequest => session has been closed !!", request.toString());
             setImmediate(() => {
                 callback(new Error("ClientSession is closed !"));
             });
-            return;
+            return undefined;
         }
-        this.performMessageTransaction(request, (err, response) => {
+        return this.performMessageTransaction(request, (err, response) => {
             if (this._closeEventHasBeenEmitted) {
-                debugLog("ClientSession#_defaultRequest ... err =", err ? err.message : "null", response ? response.toString() : " null");
+                // c8 ignore next
+                doDebug &&
+                    debugLog("ClientSession#_defaultRequest ... err =", err ? err.message : "null", response ? response.toString() : " null");
             }
             /* c8 ignore next */
             if (err) {
-                debugLog("Client session : performMessageTransaction error = ", err.message);
+                // c8 ignore next
+                doDebug && debugLog("Client session : performMessageTransaction error = ", err.message);
                 // let intercept interesting error message
                 if (err.message.match(/BadSessionClosed/)) {
                     // the session has been closed by Server
@@ -1179,6 +1275,7 @@ class ClientSessionImpl extends events_1.EventEmitter {
                     }
                     //  DO NOT TERMINATE SESSION, as we will need a publishEngine when we
                     //  reconnect this._terminatePublishEngine();
+                    // biome-ignore lint/correctness/noConstantCondition: deliberate debug on/off toggle, not dead code
                     if (false) {
                         // ER 10.2019
                         /**
@@ -1196,10 +1293,12 @@ class ClientSessionImpl extends events_1.EventEmitter {
     #_recreate_session_and_reperform_transaction(request, callback) {
         warningLog("attempt to recreate session to reperform a transaction ", request.constructor.name);
         if (this.recursive_repair_detector >= 1) {
-            // tslint:disable-next-line: no-console
             warningLog("recreate_session_and_reperform_transaction => Already in Progress");
             return callback(new Error("Cannot recreate session"));
         }
+        if (!this._client) {
+            return callback(new Error("Cannot recreate session: session has no client"));
+        }
         this.recursive_repair_detector += 1;
         warningLog(chalk_1.default.red("----------------> Repairing Client Session as Server believes it is invalid now "));
         (0, reconnection_1.repair_client_session)(this._client, this, (err) => {
@@ -1215,7 +1314,7 @@ class ClientSessionImpl extends events_1.EventEmitter {
 }
 exports.ClientSessionImpl = ClientSessionImpl;
 async function promoteOpaqueStructureForCallMethodResult(session, callMethodResult) {
-    if (!callMethodResult || !callMethodResult.outputArguments || callMethodResult.outputArguments.length === 0) {
+    if (!callMethodResult?.outputArguments || callMethodResult.outputArguments.length === 0) {
         return;
     }
     await (0, node_opcua_client_dynamic_extension_object_1.promoteOpaqueStructure)(session, callMethodResult.outputArguments.map((a) => ({ value: a })));
@@ -1242,8 +1341,6 @@ async function promoteOpaqueStructureForCall(session, callMethodResults) {
     const promises = callMethodResults.map(async (x) => promoteOpaqueStructureForCallMethodResult(session, x));
     await Promise.all(promises);
 }
-// tslint:disable:no-var-requires
-// tslint:disable:max-line-length
 const thenify_ex_1 = require("thenify-ex");
 const opts = { multiArgs: false };
 ClientSessionImpl.prototype.browse = (0, thenify_ex_1.withCallback)(ClientSessionImpl.prototype.browse, opts);