@apocaliss92/nodedreame 1.10.0 → 1.11.1

package/dist/index.cjs

@@ -69,9 +69,12 @@ __export(index_exports, {
   decodeAutoSwitchAll: () => decodeAutoSwitchAll,
   encodeAiFeatureWrite: () => encodeAiFeatureWrite,
   encodeAutoSwitchWrite: () => encodeAutoSwitchWrite,
+  extractMowerConsumableValues: () => extractMowerConsumableValues,
   getMowerCapabilities: () => getMowerCapabilities,
   getVacuumCapabilities: () => getVacuumCapabilities,
   isDreameConsumableKey: () => isDreameConsumableKey,
+  mowerConsumableIndex: () => mowerConsumableIndex,
+  parseMowerConsumables: () => parseMowerConsumables,
   renderMowerSvg: () => renderMowerSvg,
   renderVacuumPng: () => renderVacuumPng,
   resolveCapabilities: () => resolveCapabilities,
@@ -81,7 +84,7 @@ module.exports = __toCommonJS(index_exports);
 
 // src/support/version.ts
 var LIBRARY_NAME = "nodedreame";
-var LIBRARY_VERSION = "1.10.0";
+var LIBRARY_VERSION = "1.11.1";
 
 // src/transport/errors.ts
 var DreameError = class extends Error {
@@ -697,6 +700,7 @@ var DreamePush = class extends TypedEmitter {
   #region;
   #connect;
   #backoffMs;
+  #keepaliveSeconds;
   #rejectUnauthorized;
   #topic;
   #client = null;
@@ -717,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 = () => {
@@ -774,6 +779,7 @@ var DreamePush = class extends TypedEmitter {
       reconnectPeriod: 0,
       // we drive reconnect ourselves
       connectTimeout: 15e3,
+      keepalive: this.#keepaliveSeconds,
       rejectUnauthorized: this.#rejectUnauthorized,
       clean: true
     });
@@ -781,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) {
@@ -3931,6 +3949,19 @@ function buildEdgePayload(contourIds) {
 function buildSpotPayload(spotAreaIds) {
   return { m: "a", p: 0, o: TASK_OPCODE.SPOT, d: { area: [...spotAreaIds] } };
 }
+function buildGetConsumablePayload() {
+  return { m: "g", t: "CMS" };
+}
+function buildSetConsumablePayload(values) {
+  const normalized = values.map((v) => Math.trunc(v));
+  if (normalized.length !== 3) {
+    throw new RangeError(`CMS values must contain exactly 3 counters; got ${normalized.length}`);
+  }
+  if (normalized.some((v) => v < 0)) {
+    throw new RangeError(`CMS values cannot be negative; got ${JSON.stringify(normalized)}`);
+  }
+  return { m: "s", t: "CMS", d: { value: normalized } };
+}
 
 // src/models/mower/enums.ts
 var MowerStatus = /* @__PURE__ */ ((MowerStatus2) => {
@@ -4122,6 +4153,104 @@ function parseControlStatus(value) {
     zones
   };
 }
+var MOWER_CONSUMABLES = [
+  { key: "blade", index: 0, totalMinutes: 6e3 },
+  { key: "brush", index: 1, totalMinutes: 3e4 },
+  { key: "maintenance", index: 2, totalMinutes: 3600 }
+];
+function mowerConsumableIndex(item) {
+  switch (item.trim().toLowerCase()) {
+    case "blade":
+    case "blades":
+      return 0;
+    case "brush":
+    case "cleaning_brush":
+      return 1;
+    case "robot":
+    case "maintenance":
+    case "robot_maintenance":
+      return 2;
+    default:
+      return null;
+  }
+}
+function toInt(v) {
+  if (typeof v === "number" && Number.isFinite(v)) {
+    return Math.trunc(v);
+  }
+  if (typeof v === "string") {
+    const n = Number(v);
+    return Number.isFinite(n) ? Math.trunc(n) : null;
+  }
+  return null;
+}
+function extractCustomActionData(result) {
+  if (!isRecord2(result)) {
+    return null;
+  }
+  if (Array.isArray(result["value"])) {
+    return result;
+  }
+  if (isRecord2(result["d"])) {
+    return result["d"];
+  }
+  const out = result["out"];
+  if (!Array.isArray(out)) {
+    return null;
+  }
+  for (const entry of out) {
+    if (!isRecord2(entry)) {
+      continue;
+    }
+    const r = entry["r"];
+    const code = entry["code"];
+    const rError = r !== void 0 && r !== null && r !== 0;
+    const codeError = code !== void 0 && code !== null && code !== 0;
+    if (rError && codeError) {
+      continue;
+    }
+    if (isRecord2(entry["d"])) {
+      return entry["d"];
+    }
+  }
+  return null;
+}
+function extractMowerConsumableValues(result) {
+  const data = extractCustomActionData(result);
+  if (data === null) {
+    return null;
+  }
+  const values = data["value"];
+  if (!Array.isArray(values) || values.length < 3) {
+    return null;
+  }
+  const out = [];
+  for (const v of values.slice(0, 3)) {
+    const n = toInt(v);
+    if (n === null) {
+      return null;
+    }
+    out.push(n);
+  }
+  return out;
+}
+function parseMowerConsumables(result) {
+  const values = extractMowerConsumableValues(result);
+  if (values === null) {
+    return null;
+  }
+  return MOWER_CONSUMABLES.map((c) => {
+    const used = values[c.index] ?? 0;
+    const remaining = c.totalMinutes - used;
+    const pct = Math.max(0, Math.min(100, Math.round(remaining / c.totalMinutes * 1e3) / 10));
+    return {
+      key: c.key,
+      usedMinutes: used,
+      totalMinutes: c.totalMinutes,
+      remainingPercent: pct
+    };
+  });
+}
 
 // src/models/mower/capabilities.ts
 var FALLBACK2 = {
@@ -4887,6 +5016,56 @@ var MowerDevice = class _MowerDevice extends BaseDevice {
     }
     return this.#sendTask(buildSpotPayload(spotAreaIds.map((s) => Math.trunc(s))));
   }
+  // -- CMS consumables ----------------------------------------------------
+  /**
+   * Read the raw CMS consumable counters `[blade, brush, robot]` (minutes used),
+   * via the SCHEDULING_TASK (2:50) custom-action getter `{m:'g',t:'CMS'}`. This
+   * is a LIVE device action (it wakes the mower); rejects with
+   * {@link DreameDeviceOfflineError} when the mower is unreachable. Returns null
+   * if the response is malformed.
+   */
+  async getConsumableValues() {
+    const result = await this.callAction(
+      MOWER_PROP.SCHEDULING_TASK.siid,
+      MOWER_PROP.SCHEDULING_TASK.piid,
+      [buildGetConsumablePayload()]
+    );
+    return extractMowerConsumableValues(result);
+  }
+  /**
+   * Read the CMS consumables as typed readings (blade/brush/maintenance) with
+   * remaining %. LIVE action — see {@link getConsumableValues}. Returns null on
+   * a malformed response.
+   */
+  async getConsumables() {
+    const result = await this.callAction(
+      MOWER_PROP.SCHEDULING_TASK.siid,
+      MOWER_PROP.SCHEDULING_TASK.piid,
+      [buildGetConsumablePayload()]
+    );
+    return parseMowerConsumables(result);
+  }
+  /**
+   * Reset one CMS consumable counter to zero. Reads the current counters, zeroes
+   * the selected one (leaving the others), and writes them back via the
+   * `{m:'s',t:'CMS',d:{value:[…]}}` setter. LIVE action. Throws on an unknown
+   * item or when the current counters cannot be read.
+   */
+  async resetConsumable(item) {
+    const index = mowerConsumableIndex(item);
+    if (index === null) {
+      throw new DreameError(`resetConsumable: unknown consumable item "${item}"`);
+    }
+    const current = await this.getConsumableValues();
+    if (current === null) {
+      throw new DreameError("resetConsumable: failed to read current CMS counters");
+    }
+    const next = [...current];
+    next[index] = 0;
+    await this.callAction(MOWER_PROP.SCHEDULING_TASK.siid, MOWER_PROP.SCHEDULING_TASK.piid, [
+      buildSetConsumablePayload(next)
+    ]);
+  }
   /**
    * Seed the cache from the CLOUD SHADOW (last-known values) WITHOUT waking the
    * mower — reads {@link MowerDevice.DEFAULT_PROPS} from the cloud-cached
@@ -5589,9 +5768,12 @@ function createClientDumper(client, options) {
   decodeAutoSwitchAll,
   encodeAiFeatureWrite,
   encodeAutoSwitchWrite,
+  extractMowerConsumableValues,
   getMowerCapabilities,
   getVacuumCapabilities,
   isDreameConsumableKey,
+  mowerConsumableIndex,
+  parseMowerConsumables,
   renderMowerSvg,
   renderVacuumPng,
   resolveCapabilities,