node-opcua-service-discovery 2.68.1 → 2.70.2

package/dist/bonjour.d.ts

@@ -1,21 +1,40 @@
-import * as bonjour from "bonjour";
-export declare function acquireBonjour(): bonjour.Bonjour;
-export declare function releaseBonjour(): void;
+import { Bonjour, Service, ServiceConfig } from "sterfive-bonjour-service";
+export declare function acquireBonjour(): Bonjour;
+export declare function releaseBonjour(bonjour: Bonjour, callback: () => void): void;
+export declare function acquireBonjour2(): Bonjour;
+export declare function releaseBonjour2(bonjour: Bonjour): void;
 export interface Announcement {
     port: number;
     path: string;
     name: string;
     capabilities: string[];
 }
-export declare function sameAnnouncement(a?: Announcement, b?: Announcement): boolean;
-export declare function _announceServerOnMulticastSubnet(multicastDNS: bonjour.Bonjour, options: Announcement): Promise<bonjour.Service>;
+export declare function announcementToServiceConfig(announcement: Announcement): ServiceConfig;
+export declare function isSameService(a?: ServiceConfig, b?: ServiceConfig): boolean;
+export declare const serviceToString: (service: ServiceConfig) => string;
+export declare function _announceServerOnMulticastSubnet(multicastDNS: Bonjour, serviceConfig: ServiceConfig): Promise<Service>;
 export declare class BonjourHolder {
-    announcement?: Announcement;
+    serviceConfig?: ServiceConfig;
     private _multicastDNS?;
     private _service?;
-    _announcedOnMulticastSubnet(options: Announcement): Promise<boolean>;
+    private pendingAnnouncement;
+    /**
+     *
+     * @param announcement
+     * @returns
+     */
+    announcedOnMulticastSubnet(announcement: Announcement): Promise<boolean>;
     isStarted(): boolean;
-    _announcedOnMulticastSubnetWithCallback(options: Announcement, callback: (err: Error | null, result?: boolean) => void): void;
-    _stop_announcedOnMulticastSubnet(): Promise<void>;
-    _stop_announcedOnMulticastSubnetWithCallback(callback: (err: Error | null) => void): void;
+    /**
+     *
+     * @param announcement
+     * @param callback
+     * @private
+     */
+    announcedOnMulticastSubnetWithCallback(announcement: Announcement, callback: (err: Error | null, result?: boolean) => void): void;
+    /**
+     * @private
+     */
+    stopAnnnouncedOnMulticastSubnet(): Promise<void>;
+    stopAnnouncedOnMulticastSubnetWithCallback(callback: (err: Error | null) => void): void;
 }

package/dist/bonjour.js

@@ -9,32 +9,50 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BonjourHolder = exports._announceServerOnMulticastSubnet = exports.sameAnnouncement = exports.releaseBonjour = exports.acquireBonjour = void 0;
+exports.BonjourHolder = exports._announceServerOnMulticastSubnet = exports.serviceToString = exports.isSameService = exports.announcementToServiceConfig = exports.releaseBonjour2 = exports.acquireBonjour2 = exports.releaseBonjour = exports.acquireBonjour = void 0;
 /**
  * @module node-opcua-service-discovery
  */
 // tslint:disable:no-console
 const util_1 = require("util");
+const chalk = require("chalk");
 const node_opcua_assert_1 = require("node-opcua-assert");
 const node_opcua_debug_1 = require("node-opcua-debug");
 const node_opcua_object_registry_1 = require("node-opcua-object-registry");
-const bonjour = require("bonjour");
+const sterfive_bonjour_service_1 = require("sterfive-bonjour-service");
 const debugLog = (0, node_opcua_debug_1.make_debugLog)(__filename);
 const doDebug = (0, node_opcua_debug_1.checkDebugFlag)(__filename);
 let gBonjour;
 let gBonjourRefCount = 0;
 const registry = new node_opcua_object_registry_1.ObjectRegistry();
+function errorCallback(err) {
+    console.log(" ERROR received from Bonjour", err.message);
+}
 function acquireBonjour() {
+    const bonjour = new sterfive_bonjour_service_1.Bonjour();
+    registry.unregister(bonjour);
+    return bonjour;
+}
+exports.acquireBonjour = acquireBonjour;
+function releaseBonjour(bonjour, callback) {
+    bonjour.unpublishAll(() => {
+        bonjour.destroy(callback);
+        registry.unregister(bonjour);
+    });
+}
+exports.releaseBonjour = releaseBonjour;
+function acquireBonjour2() {
     if (gBonjourRefCount === 0) {
         // will start the Bonjour service
-        gBonjour = bonjour();
+        debugLog("Starting Bonjour");
+        gBonjour = new sterfive_bonjour_service_1.Bonjour(undefined, errorCallback);
         registry.register(gBonjour);
     }
     gBonjourRefCount++;
     return gBonjour;
 }
