@apocaliss92/nodedreame 1.11.0 → 1.11.2

package/dist/index.cjs

@@ -44,6 +44,7 @@ __export(index_exports, {
   DreameTransportError: () => DreameTransportError,
   LIBRARY_NAME: () => LIBRARY_NAME,
   MOWER_MODEL_CAPABILITIES: () => MODEL_CAPABILITIES2,
+  MOWER_TASK_SUBSTATES: () => MOWER_TASK_SUBSTATES,
   MiotError: () => MiotError,
   MiotState: () => MiotState,
   MowerCapabilityResolver: () => MowerCapabilityResolver,
@@ -75,6 +76,7 @@ __export(index_exports, {
   isDreameConsumableKey: () => isDreameConsumableKey,
   mowerConsumableIndex: () => mowerConsumableIndex,
   parseMowerConsumables: () => parseMowerConsumables,
+  parseMowerHeartbeat: () => parseMowerHeartbeat,
   renderMowerSvg: () => renderMowerSvg,
   renderVacuumPng: () => renderVacuumPng,
   resolveCapabilities: () => resolveCapabilities,
@@ -84,7 +86,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.2";
 
 // src/transport/errors.ts
 var DreameError = class extends Error {
@@ -700,6 +702,7 @@ var DreamePush = class extends TypedEmitter {
   #region;
   #connect;
   #backoffMs;
+  #keepaliveSeconds;
   #rejectUnauthorized;
   #topic;
   #client = null;
@@ -720,6 +723,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 +781,7 @@ var DreamePush = class extends TypedEmitter {
       reconnectPeriod: 0,
       // we drive reconnect ourselves
       connectTimeout: 15e3,
+      keepalive: this.#keepaliveSeconds,
       rejectUnauthorized: this.#rejectUnauthorized,
       clean: true
     });
@@ -784,25 +789,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) {
@@ -1644,7 +1661,9 @@ function encodeAiFeatureWrite(raw, feature, value) {
   if (typeof raw === "number") {
     const bit = AI_FEATURE_BIT[feature];
     if (bit === void 0) {
-      throw new Error(`encodeAiFeatureWrite: feature "${feature}" has no int-bitmask representation`);
+      throw new Error(
+        `encodeAiFeatureWrite: feature "${feature}" has no int-bitmask representation`
+      );
     }
     return value ? raw | bit : raw & ~bit;
   }
@@ -1761,18 +1780,53 @@ function encodeAutoSwitchWrite(key2, value) {
 
 // src/models/vacuum/consumables.ts
 var VACUUM_CONSUMABLES = [
-  { key: "main-brush", label: "Main Brush", life: { siid: 9, piid: 2 }, reset: { siid: 9, aiid: 1 } },
-  { key: "side-brush", label: "Side Brush", life: { siid: 10, piid: 2 }, reset: { siid: 10, aiid: 1 } },
+  {
+    key: "main-brush",
+    label: "Main Brush",
+    life: { siid: 9, piid: 2 },
+    reset: { siid: 9, aiid: 1 }
+  },
+  {
+    key: "side-brush",
+    label: "Side Brush",
+    life: { siid: 10, piid: 2 },
+    reset: { siid: 10, aiid: 1 }
+  },
   { key: "filter", label: "Filter", life: { siid: 11, piid: 1 }, reset: { siid: 11, aiid: 1 } },
   { key: "sensor", label: "Sensor", life: { siid: 16, piid: 1 }, reset: { siid: 16, aiid: 1 } },
-  { key: "tank-filter", label: "Tank Filter", life: { siid: 17, piid: 1 }, reset: { siid: 17, aiid: 1 } },
+  {
+    key: "tank-filter",
+    label: "Tank Filter",
+    life: { siid: 17, piid: 1 },
+    reset: { siid: 17, aiid: 1 }
+  },
   { key: "mop-pad", label: "Mop Pad", life: { siid: 18, piid: 1 }, reset: { siid: 18, aiid: 1 } },
-  { key: "silver-ion", label: "Silver-ion", life: { siid: 19, piid: 2 }, reset: { siid: 19, aiid: 1 } },
-  { key: "detergent", label: "Detergent", life: { siid: 20, piid: 1 }, reset: { siid: 20, aiid: 1 } },
+  {
+    key: "silver-ion",
+    label: "Silver-ion",
+    life: { siid: 19, piid: 2 },
+    reset: { siid: 19, aiid: 1 }
+  },
+  {
+    key: "detergent",
+    label: "Detergent",
+    life: { siid: 20, piid: 1 },
+    reset: { siid: 20, aiid: 1 }
+  },
   { key: "squeegee", label: "Squeegee", life: { siid: 24, piid: 1 }, reset: { siid: 24, aiid: 1 } },
-  { key: "deodorizer", label: "Deodorizer", life: { siid: 29, piid: 2 }, reset: { siid: 29, aiid: 1 } },
+  {
+    key: "deodorizer",
+    label: "Deodorizer",
+    life: { siid: 29, piid: 2 },
+    reset: { siid: 29, aiid: 1 }
+  },
   { key: "wheel", label: "Wheel", life: { siid: 30, piid: 2 }, reset: { siid: 30, aiid: 1 } },
-  { key: "scale-inhibitor", label: "Scale Inhibitor", life: { siid: 31, piid: 2 }, reset: { siid: 31, aiid: 1 } },
+  {
+    key: "scale-inhibitor",
+    label: "Scale Inhibitor",
+    life: { siid: 31, piid: 2 },
+    reset: { siid: 31, aiid: 1 }
+  },
   { key: "dust-bag", label: "Dust Bag", life: { siid: 27, piid: 17 }, reset: null }
 ];
 function consumableSpec(key2) {
@@ -3887,6 +3941,9 @@ var VacuumDevice = class _VacuumDevice extends BaseDevice {
 
 // src/models/mower/properties.ts
 var MOWER_PROP = {
+  /** VERIFIED-by-donor — 20-byte heartbeat (sentinel 0xCE at [0]/[19]); byte 11
+   *  battery, byte 12 main-state, byte 13 task sub-state. See parseHeartbeat. */
+  HEARTBEAT: { siid: 1, piid: 1 },
   /** VERIFIED-by-donor — pose + coverage telemetry (binary). P4 uses progress % only. */
   POSE_COVERAGE: { siid: 1, piid: 4 },
   /** VERIFIED-by-donor — MowerStatus (DeviceStatus). */
@@ -4236,6 +4293,39 @@ function parseMowerConsumables(result) {
     };
   });
 }
+var MOWER_TASK_SUBSTATES = [
+  "idle",
+  "starting",
+  "mowing",
+  "paused",
+  "finished",
+  "failed",
+  "exit",
+  "returning-to-dock"
+];
+var HEARTBEAT_SENTINEL = 206;
+var HEARTBEAT_SUBSTATE_BASE = 33;
+var HEARTBEAT_MAIN_STATE_MOWING = 4;
+function parseMowerHeartbeat(value) {
+  if (!Array.isArray(value) || value.length < 14) {
+    return null;
+  }
+  const bytes = [];
+  for (const b of value) {
+    if (typeof b !== "number") {
+      return null;
+    }
+    bytes.push(b);
+  }
+  if (bytes[0] !== HEARTBEAT_SENTINEL || bytes[bytes.length - 1] !== HEARTBEAT_SENTINEL) {
+    return null;
+  }
+  const rawBattery = bytes[11] ?? 0;
+  const mainState = ((bytes[12] ?? 0) & 15) - 1;
+  const subStateRaw = bytes[13] ?? 0;
+  const taskSubState = mainState === HEARTBEAT_MAIN_STATE_MOWING ? MOWER_TASK_SUBSTATES[subStateRaw - HEARTBEAT_SUBSTATE_BASE] ?? null : null;
+  return { rawBattery, mainState, subStateRaw, taskSubState };
+}
 
 // src/models/mower/capabilities.ts
 var FALLBACK2 = {
@@ -4909,6 +4999,19 @@ var MowerDevice = class _MowerDevice extends BaseDevice {
   get fault() {
     return FAULT(this.faultRaw);
   }
+  /**
+   * Live mowing task sub-state decoded from the HEARTBEAT (1:1) blob —
+   * idle/starting/mowing/paused/finished/failed/exit/returning-to-dock — or null
+   * when no mowing session is in progress (or the heartbeat is absent). This is
+   * the donor's "current task" sensor; the heartbeat is push-only (the mower does
+   * not answer live reads), so it tracks the device while it is actively mowing.
+   */
+  get taskSubState() {
+    const hb = parseMowerHeartbeat(
+      this.getProperty(MOWER_PROP.HEARTBEAT.siid, MOWER_PROP.HEARTBEAT.piid)?.value
+    );
+    return hb?.taskSubState ?? null;
+  }
   /** Parsed scheduling task descriptor (2:50), or null. */
   get task() {
     return parseTaskDescriptor(
@@ -5100,6 +5203,7 @@ var MowerDevice = class _MowerDevice extends BaseDevice {
   }
   /** Props worth seeding on start() / polling — exported for the facade. */
   static DEFAULT_PROPS = [
+    MOWER_PROP.HEARTBEAT,
     MOWER_PROP.STATUS,
     MOWER_PROP.DEVICE_CODE,
     MOWER_PROP.BATTERY,
@@ -5728,6 +5832,7 @@ function createClientDumper(client, options) {
   DreameTransportError,
   LIBRARY_NAME,
   MOWER_MODEL_CAPABILITIES,
+  MOWER_TASK_SUBSTATES,
   MiotError,
   MiotState,
   MowerCapabilityResolver,
@@ -5759,6 +5864,7 @@ function createClientDumper(client, options) {
   isDreameConsumableKey,
   mowerConsumableIndex,
   parseMowerConsumables,
+  parseMowerHeartbeat,
   renderMowerSvg,
   renderVacuumPng,
   resolveCapabilities,