dsh-folia 4.15.2 → 4.15.4

package/lib/client.js

@@ -18504,7 +18504,7 @@ window.__ModuleLoader__.load({
 				      className: "we-picker__btn", type: "button",
 				      disabled: Boolean(busy),
 				      onClick: () => load(true),
-				    }, weT("刷新")),
+				    }, busyIsStructural ? weT("下载中…（可继续切换皮肤）") : weT("刷新")),
 				  ));
 
 				  // 皮肤中心在不在，决定这段提示说什么：
@@ -18568,6 +18568,14 @@ window.__ModuleLoader__.load({
 				    },
 				  }, note ? note.text : "\u00a0"));
 
+				  // ⚠️ 「正在下载/安装」**不能**把整块面板锁住：实测用户点「安装」后想切到另一套皮肤，
+				  // 结果所有「应用」都灰着，必须等 zip 下完 —— 下载是长任务，切换应该与它互不阻塞。
+				  // 所以把 busy 拆成两条互不相干的通道：
+				  //   · 结构操作（install / remove / repair）：改动磁盘目录，串行，期间只锁**结构按钮**
+				  //   · 切换（activate）：只写 active，幂等且"最后动作优先"，期间只锁**该卡片的「应用」**
+				  const busyIsStructural = /^(install|remove|repair):/.test(String(busy || ""));
+				  const busyIsActivating = /^activate:/.test(String(busy || ""));
+
 				  const installed = (state && state.installed) || [];
 				  const activeId = (state && state.active) || "";
 				  // 「皮肤中心记着哪套」≠「屏上现在是哪套」：壁纸在台上时皮肤会 withhold 自己，
