人物设定
diff --git a/src/settings.js b/src/settings.js
index 8a61348..58573b2 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -137,6 +137,7 @@ async function importCharacter(kind) {
if (result.error) throw new Error();
importToken = result.token;
document.querySelector("#import-image").src = result.preview;
+ document.querySelector("#import-image").hidden = result.type === "live2d";
document.querySelector("#import-image").alt = result.name;
document.querySelector("#import-name").textContent = result.name;
document.querySelector("#import-description").textContent = result.description;
@@ -440,10 +441,15 @@ function renderCharacterCards() {
card.classList.toggle("selected", character.id === selectedCharacterId);
card.setAttribute("aria-pressed", character.id === selectedCharacterId ? "true" : "false");
- const image = document.createElement("img");
- image.src = character.previewPath || character.spritePath || "";
- image.alt = character.name;
- image.loading = "lazy";
+ const image = document.createElement(character.type === "live2d" ? "span" : "img");
+ if (character.type === "live2d") {
+ image.className = "live2d-badge";
+ image.textContent = "Live2D";
+ } else {
+ image.src = character.previewPath || character.spritePath || "";
+ image.alt = character.name;
+ image.loading = "lazy";
+ }
const content = document.createElement("span");
const name = document.createElement("b");
@@ -453,7 +459,7 @@ function renderCharacterCards() {
description.className = "description";
description.textContent = character.description || text("settings.character.noDescription");
meta.className = "meta";
- meta.textContent = text("settings.character.meta", {
+ meta.textContent = character.type === "live2d" ? text("live2d.modelMeta", { count: character.expressions?.length || 0 }) : text("settings.character.meta", {
actions: character.stateCount || 0,
click: character.clickActionCount || 0,
});
@@ -472,6 +478,45 @@ function renderCharacterCards() {
characterGridEl.append(card);
}
document.querySelector("#remove-character").hidden = !activeCharacter.imported;
+ renderLive2D(activeCharacter);
+}
+
+function fillModelExpressions(select, names, value = -1) {
+ select.textContent = "";
+ [text("live2d.neutral"), ...names].forEach((name, index) => {
+ const option = document.createElement("option");
+ option.value = String(index - 1); option.textContent = name; select.append(option);
+ });
+ select.value = String(value);
+}
+
+function renderLive2D(character) {
+ document.querySelector("#live2d-panel").hidden = character.type !== "live2d";
+ if (character.type !== "live2d") return;
+ document.querySelector("#live2d-gaze").checked = config.persona?.live2dGaze !== false;
+ const names = character.expressions || [];
+ fillModelExpressions(document.querySelector("#live2d-expression"), names);
+ for (const mood of ["happy", "shy", "review", "failed"]) {
+ const index = config.persona?.live2dExpressions?.[mood] ?? -1;
+ fillModelExpressions(document.querySelector(`#live2d-${mood}`), names, index < names.length ? index : -1);
+ }
+ const motionSelect = document.querySelector("#live2d-motion");
+ motionSelect.textContent = "";
+ for (const [group, count] of Object.entries(character.motions || {})) {
+ for (let index = 0; index < count; index++) {
+ const option = document.createElement("option");
+ option.value = JSON.stringify({ group, index }); option.textContent = `${group} ${index + 1}`; motionSelect.append(option);
+ }
+ }
+ document.querySelector("#preview-motion").disabled = !motionSelect.options.length;
+ refreshRuntimeStatus();
+}
+
+async function refreshRuntimeStatus() {
+ try {
+ const state = await window.desktopPet.getLive2DRuntime();
+ document.querySelector("#live2d-runtime-status").textContent = text(state.ready ? "live2d.runtimeReady" : "live2d.runtimeNeeded");
+ } catch { document.querySelector("#live2d-runtime-status").textContent = text("live2d.runtimeFailed"); }
}
function renderConfig(preserveDraft = false) {
@@ -644,6 +689,9 @@ function readConfigForm(includeEmptyKey = false) {
speakingStyle: personaSpeakingStyleEl.value.trim(),
background: personaBackgroundEl.value.trim(),
extraRules: personaExtraRulesEl.value.trim(),
+ live2dGaze: document.querySelector("#live2d-gaze").checked,
+ live2dExpressions: Object.fromEntries(["happy", "shy", "review", "failed"].map((mood) =>
+ [mood, Number(document.querySelector(`#live2d-${mood}`).value || -1)])),
};
const affection = {
enabled: affectionEnabledEl.checked,
@@ -894,6 +942,27 @@ window.addEventListener("beforeunload", (event) => {
});
document.querySelector("#import-folder").addEventListener("click", () => importCharacter("folder"));
document.querySelector("#import-zip").addEventListener("click", () => importCharacter("zip"));
+document.querySelector("#import-live2d").addEventListener("click", () => importCharacter("live2d"));
+document.querySelector("#download-core").addEventListener("click", () => window.desktopPet.openLive2DDownload());
+document.querySelector("#import-core").addEventListener("click", async () => {
+ try {
+ const result = await window.desktopPet.importLive2DRuntime();
+ if (result.cancelled) return;
+ if (!result.ok) throw new Error();
+ await refreshRuntimeStatus();
+ } catch { document.querySelector("#live2d-runtime-status").textContent = text("live2d.runtimeFailed"); }
+});
+document.querySelector("#preview-expression").addEventListener("click", async () => {
+ try { await window.desktopPet.performModelAction({ type: "expression", index: Number(document.querySelector("#live2d-expression").value) }); }
+ catch { document.querySelector("#live2d-action-status").textContent = text("live2d.actionFailed"); }
+});
+document.querySelector("#preview-motion").addEventListener("click", async () => {
+ try {
+ const action = JSON.parse(document.querySelector("#live2d-motion").value);
+ const result = await window.desktopPet.performModelAction({ type: "motion", ...action });
+ document.querySelector("#live2d-action-status").textContent = result ? "" : text("live2d.actionFailed");
+ } catch { document.querySelector("#live2d-action-status").textContent = text("live2d.actionFailed"); }
+});
document.querySelector("#cancel-import").addEventListener("click", () => { importToken = null; document.querySelector("#import-preview").hidden = true; });
document.querySelector("#confirm-import").addEventListener("click", async () => {
try {
diff --git a/src/styles.css b/src/styles.css
index a418178..5d281a9 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -30,6 +30,34 @@ body {
cursor: grabbing;
}
+#model-stage {
+ position: absolute;
+ left: 50%;
+ bottom: 0;
+ transform: translateX(-50%);
+ width: var(--pet-width, 192px);
+ height: var(--pet-height, 208px);
+ pointer-events: none;
+}
+#model-stage iframe { width: 100%; height: 100%; border: 0; }
+#model-status {
+ position: absolute;
+ z-index: 2;
+ bottom: 55px;
+ left: 50%;
+ transform: translateX(-50%);
+ width: min(230px, calc(100% - 24px));
+ padding: 12px;
+ border: 1px solid #d8dfe0;
+ border-radius: 6px;
+ background: #fff;
+ color: #315d64;
+ font: 12px/1.5 system-ui, sans-serif;
+ pointer-events: auto;
+ cursor: pointer;
+}
+#model-status[hidden], #model-stage[hidden] { display: none; }
+
#speech-panel {
position: absolute;
top: 8px;
diff --git a/tests/live2d-boot.cjs b/tests/live2d-boot.cjs
new file mode 100644
index 0000000..e512973
--- /dev/null
+++ b/tests/live2d-boot.cjs
@@ -0,0 +1,4 @@
+const { app } = require("electron");
+if (!process.env.PET_TEST_DATA) throw new Error("Isolated test data required");
+app.setPath("userData", process.env.PET_TEST_DATA);
+require("../src/main");
diff --git a/tests/live2d-host.test.js b/tests/live2d-host.test.js
new file mode 100644
index 0000000..8d434ce
--- /dev/null
+++ b/tests/live2d-host.test.js
@@ -0,0 +1,45 @@
+const test = require("node:test");
+const assert = require("node:assert/strict");
+const fs = require("node:fs");
+const os = require("node:os");
+const path = require("node:path");
+const { createModelHandler, installCore, runtimeReady } = require("../src/live2d-host");
+
+test("model protocol serves only the active model's declared nonexecutable resources", async (t) => {
+ const userData = fs.mkdtempSync(path.join(os.tmpdir(), "pet-protocol-test-"));
+ t.after(() => fs.rmSync(userData, { recursive: true, force: true }));
+ const id = "imported-012345678901234567890123";
+ let active = { id, type: "live2d" };
+ const root = path.join(userData, "characters", id);
+ fs.mkdirSync(root, { recursive: true });
+ fs.writeFileSync(path.join(root, "character.json"), JSON.stringify({ resources: ["model.model3.json", "loader.js", "linked.json"] }));
+ fs.writeFileSync(path.join(root, "model.model3.json"), "{}");
+ fs.writeFileSync(path.join(root, "loader.js"), "alert('no')");
+ fs.writeFileSync(path.join(userData, "settings.json"), "private fixture");
+ fs.symlinkSync(path.join(userData, "settings.json"), path.join(root, "linked.json"));
+ const handler = createModelHandler({ userData, sourceDir: path.join(__dirname, "../src"), getActiveCharacter: () => active });
+ const request = (suffix, method = "GET") => handler({ url: `pet-live2d://viewer${suffix}`, method });
+ const valid = request(`/models/${id}/model.model3.json`);
+ assert.equal(valid.status, 200);
+ assert.equal(await valid.text(), "{}");
+ assert.match(valid.headers.get("Content-Security-Policy"), /connect-src 'self'/);
+ for (const suffix of [`/models/${id}/loader.js`, `/models/${id}/linked.json`, `/models/${id}/character.json`,
+ `/models/${id}/../settings.json`, `/models/${id}/%252e%252e/settings.json`, "/settings.json", "/index.html?token=private", "/core.js"]) {
+ const result = request(suffix);
+ assert.equal(result.status, 404, suffix);
+ assert.equal(await result.text(), "Unavailable");
+ }
+ assert.equal(request("/index.html", "POST").status, 404);
+ active = { id: "default", type: "sprite" };
+ assert.equal(request(`/models/${id}/model.model3.json`).status, 404);
+ assert.equal(request("/index.html").status, 200);
+});
+
+test("unknown runtime JavaScript is never installed or served", (t) => {
+ const root = fs.mkdtempSync(path.join(os.tmpdir(), "pet-core-test-"));
+ t.after(() => fs.rmSync(root, { recursive: true, force: true }));
+ const source = path.join(root, "anything.js");
+ fs.writeFileSync(source, "console.log('untrusted')");
+ assert.throws(() => installCore(source, root), /unrecognized_runtime/);
+ assert.equal(runtimeReady(root), false);
+});
diff --git a/tests/live2d-import.test.js b/tests/live2d-import.test.js
new file mode 100644
index 0000000..e5229b5
--- /dev/null
+++ b/tests/live2d-import.test.js
@@ -0,0 +1,74 @@
+const test = require("node:test");
+const assert = require("node:assert/strict");
+const fs = require("node:fs");
+const os = require("node:os");
+const path = require("node:path");
+const { zipSync } = require("fflate");
+const { readLive2DPack, installLive2DPack, resourceName } = require("../src/live2d-import");
+const png = Buffer.from("iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+aX1sAAAAASUVORK5CYII=", "base64");
+
+function fixture(t, change = () => {}) {
+ const root = fs.mkdtempSync(path.join(os.tmpdir(), "pet-model-test-"));
+ t.after(() => fs.rmSync(root, { recursive: true, force: true }));
+ const raw = { Version: 3, FileReferences: {
+ Moc: "sample.moc3", Textures: ["textures/skin.png"],
+ Expressions: [{ Name: "Smile", File: "smile.exp3.json" }],
+ Motions: { Idle: [{ File: "rest.motion3.json", Sound: "private.wav" }] },
+ }, Groups: [{ Target: "Parameter", Name: "LipSync", Ids: ["ParamMouthOpenY"] }], url: "https://example.invalid/tracker" };
+ change(raw);
+ const moc = Buffer.alloc(64); moc.write("MOC3");
+ const files = { "sample.model3.json": Buffer.from(JSON.stringify(raw)), "sample.moc3": moc,
+ "textures/skin.png": png, "smile.exp3.json": Buffer.from('{"Parameters":[]}'),
+ "rest.motion3.json": Buffer.from('{"Version":3,"Curves":[]}'), "private.wav": Buffer.from("unused") };
+ for (const [name, bytes] of Object.entries(files)) {
+ const target = path.join(root, name); fs.mkdirSync(path.dirname(target), { recursive: true }); fs.writeFileSync(target, bytes);
+ }
+ return { root, files };
+}
+
+test("Live2D folder, selected model and wrapped ZIP install the same bounded resource graph", (t) => {
+ const { root, files } = fixture(t);
+ const pack = readLive2DPack(root);
+ const zipPath = path.join(root, "model.zip");
+ fs.writeFileSync(zipPath, zipSync(Object.fromEntries(Object.entries(files).map(([key, bytes]) => [`Model/${key}`, bytes]))));
+ assert.deepEqual(readLive2DPack(zipPath), pack);
+ assert.deepEqual(readLive2DPack(path.join(root, "sample.model3.json")), pack);
+ assert.equal(pack.manifest.type, "live2d");
+ assert.deepEqual(pack.manifest.expressions, ["Smile"]);
+ const model = JSON.parse(pack.files["model.model3.json"]);
+ assert.equal(model.url, undefined);
+ assert.equal(model.FileReferences.Motions.Idle[0].Sound, undefined);
+ assert.equal(pack.files["private.wav"], undefined);
+ installLive2DPack(pack, path.join(root, "installed"));
+ installLive2DPack(pack, path.join(root, "installed"));
+ assert.ok(fs.existsSync(path.join(root, "installed", pack.manifest.id, "textures/skin.png")));
+});
+
+for (const unsafe of ["../key.json", "/key.json", "https://example.invalid/a.png", "file:///key.json", "a\\b.png", "a/%2e%2e/b.png", "a.png?token=1", "CON.png", "a./b.png", "a//b.png"]) {
+ test(`Live2D rejects nonportable or escaping resource ${unsafe}`, () => assert.throws(() => resourceName(unsafe)));
+}
+for (const [label, change] of [
+ ["remote texture", (raw) => { raw.FileReferences.Textures = ["https://example.invalid/x.png"]; }],
+ ["executable reference", (raw) => { raw.FileReferences.Moc = "loader.js"; }],
+ ["too many textures", (raw) => { raw.FileReferences.Textures = Array(9).fill("textures/skin.png"); }],
+ ["invalid version", (raw) => { raw.Version = 2; }],
+]) test(`Live2D rejects ${label}`, (t) => assert.throws(() => readLive2DPack(fixture(t, change).root)));
+
+test("Live2D rejects missing resources, symlinked directories and malformed PNGs", (t) => {
+ const { root } = fixture(t);
+ assert.throws(() => readLive2DPack(root, () => false), /image_decode_failed/);
+ fs.renameSync(path.join(root, "textures"), path.join(root, "real-textures"));
+ fs.symlinkSync(path.join(root, "real-textures"), path.join(root, "textures"), "junction");
+ assert.throws(() => readLive2DPack(root), /symlink/);
+ fs.unlinkSync(path.join(root, "textures"));
+ assert.throws(() => readLive2DPack(root));
+});
+
+test("Live2D ZIP rejects ambiguous models, traversal and case-colliding paths", (t) => {
+ const { root, files } = fixture(t);
+ const target = path.join(root, "bad.zip");
+ for (const extra of [{ "second.model3.json": files["sample.model3.json"] }, { "../secret.json": Buffer.from("{}") }, { "textures/SKIN.png": png }]) {
+ fs.writeFileSync(target, zipSync({ ...files, ...extra }));
+ assert.throws(() => readLive2DPack(target));
+ }
+});
diff --git a/tests/live2d-runtime.test.js b/tests/live2d-runtime.test.js
new file mode 100644
index 0000000..c4fc270
--- /dev/null
+++ b/tests/live2d-runtime.test.js
@@ -0,0 +1,41 @@
+const test = require("node:test");
+const assert = require("node:assert/strict");
+const fs = require("node:fs");
+const path = require("node:path");
+const { createHash } = require("node:crypto");
+const { loadMain } = require("./helpers");
+const { loadPet } = require("./pet-helpers");
+
+test("vendored display bundles match the pinned upstream releases and omit Core/models", () => {
+ for (const [name, hash] of Object.entries({
+ "pixi.min.js": "403f2f2ee8145fa17f60c5c89403056efe2680e5096ec2762036486914ed19c5",
+ "cubism4.min.js": "af1267e6d52759b245766c578d905bfa025b532d5c3cc727c370957c4409e21b",
+ })) {
+ assert.equal(createHash("sha256").update(fs.readFileSync(path.join(__dirname, "../src/live2d/vendor", name))).digest("hex"), hash);
+ }
+ assert.equal(fs.readdirSync(path.join(__dirname, "../src/live2d/vendor")).some((name) => /core|\.moc3$|\.png$/i.test(name)), false);
+});
+
+test("model expression mappings and gaze normalize without enabling affection or voice", () => {
+ const app = loadMain();
+ const state = app.run('normalizeSettings({persona:{live2dGaze:false,live2dExpressions:{happy:0,shy:63,review:64,failed:"1"}}})');
+ assert.equal(state.persona.live2dGaze, false);
+ assert.deepEqual(JSON.parse(JSON.stringify(state.persona.live2dExpressions)), { happy: 0, shy: 63, review: -1, failed: -1 });
+ assert.equal(state.affection.enabled, false);
+ assert.equal(state.tts.enabled, false);
+});
+
+test("Live2D click-only advances once without scheduling sprite actions or network calls", () => {
+ const pet = loadPet();
+ pet.run(`globalThis.modelCalls=[]; window.DesktopPetModel={apply(){},expression(){},stopMouth(){},busy(){},cycle(){modelCalls.push("cycle")}};
+ applyAppState({settings:{expressionMode:"clickOnly"},activeCharacter:{id:"imported-fixture",type:"live2d",states:{idle:{row:0,frames:1,interval:1000}}}});
+ handleClick(); handleDoubleClick(); handleLongPress(); scheduleIdleBehavior();`);
+ assert.deepEqual(JSON.parse(pet.run('JSON.stringify(modelCalls)')), ["cycle"]);
+});
+
+test("partner touch phrases are opt-in, local and leave affection unchanged", () => {
+ const pet = loadPet();
+ pet.run('settings.persona = {relationship:"partner"}; settings.userName="Alex"; respondToInteraction("head")');
+ assert.match(pet.run('speechBubble.textContent'), /Alex/);
+ assert.equal(pet.run('speechBubble.textContent.includes("pet.interaction.")'), false);
+});
diff --git a/tests/live2d-smoke.cjs b/tests/live2d-smoke.cjs
new file mode 100644
index 0000000..efd53af
--- /dev/null
+++ b/tests/live2d-smoke.cjs
@@ -0,0 +1,162 @@
+const { _electron } = require("playwright");
+const fs = require("node:fs");
+const os = require("node:os");
+const path = require("node:path");
+const assert = require("node:assert/strict");
+const http = require("node:http");
+const project = path.join(__dirname, "..");
+const data = fs.mkdtempSync(path.join(os.tmpdir(), "pet-live2d-smoke-"));
+const output = path.join(project, "out/playwright/live2d");
+const env = { ...process.env, PET_TEST_DATA: data };
+delete env.ELECTRON_RUN_AS_NODE;
+const modelPath = process.env.PET_MODEL_FIXTURE;
+const corePath = process.env.PET_CORE_FIXTURE;
+if (!modelPath || !corePath) throw new Error("PET_MODEL_FIXTURE and PET_CORE_FIXTURE required; no model is bundled");
+
+const wav = Buffer.alloc(44 + 8000 * 2 * 5);
+wav.write("RIFF"); wav.writeUInt32LE(wav.length - 8, 4); wav.write("WAVEfmt ", 8);
+wav.writeUInt32LE(16, 16); wav.writeUInt16LE(1, 20); wav.writeUInt16LE(1, 22);
+wav.writeUInt32LE(8000, 24); wav.writeUInt32LE(16000, 28); wav.writeUInt16LE(2, 32); wav.writeUInt16LE(16, 34);
+wav.write("data", 36); wav.writeUInt32LE(wav.length - 44, 40);
+for (let i = 0; i < (wav.length - 44) / 2; i++) wav.writeInt16LE(Math.round(Math.sin(i / 8000 * Math.PI * 440) * 6000), 44 + i * 2);
+let requests = 0;
+const server = http.createServer((req, res) => {
+ req.resume(); req.on("end", () => {
+ if (req.url === "/tts") { res.writeHead(200, { "content-type": "audio/wav" }); res.end(wav); }
+ else { requests++; res.writeHead(200, { "content-type": "application/json" }); res.end(JSON.stringify({ choices: [{ message: { content: "[expression:happy] It's good to see you." } }] })); }
+ });
+});
+
+async function run() {
+ await new Promise((resolve) => server.listen(0, "127.0.0.1", resolve));
+ const endpoint = `http://127.0.0.1:${server.address().port}`;
+ const app = await _electron.launch({ executablePath: require("electron"), args: [path.join(__dirname, "live2d-boot.cjs")], env });
+ const errors = [];
+ app.on("window", (page) => {
+ page.on("pageerror", (error) => errors.push(error.message));
+ page.on("console", (entry) => { if (entry.type() === "error") console.log("Renderer:", entry.text()); });
+ });
+ const find = async (file) => {
+ for (let i = 0; i < 150; i++) {
+ const page = app.windows().find((item) => item.url().endsWith(`/${file}`));
+ if (page) { await page.waitForLoadState(); return page; }
+ await new Promise((resolve) => setTimeout(resolve, 50));
+ }
+ throw new Error(`Window missing: ${file}`);
+ };
+ try {
+ fs.mkdirSync(output, { recursive: true });
+ const pet = await find("index.html");
+ const settings = await find("settings.html");
+ await app.evaluate(({ dialog }, file) => { dialog.showOpenDialog = async () => ({ canceled: false, filePaths: [file] }); }, modelPath);
+ await settings.locator("#import-live2d").click();
+ await settings.locator("#import-preview").waitFor({ state: "visible" });
+ await settings.locator("#confirm-import").click();
+ const id = await settings.evaluate(async () => (await window.desktopPet.getChatState()).characters.find((item) => item.type === "live2d").id);
+ await settings.evaluate((id) => window.desktopPet.saveChatConfig({ characterId: id, language: "en-US", persona: { setupDone: true } }), id);
+ await pet.waitForFunction(() => document.querySelector("#model-status").textContent.includes("not installed"));
+ await app.evaluate(({ dialog }, file) => { dialog.showOpenDialog = async () => ({ canceled: false, filePaths: [file] }); }, corePath);
+ await settings.locator("#import-core").click();
+ await pet.waitForFunction(() => document.querySelector("#model-status").hidden, { timeout: 30000 });
+ const frame = pet.frames().find((item) => item.url().startsWith("pet-live2d:"));
+ assert.ok(frame, "isolated model frame");
+ assert.equal(await frame.evaluate(() => typeof window.desktopPet), "undefined");
+ assert.equal(await frame.evaluate(() => typeof window.require), "undefined");
+ await frame.evaluate(() => {
+ const original = PIXI.live2d.Live2DModel.from;
+ PIXI.live2d.Live2DModel.from = async (...args) => { window.testModel = await original.apply(PIXI.live2d.Live2DModel, args); return window.testModel; };
+ });
+ await pet.evaluate((id) => {
+ document.querySelector("iframe").contentWindow.postMessage({ channel: "desktop-pet-model", type: "load", id }, "pet-live2d://viewer");
+ window.modelEvents = [];
+ window.addEventListener("message", (event) => { if (event.data?.channel === "desktop-pet-model") modelEvents.push(event.data); });
+ }, id);
+ await frame.waitForFunction(() => window.testModel?.internalModel);
+ await frame.evaluate(() => testModel.internalModel.on("beforeModelUpdate", () => {
+ const core = testModel.internalModel.coreModel;
+ window.testParameters = { eye: core.getParameterValueById("ParamEyeLOpen"), breath: core.getParameterValueById("ParamBreath"),
+ x: core.getParameterValueById("ParamAngleX"), mouth: core.getParameterValueById("ParamMouthOpenY"),
+ mouthForm: core.getParameterValueById("ParamMouthForm") };
+ window.testBlinkMinimum = Math.min(window.testBlinkMinimum ?? 1, testParameters.eye);
+ }));
+ const stats = () => frame.evaluate(() => {
+ const canvas = document.querySelector("canvas");
+ const gl = canvas.getContext("webgl2") || canvas.getContext("webgl");
+ const pixels = new Uint8Array(canvas.width * canvas.height * 4);
+ gl.readPixels(0, 0, canvas.width, canvas.height, gl.RGBA, gl.UNSIGNED_BYTE, pixels);
+ let visible = 0;
+ for (let i = 3; i < pixels.length; i += 4) if (pixels[i] > 10) visible++;
+ return { visible, ...window.testParameters };
+ });
+ await pet.waitForTimeout(500);
+ assert.ok((await stats()).visible > 1000);
+ const sampled = [];
+ for (let i = 0; i < 50; i++) { sampled.push(await stats()); await pet.waitForTimeout(100); }
+ console.log("Model parameters", { first: sampled[0], last: sampled.at(-1), eyeRange: [Math.min(...sampled.map((s) => s.eye)), Math.max(...sampled.map((s) => s.eye))], breathRange: [Math.min(...sampled.map((s) => s.breath)), Math.max(...sampled.map((s) => s.breath))] });
+ await frame.waitForFunction(() => window.testBlinkMinimum < 0.2, null, { timeout: 12000 });
+ assert.ok(Math.max(...sampled.map((s) => s.breath)) - Math.min(...sampled.map((s) => s.breath)) > 0.1, "native breathing");
+ await pet.evaluate(() => window.desktopPet.setSettings({ expressionMode: "clickOnly", scale: 2 }));
+ await pet.waitForTimeout(600);
+ const before = await pet.evaluate(() => modelEvents.filter((item) => item.type === "expression").length);
+ await pet.locator("#pet").click();
+ await pet.waitForTimeout(800);
+ const after = await pet.evaluate(() => modelEvents.filter((item) => item.type === "expression"));
+ assert.equal(after.length, before + 1, "one click, one expression");
+ assert.equal(after.at(-1).index, 0);
+ await pet.waitForTimeout(1200);
+ assert.equal(await pet.evaluate(() => modelEvents.filter((item) => item.type === "expression").length), after.length);
+ await pet.screenshot({ path: path.join(output, "haru-manual-200.png") });
+ await pet.evaluate(() => window.desktopPet.setSettings({ expressionMode: "automatic", scale: 0.75 }));
+ await pet.waitForTimeout(600);
+ const bounds = await pet.locator("#pet").boundingBox();
+ await pet.mouse.move(bounds.x + bounds.width * 0.95, bounds.y + bounds.height * 0.25);
+ await pet.waitForTimeout(800);
+ assert.ok(Math.abs((await stats()).x) > 0.5, "gaze follows pointer");
+ assert.ok(await frame.evaluate(() => testModel.internalModel.focusController.x > 0.1), "pointer input reaches the gaze controller");
+ assert.ok((await stats()).visible > 1000);
+ await pet.screenshot({ path: path.join(output, "haru-automatic-75.png") });
+ await settings.locator("#live2d-expression").selectOption("2");
+ await settings.locator("#preview-expression").click();
+ await pet.waitForFunction(() => modelEvents.filter((item) => item.type === "expression").at(-1)?.index === 2);
+ await frame.waitForFunction(() => window.testParameters.mouthForm < -0.5);
+ await settings.screenshot({ path: path.join(output, "settings-live2d.png") });
+ await settings.locator("#preview-motion").click();
+ await pet.waitForFunction(() => modelEvents.some((item) => item.type === "motion"));
+ await settings.locator("#live2d-happy").selectOption("1");
+ await settings.locator("#save-settings").click();
+ await pet.waitForFunction(() => settings.persona.live2dExpressions.happy === 1);
+ await settings.evaluate((endpoint) => window.desktopPet.saveChatConfig({
+ assistant: { baseUrl: `${endpoint}/v1`, model: "local-test", stream: false },
+ tts: { enabled: true, provider: "custom", endpoint: `${endpoint}/tts`, customBodyTemplate: '{"text":"{{text}}"}' },
+ persona: { relationship: "partner", userName: "Alex" },
+ }), endpoint);
+ await pet.locator("#talk").click();
+ const quick = await find("quick-chat.html");
+ await quick.locator("#quick-input").fill("Stay with me a little.");
+ await quick.locator("#send").click();
+ await pet.waitForFunction(() => speechActive && activeAudio && !activeAudio.paused);
+ await pet.waitForFunction(() => modelEvents.filter((item) => item.type === "expression").at(-1)?.index === 1);
+ await frame.waitForFunction(() => window.testParameters.mouth > 0.3);
+ await pet.waitForFunction(async () => (await window.desktopPet.getChatState()).voice.status === "playing");
+ await pet.screenshot({ path: path.join(output, "haru-speaking.png") });
+ await pet.locator("#voice-toggle").click();
+ await frame.waitForFunction(() => window.testParameters.mouth < 0.03);
+ assert.equal(requests, 1);
+ assert.equal(await pet.evaluate(() => {
+ const bubble = document.querySelector("#speech-panel").getBoundingClientRect();
+ const model = document.querySelector("#model-stage").getBoundingClientRect();
+ return bubble.bottom <= model.top;
+ }), true, "reply does not cover model");
+ await pet.evaluate(() => window.desktopPet.setSettings({ characterId: "luna" }));
+ await pet.waitForFunction(() => !document.querySelector("iframe") && spriteImage && character.id === "luna");
+ assert.equal(await pet.evaluate(() => ctx.getImageData(0, 0, 768, 832).data.some((value, index) => index % 4 === 3 && value > 0)), true);
+ assert.deepEqual(errors, []);
+ console.log("PASS: native Haru loading, isolated frame, blink, breath, gaze, manual expression, motion preview, chat expression mapping, audio-driven mouth/stop, 75%/200% scaling, sprite fallback; isolated local LLM/TTS only.");
+ } finally {
+ await app.evaluate(({ app }) => app.exit(0));
+ await app.close();
+ fs.rmSync(data, { recursive: true, force: true });
+ server.closeAllConnections(); server.close();
+ }
+}
+run().catch((error) => { console.error(error); server.closeAllConnections(); server.close(); process.exitCode = 1; });
diff --git a/tests/network-safety.test.js b/tests/network-safety.test.js
new file mode 100644
index 0000000..fc48af7
--- /dev/null
+++ b/tests/network-safety.test.js
@@ -0,0 +1,70 @@
+const test = require("node:test");
+const assert = require("node:assert/strict");
+const { readResponseBytes, readResponseJson, returnedAudioUrl, audioDataUrl, redactServiceText } = require("../src/network-safety");
+const { loadMain } = require("./helpers");
+const { readChatResponse } = require("../src/chat-response");
+
+test("network readers reject both declared and streamed oversized bodies and cancel the source", async () => {
+ let cancelled = 0;
+ const response = () => new Response(new ReadableStream({
+ pull(controller) { controller.enqueue(new Uint8Array(16)); },
+ cancel() { cancelled++; },
+ }));
+ await assert.rejects(readResponseBytes(response(), 8), /response_too_large/);
+ const declared = response(); declared.headers.set("content-length", "99999");
+ await assert.rejects(readResponseBytes(declared, 8), /response_too_large/);
+ assert.equal(cancelled, 2);
+ assert.deepEqual(await readResponseJson(Response.json({ ok: true }), 100), { ok: true });
+});
+
+test("external TTS cannot request a loopback destination or follow a redirect", async () => {
+ const requests = [];
+ const app = loadMain({ fetch: async (url, options) => {
+ requests.push({ url, options });
+ return Response.json({ audio_url: "http://127.0.0.1:9880/private" });
+ } });
+ const result = await app.run('synthesizeSpeechWithSettings("hello", {tts:{enabled:true,provider:"custom",endpoint:"https://voice.example/tts",customBodyTemplate:"{}"}})');
+ assert.equal(result.ok, false);
+ assert.equal(requests.length, 1);
+ assert.equal(requests[0].options.redirect, "error");
+});
+
+test("chat JSON and SSE enforce a byte budget before accepting model output", async () => {
+ await assert.rejects(readChatResponse(new Response("{}", { headers: { "content-type": "application/json", "content-length": "999999999" } })), /response_too_large/);
+ const comment = ":" + "x".repeat(2100000) + "\n\n";
+ await assert.rejects(readChatResponse(new Response(comment, { headers: { "content-type": "text/event-stream" } })), /response_too_large/);
+});
+
+test("provider diagnostics cannot echo saved or unsaved test credentials into chat history", async () => {
+ const app = loadMain({ fetch: async () => Response.json({ error: { message: "Denied candidate-test-token and saved-test-token" } }, { status: 401 }) });
+ app.run('settings = normalizeSettings({assistant:{baseUrl:"https://llm.example/v1",model:"fixture",apiKey:"saved-test-token"}})');
+ const result = await app.run('testAssistantConnection(null,{assistant:{apiKey:"candidate-test-token"}})');
+ assert.equal(JSON.stringify(result).includes("candidate-test-token"), false);
+ await app.run('sendChatMessage(null,"Test")');
+ assert.equal(app.run('JSON.stringify(chatHistory)').includes("saved-test-token"), false);
+});
+
+test("returned TTS URLs stay on the exact user-configured origin", () => {
+ assert.equal(returnedAudioUrl("https://voice.example/audio/1.wav", "https://voice.example/tts"), "https://voice.example/audio/1.wav");
+ assert.equal(returnedAudioUrl("http://127.0.0.1:9880/audio.wav", "http://127.0.0.1:9880/tts"), "http://127.0.0.1:9880/audio.wav");
+ for (const target of ["http://127.0.0.1:9880/audio.wav", "http://169.254.169.254/latest", "https://cdn.example/audio.wav",
+ "https://voice.example:8443/audio.wav", "http://voice.example/audio.wav", "https://user:pass@voice.example/audio.wav", "file:///secret"]) {
+ assert.throws(() => returnedAudioUrl(target, "https://voice.example/tts"), /audio_origin_not_allowed/);
+ }
+});
+
+test("TTS data responses accept audio only", () => {
+ assert.equal(audioDataUrl("data:audio/wav;base64,AQID"), "data:audio/wav;base64,AQID");
+ for (const value of ["data:text/html;base64,AQID", "data:audio/wav,hello", "https://example.invalid/audio.wav", "data:audio/wav;base64,?"]) {
+ assert.throws(() => audioDataUrl(value), /invalid_audio/);
+ }
+});
+
+test("service diagnostics redact current, candidate and URL-encoded credentials before display", () => {
+ const token = "test-only-token/with+symbols";
+ const result = redactServiceText(`Denied ${token}; ${encodeURIComponent(token)}; Bearer example-secret`, [token]);
+ assert.equal(result.includes(token), false);
+ assert.equal(result.includes(encodeURIComponent(token)), false);
+ assert.equal(result.includes("example-secret"), false);
+ assert.equal(redactServiceText("Unknown model"), "Unknown model");
+});
diff --git a/tests/tts.test.js b/tests/tts.test.js
index 2d1fb87..1d57c05 100644
--- a/tests/tts.test.js
+++ b/tests/tts.test.js
@@ -10,10 +10,11 @@ test("voice URL download shares the synthesis timeout without forwarding credent
fetch: async (url, options) => {
requests.push({ url, options });
if (requests.length === 1) {
- return new Response(JSON.stringify({ audio_url: "https://audio.example/clip.wav" }), { headers: { "content-type": "application/json" } });
+ return new Response(JSON.stringify({ audio_url: "https://voice.example/clip.wav" }), { headers: { "content-type": "application/json" } });
}
assert.equal(options.signal, requests[0].options.signal);
assert.equal(options.headers?.Authorization, undefined);
+ assert.equal(options.redirect, "error");
const waiting = new Promise((_resolve, reject) => {
options.signal.addEventListener("abort", () => reject(new DOMException("Aborted", "AbortError")), { once: true });
});
diff --git a/tests/voice-controls.test.js b/tests/voice-controls.test.js
index 839da5f..c2172ba 100644
--- a/tests/voice-controls.test.js
+++ b/tests/voice-controls.test.js
@@ -65,7 +65,7 @@ test("a cancelled audio URL download also aborts without leaking the voice crede
const requests = [];
const app = voiceApp({ fetch: async (url, options) => {
requests.push({ url, options });
- if (requests.length === 1) return Response.json({ audio_url: "https://audio.example/file.wav" });
+ if (requests.length === 1) return Response.json({ audio_url: "https://voice.example/file.wav" });
return new Promise((_resolve, reject) => options.signal.addEventListener("abort", () => reject(new DOMException("Aborted", "AbortError"))));
} });
app.run('settings.tts.apiKey = "test-only-key"; beginSpeech(petEvent,speechGeneration)');
From 71d216cf16ca3a695a082d635dca14a53a545016 Mon Sep 17 00:00:00 2001
From: TonyNa-code <278977922+TonyNa-code@users.noreply.github.com>
Date: Mon, 26 Oct 2026 16:12:44 +0800
Subject: [PATCH 2/7] Add configurable Live2D reply gestures and strengthen
runtime checks
---
docs/live2d.md | 6 +++
src/i18n.js | 6 +++
src/live2d-bridge.js | 1 +
src/live2d/rig.js | 3 +-
src/live2d/viewer.js | 20 +++++++---
src/main.js | 15 ++++++++
src/renderer.js | 6 +++
src/settings.html | 7 ++++
src/settings.js | 32 ++++++++++++----
tests/live2d-runtime.test.js | 30 +++++++++++++++
tests/live2d-smoke.cjs | 16 ++++++--
tests/live2d-viewer.test.js | 72 ++++++++++++++++++++++++++++++++++++
tests/poll.cjs | 10 +++++
tests/poll.test.js | 15 ++++++++
14 files changed, 223 insertions(+), 16 deletions(-)
create mode 100644 tests/live2d-viewer.test.js
create mode 100644 tests/poll.cjs
create mode 100644 tests/poll.test.js
diff --git a/docs/live2d.md b/docs/live2d.md
index ca7d4e1..f163c5e 100644
--- a/docs/live2d.md
+++ b/docs/live2d.md
@@ -28,6 +28,8 @@ The speech icon opens a small input beside the character. Enter sends your messa
In automatic mode, a Live2D character gently centers its gaze while you type or wait for a reply. Its own blink and breath continue; random idle gestures wait until the conversation settles. Click expression mode keeps the expression you selected. External voice playback has a compact stop/replay control beside the character.
+Under **Reply gestures**, you can also assign a native motion to each reply mood. All start with **No gesture**. A completed reply can play one selected motion, not one per streamed text chunk. Gestures are spaced apart during quick exchanges, and a new message interrupts the previous gesture. Starting voice playback does not cancel the current reply gesture. Click expression mode disables reply gestures.
+
### Compatibility
- Cubism 3/4 `.model3.json` exports with `.moc3`, PNG textures, `.exp3.json`, `.motion3.json`, physics and pose files.
@@ -64,6 +66,8 @@ Chat and spoken text still go to the services you explicitly configure. Returned
点人物旁的对话图标即可展开小输入框，按回车发送后自动收起，回复显示在人物上方。按 Esc 可收起并保留草稿；点书本图标可看完整聊天记录，两处共用草稿。请求失败时也会保留未发送的文字。自动模式下，输入和等待回复时人物会轻轻看向你，保持眨眼、呼吸，暂缓待机动作。点击模式不改变手动选中的表情。朗读的停止、重播按钮在人物身旁。
+在 **回复动作** 中可以为各个情绪选择模型自带动作，默认均不播放。一条完整回复最多触发一次，逐字输出时不会重复触发；连续短回复也不会让动作连着播放。开始朗读会保留当前回复动作，发出新消息则会中止上一动作。点击表情模式不播放回复动作。
+
支持 Cubism 3/4 导出的模型、PNG、表情、动作、物理和姿态文件。不能把一张立绘自动变成 Live2D，也不支持 Cubism 2、编辑工程 `.cmo3`、PSD、VRM 或 Cubism 5.3 的扩展混合模式。单包上限 128 MiB、256 文件、8 张纹理，单张最长边 8192，纹理总像素不超过 6400 万，单个 JSON 不超过 2 MiB。
测试使用的是官方 Haru 示例，版权属于 Live2D Inc.，不是 MIT 角色素材；下载来源和许可见上方链接。Core 也不是开源库。允许用户加载任意模型的应用涉及额外发布条款，完成核实前不会将本功能发布为正式安装包。
@@ -86,6 +90,8 @@ Chat and spoken text still go to the services you explicitly configure. Returned
キャラクター横の会話アイコンで小さな入力欄が開きます。Enter で送信すると閉じ、返答はキャラクターのすぐ上に表示されます。Esc で閉じても下書きは残ります。本のアイコンから開く会話履歴とも下書きを共有します。送信失敗時も入力内容は保持されます。自動モードでは入力中や返答待ちに視線をそっと中央に戻し、まばたきと呼吸を続けます。クリック表情モードでは選んだ表情を保ちます。音声の停止・再生はキャラクター横の小さなボタンで操作できます。
+**返答時のモーション** では、感情ごとにモデルの動作を選べます。初期値はすべて「モーションなし」です。一つの返答につき一度だけ再生し、文字の逐次表示や短い返答の連続で動作を繰り返しません。読み上げ開始時も動作を保ち、新しいメッセージで前の動作を中断します。クリック表情モードでは再生しません。
+
Cubism 3/4 の書き出しモデルに対応します。Cubism 2、`.cmo3` 編集ファイル、PSD、VRM、Cubism 5.3 の拡張ブレンドは非対応です。128 MiB・256 ファイル・PNG 8 枚まで、各辺 8192 ピクセル以下、合計 6400 万ピクセル以下、JSON は一つ 2 MiB 以下です。
テストには Live2D Inc. の公式 Haru を使用しました。MIT 素材ではなく、上記の専用利用規約が適用されます。Core はプロプライエタリです。ユーザーモデルの読み込みに関する公開条件を確認するまでは、本機能を正式リリースに含めません。
diff --git a/src/i18n.js b/src/i18n.js
index 5fdf993..cafc179 100644
--- a/src/i18n.js
+++ b/src/i18n.js
@@ -32,6 +32,8 @@
"live2d.previewExpression": "预览表情",
"live2d.previewMotion": "预览动作",
"live2d.replyExpressions": "回复表情",
+ "live2d.replyMotions": "回复动作",
+ "live2d.noMotion": "不播放动作",
"live2d.happy": "开心",
"live2d.shy": "害羞",
"live2d.review": "思考",
@@ -405,6 +407,8 @@
"live2d.previewExpression": "Preview expression",
"live2d.previewMotion": "Preview motion",
"live2d.replyExpressions": "Reply expressions",
+ "live2d.replyMotions": "Reply gestures",
+ "live2d.noMotion": "No gesture",
"live2d.happy": "Happy",
"live2d.shy": "Shy",
"live2d.review": "Thoughtful",
@@ -778,6 +782,8 @@
"live2d.previewExpression": "表情を試す",
"live2d.previewMotion": "モーションを試す",
"live2d.replyExpressions": "返答時の表情",
+ "live2d.replyMotions": "返答時のモーション",
+ "live2d.noMotion": "モーションなし",
"live2d.happy": "うれしい",
"live2d.shy": "照れる",
"live2d.review": "考え中",
diff --git a/src/live2d-bridge.js b/src/live2d-bridge.js
index e289b8f..a723398 100644
--- a/src/live2d-bridge.js
+++ b/src/live2d-bridge.js
@@ -111,6 +111,7 @@
cycle: () => { if (loaded) send("cycle"); },
expression: (index) => { desiredExpression = index; if (loaded) send("expression", { index }); },
touch: () => { if (loaded) send("touch"); },
+ replyMotion: (motion) => { if (loaded) send("reply-motion", { group: motion.group, index: motion.index }); },
presence: (state) => { presence = state; if (loaded) send("presence", { state }); },
gaze: (x, y) => send("gaze", { x, y }),
busy: (busy) => { if (current) { current.busy = busy; send("options", current); } },
diff --git a/src/live2d/rig.js b/src/live2d/rig.js
index 7676db1..d8968a4 100644
--- a/src/live2d/rig.js
+++ b/src/live2d/rig.js
@@ -1,6 +1,7 @@
((root) => {
const aliases = { ParamAngleX: "PARAM_ANGLE_X", ParamAngleY: "PARAM_ANGLE_Y", ParamAngleZ: "PARAM_ANGLE_Z",
- ParamEyeBallX: "PARAM_EYE_BALL_X", ParamEyeBallY: "PARAM_EYE_BALL_Y", ParamBodyAngleX: "PARAM_BODY_ANGLE_X", ParamBreath: "PARAM_BREATH" };
+ ParamEyeBallX: "PARAM_EYE_BALL_X", ParamEyeBallY: "PARAM_EYE_BALL_Y", ParamBodyAngleX: "PARAM_BODY_ANGLE_X", ParamBreath: "PARAM_BREATH",
+ ParamMouthOpenY: "PARAM_MOUTH_OPEN_Y" };
function configure(internal) {
const ids = new Set(internal.coreModel.getModel().parameters.ids);
const resolve = (name) => ids.has(name) ? name : ids.has(aliases[name]) ? aliases[name] : name;
diff --git a/src/live2d/viewer.js b/src/live2d/viewer.js
index c2961e1..2f7061c 100644
--- a/src/live2d/viewer.js
+++ b/src/live2d/viewer.js
@@ -19,6 +19,8 @@
let mouthAt = 0;
let pettingUntil = 0;
let nextMotionAt = 0;
+ let replyMotionActive = false;
+ let replyMotionAt = -Infinity;
let metadata = { expressions: [], motions: {} };
function notify(type, extra = {}) { parent.postMessage({ channel: CHANNEL, type, ...extra }, "*"); }
@@ -36,6 +38,7 @@
function stopMotions() {
if (!model) return;
+ replyMotionActive = false;
model.internalModel.motionManager.stopAllMotions();
// Breathing and blinking remain active; large idle motions are explicitly paced below.
model.internalModel.motionManager.groups.idle = "__desktop_pet_no_automatic_motion__";
@@ -57,13 +60,15 @@
}).catch(() => notify("action-error"));
}
- function motion(group, index = 0) {
- if (!automatic || !model || !Object.hasOwn(metadata.motions, group)) return;
- if (!Number.isInteger(index) || index < 0 || index >= metadata.motions[group]) return;
+ function motion(group, index = 0, reply = false) {
+ if (!automatic || !model || !Object.hasOwn(metadata.motions, group)) return false;
+ if (!Number.isInteger(index) || index < 0 || index >= metadata.motions[group]) return false;
+ replyMotionActive = reply;
const target = model;
target.motion(group, index, 3).then((started) => { if (target === model) notify(started ? "motion" : "action-error", { group, index }); })
.catch(() => notify("action-error"));
nextMotionAt = performance.now() + 45000;
+ return true;
}
async function load(data) {
@@ -77,6 +82,7 @@
artBounds = null;
expressionIndex = -1;
mouthTarget = mouthValue = 0;
+ replyMotionAt = -Infinity;
model?.destroy({ children: true, texture: true, baseTexture: true });
model = null;
try {
@@ -105,7 +111,8 @@
artBounds = window.DesktopPetRig.measure(application, model);
fit();
nextMotionAt = performance.now() + 35000;
- const lips = descriptor.Groups?.find((group) => group.Name === "LipSync")?.Ids || ["ParamMouthOpenY"];
+ const lips = (descriptor.Groups?.find((group) => group.Name === "LipSync")?.Ids || []).filter(id => ids.has(id));
+ if (!lips.length && ids.has(resolve("ParamMouthOpenY"))) lips.push(resolve("ParamMouthOpenY"));
internal.on("beforeModelUpdate", () => {
const now = performance.now();
if (now - mouthAt > 300) mouthTarget = 0;
@@ -150,7 +157,7 @@
} else if (data.type === "presence" && ["idle", "attentive", "thinking", "speaking"].includes(data.state)) {
if (presence === data.state) return;
presence = data.state;
- if (presence !== "idle") stopMotions();
+ if (presence !== "idle" && !(presence === "speaking" && replyMotionActive)) stopMotions();
nextMotionAt = performance.now() + 45000;
if (automatic && gazeEnabled) model.internalModel.focusController.focus(0, presence === "idle" ? 0 : 0.08);
} else if (data.type === "gaze") {
@@ -164,6 +171,9 @@
expression(data.index);
} else if (data.type === "motion") {
motion(data.group, data.index);
+ } else if (data.type === "reply-motion") {
+ const now = performance.now();
+ if (now - replyMotionAt >= 12000 && motion(data.group, data.index, true)) replyMotionAt = now;
} else if (data.type === "touch" && automatic && !busy) {
pettingUntil = performance.now() + 1200;
const group = Object.keys(metadata.motions).find((key) => /^(tapbody|tap_body|touch|tap)$/i.test(key));
diff --git a/src/main.js b/src/main.js
index 6390ea1..fe33106 100644
--- a/src/main.js
+++ b/src/main.js
@@ -737,6 +737,12 @@ function normalizePersonaSettings(rawPersona = {}) {
const value = raw.live2dExpressions?.[key];
return [key, Number.isInteger(value) && value >= 0 && value < 64 ? value : -1];
})),
+ live2dMotions: Object.fromEntries(["happy", "shy", "review", "failed"].map((key) => {
+ const value = raw.live2dMotions?.[key];
+ const valid = value && typeof value.group === "string" && value.group.length <= 80
+ && !/[\u0000-\u001f\u007f]/.test(value.group) && Number.isInteger(value.index) && value.index >= 0 && value.index < 256;
+ return [key, valid ? { group: value.group, index: value.index } : null];
+ })),
};
}
@@ -1689,6 +1695,7 @@ async function sendChatMessage(_event, rawText, context) {
sendPetMessage(result.reply, result.action, {
...presentation,
speak: result.ok,
+ replyMotion: result.ok ? replyMotionFor(result.action) : null,
bubbleText: bubblePreview(result.reply),
});
if (result.ok) recordChatTimeProgress();
@@ -1703,6 +1710,14 @@ async function sendChatMessage(_event, rawText, context) {
}
}
+function replyMotionFor(action) {
+ const pack = getCharacterPack();
+ const motion = settings.persona?.live2dMotions?.[action];
+ if (settings.expressionMode !== "automatic" || pack?.type !== "live2d" || !motion
+ || !Object.hasOwn(pack.motions, motion.group) || motion.index >= pack.motions[motion.group]) return null;
+ return { group: motion.group, index: motion.index };
+}
+
function broadcastChatState() {
for (const window of [mainWindow, chatWindow, quickChatWindow]) {
if (window && !window.isDestroyed()) window.webContents.send("chat-state-updated", chatState());
diff --git a/src/renderer.js b/src/renderer.js
index 1b4973f..b44db3c 100644
--- a/src/renderer.js
+++ b/src/renderer.js
@@ -81,6 +81,7 @@ let speechActive = false;
let speechWatchdog;
let conversationActive = false;
let conversationAction = "idle";
+let lastReplyGestureId = null;
let queuedNotice = null;
let bubbleVisible = false;
let interactionReadyAt = 0;
@@ -729,6 +730,11 @@ function handlePetMessage(message = {}) {
if (settings.expressionMode === "automatic" && !dragStart) {
if (isChat) setState(conversationAction);
else if (action && character.states[action]) playTemporary(action, Math.max(temporaryDuration(action), 1200));
+ if (isChat && character.type === "live2d" && !message.streaming && message.replyMotion
+ && Number.isSafeInteger(message.presentationId) && message.presentationId !== lastReplyGestureId) {
+ lastReplyGestureId = message.presentationId;
+ window.DesktopPetModel?.replyMotion(message.replyMotion);
+ }
}
if (message.notification) window.desktopPet.presentNotification?.(message.notification);
}
diff --git a/src/settings.html b/src/settings.html
index d27f15f..d3d87cc 100644
--- a/src/settings.html
+++ b/src/settings.html
@@ -83,6 +83,13 @@ 回复表情
+ 回复动作
+
+
+
+
+
+