node-opcua-server 2.163.1 → 2.165.0

package/source/register_server_manager.ts

@@ -1,4 +1,4 @@
-/**
+ /**
  * @module node-opcua-server
  */
 // tslint:disable:no-console
@@ -112,8 +112,8 @@ function constructRegisteredServer(server: IPartialServer, isOnline: boolean): R
     const info = exploreCertificate(server.getCertificate());
     const commonName = info.tbsCertificate.subject.commonName!;
 
-    const serverUri = info.tbsCertificate.extensions?.subjectAltName.uniformResourceIdentifier[0];
-    // istanbul ignore next
+    const serverUri = info.tbsCertificate.extensions?.subjectAltName?.uniformResourceIdentifier[0];
+    // c8 ignore next
     if (serverUri !== server.serverInfo.applicationUri) {
         warningLog(
             chalk.yellow("Warning certificate uniformResourceIdentifier doesn't match serverInfo.applicationUri"),
@@ -128,7 +128,7 @@ function constructRegisteredServer(server: IPartialServer, isOnline: boolean): R
         );
     }
 
-    // istanbul ignore next
+    // c8 ignore next
     if (!server.serverInfo.applicationName.text) {
         debugLog("warning: application name is missing");
     }
@@ -403,7 +403,11 @@ export class RegisterServerManager extends EventEmitter implements IRegisterServ
                 if (!this.#_isTerminating()) {
                     this.#_setState(RegisterServerManagerStatus.INACTIVE);
                     this.#_emitEvent("serverRegistrationFailure");
-                    await pause(Math.min(5000, this.timeout));
+                    // interruptible pause: check for shutdown every 100ms
+                    const delay = Math.min(5000, this.timeout);
+                    for (let elapsed = 0; elapsed < delay && !this.#_isTerminating(); elapsed += 100) {
+                        await pause(100);
+                    }
                 }
             }
         }
@@ -513,6 +517,7 @@ export class RegisterServerManager extends EventEmitter implements IRegisterServ
                     warningLog("RegisterServerManager#_establish_initial_connection: error disconnecting client", err);
                 }
             }
+            server.serverCertificateManager.referenceCounter--;
         }
     }
 
@@ -681,6 +686,7 @@ export class RegisterServerManager extends EventEmitter implements IRegisterServ
                 this._registration_client = null;
                 await tmp.disconnect();
             }
+            server.serverCertificateManager.referenceCounter--;
         }
     }
 

package/source/register_server_manager_mdns_only.ts

@@ -40,7 +40,7 @@ export class RegisterServerManagerMDNSONLY extends EventEmitter implements IRegi
     }
 
     public async start(): Promise<void> {
-        // istanbul ignore next
+        // c8 ignore next
         if (!this.server) {
             throw new Error("internal error");
         }