dsh-live2dwaifu 0.4.0 → 0.5.0

package/README.md

@@ -23,6 +23,12 @@
 
 **会出声**：一个字一声很短的电音，标点停一拍，句尾沉一下——不是朗读，是“哔哔”那种。标题栏的 **♪** 打开调音页，放个真模型在旁边，边调边听；每只模型各存一份音色，换人换声。音量拉到 0 就安静，只剩气泡和口型。
 
+**她也会甩图**：图库直接吃 `dsh-meme` 那套，说话时按情绪挑一张，贴在气泡里。
+
+**她还会问你要选项**：话说到了需要你挑的地方，气泡下面会冒出两三个按钮，点一个就等于你回了她。
+
+**开关都在 ⚙ 里**：抽屉底下分两栏——「这台机器上」管眼睛跟随、点她、自己播动作、出声、跟着聊天念；「她那边」管没人理就自己开口、甩表情包、给选项、记性。前几项存本机，后几项存 `~/.dsh/dsh-live2d/config.json`。
+
 **跟着聊**：她挂在聊天流上（`conversation.chat.node` 插槽），助手每说一句她就念一句，情绪按话里的词换。
 
 **也能直接跟她说**：卡片底下有个小框，打一句回车，她回你。这条线**不进你的聊天记录**——后台直接问模型，往来只存在 `models/<id>/chat.json` 里。她说的话按人设卡现场写，不是复读；人设卡就是 `models/<id>/meta.json` 里的 `persona` 字段，没写就用默认那份（若妍）。

package/assets/viewer.html

@@ -33,6 +33,16 @@
     border-radius: 6px; padding: 3px 8px; cursor: pointer; font: inherit; }
   #exps button.on { background: #3a5f8a; border-color: #4c7bb0; color: #eaf2ff; }
   #exps .tipx { color: #6f7783; font-size: 11px; align-self: center; }
+  #choices { display: none; position: absolute; left: 12px; right: 12px; bottom: 96px; flex-wrap: wrap; gap: 6px; }
+  #choices.show { display: flex; }
+  #choices button { background: rgba(38,48,62,.96); border: 1px solid #4a6a92; border-radius: 14px;
+    color: #dfe9f6; font: inherit; font-size: 12px; padding: 5px 11px; cursor: pointer; }
+  #choices button:hover { background: #2f4a68; }
+  #settings { max-height: 42%; overflow-y: auto; margin-bottom: 8px; }
+  #settings h3 { font-size: 10px; letter-spacing: .6px; color: #6f7783; font-weight: 600; margin: 8px 0 4px; }
+  .opt { display: flex; align-items: center; gap: 8px; padding: 3px 2px; font-size: 12px; color: #c3c9d3; }
+  .opt input { accent-color: #6aa9ff; }
+  .bub-img { display: block; max-width: 100%; max-height: 120px; border-radius: 8px; margin-bottom: 6px; object-fit: contain; }
   #actions { display: flex; gap: 6px; }
   #actions button { flex: 1; background: #2f343d; color: #cfd4dd; border: 1px solid #3c424c;
     border-radius: 8px; padding: 6px; cursor: pointer; font: inherit; }
@@ -43,11 +53,13 @@
 <body>
 <canvas id="stage"></canvas>
 <div id="bubble"></div>
+<div id="choices"></div>
 <div id="hint"><div>还没有模型。<br />点下面的「导入模型」，选中你的 Live2D 文件夹（含 .model3.json 那一层）。</div></div>
 <div id="drawer">
   <h2>模型</h2>
   <div id="list"></div>
   <div id="exps"></div>
+  <div id="settings"></div>
   <div id="actions">
     <button id="import">导入模型</button>
     <button id="close">关掉</button>

package/assets/viewer.js

@@ -700,8 +700,8 @@
           }
           return base2;
         }
