Use bonjour advertiser as default again, warn when avahi is used on a…

…n unsupported platform. (homebridge#927)
koush · Jun 28, 2022 · a7579ad · a7579ad
1 parent 4d427ad
commit a7579ad
Showing 1 changed file with 28 additions and 24 deletions.
diff --git a/src/lib/Accessory.ts b/src/lib/Accessory.ts
@@ -1208,30 +1208,34 @@ export class Accessory extends EventEmitter {
     // create our Advertiser which broadcasts our presence over mdns
     const parsed = Accessory.parseBindOption(info);
 
-    const defaultAdvertiser = info.advertiser
-      ?? (await AvahiAdvertiser.isAvailable() ? MDNSAdvertiser.AVAHI : MDNSAdvertiser.BONJOUR);
-
-    switch (defaultAdvertiser) {
-      case MDNSAdvertiser.CIAO:
-        this._advertiser = new CiaoAdvertiser(this._accessoryInfo, {
-          interface: parsed.advertiserAddress
-        }, {
-          restrictedAddresses: parsed.serviceRestrictedAddress,
-          disabledIpv6: parsed.serviceDisableIpv6,
-        });
-        break;
-      case MDNSAdvertiser.BONJOUR:
-        // noinspection JSDeprecatedSymbols
-        this._advertiser = new BonjourHAPAdvertiser(this._accessoryInfo, info.mdns, {
-          restrictedAddresses: parsed.serviceRestrictedAddress,
-          disabledIpv6: parsed.serviceDisableIpv6,
-        });
-        break;
-      case MDNSAdvertiser.AVAHI:
-        this._advertiser = new AvahiAdvertiser(this._accessoryInfo);
-        break;
-      default:
-        throw new Error("Unsupported advertiser setting: '" + info.advertiser + "'");
+    let selectedAdvertiser = info.advertiser ?? MDNSAdvertiser.BONJOUR;
+    if (info.advertiser === MDNSAdvertiser.AVAHI && !await AvahiAdvertiser.isAvailable()) {
+      console.error("[${this.displayName}] Selected \"" + MDNSAdvertiser.AVAHI + "\" advertiser though it isn't available on the platform. " +
+        "Reverting to \"" + MDNSAdvertiser.BONJOUR + "\"");
+      selectedAdvertiser = MDNSAdvertiser.BONJOUR;
+    }
+
+    switch (selectedAdvertiser) {
+    case MDNSAdvertiser.CIAO:
+      this._advertiser = new CiaoAdvertiser(this._accessoryInfo, {
+        interface: parsed.advertiserAddress,
+      }, {
+        restrictedAddresses: parsed.serviceRestrictedAddress,
+        disabledIpv6: parsed.serviceDisableIpv6,
+      });
+      break;
+    case MDNSAdvertiser.BONJOUR:
+      // noinspection JSDeprecatedSymbols
+      this._advertiser = new BonjourHAPAdvertiser(this._accessoryInfo, info.mdns, {
+        restrictedAddresses: parsed.serviceRestrictedAddress,
+        disabledIpv6: parsed.serviceDisableIpv6,
+      });
+      break;
+    case MDNSAdvertiser.AVAHI:
+      this._advertiser = new AvahiAdvertiser(this._accessoryInfo);
+      break;
+    default:
+      throw new Error("Unsupported advertiser setting: '" + info.advertiser + "'");
     }
     this._advertiser.on(AdvertiserEvent.UPDATED_NAME, name => {
       this.displayName = name;