node-opcua-server 2.166.0 → 2.167.0

package/package.json

@@ -1,13 +1,14 @@
 {
     "name": "node-opcua-server",
-    "version": "2.166.0",
+    "version": "2.167.0",
     "description": "pure nodejs OPCUA SDK - module server",
     "scripts": {
         "build": "tsc -b",
         "lint": "eslint source test",
         "format": "prettier --write source test",
         "clean": "npx rimraf -g node_modules dist *.tsbuildinfo certificates",
-        "test": "mocha"
+        "test": "mocha",
+        "test:check": "tsc --noEmit -p test/tsconfig.json"
     },
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
@@ -19,53 +20,53 @@
         "chalk": "4.1.2",
         "dequeue": "^1.0.5",
         "lodash": "4.17.23",
-        "node-opcua-address-space": "2.166.0",
-        "node-opcua-address-space-base": "2.165.0",
+        "node-opcua-address-space": "2.167.0",
+        "node-opcua-address-space-base": "2.167.0",
         "node-opcua-assert": "2.164.0",
-        "node-opcua-basic-types": "2.165.0",
-        "node-opcua-binary-stream": "2.165.0",
-        "node-opcua-certificate-manager": "2.166.0",
-        "node-opcua-client": "2.166.0",
-        "node-opcua-common": "2.165.0",
+        "node-opcua-basic-types": "2.167.0",
+        "node-opcua-binary-stream": "2.167.0",
+        "node-opcua-certificate-manager": "2.167.0",
+        "node-opcua-client": "2.167.0",
+        "node-opcua-common": "2.167.0",
         "node-opcua-constants": "2.157.0",
-        "node-opcua-crypto": "5.3.0",
-        "node-opcua-data-model": "2.165.0",
-        "node-opcua-data-value": "2.165.0",
-        "node-opcua-date-time": "2.165.0",
+        "node-opcua-crypto": "5.3.3",
+        "node-opcua-data-model": "2.167.0",
+        "node-opcua-data-value": "2.167.0",
+        "node-opcua-date-time": "2.167.0",
         "node-opcua-debug": "2.165.0",
-        "node-opcua-extension-object": "2.165.0",
-        "node-opcua-factory": "2.165.0",
-        "node-opcua-hostname": "2.165.0",
-        "node-opcua-nodeid": "2.165.0",
+        "node-opcua-extension-object": "2.167.0",
+        "node-opcua-factory": "2.167.0",
+        "node-opcua-hostname": "2.167.0",
+        "node-opcua-nodeid": "2.167.0",
         "node-opcua-nodesets": "2.163.1",
-        "node-opcua-numeric-range": "2.165.0",
+        "node-opcua-numeric-range": "2.167.0",
         "node-opcua-object-registry": "2.165.0",
-        "node-opcua-pki": "6.11.0",
-        "node-opcua-secure-channel": "2.166.0",
-        "node-opcua-service-browse": "2.165.0",
-        "node-opcua-service-call": "2.165.0",
-        "node-opcua-service-discovery": "2.165.0",
-        "node-opcua-service-endpoints": "2.165.0",
-        "node-opcua-service-filter": "2.165.0",
-        "node-opcua-service-history": "2.165.0",
-        "node-opcua-service-node-management": "2.165.0",
-        "node-opcua-service-query": "2.165.0",
-        "node-opcua-service-read": "2.165.0",
-        "node-opcua-service-register-node": "2.165.0",
-        "node-opcua-service-secure-channel": "2.165.0",
-        "node-opcua-service-session": "2.165.0",
-        "node-opcua-service-subscription": "2.166.0",
-        "node-opcua-service-translate-browse-path": "2.165.0",
-        "node-opcua-service-write": "2.165.0",
-        "node-opcua-status-code": "2.165.0",
-        "node-opcua-transport": "2.165.0",
-        "node-opcua-types": "2.165.0",
+        "node-opcua-pki": "6.12.0",
+        "node-opcua-secure-channel": "2.167.0",
+        "node-opcua-service-browse": "2.167.0",
+        "node-opcua-service-call": "2.167.0",
+        "node-opcua-service-discovery": "2.167.0",
+        "node-opcua-service-endpoints": "2.167.0",
+        "node-opcua-service-filter": "2.167.0",
+        "node-opcua-service-history": "2.167.0",
+        "node-opcua-service-node-management": "2.167.0",
+        "node-opcua-service-query": "2.167.0",
+        "node-opcua-service-read": "2.167.0",
+        "node-opcua-service-register-node": "2.167.0",
+        "node-opcua-service-secure-channel": "2.167.0",
+        "node-opcua-service-session": "2.167.0",
+        "node-opcua-service-subscription": "2.167.0",
+        "node-opcua-service-translate-browse-path": "2.167.0",
+        "node-opcua-service-write": "2.167.0",
+        "node-opcua-status-code": "2.167.0",
+        "node-opcua-transport": "2.167.0",
+        "node-opcua-types": "2.167.0",
         "node-opcua-utils": "2.165.0",
-        "node-opcua-variant": "2.165.0",
+        "node-opcua-variant": "2.167.0",
         "thenify-ex": "4.4.0"
     },
     "devDependencies": {
-        "node-opcua-data-access": "2.165.0",
+        "node-opcua-data-access": "2.167.0",
         "node-opcua-leak-detector": "2.165.0",
         "node-opcua-test-helpers": "2.157.0"
     },