-        function digitToBasic(digit, flag) {
-          return digit + 22 + 75 * (digit < 26) - ((flag != 0) << 5);
+        function digitToBasic(digit, flag2) {
+          return digit + 22 + 75 * (digit < 26) - ((flag2 != 0) << 5);
         }
         function adapt(delta, numPoints, firstTime) {
           var k2 = 0;
@@ -9999,16 +9999,16 @@ void main(void)
       if (!this.bitmap && (this.process(), !this.bitmap))
         return false;
       if (super.upload(renderer, baseTexture, glTexture, this.bitmap), !this.preserveBitmap) {
-        let flag = true;
+        let flag2 = true;
         const glTextures = baseTexture._glTextures;
         for (const key in glTextures) {
           const otherTex = glTextures[key];
           if (otherTex !== glTexture && otherTex.dirtyId !== baseTexture.dirtyId) {
-            flag = false;
+            flag2 = false;
             break;
           }
         }
-        flag && (this.bitmap.close && this.bitmap.close(), this.bitmap = null);
+        flag2 && (this.bitmap.close && this.bitmap.close(), this.bitmap = null);
       }
       return true;
     }
@@ -31603,16 +31603,16 @@ void main(void)\r
         }
         _super.prototype.upload.call(this, renderer, baseTexture, glTexture, this.bitmap);
         if (!this.preserveBitmap) {
-          var flag = true;
+          var flag2 = true;
           var glTextures = baseTexture._glTextures;
           for (var key in glTextures) {
             var otherTex = glTextures[key];
             if (otherTex !== glTexture && otherTex.dirtyId !== baseTexture.dirtyId) {
-              flag = false;
+              flag2 = false;
               break;
             }
           }
-          if (flag) {
+          if (flag2) {
             if (this.bitmap.close) {
               this.bitmap.close();
             }
@@ -44321,6 +44321,110 @@ void main(void)\r
   var POKE_HEAD = ["\u5514\u3002", "\u522B\u6478\u3002", "\u5934\u53D1\u4E71\u4E86\u3002", "\u55EF\u2026\u2026", "\u4F60\u624B\u51C9\u3002"];
   var POKE_BODY = ["\u770B\u4EC0\u4E48\u770B\u3002", "\u6233\u4EC0\u4E48\u3002", "\u54FC\u3002", "\u522B\u95F9\u3002"];
   var POKE_LOW = ["\u5728\u5462\u3002", "\u6709\u4E8B\uFF1F", "\u600E\u4E48\u4E86\u3002"];
+  var flags = {};
+  try {
+    flags = JSON.parse(localStorage.getItem("dsh-l2d-flags") || "{}");
+  } catch {
+    flags = {};
+  }
+  function flag(k2) {
+    return flags[k2] === void 0 ? true : !!flags[k2];
+  }
+  function setFlag(k2, v2) {
+    flags[k2] = !!v2;
+    try {
+      localStorage.setItem("dsh-l2d-flags", JSON.stringify(flags));
+    } catch {
+    }
+  }
+  var LOCAL_OPTS = [
+    ["gaze", "\u773C\u775B\u8DDF\u7740\u9F20\u6807"],
+    ["poke", "\u70B9\u5979\u6709\u53CD\u5E94"],
+    ["motion", "\u81EA\u5DF1\u64AD\u52A8\u4F5C"],
+    ["sound", "\u51FA\u58F0"],
+    ["follow", "\u8DDF\u7740\u804A\u5929\u5FF5"]
+  ];
+  var SERVER_OPTS = [
+    ["proactive", "\u6CA1\u4EBA\u7406\u5C31\u81EA\u5DF1\u5F00\u53E3"],
+    ["memes", "\u4F1A\u7529\u8868\u60C5\u5305"],
+    ["choices", "\u7ED9\u9009\u9879\u8BA9\u4ED6\u6311"],
+    ["memory", "\u8BB0\u4F4F\u4E4B\u524D\u8BF4\u7684"]
+  ];
+  var serverSettings = {};
+  function renderSettings() {
+    const box = $2("settings");
+    if (!box) return;
+    box.innerHTML = "";
+    const h1 = document.createElement("h3");
+    h1.textContent = "\u8FD9\u53F0\u673A\u5668\u4E0A";
+    box.appendChild(h1);
+    for (const [k2, label] of LOCAL_OPTS) {
+      const row = document.createElement("label");
+      row.className = "opt";
+      const cb = document.createElement("input");
+      cb.type = "checkbox";
+      cb.checked = flag(k2);
+      cb.onchange = () => setFlag(k2, cb.checked);
+      row.appendChild(cb);
+      row.appendChild(document.createTextNode(label));
+      box.appendChild(row);
+    }
+    const h2 = document.createElement("h3");
+    h2.textContent = "\u5979\u90A3\u8FB9";
+    box.appendChild(h2);
+    for (const [k2, label] of SERVER_OPTS) {
+      const row = document.createElement("label");
+      row.className = "opt";
+      const cb = document.createElement("input");
+      cb.type = "checkbox";
+      cb.checked = serverSettings[k2] !== false;
+      cb.onchange = () => {
+        serverSettings[k2] = cb.checked;
+        fetch(BASE + "/api/settings", {
+          method: "POST",
+          headers: { "content-type": "application/json" },
+          body: JSON.stringify({ settings: { [k2]: cb.checked } })
+        }).catch(() => {
+        });
+      };
+      row.appendChild(cb);
+      row.appendChild(document.createTextNode(label));
+      box.appendChild(row);
+    }
+  }
+  function loadSettings() {
+    fetch(BASE + "/api/settings").then((r2) => r2.json()).then((d2) => {
+      serverSettings = d2.settings || {};
+      renderSettings();
+    }).catch(() => renderSettings());
+  }
+  function showChoices(list) {
+    const box = $2("choices");
+    if (!box) return;
+    box.innerHTML = "";
+    if (!list || !list.length) {
+      box.classList.remove("show");
+      return;
+    }
+    for (const c2 of list) {
+      const b2 = document.createElement("button");
+      b2.textContent = c2;
+      b2.onclick = () => {
+        box.classList.remove("show");
+        fetch(BASE + "/api/chat", {
+          method: "POST",
+          headers: { "content-type": "application/json" },
+          body: JSON.stringify({ text: c2 })
+        }).then((r2) => r2.json()).then((d2) => {
+          if (d2.reply || d2.image) say(d2.reply || "", d2.mood, d2.image);
+          showChoices(d2.choices || []);
+        }).catch(() => {
+        });
+      };
+      box.appendChild(b2);
+    }
+    box.classList.add("show");
+  }
   var tone = { type: "triangle", base: 400, jit: 10, dur: 60, vol: 32, spd: 62 };
   var ac = null;
   function audioCtx() {
@@ -44337,7 +44441,7 @@ void main(void)\r
   }
   function blip(freq, durMs, type) {
     const a2 = audioCtx();
-    if (!a2 || !(tone.vol > 0)) return;
+    if (!a2 || !flag("sound") || !(tone.vol > 0)) return;
     const t0 = a2.currentTime;
     const osc = a2.createOscillator();
     const g2 = a2.createGain();
@@ -44485,7 +44589,7 @@ void main(void)\r
     await refresh(true);
     $2("drawer").classList.remove("show");
   }
-  function say(text, m2) {
+  function say(text, m2, image) {
     if (m2) applyMood(m2);
     const bubble = $2("bubble");
     let s2 = String(text == null ? "" : text).replace(/\s+/g, " ").trim();
@@ -44493,6 +44597,14 @@ void main(void)\r
     bubble.textContent = "";
     bubble.style.opacity = "1";
     clearTimeout(sayFade);
+    if (image) {
+      const img = document.createElement("img");
+      img.className = "bub-img";
+      img.src = String(image);
+      bubble.appendChild(img);
+    }
+    const holder = document.createElement("div");
+    bubble.appendChild(holder);
     const chars = Array.from(s2);
     let i2 = 0;
     const step = Math.max(20, Number(tone.spd) || 62);
@@ -44506,7 +44618,7 @@ void main(void)\r
         return;
       }
       const ch = chars[i2++];
-      bubble.textContent += ch;
+      holder.textContent += ch;
       mouth = 0.14;
       if (ch.trim() && PAUSE_CH.indexOf(ch) < 0) {
         const f2 = tone.base * (1 + (Math.random() - 0.5) * 2 * (Number(tone.jit) / 100));
@@ -44522,7 +44634,10 @@ void main(void)\r
   window.addEventListener("message", (e2) => {
     const d2 = e2.data || {};
     if (d2.type === "dsh-live2d/manage") $2("drawer").classList.toggle("show");
-    if (d2.type === "dsh-live2d/say") say(String(d2.text || ""), d2.mood);
+    if (d2.type === "dsh-live2d/say") {
+      say(String(d2.text || ""), d2.mood, d2.image);
+      if (Array.isArray(d2.choices)) showChoices(d2.choices);
+    }
     if (d2.type === "dsh-live2d/mood") applyMood(String(d2.mood || "\u5E73\u9759"));
     if (d2.type === "dsh-live2d/tone" && d2.voice && typeof d2.voice === "object") Object.assign(tone, d2.voice);
   });
@@ -44550,8 +44665,8 @@ void main(void)\r
       }
     }
     setP("ParamBreath", (Math.sin(t2 * 1.1) + 1) / 2);
-    const gx = Math.max(-1, Math.min(1, gazeX));
-    const gy = Math.max(-1, Math.min(1, gazeY));
+    const gx = flag("gaze") ? Math.max(-1, Math.min(1, gazeX)) : 0;
+    const gy = flag("gaze") ? Math.max(-1, Math.min(1, gazeY)) : 0;
     setP("ParamEyeBallX", gx * 0.9);
     setP("ParamEyeBallY", -gy * 0.65);
     if (!window.__holdHead) {
@@ -44567,7 +44682,7 @@ void main(void)\r
     core.update();
   });
   function maybeMotion() {
-    if (!model || !motionGroups.length) return;
+    if (!model || !motionGroups.length || !flag("motion")) return;
     const now = performance.now();
     if (now < nextMotionAt) return;
     nextMotionAt = now + 12e3 + Math.random() * 16e3;
@@ -44578,6 +44693,7 @@ void main(void)\r
     }
   }
   window.addEventListener("resize", () => setTimeout(fit, 60));
+  loadSettings();
   refresh(true).then(() => {
     if (state.models.length) setTimeout(idleTick, 2500);
     setInterval(() => {
@@ -44658,6 +44774,7 @@ void main(void)\r
   $2("stage").addEventListener("pointerdown", (e2) => {
     if (!core) return;
     audioCtx();
+    if (!flag("poke")) return;
     const now = Date.now();
     if (now - pokeAt < 800) return;
     pokeAt = now;

package/lib/client.js

@@ -99,7 +99,13 @@
                 if (!frameWin) break;
                 try {
                   frameWin.postMessage(
-                    { type: 'dsh-live2d/say', text: items[i].text || '', mood: items[i].mood, image: items[i].image },
+                    {
+                      type: 'dsh-live2d/say',
+                      text: items[i].text || '',
+                      mood: items[i].mood,
+                      image: items[i].image,
+                      choices: items[i].choices,
+                    },
                     '*',
                   );
                 } catch {}
@@ -184,9 +190,12 @@
         })
           .then((r) => r.json())
           .then((d) => {
-            if (d.reply && frameWin) {
+            if ((d.reply || d.image) && frameWin) {
               try {
-                frameWin.postMessage({ type: 'dsh-live2d/say', text: d.reply }, '*');
+                frameWin.postMessage(
+                  { type: 'dsh-live2d/say', text: d.reply || '', image: d.image, choices: d.choices },
+                  '*',
+                );
               } catch {}
             }
           })
@@ -291,7 +300,13 @@
         (props && props.node && (props.node.role || props.node.kind)) ||
         (props && props.message && props.message.role) ||
         '';
-      const skip = /user|human|prompt/i.test(String(role));
+      let followOn = true;
+      try {
+        followOn = JSON.parse(localStorage.getItem('dsh-l2d-flags') || '{}').follow !== false;
+      } catch {
+        followOn = true;
+      }
+      const skip = !followOn || /user|human|prompt/i.test(String(role));
       react.useEffect(() => {
         if (skip) return;
         const el = anchor.current;

package/lib/index.js

@@ -9,6 +9,86 @@ const ROOT = join(homedir(), '.dsh', 'dsh-live2d');
 const MODELS = join(ROOT, 'models');
 const CONFIG = join(ROOT, 'config.json');
 const PREFIX = '/dsh-live2d';
+const MEMES_ROOT = join(homedir(), '.dsh', 'profiles', 'desktop', 'node_modules', 'dsh-meme', 'memes');
+
+/** 情绪 → 图库分类 */
+const MEME_TAGS = {
+  开心: ['happy', 'like'],
+  生气: ['angry', 'baka'],
+  委屈: ['sad', 'fool'],
+  无语: ['sigh', 'cpu', 'color'],
+  害羞: ['shy', 'see'],
+  困: ['sleep'],
+  惊讶: ['surprised'],
+  平静: ['daily', 'morning', 'meow'],
+};
+
+const DEFAULT_SETTINGS = {
+  proactive: true,
+  memes: true,
+  choices: true,
+  memory: true,
+  follow: true,
+  gaze: true,
+  poke: true,
+  motion: true,
+  sound: true,
+};
+
+function settingsOf(cfg) {
+  return { ...DEFAULT_SETTINGS, ...(cfg?.settings || {}) };
+}
+
+/** 从表情图库按情绪挑一张，返回相对路径 */
+function pickMeme(mood) {
+  try {
+    const tags = MEME_TAGS[mood] || MEME_TAGS['平静'];
+    const galleries = readdirSync(MEMES_ROOT, { withFileTypes: true }).filter((e) => e.isDirectory());
+    const pool = [];
+    for (const g of galleries) {
+      for (const tag of tags) {
+        const dir = join(MEMES_ROOT, g.name, 'memes', tag);
+        let files = [];
+        try {
+          files = readdirSync(dir);
+        } catch {
+          continue;
+        }
+        for (const f of files) {
+          if (/\.(png|jpe?g|webp|gif)$/i.test(f)) pool.push(g.name + '/memes/' + tag + '/' + f);
+        }
+      }
+    }
+    if (!pool.length) return null;
+    return pool[Math.floor(Math.random() * pool.length)];
+  } catch {
+    return null;
+  }
+}
+
+/** 从回复里摘出「||选项1|选项2」这种尾巴 */
+function splitChoices(raw) {
+  const m = /\|\|\s*([^|]+(?:\|[^|]+)*)\s*$/.exec(raw);
+  if (!m) return { text: raw.trim(), choices: [] };
+  const choices = m[1]
+    .split('|')
+    .map((s) => s.trim())
+    .filter(Boolean)
+    .slice(0, 4);
+  return { text: raw.slice(0, m.index).trim(), choices };
+}
+
+/** 粗判情绪，配图用 */
+function guessMood(text) {
+  const s = String(text || '');
+  if (/[气烦讨厌]/.test(s)) return '生气';
+  if (/[委屈难过哭]/.test(s)) return '委屈';
+  if (/[困睡熬夜]/.test(s)) return '困';
+  if (/[唔害羞]/.test(s)) return '害羞';
+  if (/[无语算了]/.test(s)) return '无语';
+  if (/[好谢喜欢]/.test(s)) return '开心';
+  return '平静';
+}
 
 /** 默认音色：一个字一声短音 */
 const DEFAULT_VOICE = { preset: 'soft', type: 'triangle', base: 400, jit: 10, dur: 60, vol: 32, spd: 62 };
@@ -96,7 +176,7 @@ let lastAutoAt = 0;
 
 async function maybeTalk(ctx) {
   const cfg = readConfig();
-  if (cfg.proactive === false) return;
+  if (!settingsOf(cfg).proactive) return;
   const now = Date.now();
   if (now - LAST_ACTIVE.at < IDLE_MS) return;
   if (now - lastAutoAt < IDLE_MS) return;
@@ -139,6 +219,7 @@ const MIME = {
   '.jpg': 'image/jpeg',
   '.jpeg': 'image/jpeg',
   '.webp': 'image/webp',
+  '.gif': 'image/gif',
   '.wasm': 'application/wasm',
   '.moc3': 'application/octet-stream',
 };
@@ -285,6 +366,12 @@ async function handle(req, res, ctx) {
     return file ? sendFile(res, file) : send(res, 403, 'forbidden');
   }
 
+  // 表情图库
+  if (path.startsWith('/media/')) {
+    const file = safeJoin(MEMES_ROOT, decodeURIComponent(path.slice('/media/'.length)));
+    return file ? sendFile(res, file) : send(res, 403, 'forbidden');
+  }
+
   // 模型文件
   if (path.startsWith('/model/')) {
     const rest = path.slice('/model/'.length);
@@ -308,7 +395,8 @@ async function handle(req, res, ctx) {
     const slot = modelSlot(ctx);
     if (!slot) return sendJson(res, 503, { error: '模型接口不可用' });
 
-    const hist = readChat(id);
+    const st = settingsOf(readConfig());
+    const hist = st.memory ? readChat(id) : [];
     const lines = hist
       .slice(-8)
       .map((m) => (m.role === 'user' ? '他：' : '你：') + String(m.text ?? ''))
@@ -319,6 +407,7 @@ async function handle(req, res, ctx) {
       lines ? '你们之前说的：\n' + lines : '',
       '他说：' + text,
       '回他一句。只输出这句话本身：一到三句，短，口语，像发消息。不要解释，不要加引号，不要旁白，不要括号里的动作。',
+      st.choices ? '如果你想让他挑，可以在最后另起一行写 ||选项一|选项二，最多三项。' : '',
     ]
       .filter(Boolean)
       .join('\n\n');
@@ -330,14 +419,18 @@ async function handle(req, res, ctx) {
       return sendJson(res, 502, { error: '生成失败：' + (e instanceof Error ? e.message : String(e)) });
     }
     LAST_ACTIVE.at = Date.now();
-    if (!reply) return sendJson(res, 200, { ok: true, reply: '', id });
-    if (reply.length > 240) reply = reply.slice(0, 240);
+    const parsed = splitChoices(reply || '');
+    let line = parsed.text;
+    const choices = st.choices ? parsed.choices : [];
+    if (line.length > 240) line = line.slice(0, 240);
+    if (!line && !choices.length) return sendJson(res, 200, { ok: true, reply: '', id });
+    const image = st.memes && guessMood(line) && Math.random() < 0.35 ? pickMeme(guessMood(line)) : null;
 
     writeChat(id, hist.concat([
       { role: 'user', text, at: Date.now() },
-      { role: 'assistant', text: reply, at: Date.now() },
+      { role: 'assistant', text: line, at: Date.now() },
     ]));
-    return sendJson(res, 200, { ok: true, reply, id });
+    return sendJson(res, 200, { ok: true, reply: line, choices, image: image || undefined, id });
   }
 
   // 人设卡
@@ -357,6 +450,24 @@ async function handle(req, res, ctx) {
     return sendJson(res, 200, { ok: true, persona: personaOf({ persona }) });
   }
 
+  // 开关：哪些功能开着
+  if (path === '/api/settings' && method === 'GET') {
+    return sendJson(res, 200, { settings: settingsOf(readConfig()) });
+  }
+
+  if (path === '/api/settings' && method === 'POST') {
+    const body = JSON.parse((await readBody(req)).toString('utf8') || '{}');
+    const cfg = readConfig();
+    const cur = settingsOf(cfg);
+    const next = { ...cur };
+    const patch = body && typeof body.settings === 'object' ? body.settings : body;
+    for (const k of Object.keys(DEFAULT_SETTINGS)) {
+      if (typeof patch?.[k] === 'boolean') next[k] = patch[k];
+    }
+    writeConfig({ ...cfg, settings: next });
+    return sendJson(res, 200, { ok: true, settings: next });
+  }
+
   // 出口：别的插件、im 机器人、脚本都能把她要说的话推进来
   if (path === '/api/push' && method === 'POST') {
     const body = JSON.parse((await readBody(req)).toString('utf8') || '{}');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-live2dwaifu",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "给 DSH 网页右下角请一个 Live2D 角色：会眨眼、会呼吸、视线跟着鼠标、点她有反应、说话时嘴动、心情变了眉毛跟着动。模型不用内置——谁装谁放自己的文件夹；支持自定义 .exp3.json 表情和 .motion3.json 动作，卡片能拖能缩，背景可换。",
   "type": "module",
   "main": "lib/index.js",