node-opcua-client 2.180.0 → 2.181.0

package/dist/tools/read_history_server_capabilities.d.ts

@@ -1,5 +1,5 @@
 import type { Variant } from "node-opcua-variant";
-import type { ClientSession } from "../client_session";
+import type { ClientSession } from "../client_session.js";
 export interface HistoryServerCapabilities {
     [key: string]: Variant;
 }

package/dist/verify.js

@@ -2,12 +2,38 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.verifyIsOPCUAValidCertificate = verifyIsOPCUAValidCertificate;
 exports.performCertificateSanityCheck = performCertificateSanityCheck;
+const node_crypto_1 = require("node:crypto");
+const node_opcua_crypto_1 = require("node-opcua-crypto");
 const web_1 = require("node-opcua-crypto/web");
 const node_opcua_debug_1 = require("node-opcua-debug");
-const _doDebug = (0, node_opcua_debug_1.checkDebugFlag)(__filename);
-const _debugLog = (0, node_opcua_debug_1.make_debugLog)(__filename);
-const errorLog = (0, node_opcua_debug_1.make_errorLog)(__filename);
-const warningLog = (0, node_opcua_debug_1.make_warningLog)(__filename);
+const _doDebug = (0, node_opcua_debug_1.checkDebugFlag)("verify");
+const _debugLog = (0, node_opcua_debug_1.make_debugLog)("verify");
+const errorLog = (0, node_opcua_debug_1.make_errorLog)("verify");
+const warningLog = (0, node_opcua_debug_1.make_warningLog)("verify");
+/**
+ * The opaque-key variant of the certificate/key match check: compares the
+ * certificate's SPKI against the one the key-operations provider reports.
+ * A provider without `getPublicKey` cannot be checked — that is worth a
+ * warning, not a refusal to start (the first real handshake will tell).
+ */
+async function verifyOpaqueKeyMatchesCertificate(secureObject, certificate) {
+    const keyOperations = secureObject.getKeyOperations();
+    if (!keyOperations.getPublicKey) {
+        warningLog("[NODE-OPCUA-W36] the key-operations provider does not implement getPublicKey():" +
+            " cannot verify that the certificate matches the (opaque) private key");
+        return;
+    }
+    const providerSpki = Buffer.from(await keyOperations.getPublicKey());
+    const certificateSpki = (0, node_crypto_1.createPublicKey)((0, web_1.extractPublicKeyFromCertificateSync)(certificate)).export({
+        type: "spki",
+        format: "der"
+    });
+    if (!providerSpki.equals(certificateSpki)) {
+        errorLog("[NODE-OPCUA-E01] Configuration error : the certificate and the (opaque) private key do not match !");
+        errorLog("               certificateFile= ", secureObject.certificateFile);
+        throw new Error("[NODE-OPCUA-E01] Configuration error : the certificate does not carry the key-operations provider's public key ! please fix your configuration");
+    }
+}
 function verifyIsOPCUAValidCertificate(certificate, certificateFile, type, applicationUri) {
     const certificateInfo = (0, web_1.exploreCertificate)(certificate);
     const now = new Date();
@@ -94,22 +120,36 @@ function verifyIsOPCUAValidCertificate(certificate, certificateFile, type, appli
 async function performCertificateSanityCheck(secureObject, serverOrClient, certificateStore, applicationUri) {
     // verify that certificate is matching private key, and inform the developer if not
     const certificate = secureObject.getCertificate();
-    const privateKey = secureObject.getPrivateKey();
-    //
-    if (!(0, web_1.publicKeyAndPrivateKeyMatches)(certificate, privateKey)) {
-        errorLog("[NODE-OPCUA-E01] Configuration error : the certificate and the private key do not match !");
-        errorLog("                  please check the configuration of the OPCUA Server");
-        errorLog("                    privateKey= ", secureObject.privateKeyFile);
-        errorLog("               certificateFile= ", secureObject.certificateFile);
-        throw new Error("[NODE-OPCUA-E01] Configuration error : the certificate and the private key do not match ! please fix your configuration");
-    }
-    // verify that the certificate provided has the right key length ( at least 2048)
-    const privateKeyInfo = (0, web_1.explorePrivateKey)(privateKey);
-    const keyLengthInBits = privateKeyInfo.modulus.length * 8;
-    if (keyLengthInBits <= 1024) {
-        warningLog(`[NODE-OPCUA-W04] The public/private key pair uses a key length which is equal or lower than 1024 bits. ( key length was ${keyLengthInBits} )\n` +
-            `OPCUA version 1.04 requires that security key length are greater or equal to 2048 bits.\n` +
-            `The ${serverOrClient} is operating at risk.                                             `);
+    let privateKey;
+    try {
+        privateKey = secureObject.getPrivateKey();
+    }
+    catch (err) {
+        if (!(err instanceof node_opcua_crypto_1.PrivateKeyUnavailableError)) {
+            throw err;
+        }
+        // The key is opaque (HSM/KMS-held): no material to compare or
+        // measure. Check what can be checked without it — that the
+        // certificate carries the provider's public key — and warn (not
+        // fail) when the provider cannot even produce that.
+        await verifyOpaqueKeyMatchesCertificate(secureObject, certificate);
+    }
+    if (privateKey) {
+        if (!(0, web_1.publicKeyAndPrivateKeyMatches)(certificate, privateKey)) {
+            errorLog("[NODE-OPCUA-E01] Configuration error : the certificate and the private key do not match !");
+            errorLog("                  please check the configuration of the OPCUA Server");
+            errorLog("                    privateKey= ", secureObject.privateKeyFile);
+            errorLog("               certificateFile= ", secureObject.certificateFile);
+            throw new Error("[NODE-OPCUA-E01] Configuration error : the certificate and the private key do not match ! please fix your configuration");
+        }
+        // verify that the certificate provided has the right key length ( at least 2048)
+        const privateKeyInfo = (0, web_1.explorePrivateKey)(privateKey);
+        const keyLengthInBits = privateKeyInfo.modulus.length * 8;
+        if (keyLengthInBits <= 1024) {
+            warningLog(`[NODE-OPCUA-W04] The public/private key pair uses a key length which is equal or lower than 1024 bits. ( key length was ${keyLengthInBits} )\n` +
+                `OPCUA version 1.04 requires that security key length are greater or equal to 2048 bits.\n` +
+                `The ${serverOrClient} is operating at risk.                                             `);
+        }
     }
     const options = {
         acceptOutdatedCertificate: false

package/dist/verify.js.map

@@ -1 +1 @@
-{"version":3,"file":"verify.js","sourceRoot":"","sources":["../source/verify.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"verify.js","sourceRoot":"","sources":["../source/verify.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-client",
-    "version": "2.180.0",
+    "version": "2.181.0",
     "description": "pure nodejs OPCUA SDK - module client",
     "scripts": {
         "clean": "npx rimraf -g node_modules dist *.tsbuildinfo certificates",
@@ -16,56 +16,57 @@
     "dependencies": {
         "@ster5/global-mutex": "^3.3.0",
         "chalk": "4.1.2",
-        "node-opcua-alarm-condition": "2.180.0",
+        "node-opcua-alarm-condition": "2.181.0",
         "node-opcua-assert": "2.179.0",
-        "node-opcua-basic-types": "2.180.0",
-        "node-opcua-buffer-utils": "2.179.0",
-        "node-opcua-certificate-manager": "2.180.0",
-        "node-opcua-client-dynamic-extension-object": "2.180.0",
-        "node-opcua-common": "2.180.0",
-        "node-opcua-constants": "2.179.0",
-        "node-opcua-crypto": "5.9.0",
-        "node-opcua-data-model": "2.180.0",
-        "node-opcua-data-value": "2.180.0",
-        "node-opcua-date-time": "2.180.0",
-        "node-opcua-debug": "2.179.0",
-        "node-opcua-extension-object": "2.180.0",
-        "node-opcua-hostname": "2.179.0",
-        "node-opcua-nodeid": "2.179.0",
-        "node-opcua-numeric-range": "2.180.0",
-        "node-opcua-object-registry": "2.179.0",
-        "node-opcua-pki": "6.21.0",
-        "node-opcua-pseudo-session": "2.180.0",
-        "node-opcua-schemas": "2.180.0",
-        "node-opcua-secure-channel": "2.180.0",
-        "node-opcua-service-browse": "2.180.0",
-        "node-opcua-service-call": "2.180.0",
-        "node-opcua-service-discovery": "2.180.0",
-        "node-opcua-service-endpoints": "2.180.0",
-        "node-opcua-service-filter": "2.180.0",
-        "node-opcua-service-history": "2.180.0",
-        "node-opcua-service-query": "2.180.0",
-        "node-opcua-service-read": "2.180.0",
-        "node-opcua-service-register-node": "2.180.0",
-        "node-opcua-service-secure-channel": "2.180.0",
-        "node-opcua-service-session": "2.180.0",
-        "node-opcua-service-subscription": "2.180.0",
-        "node-opcua-service-translate-browse-path": "2.180.0",
-        "node-opcua-service-write": "2.180.0",
-        "node-opcua-status-code": "2.180.0",
-        "node-opcua-transport": "2.180.0",
-        "node-opcua-types": "2.180.0",
-        "node-opcua-utils": "2.179.0",
-        "node-opcua-variant": "2.180.0",
+        "node-opcua-basic-types": "2.181.0",
+        "node-opcua-buffer-utils": "2.181.0",
+        "node-opcua-certificate-manager": "2.181.0",
+        "node-opcua-client-dynamic-extension-object": "2.181.0",
+        "node-opcua-common": "2.181.0",
+        "node-opcua-constants": "2.181.0",
+        "node-opcua-crypto": "5.10.1",
+        "node-opcua-data-model": "2.181.0",
+        "node-opcua-data-value": "2.181.0",
+        "node-opcua-date-time": "2.181.0",
+        "node-opcua-debug": "2.181.0",
+        "node-opcua-extension-object": "2.181.0",
+        "node-opcua-hostname": "2.181.0",
+        "node-opcua-nodeid": "2.181.0",
+        "node-opcua-numeric-range": "2.181.0",
+        "node-opcua-object-registry": "2.181.0",
+        "node-opcua-pki": "6.22.0",
+        "node-opcua-pseudo-session": "2.181.0",
+        "node-opcua-schemas": "2.181.0",
+        "node-opcua-secure-channel": "2.181.0",
+        "node-opcua-service-browse": "2.181.0",
+        "node-opcua-service-call": "2.181.0",
+        "node-opcua-service-discovery": "2.181.0",
+        "node-opcua-service-endpoints": "2.181.0",
+        "node-opcua-service-filter": "2.181.0",
+        "node-opcua-service-history": "2.181.0",
+        "node-opcua-service-query": "2.181.0",
+        "node-opcua-service-read": "2.181.0",
+        "node-opcua-service-register-node": "2.181.0",
+        "node-opcua-service-secure-channel": "2.181.0",
+        "node-opcua-service-session": "2.181.0",
+        "node-opcua-service-subscription": "2.181.0",
+        "node-opcua-service-translate-browse-path": "2.181.0",
+        "node-opcua-service-write": "2.181.0",
+        "node-opcua-status-code": "2.181.0",
+        "node-opcua-transport": "2.181.0",
+        "node-opcua-types": "2.181.0",
+        "node-opcua-utils": "2.181.0",
+        "node-opcua-variant": "2.181.0",
         "thenify-ex": "4.4.0"
     },
     "devDependencies": {
         "dequeue": "^1.0.5",
-        "node-opcua-address-space": "2.180.0",
-        "node-opcua-binary-stream": "2.180.0",
-        "node-opcua-factory": "2.180.0",
-        "node-opcua-leak-detector": "2.179.0",
-        "node-opcua-nodesets": "2.179.0"
+        "node-opcua-address-space": "2.181.0",
+        "node-opcua-binary-stream": "2.181.0",
+        "node-opcua-factory": "2.181.0",
+        "node-opcua-leak-detector": "2.181.0",
+        "node-opcua-nodesets": "2.181.0",
+        "node-opcua-test-helpers": "2.181.0"
     },
     "eslintConfig": {
         "env": {
@@ -87,7 +88,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "11ad1e0894355cd279e19443c6c9a4fc090e7d7a",
+    "gitHead": "f8f472c59e681b2aa18ae1533c3d1e5f17614c5c",
     "files": [
         "dist",
         "source"

package/source/alarms_and_conditions/client_alarm_tools.ts

@@ -13,9 +13,9 @@ import { type ReadValueIdOptions, TimestampsToReturn } from "node-opcua-service-
 import type { CreateSubscriptionRequestOptions, MonitoringParametersOptions } from "node-opcua-service-subscription";
 import { DataType, type Variant } from "node-opcua-variant";
 
-import type { ClientMonitoredItem } from "../client_monitored_item";
-import type { ClientSession } from "../client_session";
-import type { ClientSubscription } from "../client_subscription";
+import type { ClientMonitoredItem } from "../client_monitored_item.js";
+import type { ClientSession } from "../client_session.js";
+import type { ClientSubscription } from "../client_subscription.js";
 
 const doDebug = checkDebugFlag("A&E");
 const debugLog = make_debugLog("A&E");

package/source/alarms_and_conditions/client_tools.ts

@@ -9,7 +9,7 @@ import type { NodeId, NodeIdLike } from "node-opcua-nodeid";
 import { findMethodId, type ResponseCallback } from "node-opcua-pseudo-session";
 import type { Callback, StatusCode } from "node-opcua-status-code";
 
-import { ClientSessionImpl } from "../private/client_session_impl";
+import { ClientSessionImpl } from "../private/client_session_impl.js";
 
 ClientSessionImpl.prototype.disableCondition = () => {
     /** */

package/source/client_base.ts

@@ -18,8 +18,8 @@ import type { ApplicationDescription, EndpointDescription } from "node-opcua-ser
 import type { ChannelSecurityToken, MessageSecurityMode } from "node-opcua-service-secure-channel";
 import type { ErrorCallback } from "node-opcua-status-code";
 import type { IClientTransportFactory } from "node-opcua-transport";
-import type { Request, Response } from "./common";
-import type { ClientReverseConnect, ReverseConnectExpectation } from "./reverse/client_reverse_connect";
+import type { Request, Response } from "./common.js";
+import type { ClientReverseConnect, ReverseConnectExpectation } from "./reverse/client_reverse_connect.js";
 
 export type FindServersRequestLike = FindServersRequestOptions;
 export type FindServersOnNetworkRequestLike = FindServersOnNetworkRequestOptions;

package/source/client_monitored_item.ts

@@ -7,8 +7,8 @@ import { type DataValue, TimestampsToReturn } from "node-opcua-data-value";
 import type { ReadValueIdOptions } from "node-opcua-service-read";
 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";
+import type { ClientMonitoredItemBase, ClientMonitoredItemOrGroupAction } from "./client_monitored_item_base.js";
+import type { ClientSubscription } from "./client_subscription.js";
 
 export interface ClientMonitoredItem extends ClientMonitoredItemBase, ClientMonitoredItemOrGroupAction, EventEmitter {
     on(event: "changed", eventHandler: (dataValue: DataValue) => void): this;

package/source/client_monitored_item_base.ts

@@ -19,7 +19,7 @@ import type {
 import type { Callback, ErrorCallback, StatusCode } from "node-opcua-status-code";
 import type { Variant } from "node-opcua-variant";
 
-import type { ClientSubscription } from "./client_subscription";
+import type { ClientSubscription } from "./client_subscription.js";
 
 export interface ClientMonitoredItemOrGroupAction {
     modify(parameters: MonitoringParametersOptions, timestampsToReturn?: TimestampsToReturn): Promise<MonitoredItemModifyResult>;

package/source/client_monitored_item_group.ts

@@ -7,8 +7,8 @@ import type { DataValue, TimestampsToReturn } from "node-opcua-data-value";
 import type { ReadValueIdOptions } from "node-opcua-service-read";
 import type { MonitoringParametersOptions } from "node-opcua-types";
 
-import type { ClientMonitoredItemBase, ClientMonitoredItemOrGroupAction } from "./client_monitored_item_base";
-import type { ClientSubscription } from "./client_subscription";
+import type { ClientMonitoredItemBase, ClientMonitoredItemOrGroupAction } from "./client_monitored_item_base.js";
+import type { ClientSubscription } from "./client_subscription.js";
 
 export interface ClientMonitoredItemGroup extends EventEmitter, ClientMonitoredItemOrGroupAction {
     on(event: "changed", eventHandler: (monitoredItem: ClientMonitoredItemBase, dataValue: DataValue, index: number) => void): this;

package/source/client_monitored_item_toolbox.ts

@@ -19,14 +19,14 @@ import {
 } from "node-opcua-service-subscription";
 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";
-import type { ClientSubscription } from "./client_subscription";
-import type { ClientMonitoredItemImpl } from "./private/client_monitored_item_impl";
-import type { ClientSessionImpl } from "./private/client_session_impl";
-
-const debugLog = make_debugLog(__filename);
-const doDebug = checkDebugFlag(__filename);
+import type { ClientMonitoredItemBase } from "./client_monitored_item_base.js";
+import type { SetMonitoringModeRequestLike } from "./client_session.js";
+import type { ClientSubscription } from "./client_subscription.js";
+import type { ClientMonitoredItemImpl } from "./private/client_monitored_item_impl.js";
+import type { ClientSessionImpl } from "./private/client_session_impl.js";
+
+const debugLog = make_debugLog("client_monitored_item_toolbox");
+const doDebug = checkDebugFlag("client_monitored_item_toolbox");
 
 export interface ClientMonitoredItemBaseEx extends ClientMonitoredItemBase {
     internalSetMonitoringMode(monitoringMode: MonitoringMode): void;

package/source/client_session.ts

@@ -68,7 +68,7 @@ export { ExtraDataTypeManager } from "node-opcua-client-dynamic-extension-object
 export { ExtensionObject } from "node-opcua-extension-object";
 export { ArgumentDefinition, CallMethodRequestLike, MethodId } from "node-opcua-pseudo-session";
 
-import type { ClientSubscription } from "./client_subscription";
+import type { ClientSubscription } from "./client_subscription.js";
 
 export interface MonitoredItemData {
     clientHandles: Uint32Array;

package/source/client_session_keepalive_manager.ts

@@ -13,14 +13,14 @@ import { checkDebugFlag, make_debugLog, make_warningLog } from "node-opcua-debug
 import { coerceNodeId } from "node-opcua-nodeid";
 import { ClientSecureChannelLayer, type ServiceFaultAnnotatedError } from "node-opcua-secure-channel";
 import { StatusCodes } from "node-opcua-status-code";
-import type { ClientSessionImpl } from "./private/client_session_impl";
-import type { IClientBase } from "./private/i_private_client";
+import type { ClientSessionImpl } from "./private/client_session_impl.js";
+import type { IClientBase } from "./private/i_private_client.js";
 
 const serverStatusStateNodeId = coerceNodeId(VariableIds.Server_ServerStatus_State);
 
-const debugLog = make_debugLog(__filename);
-const doDebug = checkDebugFlag(__filename);
-const warningLog = make_warningLog(__filename);
+const debugLog = make_debugLog("client_session_keepalive_manager");
+const doDebug = checkDebugFlag("client_session_keepalive_manager");
+const warningLog = make_warningLog("client_session_keepalive_manager");
 
 export interface ClientSessionKeepAliveManagerEvents {
     on(event: "keepalive", eventHandler: (lastKnownServerState: ServerState, count: number) => void): this;

package/source/client_subscription.ts

@@ -16,10 +16,10 @@ import type {
 } from "node-opcua-service-subscription";
 import type { Callback, ErrorCallback, StatusCode } from "node-opcua-status-code";
 
-import type { ClientMonitoredItem } from "./client_monitored_item";
-import type { ClientMonitoredItemBase } from "./client_monitored_item_base";
-import type { ClientMonitoredItemGroup } from "./client_monitored_item_group";
-import type { ClientSession, MonitoredItemData, SubscriptionId } from "./client_session";
+import type { ClientMonitoredItem } from "./client_monitored_item.js";
+import type { ClientMonitoredItemBase } from "./client_monitored_item_base.js";
+import type { ClientMonitoredItemGroup } from "./client_monitored_item_group.js";
+import type { ClientSession, MonitoredItemData, SubscriptionId } from "./client_session.js";
 
 export interface ClientSubscriptionOptions {
     requestedPublishingInterval?: number;
@@ -254,6 +254,23 @@ export declare interface ClientSubscription {
      */
     on(event: "terminated", eventHandler: () => void): this;
 
+    /**
+     * notify the observers that the subscription has been recreated with a new subscriptionId.
+     *
+     * This happens when the client repairs a broken connection and the server could not
+     * transfer the original subscription (TransferSubscriptions not supported or refused,
+     * or the subscription had already timed out and been deleted on the server). In that
+     * case the client silently creates a new subscription on the server, and `subscriptionId`
+     * is updated to reflect it. Since `started` is only emitted once, applications that need
+     * to track the current subscriptionId (for logging, diagnostics, or correlating it with
+     * server-side state) should listen to this event as well.
+     * @event subscriptionId_changed
+     */
+    on(
+        event: "subscriptionId_changed",
+        eventHandler: (subscriptionId: SubscriptionId, previousSubscriptionId: SubscriptionId) => void
+    ): this;
+
     /**
      * notify the observers that a new monitored item has been added to the subscription.
      * @event  item_added

package/source/index.ts

@@ -26,23 +26,23 @@ export { assert } from "node-opcua-assert";
 export { ServerState, ServiceCounterDataType } from "node-opcua-common";
 export { ClientSecureChannelLayer, ConnectionStrategyOptions, SecurityPolicy } from "node-opcua-secure-channel";
 export * from "node-opcua-utils";
-export * from "./alarms_and_conditions/client_alarm_tools";
-export * from "./alarms_and_conditions/client_tools";
-export * from "./alarms_and_conditions/client_tools";
-export * from "./client_base";
-export * from "./client_monitored_item";
-export * from "./client_monitored_item_base";
-export * from "./client_monitored_item_group";
-export * from "./client_session";
-export * from "./client_subscription";
-export * from "./client_utils";
-export * from "./opcua_client";
-export { ClientSidePublishEngine } from "./private/client_publish_engine";
-export * from "./reverse/client_reverse_connect";
-export * from "./tools/findservers";
-export * from "./tools/read_history_server_capabilities";
-export * from "./user_identity_info";
-export * from "./verify";
+export * from "./alarms_and_conditions/client_alarm_tools.js";
+export * from "./alarms_and_conditions/client_tools.js";
+export * from "./alarms_and_conditions/client_tools.js";
+export * from "./client_base.js";
+export * from "./client_monitored_item.js";
+export * from "./client_monitored_item_base.js";
+export * from "./client_monitored_item_group.js";
+export * from "./client_session.js";
+export * from "./client_subscription.js";
+export * from "./client_utils.js";
+export * from "./opcua_client.js";
+export { ClientSidePublishEngine } from "./private/client_publish_engine.js";
+export * from "./reverse/client_reverse_connect.js";
+export * from "./tools/findservers.js";
+export * from "./tools/read_history_server_capabilities.js";
+export * from "./user_identity_info.js";
+export * from "./verify.js";
 
 import * as utils1 from "node-opcua-utils";
 export const utils = utils1;

package/source/opcua_client.ts

@@ -12,11 +12,11 @@ import type {
     OPCUAClientBase,
     OPCUAClientBaseEvents,
     OPCUAClientBaseOptions
-} from "./client_base";
-import type { ClientSession } from "./client_session";
-import type { ClientSubscription, ClientSubscriptionOptions } from "./client_subscription";
-import { OPCUAClientImpl } from "./private/opcua_client_impl";
-import type { UserIdentityInfo } from "./user_identity_info";
+} from "./client_base.js";
+import type { ClientSession } from "./client_session.js";
+import type { ClientSubscription, ClientSubscriptionOptions } from "./client_subscription.js";
+import { OPCUAClientImpl } from "./private/opcua_client_impl.js";
+import type { UserIdentityInfo } from "./user_identity_info.js";
 
 export interface OPCUAClientOptions extends OPCUAClientBaseOptions {
     /**

package/source/private/client_base_impl.ts

@@ -70,18 +70,22 @@ import {
     type OPCUAClientBaseEvents,
     type OPCUAClientBaseOptions,
     type TransportSettings
-} from "../client_base";
-import type { Request, Response } from "../common";
-import type { ClientReverseConnect, ICancelableRegistration, ReverseConnectExpectation } from "../reverse/client_reverse_connect";
-import type { UserIdentityInfo } from "../user_identity_info";
-import { performCertificateSanityCheck } from "../verify";
-import type { ClientSessionImpl } from "./client_session_impl";
-import type { IClientBase } from "./i_private_client";
-
-const debugLog = make_debugLog(__filename);
-const doDebug = checkDebugFlag(__filename);
-const errorLog = make_errorLog(__filename);
-const warningLog = make_warningLog(__filename);
+} from "../client_base.js";
+import type { Request, Response } from "../common.js";
+import type {
+    ClientReverseConnect,
+    ICancelableRegistration,
+    ReverseConnectExpectation
+} from "../reverse/client_reverse_connect.js";
+import type { UserIdentityInfo } from "../user_identity_info.js";
+import { performCertificateSanityCheck } from "../verify.js";
+import type { ClientSessionImpl } from "./client_session_impl.js";
+import type { IClientBase } from "./i_private_client.js";
+
+const debugLog = make_debugLog("client_base_impl");
+const doDebug = checkDebugFlag("client_base_impl");
+const errorLog = make_errorLog("client_base_impl");
+const warningLog = make_warningLog("client_base_impl");
 
 function makeCertificateThumbPrint(certificate: Certificate | Certificate[] | null | undefined): Buffer | null {
     if (!certificate) return null;
@@ -948,8 +952,12 @@ export class ClientBaseImpl<Events extends OPCUAClientBaseEvents = OPCUAClientBa
             } else {
                 // Disk path — create default cert if missing
                 await this.createDefaultCertificate();
+                const hasOpaqueKey =
+                    typeof (this.clientCertificateManager as { isPrivateKeyOpaque?: () => boolean }).isPrivateKeyOpaque ===
+                        "function" &&
+                    (this.clientCertificateManager as unknown as { isPrivateKeyOpaque: () => boolean }).isPrivateKeyOpaque();
                 // c8 ignore next
-                if (!fs.existsSync(this.privateKeyFile)) {
+                if (!hasOpaqueKey && !fs.existsSync(this.privateKeyFile)) {
                     throw new Error(` cannot locate private key file ${this.privateKeyFile}`);
                 }
 

package/source/private/client_monitored_item_group_impl.ts

@@ -9,14 +9,14 @@ 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 { 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";
-import type { ClientSubscription } from "../client_subscription";
-import { ClientMonitoredItemImpl } from "./client_monitored_item_impl";
-import type { ClientSubscriptionImpl } from "./client_subscription_impl";
-
-const warningLog = make_warningLog(__filename);
+import type { ClientMonitoredItemBase } from "../client_monitored_item_base.js";
+import { ClientMonitoredItemGroup } from "../client_monitored_item_group.js";
+import { type ClientMonitoredItemBaseEx, ClientMonitoredItemToolbox } from "../client_monitored_item_toolbox.js";
+import type { ClientSubscription } from "../client_subscription.js";
+import { ClientMonitoredItemImpl } from "./client_monitored_item_impl.js";
+import type { ClientSubscriptionImpl } from "./client_subscription_impl.js";
+
+const warningLog = make_warningLog("client_monitored_item_group_impl");
 
 /**
  * ClientMonitoredItemGroup

package/source/private/client_monitored_item_impl.ts

@@ -20,14 +20,14 @@ import {
 import { type Callback, type ErrorCallback, type StatusCode, StatusCodes } from "node-opcua-status-code";
 import type { Variant } from "node-opcua-variant";
 
-import { ClientMonitoredItem } from "../client_monitored_item";
-import { type ClientMonitoredItemBaseEx, ClientMonitoredItemToolbox } from "../client_monitored_item_toolbox";
-import type { ClientSubscription } from "../client_subscription";
-import { ClientMonitoredItem_create, type ClientSubscriptionImpl } from "./client_subscription_impl";
-
-const _debugLog = make_debugLog(__filename);
-const warningLog = make_warningLog(__filename);
-const _doDebug = checkDebugFlag(__filename);
+import { ClientMonitoredItem } from "../client_monitored_item.js";
+import { type ClientMonitoredItemBaseEx, ClientMonitoredItemToolbox } from "../client_monitored_item_toolbox.js";
+import type { ClientSubscription } from "../client_subscription.js";
+import { ClientMonitoredItem_create, type ClientSubscriptionImpl } from "./client_subscription_impl.js";
+
+const _debugLog = make_debugLog("client_monitored_item_impl");
+const warningLog = make_warningLog("client_monitored_item_impl");
+const _doDebug = checkDebugFlag("client_monitored_item_impl");
 
 export type PrepareForMonitoringResult =
     | { error: string }

package/source/private/client_publish_engine.ts

@@ -9,14 +9,14 @@ import type { ServiceFaultAnnotatedError } from "node-opcua-secure-channel";
 import { PublishRequest, type PublishResponse } from "node-opcua-service-subscription";
 import type { SubscriptionAcknowledgementOptions } from "node-opcua-types";
 
-import type { ClientSession, SubscriptionId } from "../client_session";
-import type { ClientSubscription } from "../client_subscription";
-import type { ClientSessionImpl } from "../private/client_session_impl";
-import type { ClientSubscriptionImpl } from "./client_subscription_impl";
-
-const debugLog = make_debugLog(__filename);
-const doDebug = checkDebugFlag(__filename);
-const warningLog = make_warningLog(__filename);
+import type { ClientSession, SubscriptionId } from "../client_session.js";
+import type { ClientSubscription } from "../client_subscription.js";
+import type { ClientSessionImpl } from "../private/client_session_impl.js";
+import type { ClientSubscriptionImpl } from "./client_subscription_impl.js";
+
+const debugLog = make_debugLog("client_publish_engine");
+const doDebug = checkDebugFlag("client_publish_engine");
+const warningLog = make_warningLog("client_publish_engine");
 /**
  * A client side implementation to deal with publish service.
  *