mqtt: Fix autodiscvoery

koush · Apr 16, 2024 · 584ea97 · 584ea97
1 parent 807ba81
commit 584ea97
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/plugins/mqtt/package-lock.json b/plugins/mqtt/package-lock.json
diff --git a/plugins/mqtt/package.json b/plugins/mqtt/package.json
@@ -41,5 +41,5 @@
       "@types/node": "^18.4.2",
       "@types/nunjucks": "^3.2.0"
    },
-   "version": "0.0.79"
+   "version": "0.0.80"
 }
diff --git a/plugins/mqtt/src/autodiscovery.ts b/plugins/mqtt/src/autodiscovery.ts
@@ -703,6 +703,8 @@ autoDiscoveryMap.set(ScryptedInterface.OnOff, {
 });
 
 export function publishAutoDiscovery(mqttId: string, client: Client, device: MixinDeviceBase<any>, topic: string, subscribe: boolean, autoDiscoveryPrefix = 'homeassistant') {
+    const subs = new Set<string>();
+
     for (const iface of device.interfaces) {
         const found = autoDiscoveryMap.get(iface);
         if (!found)
@@ -721,6 +723,8 @@ export function publishAutoDiscovery(mqttId: string, client: Client, device: Mix
         if (subscribe) {
             const subscriptions = found.subscriptions || {};
             for (const subscriptionTopic of Object.keys(subscriptions || {})) {
+                subs.add(subscriptionTopic);
+
                 const fullTopic = topic + '/' + subscriptionTopic;
                 const cb = subscriptions[subscriptionTopic];
                 client.subscribe(fullTopic)
@@ -746,7 +750,7 @@ export function publishAutoDiscovery(mqttId: string, client: Client, device: Mix
                 });
             }
         }
-
-        return found;
     }
+
+    return subs;
 }
diff --git a/plugins/mqtt/src/main.ts b/plugins/mqtt/src/main.ts
@@ -320,7 +320,7 @@ class MqttPublisherMixin extends SettingsMixinDeviceBase<any> {
             const method = messageTopic.substring(this.pathname.length + 1);
             if (!allMethods.includes(method)) {
                 if (!allProperties.includes(method)) {
-                    if (!found?.subscriptions?.[method]) {
+                    if (!found?.has(method)) {
                         this.console.warn('unknown topic', method);
                     }
                 }