Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
de742f4079 | ||
|
|
f54499ee5c | ||
|
|
a111b95cef | ||
|
|
f4d3e2fc3b | ||
|
|
fa11314b23 | ||
|
|
c9b14e0726 |
@@ -10,7 +10,7 @@ If the player asks to find or approach someone and no NPC is present, the direct
|
|||||||
|
|
||||||
The separate `/admin` route provides an authenticated operations view for player search/profile/trace, YAML prompt assets, generated Luau rules with validation results, runtime debug logging, and the append-only audit log. All privileged data comes from the Rust `/api/admin/...` API; the browser never connects directly to PostgreSQL. Backend endpoints require `accounts.is_admin=true`. The Driftloggar view lets an administrator switch `debug=true` on or off without restarting pods; the setting is stored in PostgreSQL and propagated to running replicas. Verbose pod logs include request, AI-call, validation, and commit metadata but never raw player text, prompts, model responses, sessions, or secrets. Full protected prompt/provider exchanges remain in the audited player trace.
|
The separate `/admin` route provides an authenticated operations view for player search/profile/trace, YAML prompt assets, generated Luau rules with validation results, runtime debug logging, and the append-only audit log. All privileged data comes from the Rust `/api/admin/...` API; the browser never connects directly to PostgreSQL. Backend endpoints require `accounts.is_admin=true`. The Driftloggar view lets an administrator switch `debug=true` on or off without restarting pods; the setting is stored in PostgreSQL and propagated to running replicas. Verbose pod logs include request, AI-call, validation, and commit metadata but never raw player text, prompts, model responses, sessions, or secrets. Full protected prompt/provider exchanges remain in the audited player trace.
|
||||||
|
|
||||||
The game is text- and dialogue-based and uses no images. Place descriptions include sound, smell, air/temperature, touch/surface, and spatial-orientation cues. Visible details may also be described in words, but are never required to understand the scene or play. The transcript is screen-reader announced, and Enter submits the input while Shift+Enter inserts a newline; no separate send button is required.
|
The game is text- and dialogue-based and uses no images. Place descriptions include sound, smell, air/temperature, touch/surface, and spatial-orientation cues. Visible details may also be described in words, but are never required to understand the scene or play. The transcript is screen-reader announced. A clearly labeled **Skicka** button beside the microphone submits typed text; Enter also submits while Shift+Enter inserts a newline. Typed text, speech transcriptions, and the send button all use the same submission flow.
|
||||||
|
|
||||||
Player-facing speech uses Piper TTS in WebAssembly in the browser after audio is activated by a user gesture. It reads game dialogue, onboarding, account responses, character and world creation, gameplay replies, in-game errors, and microphone disclosures; the `/admin` route is excluded. The audio is decoded and played through the Web Audio API, independently of `speechSynthesis`. The first unauthenticated visit keeps the introduction visible and it can be started with `Läs introduktionen`. New game replies are read automatically and the transcript remains available to screen readers and as text. Returning players hear the latest saved game reply when they reopen the game. The player can change speaking rate; narrator pitch is neutral and character pitch is varied consistently by voice identity. These preferences are stored in browser `localStorage`. If WebAssembly, model loading, or audio playback fails, the same content remains available as text and the dialogue offers a retry.
|
Player-facing speech uses Piper TTS in WebAssembly in the browser after audio is activated by a user gesture. It reads game dialogue, onboarding, account responses, character and world creation, gameplay replies, in-game errors, and microphone disclosures; the `/admin` route is excluded. The audio is decoded and played through the Web Audio API, independently of `speechSynthesis`. The first unauthenticated visit keeps the introduction visible and it can be started with `Läs introduktionen`. New game replies are read automatically and the transcript remains available to screen readers and as text. Returning players hear the latest saved game reply when they reopen the game. The player can change speaking rate; narrator pitch is neutral and character pitch is varied consistently by voice identity. These preferences are stored in browser `localStorage`. If WebAssembly, model loading, or audio playback fails, the same content remains available as text and the dialogue offers a retry.
|
||||||
|
|
||||||
|
|||||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
|||||||
name: ai-spel-frontend
|
name: ai-spel-frontend
|
||||||
description: Static web frontend for the Swedish life simulator
|
description: Static web frontend for the Swedish life simulator
|
||||||
type: application
|
type: application
|
||||||
version: 0.1.60
|
version: 0.1.63
|
||||||
appVersion: "0.1.60"
|
appVersion: "0.1.63"
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
# ADR 0003: Limit Piper WASM to one thread and reset failed workers
|
||||||
|
|
||||||
|
## Decision
|
||||||
|
|
||||||
|
The Piper worker reports one available processor to Piper and configures ONNX Runtime for one thread. If a synthesis request fails, the browser client terminates that worker; the next player retry creates a fresh worker and ONNX module.
|
||||||
|
|
||||||
|
## Context
|
||||||
|
|
||||||
|
Piper TTS Web 1.0.3 sets `env.wasm.numThreads` from `navigator.hardwareConcurrency` during `TtsSession.init()`, after the application had configured ONNX Runtime. On iPad this could undo the single-thread setting and request a larger WASM worker pool. The library also retains a singleton session if ONNX initialization fails, so retrying in the same worker can reuse a failed initialization.
|
||||||
|
|
||||||
|
## Consequences
|
||||||
|
|
||||||
|
The one-thread limit reduces parallel inference but lowers memory pressure on mobile Safari. Failed initialization no longer poisons future attempts in the same worker. This cannot guarantee that every device has enough memory for the 63 MB medium voice model; the CI release and Kubernetes checks validate packaging and deployment, while actual iPad memory behavior still requires device verification.
|
||||||
+101
-7
@@ -38,6 +38,16 @@
|
|||||||
#debug-trace details { border: 1px solid currentColor; border-radius: .3rem; padding: .5rem; }
|
#debug-trace details { border: 1px solid currentColor; border-radius: .3rem; padding: .5rem; }
|
||||||
#debug-trace summary { cursor: pointer; overflow-wrap: anywhere; }
|
#debug-trace summary { cursor: pointer; overflow-wrap: anywhere; }
|
||||||
#debug-trace pre { white-space: pre-wrap; overflow-wrap: anywhere; font: .8rem/1.45 ui-monospace, monospace; }
|
#debug-trace pre { white-space: pre-wrap; overflow-wrap: anywhere; font: .8rem/1.45 ui-monospace, monospace; }
|
||||||
|
.trace-chain { display: grid; gap: .65rem; margin-block: .75rem; }
|
||||||
|
.trace-step { border: 1px solid currentColor; border-inline-start: .35rem solid currentColor; border-radius: .3rem; padding: .65rem; }
|
||||||
|
.trace-step[data-engine="player"] { border-inline-start-color: #64748b; }
|
||||||
|
.trace-step[data-engine="ai"] { border-inline-start-color: #2563eb; }
|
||||||
|
.trace-step[data-engine="luau"] { border-inline-start-color: #9333ea; }
|
||||||
|
.trace-step[data-engine="rust"] { border-inline-start-color: #c2410c; }
|
||||||
|
.trace-step h3 { font-size: 1rem; margin: 0 0 .5rem; }
|
||||||
|
.trace-step .trace-engine { font-weight: 750; }
|
||||||
|
.trace-step pre { margin: .25rem 0 .75rem; }
|
||||||
|
.trace-raw { margin-block-start: .75rem; }
|
||||||
@media (max-width: 800px) {
|
@media (max-width: 800px) {
|
||||||
body.debug-layout { height: auto; overflow: auto; }
|
body.debug-layout { height: auto; overflow: auto; }
|
||||||
#play-layout.debug-enabled { grid-template-columns: minmax(0, 1fr); height: auto; }
|
#play-layout.debug-enabled { grid-template-columns: minmax(0, 1fr); height: auto; }
|
||||||
@@ -70,8 +80,8 @@
|
|||||||
<form id="message-form">
|
<form id="message-form">
|
||||||
<label for="message" id="message-label">Skriv ett meddelande</label>
|
<label for="message" id="message-label">Skriv ett meddelande</label>
|
||||||
<textarea id="message" name="message" maxlength="4000" aria-describedby="message-help" autocomplete="off"></textarea>
|
<textarea id="message" name="message" maxlength="4000" aria-describedby="message-help" autocomplete="off"></textarea>
|
||||||
<div id="message-tools"><button type="button" id="microphone" aria-pressed="false" aria-describedby="voice-status">Starta mikrofon</button></div>
|
<div id="message-tools"><button type="submit" id="send-message">Skicka</button> <button type="button" id="microphone" aria-pressed="false" aria-describedby="voice-status">Starta mikrofon</button></div>
|
||||||
<span id="message-help" class="sr-only">Tryck Enter för att skicka. Tryck Skift och Enter för ny rad.</span>
|
<span id="message-help" class="sr-only">Tryck på Skicka eller Enter för att skicka. Tryck Skift och Enter för ny rad.</span>
|
||||||
</form>
|
</form>
|
||||||
<p id="voice-status" role="status" aria-live="polite"></p>
|
<p id="voice-status" role="status" aria-live="polite"></p>
|
||||||
<div id="speech-progress-container" hidden>
|
<div id="speech-progress-container" hidden>
|
||||||
@@ -82,7 +92,7 @@
|
|||||||
</section>
|
</section>
|
||||||
<aside id="debug-panel" aria-labelledby="debug-heading" hidden>
|
<aside id="debug-panel" aria-labelledby="debug-heading" hidden>
|
||||||
<h2 id="debug-heading">Beslutsspårning</h2>
|
<h2 id="debug-heading">Beslutsspårning</h2>
|
||||||
<p>Administratörsvy för ditt eget spelkonto. Promptar, modelltrafik, regelresultat och Rust-commit visas från revisionsloggad API-data. Hemligheter och credentials ska vara maskerade av servern.</p>
|
<p>Administratörsvy för ditt eget spelkonto. Varje steg visar sparad indata och utdata i kedjan: spelare (grå), AI (blå), Luau (lila) och Rust (orange). Promptar, modelltrafik, regelresultat och commit visas från revisionsloggad API-data. Hemligheter och credentials maskeras av servern.</p>
|
||||||
<button type="button" id="debug-refresh">Uppdatera spår</button>
|
<button type="button" id="debug-refresh">Uppdatera spår</button>
|
||||||
<p id="debug-status" role="status" aria-live="polite">Hämtar spårning…</p>
|
<p id="debug-status" role="status" aria-live="polite">Hämtar spårning…</p>
|
||||||
<div id="debug-trace" aria-label="Kronologiskt beslutsspår"></div>
|
<div id="debug-trace" aria-label="Kronologiskt beslutsspår"></div>
|
||||||
@@ -280,6 +290,8 @@
|
|||||||
function refreshMicrophone() {
|
function refreshMicrophone() {
|
||||||
const button = document.querySelector('#microphone');
|
const button = document.querySelector('#microphone');
|
||||||
if (button) button.disabled = play.hidden || messageField.disabled || submitBusy;
|
if (button) button.disabled = play.hidden || messageField.disabled || submitBusy;
|
||||||
|
const sendButton = document.querySelector('#send-message');
|
||||||
|
if (sendButton) sendButton.disabled = play.hidden || messageField.disabled || submitBusy;
|
||||||
}
|
}
|
||||||
function persistVoiceSettings() {
|
function persistVoiceSettings() {
|
||||||
voiceSettings.mode = 'game-voice';
|
voiceSettings.mode = 'game-voice';
|
||||||
@@ -671,7 +683,7 @@
|
|||||||
const lines = await request('/api/dialogue');
|
const lines = await request('/api/dialogue');
|
||||||
transcript.replaceChildren();
|
transcript.replaceChildren();
|
||||||
latestAssistantText = '';
|
latestAssistantText = '';
|
||||||
for (const line of lines) appendLine(line.role === 'user' ? 'user' : 'assistant', line.content, {speak: false});
|
for (const line of lines) appendLine(line.role === 'user' ? 'user' : 'assistant', line.content, {speaker: line.speaker, speak: false});
|
||||||
if (lines.length > 0 && latestAssistantText && location.pathname !== '/admin') {
|
if (lines.length > 0 && latestAssistantText && location.pathname !== '/admin') {
|
||||||
voiceController?.speak(latestAssistantText, {role: 'narrator', voiceIdentity: 'neutral'});
|
voiceController?.speak(latestAssistantText, {role: 'narrator', voiceIdentity: 'neutral'});
|
||||||
} else if (lines.length === 0 && gameState?.world) {
|
} else if (lines.length === 0 && gameState?.world) {
|
||||||
@@ -705,7 +717,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function traceTimestamp(record) {
|
function traceTimestamp(record) {
|
||||||
return record.recorded_at || record.requested_at || record.completed_at || '';
|
return record.recorded_at || record.requested_at || record.completed_at || record.created_at || '';
|
||||||
}
|
}
|
||||||
function renderDecisionTrace(data) {
|
function renderDecisionTrace(data) {
|
||||||
const groups = new Map();
|
const groups = new Map();
|
||||||
@@ -734,9 +746,88 @@
|
|||||||
const eventNames = group.events.map(event => `${event.event_type} (${event.commit_status || 'okänt utfall'})`).join(', ');
|
const eventNames = group.events.map(event => `${event.event_type} (${event.commit_status || 'okänt utfall'})`).join(', ');
|
||||||
const prompts = group.ai_interactions.map(interaction => `${interaction.prompt_id} v${interaction.prompt_version}: ${interaction.outcome}`).join(', ');
|
const prompts = group.ai_interactions.map(interaction => `${interaction.prompt_id} v${interaction.prompt_version}: ${interaction.outcome}`).join(', ');
|
||||||
summary.textContent = `${group.latest || 'Tid saknas'} · ${group.correlation_id}${eventNames ? ` · Rust: ${eventNames}` : ''}${prompts ? ` · AI: ${prompts}` : ''}`;
|
summary.textContent = `${group.latest || 'Tid saknas'} · ${group.correlation_id}${eventNames ? ` · Rust: ${eventNames}` : ''}${prompts ? ` · AI: ${prompts}` : ''}`;
|
||||||
|
const chain = document.createElement('div');
|
||||||
|
chain.className = 'trace-chain';
|
||||||
|
const addStep = (engine, title, input, output, note = '') => {
|
||||||
|
const card = document.createElement('article');
|
||||||
|
card.className = 'trace-step';
|
||||||
|
card.dataset.engine = engine;
|
||||||
|
const heading = document.createElement('h3');
|
||||||
|
const label = document.createElement('span');
|
||||||
|
label.className = 'trace-engine';
|
||||||
|
label.textContent = `${engine === 'luau' ? 'Luau' : engine === 'ai' ? 'AI' : engine === 'rust' ? 'Rust' : 'Spelare'} · `;
|
||||||
|
heading.append(label, document.createTextNode(title));
|
||||||
|
card.append(heading);
|
||||||
|
if (note) {
|
||||||
|
const noteElement = document.createElement('p');
|
||||||
|
noteElement.textContent = note;
|
||||||
|
card.append(noteElement);
|
||||||
|
}
|
||||||
|
const addValue = (name, value) => {
|
||||||
|
const valueHeading = document.createElement('strong');
|
||||||
|
valueHeading.textContent = name;
|
||||||
|
const pre = document.createElement('pre');
|
||||||
|
pre.textContent = typeof value === 'string' ? value : JSON.stringify(value ?? 'Ingen uppgift sparad', null, 2);
|
||||||
|
card.append(valueHeading, pre);
|
||||||
|
};
|
||||||
|
addValue('Indata', input);
|
||||||
|
addValue('Utdata', output);
|
||||||
|
chain.append(card);
|
||||||
|
};
|
||||||
|
|
||||||
|
const orderedEvents = [...group.events].sort((a, b) => traceTimestamp(a).localeCompare(traceTimestamp(b)));
|
||||||
|
const orderedInteractions = [...group.ai_interactions].sort((a, b) => traceTimestamp(a).localeCompare(traceTimestamp(b)));
|
||||||
|
const playerMessages = [
|
||||||
|
...orderedEvents.map(event => event.payload?.player_message).filter(Boolean),
|
||||||
|
...group.player_messages.map(message => message.message).filter(Boolean),
|
||||||
|
];
|
||||||
|
for (const [index, message] of playerMessages.entries()) {
|
||||||
|
addStep('player', `Spelarens avsikt ${playerMessages.length > 1 ? index + 1 : ''}`, message, {submitted: true});
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const interaction of orderedInteractions) {
|
||||||
|
const external = interaction.external_call || {};
|
||||||
|
addStep('ai', `${interaction.prompt_id} · v${interaction.prompt_version} · ${interaction.outcome}`,
|
||||||
|
{prompt_yaml: interaction.prompt_yaml, rendered_messages: interaction.rendered_messages, provider: external.service, model: external.model, thinking_effort: external.thinking_effort, provider_request: external.request},
|
||||||
|
{response: interaction.response, outcome: interaction.outcome, provider_status: external.response_status, provider_response: external.response_body, provider_error: external.error, duration_ms: external.duration_ms, rust_interpretation_and_validation: interaction.metadata},
|
||||||
|
'AI-förslag och providertrafik. Förslaget är inte i sig ett fastställt världsfaktum.');
|
||||||
|
const metadata = interaction.metadata || {};
|
||||||
|
if (metadata.validation_inputs || metadata.validation_results || metadata.decision?.includes?.('rule')) {
|
||||||
|
addStep('luau', `Regelutkast och tester · ${metadata.rule_key || metadata.activity_key || interaction.prompt_id}`,
|
||||||
|
{rule_draft: interaction.response, test_inputs: metadata.validation_inputs},
|
||||||
|
{decision: metadata.decision || interaction.outcome, test_results: metadata.validation_results, source_hash: metadata.source_hash, rule_id: metadata.rule_id, rule_version: metadata.rule_version},
|
||||||
|
'Luau körs med isolerade testindata; resultatet kontrolleras av Rust innan regeln aktiveras.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const event of orderedEvents) {
|
||||||
|
const payload = event.payload || {};
|
||||||
|
const domain = payload.details || {};
|
||||||
|
const luau = domain.luau_trace;
|
||||||
|
if (luau) {
|
||||||
|
addStep('luau', `Regelkörning · ${domain.activity_key || domain.rule_id || 'regel'}`,
|
||||||
|
{source: event.rule_source || 'Källkod saknas i denna spårpost.', invocation: luau.input},
|
||||||
|
luau.error ? {error: luau.error, output: luau.output} : luau.output,
|
||||||
|
`Regel ${domain.rule_id || 'okänd'} version ${domain.rule_version ?? 'okänd'} · hash ${domain.rule_hash || 'saknas'}`);
|
||||||
|
addStep('rust', 'Effektvalidering och världskommando',
|
||||||
|
{proposed_effects: domain.rust_validation?.input_effects || luau.output, activity: domain.activity_key, world_version_before: luau.input?.snapshot?.version},
|
||||||
|
{validation: domain.rust_validation, committed_event: event.event_type, commit_status: event.commit_status, commit_sequence: event.commit_sequence, world_time: event.world_time, committed_details: domain},
|
||||||
|
'Rust verifierar typade effekter och skriver den godkända förändringen atomärt.');
|
||||||
|
} else {
|
||||||
|
addStep('rust', `Domänbeslut och commit · ${event.event_type}`,
|
||||||
|
{player_intent: payload.player_message, interpreted_intent: payload.intent, details: domain, world_version: payload.world_version},
|
||||||
|
{commit_status: event.commit_status, commit_sequence: event.commit_sequence, world_time: event.world_time, event_id: event.event_id},
|
||||||
|
'Rust fastställer om handlingen kan committas till den kanoniska världen.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const raw = document.createElement('details');
|
||||||
|
raw.className = 'trace-raw';
|
||||||
|
const rawSummary = document.createElement('summary');
|
||||||
|
rawSummary.textContent = 'Visa all rå spårdata';
|
||||||
const pre = document.createElement('pre');
|
const pre = document.createElement('pre');
|
||||||
pre.textContent = JSON.stringify(group, null, 2);
|
pre.textContent = JSON.stringify(group, null, 2);
|
||||||
details.append(summary, pre);
|
raw.append(rawSummary, pre);
|
||||||
|
details.append(summary, chain, raw);
|
||||||
debugTrace.append(details);
|
debugTrace.append(details);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -866,9 +957,12 @@
|
|||||||
} catch (_) { /* The committed dialogue stays successful if this optional view refresh fails. */ }
|
} catch (_) { /* The committed dialogue stays successful if this optional view refresh fails. */ }
|
||||||
}
|
}
|
||||||
const speakingNpc = ['speak', 'meet'].includes(result.intent) ? gameState.world.npc : null;
|
const speakingNpc = ['speak', 'meet'].includes(result.intent) ? gameState.world.npc : null;
|
||||||
|
for (const ruleName of result.debug_rules_created || []) {
|
||||||
|
appendLine('assistant', ruleName, {speaker: 'Nya regler', speak: false});
|
||||||
|
}
|
||||||
appendLine('assistant', result.reply, speakingNpc
|
appendLine('assistant', result.reply, speakingNpc
|
||||||
? {speaker: speakingNpc.name, voice: {characterId: speakingNpc.id, voiceIdentity: speakingNpc.voice_identity}}
|
? {speaker: speakingNpc.name, voice: {characterId: speakingNpc.id, voiceIdentity: speakingNpc.voice_identity}}
|
||||||
: {speaker: 'Berättelsen', voice: {role: 'narrator', voiceIdentity: 'neutral'}});
|
: {speaker: 'Berättaren', voice: {role: 'narrator', voiceIdentity: 'neutral'}});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
messageField.value = message;
|
messageField.value = message;
|
||||||
appendLine('assistant', `${explainDialogueError(error)} Ditt meddelande ligger kvar i inmatningen.`);
|
appendLine('assistant', `${explainDialogueError(error)} Ditt meddelande ligger kvar i inmatningen.`);
|
||||||
|
|||||||
@@ -7,6 +7,23 @@ export function createOnnxWasmPaths(origin) {
|
|||||||
|
|
||||||
export function configureOnnxRuntime(onnxRuntime) {
|
export function configureOnnxRuntime(onnxRuntime) {
|
||||||
if (!onnxRuntime?.env?.wasm) throw new TypeError('ONNX Runtime WebAssembly settings are unavailable.');
|
if (!onnxRuntime?.env?.wasm) throw new TypeError('ONNX Runtime WebAssembly settings are unavailable.');
|
||||||
|
// Piper 1.0.3 overwrites this value in TtsSession.init() with
|
||||||
|
// navigator.hardwareConcurrency. Override that source as well, otherwise an
|
||||||
|
// iPad may start a large WASM worker pool despite this setting.
|
||||||
|
const navigatorObject = globalThis.navigator;
|
||||||
|
if (navigatorObject && navigatorObject.hardwareConcurrency !== 1) {
|
||||||
|
try {
|
||||||
|
Object.defineProperty(navigatorObject, 'hardwareConcurrency', {
|
||||||
|
configurable: true,
|
||||||
|
value: 1,
|
||||||
|
});
|
||||||
|
} catch (_) {
|
||||||
|
// The check below converts an unsupported override into a clear error.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (navigatorObject && navigatorObject.hardwareConcurrency !== 1) {
|
||||||
|
throw new Error('Piper could not be restricted to one processor thread.');
|
||||||
|
}
|
||||||
// Piper already runs in a worker. Avoid a second worker pool on mobile Safari.
|
// Piper already runs in a worker. Avoid a second worker pool on mobile Safari.
|
||||||
onnxRuntime.env.wasm.numThreads = 1;
|
onnxRuntime.env.wasm.numThreads = 1;
|
||||||
onnxRuntime.env.wasm.initTimeout = 60000;
|
onnxRuntime.env.wasm.initTimeout = 60000;
|
||||||
|
|||||||
+13
-2
@@ -17,8 +17,19 @@ function getWorker() {
|
|||||||
request.onProgress?.(message.progress);
|
request.onProgress?.(message.progress);
|
||||||
} else {
|
} else {
|
||||||
pending.delete(message.id);
|
pending.delete(message.id);
|
||||||
if (message.type === 'audio') request.resolve(new Blob([message.audio], {type: 'audio/x-wav'}));
|
if (message.type === 'audio') {
|
||||||
else request.reject(new Error(message.error || 'Piper-arbetaren misslyckades.'));
|
request.resolve(new Blob([message.audio], {type: 'audio/x-wav'}));
|
||||||
|
} else {
|
||||||
|
const error = new Error(message.error || 'Piper-arbetaren misslyckades.');
|
||||||
|
request.reject(error);
|
||||||
|
// TtsSession keeps a singleton even when ONNX initialization fails.
|
||||||
|
// Discard the whole worker so a player retry starts with a clean ONNX
|
||||||
|
// module and does not reuse a poisoned WASM initialization.
|
||||||
|
for (const queued of pending.values()) queued.reject(error);
|
||||||
|
pending.clear();
|
||||||
|
worker?.terminate();
|
||||||
|
worker = null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
worker.onerror = event => {
|
worker.onerror = event => {
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ grep -q "retry.textContent = 'Läs senaste repliken'" index.html
|
|||||||
grep -q "location.pathname !== '/admin'" index.html
|
grep -q "location.pathname !== '/admin'" index.html
|
||||||
grep -q "if (options.speak !== false && location.pathname !== '/admin')" index.html
|
grep -q "if (options.speak !== false && location.pathname !== '/admin')" index.html
|
||||||
grep -q 'id="microphone" aria-pressed="false"' index.html
|
grep -q 'id="microphone" aria-pressed="false"' index.html
|
||||||
|
grep -q 'type="submit" id="send-message">Skicka</button>' index.html
|
||||||
grep -q 'id="voice-status" role="status" aria-live="polite"' index.html
|
grep -q 'id="voice-status" role="status" aria-live="polite"' index.html
|
||||||
grep -q 'id="speech-progress" aria-label="Nedladdning av svensk röstmodell"' index.html
|
grep -q 'id="speech-progress" aria-label="Nedladdning av svensk röstmodell"' index.html
|
||||||
grep -q 'id="speech-progress-value"' index.html
|
grep -q 'id="speech-progress-value"' index.html
|
||||||
@@ -59,6 +60,8 @@ grep -q 'new ReadableStream' piper-download-progress.mjs
|
|||||||
grep -q 'createOnnxWasmPaths(self.location.origin)' piper-worker.js
|
grep -q 'createOnnxWasmPaths(self.location.origin)' piper-worker.js
|
||||||
grep -q 'configureOnnxRuntime(onnxRuntime)' piper-worker.js
|
grep -q 'configureOnnxRuntime(onnxRuntime)' piper-worker.js
|
||||||
grep -q 'numThreads = 1' piper-onnx-config.mjs
|
grep -q 'numThreads = 1' piper-onnx-config.mjs
|
||||||
|
grep -q "hardwareConcurrency'" piper-onnx-config.mjs
|
||||||
|
grep -q 'Piper could not be restricted to one processor thread' piper-onnx-config.mjs
|
||||||
grep -q '/static/piper-wasm-v1/onnx/' piper-onnx-config.mjs
|
grep -q '/static/piper-wasm-v1/onnx/' piper-onnx-config.mjs
|
||||||
grep -q 'PIPER_MODEL_ORIGIN' piper-model-routing.mjs
|
grep -q 'PIPER_MODEL_ORIGIN' piper-model-routing.mjs
|
||||||
grep -q '/static/piper-wasm-v1/voices/' piper-model-routing.mjs
|
grep -q '/static/piper-wasm-v1/voices/' piper-model-routing.mjs
|
||||||
@@ -99,8 +102,8 @@ if grep -Eq 'id="(new-character|world-setup|shop|buy-offer|balance|inventory|pla
|
|||||||
echo 'The active player UI must not contain permanent data panels, forms, or action buttons.' >&2
|
echo 'The active player UI must not contain permanent data panels, forms, or action buttons.' >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
if sed -n '/<section id="play"/,/^ <\/section>/p' index.html | grep '<button' | grep -v 'id="microphone"' >/dev/null; then
|
if sed -n '/<section id="play"/,/^ <\/section>/p' index.html | grep '<button' | grep -Ev 'id="(microphone|send-message)"' >/dev/null; then
|
||||||
echo 'Only the microphone control may appear beside the game text input.' >&2
|
echo 'Only the send and microphone controls may appear beside the game text input.' >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -14,10 +14,19 @@ test('ONNX Runtime base URL rejects an invalid worker origin', async () => {
|
|||||||
assert.throws(() => createOnnxWasmPaths('undefined'), TypeError);
|
assert.throws(() => createOnnxWasmPaths('undefined'), TypeError);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('ONNX Runtime uses one thread and a bounded startup timeout', async () => {
|
test('Piper and ONNX Runtime stay on one thread even though Piper overwrites ONNX settings', async () => {
|
||||||
const {configureOnnxRuntime} = await import('../piper-onnx-config.mjs');
|
const {configureOnnxRuntime} = await import('../piper-onnx-config.mjs');
|
||||||
|
const navigatorObject = {hardwareConcurrency: 8};
|
||||||
|
const previousNavigator = globalThis.navigator;
|
||||||
|
Object.defineProperty(globalThis, 'navigator', {configurable: true, value: navigatorObject});
|
||||||
const runtime = {env: {wasm: {numThreads: 0, initTimeout: 0}}};
|
const runtime = {env: {wasm: {numThreads: 0, initTimeout: 0}}};
|
||||||
configureOnnxRuntime(runtime);
|
try {
|
||||||
assert.equal(runtime.env.wasm.numThreads, 1);
|
configureOnnxRuntime(runtime);
|
||||||
assert.equal(runtime.env.wasm.initTimeout, 60000);
|
assert.equal(navigatorObject.hardwareConcurrency, 1);
|
||||||
|
assert.equal(runtime.env.wasm.numThreads, 1);
|
||||||
|
assert.equal(runtime.env.wasm.initTimeout, 60000);
|
||||||
|
} finally {
|
||||||
|
if (previousNavigator === undefined) delete globalThis.navigator;
|
||||||
|
else Object.defineProperty(globalThis, 'navigator', {configurable: true, value: previousNavigator});
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -11,3 +11,9 @@ test('Piper worker is built and started as an ES module', async () => {
|
|||||||
assert.match(buildScript, /outfile: join\(workerRoot, 'piper-worker\.js'\),\s*bundle: true,\s*format: 'esm'/);
|
assert.match(buildScript, /outfile: join\(workerRoot, 'piper-worker\.js'\),\s*bundle: true,\s*format: 'esm'/);
|
||||||
assert.match(runtime, /new Worker\(workerUrl, \{type: 'module'\}\)/);
|
assert.match(runtime, /new Worker\(workerUrl, \{type: 'module'\}\)/);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('Piper runtime discards a worker after a failed initialization for a clean retry', async () => {
|
||||||
|
const runtime = await readFile(join(__dirname, '..', 'piper-runtime.js'), 'utf8');
|
||||||
|
assert.match(runtime, /TtsSession keeps a singleton even when ONNX initialization fails/);
|
||||||
|
assert.match(runtime, /worker\?\.terminate\(\);\s*worker = null;/);
|
||||||
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user