node-opcua-client 2.155.0 → 2.157.0

package/source/client_session.ts

@@ -61,7 +61,9 @@ import {
     CallMethodResult,
     HistoryReadRequest,
     HistoryReadResponse,
-    HistoryReadValueIdOptions
+    HistoryReadValueIdOptions,
+    ReadValueId,
+    ReadValueIdOptions
 } from "node-opcua-types";
 
 import { ExtraDataTypeManager } from "node-opcua-client-dynamic-extension-object";
@@ -197,19 +199,19 @@ export interface ClientSessionReadService extends IBasicSessionRead {
     /**
      * @deprecated use read() instead
      */
-    readVariableValue(nodeId: NodeIdLike, callback: ResponseCallback<DataValue>): void;
+    readVariableValue(nodeId: NodeIdLike | ReadValueIdOptions, callback: ResponseCallback<DataValue>): void;
     /**
      * @deprecated use read() instead
      */
-    readVariableValue(nodeId: NodeIdLike): Promise<DataValue>;
+    readVariableValue(nodeId: NodeIdLike | ReadValueIdOptions): Promise<DataValue>;
     /**
      * @deprecated use read() instead
      */
-    readVariableValue(nodeIds: NodeIdLike[], callback: ResponseCallback<DataValue[]>): void;
+    readVariableValue(nodeIds: (NodeIdLike | ReadValueIdOptions)[], callback: ResponseCallback<DataValue[]>): void;
     /**
      * @deprecated use read() instead
      */
-    readVariableValue(nodeIds: NodeIdLike[]): Promise<DataValue[]>;
+    readVariableValue(nodeIds: (NodeIdLike | ReadValueIdOptions)[]): Promise<DataValue[]>;
 }
 
 // write services

package/source/client_subscription.ts

@@ -231,6 +231,9 @@ export interface ClientSubscription extends EventEmitter  {
         linksToRemove: ClientMonitoredItemBase[] | null
     ): Promise<SetTriggeringResponse>;
 
+    setPublishingMode(publishing: boolean): Promise<StatusCode>;
+    setPublishingMode(publishing: boolean, callback: Callback<StatusCode>): void;
+
     terminate(): Promise<void>;
     terminate(callback: ErrorCallback): void;
 }

package/source/index.ts

@@ -1,7 +1,25 @@
-/**
- * @module node-opcua-client
+/*!
+ * The MIT License (MIT)
+ * Copyright (c) 2022-2025  Sterfive SAS - 833264583 RCS ORLEANS - France  (https://www.sterfive.com)
+ * Copyright (c) 2014-2022 Etienne Rossignon
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ * 
+ *   The above copyright notice and this permission notice shall be included in all
+ *   copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-
 export * from "./client_base";
 export * from "./opcua_client";
 export * from "./client_session";

package/source/private/client_base_impl.ts

@@ -609,6 +609,7 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
                         err!.message.match("BadCertificateInvalid") ||
                         err!.message.match(/socket has been disconnected by third party/)
                     ) {
+                        // it is possible also that hte server has shutdown innapropriately the connection      
                         warningLog(
                             "the server certificate has changed,  we need to retrieve server certificate again: ",
                             err.message
@@ -1236,7 +1237,10 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
         }
         if (this._internalState === "disconnected" || this._internalState === "disconnecting") {
             if (this._internalState === "disconnecting") {
-                warningLog("[NODE-OPCUA-W26] OPCUAClient#disconnect called while already disconnecting");
+                warningLog("[NODE-OPCUA-W26] OPCUAClient#disconnect called while already disconnecting. clientName=", this.clientName);
+            }
+            if (!this._reconnectionIsCanceled && this.isReconnecting) {
+                errorLog("Internal Error : _reconnectionIsCanceled should be true if isReconnecting is true");
             }
             return callback();
         }
@@ -1666,7 +1670,7 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
 
         debugLog("Entering _repairConnection ", this._internalState);
         if (this.#insideRepairConnection) {
-            errorLog("_repairConnection already in progress internal state = ", this._internalState);
+            errorLog("_repairConnection already in progress internal state = ", this._internalState, "clientName =", this.clientName);
             this.#shouldRepairAgain = true;
             return;
         }
@@ -1675,7 +1679,6 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
         debugLog("recreating new secure channel ", this._internalState);
         this._recreate_secure_channel((err1?: Error) => {
             debugLog("secureChannel#on(close) => _recreate_secure_channel returns ", err1 ? err1.message : "OK");
-
             if (err1) {
                 debugLog("_recreate_secure_channel has failed: err = ", err1.message);
                 this.emit("close", err1);

package/source/private/client_session_impl.ts

@@ -2,7 +2,6 @@
  * @module node-opcua-client-private
  */
 import { EventEmitter } from "events";
-import { callbackify } from "util";
 import chalk from "chalk";
 import { assert } from "node-opcua-assert";
 import { AggregateFunction } from "node-opcua-constants";
@@ -632,7 +631,7 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession, Re
         options.numValuesPerNode = options.numValuesPerNode || 0;
         options.returnBounds = options.returnBounds || options.returnBounds === undefined ? true : false;
         options.isReadModified = options.isReadModified || false;
-        options.timestampsToReturn = options.timestampsToReturn || TimestampsToReturn.Both;
+        options.timestampsToReturn = options.timestampsToReturn ?? TimestampsToReturn.Both;
 
         const arg0 = args[0];
         const isArray = Array.isArray(arg0);

package/source/private/client_subscription_impl.ts

@@ -244,7 +244,7 @@ export class ClientSubscriptionImpl extends EventEmitter implements ClientSubscr
 
         if (this.subscriptionId === TERMINATED_SUBSCRIPTION_ID || this.subscriptionId === TERMINATING_SUBSCRIPTION_ID) {
             // already terminated... just ignore
-            return callback(new Error("Already Terminated"));
+            return callback();
         }
 
         if (isFinite(this.subscriptionId)) {

package/source/private/reconnection/client_reconnection.ts

@@ -1,4 +1,3 @@
-import { warn } from "console";
 import { ClientBaseImpl } from "../client_base_impl";
 
 export function waitUntilReconnectionIsCanceled(client: ClientBaseImpl, callback: () => void) {
@@ -9,7 +8,7 @@ export function waitUntilReconnectionIsCanceled(client: ClientBaseImpl, callback
         if (!client.isReconnecting || ++intervalCount > maxIntervalCount) {
             clearInterval(timer);
             if (intervalCount > maxIntervalCount) {
-                warn("waitUntilReconnectionIsCanceled: timeout");
+                console.warn("waitUntilReconnectionIsCanceled: timeout");
             }
             callback();
         }