dsh-folia 4.8.0 → 4.8.2

package/lib/client.js

@@ -745,6 +745,41 @@ window.__ModuleLoader__.load({
 				  "站点上还没有桌宠。": "No pets on the site yet.",
 				  "站点不可达": "Site unreachable",
 				  "预览尺寸": "Preview-size",
+
+				  // ── 第二轮补词：来源筛选 / 页签引导条 / 桌宠提示 / 模型名（专有名词不译，但必须在册）──
+				  "开机动画": "Boot animation",
+				  "桌宠": "Desktop pet",
+				  "打开设置 ›": "Open settings ›",
+				  "开机动画的全部参数都在侧栏「壁纸引擎」设置里": "All boot-animation options live in the \"Wallpaper Engine\" section of the settings panel",
+				  "桌宠的开关 / 大小 / 声音都在「桌宠」页签里调整": "The pet toggle, size and sound all live in the \"Desktop pet\" tab",
+				  "下载一条并「使用」后，每次启动都会先播它；默认播完才淡出进入界面。点击或按 Esc 可立即跳过。「带声音」若被浏览器的自动播放策略拦下，会自动退回静音播放。": "Once downloaded and set as current, it plays at every start; by default it finishes before fading into the app. Click or press Esc to skip. If the browser blocks audible autoplay it falls back to muted playback.",
+				  "未做 faststart，播放可能更慢": "Not faststart-optimised; playback may start slower",
+				  "素材来自站点；站点不可达时这里为空，但不影响启动": "Clips come from the site; when it is unreachable this list is empty and startup is unaffected",
+				  "桌宠由本插件自己绘制（雪碧图逐帧），不依赖其它宠物插件。它会跟着模型状态换动作：干活时换成工作行、干完变完成、出错变失败；安装后出现在右下角，可拖动，点一下会挥手并出声。": "This plugin draws the pet itself (frame by frame from a spritesheet) with no other pet plugin. It follows model activity: working plays the work row, finishing plays the done row, errors play the failed row. After install it sits in the bottom-right, can be dragged, and waves with a sound when clicked.",
+				  "来源": "Source",
+				  "来源筛选": "Source filter",
+				  "全部来源": "All sources",
+				  "本机": "Local",
+				  "站点": "Site",
+				  "按来源过滤：本机 Wallpaper Engine 库，还是从我们站点拉下来的壁纸": "Filter by source: your local Wallpaper Engine library, or wallpapers pulled from our site",
+				  "按来源筛选：本机 Wallpaper Engine 库，还是从我们站点拉下来的壁纸": "Filter by source: your local Wallpaper Engine library, or wallpapers pulled from our site",
+				  "本机 Wallpaper Engine（{n}）": "Local Wallpaper Engine ({n})",
+				  "站点壁纸（{n}）": "Site wallpapers ({n})",
+				  "这张图只有 {size}，当壁纸会糊 —— 建议在站点上传原图": "This image is only {size}; it will look blurry as a wallpaper — upload the original on the site",
+				  "{type}{status}": "{type}{status}",
+				  "DeepSeek": "DeepSeek",
+				  "Deepseek_Pro": "Deepseek_Pro",
+				  "Claude": "Claude",
+				  "Gemini": "Gemini",
+				  "GPT": "GPT",
+				  "GLM": "GLM",
+				  "Grok": "Grok",
+				  "Kimi": "Kimi",
+				  "Qwen": "Qwen",
+				  "Folia": "Folia",
+				  "…": "…",
+				  // 开机动画：已开启但无选片时的提示（4.8.2）
+				  "已开启，但还没有选片 —— 下载一条后点「使用」": "Enabled, but no clip is selected yet — download one, then press Use",
 				};
 
 				// ── 内联模块：src/i18n-copy-picker.js —— 英文词表域：壁纸选择器与快捷面板（picker-* · quick-panel · sidebar-right · theme-follow）（构建期注入；勿手改本段）──
@@ -17094,7 +17129,9 @@ window.__ModuleLoader__.load({
 
 				  async function act(kind, payload, label) {
 				    if (busy) return;
-				    setBusy(payload && payload.id ? payload.id : kind);
+				    // 只有结构性操作（下载 / 选择 / 删除）才锁 UI；开关与参数是幂等的，锁了反而闪。
+				    const structural = kind === "download" || kind === "select" || kind === "remove";
+				    if (structural) setBusy(payload && payload.id ? payload.id : kind);
 				    setTick(0);
 				    setNote(null);
 				    try {
@@ -17106,7 +17143,13 @@ window.__ModuleLoader__.load({
 				        if (kind === "remove") setNote({ ok: true, text: weT("已删除：{name}", { name: label }) });
 				        if (kind === "toggle") setNote({ ok: true, text: payload.enabled ? weT("开机动画已开启") : weT("开机动画已关闭") });
 				        if (kind === "settings") setNote({ ok: true, text: weT("已保存") });
-				        await load(true);
+				        // 开关/参数类：宿主把整份 boot 配置回给我们（{ ok, ...boot }），直接并进 state，
+				        // **不再 load(true) 重拉整表** —— 那次重拉会让所有控件先禁用再恢复，视觉上就是闪一下。
+				        if (kind === "toggle" || kind === "settings") {
+				          setState((prev) => (prev ? { ...prev, ...r } : prev));
+				        } else {
+				          await load(true);
+				        }
 				      } else {
 				        const code = (r && r.error) || "failed";
 				        setNote({ ok: false, text: r && r.detail ? weT("操作失败：{code}（{detail}）", { code, detail: String(r.detail) }) : weT("操作失败：{code}", { code }) });
@@ -17139,13 +17182,18 @@ window.__ModuleLoader__.load({
 				  },
 				  React.createElement("label", { style: { display: "flex", gap: "6px", alignItems: "center", fontSize: "12px" } },
 				    React.createElement("input", {
-				      type: "checkbox", checked: enabled, disabled: Boolean(busy) || !activeId,
+				      type: "checkbox", checked: enabled,
+				        // 不因"还没选片"而禁用：开关本身是幂等的，宿主在无选片时不会注入任何脚本。
+				        // （实测反馈：勾不动，因为此时 activeId 为空 —— 那是把两件事绑在一起了。）
+				        disabled: Boolean(busy),
 				      onChange: (e) => act("toggle", { enabled: e.target.checked }, ""),
 				    }),
 				    weT("启用（下次启动播放）"),
 				  ),
 				  React.createElement("span", { className: "we-picker__hint" },
-				    activeId ? weT("当前：{name}", { name: (clips.find((c) => c.id === activeId) || {}).title || activeId }) : weT("未选择")),
+				    activeId
+				      ? weT("当前：{name}", { name: (clips.find((c) => c.id === activeId) || {}).title || activeId })
+				      : (enabled ? weT("已开启，但还没有选片 —— 下载一条后点「使用」") : weT("未选择"))),
 				  ));
 
 				  children.push(React.createElement("div", { key: "hint", className: "we-picker__hint", style: { margin: "2px 0 6px", opacity: 0.75 } },
@@ -17156,9 +17204,17 @@ window.__ModuleLoader__.load({
 				      weT("候选清单读不到：{msg}", { msg: String(state.error) })));
 				  }
 
-				  if (note) {
-				    children.push(React.createElement("div", { key: "note", className: "we-picker__hint", style: { color: note.ok ? "#8ee6a8" : "#ff9a9a", margin: "4px 0 8px" } }, note.text));
-				  }
+				  // 提示行**常驻且占位**：它出现/消失会改变面板高度，视觉上就是"点一下闪一下"。
+				  // 固定 minHeight 之后文案变了、布局不动。
+				  children.push(React.createElement("div", {
+				    key: "note",
+				    className: "we-picker__hint",
+				    style: {
+				      color: note && !note.ok ? "#ff9a9a" : "#8ee6a8",
+				      margin: "4px 0 8px", minHeight: "18px", lineHeight: "18px",
+				      opacity: note ? 1 : 0, transition: "opacity 120ms linear",
+				    },
+				  }, note ? note.text : "\u00a0"));
 
 				  // 淡出 / 停留
 				  if (state) {
@@ -17315,7 +17371,9 @@ window.__ModuleLoader__.load({
 				  React.useEffect(() => { load(false); }, [load]);
 
 				  const act = async (kind, payload, label) => {
-				    setBusy(kind + ":" + (payload.id || ""));
+				    // 只有安装/卸载/导入这类**结构性**操作才锁 UI；开关与大小是幂等的。
+				    const structural = kind === "install" || kind === "remove" || kind === "import";
+				    if (structural) setBusy(kind + ":" + (payload.id || ""));
 				    setNote(null);
 				    try {
 				      const resp = await apiPostJson("/pets/" + kind, payload || {}, { parse: "always" });
@@ -17325,7 +17383,13 @@ window.__ModuleLoader__.load({
 				        if (kind === "remove") setNote({ ok: true, text: weT("已卸载：{name}", { name: label || "" }) });
 				        if (kind === "import") setNote({ ok: true, text: weT("已导入并启用：{name}", { name: label || "" }) });
 				        if (kind === "config") setNote({ ok: true, text: weT("已保存") });
-				        await load(true);
+				        // config 的响应里带新的 config（{ ok, config }）⇒ 直接并进 state，
+				        // 不再 load(true) 重拉整个清单（那次重拉会让所有按钮先禁用再恢复 = 闪动）。
+				        if (kind === "config" && r && r.config) {
+				          setState((prev) => (prev ? { ...prev, config: r.config } : prev));
+				        } else {
+				          await load(true);
+				        }
 				      } else {
 				        const code = (r && r.error) || "failed";
 				        setNote({ ok: false, text: weT("操作失败：{code}", { code }) });
@@ -17411,13 +17475,16 @@ window.__ModuleLoader__.load({
 				    ),
 				  ));
 
-				  if (note) {
-				    children.push(React.createElement("div", {
-				      key: "note",
-				      className: "we-picker__hint",
-				      style: { color: note.ok ? "rgba(120,220,150,0.95)" : "rgba(255,140,140,0.95)", margin: "2px 0 8px" },
-				    }, note.text));
-				  }
+				  // 与开机动画页签同理：提示行常驻占位，避免开关时整块高度跳动。
+				  children.push(React.createElement("div", {
+				    key: "note",
+				    className: "we-picker__hint",
+				    style: {
+				      color: note && !note.ok ? "rgba(255,140,140,0.95)" : "rgba(120,220,150,0.95)",
+				      margin: "2px 0 8px", minHeight: "18px", lineHeight: "18px",
+				      opacity: note ? 1 : 0, transition: "opacity 120ms linear",
+				    },
+				  }, note ? note.text : "\u00a0"));
 
 				  const btn = (text, onClick, disabled) => React.createElement("button", {
 				    type: "button", className: "we-picker__btn", disabled: Boolean(disabled),

package/lib/routes/inventory.js

@@ -216,15 +216,27 @@ function foliaAbs(base, u) {
  *
  * 站点目录的条目长这样：`{ slug, title, kind: 'dynamic', mime: 'video/mp4', url: '/media/...' }` ——
  * 它没有 `file` 字段，而且 `kind: 'dynamic'` 既可能是视频也可能是有动画的图，所以 mime 最可靠。
+ *
+ * ⚠️ 实测踩过的坑：WE **工程包**（zip）的 `kind` 也是 `dynamic`、`mime` 是 `application/zip`。
+ * 早先的顺序是「kind=dynamic ⇒ video」，于是 56 MB 的 zip 被当成视频塞进 `<video>`，
+ * 用户看到的是「浏览器无法解码这段视频」。⇒ **非 image/ 非 video/ 的 mime 一律不猜视频**，
+ * 而是判成 `package`（可显示、不可播放，客户端会给出明确原因而不是解码失败）。
  */
 function foliaTypeOfEntry(it) {
   const mime = String((it && it.mime) || '').toLowerCase();
   if (mime.startsWith('video/')) return 'video';
   if (mime.startsWith('image/')) return 'image';
+  // 已知的"包"形态：工程包 / 压缩包。它们不是可直接播放的媒体。
+  if (/^application\/(zip|x-zip|x-zip-compressed)$/.test(mime)) return 'package';
   const kind = String((it && it.kind) || '').toLowerCase();
+  const probe = String((it && (it.file || it.url || it.slug)) || '');
+  if (/\.zip$/i.test(probe)) return 'package';
+  // `application/octet-stream` 是"不知道是什么的二进制"：按后缀与 kind 继续判，
+  // 不当成包（上传工具经常把视频标成 octet-stream）。
+  // 其余"有 mime 但不是媒体"的（例如 application/json）一律不猜 —— 宁可丢也不塞进播放器。
+  if (mime && mime !== 'application/octet-stream') return null;
   if (kind === 'video' || kind === 'dynamic') return 'video';
   if (kind === 'image') return 'image';
-  const probe = String((it && (it.file || it.url || it.slug)) || '');
   if (/\.(mp4|webm|mov|m4v)$/i.test(probe)) return 'video';
   if (/\.(jpg|jpeg|png|webp|gif|avif)$/i.test(probe)) return 'image';
   return null;
@@ -269,9 +281,12 @@ function foliaItemFromCatalog(it, base) {
   return {
     id: 'folia-' + (slug || media),
     title: String((it && it.title) || slug || 'Folia'),
-    type,                                   // 'video' | 'image'
+    type,                                   // 'video' | 'image' | 'package'
     contentrating: null,
-    playable: true,
+    // 工程包（zip）不是可直接播放的媒体：标成不可播放，客户端据此**不塞进 <video>**，
+    // 而是显示「工程包 · 暂不支持」的明确说明（而不是让浏览器报解码失败）。
+    playable: type !== 'package',
+    unsupportedReason: type === 'package' ? 'we-package' : null,
     media,                                  // 绝对 URL
     mediaExt: '.' + (extHit ? extHit[1].toLowerCase() : (type === 'video' ? 'mp4' : 'jpg')),
     // 站点目录可能带 preview/poster；图片没封面时用自己当预览，视频没有就留空（卡片会是黑块）
@@ -472,6 +487,9 @@ function warmInventorySiteCache() {
 }
 
 export { warmInventorySiteCache };
+// 类型判定与条目构造导出**只为测试**（test/inventory-types.mjs）：它们是纯函数，
+// 用它做判据比"起一个假站点再走 HTTP"稳定得多 —— 后者要伪造缓存目录与时点。
+export { foliaTypeOfEntry, foliaItemFromCatalog };
 export function registerInventoryRoutes(webServer, c) {
   const { disposers, base: BASE, mediaOriginApi, buildInventory, componentsProbe } = c;
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name":  "dsh-folia",
-    "version":  "4.8.0",
+    "version":  "4.8.2",
     "description":  "Folia 壁纸引擎：把本机 Wallpaper Engine 壁纸搬进 DSH 界面（场景实时渲染 / 视频 / 网页），内置液态玻璃与 Folia 吉祥物，并可从自建站点拉取壁纸。单包形态（组件已合并）。",
     "type":  "module",
     "engines":  {