@@ -84,7 +85,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "b50d48c0ebd4761670529bf66f39a9c402a07845",
+    "gitHead": "5decfa86ee53a36ecd3bb454e7bf6e3dd27c7a4e",
     "files": [
         "dist",
         "source"

package/source/base_server.ts

@@ -13,7 +13,7 @@ import chalk from "chalk";
 import { assert } from "node-opcua-assert";
 import { getDefaultCertificateManager, makeSubject, type OPCUACertificateManager } from "node-opcua-certificate-manager";
 import { performCertificateSanityCheck } from "node-opcua-client";
-import { type IOPCUASecureObjectOptions, makeApplicationUrn, OPCUASecureObject } from "node-opcua-common";
+import { type IOPCUASecureObjectOptions, invalidateCachedSecrets, makeApplicationUrn, OPCUASecureObject } from "node-opcua-common";
 import { exploreCertificate } from "node-opcua-crypto/web";
 import { coerceLocalizedText } from "node-opcua-data-model";
 import { installPeriodicClockAdjustment, uninstallPeriodicClockAdjustment } from "node-opcua-date-time";
@@ -339,9 +339,7 @@ export class OPCUABaseServer extends OPCUASecureObject {
         // recreate with current hostnames
         await this.createDefaultCertificate();
         // invalidate cached cert so next getCertificate() reloads from disk
-        const priv = this as unknown as { $$certificate: null; $$certificateChain: null };
-        priv.$$certificate = null;
-        priv.$$certificateChain = null;
+        invalidateCachedSecrets(this);
     }
 
     private _checkCertificateSanMismatch(): void {

package/source/opcua_server.ts

@@ -37,7 +37,7 @@ import { assert } from "node-opcua-assert";
 import type { ByteString, UAString } from "node-opcua-basic-types";
 import { getDefaultCertificateManager, type OPCUACertificateManager } from "node-opcua-certificate-manager";
 import { ServerState } from "node-opcua-common";
-import { type Certificate, exploreCertificate, type Nonce } from "node-opcua-crypto/web";
+import { type Certificate, combine_der, exploreCertificate, type Nonce } from "node-opcua-crypto/web";
 import {
     AttributeIds,
     filterDiagnosticOperationLevel,
@@ -149,6 +149,7 @@ import { DataType, type Variant, VariantArrayType } from "node-opcua-variant";
 import { withCallback } from "thenify-ex";
 
 import { OPCUABaseServer, type OPCUABaseServerOptions } from "./base_server";
+import { extractPasswordFromDecryptedBlob } from "./extract_password_from_blob";
 import { Factory } from "./factory";
 import type { IChannelData } from "./i_channel_data";
 import type { IRegisterServerManager } from "./i_register_server_manager";
@@ -158,9 +159,15 @@ import { RegisterServerManager } from "./register_server_manager";
 import { RegisterServerManagerHidden } from "./register_server_manager_hidden";
 import { RegisterServerManagerMDNSONLY } from "./register_server_manager_mdns_only";
 import type { SamplingFunc } from "./sampling_func";
-import { extractPasswordFromDecryptedBlob } from "./extract_password_from_blob";
 import type { ServerCapabilitiesOptions } from "./server_capabilities";
-import { type AdvertisedEndpoint, type EndpointDescriptionEx, type IServerTransportSettings, OPCUAServerEndPoint, normalizeAdvertisedEndpoints, parseOpcTcpUrl } from "./server_end_point";
+import {
+    type AdvertisedEndpoint,
+    type EndpointDescriptionEx,
+    type IServerTransportSettings,
+    normalizeAdvertisedEndpoints,
+    OPCUAServerEndPoint,
+    parseOpcTcpUrl
+} from "./server_end_point";
 import { type ClosingReason, type CreateSessionOption, ServerEngine } from "./server_engine";
 import type { ServerSession } from "./server_session";
 import type { CreateMonitoredItemHook, DeleteMonitoredItemHook, Subscription } from "./server_subscription";
@@ -2113,7 +2120,7 @@ export class OPCUAServer extends 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 ? combine_der(serverCertificateChain) : undefined,
 
             // The endpoints provided by the server.
             // The Server shall return a set of EndpointDescriptions available for the serverUri
@@ -3818,7 +3825,7 @@ export class OPCUAServer extends OPCUABaseServer {
             // xx                hostname,
             resourcePath: serverOption.resourcePath || "",
 
-            advertisedEndpoints: endpointOptions.advertisedEndpoints,
+            advertisedEndpoints: endpointOptions.advertisedEndpoints
 
             // TODO  userTokenTypes: endpointOptions.userTokenTypes || undefined,
 
@@ -4047,7 +4054,7 @@ export interface RaiseEventAuditActivateSessionEventData extends RaiseEventAudit
 }
 
 // tslint:disable:no-empty-interface
-export interface RaiseEventTransitionEventData extends RaiseEventData { }
+export interface RaiseEventTransitionEventData extends RaiseEventData {}
 
 export interface RaiseEventAuditUrlMismatchEventTypeData extends RaiseEventData {
     endpointUrl: PseudoVariantString;
@@ -4077,7 +4084,7 @@ export interface RaiseAuditCertificateDataMismatchEventData extends RaiseAuditCe
      */
     invalidUri: PseudoVariantString;
 }
-export interface RaiseAuditCertificateUntrustedEventData extends RaiseAuditCertificateEventData { }
+export interface RaiseAuditCertificateUntrustedEventData extends RaiseAuditCertificateEventData {}
 /**
  * This EventType inherits all Properties of the AuditCertificateEventType.
  *
@@ -4089,7 +4096,7 @@ export interface RaiseAuditCertificateUntrustedEventData extends RaiseAuditCerti
  * There are no additional Properties defined for this EventType.
  *
  */
-export interface RaiseAuditCertificateExpiredEventData extends RaiseAuditCertificateEventData { }
+export interface RaiseAuditCertificateExpiredEventData extends RaiseAuditCertificateEventData {}
 /**
  * This EventType inherits all Properties of the AuditCertificateEventType.
  *
@@ -4099,7 +4106,7 @@ export interface RaiseAuditCertificateExpiredEventData extends RaiseAuditCertifi
  *
  * There are no additional Properties defined for this EventType.
  */
-export interface RaiseAuditCertificateInvalidEventData extends RaiseAuditCertificateEventData { }
+export interface RaiseAuditCertificateInvalidEventData extends RaiseAuditCertificateEventData {}
 /**
  * This EventType inherits all Properties of the AuditCertificateEventType.
  *
@@ -4109,7 +4116,7 @@ export interface RaiseAuditCertificateInvalidEventData extends RaiseAuditCertifi
  * If a trust chain is involved then the certificate that failed in the trust chain should be described.
  * There are no additional Properties defined for this EventType.
  */
-export interface RaiseAuditCertificateUntrustedEventData extends RaiseAuditCertificateEventData { }
+export interface RaiseAuditCertificateUntrustedEventData extends RaiseAuditCertificateEventData {}
 /**
  * This EventType inherits all Properties of the AuditCertificateEventType.
  *
@@ -4132,7 +4139,7 @@ export interface RaiseAuditCertificateRevokedEventData extends RaiseAuditCertifi
  *
  * There are no additional Properties defined for this EventType
  */
-export interface RaiseAuditCertificateMismatchEventData extends RaiseAuditCertificateEventData { }
+export interface RaiseAuditCertificateMismatchEventData extends RaiseAuditCertificateEventData {}
 
 const opts = { multiArgs: false };
 OPCUAServer.prototype.initialize = withCallback(OPCUAServer.prototype.initialize, opts);

package/source/register_server_manager.ts

@@ -1,38 +1,36 @@
- /**
+/**
  * @module node-opcua-server
  */
 // tslint:disable:no-console
-import { EventEmitter } from "events";
+import { EventEmitter } from "node:events";
 import chalk from "chalk";
 
 import { assert } from "node-opcua-assert";
-import { UAString } from "node-opcua-basic-types";
-import {
-    coerceLocalizedText,
-    LocalizedTextOptions,
-    OPCUAClientBase,
-    OPCUAClientBaseOptions,
-    ResponseCallback
-} from "node-opcua-client";
-import { make_debugLog, checkDebugFlag, make_warningLog } from "node-opcua-debug";
+import type { UAString } from "node-opcua-basic-types";
+import type { OPCUACertificateManager } from "node-opcua-certificate-manager";
+import { coerceLocalizedText, type LocalizedTextOptions, OPCUAClientBase, type ResponseCallback } from "node-opcua-client";
+import { exploreCertificate } from "node-opcua-crypto/web";
+import { checkDebugFlag, make_debugLog, make_warningLog } from "node-opcua-debug";
 import { resolveFullyQualifiedDomainName } from "node-opcua-hostname";
 import { coerceSecurityPolicy, MessageSecurityMode, SecurityPolicy } from "node-opcua-secure-channel";
 import {
     RegisterServer2Request,
-    RegisterServer2Response,
+    type RegisterServer2Response,
     RegisterServerRequest,
-    RegisterServerResponse
+    type RegisterServerResponse
 } from "node-opcua-service-discovery";
-import { ApplicationType, EndpointDescription, MdnsDiscoveryConfiguration, RegisteredServerOptions } from "node-opcua-types";
-import { exploreCertificate } from "node-opcua-crypto/web";
-import { OPCUACertificateManager } from "node-opcua-certificate-manager";
-import { IRegisterServerManager, RegisterServerManagerStatus } from "./i_register_server_manager";
-
-const doDebug = checkDebugFlag("REGISTER_LDS");
+import {
+    type ApplicationType,
+    type EndpointDescription,
+    MdnsDiscoveryConfiguration,
+    type RegisteredServerOptions
+} from "node-opcua-types";
+import { type IRegisterServerManager, RegisterServerManagerStatus } from "./i_register_server_manager";
+
+const _doDebug = checkDebugFlag("REGISTER_LDS");
 const debugLog = make_debugLog("REGISTER_LDS");
 const warningLog = make_warningLog("REGISTER_LDS");
 
-
 const g_DefaultRegistrationServerTimeout = 8 * 60 * 1000; // 8 minutes
 
 function securityPolicyLevel(securityPolicy: UAString): number {
@@ -110,7 +108,7 @@ function constructRegisteredServer(server: IPartialServer, isOnline: boolean): R
     assert(!isOnline || discoveryUrls.length >= 1, "expecting some discoveryUrls if we go online .... ");
 
     const info = exploreCertificate(server.getCertificate());
-    const commonName = info.tbsCertificate.subject.commonName!;
+    const _commonName = info.tbsCertificate.subject.commonName ?? "";
 
     const serverUri = info.tbsCertificate.extensions?.subjectAltName?.uniformResourceIdentifier[0];
     // c8 ignore next
@@ -122,7 +120,7 @@ function constructRegisteredServer(server: IPartialServer, isOnline: boolean): R
             "\n subjectAltName            : ",
             info.tbsCertificate.extensions?.subjectAltName,
             "\n commonName                : ",
-            info.tbsCertificate.subject.commonName!,
+            info.tbsCertificate.subject.commonName,
             "\n serverInfo.applicationUri : ",
             server.serverInfo.applicationUri
         );
@@ -203,7 +201,7 @@ async function sendRegisterServerRequest(server: IPartialServer, client: ClientB
     const request = constructRegisterServer2Request(server, isOnline);
 
     await new Promise<void>((resolve, reject) => {
-        client.performMessageTransaction(request, (err: Error | null, response?: RegisterServer2Response) => {
+        client.performMessageTransaction(request, (err: Error | null, _response?: RegisterServer2Response) => {
             if (!err) {
                 // RegisterServerResponse
                 debugLog("RegisterServerManager#_registerServer sendRegisterServer2Request has succeeded (isOnline", isOnline, ")");
@@ -213,7 +211,7 @@ async function sendRegisterServerRequest(server: IPartialServer, client: ClientB
             debugLog("RegisterServerManager#_registerServer" + " falling back to using sendRegisterServerRequest instead");
             // fall back to
             const request1 = constructRegisterServerRequest(server, isOnline);
-            client.performMessageTransaction(request1, (err1: Error | null, response1?: RegisterServerResponse) => {
+            client.performMessageTransaction(request1, (err1: Error | null, _response1?: RegisterServerResponse) => {
                 if (!err1) {
                     debugLog(
                         "RegisterServerManager#_registerServer sendRegisterServerRequest " + "has succeeded (isOnline",
@@ -227,10 +225,9 @@ async function sendRegisterServerRequest(server: IPartialServer, client: ClientB
                     isOnline,
                     ")"
                 );
-                reject(err1!)
+                reject(err1);
             });
         });
-
     });
 }
 
@@ -256,7 +253,7 @@ export interface RegisterServerManagerOptions {
 let g_registeringClientCounter = 0;
 /**
  * RegisterServerManager is responsible to Register an opcua server on a LDS or LDS-ME server
- * This class takes in charge : 
+ * This class takes in charge :
  * - the initial registration of a server
  * - the regular registration renewal (every 8 minutes or so ...)
  * - dealing with cases where LDS is not up and running when server starts.
@@ -349,7 +346,7 @@ export class RegisterServerManager extends EventEmitter implements IRegisterServ
     public async start(): Promise<void> {
         debugLog("RegisterServerManager#start");
         if (this.state !== RegisterServerManagerStatus.INACTIVE) {
-            throw new Error("RegisterServer process already started: " + RegisterServerManagerStatus[this.state]);
+            throw new Error(`RegisterServer process already started: ${RegisterServerManagerStatus[this.state]}`);
         }
         this.discoveryServerEndpointUrl = resolveFullyQualifiedDomainName(this.discoveryServerEndpointUrl);
 
@@ -359,7 +356,7 @@ export class RegisterServerManager extends EventEmitter implements IRegisterServ
         // This method is called without await to ensure it is non-blocking.
         // The catch block handles any synchronous errors.
         this.#_runRegistrationProcess().catch((err) => {
-            warningLog("Synchronous error in #_runRegistrationProcess: ", (err?.message));
+            warningLog("Synchronous error in #_runRegistrationProcess: ", err?.message);
         });
     }
 
@@ -370,7 +367,12 @@ export class RegisterServerManager extends EventEmitter implements IRegisterServ
      */
     async #_runRegistrationProcess(): Promise<void> {
         while (this.getState() !== RegisterServerManagerStatus.WAITING && !this.#_isTerminating()) {
-            debugLog("RegisterServerManager#_runRegistrationProcess - state =", RegisterServerManagerStatus[this.state], "isTerminating =", this.#_isTerminating());
+            debugLog(
+                "RegisterServerManager#_runRegistrationProcess - state =",
+                RegisterServerManagerStatus[this.state],
+                "isTerminating =",
+                this.#_isTerminating()
+            );
             try {
                 if (this.getState() === RegisterServerManagerStatus.INACTIVE) {
                     this.#_setState(RegisterServerManagerStatus.INITIALIZING);
@@ -399,7 +401,7 @@ export class RegisterServerManager extends EventEmitter implements IRegisterServ
                 this.#_trigger_next();
                 return;
             } catch (err) {
-                debugLog("RegisterServerManager#_runRegistrationProcess - operation failed!", ((err as Error).message));
+                debugLog("RegisterServerManager#_runRegistrationProcess - operation failed!", (err as Error).message);
                 if (!this.#_isTerminating()) {
                     this.#_setState(RegisterServerManagerStatus.INACTIVE);
                     this.#_emitEvent("serverRegistrationFailure");
@@ -413,7 +415,10 @@ export class RegisterServerManager extends EventEmitter implements IRegisterServ
         }
     }
     #_isTerminating(): boolean {
-        return this.getState() === RegisterServerManagerStatus.UNREGISTERING || this.getState() === RegisterServerManagerStatus.DISPOSING
+        return (
+            this.getState() === RegisterServerManagerStatus.UNREGISTERING ||
+            this.getState() === RegisterServerManagerStatus.DISPOSING
+        );
     }
 
     /**
@@ -435,30 +440,28 @@ export class RegisterServerManager extends EventEmitter implements IRegisterServ
         assert(typeof this.discoveryServerEndpointUrl === "string");
         assert(this.state === RegisterServerManagerStatus.INITIALIZING);
 
-
         this.selectedEndpoint = undefined;
 
-        const applicationName = coerceLocalizedText(this.server.serverInfo.applicationName!)?.text || undefined;
+        const applicationName = coerceLocalizedText(this.server.serverInfo.applicationName)?.text || undefined;
         this.server.serverCertificateManager.referenceCounter++;
 
         const server = this.server;
         const prefix = `Client-${g_registeringClientCounter++}`;
         const action = "initializing";
         const ldsInfo = this.discoveryServerEndpointUrl;
-        const serverInfo = this.server?.serverInfo.applicationUri!;
-        const clientName = `${prefix} for server ${serverInfo} to LDS ${ldsInfo} for ${action}`;
+        const serverAppUri = this.server?.serverInfo.applicationUri ?? "";
+        const clientName = `${prefix} for server ${serverAppUri} to LDS ${ldsInfo} for ${action}`;
 
         const registrationClient = OPCUAClientBase.create({
             clientName,
             applicationName,
-            applicationUri: server.serverInfo.applicationUri!,
+            applicationUri: server.serverInfo.applicationUri ?? "",
             connectionStrategy: infinite_connectivity_strategy,
             clientCertificateManager: server.serverCertificateManager,
             certificateFile: server.certificateFile,
             privateKeyFile: server.privateKeyFile
         }) as ClientBaseEx;
 
-
         registrationClient.on("backoff", (nbRetry: number, delay: number) => {
             if (this.state !== RegisterServerManagerStatus.INITIALIZING) return; // Ignore event if state has changed
             debugLog("RegisterServerManager - received backoff");
@@ -489,24 +492,18 @@ export class RegisterServerManager extends EventEmitter implements IRegisterServ
                 return;
             }
 
-
-            const endpoints: EndpointDescription[] | undefined = await registrationClient.getEndpoints();
-            const endpoint = findSecureEndpoint(endpoints!);
+            const endpoints = await registrationClient.getEndpoints();
+            if (!endpoints || endpoints.length === 0) {
+                throw new Error("Cannot retrieve endpoints from discovery server");
+            }
+            const endpoint = findSecureEndpoint(endpoints);
             if (!endpoint) {
                 throw new Error("Cannot find Secure endpoint");
             }
 
-            if (endpoint.serverCertificate) {
-                assert(endpoint.serverCertificate);
-                this.selectedEndpoint = endpoint;
-            } else {
-                this.selectedEndpoint = undefined;
-            }
+            this.selectedEndpoint = endpoint.serverCertificate ? endpoint : undefined;
 
             this._serverEndpoints = registrationClient._serverEndpoints;
-        } catch (err) {
-            // Do not set state to INACTIVE or rethrow here, let the caller handle it.
-            throw err;
         } finally {
             if (this._registration_client) {
                 const tmp = this._registration_client;
@@ -557,7 +554,7 @@ export class RegisterServerManager extends EventEmitter implements IRegisterServ
             this.#_setState(RegisterServerManagerStatus.REGISTERING);
             this.#_emitEvent("serverRegistrationPending");
 
-            this.#_registerOrUnregisterServer(/*isOnline=*/true)
+            this.#_registerOrUnregisterServer(/*isOnline=*/ true)
                 .then(() => after_register())
                 .catch((err) => after_register(err));
         }, this.timeout);
@@ -577,7 +574,6 @@ export class RegisterServerManager extends EventEmitter implements IRegisterServ
             this._registrationTimerId = null;
         }
 
-
         // Immediately set state to signal a stop
         this.#_setState(RegisterServerManagerStatus.UNREGISTERING);
 
@@ -586,7 +582,7 @@ export class RegisterServerManager extends EventEmitter implements IRegisterServ
 
         if (this.selectedEndpoint) {
             try {
-                await this.#_registerOrUnregisterServer(/* isOnline= */false);
+                await this.#_registerOrUnregisterServer(/* isOnline= */ false);
                 this.#_setState(RegisterServerManagerStatus.UNREGISTERED);
                 this.#_emitEvent("serverUnregistered");
             } catch (err) {
@@ -615,9 +611,12 @@ export class RegisterServerManager extends EventEmitter implements IRegisterServ
         debugLog("RegisterServerManager#_registerServer isOnline:", isOnline);
 
         assert(this.selectedEndpoint, "must have a selected endpoint");
-        assert(this.server!.serverType !== undefined, " must have a valid server Type");
+        assert(this.server?.serverType !== undefined, " must have a valid server Type");
 
-        const server = this.server!;
+        if (!this.server) {
+            throw new Error("RegisterServerManager: server is not set");
+        }
+        const server = this.server;
         const selectedEndpoint = this.selectedEndpoint;
         if (!selectedEndpoint) {
             warningLog("Warning: cannot register server - no endpoint available");
@@ -626,18 +625,18 @@ export class RegisterServerManager extends EventEmitter implements IRegisterServ
         }
 
         server.serverCertificateManager.referenceCounter++;
-        const applicationName: string | undefined = coerceLocalizedText(server.serverInfo.applicationName!)?.text || undefined;
+        const applicationName: string | undefined = coerceLocalizedText(server.serverInfo.applicationName)?.text || undefined;
 
         const prefix = `Client-${g_registeringClientCounter++}`;
         const action = isOnline ? "registering" : "unregistering";
         const ldsInfo = this.discoveryServerEndpointUrl;
-        const serverInfo = server.serverInfo.applicationUri!;
-        const clientName = `${prefix} for server ${serverInfo} to LDS ${ldsInfo} for ${action}`;
+        const serverAppUri = server.serverInfo.applicationUri ?? "";
+        const clientName = `${prefix} for server ${serverAppUri} to LDS ${ldsInfo} for ${action}`;
 
         const client = OPCUAClientBase.create({
             clientName,
             applicationName,
-            applicationUri: server.serverInfo.applicationUri!,
+            applicationUri: server.serverInfo.applicationUri ?? "",
             connectionStrategy: no_retry_connectivity_strategy,
             clientCertificateManager: server.serverCertificateManager,
 
@@ -645,8 +644,7 @@ export class RegisterServerManager extends EventEmitter implements IRegisterServ
             securityPolicy: coerceSecurityPolicy(selectedEndpoint.securityPolicyUri),
             serverCertificate: selectedEndpoint.serverCertificate,
             certificateFile: server.certificateFile,
-            privateKeyFile: server.privateKeyFile,
-
+            privateKeyFile: server.privateKeyFile
         }) as ClientBaseEx;
         client.on("backoff", (nbRetry, delay) => {
             debugLog(client.clientCertificateManager, "backoff trying to connect to the LDS has failed", nbRetry, delay);
@@ -654,30 +652,36 @@ export class RegisterServerManager extends EventEmitter implements IRegisterServ
 
         this._registration_client = client;
 
-        debugLog("lds endpoint uri : ", selectedEndpoint.endpointUrl);
+        const endpointUrl = selectedEndpoint.endpointUrl;
+        if (!endpointUrl) {
+            throw new Error("selectedEndpoint.endpointUrl is missing — cannot connect to LDS");
+        }
+        debugLog("lds endpoint uri : ", endpointUrl);
 
-        const state = isOnline ? "UnRegisterServer" : "RegisterServer";
+        const state = isOnline ? "RegisterServer" : "UnRegisterServer";
         try {
-            await client.connect(selectedEndpoint!.endpointUrl!);
+            await client.connect(endpointUrl);
 
             // Check state again after connection is established
             if (this.getState() === expectedState) {
                 try {
-                    await sendRegisterServerRequest(server, client as ClientBaseEx, isOnline)
+                    await sendRegisterServerRequest(server, client as ClientBaseEx, isOnline);
                 } catch (err) {
                     if (this.getState() !== expectedState) {
-                        warningLog(`${state} '${this.server!.serverInfo.applicationUri}' to the LDS has failed during secure connection to the LDS server`);
-                        warningLog(chalk.red("  Error message:"), (err as Error).message);                // Do not rethrow here, let the caller 
+                        warningLog(
+                            `${state} '${this.server?.serverInfo.applicationUri}' to the LDS has failed during secure connection to the LDS server`
+                        );
+                        warningLog(chalk.red("  Error message:"), (err as Error).message); // Do not rethrow here, let the caller
                     }
                 }
             } else {
                 debugLog("RegisterServerManager#_registerServer: aborted ");
             }
-
         } catch (err) {
             if (this.getState() !== expectedState) {
-
-                warningLog(`${state} '${this.server!.serverInfo.applicationUri}' cannot connect to LDS at endpoint ${client.clientName}, ${selectedEndpoint.endpointUrl} :`);
+                warningLog(
+                    `${state} '${this.server?.serverInfo.applicationUri}' cannot connect to LDS at endpoint ${client.clientName}, ${selectedEndpoint.endpointUrl} :`
+                );
                 warningLog(chalk.red("  Error message:"), (err as Error).message);
             }
         } finally {
@@ -700,8 +704,7 @@ export class RegisterServerManager extends EventEmitter implements IRegisterServ
         if (this._registration_client) {
             const client = this._registration_client;
             this._registration_client = null;
-            debugLog("RegisterServerManager#_cancel_pending_client_if_any "
-                + "=> wee need to disconnect_registration_client");
+            debugLog("RegisterServerManager#_cancel_pending_client_if_any " + "=> wee need to disconnect_registration_client");
             try {
                 await client.disconnect();
             } catch (err) {