@apocaliss92/nodedreame 1.8.0 → 1.8.1

package/dist/index.cjs

@@ -81,7 +81,7 @@ module.exports = __toCommonJS(index_exports);
 
 // src/support/version.ts
 var LIBRARY_NAME = "nodedreame";
-var LIBRARY_VERSION = "1.8.0";
+var LIBRARY_VERSION = "1.8.1";
 
 // src/transport/errors.ts
 var DreameError = class extends Error {
@@ -1963,11 +1963,43 @@ function unwrapEnvelope(value, opts = {}) {
     }
     bytes = aesCbcDecrypt(bytes, key2, opts.iv);
   }
+  let inflated;
   try {
-    return zlib.inflateSync(bytes);
+    inflated = zlib.inflateSync(bytes);
   } catch (err) {
     throw new MapDecodeError("envelope: zlib inflate failed", { cause: err });
   }
+  let guard = 0;
+  while (guard < MAX_EXTRA_WRAP_LAYERS && looksLikeBase64Zlib(inflated)) {
+    const text = inflated.toString("latin1").replace(/-/g, "+").replace(/_/g, "/");
+    try {
+      inflated = zlib.inflateSync(Buffer.from(text, "base64"));
+    } catch (err) {
+      throw new MapDecodeError("envelope: nested zlib inflate failed", { cause: err });
+    }
+    guard += 1;
+  }
+  return inflated;
+}
+var MAX_EXTRA_WRAP_LAYERS = 4;
+function looksLikeBase64Zlib(buf) {
+  if (buf.length < 8) return false;
+  for (const b of buf) {
+    const isB64 = b >= 65 && b <= 90 || // A-Z
+    b >= 97 && b <= 122 || // a-z
+    b >= 48 && b <= 57 || // 0-9
+    b === 43 || b === 47 || // + /
+    b === 45 || b === 95 || // - _ (url-safe)
+    b === 61;
+    if (!isB64) return false;
+  }
+  try {
+    const prefix = buf.subarray(0, 16).toString("latin1").replace(/-/g, "+").replace(/_/g, "/");
+    const decoded = Buffer.from(prefix, "base64");
+    return decoded.length >= 2 && decoded[0] === 120;
+  } catch {
+    return false;
+  }
 }
 function aesCbcDecrypt(cipher, rawKey, iv) {
   const keyBytes = Buffer.from(
@@ -2603,7 +2635,7 @@ function decodeCleanedAreaPixels(pixels, width, height) {
 
 // src/models/vacuum/map/decode.ts
 function decodeVacuumMap(input, opts = {}) {
-  const inflated = typeof input === "string" ? unwrapEnvelope(input, opts) : input;
+  const inflated = typeof input === "string" ? unwrapEnvelope(input, opts) : looksLikeBase64Zlib(input) ? unwrapEnvelope(input.toString("latin1"), opts) : input;
   const { header, tail } = parseFrame(inflated);
   const dimensions = mergeDimensions(header, tail);
   const robot = pose(header.robotX, header.robotY, header.robotA, tail.nr === true);