@@ -18670,7 +18678,7 @@ window.__ModuleLoader__.load({
 				              ? React.createElement("span", { style: { ...SKIN_STYLE.badge, background: "rgba(60,160,90,0.55)" } }, weT("使用中"))
 				              : React.createElement("button", {
 				                className: "we-picker__btn", type: "button",
-				                disabled: Boolean(busy) || !canApply || notListed,
+				                disabled: (busyIsActivating && busyThis) || !canApply || notListed,
 				                title: notListed ? notListedWhy : (applyBlockedReason || undefined),
 				                onClick: () => act("activate", { id: s.id }, s.name),
 				              }, busyThis ? weT("切换中…") : weT("应用")),
@@ -18679,14 +18687,14 @@ window.__ModuleLoader__.load({
 				            notListed
 				              ? React.createElement("button", {
 				                className: "we-picker__btn", type: "button",
-				                disabled: Boolean(busy),
+				                disabled: busyIsStructural,
 				                title: notListedWhy,
 				                onClick: () => act("repair", { id: s.dirId || s.id }, s.name),
 				              }, busy === "repair:" + (s.dirId || s.id) ? weT("修复中…") : weT("修复清单"))
 				              : null,
 				            React.createElement("button", {
 				              className: "we-picker__btn", type: "button",
-				              disabled: Boolean(busy) || isActive,
+				              disabled: busyIsStructural || isActive,
 				              title: isActive ? weT("正在使用，先切到别的再卸") : undefined,
 				              onClick: () => act("remove", { id: s.id }, s.name),
 				            }, busy === "remove:" + s.id ? weT("卸载中…") : weT("卸载")),
@@ -18727,7 +18735,7 @@ window.__ModuleLoader__.load({
 				                  : React.createElement("button", {
 				                    key: "apply",
 				                    className: "we-picker__btn", type: "button",
-				                    disabled: Boolean(busy) || !canApply,
+				                    disabled: (busyIsActivating && busy === "activate:" + localId) || !canApply,
 				                    title: applyBlockedReason || undefined,
 				                    onClick: () => act("activate", { id: localId }, s.title),
 				                  }, busy === "activate:" + localId ? weT("切换中…") : weT("应用")),
@@ -18735,7 +18743,7 @@ window.__ModuleLoader__.load({
 				              ]
 				              : React.createElement("button", {
 				                className: "we-picker__btn", type: "button",
-				                disabled: Boolean(busy),
+				                disabled: busyIsStructural || busy === "install:" + s.id,
 				                title: skinCenter === "absent" ? weT("先装皮肤中心，否则皮肤装好也没法启用") : undefined,
 				                onClick: () => act("install", { id: s.id, url: s.url }, s.title),
 				              }, busyThis ? weT("安装中…") : weT("安装")),

package/lib/features.js

@@ -37,7 +37,7 @@ export const FEATURES = [
     role: '本机/上传/站点三源合并成壁纸库；着色、图层、播放与轮换由客户端接管',
     host: [
       'lib/routes/inventory.js',
-      'lib/routes/site-media.js',
+      'lib/routes/site-media.js',
       'lib/routes/media-bytes.js',
       'lib/routes/media-derived.js',
       'lib/routes/scene-frame.js',

package/lib/index.js

@@ -86,7 +86,7 @@ import { registerOcclusionRoutes } from './routes/occlusion.js';
 import { registerSceneFrameRoutes } from './routes/scene-frame.js';
 import { registerMediaDerivedRoutes } from './routes/media-derived.js';
 import { registerMediaBytesRoutes } from './routes/media-bytes.js';
-import { registerSiteMediaRoutes } from './routes/site-media.js';
+import { registerSiteMediaRoutes } from './routes/site-media.js';
 import { registerWeAssetsRoutes } from './routes/we-assets.js';
 import { registerSceneMediaRoutes } from './routes/scene-media.js';
 import { registerSceneServeRoutes } from './routes/scene-serve.js';
@@ -330,7 +330,9 @@ export function apply(ctx) {
   //     为什么单开一族而不是塞进 /media：那条是**本机字节直出**（token → 磁盘），
   //     这条是"上游 → 磁盘 → 客户端"的三方转发，失败语义完全不同（一切失败 302 直连）。
   //     ⚠️ 必须早于任何 `/site-*` 前缀族：本路由是 exact，不受顺序影响，但保持就近声明。
-  registerSiteMediaRoutes(webServer, { disposers, base: BASE, serveFile, log });
+  registerSiteMediaRoutes(webServer, { disposers, base: BASE, serveFile, log });
+
+
 
   // 3c-3b/3c-5. 场景帧服务族路由（实时抓帧缓存 / 自定义画面）→ lib/routes/scene-frame.js。
   //            三条注册与它们的依赖都在那个文件里；这里只声明它的依赖。

package/lib/route-registry.js

@@ -92,7 +92,7 @@ export const FEATURE_ROUTE_FAMILIES = [
 export const INLINE_ROUTE_FAMILIES = [
   // 每条写「族 id + 门面里的注册函数名」：两者**不总同形**（presets → registerGlassPresetsRoutes），
   // 靠名字猜会在守卫里制造假红。迁移一个族 = 在 FEATURE_ROUTE_FAMILIES 加一条 + 删这里一行。
-  { id: 'site-media', fn: 'registerSiteMediaRoutes' },
+  { id: 'site-media', fn: 'registerSiteMediaRoutes' },
   { id: 'media-bytes', fn: 'registerMediaBytesRoutes' },
   { id: 'media-derived', fn: 'registerMediaDerivedRoutes' },
   { id: 'scene-frame', fn: 'registerSceneFrameRoutes' },

package/lib/routes/site-media.js

@@ -276,6 +276,47 @@ export function registerSiteMediaRoutes(webServer, c) {
     }
   }
 
+  // ── 计数与统计：别的机器"慢"到底慢在哪，必须有可读的数字，而不是靠感觉 ──────────
+  // hits/misses 区分"没缓存所以每次都要下"与"缓存生效但网络慢"；
+  // bytes/ms 给出每次都真实吞吐；writable 说明那台机器的缓存目录到底能不能写。
+  const stats = { hits: 0, misses: 0, bytes: 0, ms: 0, failures: 0, since: Date.now() };
+
+  disposers.push(webServer.register({
+    kind: 'exact',
+    path: `${BASE}/site-media-stats`,
+    handler: (req, res) => {
+      let total = 0;
+      let files = 0;
+      try {
+        const dir = cacheRoot();
+        for (const name of readdirSync(dir)) {
+          if (name.endsWith('.part') || name.endsWith('.part.json')) continue;
+          try { total += statSync(join(dir, name)).size; files += 1; } catch { /* ignore */ }
+        }
+      } catch { /* 目录不存在即 0 */ }
+      const dirRoot = cacheRoot();
+      const body = JSON.stringify({
+        ok: true,
+        root: dirRoot,
+        writable: ensureCache(dirRoot),
+        files,
+        bytesOnDisk: total,
+        capBytes: capBytes(),
+        hits: stats.hits,
+        misses: stats.misses,
+        failures: stats.failures,
+        avgMBps: stats.ms > 0 ? Number(((stats.bytes / 1048576) / (stats.ms / 1000)).toFixed(2)) : null,
+        uptimeSec: Math.round((Date.now() - stats.since) / 1000),
+      });
+      try {
+        res.statusCode = 200;
+        res.setHeader('content-type', 'application/json; charset=utf-8');
+        res.setHeader('cache-control', 'no-store');
+        res.end(body);
+      } catch { /* ignore */ }
+    },
+  }));
+
   disposers.push(webServer.register({
     kind: 'prefix',
     // 路径尾部只是给客户端留一个"像文件名"的段（客户端按 `url.split('/').pop()` 取 token 做
@@ -301,6 +342,7 @@ export function registerSiteMediaRoutes(webServer, c) {
       const abs = join(dir, key);
 
       if (ensureCache(dir) && existsSync(abs)) {
+        stats.hits += 1;
         touch(abs);
         // 与 miss 对称的可观测头：页签/诊断据此区分"网络慢"与"我们没有缓存"。
         try { res.setHeader('x-folia-cache', 'hit'); } catch { /* ignore */ }
@@ -317,7 +359,13 @@ export function registerSiteMediaRoutes(webServer, c) {
         redirect(res, u);
         return;
       }
-      const task = download(u, key, req, res, headOnly);
+      stats.misses += 1;
+      const t0 = Date.now();
+      const task = download(u, key, req, res, headOnly).then((ok) => {
+        stats.ms += Date.now() - t0;
+        if (ok) { try { stats.bytes += statSync(abs).size; } catch { /* ignore */ } }
+        return ok;
+      }).catch((e) => { stats.failures += 1; throw e; });
       inflight.set(key, task);
       let ok = false;
       try { ok = await task; } finally { inflight.delete(key); }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-folia",
-  "version": "4.15.2",
+  "version": "4.15.4",
   "description": "Folia 壁纸引擎：把本机 Wallpaper Engine 壁纸搬进 DSH 界面（场景实时渲染 / 视频 / 网页），内置液态玻璃与 Folia 吉祥物，并可从自建站点拉取壁纸。单包形态（组件已合并）。",
   "type": "module",
   "engines": {
@@ -42,6 +42,7 @@
   "files": [
     "icon.png",
     "lib/index.js",
+    "lib/client.js",
     "lib/host-boot.js",
     "lib/log.js",
     "lib/notice.js",
@@ -57,7 +58,6 @@
     "lib/glass-presets/",
     "lib/about/",
     "lib/component-visibility.js",
-    "lib/client.js",
     "lib/http-body.js",
     "lib/json-response.js",
     "lib/pkg-read.js",