@apocaliss92/nodedreame 1.11.1 → 1.11.3

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.1";
+var LIBRARY_VERSION = "1.11.3";
 
 // src/transport/errors.ts
 var DreameError = class extends Error {
@@ -142,8 +144,11 @@ function buildRlcHeader(region, lang, country) {
 function randomMqttClientId() {
   return "p_" + (0, import_node_crypto.randomBytes)(8).toString("hex");
 }
+var MAX_REQUEST_ID = 16777215;
+var nextRequestId = Math.floor(Math.random() * 100) + 1;
 function randomRequestId() {
-  return Math.floor(Math.random() * 2147483647) + 1;
+  nextRequestId = nextRequestId >= MAX_REQUEST_ID ? 1 : nextRequestId + 1;
+  return nextRequestId;
 }
 
 // src/auth/config.ts
@@ -342,7 +347,7 @@ var OAuthTokenResponseSchema = import_zod.z.object({
   error: import_zod.z.string().optional(),
   error_description: import_zod.z.string().optional(),
   code: import_zod.z.number().optional(),
-  msg: import_zod.z.string().optional()
+  msg: import_zod.z.string().nullish()
 }).passthrough();
 var RawDeviceSchema = import_zod.z.object({
   did: import_zod.z.union([import_zod.z.string(), import_zod.z.number()]).optional(),
@@ -357,7 +362,7 @@ var RawDeviceSchema = import_zod.z.object({
 }).passthrough();
 var DeviceListResponseSchema = import_zod.z.object({
   code: import_zod.z.number().optional(),
-  msg: import_zod.z.string().optional(),
+  msg: import_zod.z.string().nullish(),
   data: import_zod.z.object({
     page: import_zod.z.object({ records: import_zod.z.array(RawDeviceSchema).optional() }).partial().optional(),
     records: import_zod.z.array(RawDeviceSchema).optional()
@@ -377,12 +382,12 @@ var CachedPropEntrySchema = import_zod.z.object({
 }).passthrough();
 var CachedPropsResponseSchema = import_zod.z.object({
   code: import_zod.z.number().optional(),
-  msg: import_zod.z.string().optional(),
+  msg: import_zod.z.string().nullish(),
   data: import_zod.z.array(CachedPropEntrySchema).optional()
 }).passthrough();
 var SendCommandResponseSchema = import_zod.z.object({
   code: import_zod.z.number().optional(),
-  msg: import_zod.z.string().optional(),
+  msg: import_zod.z.string().nullish(),
   data: import_zod.z.object({ result: import_zod.z.unknown().optional() }).passthrough().optional(),
   result: import_zod.z.unknown().optional()
 }).passthrough();
@@ -1659,7 +1664,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;
   }
@@ -1776,18 +1783,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) {
@@ -3902,6 +3944,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). */
@@ -4251,6 +4296,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 = {
@@ -4924,6 +5002,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(
@@ -5115,6 +5206,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,
@@ -5743,6 +5835,7 @@ function createClientDumper(client, options) {
   DreameTransportError,
   LIBRARY_NAME,
   MOWER_MODEL_CAPABILITIES,
+  MOWER_TASK_SUBSTATES,
   MiotError,
   MiotState,
   MowerCapabilityResolver,
@@ -5774,6 +5867,7 @@ function createClientDumper(client, options) {
   isDreameConsumableKey,
   mowerConsumableIndex,
   parseMowerConsumables,
+  parseMowerHeartbeat,
   renderMowerSvg,
   renderVacuumPng,
   resolveCapabilities,