Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ccaa14896c | ||
|
|
d26d7f0b55 | ||
|
|
874b9be841 | ||
|
|
d3b5308097 | ||
|
|
34adad88b8 | ||
|
|
ed0a8b90a6 | ||
|
|
1458fa8382 | ||
|
|
145c025f05 | ||
|
|
c618d2e31e | ||
|
|
696a47a9a2 | ||
|
|
95d308b326 | ||
|
|
971c457c13 | ||
|
|
94078686b4 | ||
|
|
bdc63a588e | ||
|
|
2acf1f2e82 | ||
|
|
5404428bad | ||
|
|
0ecae41a78 | ||
|
|
fb0c253cee | ||
|
|
e669830c95 | ||
|
|
aed6b15a20 | ||
|
|
474fd80a95 | ||
|
|
bf5ee88610 | ||
|
|
db76289660 | ||
|
|
702780c61b | ||
|
|
eceb33052d | ||
|
|
32e89cca73 | ||
|
|
878fc3f8ca | ||
|
|
954e066859 | ||
|
|
ea7e349fc2 | ||
|
|
557fc77a52 | ||
|
|
d788ca39ec | ||
|
|
00f7334580 | ||
|
|
c5c0fb6b03 | ||
|
|
cc17b501cc | ||
|
|
1c8d429f81 | ||
|
|
7d447940b3 | ||
|
|
09341e2486 | ||
|
|
4cb41cdeca | ||
|
|
f189adb5d6 | ||
|
|
7acc61978d | ||
|
|
f322df540d | ||
|
|
d72a3ca27f | ||
|
|
910db15b61 | ||
|
|
0452d7d065 | ||
|
|
69184d1920 | ||
|
|
5354132489 | ||
|
|
0005bb1c83 | ||
|
|
b3a0e0ca5a | ||
|
|
de915b4aa6 | ||
|
|
421b14c398 | ||
|
|
9efb602653 | ||
|
|
222dcb9054 |
@@ -5,3 +5,6 @@ scripts
|
||||
README.md
|
||||
AGENTS.md
|
||||
VERSION
|
||||
node_modules
|
||||
package-lock.json
|
||||
dist
|
||||
|
||||
@@ -29,6 +29,15 @@ jobs:
|
||||
python3 scripts/bump-version.py --check
|
||||
scripts/check-frontend.sh
|
||||
|
||||
- name: Bundle Piper worker client code
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
npm install --no-audit --no-fund
|
||||
npm run build:piper
|
||||
test -s public/tts/piper-wasm-v1/piper-worker.js
|
||||
test -s public/piper-runtime.js
|
||||
|
||||
- name: Ensure Helm is available
|
||||
shell: bash
|
||||
env:
|
||||
@@ -89,7 +98,7 @@ jobs:
|
||||
version="$(python3 scripts/bump-version.py)"
|
||||
git config user.name "Gitea Actions"
|
||||
git config user.email "actions@users.noreply.gitea"
|
||||
git add VERSION deploy/helm/ai-spel-frontend/Chart.yaml
|
||||
git add VERSION deploy/helm/ai-spel-frontend/Chart.yaml package-lock.json
|
||||
git commit -m "Release $version [auto-version-bump]"
|
||||
git tag -a "v$version" -m "v$version"
|
||||
git push origin HEAD:main "refs/tags/v$version"
|
||||
|
||||
@@ -3,7 +3,10 @@
|
||||
- This repository owns only the static, accessible web client and its container/chart packaging.
|
||||
- Rust remains the sole authority for game state. The frontend calls the backend through same-origin `/api/...` and `/version` paths.
|
||||
- Keep frontend and backend behind `ai-spel.k3s.k0.nu` so session cookies remain same-origin.
|
||||
- The public footer displays frontend, static-service, and API versions; load static-service version from uncached `/static/version.json`.
|
||||
- `VERSION` is the only release-version source in this repository. Use `scripts/bump-version.py`; do not manually edit chart versions.
|
||||
- Changes are written locally and built, checked, published, and exercised by Gitea Actions on the existing `large` runner and Kubernetes. Never run apps, tests, containers, images, or binaries locally. Do not create or register runners.
|
||||
- Never commit secrets, generated credentials, kubeconfigs, or environment files.
|
||||
- Helm charts are published to `harbor.k3s.k0.nu/ai-spel`; Argo CD uses the existing `ai-spel` project and namespace.
|
||||
- Player-facing speech uses the local Piper WebAssembly adapter when the player has activated audio. The separate `ai-spel-static` Nginx service serves pinned Swedish Piper models and ONNX/Piper runtime files from same-origin `/static/piper-wasm-v1/` URLs with immutable caching. Game text is synthesized on-device and must never be sent to a TTS provider.
|
||||
- This pipeline bundles only the Piper worker/client glue. Model/runtime downloads, image builds, and deployment belong to `ai-spel/ai-spel-static` and the existing `large` runner. Never build or run these assets locally.
|
||||
|
||||
@@ -4,6 +4,8 @@ ARG FRONTEND_VERSION
|
||||
RUN test -n "$FRONTEND_VERSION"
|
||||
COPY index.html /usr/share/nginx/html/index.html
|
||||
COPY voice.js /usr/share/nginx/html/voice.js
|
||||
COPY public/piper-runtime.js /usr/share/nginx/html/piper-runtime.js
|
||||
COPY public/tts/piper-wasm-v1/ /usr/share/nginx/html/tts/piper-wasm-v1/
|
||||
COPY nginx/default.conf /etc/nginx/conf.d/default.conf
|
||||
USER root
|
||||
RUN sed -i "s/__FRONTEND_VERSION__/${FRONTEND_VERSION}/g" /usr/share/nginx/html/index.html
|
||||
|
||||
@@ -6,18 +6,28 @@ After login, character creation and play use one dialogue history and one text i
|
||||
|
||||
During play the UI has no persistent location, task, inventory, economy, status, or purchase panels. The player asks for information or writes an action in the same input. Rust validates state changes; the AI can only propose a typed intent. A direct request to travel may establish a new place and an encounter when Rust commits that movement.
|
||||
|
||||
The separate `/admin` route provides an authenticated, read-only operations view for player search/profile/trace, YAML prompt assets, generated Luau rules with validation results, 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`.
|
||||
If the player asks to find or approach someone and no NPC is present, the direct dialogue scene may propose one person and an opening line. Rust creates that NPC only for the explicit request and commits the first exchange idempotently; a later turn continues the saved conversation. Clear requests about the current location are answered from its saved facts without asking the player to restate what they want to inspect.
|
||||
|
||||
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.
|
||||
|
||||
Voice input and output are optional browser features. The microphone button beside the text field uses Web Speech API when available and sends only its final Swedish transcript through the same submission path as typed text. Before its first use, the client explains that the browser may process audio through a provider-selected service; the game itself does not receive or store recordings, while the final transcript is saved as ordinary dialogue. Writing `röstinställningar` or saying `röstkommando alternativ` opens the temporary controls in the dialogue. The player can choose `Spelets röst`, `Skärmläsare`, or `Endast text`, select available Swedish speech voices and rate, and enable auto-read and short audio cues. The default mode is `Skärmläsare`; auto-read is off. These preferences are stored in browser `localStorage`. If speech APIs are unavailable or permission is denied, text play remains available.
|
||||
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.
|
||||
|
||||
When a character or NPC is created, its saved voice identity is masculine, feminine, or neutral. The biography prompt only assigns masculine/feminine when the character is explicitly described that way; otherwise it uses neutral. Speech synthesis applies a stable, subtly varied pitch/rate profile per character, so a character keeps the same sound across visits. Narration always uses neutral pitch. The browser's selected Swedish voice still determines the underlying voice, so the exact sound depends on installed system voices.
|
||||
The Piper engine, ONNX WebAssembly runtime, and all three Swedish medium voice models (Alma, Lisa, and NST) are served by the separate `ai-spel-static` Nginx service from same-origin `/static/piper-wasm-v1/`. Its own Gitea pipeline downloads pinned models, verifies sizes and hashes, and publishes a versioned image and Helm chart independently from frontend changes. The frontend's Piper adapter redirects the library's built-in model URLs to this static service; it does not request voice files from Hugging Face. Voice models are fetched on first use and cached in browser storage when supported. Dialogue text is synthesized on the device and is not sent to a TTS provider. Attribution is available at `/static/piper-wasm-v1/voices/ATTRIBUTION.txt`.
|
||||
|
||||
The microphone button beside the text field uses Web Speech API when available and sends only its final Swedish transcript through the same submission path as typed text. Before its first use, the client explains that the browser may process audio through a provider-selected service; the game itself does not receive or store recordings, while the final transcript is saved as ordinary dialogue. Writing `röstinställningar` or saying `röstkommando alternativ` opens temporary voice controls in the dialogue. The player can adjust speaking rate and enable or disable short audio cues. Voice preferences are stored in browser `localStorage`.
|
||||
|
||||
When a character or NPC is created, its saved voice identity is masculine, feminine, or neutral. The biography prompt only assigns masculine/feminine when the character is explicitly described that way; otherwise it uses neutral. Piper applies a stable, subtle pitch/rate profile per character, so a character keeps the same sound across visits. Narration always uses neutral pitch.
|
||||
|
||||
System voice commands require the prefix `röstkommando`: `upprepa`, `avbryt`, `hjälp`, `alternativ`, or `paus`. Without the prefix, the same words remain ordinary dialogue. Speech recognition and synthesis are browser-dependent; release acceptance must record which real iPhone/Safari/VoiceOver and Android/Chrome/TalkBack combinations were actually checked.
|
||||
|
||||
On iPhone and iPad, Safari requires a user gesture to unlock Web Audio. The frontend resumes the audio context during a trusted tap or key press and then reads generated replies automatically. Voice settings include **Testa ljudet**; if a game reply does not start, a **Läs senaste repliken** button appears in the dialogue. First use can take longer while the voice model downloads; progress and errors are announced in the dialogue. Actual iPhone/iPad playback remains a release acceptance check and must not be claimed until tested on a device.
|
||||
|
||||
The browser and API stay on the same public origin, `https://ai-spel.k3s.k0.nu`. The ingress routes `/` to this frontend service and routes `/api`, `/version`, and `/health` to the Rust service. That keeps the current server-side session cookie same-origin and avoids browser CORS configuration.
|
||||
|
||||
The public footer displays the frontend, static-service, and API versions. It fetches `/static/version.json` without caching; the static service creates that file from its sole `VERSION` source during the same image build used for the matching Helm chart and release tag.
|
||||
|
||||
## Release flow
|
||||
|
||||
`VERSION` is the only version source for this repository. Gitea Actions on the existing `large` runner runs the static checks, Helm lint/template, publishes a commit image, bumps the patch version through `scripts/bump-version.py`, creates the matching release commit and Git tag, and publishes the release image, Helm chart, and rendered frontend manifest to Harbor. Argo CD tracks the newest published frontend chart. The image and chart releases use the same version as the commit and tag.
|
||||
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: ai-spel-frontend
|
||||
description: Static web frontend for the Swedish life simulator
|
||||
type: application
|
||||
version: 0.1.28
|
||||
appVersion: "0.1.28"
|
||||
version: 0.1.52
|
||||
appVersion: "0.1.52"
|
||||
@@ -0,0 +1,13 @@
|
||||
# ADR 0001: Run Piper in an ES module worker
|
||||
|
||||
## Decision
|
||||
|
||||
Bundle the Piper worker as an ES module and start it with `new Worker(url, { type: 'module' })`.
|
||||
|
||||
## Context
|
||||
|
||||
Piper loads ONNX Runtime Web and its WebAssembly loader dynamically. The current IIFE/classic worker bundle reports `TypeError: "undefined" cannot be parsed as a URL` during WASM backend initialization, even though the pinned same-origin ONNX loader and binary are available. This is consistent with module-relative URL metadata being lost in the classic bundle.
|
||||
|
||||
## Consequences
|
||||
|
||||
The browser must support module workers. Current supported browser targets already require modern WebAssembly and worker support. CI asserts that the worker is built and started in module mode; production acceptance remains the real deployed browser flow.
|
||||
+303
-47
@@ -36,7 +36,10 @@
|
||||
<main>
|
||||
<section id="auth" aria-labelledby="auth-heading">
|
||||
<h1 id="auth-heading">Svensk livssimulator</h1>
|
||||
<p>Skapa en vuxen person och utforska en bestående värld genom dialog. Inga bilder används.</p>
|
||||
<p id="auth-intro">Välkommen till en svensk, dialogbaserad livssimulator utan bilder. Världen beskrivs med ljud, dofter, temperatur, beröring och riktning. Skapa konto med ett användarnamn och ett lösenord på minst tolv tecken. Berätta sedan fritt om en vuxen person. Du får redigera och godkänna personens biografi och startplats. Spela genom att skriva eller tala vad du gör och frågar. Personer du möter kan minnas tidigare samtal. Spelets repliker läses automatiskt upp på svenska och finns kvar som text. Har du redan konto väljer du Logga in.</p>
|
||||
<button type="button" id="auth-repeat-intro">Läs introduktionen</button>
|
||||
<p id="auth-voice-status" role="status" aria-live="polite">På iPhone och iPad kan du behöva trycka på Läs introduktionen igen en gång för att aktivera uppläsningen.</p>
|
||||
<p id="auth-status" role="status" aria-live="polite" hidden></p>
|
||||
<form id="auth-form">
|
||||
<label>Användarnamn <input name="username" required minlength="3" maxlength="40" autocomplete="username"></label>
|
||||
<label>Lösenord <input name="password" type="password" required minlength="12" maxlength="256" autocomplete="current-password"></label>
|
||||
@@ -61,14 +64,16 @@
|
||||
<button type="button" data-admin-view="players">Spelare</button>
|
||||
<button type="button" data-admin-view="prompts">Prompter</button>
|
||||
<button type="button" data-admin-view="rules">Luau-regler</button>
|
||||
<button type="button" data-admin-view="logging">Driftloggar</button>
|
||||
<button type="button" data-admin-view="audit">Revisionslogg</button>
|
||||
<button type="button" id="admin-logout">Logga ut</button>
|
||||
</nav>
|
||||
<div id="admin-content" aria-live="polite" aria-busy="false"></div>
|
||||
</section>
|
||||
</main>
|
||||
<footer id="version-footer">Frontend <span id="frontend-version">__FRONTEND_VERSION__</span> · API <span id="api-version">hämtar version…</span></footer>
|
||||
<script src="/voice.js"></script>
|
||||
<footer id="version-footer">Frontend <span id="frontend-version">__FRONTEND_VERSION__</span> · Statik <span id="static-version">hämtar version…</span> · API <span id="api-version">hämtar version…</span></footer>
|
||||
<script src="/piper-runtime.js?v=__FRONTEND_VERSION__"></script>
|
||||
<script src="/voice.js?v=__FRONTEND_VERSION__"></script>
|
||||
<script>
|
||||
const auth = document.querySelector('#auth');
|
||||
const play = document.querySelector('#play');
|
||||
@@ -85,13 +90,17 @@
|
||||
let pendingDialogue = null;
|
||||
let latestAssistantText = '';
|
||||
let latestAssistantVoice = {role: 'narrator', voiceIdentity: 'neutral'};
|
||||
const voiceSettingsKey = 'ai-spel.voice-settings.v1';
|
||||
let voiceSettings = window.GameVoice.loadSettings(localStorage, voiceSettingsKey);
|
||||
let speechRecoveryElement = null;
|
||||
const voiceSettingsKey = 'ai-spel.voice-settings.v2';
|
||||
let voiceSettings = window.GameVoice.loadSettings(localStorage, voiceSettingsKey, 'ai-spel.voice-settings.v1');
|
||||
let voiceController;
|
||||
let audioContext;
|
||||
let voiceDisclosureAcknowledged = false;
|
||||
let adminOffset = 0;
|
||||
const adminPageSize = 50;
|
||||
let presenceTimer = null;
|
||||
let playerMessagesPrimed = false;
|
||||
const seenPlayerMessageIds = new Set();
|
||||
|
||||
async function request(path, options = {}) {
|
||||
const response = await fetch(path, {credentials: 'same-origin', ...options});
|
||||
@@ -108,26 +117,85 @@
|
||||
if (role === 'assistant') {
|
||||
latestAssistantText = content;
|
||||
latestAssistantVoice = options.voice || {role: 'narrator', voiceIdentity: 'neutral'};
|
||||
if (options.speak !== false && !content.trim().endsWith('…') && !content.trim().endsWith('...')
|
||||
&& voiceSettings.mode === 'game-voice' && voiceSettings.autoSpeak && !play.hidden) {
|
||||
voiceController?.speak(content, latestAssistantVoice);
|
||||
if (options.speak !== false && location.pathname !== '/admin') {
|
||||
voiceController?.speak(content, {...latestAssistantVoice, onStart: clearSpeechRecovery});
|
||||
}
|
||||
}
|
||||
return line;
|
||||
}
|
||||
function setVoiceStatus(message = '') { document.querySelector('#voice-status').textContent = message; }
|
||||
function biographyContextText(context) {
|
||||
if (!context || typeof context !== 'object') return '';
|
||||
const details = [];
|
||||
if (typeof context.current_situation === 'string' && context.current_situation.trim()) {
|
||||
details.push(`Nuvarande situation: ${context.current_situation.trim()}.`);
|
||||
}
|
||||
for (const [key, label] of [
|
||||
['skills', 'Färdigheter'],
|
||||
['possessions', 'Ägodelar som nämnts'],
|
||||
['obligations', 'Åtaganden'],
|
||||
['past_events', 'Tidigare händelser'],
|
||||
['known_people', 'Kända personer'],
|
||||
]) {
|
||||
const values = context[key];
|
||||
if (Array.isArray(values) && values.length) details.push(`${label}: ${values.join(', ')}.`);
|
||||
}
|
||||
return details.length ? `\n\nStartuppgifter att granska: ${details.join(' ')}` : '';
|
||||
}
|
||||
function explainDialogueError(error) {
|
||||
const code = String(error?.message || '');
|
||||
const known = {
|
||||
dialogue_temporarily_unavailable: 'Berättartjänsten svarar inte just nu. Vänta en stund och försök igen.',
|
||||
world_version_conflict: 'Världen hann ändras medan du skrev. Jag har uppdaterat läget; skicka meddelandet igen.',
|
||||
world_not_available: 'Världen är inte tillgänglig just nu. Försök igen om en liten stund.',
|
||||
};
|
||||
return known[code] || (/^[a-z0-9_]+$/.test(code)
|
||||
? 'Jag kunde inte behandla det just nu. Försök igen om en liten stund.'
|
||||
: code || 'Ett tillfälligt fel uppstod. Försök igen om en liten stund.');
|
||||
}
|
||||
function setVoiceStatus(message = '') {
|
||||
document.querySelector('#voice-status').textContent = message;
|
||||
const authVoiceStatus = document.querySelector('#auth-voice-status');
|
||||
if (authVoiceStatus && !auth.hidden && message) authVoiceStatus.textContent = message;
|
||||
}
|
||||
function clearSpeechRecovery() {
|
||||
speechRecoveryElement?.remove();
|
||||
speechRecoveryElement = null;
|
||||
const status = document.querySelector('#voice-status');
|
||||
if (status?.textContent.startsWith('Uppläsningen startade inte')) setVoiceStatus('Läser upp dialog.');
|
||||
}
|
||||
function showSpeechRecovery(message) {
|
||||
clearSpeechRecovery();
|
||||
const item = document.createElement('li');
|
||||
item.dataset.role = 'voice-controls';
|
||||
item.setAttribute('aria-label', 'Uppläsning kunde inte starta');
|
||||
const explanation = document.createElement('p');
|
||||
explanation.textContent = message;
|
||||
const retry = document.createElement('button');
|
||||
retry.type = 'button';
|
||||
retry.textContent = 'Läs senaste repliken';
|
||||
retry.addEventListener('click', () => {
|
||||
voiceController.activateFromUserGesture();
|
||||
if (voiceController.speak(latestAssistantText, {...latestAssistantVoice, onStart: clearSpeechRecovery})) {
|
||||
clearSpeechRecovery();
|
||||
}
|
||||
});
|
||||
item.append(explanation, retry);
|
||||
transcript.append(item);
|
||||
item.scrollIntoView({block: 'end'});
|
||||
speechRecoveryElement = item;
|
||||
}
|
||||
function refreshMicrophone() {
|
||||
const button = document.querySelector('#microphone');
|
||||
if (button) button.disabled = play.hidden || messageField.disabled || submitBusy;
|
||||
}
|
||||
function persistVoiceSettings() {
|
||||
voiceSettings.mode = 'game-voice';
|
||||
voiceSettings.autoSpeak = true;
|
||||
if (!window.GameVoice.saveSettings(localStorage, voiceSettingsKey, voiceSettings)) {
|
||||
setVoiceStatus('Röstinställningen kunde inte sparas i den här webbläsaren.');
|
||||
}
|
||||
voiceController?.update(voiceSettings);
|
||||
if (voiceSettings.mode !== 'game-voice') voiceController?.stopAll();
|
||||
else if (!voiceSettings.autoSpeak) voiceController?.cancelSpeech();
|
||||
transcript.setAttribute('aria-live', voiceSettings.mode === 'game-voice' ? 'off' : 'polite');
|
||||
transcript.setAttribute('aria-live', 'polite');
|
||||
}
|
||||
function playVoiceSignal(state) {
|
||||
if (!voiceSettings.soundSignals || !['LISTENING', 'PROCESSING', 'ERROR', 'STOPPED'].includes(state)) return;
|
||||
@@ -151,12 +219,20 @@
|
||||
microphone.textContent = listening ? 'Avsluta mikrofon' : 'Starta mikrofon';
|
||||
refreshMicrophone();
|
||||
if (message) setVoiceStatus(message);
|
||||
else if (state === 'IDLE') setVoiceStatus('');
|
||||
if (/Läs senaste repliken/.test(message)) showSpeechRecovery(message);
|
||||
playVoiceSignal(state === 'IDLE' && /Mikrofonen är avstängd/.test(message) ? 'STOPPED' : state);
|
||||
},
|
||||
onTranscript(text) {
|
||||
return submitMessage(text, 'voice');
|
||||
},
|
||||
});
|
||||
function primeSpeechFromGesture(event) {
|
||||
if (!event.isTrusted) return;
|
||||
voiceController.activateFromUserGesture();
|
||||
}
|
||||
document.addEventListener('pointerdown', primeSpeechFromGesture, true);
|
||||
document.addEventListener('keydown', primeSpeechFromGesture, true);
|
||||
persistVoiceSettings();
|
||||
|
||||
function addVoiceButton(parent, label, handler) {
|
||||
@@ -168,16 +244,7 @@
|
||||
item.setAttribute('aria-label', 'Röstinställningar och uppläsning');
|
||||
const heading = document.createElement('strong'); heading.textContent = 'Röstinställningar'; item.append(heading);
|
||||
const fieldset = document.createElement('fieldset');
|
||||
const legend = document.createElement('legend'); legend.textContent = 'Välj hur dialogen ska läsas upp'; fieldset.append(legend);
|
||||
const modeLabel = document.createElement('label'); modeLabel.textContent = 'Läge';
|
||||
const mode = document.createElement('select');
|
||||
[['screen-reader', 'Skärmläsare'], ['game-voice', 'Spelets röst'], ['text-only', 'Endast text']].forEach(([value, label]) => {
|
||||
const option = document.createElement('option'); option.value = value; option.textContent = label; mode.append(option);
|
||||
});
|
||||
mode.value = voiceSettings.mode; modeLabel.append(mode); fieldset.append(modeLabel);
|
||||
const autoLabel = document.createElement('label'); const auto = document.createElement('input');
|
||||
auto.type = 'checkbox'; auto.checked = voiceSettings.autoSpeak;
|
||||
autoLabel.append(auto, document.createTextNode(' Läs nya repliker automatiskt')); fieldset.append(autoLabel);
|
||||
const legend = document.createElement('legend'); legend.textContent = 'Spelets repliker läses alltid upp. Anpassa rösten här.'; fieldset.append(legend);
|
||||
const speedLabel = document.createElement('label'); speedLabel.textContent = `Talhastighet: ${Number(voiceSettings.rate).toFixed(1)}`;
|
||||
const speed = document.createElement('input'); speed.type = 'range'; speed.min = '0.5'; speed.max = '2'; speed.step = '0.1'; speed.value = String(voiceSettings.rate);
|
||||
speed.setAttribute('aria-label', 'Talhastighet'); speed.addEventListener('input', () => { speedLabel.firstChild.textContent = `Talhastighet: ${Number(speed.value).toFixed(1)}`; });
|
||||
@@ -185,34 +252,40 @@
|
||||
const voiceLabel = document.createElement('label'); voiceLabel.textContent = 'Svensk röst';
|
||||
const voice = document.createElement('select'); voice.setAttribute('aria-label', 'Svensk röst');
|
||||
const defaultVoice = document.createElement('option'); defaultVoice.value = ''; defaultVoice.textContent = 'Systemets standardröst'; voice.append(defaultVoice);
|
||||
function refreshVoices() {
|
||||
const selected = voiceSettings.voiceName;
|
||||
voice.replaceChildren(defaultVoice.cloneNode(true));
|
||||
voiceController.getVoices().filter(entry => /^sv(-|$)/i.test(entry.lang)).forEach(entry => {
|
||||
const option = document.createElement('option'); option.value = entry.name; option.textContent = `${entry.name} (${entry.lang})`; voice.append(option);
|
||||
});
|
||||
voice.value = selected;
|
||||
}
|
||||
refreshVoices();
|
||||
window.speechSynthesis?.addEventListener?.('voiceschanged', refreshVoices);
|
||||
voice.value = voiceSettings.voiceName; voiceLabel.append(voice); fieldset.append(voiceLabel);
|
||||
const piperVoice = document.createElement('option');
|
||||
piperVoice.value = 'piper-sv-nst';
|
||||
piperVoice.textContent = 'Piper – svensk röst på enheten';
|
||||
voice.append(piperVoice);
|
||||
voice.value = piperVoice.value;
|
||||
voiceSettings.voiceName = piperVoice.value;
|
||||
voiceLabel.append(voice); fieldset.append(voiceLabel);
|
||||
const modelCredits = document.createElement('a');
|
||||
modelCredits.href = '/static/piper-wasm-v1/voices/ATTRIBUTION.txt';
|
||||
modelCredits.textContent = 'Svenska rösters upphov och licenser';
|
||||
fieldset.append(modelCredits);
|
||||
const signalLabel = document.createElement('label'); const signals = document.createElement('input');
|
||||
signals.type = 'checkbox'; signals.checked = voiceSettings.soundSignals;
|
||||
signalLabel.append(signals, document.createTextNode(' Ljudsignal vid röstinmatning')); fieldset.append(signalLabel);
|
||||
item.append(fieldset);
|
||||
const speakLatest = () => {
|
||||
if (!voiceController.speak(latestAssistantText, latestAssistantVoice)) setVoiceStatus('Talsyntes stöds inte här eller är avstängd. Dialogen finns kvar som text.');
|
||||
voiceController.activateFromUserGesture();
|
||||
if (!voiceController.speak(latestAssistantText, {...latestAssistantVoice, onStart: clearSpeechRecovery})) setVoiceStatus('Talsyntes stöds inte i den här webbläsaren. Dialogen finns kvar som text.');
|
||||
};
|
||||
const testSpeech = () => {
|
||||
voiceController.activateFromUserGesture();
|
||||
if (!voiceController.speak('Det här är ett test av uppläsningen.', {role: 'narrator', voiceIdentity: 'neutral', onStart: clearSpeechRecovery})) {
|
||||
setVoiceStatus('Talsyntes stöds inte i den här webbläsaren. Dialogen finns kvar som text.');
|
||||
}
|
||||
};
|
||||
addVoiceButton(item, 'Testa ljudet', testSpeech);
|
||||
addVoiceButton(item, 'Läs senaste repliken', speakLatest);
|
||||
addVoiceButton(item, 'Upprepa', speakLatest);
|
||||
addVoiceButton(item, 'Avbryt uppläsning', () => voiceController.cancelSpeech());
|
||||
mode.addEventListener('change', () => { voiceSettings.mode = mode.value; persistVoiceSettings(); });
|
||||
auto.addEventListener('change', () => { voiceSettings.autoSpeak = auto.checked; persistVoiceSettings(); });
|
||||
speed.addEventListener('change', () => { voiceSettings.rate = Number(speed.value); persistVoiceSettings(); });
|
||||
voice.addEventListener('change', () => { voiceSettings.voiceName = voice.value; persistVoiceSettings(); });
|
||||
signals.addEventListener('change', () => { voiceSettings.soundSignals = signals.checked; persistVoiceSettings(); });
|
||||
addVoiceButton(item, 'Stäng röstinställningar', () => item.remove());
|
||||
transcript.append(item); item.scrollIntoView({block: 'end'}); mode.focus();
|
||||
transcript.append(item); item.scrollIntoView({block: 'end'}); speed.focus();
|
||||
}
|
||||
function requestVoiceDisclosure() {
|
||||
const item = document.createElement('li'); item.dataset.role = 'voice-controls';
|
||||
@@ -220,6 +293,7 @@
|
||||
const message = document.createElement('p');
|
||||
message.textContent = 'Innan du startar: webbläsarens taligenkänning kan behandla ljud genom en tjänst som webbläsaren väljer. Spelet tar inte emot eller sparar ljudinspelningen. Den färdiga transkriberingen skickas och sparas som din vanliga dialog. Fortsätt bara om du godkänner webbläsarens hantering av tal.';
|
||||
item.append(message);
|
||||
voiceController.speak(message.textContent, {role: 'narrator', voiceIdentity: 'neutral'});
|
||||
addVoiceButton(item, 'Jag förstår – starta mikrofonen', () => {
|
||||
voiceDisclosureAcknowledged = true;
|
||||
item.remove();
|
||||
@@ -231,13 +305,16 @@
|
||||
function handleVoiceCommand(message, source) {
|
||||
const parsed = window.GameVoice.parseVoiceCommand(message, {requirePrefix: source === 'voice'});
|
||||
if (!parsed) return false;
|
||||
if (parsed.command === 'settings') appendVoiceSettings();
|
||||
if (parsed.command === 'settings') {
|
||||
appendLine('assistant', 'Här kan du välja en svensk röst och justera talhastigheten. Alla repliker i spelet läses upp automatiskt.');
|
||||
appendVoiceSettings();
|
||||
}
|
||||
else if (parsed.command === 'repeat') {
|
||||
if (!voiceController.speak(latestAssistantText, latestAssistantVoice)) setVoiceStatus('Talsyntes stöds inte här eller är avstängd. Dialogen finns kvar som text.');
|
||||
if (!voiceController.speak(latestAssistantText, latestAssistantVoice)) setVoiceStatus('Talsyntes stöds inte i den här webbläsaren. Dialogen finns kvar som text.');
|
||||
} else if (parsed.command === 'stop') {
|
||||
voiceController.cancelSpeech(); voiceController.stopListening(); setVoiceStatus('Röstinteraktionen är avbruten.');
|
||||
} else if (parsed.command === 'help') {
|
||||
appendLine('assistant', 'Skriv röstinställningar för röstlägen. I spelets röstläge kan du tala till mikrofonen eller skriva. Använd “röstkommando upprepa” för att höra senaste repliken igen.');
|
||||
appendLine('assistant', 'Skriv röstinställningar för att välja svensk röst och talhastighet. Spelets repliker läses alltid upp. Du kan tala i mikrofonen när den finns, eller skriva. Använd “röstkommando upprepa” för att höra senaste repliken igen.');
|
||||
} else setVoiceStatus('Okänt röstkommando. Skriv röstinställningar för alternativen.');
|
||||
return true;
|
||||
}
|
||||
@@ -269,21 +346,61 @@
|
||||
auth.hidden = false;
|
||||
document.querySelector('#auth-heading').textContent = location.pathname === '/admin' ? 'Administratörsinloggning' : 'Svensk livssimulator';
|
||||
document.querySelector('#version-footer').hidden = false;
|
||||
const adminRoute = location.pathname === '/admin';
|
||||
document.querySelector('#auth-intro').hidden = adminRoute;
|
||||
document.querySelector('#auth-repeat-intro').hidden = adminRoute;
|
||||
document.querySelector('[name="intent"][value="register"]').hidden = adminRoute;
|
||||
if (!adminRoute) playFirstVisitIntroduction();
|
||||
}
|
||||
function showPlay() {
|
||||
auth.hidden = true;
|
||||
adminView.hidden = true;
|
||||
play.hidden = false;
|
||||
document.querySelector('#version-footer').hidden = true;
|
||||
refreshMicrophone();
|
||||
messageField.focus();
|
||||
}
|
||||
function showAdmin() {
|
||||
if (presenceTimer) clearInterval(presenceTimer);
|
||||
presenceTimer = null;
|
||||
voiceController.stopAll();
|
||||
auth.hidden = true;
|
||||
play.hidden = true;
|
||||
adminView.hidden = false;
|
||||
document.querySelector('#version-footer').hidden = true;
|
||||
}
|
||||
const introductionKey = 'ai-spel.introduction-heard.v2';
|
||||
function playFirstVisitIntroduction() {
|
||||
let alreadyHeard = false;
|
||||
try { alreadyHeard = localStorage.getItem(introductionKey) === 'true'; } catch (_) { /* Keep the intro available for this visit. */ }
|
||||
if (alreadyHeard) return;
|
||||
const isAppleMobile = /iPad|iPhone|iPod/i.test(navigator.userAgent)
|
||||
|| (navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1);
|
||||
if (isAppleMobile) {
|
||||
document.querySelector('#auth-repeat-intro').textContent = 'Läs introduktionen';
|
||||
return;
|
||||
}
|
||||
const introduction = document.querySelector('#auth-intro').textContent;
|
||||
voiceController.speak(introduction, {
|
||||
role: 'narrator', voiceIdentity: 'neutral',
|
||||
onStart() { try { localStorage.setItem(introductionKey, 'true'); } catch (_) { /* The page text remains available. */ } },
|
||||
});
|
||||
}
|
||||
document.querySelector('#auth-repeat-intro').addEventListener('click', () => {
|
||||
if (location.pathname !== '/admin') {
|
||||
voiceController.activateFromUserGesture();
|
||||
const introduction = document.querySelector('#auth-intro').textContent;
|
||||
voiceController.speak(introduction, {
|
||||
role: 'narrator', voiceIdentity: 'neutral',
|
||||
onStart() { try { localStorage.setItem(introductionKey, 'true'); } catch (_) { /* The page text remains available. */ } },
|
||||
});
|
||||
}
|
||||
});
|
||||
function explainAuthError(error, intent) {
|
||||
if (intent === 'register' && error?.message === 'username_unavailable') return 'Det användarnamnet används redan. Välj ett annat och försök igen.';
|
||||
if (intent === 'register' && ['invalid_username', 'password_length_must_be_12_to_256'].includes(error?.message)) return 'Kontot kunde inte skapas. Användarnamnet ska ha 3 till 40 bokstäver, siffror eller tecknen punkt, bindestreck och understreck. Lösenordet ska ha minst tolv tecken.';
|
||||
if (intent === 'login' && ['unauthorized', 'invalid_credentials'].includes(error?.message)) return 'Användarnamnet eller lösenordet stämmer inte. Försök igen.';
|
||||
return 'Begäran kunde inte genomföras just nu. Kontrollera uppgifterna och försök igen.';
|
||||
}
|
||||
function adminElement(tag, text, parent = adminContent) {
|
||||
const element = document.createElement(tag);
|
||||
if (text !== undefined) element.textContent = text;
|
||||
@@ -330,6 +447,7 @@
|
||||
const trace = await request(`/api/admin/players/${encodeURIComponent(accountId)}/trace?limit=200`);
|
||||
const entries = [
|
||||
...trace.events.map(event => ({kind: 'Världshändelse', at: event.recorded_at, order: event.commit_sequence, data: event})),
|
||||
...trace.player_messages.map(message => ({kind: 'Privat spelarmeddelande', at: message.recorded_at, order: message.sequence, data: message})),
|
||||
...trace.ai_interactions.map(interaction => ({kind: `AI ${interaction.prompt_id} · ${interaction.outcome}`, at: interaction.requested_at, order: interaction.correlation_id, data: interaction}))
|
||||
].sort((a, b) => String(a.at).localeCompare(String(b.at)));
|
||||
adminElement('h2', 'Kronologiskt spelarspår');
|
||||
@@ -362,6 +480,32 @@
|
||||
adminElement('h2', 'Revisionslogg');
|
||||
for (const entry of result.entries) adminJson(`${entry.created_at} · ${entry.action} · ${entry.admin_account_id || entry.operator_identity}`, entry);
|
||||
}
|
||||
async function loadAdminLogging() {
|
||||
adminContent.replaceChildren();
|
||||
const result = await request('/api/admin/settings/logging');
|
||||
adminElement('h2', 'Driftloggar');
|
||||
adminElement('p', 'debug=true skriver detaljerade tekniska händelser för HTTP, AI-anrop, validering och commit. debug=false behåller korta tekniska åtkomstloggar och fel. Ändringen sparas i databasen och börjar gälla utan omstart. Spelartext, promptinnehåll, AI-svar, sessionsuppgifter och hemligheter skrivs aldrig till poddloggarna.');
|
||||
const form = adminElement('form');
|
||||
const label = adminElement('label', undefined, form);
|
||||
const checkbox = document.createElement('input');
|
||||
checkbox.type = 'checkbox'; checkbox.name = 'debug'; checkbox.checked = result.debug;
|
||||
label.append(checkbox, document.createTextNode(' Aktivera verbose felsökningsloggar (debug=true)'));
|
||||
const save = adminElement('button', 'Spara loggnivå', form); save.type = 'submit';
|
||||
const status = adminElement('p', `Aktuell nivå: debug=${result.debug}`);
|
||||
status.setAttribute('role', 'status');
|
||||
form.addEventListener('submit', async event => {
|
||||
event.preventDefault(); save.disabled = true;
|
||||
try {
|
||||
const updated = await request('/api/admin/settings/logging', {
|
||||
method: 'PUT', headers: {'content-type': 'application/json'},
|
||||
body: JSON.stringify({debug: checkbox.checked}),
|
||||
});
|
||||
status.textContent = `Aktuell nivå: debug=${updated.debug}. Ändringen gäller utan omstart.`;
|
||||
} catch (error) {
|
||||
status.textContent = `Loggnivån kunde inte ändras: ${error.message}`;
|
||||
} finally { save.disabled = false; }
|
||||
});
|
||||
}
|
||||
async function openAdmin() {
|
||||
showAdmin();
|
||||
adminContent.setAttribute('aria-busy', 'true');
|
||||
@@ -419,7 +563,9 @@
|
||||
transcript.replaceChildren();
|
||||
latestAssistantText = '';
|
||||
for (const line of lines) appendLine(line.role === 'user' ? 'user' : 'assistant', line.content, {speak: false});
|
||||
if (lines.length === 0 && gameState?.world) {
|
||||
if (lines.length > 0 && latestAssistantText && location.pathname !== '/admin') {
|
||||
voiceController?.speak(latestAssistantText, {role: 'narrator', voiceIdentity: 'neutral'});
|
||||
} else if (lines.length === 0 && gameState?.world) {
|
||||
const place = gameState.world.location;
|
||||
const senses = place.senses || {};
|
||||
appendLine('assistant', `Du börjar på ${place.name}. ${place.description} Ljud: ${senses.sound || 'Inget särskilt ljud beskrivet.'} Doft: ${senses.smell || 'Ingen särskild doft beskriven.'} Luft och temperatur: ${senses.air_and_temperature || 'Inte beskrivet.'} Beröring och ytor: ${senses.touch_and_surfaces || 'Inte beskrivet.'} Orientering: ${senses.spatial_orientation || 'Inte beskrivet.'}`);
|
||||
@@ -442,9 +588,24 @@
|
||||
}
|
||||
await loadSavedDialogue();
|
||||
setStage('game');
|
||||
startPlayerPresence();
|
||||
announcePlayerChatHelp();
|
||||
}
|
||||
function announcePlayerChatHelp() {
|
||||
const key = 'ai-spel.player-chat-help.v1';
|
||||
try {
|
||||
if (localStorage.getItem(key) === 'true') return;
|
||||
localStorage.setItem(key, 'true');
|
||||
} catch (_) { /* The help remains available through dialogue questions. */ }
|
||||
appendLine('assistant', 'Du kan fråga vilka andra spelare som är här, säga “Säg till Robin: hej” för att skriva direkt till en spelare eller be mig visa meddelanden från spelare.');
|
||||
}
|
||||
async function handleLogout() {
|
||||
if (presenceTimer) clearInterval(presenceTimer);
|
||||
presenceTimer = null;
|
||||
playerMessagesPrimed = false;
|
||||
seenPlayerMessageIds.clear();
|
||||
await request('/api/logout', {method: 'POST'});
|
||||
if (location.pathname !== '/admin') appendLine('assistant', 'Du har loggat ut. Logga in igen för att fortsätta spela.');
|
||||
characterDraft = null;
|
||||
gameState = null;
|
||||
transcript.replaceChildren();
|
||||
@@ -482,7 +643,7 @@
|
||||
body: JSON.stringify({input: message, current_draft: characterDraft}),
|
||||
});
|
||||
characterDraft = proposal.draft;
|
||||
appendLine('assistant', `${proposal.message}\n\nFörslag: ${characterDraft.name}, ${characterDraft.age} år.\n${characterDraft.biography}\n\nSkriv ändringar eller “godkänn”.`);
|
||||
appendLine('assistant', `${proposal.message}\n\nFörslag: ${characterDraft.name}, ${characterDraft.age} år.\n${characterDraft.biography}${biographyContextText(characterDraft.life_context)}\n\nSkriv ändringar eller “godkänn”.`);
|
||||
} catch (error) {
|
||||
appendLine('assistant', `Jag kunde inte ta fram ett biografiförslag: ${error.message}. Försök igen när tjänsten svarar.`);
|
||||
}
|
||||
@@ -509,6 +670,7 @@
|
||||
else await proposeWorld(message);
|
||||
return;
|
||||
}
|
||||
if (await handlePlayerMessageCommand(message)) return;
|
||||
const idempotencyKey = pendingDialogue?.message === message
|
||||
? pendingDialogue.idempotencyKey
|
||||
: crypto.randomUUID();
|
||||
@@ -534,19 +696,19 @@
|
||||
gameState.world.version = result.world_version;
|
||||
gameState.world.world_time = result.world_time;
|
||||
pendingDialogue = null;
|
||||
if (result.intent === 'move') {
|
||||
if (result.intent === 'move' || result.intent === 'meet') {
|
||||
try {
|
||||
const refreshed = await request('/api/world');
|
||||
if (refreshed.world) gameState = refreshed;
|
||||
} catch (_) { /* The committed dialogue stays successful if this optional view refresh fails. */ }
|
||||
}
|
||||
const speakingNpc = result.intent === 'speak' ? gameState.world.npc : null;
|
||||
const speakingNpc = ['speak', 'meet'].includes(result.intent) ? gameState.world.npc : null;
|
||||
appendLine('assistant', result.reply, speakingNpc
|
||||
? {speaker: speakingNpc.name, voice: {characterId: speakingNpc.id, voiceIdentity: speakingNpc.voice_identity}}
|
||||
: {speaker: 'Berättelsen', voice: {role: 'narrator', voiceIdentity: 'neutral'}});
|
||||
} catch (error) {
|
||||
messageField.value = message;
|
||||
appendLine('assistant', `Meddelandet kunde inte behandlas: ${error.message}. Texten ligger kvar i inmatningen; skicka igen för att försöka på nytt.`);
|
||||
appendLine('assistant', `${explainDialogueError(error)} Ditt meddelande ligger kvar i inmatningen.`);
|
||||
}
|
||||
messageField.disabled = false;
|
||||
messageField.focus();
|
||||
@@ -562,7 +724,10 @@
|
||||
form.reset();
|
||||
if (location.pathname === '/admin') await openAdmin(); else await openGame();
|
||||
} catch (error) {
|
||||
window.alert(`Kunde inte logga in: ${error.message}`);
|
||||
const status = document.querySelector('#auth-status');
|
||||
status.textContent = explainAuthError(error, intent);
|
||||
status.hidden = false;
|
||||
if (location.pathname !== '/admin') voiceController.speak(status.textContent, {role: 'narrator', voiceIdentity: 'neutral'});
|
||||
}
|
||||
});
|
||||
async function submitMessage(input, source = 'text') {
|
||||
@@ -574,6 +739,10 @@
|
||||
refreshMicrophone();
|
||||
voiceController.stopListening();
|
||||
voiceController.cancelSpeech();
|
||||
// cancel() above may also have discarded Safari's silent speech-channel
|
||||
// primer. Restore it synchronously inside the submit gesture, before
|
||||
// waiting for the API response that will be read aloud.
|
||||
voiceController.activateFromUserGesture();
|
||||
messageField.value = '';
|
||||
try {
|
||||
if (stage === 'biography') await handleBiography(message);
|
||||
@@ -586,6 +755,87 @@
|
||||
if (!play.hidden && !messageField.disabled) messageField.focus();
|
||||
}
|
||||
}
|
||||
async function handlePlayerMessageCommand(message) {
|
||||
const listPlayers = /^(?:vilka (?:andra )?spelare är här|finns det andra spelare här)\??$/i.test(message.trim());
|
||||
const sendMatch = /^(?:säg|skriv|skicka) till ([^:]{1,80}):\s*(.{1,4000})$/is.exec(message.trim());
|
||||
const readMessages = /^(?:visa|läs upp) (?:de senaste )?meddelanden från spelare\.?$/i.test(message.trim());
|
||||
if (!listPlayers && !sendMatch && !readMessages) return false;
|
||||
appendLine('user', message);
|
||||
try {
|
||||
if (listPlayers) {
|
||||
const players = await request('/api/players/nearby');
|
||||
appendLine('assistant', players.length
|
||||
? `Här finns ${players.map(player => player.name).join(', ')} att prata med.`
|
||||
: 'Just nu finns inga andra inloggade spelare på platsen.');
|
||||
return true;
|
||||
}
|
||||
if (readMessages) {
|
||||
const messages = await request('/api/player/messages');
|
||||
const recent = messages.slice(-10);
|
||||
if (recent.length === 0) appendLine('assistant', 'Du har inga sparade meddelanden från andra spelare.');
|
||||
else for (const entry of recent) {
|
||||
seenPlayerMessageIds.add(entry.id);
|
||||
const isIncoming = entry.direction === 'incoming';
|
||||
appendLine(isIncoming ? 'assistant' : 'user', entry.message, isIncoming
|
||||
? {speaker: entry.sender_name, voice: {characterId: entry.sender_character_id, voiceIdentity: entry.sender_voice_identity}}
|
||||
: {speaker: 'Du', speak: false});
|
||||
}
|
||||
return true;
|
||||
}
|
||||
const players = await request('/api/players/nearby');
|
||||
const targetName = sendMatch[1].trim();
|
||||
const matches = players.filter(player => player.name.localeCompare(targetName, 'sv', {sensitivity: 'base'}) === 0);
|
||||
if (matches.length === 0) {
|
||||
appendLine('assistant', `Jag hittar ingen inloggad spelare som heter ${targetName} på platsen. Fråga vilka andra spelare som är här.`);
|
||||
return true;
|
||||
}
|
||||
if (matches.length > 1) {
|
||||
appendLine('assistant', `Flera spelare heter ${targetName}. Säg vilket namn de använder i spelet.`);
|
||||
return true;
|
||||
}
|
||||
const key = pendingPlayerMessage?.text === sendMatch[2] && pendingPlayerMessage?.target === matches[0].character_id
|
||||
? pendingPlayerMessage.key
|
||||
: crypto.randomUUID();
|
||||
pendingPlayerMessage = {text: sendMatch[2], target: matches[0].character_id, key};
|
||||
const result = await request(`/api/players/${encodeURIComponent(matches[0].character_id)}/messages`, {
|
||||
method: 'POST', headers: {'content-type': 'application/json'},
|
||||
body: JSON.stringify({message: sendMatch[2], idempotency_key: key}),
|
||||
});
|
||||
pendingPlayerMessage = null;
|
||||
appendLine('assistant', `Ditt meddelande skickades till ${matches[0].name}.`);
|
||||
return Boolean(result.message_id);
|
||||
} catch (error) {
|
||||
messageField.value = message;
|
||||
appendLine('assistant', `Spelarmeddelandet kunde inte hanteras: ${explainDialogueError(error)}`);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
let pendingPlayerMessage = null;
|
||||
async function startPlayerPresence() {
|
||||
if (presenceTimer) clearInterval(presenceTimer);
|
||||
const refresh = async (announceNewMessages) => {
|
||||
if (play.hidden || stage !== 'game') return;
|
||||
try {
|
||||
await request('/api/presence/heartbeat', {method: 'POST'});
|
||||
const messages = await request('/api/player/messages');
|
||||
for (const entry of messages) {
|
||||
if (seenPlayerMessageIds.has(entry.id)) continue;
|
||||
if (announceNewMessages && entry.direction === 'incoming'
|
||||
&& (submitBusy || ['LISTENING', 'PROCESSING', 'SPEAKING'].includes(voiceController.getState()))) continue;
|
||||
seenPlayerMessageIds.add(entry.id);
|
||||
if (announceNewMessages && entry.direction === 'incoming') {
|
||||
appendLine('assistant', entry.message, {
|
||||
speaker: entry.sender_name,
|
||||
voice: {characterId: entry.sender_character_id, voiceIdentity: entry.sender_voice_identity},
|
||||
});
|
||||
}
|
||||
}
|
||||
playerMessagesPrimed = true;
|
||||
} catch (_) { /* Presence is a hint; the text game remains usable if it is unavailable. */ }
|
||||
};
|
||||
await refresh(playerMessagesPrimed);
|
||||
presenceTimer = setInterval(() => refresh(true), 30_000);
|
||||
}
|
||||
document.querySelector('#message-form').addEventListener('submit', async (event) => {
|
||||
event.preventDefault();
|
||||
await submitMessage(messageField.value);
|
||||
@@ -596,6 +846,7 @@
|
||||
if (button.dataset.adminView === 'players') await loadAdminPlayers();
|
||||
else if (button.dataset.adminView === 'prompts') await loadAdminPrompts();
|
||||
else if (button.dataset.adminView === 'rules') await loadAdminRules();
|
||||
else if (button.dataset.adminView === 'logging') await loadAdminLogging();
|
||||
else await loadAdminAudit();
|
||||
} catch (error) { adminContent.replaceChildren(); adminElement('p', `Vyn kunde inte läsas: ${error.message}`); }
|
||||
finally { adminContent.setAttribute('aria-busy', 'false'); }
|
||||
@@ -612,6 +863,11 @@
|
||||
}).catch(() => {
|
||||
document.querySelector('#api-version').textContent = 'otillgänglig';
|
||||
});
|
||||
request('/static/version.json', {cache: 'no-store'}).then(({version}) => {
|
||||
document.querySelector('#static-version').textContent = version;
|
||||
}).catch(() => {
|
||||
document.querySelector('#static-version').textContent = 'otillgänglig';
|
||||
});
|
||||
request('/api/me').then(() => location.pathname === '/admin' ? openAdmin() : openGame()).catch(showAuth);
|
||||
</script>
|
||||
</body>
|
||||
|
||||
+20
-1
@@ -9,8 +9,27 @@ server {
|
||||
return 204;
|
||||
}
|
||||
|
||||
location ^~ /tts/piper-wasm-v1/ {
|
||||
types {
|
||||
application/wasm wasm;
|
||||
application/javascript js mjs;
|
||||
application/json json;
|
||||
application/octet-stream onnx;
|
||||
text/plain txt;
|
||||
}
|
||||
add_header Cache-Control "public, max-age=31536000, immutable" always;
|
||||
add_header Cross-Origin-Opener-Policy "same-origin" always;
|
||||
add_header Cross-Origin-Embedder-Policy "require-corp" always;
|
||||
add_header Cross-Origin-Resource-Policy "same-origin" always;
|
||||
try_files $uri =404;
|
||||
}
|
||||
|
||||
location / {
|
||||
add_header Cache-Control "no-cache" always;
|
||||
add_header Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0" always;
|
||||
add_header Pragma "no-cache" always;
|
||||
add_header Expires "0" always;
|
||||
add_header Cross-Origin-Opener-Policy "same-origin" always;
|
||||
add_header Cross-Origin-Embedder-Policy "require-corp" always;
|
||||
try_files $uri $uri/ /index.html;
|
||||
}
|
||||
}
|
||||
|
||||
Generated
+610
@@ -0,0 +1,610 @@
|
||||
{
|
||||
"name": "ai-spel-frontend-assets",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "ai-spel-frontend-assets",
|
||||
"dependencies": {
|
||||
"@diffusionstudio/piper-wasm": "1.0.0",
|
||||
"@mintplex-labs/piper-tts-web": "1.0.3",
|
||||
"esbuild": "0.25.5",
|
||||
"onnxruntime-web": "1.20.1"
|
||||
}
|
||||
},
|
||||
"node_modules/@diffusionstudio/piper-wasm": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/@diffusionstudio/piper-wasm/-/piper-wasm-1.0.0.tgz",
|
||||
"integrity": "sha512-4Hgh7wJ1PuGEVgVi1CpducESnyXwjFRJN4zXjYRpxgquM+Zh6Eqq8ZaiGpCKm4yXvT1Y2SPQXbv0dEckFD9NaQ==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@esbuild/aix-ppc64": {
|
||||
"version": "0.25.5",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.5.tgz",
|
||||
"integrity": "sha512-9o3TMmpmftaCMepOdA5k/yDw8SfInyzWWTjYTFCX3kPSDJMROQTb8jg+h9Cnwnmm1vOzvxN7gIfB5V2ewpjtGA==",
|
||||
"cpu": [
|
||||
"ppc64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"aix"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/android-arm": {
|
||||
"version": "0.25.5",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.5.tgz",
|
||||
"integrity": "sha512-AdJKSPeEHgi7/ZhuIPtcQKr5RQdo6OO2IL87JkianiMYMPbCtot9fxPbrMiBADOWWm3T2si9stAiVsGbTQFkbA==",
|
||||
"cpu": [
|
||||
"arm"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"android"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/android-arm64": {
|
||||
"version": "0.25.5",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.5.tgz",
|
||||
"integrity": "sha512-VGzGhj4lJO+TVGV1v8ntCZWJktV7SGCs3Pn1GRWI1SBFtRALoomm8k5E9Pmwg3HOAal2VDc2F9+PM/rEY6oIDg==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"android"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/android-x64": {
|
||||
"version": "0.25.5",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.5.tgz",
|
||||
"integrity": "sha512-D2GyJT1kjvO//drbRT3Hib9XPwQeWd9vZoBJn+bu/lVsOZ13cqNdDeqIF/xQ5/VmWvMduP6AmXvylO/PIc2isw==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"android"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/darwin-arm64": {
|
||||
"version": "0.25.5",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.5.tgz",
|
||||
"integrity": "sha512-GtaBgammVvdF7aPIgH2jxMDdivezgFu6iKpmT+48+F8Hhg5J/sfnDieg0aeG/jfSvkYQU2/pceFPDKlqZzwnfQ==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"darwin"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/darwin-x64": {
|
||||
"version": "0.25.5",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.5.tgz",
|
||||
"integrity": "sha512-1iT4FVL0dJ76/q1wd7XDsXrSW+oLoquptvh4CLR4kITDtqi2e/xwXwdCVH8hVHU43wgJdsq7Gxuzcs6Iq/7bxQ==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"darwin"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/freebsd-arm64": {
|
||||
"version": "0.25.5",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.5.tgz",
|
||||
"integrity": "sha512-nk4tGP3JThz4La38Uy/gzyXtpkPW8zSAmoUhK9xKKXdBCzKODMc2adkB2+8om9BDYugz+uGV7sLmpTYzvmz6Sw==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"freebsd"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/freebsd-x64": {
|
||||
"version": "0.25.5",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.5.tgz",
|
||||
"integrity": "sha512-PrikaNjiXdR2laW6OIjlbeuCPrPaAl0IwPIaRv+SMV8CiM8i2LqVUHFC1+8eORgWyY7yhQY+2U2fA55mBzReaw==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"freebsd"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/linux-arm": {
|
||||
"version": "0.25.5",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.5.tgz",
|
||||
"integrity": "sha512-cPzojwW2okgh7ZlRpcBEtsX7WBuqbLrNXqLU89GxWbNt6uIg78ET82qifUy3W6OVww6ZWobWub5oqZOVtwolfw==",
|
||||
"cpu": [
|
||||
"arm"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/linux-arm64": {
|
||||
"version": "0.25.5",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.5.tgz",
|
||||
"integrity": "sha512-Z9kfb1v6ZlGbWj8EJk9T6czVEjjq2ntSYLY2cw6pAZl4oKtfgQuS4HOq41M/BcoLPzrUbNd+R4BXFyH//nHxVg==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/linux-ia32": {
|
||||
"version": "0.25.5",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.5.tgz",
|
||||
"integrity": "sha512-sQ7l00M8bSv36GLV95BVAdhJ2QsIbCuCjh/uYrWiMQSUuV+LpXwIqhgJDcvMTj+VsQmqAHL2yYaasENvJ7CDKA==",
|
||||
"cpu": [
|
||||
"ia32"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/linux-loong64": {
|
||||
"version": "0.25.5",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.5.tgz",
|
||||
"integrity": "sha512-0ur7ae16hDUC4OL5iEnDb0tZHDxYmuQyhKhsPBV8f99f6Z9KQM02g33f93rNH5A30agMS46u2HP6qTdEt6Q1kg==",
|
||||
"cpu": [
|
||||
"loong64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/linux-mips64el": {
|
||||
"version": "0.25.5",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.5.tgz",
|
||||
"integrity": "sha512-kB/66P1OsHO5zLz0i6X0RxlQ+3cu0mkxS3TKFvkb5lin6uwZ/ttOkP3Z8lfR9mJOBk14ZwZ9182SIIWFGNmqmg==",
|
||||
"cpu": [
|
||||
"mips64el"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/linux-ppc64": {
|
||||
"version": "0.25.5",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.5.tgz",
|
||||
"integrity": "sha512-UZCmJ7r9X2fe2D6jBmkLBMQetXPXIsZjQJCjgwpVDz+YMcS6oFR27alkgGv3Oqkv07bxdvw7fyB71/olceJhkQ==",
|
||||
"cpu": [
|
||||
"ppc64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/linux-riscv64": {
|
||||
"version": "0.25.5",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.5.tgz",
|
||||
"integrity": "sha512-kTxwu4mLyeOlsVIFPfQo+fQJAV9mh24xL+y+Bm6ej067sYANjyEw1dNHmvoqxJUCMnkBdKpvOn0Ahql6+4VyeA==",
|
||||
"cpu": [
|
||||
"riscv64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/linux-s390x": {
|
||||
"version": "0.25.5",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.5.tgz",
|
||||
"integrity": "sha512-K2dSKTKfmdh78uJ3NcWFiqyRrimfdinS5ErLSn3vluHNeHVnBAFWC8a4X5N+7FgVE1EjXS1QDZbpqZBjfrqMTQ==",
|
||||
"cpu": [
|
||||
"s390x"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/linux-x64": {
|
||||
"version": "0.25.5",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.5.tgz",
|
||||
"integrity": "sha512-uhj8N2obKTE6pSZ+aMUbqq+1nXxNjZIIjCjGLfsWvVpy7gKCOL6rsY1MhRh9zLtUtAI7vpgLMK6DxjO8Qm9lJw==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/netbsd-arm64": {
|
||||
"version": "0.25.5",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.5.tgz",
|
||||
"integrity": "sha512-pwHtMP9viAy1oHPvgxtOv+OkduK5ugofNTVDilIzBLpoWAM16r7b/mxBvfpuQDpRQFMfuVr5aLcn4yveGvBZvw==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"netbsd"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/netbsd-x64": {
|
||||
"version": "0.25.5",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.5.tgz",
|
||||
"integrity": "sha512-WOb5fKrvVTRMfWFNCroYWWklbnXH0Q5rZppjq0vQIdlsQKuw6mdSihwSo4RV/YdQ5UCKKvBy7/0ZZYLBZKIbwQ==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"netbsd"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/openbsd-arm64": {
|
||||
"version": "0.25.5",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.5.tgz",
|
||||
"integrity": "sha512-7A208+uQKgTxHd0G0uqZO8UjK2R0DDb4fDmERtARjSHWxqMTye4Erz4zZafx7Di9Cv+lNHYuncAkiGFySoD+Mw==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"openbsd"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/openbsd-x64": {
|
||||
"version": "0.25.5",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.5.tgz",
|
||||
"integrity": "sha512-G4hE405ErTWraiZ8UiSoesH8DaCsMm0Cay4fsFWOOUcz8b8rC6uCvnagr+gnioEjWn0wC+o1/TAHt+It+MpIMg==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"openbsd"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/sunos-x64": {
|
||||
"version": "0.25.5",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.5.tgz",
|
||||
"integrity": "sha512-l+azKShMy7FxzY0Rj4RCt5VD/q8mG/e+mDivgspo+yL8zW7qEwctQ6YqKX34DTEleFAvCIUviCFX1SDZRSyMQA==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"sunos"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/win32-arm64": {
|
||||
"version": "0.25.5",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.5.tgz",
|
||||
"integrity": "sha512-O2S7SNZzdcFG7eFKgvwUEZ2VG9D/sn/eIiz8XRZ1Q/DO5a3s76Xv0mdBzVM5j5R639lXQmPmSo0iRpHqUUrsxw==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"win32"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/win32-ia32": {
|
||||
"version": "0.25.5",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.5.tgz",
|
||||
"integrity": "sha512-onOJ02pqs9h1iMJ1PQphR+VZv8qBMQ77Klcsqv9CNW2w6yLqoURLcgERAIurY6QE63bbLuqgP9ATqajFLK5AMQ==",
|
||||
"cpu": [
|
||||
"ia32"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"win32"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@esbuild/win32-x64": {
|
||||
"version": "0.25.5",
|
||||
"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.5.tgz",
|
||||
"integrity": "sha512-TXv6YnJ8ZMVdX+SXWVBo/0p8LTcrUYngpWjvm91TMjjBQii7Oz11Lw5lbDV5Y0TzuhSJHwiH4hEtC1I42mMS0g==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"win32"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@mintplex-labs/piper-tts-web": {
|
||||
"version": "1.0.3",
|
||||
"resolved": "https://registry.npmjs.org/@mintplex-labs/piper-tts-web/-/piper-tts-web-1.0.3.tgz",
|
||||
"integrity": "sha512-vjYiEgigm0JHt9yKxj0euQd2eHIhtbGgWyeySLTPG+CdCH9RMf10WtczpeslboUYAvX5Eaxh6RMK+IuHU2rNhw==",
|
||||
"license": "MIT",
|
||||
"peerDependencies": {
|
||||
"onnxruntime-web": "^1.18.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@protobufjs/aspromise": {
|
||||
"version": "1.1.2",
|
||||
"resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
|
||||
"integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==",
|
||||
"license": "BSD-3-Clause"
|
||||
},
|
||||
"node_modules/@protobufjs/base64": {
|
||||
"version": "1.1.2",
|
||||
"resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
|
||||
"integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==",
|
||||
"license": "BSD-3-Clause"
|
||||
},
|
||||
"node_modules/@protobufjs/codegen": {
|
||||
"version": "2.0.5",
|
||||
"resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.5.tgz",
|
||||
"integrity": "sha512-zgXFLzW3Ap33e6d0Wlj4MGIm6Ce8O89n/apUaGNB/jx+hw+ruWEp7EwGUshdLKVRCxZW12fp9r40E1mQrf/34g==",
|
||||
"license": "BSD-3-Clause"
|
||||
},
|
||||
"node_modules/@protobufjs/eventemitter": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.1.tgz",
|
||||
"integrity": "sha512-vW1GmwMZNnL+gMRaovlh9yZX74kc+TTU3FObkkurpMaRtBfLP3ldjS9KQWlwZgraRE0+dheEEoAxdzcJQ8eXZg==",
|
||||
"license": "BSD-3-Clause"
|
||||
},
|
||||
"node_modules/@protobufjs/fetch": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.1.tgz",
|
||||
"integrity": "sha512-GpptLrs57adMSuHi3VNj0mAF8dwh36LMaYF6XyJ6JMWlVsc+t42tm1HSEDmOs3A8fC9yyeisgLhsTVQokOZ0zw==",
|
||||
"license": "BSD-3-Clause",
|
||||
"dependencies": {
|
||||
"@protobufjs/aspromise": "^1.1.1"
|
||||
}
|
||||
},
|
||||
"node_modules/@protobufjs/float": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
|
||||
"integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==",
|
||||
"license": "BSD-3-Clause"
|
||||
},
|
||||
"node_modules/@protobufjs/path": {
|
||||
"version": "1.1.2",
|
||||
"resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
|
||||
"integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==",
|
||||
"license": "BSD-3-Clause"
|
||||
},
|
||||
"node_modules/@protobufjs/pool": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
|
||||
"integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==",
|
||||
"license": "BSD-3-Clause"
|
||||
},
|
||||
"node_modules/@protobufjs/utf8": {
|
||||
"version": "1.1.2",
|
||||
"resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.2.tgz",
|
||||
"integrity": "sha512-b1UQwcEZ4yCnMCD8DAL1VlbvBJE9/IX4FTIp7BG1xYpf29SLazLSrqUkj4w7Y5y7cCVP6E5tcqqcI0xemPkHug==",
|
||||
"license": "BSD-3-Clause"
|
||||
},
|
||||
"node_modules/@types/node": {
|
||||
"version": "26.6.5",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-26.6.5.tgz",
|
||||
"integrity": "sha512-uMzsv9stDdofIZBx4UGh4Z9ZgXnGC9seRDscilBcTHAeOFk67MZg/k9bWVfO+bk4qZmG+l52hRnLwUiH2LnJTg==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"undici-types": "~8.9.0"
|
||||
}
|
||||
},
|
||||
"node_modules/esbuild": {
|
||||
"version": "0.25.5",
|
||||
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.5.tgz",
|
||||
"integrity": "sha512-P8OtKZRv/5J5hhz0cUAdu/cLuPIKXpQl1R9pZtvmHWQvrAUVd0UNIPT4IB4W3rNOqVO0rlqHmCIbSwxh/c9yUQ==",
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"bin": {
|
||||
"esbuild": "bin/esbuild"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"@esbuild/aix-ppc64": "0.25.5",
|
||||
"@esbuild/android-arm": "0.25.5",
|
||||
"@esbuild/android-arm64": "0.25.5",
|
||||
"@esbuild/android-x64": "0.25.5",
|
||||
"@esbuild/darwin-arm64": "0.25.5",
|
||||
"@esbuild/darwin-x64": "0.25.5",
|
||||
"@esbuild/freebsd-arm64": "0.25.5",
|
||||
"@esbuild/freebsd-x64": "0.25.5",
|
||||
"@esbuild/linux-arm": "0.25.5",
|
||||
"@esbuild/linux-arm64": "0.25.5",
|
||||
"@esbuild/linux-ia32": "0.25.5",
|
||||
"@esbuild/linux-loong64": "0.25.5",
|
||||
"@esbuild/linux-mips64el": "0.25.5",
|
||||
"@esbuild/linux-ppc64": "0.25.5",
|
||||
"@esbuild/linux-riscv64": "0.25.5",
|
||||
"@esbuild/linux-s390x": "0.25.5",
|
||||
"@esbuild/linux-x64": "0.25.5",
|
||||
"@esbuild/netbsd-arm64": "0.25.5",
|
||||
"@esbuild/netbsd-x64": "0.25.5",
|
||||
"@esbuild/openbsd-arm64": "0.25.5",
|
||||
"@esbuild/openbsd-x64": "0.25.5",
|
||||
"@esbuild/sunos-x64": "0.25.5",
|
||||
"@esbuild/win32-arm64": "0.25.5",
|
||||
"@esbuild/win32-ia32": "0.25.5",
|
||||
"@esbuild/win32-x64": "0.25.5"
|
||||
}
|
||||
},
|
||||
"node_modules/flatbuffers": {
|
||||
"version": "1.12.0",
|
||||
"resolved": "https://registry.npmjs.org/flatbuffers/-/flatbuffers-1.12.0.tgz",
|
||||
"integrity": "sha512-c7CZADjRcl6j0PlvFy0ZqXQ67qSEZfrVPynmnL+2zPc+NtMvrF8Y0QceMo7QqnSPc7+uWjUIAbvCQ5WIKlMVdQ==",
|
||||
"license": "SEE LICENSE IN LICENSE.txt"
|
||||
},
|
||||
"node_modules/guid-typescript": {
|
||||
"version": "1.0.9",
|
||||
"resolved": "https://registry.npmjs.org/guid-typescript/-/guid-typescript-1.0.9.tgz",
|
||||
"integrity": "sha512-Y8T4vYhEfwJOTbouREvG+3XDsjr8E3kIr7uf+JZ0BYloFsttiHU0WfvANVsR7TxNUJa/WpCnw/Ino/p+DeBhBQ==",
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/long": {
|
||||
"version": "5.3.2",
|
||||
"resolved": "https://registry.npmjs.org/long/-/long-5.3.2.tgz",
|
||||
"integrity": "sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA==",
|
||||
"license": "Apache-2.0"
|
||||
},
|
||||
"node_modules/onnxruntime-common": {
|
||||
"version": "1.20.1",
|
||||
"resolved": "https://registry.npmjs.org/onnxruntime-common/-/onnxruntime-common-1.20.1.tgz",
|
||||
"integrity": "sha512-YiU0s0IzYYC+gWvqD1HzLc46Du1sXpSiwzKb63PACIJr6LfL27VsXSXQvt68EzD3V0D5Bc0vyJTjmMxp0ylQiw==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/onnxruntime-web": {
|
||||
"version": "1.20.1",
|
||||
"resolved": "https://registry.npmjs.org/onnxruntime-web/-/onnxruntime-web-1.20.1.tgz",
|
||||
"integrity": "sha512-TePF6XVpLL1rWVMIl5Y9ACBQcyCNFThZON/jgElNd9Txb73CIEGlklhYR3UEr1cp5r0rbGI6nDwwrs79g7WjoA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"flatbuffers": "^1.12.0",
|
||||
"guid-typescript": "^1.0.9",
|
||||
"long": "^5.2.3",
|
||||
"onnxruntime-common": "1.20.1",
|
||||
"platform": "^1.3.6",
|
||||
"protobufjs": "^7.2.4"
|
||||
}
|
||||
},
|
||||
"node_modules/platform": {
|
||||
"version": "1.3.6",
|
||||
"resolved": "https://registry.npmjs.org/platform/-/platform-1.3.6.tgz",
|
||||
"integrity": "sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/protobufjs": {
|
||||
"version": "7.6.6",
|
||||
"resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.6.6.tgz",
|
||||
"integrity": "sha512-dYDWdjSl5RNb7SgPxGQcRU+GtvP7s2fpkrY0r432PcOIaZ0/rBcxEZnQN67iJhFuQiVw754JDoPruPCNdGsbjg==",
|
||||
"hasInstallScript": true,
|
||||
"license": "BSD-3-Clause",
|
||||
"dependencies": {
|
||||
"@protobufjs/aspromise": "^1.1.2",
|
||||
"@protobufjs/base64": "^1.1.2",
|
||||
"@protobufjs/codegen": "^2.0.5",
|
||||
"@protobufjs/eventemitter": "^1.1.1",
|
||||
"@protobufjs/fetch": "^1.1.1",
|
||||
"@protobufjs/float": "^1.0.2",
|
||||
"@protobufjs/path": "^1.1.2",
|
||||
"@protobufjs/pool": "^1.1.0",
|
||||
"@protobufjs/utf8": "^1.1.1",
|
||||
"@types/node": ">=13.7.0",
|
||||
"long": "^5.3.2"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=12.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/undici-types": {
|
||||
"version": "8.9.0",
|
||||
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-8.9.0.tgz",
|
||||
"integrity": "sha512-KTDyRTYX8sWmKXAikPHHSyc63CRPETMctyjKFupcC6OBLXT3xsN0e9aF7m+mIXutFWpUXuedtowG7iLOzp0kQg==",
|
||||
"license": "MIT"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
{
|
||||
"name": "ai-spel-frontend-assets",
|
||||
"private": true,
|
||||
"description": "Build-only Piper WebAssembly assets for the static game client.",
|
||||
"scripts": {
|
||||
"build:piper": "node scripts/build-piper.mjs"
|
||||
},
|
||||
"dependencies": {
|
||||
"@diffusionstudio/piper-wasm": "1.0.0",
|
||||
"@mintplex-labs/piper-tts-web": "1.0.3",
|
||||
"esbuild": "0.25.5",
|
||||
"onnxruntime-web": "1.20.1"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
const PIPER_MODEL_ORIGIN = 'https://huggingface.co/diffusionstudio/piper-voices/resolve/main/';
|
||||
const localPathPrefix = '/static/piper-wasm-v1/voices/';
|
||||
|
||||
export function localPiperModelUrl(requestedUrl, origin) {
|
||||
if (!requestedUrl.startsWith(PIPER_MODEL_ORIGIN)) return null;
|
||||
const relativePath = requestedUrl.slice(PIPER_MODEL_ORIGIN.length);
|
||||
if (!/^[\w./-]+$/.test(relativePath) || relativePath.split('/').includes('..')) return null;
|
||||
return new URL(`${localPathPrefix}${relativePath}`, origin).href;
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
const assetRoot = '/static/piper-wasm-v1/onnx/';
|
||||
|
||||
export function createOnnxWasmPaths(origin) {
|
||||
const absoluteAssetRoot = new URL(assetRoot, origin).href;
|
||||
return absoluteAssetRoot;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
const version = document.querySelector('#frontend-version')?.textContent || 'dev';
|
||||
const workerUrl = `/tts/piper-wasm-v1/piper-worker.js?v=${encodeURIComponent(version)}`;
|
||||
let worker;
|
||||
let requestId = 0;
|
||||
const pending = new Map();
|
||||
|
||||
function getWorker() {
|
||||
if (worker) return worker;
|
||||
// ONNX Runtime resolves its WASM loader relative to the worker module URL.
|
||||
// Keep the worker as ESM so import.meta.url remains available at runtime.
|
||||
worker = new Worker(workerUrl, {type: 'module'});
|
||||
worker.onmessage = event => {
|
||||
const message = event.data || {};
|
||||
const request = pending.get(message.id);
|
||||
if (!request) return;
|
||||
if (message.type === 'progress') {
|
||||
request.onProgress?.(message.progress);
|
||||
} else {
|
||||
pending.delete(message.id);
|
||||
if (message.type === 'audio') request.resolve(new Blob([message.audio], {type: 'audio/x-wav'}));
|
||||
else request.reject(new Error(message.error || 'Piper-arbetaren misslyckades.'));
|
||||
}
|
||||
};
|
||||
worker.onerror = event => {
|
||||
const details = [event.message, event.filename && `${event.filename}:${event.lineno || 0}:${event.colno || 0}`]
|
||||
.filter(Boolean)
|
||||
.join(' — ');
|
||||
const error = new Error(details
|
||||
? `Piper-arbetaren kunde inte startas: ${details}`
|
||||
: 'Piper-arbetaren kunde inte startas.');
|
||||
for (const request of pending.values()) request.reject(error);
|
||||
pending.clear();
|
||||
worker?.terminate();
|
||||
worker = null;
|
||||
};
|
||||
worker.onmessageerror = () => {
|
||||
const error = new Error('Piper-arbetaren skickade ett oläsbart svar.');
|
||||
for (const request of pending.values()) request.reject(error);
|
||||
pending.clear();
|
||||
worker?.terminate();
|
||||
worker = null;
|
||||
};
|
||||
return worker;
|
||||
}
|
||||
|
||||
window.GamePiper = {
|
||||
voiceId: 'sv_SE-nst-medium',
|
||||
synthesize(text, onProgress) {
|
||||
return new Promise((resolve, reject) => {
|
||||
const id = ++requestId;
|
||||
pending.set(id, {resolve, reject, onProgress});
|
||||
try { getWorker().postMessage({id, text: String(text)}); }
|
||||
catch (error) { pending.delete(id); reject(error); }
|
||||
});
|
||||
},
|
||||
};
|
||||
@@ -0,0 +1,55 @@
|
||||
import {TtsSession} from '@mintplex-labs/piper-tts-web';
|
||||
import {localPiperModelUrl} from './piper-model-routing.mjs';
|
||||
import {createOnnxWasmPaths} from './piper-onnx-config.mjs';
|
||||
|
||||
const VOICE_ID = 'sv_SE-nst-medium';
|
||||
const ASSET_ROOT = '/static/piper-wasm-v1';
|
||||
const localFetch = self.fetch.bind(self);
|
||||
|
||||
// Keep the TTS library's OPFS cache logic, but serve models/config from the
|
||||
// same-origin static asset service instead of its built-in external model URL.
|
||||
self.fetch = (resource, options) => {
|
||||
const requestedUrl = resource instanceof Request ? resource.url : String(resource);
|
||||
const localModelUrl = localPiperModelUrl(requestedUrl, self.location.origin);
|
||||
if (!localModelUrl) return localFetch(resource, options);
|
||||
const redirected = resource instanceof Request ? new Request(localModelUrl, resource) : localModelUrl;
|
||||
return localFetch(redirected, options);
|
||||
};
|
||||
|
||||
let sessionPromise;
|
||||
let inferenceQueue = Promise.resolve();
|
||||
|
||||
async function getSession(onProgress) {
|
||||
if (!sessionPromise) {
|
||||
sessionPromise = TtsSession.create({
|
||||
voiceId: VOICE_ID,
|
||||
progress: onProgress,
|
||||
wasmPaths: {
|
||||
onnxWasm: createOnnxWasmPaths(self.location.origin),
|
||||
piperData: `${ASSET_ROOT}/piper/piper_phonemize.data`,
|
||||
piperWasm: `${ASSET_ROOT}/piper/piper_phonemize.wasm`,
|
||||
},
|
||||
}).catch(error => {
|
||||
sessionPromise = null;
|
||||
throw error;
|
||||
});
|
||||
}
|
||||
return sessionPromise;
|
||||
}
|
||||
|
||||
async function synthesizeMessage(event) {
|
||||
const {id, text} = event.data || {};
|
||||
if (!Number.isSafeInteger(id) || typeof text !== 'string') return;
|
||||
try {
|
||||
const session = await getSession(progress => self.postMessage({id, type: 'progress', progress}));
|
||||
const blob = await session.predict(text);
|
||||
const audio = await blob.arrayBuffer();
|
||||
self.postMessage({id, type: 'audio', audio}, [audio]);
|
||||
} catch (error) {
|
||||
self.postMessage({id, type: 'error', error: String(error?.message || error)});
|
||||
}
|
||||
}
|
||||
|
||||
self.addEventListener('message', event => {
|
||||
inferenceQueue = inferenceQueue.then(() => synthesizeMessage(event));
|
||||
});
|
||||
@@ -0,0 +1,46 @@
|
||||
import {build} from 'esbuild';
|
||||
import {mkdir, rm, readFile} from 'node:fs/promises';
|
||||
import {join, resolve} from 'node:path';
|
||||
|
||||
const root = process.cwd();
|
||||
const publicRoot = join(root, 'public');
|
||||
const workerRoot = join(publicRoot, 'tts', 'piper-wasm-v1');
|
||||
|
||||
await rm(workerRoot, {recursive: true, force: true});
|
||||
await mkdir(workerRoot, {recursive: true});
|
||||
|
||||
await build({
|
||||
entryPoints: [resolve(root, 'piper-runtime.js')],
|
||||
outfile: join(publicRoot, 'piper-runtime.js'),
|
||||
bundle: true,
|
||||
format: 'iife',
|
||||
platform: 'browser',
|
||||
target: ['es2022'],
|
||||
external: ['fs', 'path'],
|
||||
sourcemap: false,
|
||||
legalComments: 'none',
|
||||
});
|
||||
|
||||
await build({
|
||||
entryPoints: [resolve(root, 'piper-worker.js')],
|
||||
outfile: join(workerRoot, 'piper-worker.js'),
|
||||
bundle: true,
|
||||
format: 'esm',
|
||||
platform: 'browser',
|
||||
target: ['es2022'],
|
||||
external: ['fs', 'path'],
|
||||
sourcemap: false,
|
||||
legalComments: 'none',
|
||||
});
|
||||
|
||||
const workerBundle = await readFile(join(workerRoot, 'piper-worker.js'), 'utf8');
|
||||
for (const route of [
|
||||
'https://huggingface.co/diffusionstudio/piper-voices/resolve/main/',
|
||||
'/static/piper-wasm-v1',
|
||||
'/static/piper-wasm-v1/voices/',
|
||||
'/static/piper-wasm-v1/onnx/',
|
||||
]) {
|
||||
if (!workerBundle.includes(route)) throw new Error(`The Piper worker is missing static route ${route}`);
|
||||
}
|
||||
|
||||
console.log(`Piper worker bundle prepared at ${workerRoot}`);
|
||||
@@ -4,32 +4,76 @@ set -euo pipefail
|
||||
test -s index.html
|
||||
grep -q '<html lang="sv">' index.html
|
||||
grep -q 'id="frontend-version">__FRONTEND_VERSION__' index.html
|
||||
grep -q '<script src="/voice.js?v=__FRONTEND_VERSION__"></script>' index.html
|
||||
grep -q '<script src="/piper-runtime.js?v=__FRONTEND_VERSION__"></script>' index.html
|
||||
grep -q 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0' nginx/default.conf
|
||||
grep -q 'Cross-Origin-Embedder-Policy "require-corp"' nginx/default.conf
|
||||
grep -q 'add_header Cross-Origin-Embedder-Policy "require-corp" always;' nginx/default.conf
|
||||
grep -q 'add_header Cross-Origin-Resource-Policy "same-origin" always;' nginx/default.conf
|
||||
grep -q 'application/javascript js mjs;' nginx/default.conf
|
||||
grep -q "request('/version')" index.html
|
||||
grep -q 'id="static-version">hämtar version…' index.html
|
||||
grep -q "request('/static/version.json', {cache: 'no-store'})" index.html
|
||||
grep -Fq "credentials: 'same-origin'" index.html
|
||||
grep -q 'id="dialogue" aria-label="Dialoghistorik" role="log" aria-live="polite"' index.html
|
||||
grep -q 'id="message" name="message"' index.html
|
||||
grep -q 'id="auth-intro"' index.html
|
||||
grep -q 'Skapa konto med ett användarnamn och ett lösenord på minst tolv tecken' index.html
|
||||
grep -q 'id="auth-repeat-intro"' index.html
|
||||
grep -q 'function playFirstVisitIntroduction' index.html
|
||||
grep -q 'id="auth-voice-status" role="status" aria-live="polite"' index.html
|
||||
grep -q 'activateFromUserGesture' index.html
|
||||
grep -q 'function showSpeechRecovery' index.html
|
||||
grep -q "retry.textContent = 'Läs senaste repliken'" index.html
|
||||
grep -q "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="voice-status" role="status" aria-live="polite"' index.html
|
||||
grep -q "window.GameVoice.createVoiceController" index.html
|
||||
grep -q "addVoiceButton(item, 'Testa ljudet'" index.html
|
||||
grep -q 'Jag förstår – starta mikrofonen' index.html
|
||||
grep -q 'supportsRecognition' voice.js
|
||||
grep -q 'characterVoiceProfile' voice.js
|
||||
grep -q 'utterance.volume = 1' voice.js
|
||||
grep -q 'Webbläsaren har startat talsyntesen' voice.js
|
||||
grep -q 'WebKit versions before Safari 27' voice.js
|
||||
grep -q "voiceIdentity: speakingNpc.voice_identity" index.html
|
||||
grep -q "role: 'narrator', voiceIdentity: 'neutral'" index.html
|
||||
grep -q 'COPY voice.js /usr/share/nginx/html/voice.js' Dockerfile
|
||||
grep -q 'COPY public/piper-runtime.js /usr/share/nginx/html/piper-runtime.js' Dockerfile
|
||||
grep -q 'COPY public/tts/piper-wasm-v1/' Dockerfile
|
||||
grep -q 'build:piper' .gitea/workflows/publish.yaml
|
||||
grep -q 'Piper' piper-runtime.js
|
||||
grep -q 'sv_SE-nst-medium' piper-worker.js
|
||||
grep -q "new Worker(workerUrl, {type: 'module'})" piper-runtime.js
|
||||
grep -q 'worker.js?v=' piper-runtime.js
|
||||
grep -q 'worker.onmessageerror' piper-runtime.js
|
||||
grep -q 'localPiperModelUrl' piper-worker.js
|
||||
grep -q 'createOnnxWasmPaths(self.location.origin)' piper-worker.js
|
||||
grep -q '/static/piper-wasm-v1/onnx/' piper-onnx-config.mjs
|
||||
grep -q 'PIPER_MODEL_ORIGIN' piper-model-routing.mjs
|
||||
grep -q '/static/piper-wasm-v1/voices/' piper-model-routing.mjs
|
||||
grep -q 'ai-spel-static' README.md
|
||||
grep -q 'ATTRIBUTION.txt' index.html
|
||||
grep -q "SpeechRecognition || win.webkitSpeechRecognition" voice.js
|
||||
grep -q "submitMessage(text, 'voice')" index.html
|
||||
grep -q "'screen-reader', 'Skärmläsare'" index.html
|
||||
grep -q "'game-voice', 'Spelets röst'" index.html
|
||||
grep -q "'text-only', 'Endast text'" index.html
|
||||
grep -q 'Spelets repliker läses alltid upp' index.html
|
||||
grep -q "event.key === 'Enter' && !event.shiftKey" index.html
|
||||
grep -q "request('/api/character/draft'" index.html
|
||||
grep -q "request('/api/world/draft'" index.html
|
||||
grep -q "request('/api/dialogue'" index.html
|
||||
grep -q "request('/api/presence/heartbeat'" index.html
|
||||
grep -q "request('/api/players/nearby'" index.html
|
||||
grep -q "request('/api/player/messages'" index.html
|
||||
grep -q "Säg till Robin" index.html
|
||||
grep -q "result.intent === 'move' || result.intent === 'meet'" index.html
|
||||
grep -q 'dialogue_temporarily_unavailable:' index.html
|
||||
grep -q 'id="admin-view"' index.html
|
||||
grep -q '/api/admin/players?' index.html
|
||||
grep -q "request('/api/admin/prompts'" index.html
|
||||
grep -q "request('/api/admin/rules'" index.html
|
||||
grep -q "request('/api/admin/settings/logging'" index.html
|
||||
grep -q 'data-admin-view="logging"' index.html
|
||||
grep -q '/api/admin/audit?limit=200' index.html
|
||||
grep -q 'entry.data.external_call' index.html
|
||||
grep -q 'Externt tjänsteanrop' index.html
|
||||
@@ -45,6 +89,6 @@ if sed -n '/<section id="play"/,/^ <\/section>/p' index.html | grep '<button'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
node --test tests/voice.test.cjs
|
||||
node --test tests/*.test.cjs
|
||||
|
||||
echo 'Frontend source checks passed.'
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
const test = require('node:test');
|
||||
const assert = require('node:assert/strict');
|
||||
|
||||
test('Piper model and config requests use the same-origin voice mirror', async () => {
|
||||
const {localPiperModelUrl} = await import('../piper-model-routing.mjs');
|
||||
const origin = 'https://ai-spel.k3s.k0.nu';
|
||||
assert.equal(
|
||||
localPiperModelUrl('https://huggingface.co/diffusionstudio/piper-voices/resolve/main/sv/sv_SE/nst/medium/sv_SE-nst-medium.onnx', origin),
|
||||
'https://ai-spel.k3s.k0.nu/static/piper-wasm-v1/voices/sv/sv_SE/nst/medium/sv_SE-nst-medium.onnx',
|
||||
);
|
||||
assert.equal(
|
||||
localPiperModelUrl('https://huggingface.co/diffusionstudio/piper-voices/resolve/main/sv/sv_SE/lisa/medium/sv_SE-lisa-medium.onnx.json', origin),
|
||||
'https://ai-spel.k3s.k0.nu/static/piper-wasm-v1/voices/sv/sv_SE/lisa/medium/sv_SE-lisa-medium.onnx.json',
|
||||
);
|
||||
});
|
||||
|
||||
test('Piper model routing leaves unrelated URLs alone and rejects traversal paths', async () => {
|
||||
const {localPiperModelUrl} = await import('../piper-model-routing.mjs');
|
||||
const origin = 'https://ai-spel.k3s.k0.nu';
|
||||
assert.equal(localPiperModelUrl('https://example.com/model.onnx', origin), null);
|
||||
assert.equal(localPiperModelUrl('https://huggingface.co.evil.test/diffusionstudio/piper-voices/resolve/main/model.onnx', origin), null);
|
||||
assert.equal(localPiperModelUrl('https://huggingface.co/diffusionstudio/piper-voices/resolve/main/../secret', origin), null);
|
||||
});
|
||||
@@ -0,0 +1,15 @@
|
||||
const test = require('node:test');
|
||||
const assert = require('node:assert/strict');
|
||||
|
||||
test('ONNX Runtime receives an absolute same-origin base URL', async () => {
|
||||
const {createOnnxWasmPaths} = await import('../piper-onnx-config.mjs');
|
||||
const wasmPaths = createOnnxWasmPaths('https://ai-spel.k3s.k0.nu');
|
||||
assert.equal(wasmPaths, 'https://ai-spel.k3s.k0.nu/static/piper-wasm-v1/onnx/');
|
||||
assert.equal(new URL('ort-wasm-simd-threaded.mjs', wasmPaths).href,
|
||||
'https://ai-spel.k3s.k0.nu/static/piper-wasm-v1/onnx/ort-wasm-simd-threaded.mjs');
|
||||
});
|
||||
|
||||
test('ONNX Runtime base URL rejects an invalid worker origin', async () => {
|
||||
const {createOnnxWasmPaths} = await import('../piper-onnx-config.mjs');
|
||||
assert.throws(() => createOnnxWasmPaths('undefined'), TypeError);
|
||||
});
|
||||
@@ -0,0 +1,13 @@
|
||||
const test = require('node:test');
|
||||
const assert = require('node:assert/strict');
|
||||
const {readFile} = require('node:fs/promises');
|
||||
const {join} = require('node:path');
|
||||
|
||||
test('Piper worker is built and started as an ES module', async () => {
|
||||
const [buildScript, runtime] = await Promise.all([
|
||||
readFile(join(__dirname, '..', 'scripts', 'build-piper.mjs'), 'utf8'),
|
||||
readFile(join(__dirname, '..', 'piper-runtime.js'), 'utf8'),
|
||||
]);
|
||||
assert.match(buildScript, /outfile: join\(workerRoot, 'piper-worker\.js'\),\s*bundle: true,\s*format: 'esm'/);
|
||||
assert.match(runtime, /new Worker\(workerUrl, \{type: 'module'\}\)/);
|
||||
});
|
||||
+141
-9
@@ -9,11 +9,12 @@ const apiWindow = {};
|
||||
vm.runInNewContext(source, {window: apiWindow, globalThis: apiWindow, Promise, String, Math, Object});
|
||||
const GameVoice = apiWindow.GameVoice;
|
||||
|
||||
function makeHarness({supported = true, tts = true, onTranscript = () => Promise.resolve()} = {}) {
|
||||
function makeHarness({supported = true, tts = true, piper = false, onTranscript = () => Promise.resolve()} = {}) {
|
||||
const recognitions = [];
|
||||
const utterances = [];
|
||||
const states = [];
|
||||
const timers = new Map();
|
||||
const timerDelays = new Map();
|
||||
let timerId = 0;
|
||||
class Recognition {
|
||||
constructor() { recognitions.push(this); }
|
||||
@@ -24,6 +25,17 @@ function makeHarness({supported = true, tts = true, onTranscript = () => Promise
|
||||
class Utterance {
|
||||
constructor(text) { this.text = text; utterances.push(this); }
|
||||
}
|
||||
const audioSources = [];
|
||||
class AudioContext {
|
||||
constructor() { this.state = 'running'; this.destination = {}; }
|
||||
resume() { this.state = 'running'; return Promise.resolve(); }
|
||||
decodeAudioData() { return Promise.resolve({duration: 1}); }
|
||||
createBufferSource() {
|
||||
const source = {playbackRate: {value: 1}, detune: {value: 0}, connect() {}, start() { this.started = true; }, stop() { this.stopped = true; }};
|
||||
audioSources.push(source);
|
||||
return source;
|
||||
}
|
||||
}
|
||||
const synthesis = tts ? {
|
||||
spoken: [], cancelled: 0,
|
||||
getVoices: () => [{name: 'Svensk', lang: 'sv-SE'}],
|
||||
@@ -31,11 +43,13 @@ function makeHarness({supported = true, tts = true, onTranscript = () => Promise
|
||||
cancel() { this.cancelled += 1; },
|
||||
} : undefined;
|
||||
const window = {
|
||||
setTimeout(callback) { const id = ++timerId; timers.set(id, callback); return id; },
|
||||
clearTimeout(id) { timers.delete(id); },
|
||||
setTimeout(callback, delay = 0) { const id = ++timerId; timers.set(id, callback); timerDelays.set(id, delay); return id; },
|
||||
clearTimeout(id) { timers.delete(id); timerDelays.delete(id); },
|
||||
speechSynthesis: synthesis,
|
||||
SpeechSynthesisUtterance: tts ? Utterance : undefined,
|
||||
SpeechRecognition: supported ? Recognition : undefined,
|
||||
AudioContext,
|
||||
GamePiper: piper ? {synthesize: () => Promise.resolve({arrayBuffer: () => Promise.resolve(new ArrayBuffer(8))})} : undefined,
|
||||
};
|
||||
vm.runInNewContext(source, {window, globalThis: window, Promise, String, Math, Object});
|
||||
const controller = window.GameVoice.createVoiceController({
|
||||
@@ -43,7 +57,14 @@ function makeHarness({supported = true, tts = true, onTranscript = () => Promise
|
||||
onState: (state, message) => states.push({state, message}),
|
||||
onTranscript,
|
||||
});
|
||||
return {controller, recognitions, utterances, synthesis, states, timers};
|
||||
return {
|
||||
controller, recognitions, utterances, synthesis, states, timers, audioSources,
|
||||
runTimer(delay) {
|
||||
const match = [...timerDelays.entries()].find(([, value]) => value === delay);
|
||||
if (!match) throw new Error(`No timer found with delay ${delay}`);
|
||||
timers.get(match[0])();
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
test('recognition is single-shot Swedish and sends only final transcript once', async () => {
|
||||
@@ -109,17 +130,89 @@ test('recognition watchdog closes a session that never ends and permits retry',
|
||||
assert.equal(h.recognitions.length, 2);
|
||||
});
|
||||
|
||||
test('TTS selects Swedish fallback, applies rate, and cancellation invalidates callbacks', () => {
|
||||
test('TTS uses the system default voice unless a named Swedish voice is selected', () => {
|
||||
const h = makeHarness();
|
||||
h.controller.update({mode: 'game-voice', rate: 1.4});
|
||||
assert.equal(h.controller.speak('Hej.'), true);
|
||||
const first = h.utterances[0];
|
||||
assert.equal(first.lang, 'sv-SE');
|
||||
assert.equal(first.rate, 1.4);
|
||||
assert.equal(first.voice.name, 'Svensk');
|
||||
assert.equal(first.voice, null);
|
||||
h.controller.cancelSpeech();
|
||||
first.onend();
|
||||
assert.equal(h.controller.getState(), 'IDLE');
|
||||
assert.equal(h.controller.speak('Namngiven röst.', {voiceName: 'Svensk'}), true);
|
||||
assert.equal(h.utterances.at(-1).voice.name, 'Svensk');
|
||||
});
|
||||
|
||||
test('a player gesture restores the iOS speech primer after cancelling a queued reply', () => {
|
||||
const h = makeHarness();
|
||||
assert.equal(h.controller.activateFromUserGesture(), true);
|
||||
assert.equal(h.synthesis.spoken[0].text, ' ');
|
||||
h.controller.speak('Tidigare replik');
|
||||
h.controller.cancelSpeech();
|
||||
const countAfterCancel = h.synthesis.spoken.length;
|
||||
assert.equal(h.controller.activateFromUserGesture(), true);
|
||||
assert.equal(h.synthesis.spoken.length, countAfterCancel + 1);
|
||||
assert.equal(h.synthesis.spoken.at(-1).text, ' ');
|
||||
h.controller.speak('Nytt svar');
|
||||
assert.equal(h.synthesis.spoken.at(-1).text, 'Nytt svar');
|
||||
});
|
||||
|
||||
test('speech is reported as in progress only after the native onstart event', () => {
|
||||
const h = makeHarness();
|
||||
h.controller.speak('Hej.');
|
||||
assert.equal(h.controller.getState(), 'QUEUED');
|
||||
assert.match(h.states.at(-1).message, /Startar uppläsningen/);
|
||||
h.utterances[0].onstart();
|
||||
assert.equal(h.controller.getState(), 'SPEAKING');
|
||||
assert.match(h.states.at(-1).message, /Webbläsaren har startat talsyntesen/);
|
||||
assert.match(h.states.at(-1).message, /Läs senaste repliken/);
|
||||
});
|
||||
|
||||
test('iOS user gesture primes speech silently and idle speech is not cancelled before speak', () => {
|
||||
const h = makeHarness();
|
||||
assert.equal(h.controller.activateFromUserGesture(), true);
|
||||
assert.equal(h.synthesis.spoken[0].text, ' ');
|
||||
assert.equal(h.synthesis.spoken[0].volume, 0);
|
||||
const cancelledBeforeReply = h.synthesis.cancelled;
|
||||
assert.equal(h.controller.speak('Ett svar efter nätverksanropet'), true);
|
||||
assert.equal(h.synthesis.spoken.at(-1).text, 'Ett svar efter nätverksanropet');
|
||||
assert.equal(h.synthesis.cancelled, cancelledBeforeReply);
|
||||
});
|
||||
|
||||
test('replacing active speech waits one event-loop turn after WebKit cancel', () => {
|
||||
const h = makeHarness();
|
||||
h.controller.speak('Första repliken');
|
||||
const cancelledBeforeReplace = h.synthesis.cancelled;
|
||||
h.controller.speak('Nästa replik');
|
||||
assert.equal(h.synthesis.cancelled, cancelledBeforeReplace + 1);
|
||||
assert.notEqual(h.synthesis.spoken.at(-1).text, 'Nästa replik');
|
||||
h.runTimer(100);
|
||||
assert.equal(h.synthesis.spoken.at(-1).text, 'Nästa replik');
|
||||
});
|
||||
|
||||
test('speech start timeout tells the player how to recover when mobile playback is blocked', () => {
|
||||
const h = makeHarness();
|
||||
h.controller.speak('En replik');
|
||||
const cancelledBeforeTimeout = h.synthesis.cancelled;
|
||||
h.runTimer(4000);
|
||||
assert.match(h.states.at(-1).message, /Tryck på Läs senaste repliken/);
|
||||
assert.equal(h.synthesis.cancelled, cancelledBeforeTimeout + 1);
|
||||
const cancelledBeforeRetry = h.synthesis.cancelled;
|
||||
h.controller.speak('Manuell återläsning');
|
||||
assert.equal(h.synthesis.spoken.at(-1).text, 'Manuell återläsning');
|
||||
assert.equal(h.synthesis.cancelled, cancelledBeforeRetry);
|
||||
});
|
||||
|
||||
test('iOS not-allowed speech error offers an immediate gesture-based retry', () => {
|
||||
const h = makeHarness();
|
||||
h.controller.speak('En replik');
|
||||
h.utterances[0].onerror({error: 'not-allowed'});
|
||||
assert.match(h.states.at(-1).message, /Safari blockerade uppläsningen/);
|
||||
assert.match(h.states.at(-1).message, /Läs senaste repliken/);
|
||||
assert.equal(h.controller.speak('Försök igen'), true);
|
||||
assert.equal(h.synthesis.spoken.at(-1).text, 'Försök igen');
|
||||
});
|
||||
|
||||
test('character voice identity gives stable distinct masculine, feminine, and neutral timbres', () => {
|
||||
@@ -138,22 +231,50 @@ test('narrator uses neutral pitch while character replies use their saved voice
|
||||
h.controller.update({mode: 'game-voice'});
|
||||
h.controller.speak('Berättarröst', {role: 'narrator', voiceIdentity: 'feminine', characterId: 'narrator'});
|
||||
h.controller.speak('NPC-replik', {voiceIdentity: 'masculine', characterId: 'npc-1'});
|
||||
h.runTimer(100);
|
||||
assert.equal(h.utterances[0].pitch, 1);
|
||||
assert.ok(h.utterances[1].pitch < 1);
|
||||
});
|
||||
|
||||
test('Piper WASM output uses the unlocked audio context and starts only after local synthesis', async () => {
|
||||
const h = makeHarness({piper: true});
|
||||
assert.equal(h.controller.activateFromUserGesture(), true);
|
||||
assert.equal(h.controller.speak('Ett svar från Piper.', {role: 'narrator', voiceIdentity: 'neutral'}), true);
|
||||
assert.equal(h.controller.getState(), 'QUEUED');
|
||||
await new Promise(resolve => setImmediate(resolve));
|
||||
assert.equal(h.audioSources.length, 1);
|
||||
assert.equal(h.audioSources[0].started, true);
|
||||
assert.equal(h.audioSources[0].detune.value, 0);
|
||||
assert.equal(h.controller.getState(), 'SPEAKING');
|
||||
h.audioSources[0].onended();
|
||||
assert.equal(h.controller.getState(), 'IDLE');
|
||||
});
|
||||
|
||||
test('Piper output keeps per-character pitch and rate stable', async () => {
|
||||
const h = makeHarness({piper: true});
|
||||
h.controller.activateFromUserGesture();
|
||||
h.controller.speak('NPC-svar.', {voiceIdentity: 'masculine', characterId: 'npc-1'});
|
||||
await new Promise(resolve => setImmediate(resolve));
|
||||
assert.ok(h.audioSources[0].detune.value < 0);
|
||||
assert.ok(h.audioSources[0].playbackRate.value < 1);
|
||||
});
|
||||
|
||||
test('TTS and microphone are mutually exclusive', () => {
|
||||
const h = makeHarness();
|
||||
h.controller.update({mode: 'game-voice'});
|
||||
h.controller.startListening();
|
||||
h.controller.speak('Svar');
|
||||
assert.equal(h.recognitions[0].aborted, true);
|
||||
assert.equal(h.controller.getState(), 'QUEUED');
|
||||
h.utterances.at(-1).onstart();
|
||||
assert.equal(h.controller.getState(), 'SPEAKING');
|
||||
});
|
||||
|
||||
test('speech is disabled in screen-reader mode and gracefully degrades without synthesis', () => {
|
||||
test('game speech stays automatic even with legacy text-only settings and gracefully degrades without synthesis', () => {
|
||||
const screenReader = makeHarness();
|
||||
assert.equal(screenReader.controller.speak('dialog'), false);
|
||||
screenReader.controller.update({mode: 'text-only', autoSpeak: false});
|
||||
assert.equal(screenReader.controller.speak('dialog'), true);
|
||||
assert.equal(screenReader.synthesis.spoken[0].text, 'dialog');
|
||||
const noTts = makeHarness({tts: false});
|
||||
noTts.controller.update({mode: 'game-voice'});
|
||||
assert.equal(noTts.controller.speak('dialog'), false);
|
||||
@@ -176,6 +297,16 @@ test('settings survive reload and invalid storage falls back to accessible defau
|
||||
vm.runInNewContext(source, {window: global, globalThis: global, Promise, String, Math, Object});
|
||||
const values = new Map();
|
||||
const storage = {getItem: key => values.get(key) || null, setItem: (key, value) => values.set(key, value)};
|
||||
const defaults = GameVoice.loadSettings(storage, 'new-player');
|
||||
assert.equal(defaults.mode, 'game-voice');
|
||||
assert.equal(defaults.autoSpeak, true);
|
||||
values.set('voice-v1', JSON.stringify({mode: 'text-only', autoSpeak: false, rate: 1.4, voiceName: 'Svensk', soundSignals: false}));
|
||||
const migrated = GameVoice.loadSettings(storage, 'voice-v2', 'voice-v1');
|
||||
assert.equal(migrated.mode, 'game-voice');
|
||||
assert.equal(migrated.autoSpeak, true);
|
||||
assert.equal(migrated.rate, 1.4);
|
||||
assert.equal(migrated.voiceName, 'Svensk');
|
||||
assert.equal(migrated.soundSignals, false);
|
||||
const requested = {...GameVoice.DEFAULT_SETTINGS, mode: 'game-voice', autoSpeak: true, rate: 1.5, voiceName: 'Svensk'};
|
||||
assert.equal(GameVoice.saveSettings(storage, 'voice', requested), true);
|
||||
const loaded = GameVoice.loadSettings(storage, 'voice');
|
||||
@@ -184,6 +315,7 @@ test('settings survive reload and invalid storage falls back to accessible defau
|
||||
assert.equal(loaded.rate, 1.5);
|
||||
assert.equal(loaded.voiceName, 'Svensk');
|
||||
values.set('voice', '{trasig');
|
||||
assert.equal(GameVoice.loadSettings(storage, 'voice').mode, 'screen-reader');
|
||||
assert.equal(GameVoice.loadSettings(storage, 'voice').mode, 'game-voice');
|
||||
assert.equal(GameVoice.loadSettings(storage, 'voice').autoSpeak, true);
|
||||
assert.equal(GameVoice.saveSettings({setItem() { throw new Error('blocked'); }}, 'voice', requested), false);
|
||||
});
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
/* Browser voice adapters. Kept independent of the game submission and API layer. */
|
||||
(function exposeVoice(root) {
|
||||
const DEFAULT_SETTINGS = Object.freeze({
|
||||
mode: 'screen-reader',
|
||||
autoSpeak: false,
|
||||
mode: 'game-voice',
|
||||
autoSpeak: true,
|
||||
language: 'sv-SE',
|
||||
rate: 1,
|
||||
voiceName: '',
|
||||
@@ -25,15 +25,30 @@
|
||||
return {command: aliases[command] || 'unknown'};
|
||||
}
|
||||
|
||||
function loadSettings(storage, key) {
|
||||
function loadSettings(storage, key, legacyKey) {
|
||||
try {
|
||||
const stored = JSON.parse(storage.getItem(key) || '{}');
|
||||
const current = storage.getItem(key);
|
||||
if (!current && legacyKey) {
|
||||
const legacy = JSON.parse(storage.getItem(legacyKey) || '{}');
|
||||
const migrated = {
|
||||
...DEFAULT_SETTINGS,
|
||||
rate: legacy.rate,
|
||||
voiceName: legacy.voiceName,
|
||||
speakerProfiles: legacy.speakerProfiles,
|
||||
soundSignals: legacy.soundSignals,
|
||||
};
|
||||
saveSettings(storage, key, migrated);
|
||||
return migrated;
|
||||
}
|
||||
const stored = JSON.parse(current || '{}');
|
||||
const settings = {...DEFAULT_SETTINGS, ...stored};
|
||||
if (!['screen-reader', 'game-voice', 'text-only'].includes(settings.mode)) settings.mode = DEFAULT_SETTINGS.mode;
|
||||
// Game dialogue is always spoken. These assignments also migrate older
|
||||
// local settings that allowed text-only or screen-reader-only playback.
|
||||
settings.mode = 'game-voice';
|
||||
settings.autoSpeak = true;
|
||||
settings.rate = Math.min(2, Math.max(0.5, Number(settings.rate) || 1));
|
||||
settings.voiceName = typeof settings.voiceName === 'string' ? settings.voiceName : '';
|
||||
settings.speakerProfiles = settings.speakerProfiles && typeof settings.speakerProfiles === 'object' ? settings.speakerProfiles : {};
|
||||
settings.autoSpeak = settings.autoSpeak === true;
|
||||
settings.soundSignals = settings.soundSignals !== false;
|
||||
return settings;
|
||||
} catch (_) { return {...DEFAULT_SETTINGS}; }
|
||||
@@ -63,7 +78,13 @@
|
||||
let generation = 0;
|
||||
let recognition = null;
|
||||
let speechTimer = null;
|
||||
let speechStartTimer = null;
|
||||
let listeningTimer = null;
|
||||
let currentUtterance = null;
|
||||
let speechPrimed = false;
|
||||
let piperAudioContext = null;
|
||||
let piperSource = null;
|
||||
let piperAudioUnlocked = false;
|
||||
|
||||
function setState(next, message = '') {
|
||||
state = next;
|
||||
@@ -73,11 +94,52 @@
|
||||
function cancelSpeech() {
|
||||
generation += 1;
|
||||
if (speechTimer !== null) win.clearTimeout(speechTimer);
|
||||
if (speechStartTimer !== null) win.clearTimeout(speechStartTimer);
|
||||
speechTimer = null;
|
||||
speechStartTimer = null;
|
||||
const wasQueued = currentUtterance !== null;
|
||||
const wasPiper = currentUtterance?.kind === 'piper';
|
||||
currentUtterance = null;
|
||||
// WebKit versions before Safari 27 can discard a speak() queued in the
|
||||
// same turn as cancel(). Do not clear an already-empty native queue.
|
||||
if (wasQueued) {
|
||||
if (wasPiper) {
|
||||
try { piperSource?.stop(); } catch (_) { /* Already stopped. */ }
|
||||
piperSource = null;
|
||||
} else {
|
||||
try { win.speechSynthesis?.cancel(); } catch (_) { /* Best effort. */ }
|
||||
// cancel() also removes the silent user-gesture primer from the native
|
||||
// queue. A later reply must prime again from the next player gesture.
|
||||
speechPrimed = false;
|
||||
}
|
||||
}
|
||||
if (!recognition) setState('IDLE');
|
||||
}
|
||||
|
||||
function activateFromUserGesture() {
|
||||
const AudioContext = win.AudioContext || win.webkitAudioContext;
|
||||
if (win.GamePiper && AudioContext) {
|
||||
try {
|
||||
piperAudioContext ||= new AudioContext();
|
||||
if (piperAudioContext.state === 'suspended') piperAudioContext.resume().catch(() => {});
|
||||
piperAudioUnlocked = true;
|
||||
return true;
|
||||
} catch (_) { /* Fall through to the browser speech adapter. */ }
|
||||
}
|
||||
if (!win.speechSynthesis || !win.SpeechSynthesisUtterance) return false;
|
||||
if (speechPrimed) return true;
|
||||
// iOS Safari requires speech output to be initiated by a user gesture.
|
||||
// Prime its speech channel silently on the first trusted tap/key press so
|
||||
// later game replies can be spoken after the API response arrives.
|
||||
try {
|
||||
const primer = new win.SpeechSynthesisUtterance(' ');
|
||||
primer.volume = 0;
|
||||
win.speechSynthesis.speak(primer);
|
||||
speechPrimed = true;
|
||||
return true;
|
||||
} catch (_) { return false; }
|
||||
}
|
||||
|
||||
function finishRecognition(token, message = '') {
|
||||
if (token !== generation) return;
|
||||
if (listeningTimer !== null) win.clearTimeout(listeningTimer);
|
||||
@@ -108,6 +170,10 @@
|
||||
return false;
|
||||
}
|
||||
cancelSpeech();
|
||||
// This runs synchronously from the microphone button gesture. If
|
||||
// cancelSpeech() removed the earlier primer, restore it before starting
|
||||
// recognition so a spoken reply can follow the transcript.
|
||||
activateFromUserGesture();
|
||||
const token = ++generation;
|
||||
let instance;
|
||||
try { instance = new Recognition(); }
|
||||
@@ -163,15 +229,94 @@
|
||||
try { return win.speechSynthesis?.getVoices?.() || []; } catch (_) { return []; }
|
||||
}
|
||||
|
||||
function speak(text, voiceOptions = {}) {
|
||||
if (!text || settings.mode !== 'game-voice' || !win.speechSynthesis || !win.SpeechSynthesisUtterance) return false;
|
||||
function speakWithPiper(text, voiceOptions) {
|
||||
const AudioContext = win.AudioContext || win.webkitAudioContext;
|
||||
if (!AudioContext || !piperAudioUnlocked) return false;
|
||||
stopListening();
|
||||
cancelSpeech();
|
||||
const token = generation;
|
||||
if (currentUtterance) cancelSpeech();
|
||||
const token = ++generation;
|
||||
const playback = {kind: 'piper', token};
|
||||
currentUtterance = playback;
|
||||
setState('QUEUED', 'Förbereder svensk uppläsning. Första gången kan en röstmodell på cirka 63 MB behöva hämtas till enheten.');
|
||||
|
||||
if (speechTimer !== null) win.clearTimeout(speechTimer);
|
||||
speechTimer = win.setTimeout(() => {
|
||||
if (token !== generation) return;
|
||||
generation += 1;
|
||||
currentUtterance = null;
|
||||
try { piperSource?.stop(); } catch (_) { /* Best effort. */ }
|
||||
piperSource = null;
|
||||
speechTimer = null;
|
||||
setState('IDLE', 'Piper tog för lång tid på sig. Dialogen finns kvar som text. Tryck på Läs senaste repliken för att försöka igen.');
|
||||
}, 180000);
|
||||
|
||||
let lastProgress = -1;
|
||||
const progress = event => {
|
||||
if (token !== generation || !event?.total) return;
|
||||
const percent = Math.min(100, Math.floor((event.loaded / event.total) * 100));
|
||||
if (percent === lastProgress) return;
|
||||
lastProgress = percent;
|
||||
setState('PROCESSING', `Hämtar svensk röstmodell till enheten: ${percent} procent.`);
|
||||
};
|
||||
|
||||
Promise.resolve()
|
||||
.then(() => win.GamePiper.synthesize(String(text), progress))
|
||||
.then(async blob => {
|
||||
if (token !== generation) return;
|
||||
piperAudioContext ||= new AudioContext();
|
||||
if (piperAudioContext.state === 'suspended') await piperAudioContext.resume();
|
||||
const buffer = await piperAudioContext.decodeAudioData(await blob.arrayBuffer());
|
||||
if (token !== generation) return;
|
||||
const source = piperAudioContext.createBufferSource();
|
||||
const profile = voiceOptions.characterId ? settings.speakerProfiles?.[voiceOptions.characterId] || {} : {};
|
||||
const identity = characterVoiceProfile(voiceOptions.voiceIdentity, voiceOptions.characterId);
|
||||
const narrator = voiceOptions.role === 'narrator';
|
||||
const requestedRate = Number(voiceOptions.rate ?? profile.rate ?? settings.rate) || 1;
|
||||
source.buffer = buffer;
|
||||
source.playbackRate.value = Math.min(2, Math.max(0.5, requestedRate * (narrator || voiceOptions.rate != null || profile.rate != null ? 1 : identity.rate)));
|
||||
const pitch = narrator ? 1 : Number(voiceOptions.pitch ?? profile.pitch ?? identity.pitch) || 1;
|
||||
if (source.detune) source.detune.value = Math.min(600, Math.max(-600, (pitch - 1) * 1200));
|
||||
source.connect(piperAudioContext.destination);
|
||||
source.onended = () => {
|
||||
if (token !== generation) return;
|
||||
if (speechTimer !== null) win.clearTimeout(speechTimer);
|
||||
speechTimer = null;
|
||||
currentUtterance = null;
|
||||
piperSource = null;
|
||||
setState('IDLE');
|
||||
};
|
||||
piperSource = source;
|
||||
source.start();
|
||||
if (typeof voiceOptions.onStart === 'function') voiceOptions.onStart();
|
||||
setState('SPEAKING', 'Läser upp dialogen med svensk röst.');
|
||||
})
|
||||
.catch(error => {
|
||||
if (token !== generation) return;
|
||||
if (speechTimer !== null) win.clearTimeout(speechTimer);
|
||||
speechTimer = null;
|
||||
currentUtterance = null;
|
||||
piperSource = null;
|
||||
generation += 1;
|
||||
setState('IDLE', `Piper kunde inte skapa eller spela upp ljudet${error?.message ? `: ${error.message}` : '.'} Dialogen finns kvar som text. Tryck på Läs senaste repliken för att försöka igen.`);
|
||||
});
|
||||
return true;
|
||||
}
|
||||
|
||||
function speak(text, voiceOptions = {}) {
|
||||
if (text && win.GamePiper?.synthesize && speakWithPiper(text, voiceOptions)) return true;
|
||||
if (!text || !win.speechSynthesis || !win.SpeechSynthesisUtterance) {
|
||||
setState('IDLE', 'Talsyntes stöds inte i den här webbläsaren. Dialogen finns kvar som text.');
|
||||
return false;
|
||||
}
|
||||
stopListening();
|
||||
const hadQueuedUtterance = currentUtterance !== null;
|
||||
if (hadQueuedUtterance) cancelSpeech();
|
||||
const token = ++generation;
|
||||
let utterance;
|
||||
try { utterance = new win.SpeechSynthesisUtterance(text); }
|
||||
catch (_) { setState('IDLE', 'Talsyntesen kunde inte startas. Dialogen finns kvar som text.'); return false; }
|
||||
utterance.lang = settings.language || 'sv-SE';
|
||||
utterance.volume = 1;
|
||||
const profile = voiceOptions.characterId ? settings.speakerProfiles?.[voiceOptions.characterId] || {} : {};
|
||||
const identityProfile = characterVoiceProfile(voiceOptions.voiceIdentity, voiceOptions.characterId);
|
||||
const isNarrator = voiceOptions.role === 'narrator';
|
||||
@@ -180,31 +325,86 @@
|
||||
utterance.pitch = isNarrator ? 1 : Math.min(2, Math.max(0, Number(voiceOptions.pitch ?? profile.pitch ?? identityProfile.pitch) || 1));
|
||||
const requestedName = voiceOptions.voiceName || profile.voiceName || settings.voiceName;
|
||||
const voices = availableVoices();
|
||||
utterance.voice = voices.find(voice => voice.name === requestedName)
|
||||
// An empty selection means the operating system should choose its
|
||||
// default voice for the requested language. Forcing the first voice
|
||||
// returned by WebKit can select a voice that is listed but cannot speak.
|
||||
utterance.voice = requestedName
|
||||
? voices.find(voice => voice.name === requestedName)
|
||||
|| voices.find(voice => /^sv(-|$)/i.test(voice.lang))
|
||||
|| null;
|
||||
|| null
|
||||
: null;
|
||||
utterance.onstart = () => {
|
||||
if (token !== generation) return;
|
||||
if (speechStartTimer !== null) win.clearTimeout(speechStartTimer);
|
||||
speechStartTimer = null;
|
||||
if (typeof voiceOptions.onStart === 'function') voiceOptions.onStart();
|
||||
// onstart confirms the browser speech engine accepted the utterance;
|
||||
// it cannot confirm that sound reached the device's speakers.
|
||||
setState('SPEAKING', 'Webbläsaren har startat talsyntesen. Om du inte hör ljud, tryck på Läs senaste repliken.');
|
||||
};
|
||||
utterance.onend = () => {
|
||||
if (token !== generation) return;
|
||||
if (speechTimer !== null) win.clearTimeout(speechTimer);
|
||||
if (speechStartTimer !== null) win.clearTimeout(speechStartTimer);
|
||||
speechTimer = null;
|
||||
speechStartTimer = null;
|
||||
currentUtterance = null;
|
||||
setState('IDLE');
|
||||
};
|
||||
utterance.onerror = () => {
|
||||
utterance.onerror = event => {
|
||||
if (token !== generation) return;
|
||||
if (speechTimer !== null) win.clearTimeout(speechTimer);
|
||||
if (speechStartTimer !== null) win.clearTimeout(speechStartTimer);
|
||||
speechTimer = null;
|
||||
speechStartTimer = null;
|
||||
currentUtterance = null;
|
||||
generation += 1;
|
||||
setState('IDLE', 'Uppläsningen avbröts. Dialogen finns kvar som text.');
|
||||
const blocked = event?.error === 'not-allowed' || event?.error === 'service-not-allowed';
|
||||
const message = blocked
|
||||
? 'Safari blockerade uppläsningen. Tryck på Läs senaste repliken för att starta ljudet.'
|
||||
: 'Uppläsningen avbröts. Tryck på Läs senaste repliken för att försöka igen. Dialogen finns kvar som text.';
|
||||
setState('IDLE', message);
|
||||
};
|
||||
setState('SPEAKING', 'Läser upp dialog.');
|
||||
setState('QUEUED', 'Startar uppläsningen.');
|
||||
currentUtterance = utterance;
|
||||
speechStartTimer = win.setTimeout(() => {
|
||||
if (token !== generation || currentUtterance !== utterance) return;
|
||||
speechStartTimer = null;
|
||||
generation += 1;
|
||||
currentUtterance = null;
|
||||
if (speechTimer !== null) win.clearTimeout(speechTimer);
|
||||
speechTimer = null;
|
||||
// Drop a blocked native utterance now. A player retry can then call
|
||||
// speak() directly from its button gesture instead of following a
|
||||
// same-turn cancel() that older WebKit versions may discard.
|
||||
try { win.speechSynthesis.cancel(); } catch (_) { /* Best effort. */ }
|
||||
setState('IDLE', 'Uppläsningen startade inte. Tryck på Läs senaste repliken för att starta ljudet.');
|
||||
}, 4000);
|
||||
speechTimer = win.setTimeout(() => {
|
||||
if (token !== generation) return;
|
||||
generation += 1;
|
||||
try { win.speechSynthesis.cancel(); } catch (_) { /* Best effort. */ }
|
||||
currentUtterance = null;
|
||||
if (speechStartTimer !== null) win.clearTimeout(speechStartTimer);
|
||||
speechStartTimer = null;
|
||||
speechTimer = null;
|
||||
setState('IDLE', 'Uppläsningen avslutades. Dialogen finns kvar som text.');
|
||||
}, Math.max(30000, Math.min(180000, String(text).length * 180)));
|
||||
const enqueue = () => {
|
||||
if (token !== generation) return;
|
||||
try { win.speechSynthesis.speak(utterance); }
|
||||
catch (_) {
|
||||
currentUtterance = null;
|
||||
cancelSpeech();
|
||||
setState('IDLE', 'Talsyntesen kunde inte startas. Dialogen finns kvar som text.');
|
||||
}
|
||||
};
|
||||
try {
|
||||
// Give WebKit one event-loop turn to finish cancel() before replacing
|
||||
// speech that was actively playing. Normal replies enqueue immediately.
|
||||
if (hadQueuedUtterance) win.setTimeout(enqueue, 100);
|
||||
else enqueue();
|
||||
}
|
||||
catch (_) { cancelSpeech(); setState('IDLE', 'Talsyntesen kunde inte startas. Dialogen finns kvar som text.'); return false; }
|
||||
return true;
|
||||
}
|
||||
@@ -215,7 +415,7 @@
|
||||
function getSettings() { return {...settings}; }
|
||||
function getVoices() { return availableVoices(); }
|
||||
function supportsRecognition() { return Boolean(win.SpeechRecognition || win.webkitSpeechRecognition); }
|
||||
return {startListening, stopListening, speak, cancelSpeech, stopAll, update, getState, getSettings, getVoices, supportsRecognition};
|
||||
return {startListening, stopListening, speak, cancelSpeech, stopAll, activateFromUserGesture, update, getState, getSettings, getVoices, supportsRecognition};
|
||||
}
|
||||
|
||||
root.GameVoice = {createVoiceController, DEFAULT_SETTINGS, parseVoiceCommand, loadSettings, saveSettings, characterVoiceProfile};
|
||||
|
||||
Reference in New Issue
Block a user