@apocaliss92/nodedreame 1.11.5 → 1.11.9

package/dist/index.cjs

@@ -75,8 +75,10 @@ __export(index_exports, {
   getVacuumCapabilities: () => getVacuumCapabilities,
   isDreameConsumableKey: () => isDreameConsumableKey,
   mowerConsumableIndex: () => mowerConsumableIndex,
+  mowerFaultSeverity: () => mowerFaultSeverity,
   parseMowerConsumables: () => parseMowerConsumables,
   parseMowerHeartbeat: () => parseMowerHeartbeat,
+  parseMowingProgress: () => parseMowingProgress,
   renderMowerSvg: () => renderMowerSvg,
   renderVacuumPng: () => renderVacuumPng,
   resolveCapabilities: () => resolveCapabilities,
@@ -86,7 +88,7 @@ module.exports = __toCommonJS(index_exports);
 
 // src/support/version.ts
 var LIBRARY_NAME = "nodedreame";
-var LIBRARY_VERSION = "1.11.5";
+var LIBRARY_VERSION = "1.11.9";
 
 // src/transport/errors.ts
 var DreameError = class extends Error {
@@ -385,6 +387,11 @@ var CachedPropsResponseSchema = import_zod.z.object({
   msg: import_zod.z.string().nullish(),
   data: import_zod.z.array(CachedPropEntrySchema).optional()
 }).passthrough();
+var BatchDeviceDataResponseSchema = import_zod.z.object({
+  code: import_zod.z.number().optional(),
+  msg: import_zod.z.string().nullish(),
+  data: import_zod.z.record(import_zod.z.string(), import_zod.z.unknown()).optional()
+}).passthrough();
 var SendCommandResponseSchema = import_zod.z.object({
   code: import_zod.z.number().optional(),
   msg: import_zod.z.string().nullish(),
@@ -645,6 +652,29 @@ async function callAction(base, action, opts = {}) {
   const res = await sendCommand({ ...base, ...opts, method: "action", params });
   return res.data?.result ?? res.result ?? res;
 }
+async function getBatchDeviceDatas(base, props, opts = {}) {
+  const ctx = base.ctx ?? RequestContext.from({ ...base, host: base.apiHost });
+  const signal = opts.signal ?? base.signal;
+  const timeoutMs = opts.timeoutMs ?? base.timeoutMs;
+  const raw = await httpPostJsonBody({
+    ctx,
+    path: "/dreame-user-iot/iotuserdata/getDeviceData",
+    accessToken: base.session.accessToken,
+    body: { did: base.did, model: props },
+    context: "batch device data",
+    ...signal !== void 0 ? { signal } : {},
+    ...timeoutMs !== void 0 ? { timeoutMs } : {}
+  });
+  const parsed = BatchDeviceDataResponseSchema.parse(raw);
+  if (parsed.code !== void 0 && parsed.code !== 0) {
+    throw new DreameApiError(
+      `batch device data rejected: code=${parsed.code} msg=${parsed.msg ?? "?"}`,
+      200,
+      parsed
+    );
+  }
+  return parsed.data ?? {};
+}
 function extractResultArray(res, context) {
   const raw = Array.isArray(res.data?.result) ? res.data.result : Array.isArray(res.result) ? res.result : null;
   if (raw === null) {
@@ -2149,6 +2179,43 @@ function parseFrame(inflated) {
   return { header, tail };
 }
 
+// src/models/vacuum/map/segment-types.ts
+var SEGMENT_TYPE_CODE_TO_NAME = {
+  0: "Room",
+  1: "Living Room",
+  2: "Primary Bedroom",
+  3: "Study",
+  4: "Kitchen",
+  5: "Dining Hall",
+  6: "Bathroom",
+  7: "Balcony",
+  8: "Corridor",
+  9: "Utility Room",
+  10: "Closet",
+  11: "Meeting Room",
+  12: "Office",
+  13: "Fitness Area",
+  14: "Recreation Area",
+  15: "Secondary Bedroom"
+};
+function safeBase64ToUtf8(s) {
+  try {
+    return Buffer.from(s, "base64").toString("utf8");
+  } catch {
+    return null;
+  }
+}
+function resolveSegmentName(type, index, customName) {
+  if (type !== void 0 && type !== 0 && SEGMENT_TYPE_CODE_TO_NAME[type] !== void 0) {
+    const base = SEGMENT_TYPE_CODE_TO_NAME[type];
+    return index !== void 0 && index > 0 ? `${base} ${index + 1}` : base;
+  }
+  if (typeof customName === "string" && customName.length > 0) {
+    return safeBase64ToUtf8(customName);
+  }
+  return null;
+}
+
 // src/models/vacuum/map/pixel-grid.ts
 function classifyPixelFsm1(byte) {
   if (byte === 0) {
@@ -2294,7 +2361,9 @@ function collectSegments(layers, dim, tail) {
     };
     segs.push({
       id,
-      name: meta?.name ? safeBase64ToUtf8(meta.name) : null,
+      // Mirror the donor: a room-type code (≠0) yields a localized default name
+      // (e.g. "Kitchen"), else the user's custom base64 name, else null.
+      name: resolveSegmentName(meta?.type, meta?.index, meta?.name),
       bbox,
       centroid,
       neighbours: meta?.nei_id ?? [],
@@ -2305,13 +2374,6 @@ function collectSegments(layers, dim, tail) {
   }
   return segs;
 }
-function safeBase64ToUtf8(s) {
-  try {
-    return Buffer.from(s, "base64").toString("utf8");
-  } catch {
-    return null;
-  }
-}
 
 // src/models/vacuum/map/path.ts
 var PATH_TYPE_FROM_OP = {
@@ -2857,18 +2919,27 @@ function decodeVacuumMap(input, opts = {}) {
   const pixelGrid = inflated.subarray(pixelStart, pixelEnd);
   const canDecodePixels = header.frameType === "I" && pixelGrid.length === header.width * header.height;
   const layers = canDecodePixels ? decodePixelGridFsm1(pixelGrid, header.width, header.height) : [];
-  const segments = canDecodePixels ? collectSegments(layers, dimensions, tail) : [];
   const paths = parsePathTr(tail.tr ?? "");
   const obstacles = parseObstacles(tail.ai_obstacle ?? []);
   let geometry = parseTailGeometry(tail);
-  if (!isGeometryComplete(geometry) && typeof tail.rism === "string" && tail.rism.length > 0) {
+  let segTail = tail;
+  const outerHasNames = Object.values(tail.seg_inf ?? {}).some(
+    (m) => typeof m?.name === "string" && m.name.length > 0
+  );
+  if ((!isGeometryComplete(geometry) || !outerHasNames) && typeof tail.rism === "string" && tail.rism.length > 0) {
     try {
       const innerInflated = unwrapEnvelope(tail.rism);
       const { tail: innerTail } = parseFrame(innerInflated);
-      geometry = coalesceGeometry(geometry, parseTailGeometry(innerTail));
+      if (!isGeometryComplete(geometry)) {
+        geometry = coalesceGeometry(geometry, parseTailGeometry(innerTail));
+      }
+      if (!outerHasNames && innerTail.seg_inf) {
+        segTail = mergeSegInfNames(tail, innerTail.seg_inf);
+      }
     } catch {
     }
   }
+  const segments = canDecodePixels ? collectSegments(layers, dimensions, segTail) : [];
   const cleanedArea = typeof tail.decmap === "string" ? parseCleanedAreaOverlay(tail.decmap) : null;
   return {
     mapId: header.mapId,
@@ -2892,6 +2963,18 @@ function applyVacuumPFrame(prev, pframe, opts = {}) {
   const merged = typeof prev === "string" || typeof pframe === "string" ? mergePFrameEnvelope(prev, pframe, opts.prev, opts.pframe) : mergePFrame(prev, pframe);
   return { buffer: merged, data: decodeVacuumMap(merged) };
 }
+function mergeSegInfNames(tail, innerSegInf) {
+  const outer = tail.seg_inf ?? {};
+  const ids = /* @__PURE__ */ new Set([...Object.keys(outer), ...Object.keys(innerSegInf)]);
+  const merged = {};
+  for (const id of ids) {
+    const o = outer[id] ?? {};
+    const inner = innerSegInf[id] ?? {};
+    const name = typeof o.name === "string" && o.name.length > 0 ? o.name : inner.name;
+    merged[id] = { ...inner, ...o, ...name !== void 0 ? { name } : {} };
+  }
+  return { ...tail, seg_inf: merged };
+}
 function mergeDimensions(header, tail) {
   const left = tail.origin?.[0] ?? header.left;
   const top = tail.origin?.[1] ?? header.top;
@@ -3052,8 +3135,12 @@ function renderVacuumPng(map, opts = {}) {
     const byType = opts.colorObstaclesByType !== false;
     for (const ob of map.obstacles) {
       const p = worldToPx(ob.x, ob.y, dim, scale);
-      const color = byType ? obstacleColor(ob.type) : pal.obstacle;
-      drawDiamond(png, p.x, p.y, Math.max(2, scale * 2), color);
+      const r = Math.max(2, scale * 2);
+      if (byType) {
+        drawObstacleShape(png, p.x, p.y, r, ob.type, obstacleColor(ob.type));
+      } else {
+        drawDiamond(png, p.x, p.y, r, pal.obstacle);
+      }
     }
   }
   if (opts.showCharger !== false && map.dock !== null) {
@@ -3214,6 +3301,32 @@ function obstacleColor(type) {
   const hue = Math.abs(Math.trunc(type)) * 47 % 360;
   return hsvToRgba(hue, 0.85, 0.95);
 }
+function drawSquare(png, cx, cy, r, color) {
+  fillRect(png, cx - r, cy - r, cx + r, cy + r, color);
+}
+function drawTriangle(png, cx, cy, r, color) {
+  for (let dy = -r; dy <= r; dy += 1) {
+    const w = Math.round((dy + r) / (2 * r) * r);
+    for (let dx = -w; dx <= w; dx += 1) {
+      setPixel(png, cx + dx, cy + dy, color);
+    }
+  }
+}
+function drawObstacleShape(png, cx, cy, r, type, color) {
+  switch (Math.abs(Math.trunc(type)) % 4) {
+    case 0:
+      drawDiamond(png, cx, cy, r, color);
+      return;
+    case 1:
+      drawSquare(png, cx, cy, r, color);
+      return;
+    case 2:
+      drawTriangle(png, cx, cy, r, color);
+      return;
+    default:
+      drawDisk(png, cx, cy, r, color);
+  }
+}
 var FURNITURE_LINE = [150, 110, 200, 235];
 function paintFurnitureZone(png, points, dim, scale) {
   if (points.length < 2) return;
@@ -4056,7 +4169,8 @@ var TASK_OPCODE = {
   ALL_AREA: 100,
   EDGE: 101,
   ZONE: 102,
-  SPOT: 103
+  SPOT: 103,
+  SET_CURRENT_MAP: 200
 };
 function buildResumePayload() {
   return { m: "a", p: 0, o: 5 };
@@ -4073,6 +4187,9 @@ function buildEdgePayload(contourIds) {
 function buildSpotPayload(spotAreaIds) {
   return { m: "a", p: 0, o: TASK_OPCODE.SPOT, d: { area: [...spotAreaIds] } };
 }
+function buildSetCurrentMapPayload(mapIndex) {
+  return { m: "a", p: 0, o: TASK_OPCODE.SET_CURRENT_MAP, d: { idx: mapIndex } };
+}
 function buildGetConsumablePayload() {
   return { m: "g", t: "CMS" };
 }
@@ -4198,6 +4315,12 @@ var MowerFault = /* @__PURE__ */ ((MowerFault2) => {
   MowerFault2[MowerFault2["TopCoverOpen"] = 73] = "TopCoverOpen";
   return MowerFault2;
 })(MowerFault || {});
+function mowerFaultSeverity(code) {
+  if (code === null) return "info";
+  if (code >= 1 && code <= 30 || code === 37 || code === 73) return "error";
+  if (code >= 31 && code <= 36 || code >= 38 && code <= 45) return "warning";
+  return "info";
+}
 
 // src/models/mower/decode.ts
 function isRecord2(v) {
@@ -4408,6 +4531,37 @@ function parseMowerHeartbeat(value) {
   const taskSubState = mainState === HEARTBEAT_MAIN_STATE_MOWING ? MOWER_TASK_SUBSTATES[subStateRaw - HEARTBEAT_SUBSTATE_BASE] ?? null : null;
   return { rawBattery, mainState, subStateRaw, taskSubState };
 }
+var POSE_SENTINEL = 206;
+function poseBytes(value) {
+  if (!Array.isArray(value)) return null;
+  const bytes = [];
+  for (const b of value) {
+    if (typeof b !== "number") return null;
+    bytes.push(b);
+  }
+  return bytes;
+}
+function parseMowingProgress(value) {
+  const bytes = poseBytes(value);
+  if (bytes === null || bytes.length < 11) return null;
+  const last = bytes[bytes.length - 1];
+  const head = bytes[0];
+  let offset = null;
+  if (head !== POSE_SENTINEL && last === POSE_SENTINEL) {
+    offset = 0;
+  } else if (head === POSE_SENTINEL && last === POSE_SENTINEL && bytes.length >= 33) {
+    offset = 22;
+  }
+  if (offset === null || offset + 10 > bytes.length) return null;
+  const rawPercent = (bytes[offset + 2] ?? 0) | (bytes[offset + 3] ?? 0) << 8;
+  const total = (bytes[offset + 4] ?? 0) | (bytes[offset + 5] ?? 0) << 8 | (bytes[offset + 6] ?? 0) << 16;
+  const finish = (bytes[offset + 7] ?? 0) | (bytes[offset + 8] ?? 0) << 8 | (bytes[offset + 9] ?? 0) << 16;
+  return {
+    progressPercent: rawPercent ? Math.min(100, rawPercent / 100) : 0,
+    currentAreaSqm: finish / 100,
+    totalAreaSqm: total / 100
+  };
+}
 
 // src/models/mower/capabilities.ts
 var FALLBACK2 = {
@@ -5026,7 +5180,10 @@ var MowerDevice = class _MowerDevice extends BaseDevice {
       capabilities: input.capabilities ?? new MowerCapabilityResolver().resolve(input.device.model)
     });
     this.#caps = getMowerCapabilities(input.device.model);
-    this.#fetchBatch = input.getBatchDeviceDatas ?? null;
+    this.#fetchBatch = input.getBatchDeviceDatas ?? ((did, props) => getBatchDeviceDatas(
+      { session: this.currentSession(), region: this.region, did },
+      props
+    ));
   }
   /** Rich, mower-specific capability record. */
   get mowerCapabilities() {
@@ -5107,6 +5264,25 @@ var MowerDevice = class _MowerDevice extends BaseDevice {
   get coverageTargetPct() {
     return this.task?.coverageTarget ?? null;
   }
+  /**
+   * Live mowing PROGRESS decoded from the POSE_COVERAGE (1:4) task block —
+   * `{progressPercent, currentAreaSqm, totalAreaSqm}` — or null when 1:4 carries
+   * no task block (idle / pose-only frame). This is the byte-accurate progress
+   * the Dreamehome app shows (vs {@link coverageTargetPct}, the task TARGET).
+   */
+  get mowingProgress() {
+    return parseMowingProgress(
+      this.getProperty(MOWER_PROP.POSE_COVERAGE.siid, MOWER_PROP.POSE_COVERAGE.piid)?.value
+    );
+  }
+  /** Mowing completion percent (0..100) from {@link mowingProgress}, or null. */
+  get mowingProgressPct() {
+    return this.mowingProgress?.progressPercent ?? null;
+  }
+  /** Severity of the current DEVICE_CODE (2:2) — info / warning / error. */
+  get faultSeverity() {
+    return mowerFaultSeverity(this.faultRaw);
+  }
   /** Parsed per-zone control status (2:56), or null. */
   get controlStatus() {
     return parseControlStatus(
@@ -5186,6 +5362,20 @@ var MowerDevice = class _MowerDevice extends BaseDevice {
     }
     return this.#sendTask(buildSpotPayload(spotAreaIds.map((s) => Math.trunc(s))));
   }
+  /**
+   * Switch the mower's ACTIVE map (2:50 o:200). Takes a map *id* (as carried by
+   * {@link MowerMap.availableMaps}/`currentMapId`) and resolves it to the
+   * firmware's map *index* via the last-fetched map; falls back to treating the
+   * id as the index when no map has been fetched yet. Mirrors the donor
+   * `set_current_map`. Capability-gated on `canMap`.
+   */
+  async setCurrentMap(mapId) {
+    this.#requireCap(this.#caps.canMap, "setCurrentMap", "map switching");
+    const id = Math.trunc(mapId);
+    const entry = this.#lastMap?.availableMaps.find((m) => m.mapId === id);
+    const index = entry?.mapIndex ?? id;
+    return this.#sendTask(buildSetCurrentMapPayload(index));
+  }
   // -- CMS consumables ----------------------------------------------------
   /**
    * Read the raw CMS consumable counters `[blade, brush, robot]` (minutes used),
@@ -5286,6 +5476,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.POSE_COVERAGE,
     MOWER_PROP.STATUS,
     MOWER_PROP.DEVICE_CODE,
     MOWER_PROP.BATTERY,
@@ -5945,8 +6136,10 @@ function createClientDumper(client, options) {
   getVacuumCapabilities,
   isDreameConsumableKey,
   mowerConsumableIndex,
+  mowerFaultSeverity,
   parseMowerConsumables,
   parseMowerHeartbeat,
+  parseMowingProgress,
   renderMowerSvg,
   renderVacuumPng,
   resolveCapabilities,