node-opcua-server 2.166.0 → 2.168.0

package/dist/node_sampler.d.ts

@@ -1,3 +1,3 @@
-import { MonitoredItem } from "./monitored_item";
+import type { MonitoredItem } from "./monitored_item";
 export declare function appendToTimer(monitoredItem: MonitoredItem): string;
 export declare function removeFromTimer(monitoredItem: MonitoredItem): void;

package/dist/node_sampler.js

@@ -37,7 +37,7 @@ function appendToTimer(monitoredItem) {
             const start = doDebug ? (0, node_opcua_utils_1.hrtime)() : undefined;
             let counter = 0;
             for (const m in _t.monitoredItems) {
-                if (Object.prototype.hasOwnProperty.call(_t.monitoredItems, m)) {
+                if (Object.hasOwn(_t.monitoredItems, m)) {
                     sampleMonitoredItem(_t.monitoredItems[m]);
                     counter++;
                 }
@@ -45,9 +45,7 @@ function appendToTimer(monitoredItem) {
             // c8 ignore next
             if (doDebug) {
                 const elapsed = (0, node_opcua_utils_1.hrtime)(start);
-                debugLog(`Sampler ${samplingInterval}  ms : Benchmark took ${((elapsed[0] * NS_PER_SEC + elapsed[1]) /
-                    1000 /
-                    1000.0).toFixed(3)} milliseconds for ${counter} elements`);
+                debugLog(`Sampler ${samplingInterval}  ms : Benchmark took ${((elapsed[0] * NS_PER_SEC + elapsed[1]) / 1000 / 1000.0).toFixed(3)} milliseconds for ${counter} elements`);
             }
         }, samplingInterval);
         timers[key] = _t;

package/dist/node_sampler.js.map

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

package/dist/opcua_server.d.ts

@@ -237,10 +237,63 @@ export interface OPCUAServerOptions extends OPCUABaseServerOptions, OPCUAServerE
     skipOwnNamespace?: boolean;
     transportSettings?: IServerTransportSettings;
 }
-/**
- *
- */
-export declare class OPCUAServer extends OPCUABaseServer {
+export interface OPCUAServerEvents {
+    /** event raised when a new session is created */
+    create_session: [session: ServerSession];
+    /** event raised when a session is activated */
+    session_activated: [session: ServerSession, userIdentityToken: UserIdentityToken];
+    /** event raised when a session is closed */
+    session_closed: [session: ServerSession, deleteSubscriptions: boolean];
+    /** event raised after the server address space has been initialized */
+    post_initialize: [];
+    /**
+     * emitted when the server is trying to register with the LDS
+     * but the connection has failed (backoff signal)
+     */
+    serverRegistrationPending: [];
+    /** event raised when server has been successfully registered on the LDS */
+    serverRegistered: [];
+    /** event raised when server registration has been successfully renewed on the LDS */
+    serverRegistrationRenewed: [];
+    /** event raised when server has been successfully unregistered from the LDS */
+    serverUnregistered: [];
+    /** event raised after the server has raised an OPCUA event toward a client */
+    event: [eventData: unknown];
+    /**
+     * event raised when the server receives a request from a connected client.
+     * Useful for trace/diagnostics.
+     */
+    request: [request: Request, channel: ServerSecureChannelLayer];
+    /**
+     * event raised when the server sends a response to a connected client.
+     * Useful for trace/diagnostics.
+     */
+    response: [response: Response, channel: ServerSecureChannelLayer];
+    /**
+     * event raised when a new secure channel transport is initialized (HEL/ACK complete).
+     * Note: securityPolicy and securityMode are NOT yet established at this point.
+     * Use "channelSecured" for post-handshake notifications.
+     */
+    newChannel: [channel: ServerSecureChannelLayer, endpoint: OPCUAServerEndPoint];
+    /**
+     * event raised when a secure channel has completed the OpenSecureChannel handshake.
+     * At this point securityPolicy, securityMode, and clientCertificate are available.
+     */
+    channelSecured: [channel: ServerSecureChannelLayer, endpoint: OPCUAServerEndPoint];
+    /** event raised when a secure channel is closed */
+    closeChannel: [channel: ServerSecureChannelLayer, endpoint: OPCUAServerEndPoint];
+    /**
+     * event raised when the server refused a TCP connection from a client
+     * (for instance because too many connections)
+     */
+    connectionRefused: [socketData: ISocketData, endpoint: OPCUAServerEndPoint];
+    /**
+     * event raised when an OpenSecureChannel has failed,
+     * e.g. invalid certificate or malformed message
+     */
+    openSecureChannelFailure: [socketData: ISocketData, channelData: IChannelData, endpoint: OPCUAServerEndPoint];
+}
+export declare class OPCUAServer extends OPCUABaseServer<OPCUAServerEvents> {
     engine: ServerEngine;
     registerServerMethod: RegisterServerMethod;
     discoveryServerEndpointUrl: string;
@@ -601,64 +654,6 @@ export declare class OPCUAServer extends OPCUABaseServer {
     private createEndpoint;
     private createEndpointDescriptions;
     initializeCM(): Promise<void>;
-    on(event: "create_session", eventHandler: (session: ServerSession) => void): this;
-    on(event: "session_activated", eventHandler: (session: ServerSession) => void): this;
-    on(event: "session_closed", eventHandler: (session: ServerSession, reason: string) => void): this;
-    on(event: "post_initialize", eventHandler: () => void): this;
-    /**
-     * emitted when the server is trying to registered the LDS
-     * but when the connection to the lds has failed
-     * serverRegistrationPending is sent when the backoff signal of the
-     * connection process is raised
-     * @event serverRegistrationPending
-     */
-    on(event: "serverRegistrationPending", eventHandler: () => void): this;
-    /**
-     * event raised when server  has been successfully registered on the local discovery server
-     * @event serverRegistered
-     */
-    on(event: "serverRegistered", eventHandler: () => void): this;
-    /**
-     * event raised when server registration has been successfully renewed on the local discovery server
-     * @event serverRegistered
-     */
-    on(event: "serverRegistrationRenewed", eventHandler: () => void): this;
-    /**
-     * event raised when server  has been successfully unregistered from the local discovery server
-     * @event serverUnregistered
-     */
-    on(event: "serverUnregistered", eventHandler: () => void): this;
-    /**
-     * event raised after the server has raised an OPCUA event toward a client
-     */
-    on(event: "event", eventHandler: (eventData: unknown) => void): this;
-    /**
-     * event raised when the server received a request from one of its connected client.
-     * useful for trace purpose.
-     */
-    on(event: "request", eventHandler: (request: Request, channel: ServerSecureChannelLayer) => void): this;
-    /**
-     * event raised when the server send an response to a request to one of its connected client.
-     * useful for trace purpose.
-     */
-    on(event: "response", eventHandler: (request: Response, channel: ServerSecureChannelLayer) => void): this;
-    /**
-     * event raised when a new secure channel is opened
-     */
-    on(event: "newChannel", eventHandler: (channel: ServerSecureChannelLayer, endpoint: OPCUAServerEndPoint) => void): this;
-    /**
-     * event raised when a new secure channel is closed
-     */
-    on(event: "closeChannel", eventHandler: (channel: ServerSecureChannelLayer, endpoint: OPCUAServerEndPoint) => void): this;
-    /**
-     * event raised when the server refused a tcp connection from a client. ( for instance because too any connections)
-     */
-    on(event: "connectionRefused", eventHandler: (socketData: ISocketData, endpoint: OPCUAServerEndPoint) => void): this;
-    /**
-     * event raised when a OpenSecureChannel has failed, it could be a invalid certificate or malformed message
-     */
-    on(event: "openSecureChannelFailure", eventHandler: (socketData: ISocketData, channelData: IChannelData, endpoint: OPCUAServerEndPoint) => void): this;
-    on(event: string, eventHandler: (...args: unknown[]) => void): this;
 }
 export interface RaiseEventAuditEventData extends RaiseEventData {
     actionTimeStamp: PseudoVariantDateTime;

package/dist/opcua_server.js

@@ -41,12 +41,12 @@ const node_opcua_utils_1 = require("node-opcua-utils");
 const node_opcua_variant_1 = require("node-opcua-variant");
 const thenify_ex_1 = require("thenify-ex");
 const base_server_1 = require("./base_server");
+const extract_password_from_blob_1 = require("./extract_password_from_blob");
 const factory_1 = require("./factory");
 const monitored_item_1 = require("./monitored_item");
 const register_server_manager_1 = require("./register_server_manager");
 const register_server_manager_hidden_1 = require("./register_server_manager_hidden");
 const register_server_manager_mdns_only_1 = require("./register_server_manager_mdns_only");
-const extract_password_from_blob_1 = require("./extract_password_from_blob");
 const server_end_point_1 = require("./server_end_point");
 const server_engine_1 = require("./server_engine");
 const user_manager_1 = require("./user_manager");
@@ -484,9 +484,6 @@ var RegisterServerMethod;
     RegisterServerMethod[RegisterServerMethod["LDS"] = 3] = "LDS"; // the server registers itself to the LDS or LDS-ME (Local Discovery Server)
 })(RegisterServerMethod || (exports.RegisterServerMethod = RegisterServerMethod = {}));
 const g_requestExactEndpointUrl = !!process.env.NODEOPCUA_SERVER_REQUEST_EXACT_ENDPOINT_URL;
-/**
- *
- */
 class OPCUAServer extends base_server_1.OPCUABaseServer {
     engine;
     registerServerMethod;
@@ -1397,7 +1394,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
             // If the securityPolicyUri is None and none of the UserTokenPolicies requires
             // encryption, the Server shall not send an ApplicationInstanceCertificate and the Client
             // shall ignore the ApplicationInstanceCertificate.
-            serverCertificate: hasEncryption ? serverCertificateChain : undefined,
+            serverCertificate: hasEncryption && serverCertificateChain.length > 0 ? (0, web_1.combine_der)(serverCertificateChain) : undefined,
             // The endpoints provided by the server.
             // The Server shall return a set of EndpointDescriptions available for the serverUri
             // specified in the request.[...]
@@ -2587,6 +2584,13 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
             serverInfo: this.serverInfo,
             transportSettings: serverOptions.transportSettings
         });
+        // SecretHolder reads certificateFile/privateKeyFile from `this`
+        // on each access, so it follows Object.defineProperty redirects
+        // (e.g. from push cert management) automatically.
+        // Note: creates a cycle (server → endpoint → SecretHolder → server)
+        // which is harmless — V8 mark-and-sweep handles it, and
+        // endpoint.dispose() breaks it by replacing #certProvider.
+        endPoint.setCertificateProvider(new node_opcua_common_1.SecretHolder(this));
         return endPoint;
     }
     createEndpointDescriptions(serverOption, endpointOptions) {
@@ -2619,7 +2623,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
             disableDiscovery: !!endpointOptions.disableDiscovery,
             // xx                hostname,
             resourcePath: serverOption.resourcePath || "",
-            advertisedEndpoints: endpointOptions.advertisedEndpoints,
+            advertisedEndpoints: endpointOptions.advertisedEndpoints
             // TODO  userTokenTypes: endpointOptions.userTokenTypes || undefined,
             // TODO allowUnsecurePassword: endpointOptions.allowUnsecurePassword || false
         });
@@ -2629,10 +2633,6 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
         await super.initializeCM();
         await this.userCertificateManager.initialize();
     }
-    // biome-ignore lint/suspicious/noExplicitAny: must match EventEmitter.on() signature
-    on(event, eventHandler) {
-        return super.on(event, eventHandler);
-    }
 }
 exports.OPCUAServer = OPCUAServer;
 const userIdentityTokenPasswordRemoved = (userIdentityToken) => {