node-opcua-server 2.156.0 → 2.158.0

package/source/register_server_manager_hidden.ts

@@ -2,7 +2,7 @@
  * @module node-opcua-server
  */
 import { EventEmitter } from "events";
-import { IRegisterServerManager } from "./i_register_server_manager";
+import { IRegisterServerManager, RegisterServerManagerStatus } from "./i_register_server_manager";
 
 /**
  * a IRegisterServerManager that hides the server from any local discover server
@@ -17,15 +17,16 @@ export class RegisterServerManagerHidden extends EventEmitter implements IRegist
         super();
     }
 
-    public stop(callback: () => void): void {
-        setImmediate(callback);
+    public async stop(): Promise<void> {
     }
 
-    public start(callback: () => void): void {
-        setImmediate(callback);
+    public async start(): Promise<void> {
     }
 
     public dispose(): void {
         //
     }
+    public getState(): RegisterServerManagerStatus {
+        return RegisterServerManagerStatus.NOT_APPLICABLE;
+    }
 }

package/source/register_server_manager_mdns_only.ts

@@ -7,7 +7,7 @@ import { EventEmitter } from "events";
 import { assert } from "node-opcua-assert";
 import { BonjourHolder } from "node-opcua-service-discovery";
 import { OPCUABaseServer } from "./base_server";
-import { IRegisterServerManager } from "./i_register_server_manager";
+import { IRegisterServerManager, RegisterServerManagerStatus } from "./i_register_server_manager";
 
 /**
  * a RegisterServerManager that declare the server the OPCUA Bonjour service
@@ -18,6 +18,7 @@ export class RegisterServerManagerMDNSONLY extends EventEmitter implements IRegi
 
     private server?: OPCUABaseServer;
     private bonjour: BonjourHolder;
+    private _state: RegisterServerManagerStatus = RegisterServerManagerStatus.NOT_APPLICABLE;
 
     constructor(options: { server: OPCUABaseServer }) {
         super();
@@ -25,18 +26,20 @@ export class RegisterServerManagerMDNSONLY extends EventEmitter implements IRegi
         assert(this.server);
         assert(this.server instanceof OPCUABaseServer);
         this.bonjour = new BonjourHolder();
+        this._state = RegisterServerManagerStatus.INITIALIZING;
     }
 
-    public stop(callback: () => void): void {
+    public async stop(): Promise<void> {
         if (this.bonjour) {
-            this.bonjour.stopAnnouncedOnMulticastSubnetWithCallback(()=>{
-                this.emit("serverUnregistered");
-                setImmediate(callback);
-            });
+
+            this._state = RegisterServerManagerStatus.UNREGISTERING;
+            await this.bonjour.stopAnnouncedOnMulticastSubnet();
+            this.emit("serverUnregistered");
+            this._state = RegisterServerManagerStatus.INACTIVE;
         }
     }
 
-    public start(callback: () => void): void {
+    public async start(): Promise<void> {
         // istanbul ignore next
         if (!this.server) {
             throw new Error("internal error");
@@ -44,16 +47,21 @@ export class RegisterServerManagerMDNSONLY extends EventEmitter implements IRegi
         assert(this.server instanceof OPCUABaseServer);
 
         const host = "TODO-find how to extract hostname";
-        this.bonjour.announcedOnMulticastSubnetWithCallback({
-            capabilities: this.server.capabilitiesForMDNS,
-            name: this.server.serverInfo.applicationUri!,
+        const capabilities = this.server.capabilitiesForMDNS;
+        const name = this.server.serverInfo.applicationUri!;
+        const port = this.server.endpoints[0].port;
+
+
+        this._state = RegisterServerManagerStatus.REGISTERING;
+        await this.bonjour.announcedOnMulticastSubnet({
+            capabilities: capabilities,
+            name: name,
             path: "/", // <- to do
             host,
-            port: this.server.endpoints[0].port
-        }, ()=>{
-            this.emit("serverRegistered");
-            setImmediate(callback);
+            port: port
         });
+        this._state = RegisterServerManagerStatus.WAITING;
+        this.emit("serverRegistered");
     }
 
     public dispose(): void {
@@ -61,4 +69,7 @@ export class RegisterServerManagerMDNSONLY extends EventEmitter implements IRegi
         assert(this.server);
         this.server = undefined;
     }
+    public getState(): RegisterServerManagerStatus {
+        return this._state;
+    }
 }