-exports.acquireBonjour = acquireBonjour;
-function releaseBonjour() {
+exports.acquireBonjour2 = acquireBonjour2;
+function releaseBonjour2(bonjour) {
     gBonjourRefCount--;
     (0, node_opcua_assert_1.assert)(gBonjourRefCount >= 0);
     if (gBonjourRefCount === 0) {
@@ -44,105 +62,203 @@ function releaseBonjour() {
         const tmp = gBonjour;
         gBonjour = undefined;
         // will stop the Bonjour service
-        tmp.destroy();
-        registry.unregister(tmp);
+        tmp.unpublishAll(() => {
+            tmp.destroy();
+            registry.unregister(tmp);
+            debugLog("Releasing Bonjour");
+        });
     }
 }
-exports.releaseBonjour = releaseBonjour;
-function sameAnnouncement(a, b) {
+exports.releaseBonjour2 = releaseBonjour2;
+function announcementToServiceConfig(announcement) {
+    const serviceConfig = {
+        name: announcement.name,
+        port: announcement.port,
+        protocol: "tcp",
+        txt: {
+            caps: announcement.capabilities.sort().join(","),
+            path: announcement.path
+        },
+        type: "opcua-tcp"
+    };
+    return serviceConfig;
+}
+exports.announcementToServiceConfig = announcementToServiceConfig;
+function isSameService(a, b) {
+    var _a, _b, _c, _d;
     if (!a && !b) {
         return true;
     }
     if (!a || !b) {
         return false;
     }
-    return a.port === b.port && a.path === b.path && a.name === b.name && a.capabilities.join(" ") === b.capabilities.join(" ");
+    return a.port === b.port && ((_a = a.txt) === null || _a === void 0 ? void 0 : _a.path) === ((_b = b.txt) === null || _b === void 0 ? void 0 : _b.path) && a.name === b.name && ((_c = a.txt) === null || _c === void 0 ? void 0 : _c.caps) === ((_d = b.txt) === null || _d === void 0 ? void 0 : _d.caps);
 }
-exports.sameAnnouncement = sameAnnouncement;
-function _announceServerOnMulticastSubnet(multicastDNS, options) {
+exports.isSameService = isSameService;
+const serviceToString = (service) => {
+    return "type=" + service.type + service.name + " on port " + service.port + " txt " + JSON.stringify(service.txt);
+};
+exports.serviceToString = serviceToString;
+// function waitServiceUp(serviceConfig: ServiceConfig, callback: () => void) {
+//     const multicastDNS = new Bonjour();
+//     const browser = multicastDNS.find({
+//         protocol: "tcp",
+//         type: "opcua-tcp"
+//     });
+//     const onUp = (service: Service) => {
+//         if (doDebug) {
+//             debugLog(chalk.cyan("    waitServiceUp is up with  ", serviceToString(service)));
+//         }
+//         if (isSameService(service, serviceConfig)) {
+//             browser.removeAllListeners("up");
+//             multicastDNS.destroy();
+//             callback();
+//         }
+//     };
+//     browser.on("up", onUp);
+// }
+// function waitServiceDown(serviceConfig: ServiceConfig, callback: () => void) {
+//     const multicastDNS = new Bonjour();
+//     const browser = multicastDNS.find({
+//         protocol: "tcp",
+//         type: "opcua-tcp"
+//     });
+//     const onDown = (service: Service) => {
+//         if (doDebug) {
+//             debugLog(chalk.cyan("    waitServiceDown down with  ", serviceToString(service)));
+//         }
+//         if (isSameService(service, serviceConfig)) {
+//             browser.removeAllListeners("down");
+//             multicastDNS.destroy();
+//             callback();
+//         }
+//     };
+//     browser.on("down", onDown);
+// }
+function _announceServerOnMulticastSubnet(multicastDNS, serviceConfig) {
     return __awaiter(this, void 0, void 0, function* () {
-        const port = options.port;
-        (0, node_opcua_assert_1.assert)(typeof port === "number");
-        (0, node_opcua_assert_1.assert)(multicastDNS, "bonjour must have been initialized?");
-        const params = {
-            name: options.name,
-            port,
-            protocol: "tcp",
-            txt: {
-                caps: options.capabilities.join(","),
-                path: options.path
-            },
-            type: "opcua-tcp"
-        };
-        const service = multicastDNS.publish(params);
-        service.on("error", (err) => {
-            debugLog("bonjour ERROR received ! ", err.message);
-            debugLog("params = ", params);
+        return new Promise((resolve, reject) => {
+            const port = serviceConfig.port;
+            (0, node_opcua_assert_1.assert)(typeof port === "number");
+            (0, node_opcua_assert_1.assert)(multicastDNS, "bonjour must have been initialized?");
+            debugLog(chalk.cyan("  announceServerOnMulticastSubnet", (0, exports.serviceToString)(serviceConfig)));
+            // waitServiceUp(serviceConfig, () => {
+            //     // istanbul ignore next
+            //     if (doDebug) {
+            //         debugLog(chalk.cyan("  announcedOnMulticastSubnet done ", serviceToString(serviceConfig)));
+            //     }
+            //     //    resolve(service);
+            // });
+            const service = multicastDNS.publish(Object.assign(Object.assign({}, serviceConfig), { probe: false }));
+            service.on("error", (err) => {
+                debugLog("bonjour ERROR received ! ", err.message);
+                debugLog("params = ", serviceConfig);
+            });
+            service.on("up", () => {
+                debugLog("_announceServerOnMulticastSubnet: bonjour UP received ! ", (0, exports.serviceToString)(serviceConfig));
+                resolve(service);
+            });
+            service.start();
         });
-        // istanbul ignore next
-        if (doDebug) {
-            debugLog("Announcing ", params.name, "on port ", port, " txt ", JSON.stringify(params.txt));
-        }
-        service.start();
-        return service;
     });
 }
 exports._announceServerOnMulticastSubnet = _announceServerOnMulticastSubnet;
 class BonjourHolder {
-    _announcedOnMulticastSubnet(options) {
+    constructor() {
+        this.pendingAnnouncement = false;
+    }
+    /**
+     *
+     * @param announcement
+     * @returns
+     */
+    announcedOnMulticastSubnet(announcement) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!options) {
-                // ignored
-                return false;
-            }
-            if (this._service && this.announcement && options) {
+            debugLog(chalk.yellow("\n\nentering announcedOnMulticastSubnet"));
+            const serviceConfig = announcementToServiceConfig(announcement);
+            if (this._service && this.serviceConfig) {
                 // verify that Announcement has changed
-                if (sameAnnouncement(options, this.announcement)) {
-                    debugLog(" Announcement ignored as it has been already made", options.name);
+                if (isSameService(serviceConfig, this.serviceConfig)) {
+                    debugLog(" Announcement ignored as it has been already made", announcement.name);
+                    debugLog("exiting announcedOnMulticastSubnet-2", false);
                     return false; // nothing changed
                 }
             }
             (0, node_opcua_assert_1.assert)(!this._multicastDNS, "already called ?");
             this._multicastDNS = acquireBonjour();
-            this._service = yield _announceServerOnMulticastSubnet(this._multicastDNS, options);
-            this.announcement = options;
+            this.pendingAnnouncement = true;
+            this.serviceConfig = serviceConfig;
+            this._service = yield _announceServerOnMulticastSubnet(this._multicastDNS, serviceConfig);
+            this.pendingAnnouncement = false;
+            debugLog(chalk.yellow("exiting announcedOnMulticastSubnet-3", true));
             return true;
         });
     }
     isStarted() {
         return !!this._multicastDNS;
     }
-    _announcedOnMulticastSubnetWithCallback(options, callback) {
+    /**
+     *
+     * @param announcement
+     * @param callback
+     * @private
+     */
+    announcedOnMulticastSubnetWithCallback(announcement, callback) {
         callback(new Error("Internal Error"));
     }
-    _stop_announcedOnMulticastSubnet() {
+    /**
+     * @private
+     */
+    stopAnnnouncedOnMulticastSubnet() {
         return __awaiter(this, void 0, void 0, function* () {
-            debugLog("_stop_announcedOnMulticastSubnet = ");
-            if (this._service) {
-                // due to a wrong declaration of Service.stop in the d.ts file we
-                // need to use a workaround here
-                const this_service = this._service;
-                this._service = undefined;
-                this._multicastDNS = undefined;
-                releaseBonjour();
-                this.announcement = undefined;
-                const proxy = (callback) => {
-                    this_service.stop(() => {
-                        callback();
-                    });
-                };
-                const stop = (0, util_1.promisify)(proxy);
-                yield stop.call(this);
-                //xx await new Promise((resolve) => setTimeout(resolve, 20));
-                debugLog("stop announcement completed");
+            if (this.pendingAnnouncement) {
+                debugLog(chalk.bgWhite.redBright("stopAnnnouncedOnMulticastSubnet is pending : let's wait a little bit and try again"));
+                // wait until announcement is done
+                yield new Promise((resolve) => setTimeout(resolve, 500));
+                return this.stopAnnnouncedOnMulticastSubnet();
             }
+            debugLog(chalk.green("\n\nentering stop_announcedOnMulticastSubnet = ", this.serviceConfig ? (0, exports.serviceToString)(this.serviceConfig) : "<null>"));
+            if (!this._service) {
+                debugLog(chalk.green("leaving stop_announcedOnMulticastSubnet = no service"));
+                return;
+            }
+            // due to a wrong declaration of Service.stop in the d.ts file we
+            // need to use a workaround here
+            const that_service = this._service;
+            const that_multicastDNS = this._multicastDNS;
+            this._service = undefined;
+            this._multicastDNS = undefined;
+            this.serviceConfig = undefined;
+            const proxy = (callback) => {
+                if (that_multicastDNS && that_service.stop) {
+                    // waitServiceDown(that_service, () => {
+                    //     debugLog(chalk.green("stop_announcedOnMulticastSubnet, ", serviceToString(that_service)));
+                    // });
+                    that_service.stop((err) => {
+                        debugLog(chalk.green("service stopped err=", err));
+                        that_multicastDNS.unpublishAll(() => {
+                            releaseBonjour(that_multicastDNS, () => {
+                                callback();
+                            });
+                        });
+                    });
+                    return;
+                }
+                else {
+                    callback();
+                }
+            };
+            const stop = (0, util_1.promisify)(proxy);
+            yield stop.call(this);
+            debugLog(chalk.green("leaving stop_announcedOnMulticastSubnet = done"));
+            debugLog(chalk.green("leaving stop_announcedOnMulticastSubnet stop announcement completed"));
         });
     }
-    _stop_announcedOnMulticastSubnetWithCallback(callback) {
+    stopAnnouncedOnMulticastSubnetWithCallback(callback) {
         callback(new Error("Internal Error"));
     }
 }
 exports.BonjourHolder = BonjourHolder;
-BonjourHolder.prototype._announcedOnMulticastSubnetWithCallback = (0, util_1.callbackify)(BonjourHolder.prototype._announcedOnMulticastSubnet);
-BonjourHolder.prototype._stop_announcedOnMulticastSubnetWithCallback = (0, util_1.callbackify)(BonjourHolder.prototype._stop_announcedOnMulticastSubnet);
+BonjourHolder.prototype.announcedOnMulticastSubnetWithCallback = (0, util_1.callbackify)(BonjourHolder.prototype.announcedOnMulticastSubnet);
+BonjourHolder.prototype.stopAnnouncedOnMulticastSubnetWithCallback = (0, util_1.callbackify)(BonjourHolder.prototype.stopAnnnouncedOnMulticastSubnet);
 //# sourceMappingURL=bonjour.js.map

package/dist/bonjour.js.map

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

package/dist/index.d.ts

@@ -3,4 +3,4 @@
  */
 export { RegisteredServer, RegisterServerRequest, RegisterServerResponse, MdnsDiscoveryConfiguration, RegisterServer2Request, RegisterServer2Response, RegisterServerRequestOptions, RegisterServer2RequestOptions, FindServersRequest, FindServersRequestOptions, FindServersResponse, FindServersOnNetworkRequest, FindServersOnNetworkRequestOptions, FindServersOnNetworkResponse, ServerOnNetwork } from "node-opcua-types";
 export { serverCapabilities } from "./server_capabilities";
-export { acquireBonjour, Announcement, releaseBonjour, BonjourHolder, sameAnnouncement, _announceServerOnMulticastSubnet } from "./bonjour";
+export { Announcement, BonjourHolder, isSameService as sameService, _announceServerOnMulticastSubnet, announcementToServiceConfig, serviceToString, } from "./bonjour";

package/dist/index.js

@@ -3,7 +3,7 @@
  * @module node-opcua-service-discovery
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._announceServerOnMulticastSubnet = exports.sameAnnouncement = exports.BonjourHolder = exports.releaseBonjour = exports.acquireBonjour = exports.serverCapabilities = exports.ServerOnNetwork = exports.FindServersOnNetworkResponse = exports.FindServersOnNetworkRequest = exports.FindServersResponse = exports.FindServersRequest = exports.RegisterServer2Response = exports.RegisterServer2Request = exports.MdnsDiscoveryConfiguration = exports.RegisterServerResponse = exports.RegisterServerRequest = exports.RegisteredServer = void 0;
+exports.serviceToString = exports.announcementToServiceConfig = exports._announceServerOnMulticastSubnet = exports.sameService = exports.BonjourHolder = exports.serverCapabilities = exports.ServerOnNetwork = exports.FindServersOnNetworkResponse = exports.FindServersOnNetworkRequest = exports.FindServersResponse = exports.FindServersRequest = exports.RegisterServer2Response = exports.RegisterServer2Request = exports.MdnsDiscoveryConfiguration = exports.RegisterServerResponse = exports.RegisterServerRequest = exports.RegisteredServer = void 0;
 var node_opcua_types_1 = require("node-opcua-types");
 Object.defineProperty(exports, "RegisteredServer", { enumerable: true, get: function () { return node_opcua_types_1.RegisteredServer; } });
 Object.defineProperty(exports, "RegisterServerRequest", { enumerable: true, get: function () { return node_opcua_types_1.RegisterServerRequest; } });
@@ -19,9 +19,9 @@ Object.defineProperty(exports, "ServerOnNetwork", { enumerable: true, get: funct
 var server_capabilities_1 = require("./server_capabilities");
 Object.defineProperty(exports, "serverCapabilities", { enumerable: true, get: function () { return server_capabilities_1.serverCapabilities; } });
 var bonjour_1 = require("./bonjour");
-Object.defineProperty(exports, "acquireBonjour", { enumerable: true, get: function () { return bonjour_1.acquireBonjour; } });
-Object.defineProperty(exports, "releaseBonjour", { enumerable: true, get: function () { return bonjour_1.releaseBonjour; } });
 Object.defineProperty(exports, "BonjourHolder", { enumerable: true, get: function () { return bonjour_1.BonjourHolder; } });
-Object.defineProperty(exports, "sameAnnouncement", { enumerable: true, get: function () { return bonjour_1.sameAnnouncement; } });
+Object.defineProperty(exports, "sameService", { enumerable: true, get: function () { return bonjour_1.isSameService; } });
 Object.defineProperty(exports, "_announceServerOnMulticastSubnet", { enumerable: true, get: function () { return bonjour_1._announceServerOnMulticastSubnet; } });
+Object.defineProperty(exports, "announcementToServiceConfig", { enumerable: true, get: function () { return bonjour_1.announcementToServiceConfig; } });
+Object.defineProperty(exports, "serviceToString", { enumerable: true, get: function () { return bonjour_1.serviceToString; } });
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,qDAoB0B;AAnBtB,oHAAA,gBAAgB,OAAA;AAChB,yHAAA,qBAAqB,OAAA;AACrB,0HAAA,sBAAsB,OAAA;AACtB,8HAAA,0BAA0B,OAAA;AAC1B,0HAAA,sBAAsB,OAAA;AACtB,2HAAA,uBAAuB,OAAA;AAKvB,sHAAA,kBAAkB,OAAA;AAElB,uHAAA,mBAAmB,OAAA;AAEnB,+HAAA,2BAA2B,OAAA;AAE3B,gIAAA,4BAA4B,OAAA;AAE5B,mHAAA,eAAe,OAAA;AAGnB,6DAA2D;AAAlD,yHAAA,kBAAkB,OAAA;AAC3B,qCAOkB;AANd,yGAAA,cAAc,OAAA;AAEd,yGAAA,cAAc,OAAA;AACd,wGAAA,aAAa,OAAA;AACb,2GAAA,gBAAgB,OAAA;AAChB,2HAAA,gCAAgC,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,qDAoB0B;AAnBtB,oHAAA,gBAAgB,OAAA;AAChB,yHAAA,qBAAqB,OAAA;AACrB,0HAAA,sBAAsB,OAAA;AACtB,8HAAA,0BAA0B,OAAA;AAC1B,0HAAA,sBAAsB,OAAA;AACtB,2HAAA,uBAAuB,OAAA;AAKvB,sHAAA,kBAAkB,OAAA;AAElB,uHAAA,mBAAmB,OAAA;AAEnB,+HAAA,2BAA2B,OAAA;AAE3B,gIAAA,4BAA4B,OAAA;AAE5B,mHAAA,eAAe,OAAA;AAGnB,6DAA2D;AAAlD,yHAAA,kBAAkB,OAAA;AAC3B,qCAOkB;AALd,wGAAA,aAAa,OAAA;AACb,sGAAA,aAAa,OAAe;AAC5B,2HAAA,gCAAgC,OAAA;AAChC,sHAAA,2BAA2B,OAAA;AAC3B,0GAAA,eAAe,OAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-service-discovery",
-    "version": "2.68.1",
+    "version": "2.70.2",
     "description": "pure nodejs OPCUA SDK - module -service-discovery",
     "scripts": {
         "build": "tsc -b",
@@ -12,18 +12,18 @@
     "types": "./dist/index.d.ts",
     "dependencies": {
         "@types/bonjour": "^3.5.10",
-        "bonjour": "^3.5.0",
         "node-opcua-assert": "2.66.0",
-        "node-opcua-basic-types": "2.68.0",
-        "node-opcua-binary-stream": "2.67.0",
-        "node-opcua-data-model": "2.68.0",
-        "node-opcua-debug": "2.68.0",
-        "node-opcua-factory": "2.68.0",
-        "node-opcua-nodeid": "2.68.0",
-        "node-opcua-object-registry": "2.68.0",
-        "node-opcua-service-endpoints": "2.68.1",
-        "node-opcua-service-secure-channel": "2.68.1",
-        "node-opcua-types": "2.68.1"
+        "node-opcua-basic-types": "2.70.0",
+        "node-opcua-binary-stream": "2.69.0",
+        "node-opcua-data-model": "2.70.0",
+        "node-opcua-debug": "2.69.0",
+        "node-opcua-factory": "2.70.0",
+        "node-opcua-nodeid": "2.70.0",
+        "node-opcua-object-registry": "2.69.0",
+        "node-opcua-service-endpoints": "2.70.2",
+        "node-opcua-service-secure-channel": "2.70.2",
+        "node-opcua-types": "2.70.2",
+        "sterfive-bonjour-service": "1.1.4"
     },
     "author": "Etienne Rossignon",
     "license": "MIT",
@@ -40,5 +40,5 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "7bcb67b06ea755d438e91f5c143d20531497e286"
+    "gitHead": "3d63db79d14539ee61bc82998b19320202f35392"
 }

package/source/bonjour.ts

@@ -3,31 +3,49 @@
  */
 // tslint:disable:no-console
 import { callbackify, promisify } from "util";
-
+import * as chalk from "chalk";
 import { assert } from "node-opcua-assert";
 import { checkDebugFlag, make_debugLog } from "node-opcua-debug";
 import { ObjectRegistry } from "node-opcua-object-registry";
-import * as bonjour from "bonjour";
+import { Bonjour, Service, ServiceConfig } from "sterfive-bonjour-service";
 
 const debugLog = make_debugLog(__filename);
 const doDebug = checkDebugFlag(__filename);
 
-let gBonjour: bonjour.Bonjour | undefined;
+let gBonjour: Bonjour | undefined;
 let gBonjourRefCount = 0;
 
 const registry = new ObjectRegistry();
 
-export function acquireBonjour(): bonjour.Bonjour {
+function errorCallback(err: Error) {
+    console.log(" ERROR received from Bonjour", err.message);
+}
+
+export function acquireBonjour(): Bonjour {
+    const bonjour = new Bonjour();
+    registry.unregister(bonjour);
+    return bonjour;
+}
+
+export function releaseBonjour(bonjour: Bonjour, callback: () => void) {
+    bonjour!.unpublishAll(() => {
+        bonjour!.destroy(callback);
+        registry.unregister(bonjour);
+    });
+}
+
+export function acquireBonjour2(): Bonjour {
     if (gBonjourRefCount === 0) {
         // will start the Bonjour service
-        gBonjour = bonjour();
+        debugLog("Starting Bonjour");
+        gBonjour = new Bonjour(undefined, errorCallback);
         registry.register(gBonjour);
     }
     gBonjourRefCount++;
     return gBonjour!;
 }
 
-export function releaseBonjour() {
+export function releaseBonjour2(bonjour: Bonjour) {
     gBonjourRefCount--;
     assert(gBonjourRefCount >= 0);
     if (gBonjourRefCount === 0) {
@@ -37,8 +55,11 @@ export function releaseBonjour() {
         const tmp = gBonjour;
         gBonjour = undefined;
         // will stop the Bonjour service
-        tmp!.destroy();
-        registry.unregister(tmp);
+        tmp!.unpublishAll(() => {
+            tmp!.destroy();
+            registry.unregister(tmp);
+            debugLog("Releasing Bonjour");
+        });
     }
 }
 
@@ -49,87 +70,133 @@ export interface Announcement {
     capabilities: string[];
 }
 
-export function sameAnnouncement(a?: Announcement, b?: Announcement): boolean {
+export function announcementToServiceConfig(announcement: Announcement): ServiceConfig {
+    const serviceConfig: ServiceConfig = {
+        name: announcement.name,
+        port: announcement.port,
+        protocol: "tcp",
+        txt: {
+            caps: announcement.capabilities.sort().join(","),
+            path: announcement.path
+        },
+        type: "opcua-tcp"
+    };
+
+    return serviceConfig;
+}
+
+export function isSameService(a?: ServiceConfig, b?: ServiceConfig): boolean {
     if (!a && !b) {
         return true;
     }
     if (!a || !b) {
         return false;
     }
-    return a.port === b.port && a.path === b.path && a.name === b.name && a.capabilities.join(" ") === b.capabilities.join(" ");
+    return a.port === b.port && a.txt?.path === b.txt?.path && a.name === b.name && a.txt?.caps === b.txt?.caps;
 }
 
-export async function _announceServerOnMulticastSubnet(
-    multicastDNS: bonjour.Bonjour,
-    options: Announcement
-): Promise<bonjour.Service> {
-    const port = options.port;
-    assert(typeof port === "number");
-    assert(multicastDNS, "bonjour must have been initialized?");
-
-    const params: bonjour.ServiceOptions = {
-        name: options.name,
-        port,
-        protocol: "tcp",
-        txt: {
-            caps: options.capabilities.join(","),
-            path: options.path
-        },
-        type: "opcua-tcp"
-    };
-    const service: bonjour.Service = multicastDNS.publish(params);
-    service.on("error", (err: Error) => {
-        debugLog("bonjour ERROR received ! ", err.message);
-        debugLog("params = ", params);
-    });
+export const serviceToString = (service: ServiceConfig) => {
+    return "type=" + service.type + service.name + " on port " + service.port + " txt " + JSON.stringify(service.txt);
+};
 
-    // istanbul ignore next
-    if (doDebug) {
-        debugLog("Announcing ", params.name, "on port ", port, " txt ", JSON.stringify(params.txt));
-    }
+// function waitServiceUp(serviceConfig: ServiceConfig, callback: () => void) {
+//     const multicastDNS = new Bonjour();
+//     const browser = multicastDNS.find({
+//         protocol: "tcp",
+//         type: "opcua-tcp"
+//     });
+//     const onUp = (service: Service) => {
+//         if (doDebug) {
+//             debugLog(chalk.cyan("    waitServiceUp is up with  ", serviceToString(service)));
+//         }
+//         if (isSameService(service, serviceConfig)) {
+//             browser.removeAllListeners("up");
+//             multicastDNS.destroy();
+//             callback();
+//         }
+//     };
+//     browser.on("up", onUp);
+// }
 
-    service.start();
-    return service;
-}
+// function waitServiceDown(serviceConfig: ServiceConfig, callback: () => void) {
+//     const multicastDNS = new Bonjour();
+//     const browser = multicastDNS.find({
+//         protocol: "tcp",
+//         type: "opcua-tcp"
+//     });
+//     const onDown = (service: Service) => {
+//         if (doDebug) {
+//             debugLog(chalk.cyan("    waitServiceDown down with  ", serviceToString(service)));
+//         }
+//         if (isSameService(service, serviceConfig)) {
+//             browser.removeAllListeners("down");
+//             multicastDNS.destroy();
+//             callback();
+//         }
+//     };
+//     browser.on("down", onDown);
+// }
 
-interface ServiceFixed extends NodeJS.EventEmitter {
-    name: string;
-    type: string;
-    subtypes: string[];
-    protocol: string;
-    host: string;
-    port: number;
-    fqdn: string;
-    txt: Object;
-    published: boolean;
+export async function _announceServerOnMulticastSubnet(multicastDNS: Bonjour, serviceConfig: ServiceConfig): Promise<Service> {
+    return new Promise((resolve, reject) => {
+        const port = serviceConfig.port;
+        assert(typeof port === "number");
+        assert(multicastDNS, "bonjour must have been initialized?");
+
+        debugLog(chalk.cyan("  announceServerOnMulticastSubnet", serviceToString(serviceConfig)));
 
-    stop(callback: (err: Error | null) => void): void;
+        // waitServiceUp(serviceConfig, () => {
+        //     // istanbul ignore next
+        //     if (doDebug) {
+        //         debugLog(chalk.cyan("  announcedOnMulticastSubnet done ", serviceToString(serviceConfig)));
+        //     }
+        //     //    resolve(service);
+        // });
 
-    start(): void;
+        const service: Service = multicastDNS.publish({ ...serviceConfig, probe: false });
+        service.on("error", (err: Error) => {
+            debugLog("bonjour ERROR received ! ", err.message);
+            debugLog("params = ", serviceConfig);
+        });
+        service.on("up", () => {
+            debugLog("_announceServerOnMulticastSubnet: bonjour UP received ! ", serviceToString(serviceConfig));
+            resolve(service);
+        });
+        service.start();
+    });
 }
 
 export class BonjourHolder {
-    public announcement?: Announcement;
+    public serviceConfig?: ServiceConfig;
 
-    private _multicastDNS?: bonjour.Bonjour;
-    private _service?: bonjour.Service;
-
-    public async _announcedOnMulticastSubnet(options: Announcement): Promise<boolean> {
-        if (!options) {
-            // ignored
-            return false;
-        }
-        if (this._service && this.announcement && options) {
+    private _multicastDNS?: Bonjour;
+    private _service?: Service;
+    private pendingAnnouncement = false;
+    /**
+     *
+     * @param announcement
+     * @returns
+     */
+    public async announcedOnMulticastSubnet(announcement: Announcement): Promise<boolean> {
+        debugLog(chalk.yellow("\n\nentering announcedOnMulticastSubnet"));
+        const serviceConfig = announcementToServiceConfig(announcement);
+        if (this._service && this.serviceConfig) {
             // verify that Announcement has changed
-            if (sameAnnouncement(options, this.announcement!)) {
-                debugLog(" Announcement ignored as it has been already made", options.name);
+            if (isSameService(serviceConfig, this.serviceConfig!)) {
+                debugLog(" Announcement ignored as it has been already made", announcement.name);
+                debugLog("exiting announcedOnMulticastSubnet-2", false);
                 return false; // nothing changed
             }
         }
         assert(!this._multicastDNS, "already called ?");
+
         this._multicastDNS = acquireBonjour();
-        this._service = await _announceServerOnMulticastSubnet(this._multicastDNS, options);
-        this.announcement = options;
+
+        this.pendingAnnouncement = true;
+        this.serviceConfig = serviceConfig;
+        this._service = await _announceServerOnMulticastSubnet(this._multicastDNS, serviceConfig);
+        this.pendingAnnouncement = false;
+        debugLog(chalk.yellow("exiting announcedOnMulticastSubnet-3", true));
         return true;
     }
 
@@ -137,40 +204,80 @@ export class BonjourHolder {
         return !!this._multicastDNS;
     }
 
-    public _announcedOnMulticastSubnetWithCallback(options: Announcement, callback: (err: Error | null, result?: boolean) => void) {
+    /**
+     *
+     * @param announcement
+     * @param callback
+     * @private
+     */
+    public announcedOnMulticastSubnetWithCallback(
+        announcement: Announcement,
+        callback: (err: Error | null, result?: boolean) => void
+    ) {
         callback(new Error("Internal Error"));
     }
 
-    public async _stop_announcedOnMulticastSubnet(): Promise<void> {
-        debugLog("_stop_announcedOnMulticastSubnet = ");
-
-        if (this._service) {
-            // due to a wrong declaration of Service.stop in the d.ts file we
-            // need to use a workaround here
-            const this_service = this._service as any as ServiceFixed;
-            this._service = undefined;
-            this._multicastDNS = undefined;
-            releaseBonjour();
-          
-            this.announcement = undefined;
-            const proxy = (callback: (err?: Error) => void) => {
-                this_service.stop(() => {
-                    callback();
-                });
-            };
-            const stop = promisify(proxy);
-            await stop.call(this);
-            //xx await new Promise((resolve) => setTimeout(resolve, 20));
-            debugLog("stop announcement completed");
+    /**
+     * @private
+     */
+    public async stopAnnnouncedOnMulticastSubnet(): Promise<void> {
+        if (this.pendingAnnouncement) {
+            debugLog(chalk.bgWhite.redBright("stopAnnnouncedOnMulticastSubnet is pending : let's wait a little bit and try again"));
+            // wait until announcement is done
+            await new Promise((resolve) => setTimeout(resolve, 500));
+            return this.stopAnnnouncedOnMulticastSubnet();
+        }
+
+        debugLog(
+            chalk.green(
+                "\n\nentering stop_announcedOnMulticastSubnet = ",
+                this.serviceConfig ? serviceToString(this.serviceConfig) : "<null>"
+            )
+        );
+
+        if (!this._service) {
+            debugLog(chalk.green("leaving stop_announcedOnMulticastSubnet = no service"));
+            return;
         }
+        // due to a wrong declaration of Service.stop in the d.ts file we
+        // need to use a workaround here
+        const that_service = this._service;
+        const that_multicastDNS = this._multicastDNS!;
+        this._service = undefined;
+        this._multicastDNS = undefined;
+
+        this.serviceConfig = undefined;
+        const proxy = (callback: (err?: Error) => void) => {
+            if (that_multicastDNS && that_service.stop) {
+                // waitServiceDown(that_service, () => {
+                //     debugLog(chalk.green("stop_announcedOnMulticastSubnet, ", serviceToString(that_service)));
+                // });
+                that_service.stop((err?: Error) => {
+                    debugLog(chalk.green("service stopped err=", err));
+                    that_multicastDNS.unpublishAll(() => {
+                        releaseBonjour(that_multicastDNS, () => {
+                            callback();
+                        });
+                    });
+                });
+                return;
+            } else {
+                callback();
+            }
+        };
+        const stop = promisify(proxy);
+        await stop.call(this);
+
+        debugLog(chalk.green("leaving stop_announcedOnMulticastSubnet = done"));
+        debugLog(chalk.green("leaving stop_announcedOnMulticastSubnet stop announcement completed"));
     }
 
-    public _stop_announcedOnMulticastSubnetWithCallback(callback: (err: Error | null) => void) {
+    public stopAnnouncedOnMulticastSubnetWithCallback(callback: (err: Error | null) => void) {
         callback(new Error("Internal Error"));
     }
 }
 
-BonjourHolder.prototype._announcedOnMulticastSubnetWithCallback = callbackify(BonjourHolder.prototype._announcedOnMulticastSubnet);
-BonjourHolder.prototype._stop_announcedOnMulticastSubnetWithCallback = callbackify(
-    BonjourHolder.prototype._stop_announcedOnMulticastSubnet
+BonjourHolder.prototype.announcedOnMulticastSubnetWithCallback = callbackify(BonjourHolder.prototype.announcedOnMulticastSubnet);
+BonjourHolder.prototype.stopAnnouncedOnMulticastSubnetWithCallback = callbackify(
+    BonjourHolder.prototype.stopAnnnouncedOnMulticastSubnet
 );

package/source/index.ts

@@ -26,10 +26,10 @@ export {
 
 export { serverCapabilities } from "./server_capabilities";
 export {
-    acquireBonjour,
     Announcement,
-    releaseBonjour,
     BonjourHolder,
-    sameAnnouncement,
-    _announceServerOnMulticastSubnet
+    isSameService as sameService,
+    _announceServerOnMulticastSubnet,
+    announcementToServiceConfig,
+    serviceToString,
 }from "./bonjour";