dsh-folia 4.2.0 → 4.3.1

package/lib/client.js

@@ -17270,7 +17270,7 @@ window.__ModuleLoader__.load({
 				  ));
 
 				  children.push(React.createElement("div", { key: "hint", className: "we-picker__hint", style: { margin: "6px 0 10px" } },
-				    weT("桌宠由本插件自己绘制（雪碧图逐帧），不依赖其它宠物插件。安装后会立刻出现在右下角，可拖动，点一下会挥手。")));
+				    weT("桌宠由本插件自己绘制（雪碧图逐帧），不依赖其它宠物插件。它会跟着模型状态换动作：干活时换成工作行、干完变完成、出错变失败；安装后出现在右下角，可拖动，点一下会挥手并出声。")));
 
 				  children.push(React.createElement("div", { key: "opts", style: { ...PET_STYLE.row, margin: "2px 0 8px" } },
 				    React.createElement("label", { style: { display: "flex", gap: "6px", alignItems: "center", fontSize: "12px" } },
@@ -17282,6 +17282,32 @@ window.__ModuleLoader__.load({
 				      }),
 				      weT("显示桌宠"),
 				    ),
+				    React.createElement("label", { style: { display: "flex", gap: "6px", alignItems: "center", fontSize: "12px" } },
+				      React.createElement("input", {
+				        type: "checkbox",
+				        checked: Boolean(cfg.sound),
+				        disabled: Boolean(busy),
+				        onChange: (e) => act("config", { sound: e.target.checked }, ""),
+				      }),
+				      weT("声音"),
+				    ),
+				    React.createElement("label", { style: { display: "flex", gap: "4px", alignItems: "center", fontSize: "12px" } },
+				      weT("音量"),
+				      React.createElement("select", {
+				        className: "we-picker__playlist-select",
+				        value: String(cfg.volume == null ? 0.6 : cfg.volume),
+				        disabled: Boolean(busy) || !cfg.sound,
+				        onChange: (e) => act("config", { volume: Number(e.target.value) }, ""),
+				      },
+				      [[0.2, "20%"], [0.4, "40%"], [0.6, "60%"], [0.8, "80%"], [1, "100%"]].map(([v, lb]) =>
+				        React.createElement("option", { key: String(v), value: String(v) }, lb)),
+				      ),
+				    ),
+				    React.createElement("button", {
+				      type: "button", className: "we-picker__btn", disabled: Boolean(busy),
+				      title: weT("把桌宠挪回右下角"),
+				      onClick: () => { try { localStorage.removeItem("wePetPos"); } catch { /* ignore */ } setNote({ ok: true, text: weT("位置已复位（下一次出现回到右下角）") }); },
+				    }, weT("复位位置")),
 				    React.createElement("label", { style: { display: "flex", gap: "4px", alignItems: "center", fontSize: "12px" } },
 				      weT("大小"),
 				      React.createElement("select", {
@@ -17319,10 +17345,20 @@ window.__ModuleLoader__.load({
 				        actions.push(btn(isActive ? weT("使用中") : weT("使用"), () => act("config", { enabled: true, petId: p.dirId }, p.name), isActive || Boolean(busy)));
 				        actions.push(btn(weT("卸载"), () => act("remove", { id: p.dirId }, p.name), Boolean(busy)));
 				        return React.createElement("div", { key, style: PET_STYLE.card },
-				          React.createElement("img", {
-				            src: p.sheet, alt: "", loading: "lazy", decoding: "async",
-				            style: { width: "100%", maxHeight: "96px", objectFit: "contain", background: "rgba(0,0,0,0.25)", borderRadius: "6px" },
-				            onError: (e) => { e.target.style.display = "none"; },
+				          // 预览只显示**第一帧**：雪碧图是 8×9 网格，直接贴图会看到一整排小人（用户实测反馈"看着很乱"）。
+				          // 用 background-size = 列数/行数 × 100% + position 0 0 裁出左上角那一格。
+				          React.createElement("div", {
+				            style: {
+				              width: "100%",
+				              aspectRatio: (p.cell ? p.cell.width + " / " + p.cell.height : "192 / 208"),
+				              maxHeight: "96px",
+				              backgroundImage: "url(" + apiUrl(p.sheet) + ")",
+				              backgroundSize: (Number(p.columns) || 8) * 100 + "% " + (Array.isArray(p.frames) ? p.frames.length : 9) * 100 + "%",
+				              backgroundPosition: "0 0",
+				              backgroundRepeat: "no-repeat",
+				              backgroundColor: "rgba(0,0,0,0.25)",
+				              borderRadius: "6px",
+				            },
 				          }),
 				          React.createElement("div", { style: PET_STYLE.title }, p.name),
 				          React.createElement("div", { style: PET_STYLE.meta },
@@ -17395,25 +17431,165 @@ window.__ModuleLoader__.load({
 				const PET_LAYER_ID = "we-pet-layer";
 				const PET_ROW = { idle: 0, runRight: 1, runLeft: 2, wave: 3, jump: 4, fail: 5, wait: 6, work: 7, done: 8 };
 				const PET_DEFAULT_FRAME_MS = 120;
+				/**
+				 * 活动检测：DSH 的客户端 `ctx` 只暴露 effect/get/slots/surface，没有会话事件，
+				 * 所以"模型在不在干活"只能从**页面本身**读。两条独立信号，任一命中即认为在工作：
+				 *   ① DOM 特征：选择器（默认覆盖常见的 streaming / 生成中 标记）
+				 *   ② 文本特征：屏幕上出现"正在生成 / 思考中 / Stop generating"这类字眼
+				 * 两条都读不到时**安静地停在 idle** —— 宁可不动，也不要让宠物乱跳。
+				 */
+				const PET_ACTIVITY_SELECTORS = [
+				  '[data-dsh-streaming]', '[data-streaming="true"]', '.ds-streaming',
+				  '[class*="streaming"]', '[class*="isGenerating"]', '[aria-busy="true"]',
+				];
+				const PET_ACTIVITY_TEXTS = ['正在生成', '思考中', '停止生成', 'Stop generating', 'Thinking'];
+				/** 检测节流（毫秒）：一次 body 扫描比一次布局还便宜，但没必要每帧跑。 */
+				const PET_ACTIVITY_POLL_MS = 500;
 				/** 光标静止后多久切回 idle（毫秒）。 */
 				const PET_WAVE_IDLE_MS = 9000;
+				/**
+				 * 日常动作调度：没在干活时，每隔 5~11 秒随机演一个。
+				 *
+				 * 为什么需要它：只播 idle 的宠物看起来是"一张会呼吸的图"，不像活物。这里把 manifest 的
+				 * 9 条轨道都用上 —— 走一段（左右跑）、挥手、跳一下、发会儿呆 —— 用**随机间隔**而不是固定节拍，
+				 * 避免机械感。干活（work/done/fail）优先级最高，调度器在那些状态下不抢行。
+				 */
+				const PET_IDLE_ACTIONS = [
+				  { row: "wave", weight: 3, ms: 0 },
+				  { row: "jump", weight: 2, ms: 0 },
+				  { row: "wait", weight: 2, ms: 1800 },
+				  { row: "walkRight", weight: 3, ms: 1600 },
+				  { row: "walkLeft", weight: 3, ms: 1600 },
+				];
+				/**
+				 * 统一时钟。
+				 *
+				 * ⚠️ `requestAnimationFrame(fn)` 交给 fn 的是**页面相对时间**（与 performance.now 同源），
+				 *    不是 petNow()。两者混用会出现「holdUntil = petNow() + 1400，而 now 只有几千」——
+				 *    比较永远不成立，于是宠物切到 done/fail/wave 之后**再也回不到 idle**（实测复现）。
+				 *    所有时间比较一律走这一个函数。
+				 */
+				function petNow() {
+				  try {
+				    if (typeof performance !== "undefined" && typeof performance.now === "function") return performance.now();
+				  } catch { /* 退回 Date.now */ }
+				  return petNow();
+				}
+				/** 两次随机动作之间的间隔范围（毫秒）。 */
+				const PET_IDLE_GAP_MS = [5000, 11000];
+
+				/**
+				 * 声音：包内 `sounds/<事件>.ogg|mp3|wav` 优先（manifest.sounds 显式声明），
+				 * 没有就用 Web Audio 合成 —— 一只宠物没声音比"声音是版权素材"糟得多。
+				 * 全部失败都静默：声音是可选项，不该有能力打断渲染。
+				 */
+				function petVoice(ctxWindow, sounds, cfg) {
+				  const enabled = Boolean(cfg && cfg.sound);
+				  const volume = Math.max(0, Math.min(1, Number(cfg && cfg.volume) || 0));
+				  let audioCtx = null;
+				  const cache = new Map();
+
+				  function ensureCtx() {
+				    if (audioCtx || typeof ctxWindow.AudioContext !== 'function') return audioCtx;
+				    try { audioCtx = new ctxWindow.AudioContext(); } catch { audioCtx = null; }
+				    return audioCtx;
+				  }
+
+				  /** 合成提示音：不同事件不同音高与波形，短、克制。 */
+				  function synth(kind) {
+				    const ac = ensureCtx();
+				    if (!ac) return;
+				    const spec = kind === "done" ? { f: 880, d: 0.09, w: "sine" }
+				      : kind === "fail" ? { f: 220, d: 0.16, w: "sawtooth" }
+				      : { f: 620, d: 0.08, w: "triangle" };
+				    try {
+				      const osc = ac.createOscillator();
+				      const gain = ac.createGain();
+				      osc.type = spec.w;
+				      osc.frequency.value = spec.f;
+				      gain.gain.value = 0.0001;
+				      osc.connect(gain);
+				      gain.connect(ac.destination);
+				      const now = ac.currentTime;
+				      gain.gain.exponentialRampToValueAtTime(Math.max(0.0001, volume * 0.25), now + 0.01);
+				      gain.gain.exponentialRampToValueAtTime(0.0001, now + spec.d);
+				      osc.start(now);
+				      osc.stop(now + spec.d + 0.02);
+				    } catch { /* 合成失败就算了 */ }
+				  }
+
+				  function file(kind) {
+				    const url = sounds && sounds[kind];
+				    if (!url) return null;
+				    let el = cache.get(kind);
+				    if (!el) {
+				      try { el = new ctxWindow.Audio(apiUrl(url)); } catch { return null; }
+				      el.preload = "auto";
+				      cache.set(kind, el);
+				    }
+				    return el;
+				  }
+
+				  return {
+				    get enabled() { return enabled; },
+				    play(kind) {
+				      if (!enabled || volume <= 0) return;
+				      const el = file(kind);
+				      if (el) {
+				        try { el.currentTime = 0; el.volume = volume; const p = el.play(); if (p && p.catch) p.catch(() => synth(kind)); return; } catch { /* 落回合成 */ }
+				      }
+				      synth(kind);
+				    },
+				    destroy() {
+				      cache.clear();
+				      try { if (audioCtx && typeof audioCtx.close === "function") audioCtx.close(); } catch { /* ignore */ }
+				      audioCtx = null;
+				    },
+				  };
+				}
+
+				/** 页面里现在像不像"模型在干活"。任何异常都当 false。 */
+				function petActivityProbe() {
+				  try {
+				    if (typeof document === 'undefined' || !document.body) return false;
+				    for (const sel of PET_ACTIVITY_SELECTORS) {
+				      if (document.querySelector(sel)) return true;
+				    }
+				    const text = document.body.innerText || "";
+				    for (const marker of PET_ACTIVITY_TEXTS) {
+				      if (text.indexOf(marker) !== -1) return true;
+				    }
+				  } catch { /* ignore */ }
+				  return false;
+				}
 
 				/**
 				 * 桌宠实例：一只宠物一条生命周期（换宠物 = 销毁重来）。
 				 * 不导出（构建期内联进同一作用域），只由 mountPetLayer 使用。
 				 */
-				function createPetLayer(layerEl, canvas, pet, scale) {
+				function createPetLayer(layerEl, canvas, pet, scale, cfg) {
 				  const ctx = canvas.getContext("2d");
 				  const img = new Image();
 				  let frame = 0;
 				  let row = PET_ROW.idle;
 				  let acc = 0;
-				  let last = 0;
+				  let last = 0;   // rAF 时间戳（页面相对时间），不是 Date.now()
 				  let raf = 0;
 				  let dead = false;
 				  let idleSince = 0;
 				  let dragging = null;
 				  let ready = false;
+				  const voice = petVoice(typeof window !== "undefined" ? window : {}, pet.sounds, cfg || {});
+				  let activity = false;
+				  let activityTimer = null;
+				  /** 一次性动作（done/fail）播完自动回 idle 的时间戳。 */
+				  let holdUntil = 0;
+				  /** 下一次随机动作的时间点；0 = 立即重排。 */
+				  let nextActionAt = 0;
+				  /** 走动中的速度（px/帧，正=向右）。0 = 不走。 */
+				  let walkSpeed = 0;
+				  /** 走动剩余时长（毫秒）。 */
+				  let walkLeft = 0;
 
 				  const cw = Math.max(1, Number(pet.cell && pet.cell.width) || 192);
 				  const ch = Math.max(1, Number(pet.cell && pet.cell.height) || 208);
@@ -17459,8 +17635,55 @@ window.__ModuleLoader__.load({
 				  function tick(now) {
 				    if (dead) return;
 				    if (!last) last = now;
-				    acc += now - last;
+				    const dt = Math.max(0, Math.min(100, now - last));   // 切后台回来可能是几百毫秒，钳住
+				    acc += dt;
 				    last = now;
+				    // ── 走动：每帧挪一点，走到头或时间到就停下回 idle ──
+				    if (walkSpeed !== 0 && walkLeft > 0) {
+				      const p = pos();
+				      const maxX = Math.max(0, (window.innerWidth || 1920) - layerEl.offsetWidth);
+				      const nx = p.left + walkSpeed;
+				      if (nx <= 0 || nx >= maxX) {
+				        walkSpeed = -walkSpeed;
+				        setRow(walkSpeed > 0 ? PET_ROW.runRight : PET_ROW.runLeft);
+				        moveTo(Math.max(0, Math.min(maxX, nx)), p.top);
+				      } else {
+				        moveTo(nx, p.top);
+				      }
+				      walkLeft -= dt;
+				      if (walkLeft <= 0) {
+				        walkSpeed = 0;
+				        setRow(PET_ROW.idle);
+				        nextActionAt = petNow() + PET_IDLE_GAP_MS[0] + Math.random() * (PET_IDLE_GAP_MS[1] - PET_IDLE_GAP_MS[0]);
+				      }
+				    }
+				    // ── 日常动作调度：只在"真的闲着"时才演 ──
+				    if (!activity && walkSpeed === 0 && row === PET_ROW.idle && !holdUntil && now >= nextActionAt) {
+				      playIdleAction();
+				      const gap = PET_IDLE_GAP_MS[0] + Math.random() * (PET_IDLE_GAP_MS[1] - PET_IDLE_GAP_MS[0]);
+				      nextActionAt = petNow() + gap;
+				    }
+
+				    // 活动状态变化时先切行（work/done/fail 优先于 idle/wave）。
+				    if (activityTimer === null && typeof setInterval === "function") {
+				      activityTimer = setInterval(() => {
+				        const nowActive = petActivityProbe();
+				        if (nowActive === activity && now < holdUntil) return;
+				        activity = nowActive;
+				        if (activity) {
+				          holdUntil = 0;
+				          walkSpeed = 0;
+				          walkLeft = 0;
+				          if (row !== PET_ROW.work) setRow(PET_ROW.work);
+				        } else if (row === PET_ROW.work) {
+				          // 干完活 → 完成行一小会儿，再回 idle（"被看见"的反馈）
+				          setRow(PET_ROW.done);
+				          holdUntil = petNow() + 1600;
+				          voice.play("done");
+				        }
+				      }, PET_ACTIVITY_POLL_MS);
+				    }
+				    if (holdUntil && now >= holdUntil) { holdUntil = 0; setRow(PET_ROW.idle); }
 				    const ms = frameMs(row, frame);
 				    if (acc >= ms) {
 				      acc = 0;
@@ -17469,12 +17692,60 @@ window.__ModuleLoader__.load({
 				        frame = 0;
 				        // 一次性动作（挥手 / 跳）播完回 idle
 				        if (row === PET_ROW.wave || row === PET_ROW.jump) row = PET_ROW.idle;
+				        // done / fail 由 holdUntil 计时收尾，不在这里回 idle（否则刚出现的反馈会被吞掉）。
 				      }
 				    }
 				    draw();
 				    raf = (typeof requestAnimationFrame === "function")
 				      ? requestAnimationFrame(tick)
-				      : setTimeout(() => tick(Date.now()), 60);
+				      : setTimeout(() => tick(petNow()), 60);
+				  }
+
+				  /** 当前左上角（拖动/走动都读写这一对值）。 */
+				  function pos() {
+				    const left = parseFloat(layerEl.style.left);
+				    const top = parseFloat(layerEl.style.top);
+				    return {
+				      left: Number.isFinite(left) ? left : (window.innerWidth - layerEl.offsetWidth - 24),
+				      top: Number.isFinite(top) ? top : (window.innerHeight - layerEl.offsetHeight - 16),
+				    };
+				  }
+				  function moveTo(left, top) {
+				    const maxX = Math.max(0, (window.innerWidth || 1920) - layerEl.offsetWidth);
+				    const maxY = Math.max(0, (window.innerHeight || 1080) - layerEl.offsetHeight);
+				    const x = Math.max(0, Math.min(maxX, left));
+				    const y = Math.max(0, Math.min(maxY, top));
+				    layerEl.style.left = x + "px";
+				    layerEl.style.top = y + "px";
+				    layerEl.style.right = "auto";
+				    layerEl.style.bottom = "auto";
+				  }
+
+				  /** 从 idle 里挑一个动作演。走动会真的位移，演完自己停。 */
+				  function playIdleAction() {
+				    const total = PET_IDLE_ACTIONS.reduce((s, a) => s + a.weight, 0);
+				    let pick = Math.random() * total;
+				    let action = PET_IDLE_ACTIONS[0];
+				    for (const a of PET_IDLE_ACTIONS) { if ((pick -= a.weight) <= 0) { action = a; break; } }
+				    if (action.row === "walkRight" || action.row === "walkLeft") {
+				      const dir = action.row === "walkRight" ? 1 : -1;
+				      const p0 = pos();
+				      // 走到边上就掉头：撞墙不停在原地踏步，直接换方向。
+				      const maxX = Math.max(0, (window.innerWidth || 1920) - layerEl.offsetWidth);
+				      if ((dir > 0 && p0.left >= maxX - 2) || (dir < 0 && p0.left <= 2)) {
+				        setRow(dir > 0 ? PET_ROW.runLeft : PET_ROW.runRight);
+				        walkSpeed = -dir * (0.9 * scale);
+				      } else {
+				        setRow(dir > 0 ? PET_ROW.runRight : PET_ROW.runLeft);
+				        walkSpeed = dir * (0.9 * scale);
+				      }
+				      walkLeft = action.ms;
+				      return;
+				    }
+				    walkSpeed = 0;
+				    walkLeft = 0;
+				    setRow(PET_ROW[action.row] === undefined ? PET_ROW.idle : PET_ROW[action.row]);
+				    holdUntil = action.ms ? petNow() + action.ms : petNow() + 1400;
 				  }
 
 				  function setRow(next) {
@@ -17510,7 +17781,11 @@ window.__ModuleLoader__.load({
 				    dragging = null;
 				    if (!moved) {
 				      // 单击 = 挥手（给用户一个"它有反应"的反馈），之后自动回 idle
+				      walkSpeed = 0;
+				      walkLeft = 0;
 				      setRow(PET_ROW.wave);
+				      holdUntil = petNow() + 1400;
+				      voice.play("wave");
 				    } else {
 				      try { localStorage.setItem("wePetPos", JSON.stringify({ left: layerEl.style.left, top: layerEl.style.top })); } catch { /* ignore */ }
 				    }
@@ -17525,11 +17800,14 @@ window.__ModuleLoader__.load({
 				    window.addEventListener("pointermove", onPointerMove);
 				    window.addEventListener("pointerup", onPointerUp);
 				  }
-				  idleSince = Date.now();
-				  raf = (typeof requestAnimationFrame === "function") ? requestAnimationFrame(tick) : setTimeout(() => tick(Date.now()), 60);
+				  idleSince = petNow();
+				  raf = (typeof requestAnimationFrame === "function") ? requestAnimationFrame(tick) : setTimeout(() => tick(petNow()), 60);
 
 				  function destroy() {
 				    dead = true;
+				    if (typeof clearInterval === "function" && activityTimer !== null) clearInterval(activityTimer);
+				    activityTimer = null;
+				    try { voice.destroy(); } catch { /* ignore */ }
 				    if (typeof cancelAnimationFrame === "function") cancelAnimationFrame(raf); else clearTimeout(raf);
 				    canvas.removeEventListener("pointerdown", onPointerDown);
 				    if (typeof window !== "undefined") {
@@ -17538,7 +17816,15 @@ window.__ModuleLoader__.load({
 				    }
 				  }
 
-				  return { destroy, setRow, resize };
+				  return {
+				    destroy, setRow, resize,
+				    /** 外部事件注入（面板操作失败等）：一次性播放失败行并出声。 */
+				    fail() { setRow(PET_ROW.fail); holdUntil = petNow() + 1600; voice.play("fail"); },
+				    cheer() { setRow(PET_ROW.done); holdUntil = petNow() + 1600; voice.play("done"); },
+				    get row() { return row; },
+				    /** 让下一次随机动作尽快发生（首次出现时用）。 */
+				    scheduleSoon() { nextActionAt = petNow() + 1200 + Math.random() * 1800; },
+				  };
 				}
 
 				/**
@@ -17547,16 +17833,24 @@ window.__ModuleLoader__.load({
 				 * 它自己拉 `/folia/pets/list`（配置 + 已装宠物），所以**不依赖面板是否打开过** ——
 				 * 冷启动就能出宠物。
 				 */
+				/** 让刚出现的宠物在 1.2~3 秒后演第一个动作（实例内部按需读 nextActionAt）。 */
+				function nextActionSoon(instance) {
+				  try { if (instance && typeof instance.scheduleSoon === "function") instance.scheduleSoon(); } catch { /* ignore */ }
+				}
+
 				function mountPetLayer() {
 				  if (typeof document === "undefined" || !document.body) return null;
 				  let disposed = false;
 				  let instance = null;
 				  let layerEl = null;
+				  /** 当前实例对应的「宠物@大小」；变了就要销毁重建。 */
+				  let currentKey = "";
 
 				  function teardownDom() {
 				    if (instance) { try { instance.destroy(); } catch { /* ignore */ } instance = null; }
 				    if (layerEl && layerEl.parentNode) layerEl.parentNode.removeChild(layerEl);
 				    layerEl = null;
+				    currentKey = "";
 				  }
 
 				  async function sync() {
@@ -17572,7 +17866,12 @@ window.__ModuleLoader__.load({
 				    if (!cfg || !cfg.enabled || !pet) { teardownDom(); return; }
 
 				    const scale = Number(cfg.scale) > 0 ? Number(cfg.scale) : 1;
-				    if (layerEl) { layerEl.style.display = ""; if (instance) instance.resize(); return; }
+				    const key = String(pet.dirId || pet.id) + "@" + scale;
+				    // 换宠物 / 改大小 ⇒ **必须重建**：旧实例的贴图与几何都是上一只的。
+				    // （实测踩过：只在首次创建，于是点「使用」换了宠物而屏幕没变 —— 就是这里。）
+				    if (layerEl && currentKey === key) { layerEl.style.display = ""; return; }
+				    teardownDom();
+				    currentKey = key;
 
 				    layerEl = document.createElement("div");
 				    layerEl.id = PET_LAYER_ID;
@@ -17593,7 +17892,9 @@ window.__ModuleLoader__.load({
 				    const canvas = document.createElement("canvas");
 				    layerEl.appendChild(canvas);
 				    document.body.appendChild(layerEl);
-				    instance = createPetLayer(layerEl, canvas, pet, scale);
+				    instance = createPetLayer(layerEl, canvas, pet, scale, cfg);
+				    // 首次出现时排一个随机动作，别一上来就傻站着。
+				    nextActionSoon(instance);
 				  }
 
 				  sync();
@@ -17611,6 +17912,8 @@ window.__ModuleLoader__.load({
 				  };
 				}
 
+				// 仅供单测驱动（构建期内联时会剥掉 export，不影响产物）。
+
 				// ── 内联模块：src/quick-panel.js —— 快捷播放面板（官方侧栏 tab 与低版本抽屉共用同一份内容）：当前壁纸 + 轮播 + 列表快切 + 声音 + 设置入口。列表虚拟滚动（spacer + 可视窗口）（构建期注入；勿手改本段）──
 				/**
 				 * quick-panel.js — 快捷播放面板（侧边栏的**唯一**内容）：当前壁纸 + 轮播 + 三档页签

package/lib/routes/pets.js

@@ -26,6 +26,7 @@ import { homedir } from 'node:os';
 import { basename, dirname, extname, join } from 'node:path';
 
 /** 注入契约（ADR-0013 D12）。 */
+export { unzip };
 export const DEPS = ['disposers', 'base', 'log'];
 
 const DEFAULT_COLUMNS = 8;
@@ -92,6 +93,23 @@ function readPet(dir, id) {
     bytes: (() => { try { return statSync(sheetPath).size; } catch { return null; } })(),
     cell, columns, frames, tracks,
     sheet: '/folia/pets/sheet?v=' + encodeURIComponent(id),
+    // 音效：manifest 里显式给了 `sounds`（事件 → 包内文件）才生效；
+    // 没有就由前端用 Web Audio 合成，避免"没声音"变成默认行为。
+    sounds: (() => {
+      const src = (manifest.sounds && typeof manifest.sounds === 'object') ? manifest.sounds : null;
+      if (!src) return null;
+      const out = {};
+      for (const [ev, file] of Object.entries(src)) {
+        if (typeof file !== 'string') continue;
+        const rel = file.replace(/\\/g, '/');
+        if (!/^sounds\/[^/]+\.(ogg|mp3|wav|m4a|webm)$/i.test(rel)) continue;
+        const abs = join(dir, rel);
+        if (!existsSync(abs)) continue;
+        // 原样带 sounds/ 前缀：资源路由按 sounds/<文件> 白名单校验，剥掉前缀就对不上了。
+        out[ev] = '/folia/pets/asset?v=' + encodeURIComponent(id) + '&f=' + encodeURIComponent(rel);
+      }
+      return Object.keys(out).length ? out : null;
+    })(),
   };
 }
 
@@ -120,9 +138,11 @@ function readConfig() {
       enabled: raw.enabled === true,
       petId: typeof raw.petId === 'string' ? raw.petId : '',
       scale: Number.isFinite(Number(raw.scale)) ? Math.min(3, Math.max(0.5, Number(raw.scale))) : 1,
+      sound: raw.sound === true,
+      volume: Number.isFinite(Number(raw.volume)) ? Math.min(1, Math.max(0, Number(raw.volume))) : 0.6,
     };
   } catch {
-    return { enabled: false, petId: '', scale: 1 };
+    return { enabled: false, petId: '', scale: 1, sound: false, volume: 0.6 };
   }
 }
 function writeConfig(next) {
@@ -131,6 +151,8 @@ function writeConfig(next) {
     enabled: next.enabled === undefined ? cur.enabled : Boolean(next.enabled),
     petId: next.petId === undefined ? cur.petId : String(next.petId || ''),
     scale: next.scale === undefined ? cur.scale : Math.min(3, Math.max(0.5, Number(next.scale) || 1)),
+    sound: next.sound === undefined ? cur.sound : Boolean(next.sound),
+    volume: next.volume === undefined ? cur.volume : Math.min(1, Math.max(0, Number(next.volume) || 0)),
   };
   try {
     ensureDir(dirname(configPath()));
@@ -181,8 +203,12 @@ function unzip(buf, opts = {}) {
     const localOff = buf.readUInt32LE(p + 42);
     const name = buf.toString('utf8', p + 46, p + 46 + nameLen);
     p += 46 + nameLen + extraLen + commentLen;
-    // 路径安全：只收单层文件名，任何目录跳转一律丢弃
-    if (!name || name.includes('/') || name.includes('\\') || name.includes('..')) continue;
+    // 路径安全：只收「根文件」与「sounds/<文件>」两种形态 —— 任何 `..`、绝对路径、
+    // 其它子目录一律丢弃。宠物包只需要雪碧图/清单/音效三类东西，收窄比放行安全。
+    const safeName = String(name).replace(/\\/g, '/');
+    const okShape = safeName.includes('..') || safeName.startsWith('/') ? false
+      : (safeName.indexOf('/') === -1 || /^sounds\/[^/]+$/.test(safeName));
+    if (!safeName || !okShape) continue;
     if (compSize > maxEntry) continue;
     const lNameLen = buf.readUInt16LE(localOff + 26);
     const lExtraLen = buf.readUInt16LE(localOff + 28);
@@ -300,6 +326,35 @@ export function registerPetsRoutes(webServer, c) {
     },
   }));
 
+  // ── GET /pets/asset?v=<dirId>&f=<相对路径>（包内音频等额外资源） ───────────
+  disposers.push(webServer.register({
+    kind: 'exact',
+    path: `${BASE}/pets/asset`,
+    handler: async (req, res) => {
+      let q = null;
+      try { q = new URL(req.url || '/', 'http://x').searchParams; } catch { q = null; }
+      const id = q ? String(q.get('v') || '') : '';
+      const rel = q ? String(q.get('f') || '').replace(/\\/g, '/') : '';
+      if (!id || /[\\/]/.test(id) || id.includes('..') || !rel) { res.statusCode = 400; res.end(); return; }
+      // 只放行 sounds/ 下的已知音频扩展名：这条路由不充当通用文件读口。
+      if (!/^sounds\/[^/]+\.(ogg|mp3|wav|m4a|webm)$/i.test(rel)) { res.statusCode = 400; res.end(); return; }
+      const file = join(dataRoot(), id, rel);
+      let size = 0;
+      try { size = statSync(file).size; } catch { size = 0; }
+      if (!size || size > 16 * 1024 * 1024) { res.statusCode = 404; res.end(); return; }
+      const ext = extname(file).toLowerCase();
+      const type = ext === '.mp3' ? 'audio/mpeg' : ext === '.wav' ? 'audio/wav'
+        : ext === '.m4a' ? 'audio/mp4' : ext === '.webm' ? 'audio/webm' : 'audio/ogg';
+      if (typeof res.setHeader === 'function') {
+        res.setHeader('content-type', type);
+        res.setHeader('content-length', String(size));
+        res.setHeader('cache-control', 'public, max-age=31536000, immutable');
+      }
+      res.statusCode = 200;
+      createReadStream(file).pipe(res);
+    },
+  }));
+
   // ── POST /pets/config（开关 / 选中 / 缩放） ───────────────────────────────
   disposers.push(webServer.register({
     kind: 'exact',
@@ -358,7 +413,13 @@ export function registerPetsRoutes(webServer, c) {
       const dir = join(dataRoot(), id);
       try {
         ensureDir(dir);
-        for (const [name, data] of entries) writeFileSync(join(dir, basename(name)), data);
+        for (const [name, data] of entries) {
+          const rel = String(name).replace(/\\/g, '/');
+          const safe = rel.indexOf('/') === -1 ? basename(rel) : rel;   // sounds/x.ogg 保留一层
+          const target = join(dir, safe);
+          ensureDir(dirname(target));
+          writeFileSync(target, data);
+        }
       } catch (e) {
         try { rmSync(dir, { recursive: true, force: true }); } catch { /* ignore */ }
         sendJson(res, 500, { ok: false, error: 'write-failed', detail: String((e && e.message) || e) });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name":  "dsh-folia",
-    "version":  "4.2.0",
+    "version":  "4.3.1",
     "description":  "Folia 壁纸引擎：把本机 Wallpaper Engine 壁纸搬进 DSH 界面（场景实时渲染 / 视频 / 网页），内置液态玻璃与 Folia 吉祥物，并可从自建站点拉取壁纸。单包形态（组件已合并）。",
     "type":  "module",
     "engines":  {
@@ -191,7 +191,9 @@
                     "verify:all":  "node test/run-guards.mjs all",
                     "prepack":  "node scripts/prepare.mjs",
                     "test:boot":  "node test/boot-http.mjs",
-                    "gate":  "node scripts/build-client.mjs \u0026\u0026 node test/run-guards.mjs smoke \u0026\u0026 node test/boot-http.mjs"
+                    "test:pets":  "node test/pets-http.mjs",
+                    "test:pets-layer":  "node test/pets-layer.mjs",
+                    "gate":  "node scripts/build-client.mjs \u0026\u0026 node test/run-guards.mjs smoke \u0026\u0026 node test/boot-http.mjs \u0026\u0026 node test/pets-http.mjs \u0026\u0026 node test/pets-layer.mjs"
                 },
     "peerDependencies":  {
                              "@deepseek-ai/cordis":  "^4.0.4",