fix(mqtt): Force disconnect if it takes longer than 1500ms

Hypfer · Dec 19, 2021 · ced9ee1 · ced9ee1
1 parent ab7c3e7
commit ced9ee1
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/backend/lib/mqtt/MqttController.js b/backend/lib/mqtt/MqttController.js
@@ -372,8 +372,27 @@ class MqttController {
             });
         }));
 
-        await this.asyncClient.end();
-        await closePromise;
+        let forceDisconnectTimeout;
+
+        await Promise.race([
+            Promise.all([
+                this.asyncClient.end(),
+                closePromise
+            ]),
+            new Promise((resolve) => {
+                forceDisconnectTimeout = setTimeout(() => {
+                    if (this.client !== null && typeof this.client.end === "function") {
+                        this.client.end(true);
+
+                        Logger.warn("Forced MQTT disconnect");
+                    }
+
+                    resolve();
+                }, 1500);
+            })
+        ]);
+        clearTimeout(forceDisconnectTimeout);
+
 
         if (this.client && !this.client.disconnected) {
             throw new Error("MQTT.js is pretending to be disconnected");