node-opcua-client 2.168.0 → 2.169.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-client",
-    "version": "2.168.0",
+    "version": "2.169.0",
     "description": "pure nodejs OPCUA SDK - module client",
     "scripts": {
         "clean": "npx rimraf -g node_modules dist *.tsbuildinfo certificates",
@@ -16,54 +16,54 @@
     "dependencies": {
         "@ster5/global-mutex": "^3.3.0",
         "chalk": "4.1.2",
-        "node-opcua-alarm-condition": "2.168.0",
+        "node-opcua-alarm-condition": "2.169.0",
         "node-opcua-assert": "2.164.0",
-        "node-opcua-basic-types": "2.168.0",
-        "node-opcua-buffer-utils": "2.168.0",
-        "node-opcua-certificate-manager": "2.168.0",
-        "node-opcua-client-dynamic-extension-object": "2.168.0",
-        "node-opcua-common": "2.168.0",
+        "node-opcua-basic-types": "2.169.0",
+        "node-opcua-buffer-utils": "2.169.0",
+        "node-opcua-certificate-manager": "2.169.0",
+        "node-opcua-client-dynamic-extension-object": "2.169.0",
+        "node-opcua-common": "2.169.0",
         "node-opcua-constants": "2.157.0",
-        "node-opcua-crypto": "5.3.3",
-        "node-opcua-data-model": "2.168.0",
-        "node-opcua-data-value": "2.168.0",
-        "node-opcua-date-time": "2.168.0",
+        "node-opcua-crypto": "5.3.5",
+        "node-opcua-data-model": "2.169.0",
+        "node-opcua-data-value": "2.169.0",
+        "node-opcua-date-time": "2.169.0",
         "node-opcua-debug": "2.168.0",
-        "node-opcua-extension-object": "2.168.0",
+        "node-opcua-extension-object": "2.169.0",
         "node-opcua-hostname": "2.167.0",
-        "node-opcua-nodeid": "2.168.0",
-        "node-opcua-numeric-range": "2.168.0",
-        "node-opcua-object-registry": "2.168.0",
-        "node-opcua-pki": "6.12.0",
-        "node-opcua-pseudo-session": "2.168.0",
-        "node-opcua-schemas": "2.168.0",
-        "node-opcua-secure-channel": "2.168.0",
-        "node-opcua-service-browse": "2.168.0",
-        "node-opcua-service-call": "2.168.0",
-        "node-opcua-service-discovery": "2.168.0",
-        "node-opcua-service-endpoints": "2.168.0",
-        "node-opcua-service-filter": "2.168.0",
-        "node-opcua-service-history": "2.168.0",
-        "node-opcua-service-query": "2.168.0",
-        "node-opcua-service-read": "2.168.0",
-        "node-opcua-service-register-node": "2.168.0",
-        "node-opcua-service-secure-channel": "2.168.0",
-        "node-opcua-service-session": "2.168.0",
-        "node-opcua-service-subscription": "2.168.0",
-        "node-opcua-service-translate-browse-path": "2.168.0",
-        "node-opcua-service-write": "2.168.0",
-        "node-opcua-status-code": "2.168.0",
-        "node-opcua-types": "2.168.0",
-        "node-opcua-utils": "2.168.0",
-        "node-opcua-variant": "2.168.0",
+        "node-opcua-nodeid": "2.169.0",
+        "node-opcua-numeric-range": "2.169.0",
+        "node-opcua-object-registry": "2.169.0",
+        "node-opcua-pki": "6.13.0",
+        "node-opcua-pseudo-session": "2.169.0",
+        "node-opcua-schemas": "2.169.0",
+        "node-opcua-secure-channel": "2.169.0",
+        "node-opcua-service-browse": "2.169.0",
+        "node-opcua-service-call": "2.169.0",
+        "node-opcua-service-discovery": "2.169.0",
+        "node-opcua-service-endpoints": "2.169.0",
+        "node-opcua-service-filter": "2.169.0",
+        "node-opcua-service-history": "2.169.0",
+        "node-opcua-service-query": "2.169.0",
+        "node-opcua-service-read": "2.169.0",
+        "node-opcua-service-register-node": "2.169.0",
+        "node-opcua-service-secure-channel": "2.169.0",
+        "node-opcua-service-session": "2.169.0",
+        "node-opcua-service-subscription": "2.169.0",
+        "node-opcua-service-translate-browse-path": "2.169.0",
+        "node-opcua-service-write": "2.169.0",
+        "node-opcua-status-code": "2.169.0",
+        "node-opcua-types": "2.169.0",
+        "node-opcua-utils": "2.169.0",
+        "node-opcua-variant": "2.169.0",
         "thenify-ex": "4.4.0"
     },
     "devDependencies": {
         "dequeue": "^1.0.5",
-        "node-opcua-address-space": "2.168.0",
-        "node-opcua-binary-stream": "2.168.0",
-        "node-opcua-factory": "2.168.0",
-        "node-opcua-leak-detector": "2.168.0",
+        "node-opcua-address-space": "2.169.0",
+        "node-opcua-binary-stream": "2.169.0",
+        "node-opcua-factory": "2.169.0",
+        "node-opcua-leak-detector": "2.169.0",
         "node-opcua-nodesets": "2.163.1"
     },
     "eslintConfig": {
@@ -86,7 +86,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "653b6d6df801ca17298308089dee32e5b12102b6",
+    "gitHead": "82d570d3e95bea689cbbe30096279885c5282245",
     "files": [
         "dist",
         "source"

package/source/client_monitored_item.ts

@@ -1,11 +1,11 @@
 /**
  * @module node-opcua-client
  */
-import type { EventEmitter } from "events";
+import type { EventEmitter } from "node:events";
 
 import { type DataValue, TimestampsToReturn } from "node-opcua-data-value";
 import type { ReadValueIdOptions } from "node-opcua-service-read";
-import { MonitoringMode, type MonitoringParametersOptions } from "node-opcua-types";
+import type { MonitoringParametersOptions } from "node-opcua-types";
 import type { Variant } from "node-opcua-variant";
 import type { ClientMonitoredItemBase, ClientMonitoredItemOrGroupAction } from "./client_monitored_item_base";
 import type { ClientSubscription } from "./client_subscription";
@@ -22,8 +22,9 @@ export interface ClientMonitoredItem extends ClientMonitoredItemBase, ClientMoni
     on(event: "err", eventHandler: (message: string) => void): this;
 }
 
-export class ClientMonitoredItem {
-    public static create(
+// eslint-disable-next-line @typescript-eslint/no-namespace
+export namespace ClientMonitoredItem {
+    export let create = function(
         subscription: ClientSubscription,
         itemToMonitor: ReadValueIdOptions,
         monitoringParameters: MonitoringParametersOptions,

package/source/client_monitored_item_base.ts

@@ -1,8 +1,8 @@
 /**
  * @module node-opcua-client
  */
-import type { EventEmitter } from "events";
-import { type AttributeIds, UInt32 } from "node-opcua-basic-types";
+import type { EventEmitter } from "node:events";
+import type { AttributeIds } from "node-opcua-basic-types";
 import type { QualifiedNameLike } from "node-opcua-data-model";
 import type { DataValue } from "node-opcua-data-value";
 import type { ExtensionObject } from "node-opcua-extension-object";
@@ -11,6 +11,7 @@ import type { NumericRange } from "node-opcua-numeric-range";
 import type { TimestampsToReturn } from "node-opcua-service-read";
 import type {
     MonitoredItemCreateResult,
+    MonitoredItemModifyResult,
     MonitoringMode,
     MonitoringParameters,
     MonitoringParametersOptions
@@ -20,14 +21,19 @@ import type { Variant } from "node-opcua-variant";
 
 import type { ClientSubscription } from "./client_subscription";
 
-// tslint:disable:unified-signatures
 export interface ClientMonitoredItemOrGroupAction {
-    modify(parameters: MonitoringParametersOptions, timestampsToReturn?: TimestampsToReturn): Promise<StatusCode>;
-    modify(parameters: MonitoringParametersOptions, callback: Callback<StatusCode>): void;
+    modify(
+        parameters: MonitoringParametersOptions,
+        timestampsToReturn?: TimestampsToReturn
+    ): Promise<MonitoredItemModifyResult>;
+    modify(
+        parameters: MonitoringParametersOptions,
+        callback: Callback<MonitoredItemModifyResult>
+    ): void;
     modify(
         parameters: MonitoringParametersOptions,
         timestampsToReturn: TimestampsToReturn | null,
-        callback: Callback<StatusCode>
+        callback: Callback<MonitoredItemModifyResult>
     ): void;
 
     setMonitoringMode(monitoringMode: MonitoringMode): Promise<StatusCode>;
@@ -37,7 +43,6 @@ export interface ClientMonitoredItemOrGroupAction {
     terminate(done: ErrorCallback): void;
 }
 
-// tslint:disable:unified-signatures
 export interface ClientMonitoredItemBase extends EventEmitter, ClientMonitoredItemOrGroupAction {
     on(event: "changed", eventHandler: (dataValue: DataValue) => void): this;
     on(event: "changed", eventHandler: (values: Variant[]) => void): this;
@@ -60,7 +65,7 @@ export interface ClientMonitoredItemBase {
     readonly subscription: ClientSubscription;
     readonly monitoringMode: MonitoringMode;
     readonly statusCode: StatusCode;
-    readonly monitoredItemId?: any;
+    readonly monitoredItemId?: number;
     readonly result?: MonitoredItemCreateResult;
     readonly filterResult?: ExtensionObject;
 }

package/source/client_monitored_item_toolbox.ts

@@ -4,6 +4,7 @@
 import chalk from "chalk";
 
 import { assert } from "node-opcua-assert";
+import type { UInt32 } from "node-opcua-basic-types";
 import type { TimestampsToReturn } from "node-opcua-data-value";
 import { checkDebugFlag, make_debugLog } from "node-opcua-debug";
 import {
@@ -16,8 +17,7 @@ import {
     type MonitoringMode,
     type SetMonitoringModeResponse
 } from "node-opcua-service-subscription";
-import { type Callback, type ErrorCallback, type StatusCode, StatusCodes } from "node-opcua-status-code";
-
+import type { Callback, ErrorCallback, StatusCode } from "node-opcua-status-code";
 import type { MonitoredItemCreateRequestOptions, MonitoringParametersOptions } from "node-opcua-types";
 import type { ClientMonitoredItemBase } from "./client_monitored_item_base";
 import type { SetMonitoringModeRequestLike } from "./client_session";
@@ -26,7 +26,7 @@ import type { ClientMonitoredItemImpl } from "./private/client_monitored_item_im
 import type { ClientSessionImpl } from "./private/client_session_impl";
 
 const debugLog = make_debugLog(__filename);
-const doDebug = checkDebugFlag(__filename);
+const _doDebug = checkDebugFlag(__filename);
 
 export interface ClientMonitoredItemBaseEx extends ClientMonitoredItemBase {
     internalSetMonitoringMode(monitoringMode: MonitoringMode): void;
@@ -34,8 +34,8 @@ export interface ClientMonitoredItemBaseEx extends ClientMonitoredItemBase {
 /**
  * @internal
  */
-export class ClientMonitoredItemToolbox {
-    public static _toolbox_monitor(
+export namespace ClientMonitoredItemToolbox {
+    export function _toolbox_monitor(
         subscription: ClientSubscription,
         timestampsToReturn: TimestampsToReturn,
         monitoredItems: ClientMonitoredItemBase[],
@@ -46,18 +46,14 @@ export class ClientMonitoredItemToolbox {
         // we expect subscription to be valid and have a valid session
         if (!subscription.hasSession) {
             const err0 = new Error("Invalid subscription");
-            if (done) {
-                return done(err0);
-            }
+            done(err0);
             return;
         }
 
         // may be the subscription has been terminated or is not fully initialize, in the meantime
         if (!subscription.isActive) {
             const err1 = new Error("Subscription has been terminated or is not fully initialized");
-            if (done) {
-                return done(err1);
-            }
+            done(err1);
             return;
         }
 
@@ -66,7 +62,8 @@ export class ClientMonitoredItemToolbox {
             const monitoredItemI = monitoredItem as ClientMonitoredItemImpl;
             const itemToCreate = monitoredItemI._prepare_for_monitoring();
             if (typeof itemToCreate.error === "string") {
-                return done(new Error(itemToCreate.error));
+                done(new Error(itemToCreate.error));
+                return;
             }
             itemsToCreate.push(itemToCreate as MonitoredItemCreateRequestOptions);
         }
@@ -107,7 +104,7 @@ export class ClientMonitoredItemToolbox {
         });
     }
 
-    public static _toolbox_modify(
+    export function _toolbox_modify(
         subscription: ClientSubscription,
         monitoredItems: ClientMonitoredItemBase[],
         parameters: MonitoringParametersOptions,
@@ -139,10 +136,12 @@ export class ClientMonitoredItemToolbox {
         session.modifyMonitoredItems(modifyMonitoredItemsRequest, (err: Error | null, response?: ModifyMonitoredItemsResponse) => {
             /* c8 ignore next */
             if (err) {
-                return callback(err);
+                callback(err);
+                return;
             }
             if (!response || !(response instanceof ModifyMonitoredItemsResponse)) {
-                return callback(new Error("internal error"));
+                callback(new Error("internal error"));
+                return;
             }
 
             response.results = response.results || [];
@@ -153,19 +152,20 @@ export class ClientMonitoredItemToolbox {
 
             /* c8 ignore next */
             if (response.results.length === 1 && res.statusCode.isNotGood()) {
-                return callback(new Error("Error" + res.statusCode.toString()));
+                callback(new Error(`Error${res.statusCode.toString()}`));
+                return;
             }
             callback(null, response.results);
         });
     }
 
-    public static _toolbox_setMonitoringMode(
+    export function _toolbox_setMonitoringMode(
         subscription: ClientSubscription,
         monitoredItems: ClientMonitoredItemBaseEx[],
         monitoringMode: MonitoringMode,
         callback: Callback<StatusCode[]>
     ): void {
-        const monitoredItemIds = monitoredItems.map((monitoredItem) => monitoredItem.monitoredItemId);
+        const monitoredItemIds = monitoredItems.map((monitoredItem) => monitoredItem.monitoredItemId as UInt32);
 
         const setMonitoringModeRequest: SetMonitoringModeRequestLike = {
             monitoredItemIds,
@@ -178,12 +178,16 @@ export class ClientMonitoredItemToolbox {
 
         session.setMonitoringMode(setMonitoringModeRequest, (err: Error | null, response?: SetMonitoringModeResponse) => {
             if (err) {
-                return callback(err);
+                callback(err);
+                return;
+            }
+            if (!response) {
+                callback(new Error("internal error"));
+                return;
             }
             monitoredItems.forEach((monitoredItem) => {
                 monitoredItem.internalSetMonitoringMode(monitoringMode);
             });
-            response = response!;
             response.results = response.results || [];
             callback(null, response.results);
         });

package/source/private/client_base_impl.ts

@@ -230,7 +230,7 @@ function __findEndpoint(this: ClientBaseImpl, endpointUrl: string, params: FindE
  */
 async function _verify_serverCertificate(certificateManager: OPCUACertificateManager, serverCertificate: Certificate) {
     const status = await certificateManager.checkCertificate(serverCertificate);
-    if (status !== StatusCodes.Good) {
+    if (!status.isGood()) {
         // c8 ignore next
         if (doDebug) {
             // do it again for debug purposes
@@ -1481,14 +1481,35 @@ export class ClientBaseImpl<Events extends OPCUAClientBaseEvents = OPCUAClientBa
                     warningLog("[NODE-OPCUA-W25] client's server certificate verification has failed ", err1.message);
                     warningLog("                 clientCertificateManager.rootDir = ", this.clientCertificateManager.rootDir);
 
-                    const f = (b: Buffer) =>
-                        `                 ${b.toString("base64").replace(/(.{80})/g, "$1\n                 ")}`;
-
                     const chain = split_der(endpoint.serverCertificate);
-                    warningLog(`                  server certificate contains ${chain.length} elements`);
+                    warningLog(`                 server certificate chain contains ${chain.length} element(s)`);
                     for (let i = 0; i < chain.length; i++) {
                         const c = chain[i];
-                        warningLog("certificate", i, `\n${f(c)}`);
+                        const thumbprint = makeSHA1Thumbprint(c).toString("hex");
+                        try {
+                            const { exploreCertificate } = require("node-opcua-crypto");
+                            const info = exploreCertificate(c);
+                            const tbs = info.tbsCertificate;
+                            const cn = tbs.subject?.commonName ?? "unknown";
+                            const issuerCN = tbs.issuer?.commonName ?? "unknown";
+                            const isCA = tbs.extensions?.basicConstraints?.cA === true;
+                            const isSelfSigned = JSON.stringify(tbs.subject) === JSON.stringify(tbs.issuer);
+                            const certType = isCA
+                                ? (isSelfSigned ? "Root CA" : "Intermediate CA")
+                                : (isSelfSigned ? "Application (self-signed)" : "Application (CA-signed)");
+                            const ski = tbs.extensions?.subjectKeyIdentifier ?? "-";
+                            const aki = tbs.extensions?.authorityKeyIdentifier?.keyIdentifier ?? "-";
+                            const notBefore = tbs.validity.notBefore.toISOString();
+                            const notAfter = tbs.validity.notAfter.toISOString();
+                            warningLog(`                 [${i + 1}/${chain.length}] "${cn}" (${certType})`);
+                            warningLog(`                   thumbprint: ${thumbprint}`);
+                            warningLog(`                   issuer:     "${issuerCN}"`);
+                            warningLog(`                   SKI:        ${ski}`);
+                            warningLog(`                   AKI:        ${aki}`);
+                            warningLog(`                   validity:   ${notBefore} → ${notAfter}`);
+                        } catch {
+                            warningLog(`                 [${i + 1}/${chain.length}] thumbprint: ${thumbprint} (details unavailable)`);
+                        }
                     }
                     if (chain.length > 1) {
                         warningLog(

package/source/private/client_monitored_item_group_impl.ts

@@ -2,14 +2,14 @@
  * @module node-opcua-client-private
  */
 // tslint:disable:no-empty
-import { EventEmitter } from "events";
+import { EventEmitter } from "node:events";
 import { assert } from "node-opcua-assert";
 import { coerceTimestampsToReturn, type DataValue, TimestampsToReturn } from "node-opcua-data-value";
 import { checkDebugFlag, make_debugLog, make_warningLog } from "node-opcua-debug";
-import { resolveNodeId } from "node-opcua-nodeid";
+import { NodeId, resolveNodeId } from "node-opcua-nodeid";
 import { MonitoringMode, type MonitoringParametersOptions } from "node-opcua-service-subscription";
 import type { Callback, ErrorCallback, StatusCode } from "node-opcua-status-code";
-import type { ReadValueIdOptions } from "node-opcua-types";
+import type { MonitoredItemModifyResult, ReadValueIdOptions } from "node-opcua-types";
 import type { ClientMonitoredItemBase } from "../client_monitored_item_base";
 import { ClientMonitoredItemGroup } from "../client_monitored_item_group";
 import { type ClientMonitoredItemBaseEx, ClientMonitoredItemToolbox } from "../client_monitored_item_toolbox";
@@ -17,8 +17,7 @@ import type { ClientSubscription } from "../client_subscription";
 import { ClientMonitoredItemImpl } from "./client_monitored_item_impl";
 import type { ClientSubscriptionImpl } from "./client_subscription_impl";
 
-const debugLog = make_debugLog(__filename);
-const doDebug = checkDebugFlag(__filename);
+
 const warningLog = make_warningLog(__filename);
 
 /**
@@ -38,7 +37,7 @@ export class ClientMonitoredItemGroupImpl extends EventEmitter implements Client
 
     constructor(
         subscription: ClientSubscription,
-        itemsToMonitor: any[],
+        itemsToMonitor: ReadValueIdOptions[],
         monitoringParameters: MonitoringParametersOptions,
         timestampsToReturn: TimestampsToReturn,
         monitoringMode: MonitoringMode = MonitoringMode.Reporting
@@ -47,7 +46,7 @@ export class ClientMonitoredItemGroupImpl extends EventEmitter implements Client
         assert(Array.isArray(itemsToMonitor));
         // Try to resolve the nodeId and fail fast if we can't.
         itemsToMonitor.forEach((itemToMonitor: ReadValueIdOptions) => {
-            itemToMonitor.nodeId = resolveNodeId(itemToMonitor.nodeId!);
+            itemToMonitor.nodeId = resolveNodeId(itemToMonitor.nodeId || NodeId.nullNodeId);
         });
 
         timestampsToReturn = coerceTimestampsToReturn(timestampsToReturn);
@@ -82,8 +81,8 @@ export class ClientMonitoredItemGroupImpl extends EventEmitter implements Client
                 )
                 .join("\n") +
             "\n];\n";
-        ret += "timestampsToReturn:   " + TimestampsToReturn[this.timestampsToReturn] + "\n";
-        ret += "monitoringMode        " + MonitoringMode[this.monitoringMode];
+        ret += `timestampsToReturn:   ${TimestampsToReturn[this.timestampsToReturn]}\n`;
+        ret += `monitoringMode        ${MonitoringMode[this.monitoringMode]}`;
         return ret;
     }
 
@@ -109,13 +108,13 @@ export class ClientMonitoredItemGroupImpl extends EventEmitter implements Client
     /**
 
      */
-    public async modify(parameters: MonitoringParametersOptions): Promise<StatusCode>;
-    public async modify(parameters: MonitoringParametersOptions, timestampsToReturn: TimestampsToReturn): Promise<StatusCode>;
-    public modify(parameters: MonitoringParametersOptions, callback: (err: Error | null, statusCode?: StatusCode) => void): void;
+    public async modify(parameters: MonitoringParametersOptions): Promise<MonitoredItemModifyResult>;
+    public async modify(parameters: MonitoringParametersOptions, timestampsToReturn: TimestampsToReturn): Promise<MonitoredItemModifyResult>;
+    public modify(parameters: MonitoringParametersOptions, callback: Callback<MonitoredItemModifyResult>): void;
     public modify(
         parameters: MonitoringParametersOptions,
         timestampsToReturn: TimestampsToReturn | null,
-        callback: (err: Error | null, statusCode?: StatusCode) => void
+        callback: Callback<MonitoredItemModifyResult>
     ): void;
     public modify(...args: any[]): any {
         if (args.length === 2) {
@@ -223,8 +222,8 @@ ClientMonitoredItemGroupImpl.prototype.modify = withCallback(ClientMonitoredItem
 
 ClientMonitoredItemGroup.create = (
     subscription: ClientSubscription,
-    itemsToMonitor: any[],
-    monitoringParameters: any,
+    itemsToMonitor: ReadValueIdOptions[],
+    monitoringParameters: MonitoringParametersOptions,
     timestampsToReturn: TimestampsToReturn
 ) => {
     const monitoredItemGroup = new ClientMonitoredItemGroupImpl(
@@ -238,7 +237,7 @@ ClientMonitoredItemGroup.create = (
         if (err) {
             return;
         }
-        monitoredItemGroup._monitor((err1?: Error) => {
+        monitoredItemGroup._monitor((_err1?: Error) => {
             /** */
         });
     });