wallpaper-engine-dsh 0.1.0 → 0.1.2

package/lib/core.js

@@ -272,11 +272,21 @@ export function inferType(file) {
  * @returns {boolean}
  */
 export function isInsideDir(root, target, platform = process.platform) {
-  let r = resolve(String(root));
-  let t = resolve(String(target));
-  if (platform === 'win32') { r = r.toLowerCase(); t = t.toLowerCase(); }
+  const win = platform === 'win32';
+  // Canonicalize for comparison: win32 paths are case-insensitive and accept
+  // both separators, so normalize `/` and `\` to `\` and lowercase. This also
+  // makes the win32 semantics identical no matter which OS the code runs on
+  // (CI is Linux; the WE files themselves are Windows paths).
+  const canon = (p) => {
+    let r = resolve(String(p));
+    if (win) r = r.replace(/[\\/]/g, '\\').toLowerCase();
+    return r;
+  };
+  const r = canon(root);
+  const t = canon(target);
   if (t === r) return true;
-  const withSep = r.endsWith(sep) ? r : r + sep;
+  const boundary = win ? '\\' : sep;
+  const withSep = r.endsWith(boundary) ? r : r + boundary;
   return t.startsWith(withSep);
 }
 
@@ -497,3 +507,85 @@ export function mimeFor(absPath) {
     woff: 'font/woff', woff2: 'font/woff2', ttf: 'font/ttf',
   }[ext] || 'application/octet-stream';
 }
+
+// ── 6. Inventory assembly (pure; the host wires it to HTTP) ──────────────────
+
+/**
+ * Assemble the JSON inventory payload from a discovery result. Pure on top of
+ * the enumeration/playlist helpers, so the host's HTTP layer stays thin and
+ * this function is directly unit-testable against fixture trees.
+ *
+ * @param {{ installDir: string | null, libraryRoots: string[] }} discovery
+ * @param {object} [io] overridable IO: existsSync/readFileSync/readdirSync/
+ *   statSync (default to node:fs), plus:
+ *   - `mint(entry)` — mint a media/preview token for a file entry; the host
+ *     provides a random-token map, tests provide a spy.
+ *   - `base` — URL prefix for media/preview links (default '/we-background').
+ * @returns {{ installDir, total, portableCount, wallpapers, playlists }}
+ */
+export function buildInventoryFrom(discovery = {}, io = {}) {
+  const exists = io.existsSync || existsSync;
+  const read = io.readFileSync || readFileSync;
+  const mint = io.mint || (() => null);
+  const base = io.base || '/we-background';
+
+  const installDir = discovery.installDir || null;
+  const libraryRoots = Array.isArray(discovery.libraryRoots) ? discovery.libraryRoots : [];
+  const roots = wallpaperRoots(installDir, libraryRoots, { existsSync: exists });
+  const projects = enumerateWallpapers(roots, io);
+  const byId = new Map(projects.map((p) => [p.id, p]));
+  const byPath = new Map(projects.map((p) => [pathKey(p.fileAbs), p.id]));
+
+  const wallpapers = projects.map((p) => {
+    const portable = PORTABLE_KINDS.includes(p.type);
+    const hasMedia = portable && exists(p.fileAbs);
+    const hasPreview = Boolean(p.previewAbs) && exists(p.previewAbs);
+    return {
+      id: p.id,
+      title: p.title,
+      type: p.type,
+      playable: hasMedia,
+      media: hasMedia
+        ? `${base}/media/${mint({ abs: p.fileAbs, rootDir: p.type === 'web' ? p.dir : null })}`
+        : null,
+      preview: hasPreview
+        ? `${base}/preview/${mint({ abs: p.previewAbs, rootDir: null })}`
+        : null,
+    };
+  });
+  const playableIds = new Set(wallpapers.filter((w) => w.playable).map((w) => w.id));
+
+  let playlists = [];
+  const configPath = installDir ? join(installDir, 'config.json') : null;
+  if (configPath && exists(configPath)) {
+    try {
+      playlists = parsePlaylists(JSON.parse(read(configPath, 'utf8')));
+    } catch { /* malformed config.json → no playlists, not fatal */ }
+  }
+  const playlistView = playlists.map((playlist, index) => {
+    const ids = [];
+    const seen = new Set();
+    for (const item of playlist.items) {
+      const id = resolvePlaylistItem(item, byPath, byId);
+      if (id && !seen.has(id)) { seen.add(id); ids.push(id); }
+    }
+    return {
+      id: `pl-${index}`,
+      name: playlist.name,
+      order: playlist.order,
+      delay: playlist.delay,
+      wallpaperIds: ids,
+      total: ids.length,
+      portableCount: ids.filter((id) => playableIds.has(id)).length,
+      unresolvedCount: Math.max(0, playlist.items.length - ids.length),
+    };
+  });
+
+  return {
+    installDir,
+    total: wallpapers.length,
+    portableCount: wallpapers.filter((w) => w.playable).length,
+    wallpapers,
+    playlists: playlistView,
+  };
+}

