@apocaliss92/nodedreame 1.11.6 → 1.11.10

package/dist/index.d.cts

@@ -2178,6 +2178,14 @@ declare class MowerDevice extends BaseDevice {
     startMowingEdges(contourIds: number[][]): Promise<unknown>;
     /** Spot mowing (2:50 o:103). */
     startMowingSpots(spotAreaIds: number[]): Promise<unknown>;
+    /**
+     * 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`.
+     */
+    setCurrentMap(mapId: number): Promise<unknown>;
     /**
      * 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

package/dist/index.d.ts

@@ -2178,6 +2178,14 @@ declare class MowerDevice extends BaseDevice {
     startMowingEdges(contourIds: number[][]): Promise<unknown>;
     /** Spot mowing (2:50 o:103). */
     startMowingSpots(spotAreaIds: number[]): Promise<unknown>;
+    /**
+     * 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`.
+     */
+    setCurrentMap(mapId: number): Promise<unknown>;
     /**
      * 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

package/dist/index.js

@@ -1,6 +1,6 @@
 // src/support/version.ts
 var LIBRARY_NAME = "nodedreame";
-var LIBRARY_VERSION = "1.11.6";
+var LIBRARY_VERSION = "1.11.10";
 
 // src/transport/errors.ts
 var DreameError = class extends Error {
@@ -299,6 +299,11 @@ var CachedPropsResponseSchema = z.object({
   msg: z.string().nullish(),
   data: z.array(CachedPropEntrySchema).optional()
 }).passthrough();
+var BatchDeviceDataResponseSchema = z.object({
+  code: z.number().optional(),
+  msg: z.string().nullish(),
+  data: z.record(z.string(), z.unknown()).optional()
+}).passthrough();
 var SendCommandResponseSchema = z.object({
   code: z.number().optional(),
   msg: z.string().nullish(),
@@ -559,6 +564,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) {
@@ -2063,6 +2091,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) {
@@ -2208,7 +2273,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 ?? [],
@@ -2219,13 +2286,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 = {
@@ -4021,7 +4081,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 };
@@ -4038,6 +4099,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" };
 }
@@ -4799,11 +4863,15 @@ var DEFAULT_HEIGHT = 1200;
 var DEFAULT_PADDING = 50;
 var BACKGROUND = "#f5f5f0";
 var MAP_BOUNDARY = "#006400";
-var MOWING_PATH = "#ffa500";
+var MOWING_PATH = "#32cd32";
 var NAV_PATH = "#b4b4b4";
 var OBSTACLE_STROKE = "#ff4d00";
 var OBSTACLE_FILL = "#ff4d0065";
 var TEXT_COLOR = "#000000";
+var ZONE_LABEL_COLOR = "#3c3c3c";
+function escapeXml(s) {
+  return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
+}
 var ZONE_COLORS = [
   ["#a4d291c8", "#86be73"],
   ["#a0c8dcc8", "#82aac8"],
@@ -4926,7 +4994,6 @@ function renderMowerSvg(map, opts = {}) {
     return lines.join("\n");
   }
   const bounds = calculateBounds(allPoints);
-  const multiZone = map.zones.length > 1;
   for (const navPath of map.paths) {
     const dashed = svgPathFromSegments(
       [navPath.path],
@@ -4943,9 +5010,6 @@ function renderMowerSvg(map, opts = {}) {
     }
   }
   map.zones.forEach((zone, i) => {
-    if (!multiZone) {
-      return;
-    }
     const palette = ZONE_COLORS[i % ZONE_COLORS.length];
     const [fill, outline] = palette ?? ZONE_COLORS[0] ?? ["#cccccc", "#888888"];
     const poly = svgPolygon(zone.path, bounds, width, height, padding, fill, outline);
@@ -4954,7 +5018,7 @@ function renderMowerSvg(map, opts = {}) {
     }
   });
   map.zones.forEach((zone, i) => {
-    const outline = multiZone ? ZONE_COLORS[i % ZONE_COLORS.length]?.[1] ?? MAP_BOUNDARY : MAP_BOUNDARY;
+    const outline = ZONE_COLORS[i % ZONE_COLORS.length]?.[1] ?? MAP_BOUNDARY;
     const boundary = svgPathFromSegments(
       [zone.path],
       bounds,
@@ -4998,6 +5062,22 @@ function renderMowerSvg(map, opts = {}) {
       lines.push(poly);
     }
   }
+  for (const zone of map.zones) {
+    if (zone.name.length === 0 || zone.path.length === 0) {
+      continue;
+    }
+    let sumX = 0;
+    let sumY = 0;
+    for (const p of zone.path) {
+      sumX += p.x;
+      sumY += p.y;
+    }
+    const centroid = { x: sumX / zone.path.length, y: sumY / zone.path.length };
+    const { px, py } = coordToPixel(centroid, bounds, width, height, padding);
+    lines.push(
+      `<text x="${px}" y="${py}" font-family="Arial, sans-serif" font-size="20" font-weight="bold" fill="${ZONE_LABEL_COLOR}" text-anchor="middle" dominant-baseline="middle">${escapeXml(zone.name)}</text>`
+    );
+  }
   lines.push("</svg>");
   return lines.join("\n");
 }
@@ -5028,7 +5108,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() {
@@ -5207,6 +5290,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),