@apocaliss92/nodedreame 1.11.2 → 1.11.4

package/dist/index.d.cts

@@ -1229,14 +1229,26 @@ interface VacuumMap {
  *
  * Coordinate transform: every overlay coordinate is mm in the world frame.
  * `dimensions.left` / `.top` are the world-mm of pixel (0,0) and `.gridSize` is
- * mm-per-pixel, so `px = (worldX - left) / gridSize` (then × `scale`). Row 0 is
- * the top edge — no Y flip.
+ * mm-per-pixel, so `xPx = (worldX - left) / gridSize` (then × `scale`).
+ *
+ * Y IS FLIPPED. Dreame's grid has world-Y increasing DOWNWARD relative to how
+ * the robot/dock/app present the floor, so rendering rows top-down produced a
+ * VERTICALLY MIRRORED map vs the Dreamehome app / Home Assistant (live-confirmed
+ * on r2538z). We reflect in cell space — `yPx = ((height - 1) - cellY) × scale` —
+ * applied identically to the run-length base layers ({@link paintRun}) and the
+ * world-frame overlays ({@link worldToPx}) so they stay pixel-aligned, and the
+ * robot heading's Y component is negated ({@link drawRobot}). Glyph labels are
+ * drawn upright (only their anchor is flipped).
  *
  * Pure: only `pngjs` + arithmetic. No casts.
  */
 
-/** A named map palette. Mirrors the HA integration's `color_scheme` choices. */
-type MapColorScheme = 'dreame-light' | 'dreame-dark' | 'mijia-light' | 'tasshack';
+/**
+ * A named map palette. The first four mirror the HA integration's `color_scheme`
+ * choices; `flat` / `dark-neon` / `materico` are node-dreame additions for
+ * distinct visual styles.
+ */
+type MapColorScheme = 'dreame-light' | 'dreame-dark' | 'mijia-light' | 'tasshack' | 'flat' | 'dark-neon' | 'materico';
 interface RenderVacuumPngOptions {
     /** Integer upscale factor (nearest-neighbour). Default 1. */
     scale?: number;
@@ -1256,6 +1268,15 @@ interface RenderVacuumPngOptions {
     showObstacles?: boolean;
     /** Draw the segment id as a tiny label at each room centroid. Default false. */
     showSegmentLabels?: boolean;
+    /** Draw each room's NAME (falls back to `Room <id>`) at its centroid. Default
+     *  false. Mutually useful with `showSegmentLabels` (names take the centroid). */
+    showSegmentNames?: boolean;
+    /** Tint the cleaned-area overlay (`cleanedArea.cleaned`) when present. Default false. */
+    showCleanedArea?: boolean;
+    /** Outline low-clearance "sneak under furniture" zones. Default true. */
+    showFurniture?: boolean;
+    /** Colour AI obstacle markers by their `type` (else a single accent). Default true. */
+    colorObstaclesByType?: boolean;
 }
 declare function renderVacuumPng(map: VacuumMap, opts?: RenderVacuumPngOptions): Buffer;
 

package/dist/index.d.ts

@@ -1229,14 +1229,26 @@ interface VacuumMap {
  *
  * Coordinate transform: every overlay coordinate is mm in the world frame.
  * `dimensions.left` / `.top` are the world-mm of pixel (0,0) and `.gridSize` is
- * mm-per-pixel, so `px = (worldX - left) / gridSize` (then × `scale`). Row 0 is
- * the top edge — no Y flip.
+ * mm-per-pixel, so `xPx = (worldX - left) / gridSize` (then × `scale`).
+ *
+ * Y IS FLIPPED. Dreame's grid has world-Y increasing DOWNWARD relative to how
+ * the robot/dock/app present the floor, so rendering rows top-down produced a
+ * VERTICALLY MIRRORED map vs the Dreamehome app / Home Assistant (live-confirmed
+ * on r2538z). We reflect in cell space — `yPx = ((height - 1) - cellY) × scale` —
+ * applied identically to the run-length base layers ({@link paintRun}) and the
+ * world-frame overlays ({@link worldToPx}) so they stay pixel-aligned, and the
+ * robot heading's Y component is negated ({@link drawRobot}). Glyph labels are
+ * drawn upright (only their anchor is flipped).
  *
  * Pure: only `pngjs` + arithmetic. No casts.
  */
 
-/** A named map palette. Mirrors the HA integration's `color_scheme` choices. */
-type MapColorScheme = 'dreame-light' | 'dreame-dark' | 'mijia-light' | 'tasshack';
+/**
+ * A named map palette. The first four mirror the HA integration's `color_scheme`
+ * choices; `flat` / `dark-neon` / `materico` are node-dreame additions for
+ * distinct visual styles.
+ */
+type MapColorScheme = 'dreame-light' | 'dreame-dark' | 'mijia-light' | 'tasshack' | 'flat' | 'dark-neon' | 'materico';
 interface RenderVacuumPngOptions {
     /** Integer upscale factor (nearest-neighbour). Default 1. */
     scale?: number;
@@ -1256,6 +1268,15 @@ interface RenderVacuumPngOptions {
     showObstacles?: boolean;
     /** Draw the segment id as a tiny label at each room centroid. Default false. */
     showSegmentLabels?: boolean;
+    /** Draw each room's NAME (falls back to `Room <id>`) at its centroid. Default
+     *  false. Mutually useful with `showSegmentLabels` (names take the centroid). */
+    showSegmentNames?: boolean;
+    /** Tint the cleaned-area overlay (`cleanedArea.cleaned`) when present. Default false. */
+    showCleanedArea?: boolean;
+    /** Outline low-clearance "sneak under furniture" zones. Default true. */
+    showFurniture?: boolean;
+    /** Colour AI obstacle markers by their `type` (else a single accent). Default true. */
+    colorObstaclesByType?: boolean;
 }
 declare function renderVacuumPng(map: VacuumMap, opts?: RenderVacuumPngOptions): Buffer;
 

package/dist/index.js

@@ -1,6 +1,6 @@
 // src/support/version.ts
 var LIBRARY_NAME = "nodedreame";
-var LIBRARY_VERSION = "1.11.2";
+var LIBRARY_VERSION = "1.11.4";
 
 // src/transport/errors.ts
 var DreameError = class extends Error {
@@ -58,8 +58,11 @@ function buildRlcHeader(region, lang, country) {
 function randomMqttClientId() {
   return "p_" + 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
@@ -258,7 +261,7 @@ var OAuthTokenResponseSchema = z.object({
   error: z.string().optional(),
   error_description: z.string().optional(),
   code: z.number().optional(),
-  msg: z.string().optional()
+  msg: z.string().nullish()
 }).passthrough();
 var RawDeviceSchema = z.object({
   did: z.union([z.string(), z.number()]).optional(),
@@ -273,7 +276,7 @@ var RawDeviceSchema = z.object({
 }).passthrough();
 var DeviceListResponseSchema = z.object({
   code: z.number().optional(),
-  msg: z.string().optional(),
+  msg: z.string().nullish(),
   data: z.object({
     page: z.object({ records: z.array(RawDeviceSchema).optional() }).partial().optional(),
     records: z.array(RawDeviceSchema).optional()
@@ -293,12 +296,12 @@ var CachedPropEntrySchema = z.object({
 }).passthrough();
 var CachedPropsResponseSchema = z.object({
   code: z.number().optional(),
-  msg: z.string().optional(),
+  msg: z.string().nullish(),
   data: z.array(CachedPropEntrySchema).optional()
 }).passthrough();
 var SendCommandResponseSchema = z.object({
   code: z.number().optional(),
-  msg: z.string().optional(),
+  msg: z.string().nullish(),
   data: z.object({ result: z.unknown().optional() }).passthrough().optional(),
   result: z.unknown().optional()
 }).passthrough();
@@ -2895,6 +2898,66 @@ var SCHEMES = {
     virtualWall: [195, 35, 35, 230],
     obstacle: [225, 145, 25, 255],
     label: [35, 42, 54, 255]
+  },
+  // Flat-design: soft neutral floor, bright low-saturation segment fills, thin
+  // mid-grey walls, a single vivid accent for the path.
+  flat: {
+    floor: [236, 239, 241, 255],
+    wall: [120, 132, 145, 255],
+    carpet: [205, 185, 160, 200],
+    segSat: 0.28,
+    segVal: 0.99,
+    path: [255, 138, 101, 240],
+    robotBody: [38, 50, 56, 255],
+    robotHeading: [255, 255, 255, 255],
+    charger: [38, 166, 154, 255],
+    noGoFill: [239, 83, 80, 60],
+    noGoBorder: [229, 57, 53, 210],
+    noMopFill: [66, 165, 245, 55],
+    noMopBorder: [30, 136, 229, 200],
+    virtualWall: [229, 57, 53, 225],
+    obstacle: [255, 167, 38, 255],
+    label: [55, 71, 79, 255]
+  },
+  // Dark-neon: near-black floor with high-saturation glowing segment fills, a
+  // bright cyan path and magenta robot.
+  "dark-neon": {
+    floor: [16, 18, 27, 255],
+    wall: [5, 6, 10, 255],
+    carpet: [60, 50, 80, 200],
+    segSat: 0.85,
+    segVal: 0.95,
+    path: [0, 230, 255, 240],
+    robotBody: [255, 45, 170, 255],
+    robotHeading: [255, 255, 255, 255],
+    charger: [0, 255, 150, 255],
+    noGoFill: [255, 40, 90, 80],
+    noGoBorder: [255, 40, 90, 235],
+    noMopFill: [40, 130, 255, 75],
+    noMopBorder: [40, 160, 255, 225],
+    virtualWall: [255, 40, 90, 235],
+    obstacle: [255, 220, 0, 255],
+    label: [230, 240, 255, 255]
+  },
+  // Materico (Material-design): light grey surface, Material-palette segment
+  // fills, indigo/teal accents.
+  materico: {
+    floor: [245, 245, 245, 255],
+    wall: [97, 97, 97, 255],
+    carpet: [188, 170, 144, 205],
+    segSat: 0.55,
+    segVal: 0.93,
+    path: [63, 81, 181, 235],
+    robotBody: [48, 63, 159, 255],
+    robotHeading: [255, 255, 255, 255],
+    charger: [0, 150, 136, 255],
+    noGoFill: [244, 67, 54, 65],
+    noGoBorder: [211, 47, 47, 215],
+    noMopFill: [33, 150, 243, 60],
+    noMopBorder: [25, 118, 210, 205],
+    virtualWall: [211, 47, 47, 225],
+    obstacle: [255, 152, 0, 255],
+    label: [33, 33, 33, 255]
   }
 };
 function hsvToRgba(h, s, v) {
@@ -2937,10 +3000,13 @@ function renderVacuumPng(map, opts = {}) {
   const h = Math.max(1, map.dimensions.height * scale);
   const png = new PNG({ width: w, height: h });
   png.data.fill(0);
+  const dim = map.dimensions;
   for (const layer of map.layers) {
-    paintLayer(png, layer, scale, pal);
+    paintLayer(png, layer, dim.height, scale, pal);
+  }
+  if (opts.showCleanedArea === true && map.cleanedArea !== null) {
+    paintCleanedArea(png, map.cleanedArea, dim, scale, pal.path);
   }
-  const dim = map.dimensions;
   if (opts.showNoGo !== false) {
     for (const area of map.restrictedAreas) {
       const fill = area.kind === "noMop" ? pal.noMopFill : pal.noGoFill;
@@ -2963,10 +3029,17 @@ function renderVacuumPng(map, opts = {}) {
       drawPolyline(png, path.points, dim, scale, pal.path, Math.max(1, scale));
     }
   }
+  if (opts.showFurniture !== false) {
+    for (const zone of map.lowLyingAreas) {
+      paintFurnitureZone(png, zone.points, dim, scale);
+    }
+  }
   if (opts.showObstacles !== false) {
+    const byType = opts.colorObstaclesByType !== false;
     for (const ob of map.obstacles) {
       const p = worldToPx(ob.x, ob.y, dim, scale);
-      drawDisk(png, p.x, p.y, Math.max(2, scale * 2), pal.obstacle);
+      const color = byType ? obstacleColor(ob.type) : pal.obstacle;
+      drawDiamond(png, p.x, p.y, Math.max(2, scale * 2), color);
     }
   }
   if (opts.showCharger !== false && map.dock !== null) {
@@ -2975,31 +3048,33 @@ function renderVacuumPng(map, opts = {}) {
   if (opts.showRobot !== false && map.robot !== null) {
     drawRobot(png, map.robot, dim, scale, pal);
   }
-  if (opts.showSegmentLabels === true) {
+  if (opts.showSegmentNames === true || opts.showSegmentLabels === true) {
     for (const seg of map.segments) {
       const p = worldToPx(seg.centroid.x, seg.centroid.y, dim, scale);
-      drawLabel(png, p.x, p.y, String(seg.id), pal.label, Math.max(1, scale));
+      const text = opts.showSegmentNames === true ? labelText(seg.name, seg.id) : String(seg.id);
+      drawLabel(png, p.x, p.y, text, pal.label, Math.max(1, scale));
     }
   }
   return PNG.sync.write(png);
 }
 function worldToPx(worldX, worldY, dim, scale) {
+  const cellY = (worldY - dim.top) / dim.gridSize;
   return {
     x: Math.round((worldX - dim.left) / dim.gridSize * scale),
-    y: Math.round((worldY - dim.top) / dim.gridSize * scale)
+    y: Math.round((dim.height - 1 - cellY) * scale)
   };
 }
-function paintLayer(png, layer, scale, pal) {
+function paintLayer(png, layer, dimHeight, scale, pal) {
   const color = layer.type === "segment" ? segmentColor(layer.segmentId ?? 0, pal) : layer.type === "wall" ? pal.wall : layer.type === "carpet" ? pal.carpet : pal.floor;
   for (const run of layer.runs) {
-    paintRun(png, run, color, scale);
+    paintRun(png, run, dimHeight, color, scale);
   }
 }
-function paintRun(png, run, color, scale) {
+function paintRun(png, run, dimHeight, color, scale) {
   const [xPx, yPx, len] = run;
+  const baseY = (dimHeight - 1 - yPx) * scale;
   for (let i = 0; i < len; i += 1) {
     const baseX = (xPx + i) * scale;
-    const baseY = yPx * scale;
     for (let dy = 0; dy < scale; dy += 1) {
       for (let dx = 0; dx < scale; dx += 1) {
         setPixel(png, baseX + dx, baseY + dy, color);
@@ -3105,7 +3180,7 @@ function drawRobot(png, robot, dim, scale, pal) {
   drawDisk(png, p.x, p.y, r, pal.robotBody);
   const rad = robot.angle * Math.PI / 180;
   const hx = Math.round(p.x + Math.cos(rad) * r);
-  const hy = Math.round(p.y + Math.sin(rad) * r);
+  const hy = Math.round(p.y - Math.sin(rad) * r);
   drawLine(png, p.x, p.y, hx, hy, pal.robotHeading, Math.max(1, Math.trunc(scale / 2) + 1));
 }
 function drawCharger(png, dock, dim, scale, pal) {
@@ -3113,6 +3188,58 @@ function drawCharger(png, dock, dim, scale, pal) {
   const r = Math.max(2, scale * 2);
   fillRect(png, p.x - r, p.y - r, p.x + r, p.y + r, pal.charger);
 }
+function drawDiamond(png, cx, cy, r, color) {
+  for (let dy = -r; dy <= r; dy += 1) {
+    const w = r - Math.abs(dy);
+    for (let dx = -w; dx <= w; dx += 1) {
+      setPixel(png, cx + dx, cy + dy, color);
+    }
+  }
+}
+function obstacleColor(type) {
+  const hue = Math.abs(Math.trunc(type)) * 47 % 360;
+  return hsvToRgba(hue, 0.85, 0.95);
+}
+var FURNITURE_LINE = [150, 110, 200, 235];
+function paintFurnitureZone(png, points, dim, scale) {
+  if (points.length < 2) return;
+  for (let i = 0; i < points.length; i += 1) {
+    const a = points[i];
+    const b = points[(i + 1) % points.length];
+    if (a === void 0 || b === void 0) continue;
+    const pa = worldToPx(a.x, a.y, dim, scale);
+    const pb = worldToPx(b.x, b.y, dim, scale);
+    drawLine(png, pa.x, pa.y, pb.x, pb.y, FURNITURE_LINE, Math.max(1, scale));
+  }
+}
+function paintCleanedArea(png, overlay, parentDim, scale, baseColor) {
+  const tint = [baseColor[0], baseColor[1], baseColor[2], 55];
+  const inner = overlay.dimensions;
+  const block = Math.max(1, Math.round(inner.gridSize / parentDim.gridSize * scale));
+  for (const [xPx, yPx, len] of overlay.cleaned) {
+    for (let i = 0; i < len; i += 1) {
+      const worldX = inner.left + (xPx + i) * inner.gridSize;
+      const worldY = inner.top + yPx * inner.gridSize;
+      const p = worldToPx(worldX, worldY, parentDim, scale);
+      for (let dy = 0; dy < block; dy += 1) {
+        for (let dx = 0; dx < block; dx += 1) {
+          setPixel(png, p.x + dx, p.y + dy, tint);
+        }
+      }
+    }
+  }
+}
+function labelText(name, id) {
+  const raw = (name ?? "").trim();
+  const base = raw.length > 0 ? raw : `ROOM ${id}`;
+  const upper = base.toUpperCase().normalize("NFD").replace(/[\u0300-\u036f]/g, "");
+  let out = "";
+  for (const ch of upper) {
+    if (GLYPHS[ch] !== void 0) out += ch;
+  }
+  const trimmed = out.trim().slice(0, 14);
+  return trimmed.length > 0 ? trimmed : `ROOM ${id}`;
+}
 var GLYPHS = {
   "0": [7, 5, 5, 5, 7],
   "1": [2, 6, 2, 2, 7],
@@ -3124,7 +3251,34 @@ var GLYPHS = {
   "7": [7, 1, 2, 2, 2],
   "8": [7, 5, 7, 5, 7],
   "9": [7, 5, 7, 1, 7],
-  "-": [0, 0, 7, 0, 0]
+  "-": [0, 0, 7, 0, 0],
+  " ": [0, 0, 0, 0, 0],
+  A: [2, 5, 7, 5, 5],
+  B: [6, 5, 6, 5, 6],
+  C: [3, 4, 4, 4, 3],
+  D: [6, 5, 5, 5, 6],
+  E: [7, 4, 6, 4, 7],
+  F: [7, 4, 6, 4, 4],
+  G: [3, 4, 5, 5, 3],
+  H: [5, 5, 7, 5, 5],
+  I: [7, 2, 2, 2, 7],
+  J: [1, 1, 1, 5, 2],
+  K: [5, 5, 6, 5, 5],
+  L: [4, 4, 4, 4, 7],
+  M: [5, 7, 7, 5, 5],
+  N: [5, 7, 7, 7, 5],
+  O: [2, 5, 5, 5, 2],
+  P: [6, 5, 6, 4, 4],
+  Q: [2, 5, 5, 6, 3],
+  R: [6, 5, 6, 5, 5],
+  S: [3, 4, 2, 1, 6],
+  T: [7, 2, 2, 2, 2],
+  U: [5, 5, 5, 5, 7],
+  V: [5, 5, 5, 5, 2],
+  W: [5, 5, 7, 7, 5],
+  X: [5, 5, 2, 5, 5],
+  Y: [5, 5, 2, 2, 2],
+  Z: [7, 1, 2, 4, 7]
 };
 function drawLabel(png, cx, cy, text, color, px) {
   const glyphW = 3 * px;