package/lib/index.js

@@ -47,8 +47,6 @@ import * as core from './core.js';
 const BASE = '/we-background';
 /** Inventory is cached and rebuilt at most this often unless ?refresh=1. */
 const INVENTORY_TTL_MS = 30_000;
-/** Media kinds eligible for sub-asset serving (web wallpapers bundle files). */
-const SUBASSET_KINDS = new Set(['web']);
 
 /** Steam root recorded by the Windows installer; null elsewhere/on failure. */
 function steamRegistryRoot() {
@@ -107,74 +105,24 @@ export function apply(ctx) {
   // ── Inventory (cached) ──────────────────────────────────────────────────
   let cache = null; // { at: number, payload: object }
 
-  function buildInventory() {
-    tokens.clear(); // re-mint: tokens from older builds stop resolving
-    const { installDir, libraryRoots } = discover();
-    const roots = core.wallpaperRoots(installDir, libraryRoots);
-    const projects = core.enumerateWallpapers(roots);
-    const byId = new Map(projects.map((p) => [p.id, p]));
-    const byPath = new Map(projects.map((p) => [core.pathKey(p.fileAbs), p.id]));
-
-    const wallpapers = projects.map((p) => {
-      const portable = core.PORTABLE_KINDS.includes(p.type);
-      const hasMedia = portable && existsSync(p.fileAbs);
-      const hasPreview = Boolean(p.previewAbs) && existsSync(p.previewAbs);
-      return {
-        id: p.id,
-        title: p.title,
-        type: p.type,
-        playable: hasMedia,
-        media: hasMedia
-          ? `${BASE}/media/${mint({
-              abs: p.fileAbs,
-              rootDir: SUBASSET_KINDS.has(p.type) ? p.dir : null,
-            })}`
-          : null,
-        preview: hasPreview
-          ? `${BASE}/preview/${mint({ abs: p.previewAbs, rootDir: null })}`
-          : null,
-      };
-    });
-    const playableIds = new Set(wallpapers.filter((w) => w.playable).map((w) => w.id));
-
-    let playlists = [];
-    const configPath = installDir ? join(installDir, 'config.json') : null;
-    if (configPath && existsSync(configPath)) {
-      try {
-        playlists = core.parsePlaylists(JSON.parse(readFileSync(configPath, 'utf8')));
-      } catch { /* malformed config.json → no playlists, not fatal */ }
-    }
-    const playlistView = playlists.map((playlist, index) => {
-      const ids = [];
-      const seen = new Set();
-      for (const item of playlist.items) {
-        const id = core.resolvePlaylistItem(item, byPath, byId);
-        if (id && !seen.has(id)) { seen.add(id); ids.push(id); }
-      }
-      return {
-        id: `pl-${index}`,
-        name: playlist.name,
-        order: playlist.order,
-        delay: playlist.delay,
-        wallpaperIds: ids,
-        total: ids.length,
-        portableCount: ids.filter((id) => playableIds.has(id)).length,
-        unresolvedCount: Math.max(0, playlist.items.length - ids.length),
-      };
-    });
+  // Discovery is expensive (reg.exe + vdf scan) and the install layout barely
+  // changes — resolve it ONCE and reuse across builds; only an explicit
+  // refresh (or TTL expiry on the first build) forces a re-discovery.
+  let discoveryCache = null;
+  function getDiscovery(force) {
+    if (!force && discoveryCache) return discoveryCache;
+    discoveryCache = discover();
+    return discoveryCache;
+  }
 
-    return {
-      installDir,
-      total: wallpapers.length,
-      portableCount: wallpapers.filter((w) => w.playable).length,
-      wallpapers,
-      playlists: playlistView,
-    };
+  function buildInventory(force) {
+    tokens.clear(); // re-mint: tokens from older builds stop resolving
+    return core.buildInventoryFrom(getDiscovery(force), { mint });
   }
 
   function getInventory(force) {
     if (!force && cache && Date.now() - cache.at < INVENTORY_TTL_MS) return cache.payload;
-    const payload = buildInventory();
+    const payload = buildInventory(force);
     cache = { at: Date.now(), payload };
     return payload;
   }
@@ -235,10 +183,18 @@ export function apply(ctx) {
     kind: 'exact',
     path: `${BASE}/inventory`,
     handler: (req, res) => {
-      if (req.method !== 'GET') { sendJson(res, 405, { error: 'method not allowed' }); return; }
+      if (req.method !== 'GET' && req.method !== 'HEAD') {
+        sendJson(res, 405, { error: 'method not allowed' });
+        return;
+      }
       try {
         const url = new URL(req.url || '/', 'http://x');
-        sendJson(res, 200, getInventory(url.searchParams.get('refresh') === '1'));
+        const payload = JSON.stringify(getInventory(url.searchParams.get('refresh') === '1'));
+        res.statusCode = 200;
+        res.setHeader('Content-Type', 'application/json; charset=utf-8');
+        res.setHeader('Cache-Control', 'no-store');
+        res.setHeader('Content-Length', String(Buffer.byteLength(payload)));
+        res.end(req.method === 'HEAD' ? undefined : payload);
       } catch (err) {
         sendJson(res, 500, { error: String(err && err.message ? err.message : err) });
       }
@@ -273,7 +229,8 @@ export function apply(ctx) {
         const entry = tokens.get(token);
         if (!entry) {
           res.statusCode = 404;
-          res.end('not found');
+          if (req.method === 'HEAD') res.end();
+          else res.end('not found');
           return;
         }
         let abs = entry.abs;
@@ -281,7 +238,8 @@ export function apply(ctx) {
           // Sub-asset of a bundled web wallpaper: must stay inside its dir.
           if (seg !== 'media' || !entry.rootDir) {
             res.statusCode = 404;
-            res.end('not found');
+            if (req.method === 'HEAD') res.end();
+            else res.end('not found');
             return;
           }
           let rel;
@@ -304,11 +262,16 @@ export function apply(ctx) {
     }));
   }
 
+  // Warm the discovery cache now (reg.exe + vdf scan) so the first inventory
+  // request answers immediately instead of paying the discovery cost inline.
+  try { getDiscovery(false); } catch { /* non-fatal: inventory will 500 with reason */ }
+
   return () => {
     for (const d of disposers) { try { d(); } catch { /* ignore */ } }
     disposers.length = 0;
     tokens.clear();
     cache = null;
+    discoveryCache = null;
   };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wallpaper-engine-dsh",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Wallpaper Engine Video/Web wallpapers as the DSH web GUI background — discovery, sandboxed rendering, rotation lists, liquid-glass tuning.",
   "type": "module",
   "main": "lib/index.js",
@@ -61,7 +61,10 @@
     "verify": "node scripts/verify-client.mjs",
     "test": "node --test test/core.test.mjs",
     "prepare": "node scripts/prepare.mjs",
-    "prepublishOnly": "npm run test && npm run build && npm run verify"
+    "prepublishOnly": "npm run test && npm run build && npm run verify",
+    "release": "npm version patch -m \"chore: release v%s\" && git push --follow-tags",
+    "release:minor": "npm version minor -m \"chore: release v%s\" && git push --follow-tags",
+    "release:major": "npm version major -m \"chore: release v%s\" && git push --follow-tags"
   },
   "engines": {
     "node": ">=18.17"
@@ -74,8 +77,20 @@
     "react": "^18.2.0"
   },
   "peerDependenciesMeta": {
+    "@deepseek-ai/cordis": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-runtime": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-ui-slots": {
+      "optional": true
+    },
     "@deepseek-ai/dsh-host-webserver": {
       "optional": true
+    },
+    "react": {
+      "optional": true
     }
   }
 }