homematic-manager 3.0.0-beta.19 → 3.0.0-beta.20

package/node_modules/@homematic-manager/backend/dist/images/deviceImages.d.ts

@@ -47,6 +47,12 @@ export declare const MEMORY_CACHE_LIMIT = 200;
 export declare const IMAGE_MIME_TYPES: Readonly<Record<string, string>>;
 /** The content type for a file name, or `undefined` for one we would not serve. */
 export declare function imageMimeType(file: string): string | undefined;
+/**
+ * Whether a body is a picture, by its first bytes (B-57): PNG, JPEG, GIF, WebP or SVG. A box
+ * without `/config/img` (openccu-lite) answered the request with its UI's HTML page and 200, and
+ * that page was cached and served as the device picture.
+ */
+export declare function looksLikeImage(body: Buffer): boolean;
 /**
  * A file name from `device-icons.json`, as a name and nothing else.
  *

package/node_modules/@homematic-manager/backend/dist/images/deviceImages.js

@@ -58,6 +58,29 @@ export const IMAGE_MIME_TYPES = {
 export function imageMimeType(file) {
     return IMAGE_MIME_TYPES[path.extname(file).toLowerCase()];
 }
+/**
+ * Whether a body is a picture, by its first bytes (B-57): PNG, JPEG, GIF, WebP or SVG. A box
+ * without `/config/img` (openccu-lite) answered the request with its UI's HTML page and 200, and
+ * that page was cached and served as the device picture.
+ */
+export function looksLikeImage(body) {
+    if (body.length < 4) {
+        return false;
+    }
+    if (body[0] === 0x89 && body.subarray(1, 4).toString('latin1') === 'PNG') {
+        return true;
+    }
+    if (body[0] === 0xff && body[1] === 0xd8 && body[2] === 0xff) {
+        return true;
+    }
+    const head = body.subarray(0, 12).toString('latin1');
+    if (head.startsWith('GIF8') || (head.startsWith('RIFF') && head.slice(8, 12) === 'WEBP')) {
+        return true;
+    }
+    // SVG is text: an <svg> root, possibly after an XML declaration or a comment - never an HTML page
+    const text = body.subarray(0, 512).toString('utf8').trimStart().toLowerCase();
+    return !text.startsWith('<!doctype html') && !text.startsWith('<html') && text.includes('<svg');
+}
 /**
  * A file name from `device-icons.json`, as a name and nothing else.
  *
@@ -163,7 +186,13 @@ export class DeviceImageService {
             return undefined;
         }
         const cacheFile = path.join(this.#options.cacheDir, cacheFileName(deviceType, iconFile));
-        const fromDisk = await readIfPresent(cacheFile);
+        let fromDisk = await readIfPresent(cacheFile);
+        if (fromDisk && !looksLikeImage(fromDisk)) {
+            // B-57: an earlier version cached what the box answered, a page included
+            this.#log.warn(`cached ${cacheFile} is not a picture - removed`);
+            await fs.rm(cacheFile, { force: true }).catch(() => undefined);
+            fromDisk = undefined;
+        }
         if (fromDisk) {
             return this.#remember(deviceType, { mime: mimeOrDefault(cacheFile), body: fromDisk, source: 'disk' });
         }
@@ -200,7 +229,14 @@ export class DeviceImageService {
                     signal: AbortSignal.timeout(this.#options.timeoutMs ?? DEFAULT_IMAGE_TIMEOUT_MS),
                 });
                 if (response.ok) {
-                    return Buffer.from(await response.arrayBuffer());
+                    const body = Buffer.from(await response.arrayBuffer());
+                    const type = (response.headers.get('content-type') ?? '').toLowerCase();
+                    if ((type === '' || type.startsWith('image/')) && looksLikeImage(body)) {
+                        return body;
+                    }
+                    // B-57: a box without the file answered with a page; the next shape may exist
+                    this.#log.debug(`${url} answered ${response.status} with ${type || 'no type'}, not a picture`);
+                    continue;
                 }
                 this.#log.debug(`${url} answered ${response.status}`);
             }

package/node_modules/@homematic-manager/backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@homematic-manager/backend",
-  "version": "3.0.0-beta.19",
+  "version": "3.0.0-beta.20",
   "type": "module",
   "description": "Homematic Manager backend: XML-RPC/BIN-RPC clients and callback servers, caches, optional ReGa",
   "license": "AGPL-3.0-or-later",

package/node_modules/@homematic-manager/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@homematic-manager/core",
-  "version": "3.0.0-beta.19",
+  "version": "3.0.0-beta.20",
   "type": "module",
   "description": "Pure domain logic of the Homematic Manager: no I/O, no DOM",
   "license": "AGPL-3.0-or-later",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homematic-manager",
-  "version": "3.0.0-beta.19",
+  "version": "3.0.0-beta.20",
   "type": "module",
   "description": "Configure and administer Homematic and HomematicIP devices - devices and channels, direct links, paramsets, RSSI, service messages, events and an RPC console - from a local HTTP/WebSocket server that also serves the web UI",
   "keywords": [
@@ -67,8 +67,8 @@
     "hm-simulator": "^1.0.0"
   },
   "dependencies": {
-    "@homematic-manager/backend": "3.0.0-beta.19",
-    "@homematic-manager/core": "3.0.0-beta.19",
+    "@homematic-manager/backend": "3.0.0-beta.20",
+    "@homematic-manager/core": "3.0.0-beta.20",
     "binrpc": "^4.2.0",
     "homematic-rega": "^2.0.0",
     "homematic-xmlrpc": "^2.0.0",