@apocaliss92/nodedreame 1.11.0 → 1.11.1

package/dist/index.cjs

@@ -84,7 +84,7 @@ module.exports = __toCommonJS(index_exports);
 
 // src/support/version.ts
 var LIBRARY_NAME = "nodedreame";
-var LIBRARY_VERSION = "1.11.0";
+var LIBRARY_VERSION = "1.11.1";
 
 // src/transport/errors.ts
 var DreameError = class extends Error {
@@ -700,6 +700,7 @@ var DreamePush = class extends TypedEmitter {
   #region;
   #connect;
   #backoffMs;
+  #keepaliveSeconds;
   #rejectUnauthorized;
   #topic;
   #client = null;
@@ -720,6 +721,7 @@ var DreamePush = class extends TypedEmitter {
     this.#region = input.region;
     this.#connect = input.connect ?? defaultConnect;
     this.#backoffMs = input.reconnectBackoffMs ?? 5e3;
+    this.#keepaliveSeconds = input.keepaliveSeconds ?? 60;
     this.#rejectUnauthorized = input.rejectUnauthorized ?? false;
     this.#topic = buildStatusTopic(this.#device, this.#session.uid, this.#region);
     this.#onClose = () => {
@@ -777,6 +779,7 @@ var DreamePush = class extends TypedEmitter {
       reconnectPeriod: 0,
       // we drive reconnect ourselves
       connectTimeout: 15e3,
+      keepalive: this.#keepaliveSeconds,
       rejectUnauthorized: this.#rejectUnauthorized,
       clean: true
     });
@@ -784,25 +787,37 @@ var DreamePush = class extends TypedEmitter {
     client.on("message", (_topic, payload) => this.#handleMessage(payload));
     client.on("error", (err) => this.emit("error", err));
     client.on("close", this.#onClose);
-    await new Promise((resolve, reject) => {
-      const onConnect = () => {
-        client.removeListener("error", onError);
-        client.subscribe(this.#topic, { qos: 0 }, (err) => {
-          if (err) {
-            reject(new DreameTransportError(`mqtt subscribe failed: ${err.message}`, err));
-            return;
-          }
-          this.emit("connect");
-          resolve();
-        });
-      };
-      const onError = (err) => {
-        client.removeListener("connect", onConnect);
-        reject(new DreameTransportError(`mqtt connect failed: ${err.message}`, err));
-      };
-      client.once("connect", onConnect);
-      client.once("error", onError);
-    });
+    try {
+      await new Promise((resolve, reject) => {
+        const onConnect = () => {
+          client.removeListener("error", onError);
+          client.subscribe(this.#topic, { qos: 0 }, (err) => {
+            if (err) {
+              reject(new DreameTransportError(`mqtt subscribe failed: ${err.message}`, err));
+              return;
+            }
+            this.emit("connect");
+            resolve();
+          });
+        };
+        const onError = (err) => {
+          client.removeListener("connect", onConnect);
+          reject(new DreameTransportError(`mqtt connect failed: ${err.message}`, err));
+        };
+        client.once("connect", onConnect);
+        client.once("error", onError);
+      });
+    } catch (err) {
+      client.removeListener("close", this.#onClose);
+      try {
+        client.end(true, {}, () => void 0);
+      } catch {
+      }
+      if (this.#client === client) {
+        this.#client = null;
+      }
+      throw err;
+    }
   }
   #scheduleReconnect() {
     if (this.#closed || this.#reconnectTimer) {