node-opcua-server-discovery 2.156.0 → 2.158.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-server-discovery",
-    "version": "2.156.0",
+    "version": "2.158.0",
     "description": "pure nodejs OPCUA SDK - module server-discovery",
     "scripts": {
         "build": "tsc -b",
@@ -12,18 +12,17 @@
     "dependencies": {
         "chalk": "4.1.2",
         "env-paths": "2.2.1",
-        "node-opcua-assert": "2.139.0",
-        "node-opcua-basic-types": "2.154.0",
-        "node-opcua-certificate-manager": "2.154.0",
-        "node-opcua-common": "2.155.0",
-        "node-opcua-debug": "2.153.0",
-        "node-opcua-hostname": "2.139.0",
-        "node-opcua-object-registry": "2.153.0",
-        "node-opcua-secure-channel": "2.155.0",
-        "node-opcua-server": "2.156.0",
-        "node-opcua-service-discovery": "2.155.0",
-        "node-opcua-service-endpoints": "2.155.0",
-        "node-opcua-status-code": "2.153.0",
+        "node-opcua-assert": "2.157.0",
+        "node-opcua-basic-types": "2.157.0",
+        "node-opcua-certificate-manager": "2.157.0",
+        "node-opcua-common": "2.158.0",
+        "node-opcua-debug": "2.157.0",
+        "node-opcua-object-registry": "2.157.0",
+        "node-opcua-secure-channel": "2.158.0",
+        "node-opcua-server": "2.158.0",
+        "node-opcua-service-discovery": "2.158.0",
+        "node-opcua-service-endpoints": "2.158.0",
+        "node-opcua-status-code": "2.157.0",
         "sterfive-bonjour-service": "1.1.4",
         "thenify-ex": "4.4.0"
     },
@@ -42,9 +41,12 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "53bc91f8992b50b9ddb938e279f78ac1026ec13f",
+    "gitHead": "d92c1c46754548964c3a7821dfec2b52a8522232",
     "files": [
         "dist",
         "source"
-    ]
+    ],
+    "devDependencies": {
+        "node-opcua-pki": "5.5.0"
+    }
 }

package/source/mdns_responder.ts

@@ -6,8 +6,8 @@ import { checkDebugFlag, make_debugLog } from "node-opcua-debug";
 import { ObjectRegistry } from "node-opcua-object-registry";
 import { ServerOnNetwork, serviceToString } from "node-opcua-service-discovery";
 
-const debugLog = make_debugLog(__filename);
-const doDebug = checkDebugFlag(__filename) || true;
+const debugLog = make_debugLog("LDSSERVER");
+const doDebug = checkDebugFlag("LDSSERVER") || true;
 
 const registry = new ObjectRegistry();
 
@@ -17,10 +17,10 @@ export class MDNSResponder {
      */
     public registeredServers: ServerOnNetwork[];
 
-    private multicastDNS: Bonjour;
-    private browser: Browser;
+    #bonjour: Bonjour;
+    #mDNSBrowser: Browser;
 
-    private recordId: number;
+    #recordId: number;
     public lastUpdateDate: Date = new Date();
 
     constructor() {
@@ -28,10 +28,10 @@ export class MDNSResponder {
 
         this.registeredServers = [];
 
-        this.multicastDNS = new Bonjour();
-        this.recordId = 0;
+        this.#bonjour = new Bonjour();
+        this.#recordId = 0;
 
-        this.browser = this.multicastDNS.find({
+        this.#mDNSBrowser = this.#bonjour.find({
             protocol: "tcp",
             type: "opcua-tcp"
         });
@@ -72,8 +72,8 @@ export class MDNSResponder {
                 return;
             }
 
-            this.recordId++;
-            const recordId = this.recordId;
+            this.#recordId++;
+            const recordId = this.#recordId;
             const serverName = service.name;
 
             service.txt = service.txt || {};
@@ -112,23 +112,33 @@ export class MDNSResponder {
             this.lastUpdateDate = new Date();
         };
 
-        this.browser.on("up", (service: Service) => {
+        this.#mDNSBrowser.on("up", (service: Service) => {
             // istanbul ignore next
             doDebug && debugLog("MDNSResponder : service is up with  ", serviceToString(service));
             addService(service);
+            // console.log("records " , JSON.stringify(service.records()));
         });
 
-        this.browser.on("down", (service: Service) => {
+        this.#mDNSBrowser.on("down", (service: Service) => {
             // istanbul ignore next
             doDebug && debugLog("MDNSResponder : service is down with  ", serviceToString(service));
-
             removeService(service);
         });
     }
-
-    public dispose() {
-        // yy delete (this as any).multicastDNS;
-        this.multicastDNS.destroy();
+    public async dispose(): Promise<void> {
+        
+        if (this.#mDNSBrowser) {
+            this.#mDNSBrowser.stop();
+            this.#mDNSBrowser = undefined!;
+        }
+        await new Promise<void>((resolve) => {
+            this.#bonjour.unpublishAll(() => {
+                this.#bonjour.destroy(() => {
+                    resolve();
+                });
+            })
+        });
         registry.unregister(this);
+        await new Promise<void>((resolve) => setTimeout(resolve, 100));
     }
 }