Merge branch 'master' into main

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hap-nodejs",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "HAP-NodeJS is a Node.js implementation of HomeKit Accessory Server.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -53,7 +53,7 @@
   ],
   "dependencies": {
     "@homebridge/ciao": "^1.1.5",
-    "@homebridge/dbus-native": "^0.5.0",
+    "@homebridge/dbus-native": "^0.5.1",
     "bonjour-hap": "~3.6.4",
     "debug": "^4.3.4",
     "fast-srp-hap": "~2.0.4",

src/lib/Accessory.ts

@@ -1430,7 +1430,12 @@ export class Accessory extends EventEmitter {
 
     this._advertiser!.startAdvertising()
       .then(() => this.emit(AccessoryEventTypes.ADVERTISED))
-      .catch(reason => console.error("Could not create mDNS advertisement. The HAP-Server won't be discoverable: " + reason));
+      .catch(reason => {
+        console.error("Could not create mDNS advertisement. The HAP-Server won't be discoverable: " + reason);
+        if (reason.stack) {
+          debug("Detailed error: " + reason.stack);
+        }
+      });
 
     this.emit(AccessoryEventTypes.LISTENING, port, hostname);
   }

src/lib/Advertiser.ts

@@ -2,7 +2,7 @@
 /// <reference path="../../@types/bonjour-hap.d.ts" />
 import ciao, { CiaoService, MDNSServerOptions, Responder, ServiceEvent, ServiceTxt, ServiceType } from "@homebridge/ciao";
 import { InterfaceName, IPAddress } from "@homebridge/ciao/lib/NetworkManager";
-import dbus, { DBusInterface, InvokeError, MessageBus } from "@homebridge/dbus-native";
+import dbus, { DBusInterface, MessageBus } from "@homebridge/dbus-native";
 import assert from "assert";
 import bonjour, { BonjourHAP, BonjourHAPService, MulticastOptions } from "bonjour-hap";
 import crypto from "crypto";
@@ -303,7 +303,8 @@ function messageBusConnectionResult(bus: MessageBus): Promise<void> {
 export class DBusInvokeError extends Error {
   readonly errorName: string;
 
-  constructor(errorObject: InvokeError) {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  constructor(errorObject: { name: string, message: any }) {
     super();
 
     Object.setPrototypeOf(this, DBusInvokeError.prototype);
@@ -412,11 +413,6 @@ export class AvahiAdvertiser extends EventEmitter implements Advertiser {
 
     debug(`Starting to advertise '${this.accessoryInfo.displayName}' using Avahi backend!`);
 
-    if (!this.avahiServerInterface) {
-      this.avahiServerInterface = await AvahiAdvertiser.avahiInterface(this.bus, "Server");
-      this.avahiServerInterface.on("StateChanged", this.stateChangeHandler);
-    }
-
     this.path = await AvahiAdvertiser.avahiInvoke(this.bus, "/", "Server", "EntryGroupNew") as string;
     await AvahiAdvertiser.avahiInvoke(this.bus, this.path, "EntryGroup", "AddService", {
       body: [
@@ -433,6 +429,20 @@ export class AvahiAdvertiser extends EventEmitter implements Advertiser {
       signature: "iiussssqaay",
     });
     await AvahiAdvertiser.avahiInvoke(this.bus, this.path, "EntryGroup", "Commit");
+
+    try {
+      if (!this.avahiServerInterface) {
+        this.avahiServerInterface = await AvahiAdvertiser.avahiInterface(this.bus, "Server");
+        this.avahiServerInterface.on("StateChanged", this.stateChangeHandler);
+      }
+    } catch (error) {
+      // We have some problem on Synology https://github.com/homebridge/HAP-NodeJS/issues/993
+      console.warn("Failed to create listener for avahi-daemon server state. The system will not be notified about restarts of avahi-daemon " +
+        "and will therefore stay undiscoverable in those instances. Error message: " + error);
+      if (error.stack) {
+        debug("Detailed error: " + error.stack);
+      }
+    }
   }
 
   /**

src/types/dbus-native.d.ts

@@ -4,17 +4,11 @@ declare module "@homebridge/dbus-native" {
 
   function systemBus(): MessageBus;
 
-  export class InvokeError {
-    name: string;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    message: any;
-  }
-
   export class MessageBus {
     connection: BusConnection;
 
     // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types,@typescript-eslint/no-explicit-any
-    public invoke(message: any, callback: (error: InvokeError | undefined, value: any) => void): void;
+    public invoke(message: any, callback: (error: { name: string, message: any } | undefined, value: any) => void): void;
 
     public getService(name: string): DBusService;
   }