node-opcua-client 2.112.0 → 2.113.1

package/source/index.ts

@@ -37,7 +37,7 @@ export const utils = utils1;
 import * as crypto_util1 from "node-opcua-crypto";
 export const crypto_utils = crypto_util1;
 
-export { hexDump } from "node-opcua-debug";
+export { hexDump, LogLevel, setLogLevel, setDebugLogger, setWarningLogger, setErrorLogger } from "node-opcua-debug";
 
 ///
 export {

package/source/private/client_base_impl.ts

@@ -123,6 +123,7 @@ function __findEndpoint(this: OPCUAClientBase, endpointUrl: string, params: Find
             // rebind backoff handler
             masterClient.listeners("backoff").forEach((handler: any) => client.on("backoff", handler));
 
+            // istanbul ignore next
             if (doDebug) {
                 client.on("backoff", (retryCount: number, delay: number) => {
                     debugLog(
@@ -146,7 +147,7 @@ function __findEndpoint(this: OPCUAClientBase, endpointUrl: string, params: Find
                         " (err =" +
                         err.message +
                         ")";
-                    debugLog(err.message);
+                    warningLog(err.message);
                 }
                 return innerCallback(err);
             });
@@ -231,8 +232,9 @@ function _verify_serverCertificate(
             return callback(err);
         }
         if (status !== StatusCodes.Good) {
-            // do it again for debug purposes
+            // istanbul ignore next
             if (doDebug) {
+                // do it again for debug purposes
                 certificateManager.verifyCertificate(serverCertificate, (err1: Error | null, status1?: VerificationStatus) => {
                     debugLog(status1);
                 });
@@ -384,7 +386,7 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
     private _instanceNumber: number;
     private _transportSettings: TransportSettings;
     private _transportTimeout?: number;
-    
+
     public clientCertificateManager: OPCUACertificateManager;
 
     public isUnusable() {
@@ -404,6 +406,7 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
         this._internalState = internalState;
     }
     public emit(eventName: string | symbol, ...others: any[]): boolean {
+        // istanbul ignore next
         if (doDebug) {
             debugLog(chalk.cyan(`  Client ${this._instanceNumber} ${this.clientName} emitting `), chalk.magentaBright(eventName));
         }
@@ -1455,6 +1458,7 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
             this._byteRead += this._secureChannel.bytesRead;
             this._transactionsPerformed += this._secureChannel.transactionsPerformed;
             this._timedOutRequestCount += this._secureChannel.timedOutRequestCount;
+            // istanbul ignore next
             if (doDebug) {
                 const h = `Client ${this._instanceNumber} ${this.clientName}`;
                 debugLog(chalk.cyan(`${h} byteWritten          = `), this._byteWritten);
@@ -1466,6 +1470,7 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
     }
     private _destroy_secure_channel() {
         if (this._secureChannel) {
+            // istanbul ignore next
             if (doDebug) {
                 debugLog(
                     " DESTROYING SECURE CHANNEL (isTransactionInProgress ?",

package/source/private/client_publish_engine.ts

@@ -337,6 +337,7 @@ export class ClientSidePublishEngine {
                     warningLog(" => nbMaxPublishRequestsAcceptedByServer =", this.nbMaxPublishRequestsAcceptedByServer);
                 }
             } else {
+                // istanbul ignore next
                 if (doDebug) {
                     debugLog(chalk.cyan("ClientSidePublishEngine.prototype.internalSendPublishRequest callback "));
                 }
@@ -390,6 +391,7 @@ export class ClientSidePublishEngine {
                 // delegate notificationData to the subscription callback
                 subscription.onNotificationMessage(notificationMessage);
             } catch (err) {
+                // istanbul ignore next
                 if (doDebug) {
                     debugLog(err);
                     debugLog("Exception in onNotificationMessage");
@@ -418,6 +420,7 @@ export class ClientSidePublishEngine {
 
             // istanbul ignore next
             if (doDebug) {
+                // istanbul ignore next
                 debugLog(
                     chalk.bgCyan.yellow.bold(" republish Request for subscription"),
                     request.subscriptionId,

package/source/private/client_session_impl.ts

@@ -2061,7 +2061,7 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
         str += "\n timeout.................. " + this.timeout + "ms" + timeoutInfo;
         str += "\n serverNonce.............. " + (this.serverNonce ? this.serverNonce!.toString("hex") : "");
         str += "\n serverCertificate........ " + buffer_ellipsis(this.serverCertificate);
-        // xx console.log(" serverSignature.......... ", this.serverSignature);
+        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;

package/source/private/client_subscription_impl.ts

@@ -760,6 +760,7 @@ export class ClientSubscriptionImpl extends EventEmitter implements ClientSubscr
             displayKeepAliveWarning(this.session.timeout, this.maxKeepAliveCount, this.publishingInterval);
             ClientSubscription.ignoreNextWarning = false;
 
+            // istanbul ignore next
             if (doDebug) {
                 debugLog(chalk.yellow.bold("registering callback"));
                 debugLog(chalk.yellow.bold("publishingInterval               "), this.publishingInterval);

package/source/reconnection.ts

@@ -174,12 +174,14 @@ function repair_client_session_by_recreating_a_new_session(
     // and may be upgraded in between, we have to invalidate the extra data type manager
     invalidateExtraDataTypeManager(session);
 
+    // istanbul ignore next
     if (doDebug) {
-        doDebug && debugLog(" repairing client session by_recreating a new session for old session ", session.sessionId.toString());
+        debugLog(" repairing client session by_recreating a new session for old session ", session.sessionId.toString());
     }
 
     //  TO DO : it is possible that session is already closed while we get there
     if (session.hasBeenClosed()) {
+        // istanbul ignore next
         doDebug && debugLog(chalk.bgWhite.red("Aborting reactivation of old session because user requested session to be closed"));
         return callback(new Error("reconnection cancelled due to session termination"));
     }
@@ -194,6 +196,7 @@ function repair_client_session_by_recreating_a_new_session(
                 if (session.hasBeenClosed()) {
                     return innerCallback(new Error("Cannot complete subscription republish due to session termination"));
                 }
+                // istanbul ignore next
                 doDebug && debugLog(chalk.bgWhite.red("    => suspend old session publish engine...."));
                 session.getPublishEngine().suspend(true);
                 innerCallback();
@@ -218,6 +221,7 @@ function repair_client_session_by_recreating_a_new_session(
                     newSession,
                     newSession.userIdentityInfo!,
                     (err: Error | null, session1?: ClientSessionImpl) => {
+                        // istanbul ignore next
                         doDebug && debugLog("    =>  activating a new session .... Done err=", err ? err.message : "null");
                         if (err) {
                             doDebug &&
@@ -235,7 +239,9 @@ function repair_client_session_by_recreating_a_new_session(
                                 if (err2) {
                                     warningLog("closing session", err2.message);
                                 }
+                                // istanbul ignore next
                                 doDebug && debugLog("the temporary replacement session is now closed");
+                                // istanbul ignore next
                                 doDebug && debugLog(" err ", err.message, "propagated upwards");
                                 innerCallback(err);
                             });
@@ -459,7 +465,6 @@ export function repair_client_session(client: IClientBase, session: ClientSessio
                     " => Let's retry"
                 );
                 if (!session.hasBeenClosed()) {
-
                     const delay = 2000;
                     errorLog(chalk.red(`... will retry session repair... in ${delay} ms`));
                     setTimeout(() => {
@@ -468,24 +473,27 @@ export function repair_client_session(client: IClientBase, session: ClientSessio
                     }, delay);
                     return;
                 } else {
-                    console.log(chalk.red("session restoration should be interrupted because session has been closed forcefully"));
+                    errorLog(chalk.red("session restoration should be interrupted because session has been closed forcefully"));
                     // session does not need to be repaired anymore
                     callback();
-                } 
+                }
                 return;
             }
 
             privateSession._reconnecting.reconnecting = false;
 
-            // warningLog("Session has been restored");
+            // istanbul ignore next
             doDebug && debugLog(chalk.yellow("session has been restored"), session.sessionId.toString());
-           
+
             session.emit("session_restored");
             const otherCallbacks = privateSession._reconnecting.pendingCallbacks;
             privateSession._reconnecting.pendingCallbacks = [];
 
             // re-inject element in queue
+            
+            // istanbul ignore next
             doDebug && debugLog(chalk.yellow("re-injecting transaction queue"), transactionQueue.length);
+            
             transactionQueue.forEach((e: any) => privateSession.pendingTransactions.push(e));
             otherCallbacks.forEach((c: EmptyCallback) => c(err));
             callback(err);