Release 0.1.55 [auto-version-bump]

VERSION

@@ -1 +1 @@
-0.1.52
+0.1.55

deploy/helm/ai-spel-frontend/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: ai-spel-frontend
 description: Static web frontend for the Swedish life simulator
 type: application
-version: 0.1.52
-appVersion: "0.1.52"
+version: 0.1.55
+appVersion: "0.1.55"

index.html

@@ -20,6 +20,8 @@
     #message { width: 100%; min-height: 3.5rem; box-sizing: border-box; }
     #message-tools { display: flex; flex-wrap: wrap; align-items: center; gap: .5rem; }
     #voice-status { min-height: 1.5em; }
+    #speech-progress { width: min(100%, 32rem); height: 1.25rem; }
+    #speech-progress-value { margin-inline-start: .5rem; font-variant-numeric: tabular-nums; }
     #dialogue li[data-role="voice-controls"] { border: 1px solid currentColor; border-radius: .35rem; padding: .75rem; }
     #dialogue li[data-role="voice-controls"] fieldset { display: grid; gap: .5rem; margin-block: .5rem; }
     #admin-content { display: grid; gap: 1rem; }
@@ -56,6 +58,11 @@
         <span id="message-help" class="sr-only">Tryck Enter för att skicka. Tryck Skift och Enter för ny rad.</span>
       </form>
       <p id="voice-status" role="status" aria-live="polite"></p>
+      <div id="speech-progress-container" hidden>
+        <label for="speech-progress">Hämtar svensk röstmodell till enheten</label>
+        <progress id="speech-progress" aria-label="Nedladdning av svensk röstmodell"></progress>
+        <output id="speech-progress-value" for="speech-progress">Väntar på nedladdning</output>
+      </div>
     </section>
     <section id="admin-view" aria-labelledby="admin-heading" hidden>
       <h1 id="admin-heading">Administration</h1>
@@ -157,6 +164,40 @@
       const authVoiceStatus = document.querySelector('#auth-voice-status');
       if (authVoiceStatus && !auth.hidden && message) authVoiceStatus.textContent = message;
     }
+    function updateSpeechProgress(message = '') {
+      const container = document.querySelector('#speech-progress-container');
+      const progress = document.querySelector('#speech-progress');
+      const value = document.querySelector('#speech-progress-value');
+      const label = container.querySelector('label');
+      const preparing = message.startsWith('Förbereder svensk uppläsning.');
+      const starting = message.startsWith('Startar svensk röstmotor och förbereder modellen.');
+      const match = message.match(/^Hämtar svensk röstmodell till enheten: (\d+) procent\.$/);
+      const bytesMatch = message.match(/^Hämtar svensk röstmodell till enheten: ([\d.,]+) MB hämtade\.$/);
+      if (!preparing && !starting && !match && !bytesMatch) {
+        container.hidden = true;
+        progress.removeAttribute('value');
+        value.textContent = 'Väntar på nedladdning';
+        return false;
+      }
+      container.hidden = false;
+      label.textContent = starting
+        ? 'Startar och läser in den svenska röstmodellen'
+        : 'Hämtar svensk röstmodell till enheten';
+      if (match) {
+        const percent = Math.max(0, Math.min(100, Number(match[1])));
+        progress.value = percent;
+        value.textContent = `${percent}%`;
+        return true;
+      }
+      if (bytesMatch) {
+        progress.removeAttribute('value');
+        value.textContent = `${bytesMatch[1]} MB hämtade`;
+        return true;
+      }
+      progress.removeAttribute('value');
+      value.textContent = starting ? 'Startar röstmotorn…' : 'Förbereder…';
+      return true;
+    }
     function clearSpeechRecovery() {
       speechRecoveryElement?.remove();
       speechRecoveryElement = null;
@@ -218,8 +259,15 @@
         microphone.setAttribute('aria-pressed', String(listening));
         microphone.textContent = listening ? 'Avsluta mikrofon' : 'Starta mikrofon';
         refreshMicrophone();
-        if (message) setVoiceStatus(message);
-        else if (state === 'IDLE') setVoiceStatus('');
+        if (message) {
+          const downloading = updateSpeechProgress(message);
+          setVoiceStatus(downloading && message.startsWith('Hämtar svensk röstmodell')
+            ? 'Hämtar svensk röstmodell till enheten.'
+            : message);
+        } else if (state === 'IDLE') {
+          updateSpeechProgress('');
+          setVoiceStatus('');
+        }
         if (/Läs senaste repliken/.test(message)) showSpeechRecovery(message);
         playVoiceSignal(state === 'IDLE' && /Mikrofonen är avstängd/.test(message) ? 'STOPPED' : state);
       },

piper-download-progress.mjs

@@ -0,0 +1,32 @@
+export function trackModelDownload(response, {id, postMessage}) {
+  const reader = response.body?.getReader?.();
+  if (!reader || typeof ReadableStream !== 'function' || typeof Response !== 'function') return response;
+
+  const total = Number(response.headers.get('content-length')) || 0;
+  let loaded = 0;
+  const body = new ReadableStream({
+    async pull(controller) {
+      try {
+        const {done, value} = await reader.read();
+        if (done) {
+          controller.close();
+          return;
+        }
+        loaded += value.byteLength;
+        postMessage({id, type: 'progress', progress: {loaded, total}});
+        controller.enqueue(value);
+      } catch (error) {
+        controller.error(error);
+      }
+    },
+    cancel(reason) {
+      return reader.cancel(reason);
+    },
+  });
+
+  return new Response(body, {
+    status: response.status,
+    statusText: response.statusText,
+    headers: response.headers,
+  });
+}

piper-worker.js

@@ -1,4 +1,5 @@
 import {TtsSession} from '@mintplex-labs/piper-tts-web';
+import {trackModelDownload} from './piper-download-progress.mjs';
 import {localPiperModelUrl} from './piper-model-routing.mjs';
 import {createOnnxWasmPaths} from './piper-onnx-config.mjs';
 
@@ -8,22 +9,27 @@ 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) => {
+self.fetch = async (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);
+  const response = await localFetch(redirected, options);
+  if (!activeRequestId || !localModelUrl.endsWith('.onnx')) return response;
+  return trackModelDownload(response, {
+    id: activeRequestId,
+    postMessage: message => self.postMessage(message),
+  });
 };
 
 let sessionPromise;
 let inferenceQueue = Promise.resolve();
+let activeRequestId = null;
 
-async function getSession(onProgress) {
+async function getSession() {
   if (!sessionPromise) {
     sessionPromise = TtsSession.create({
       voiceId: VOICE_ID,
-      progress: onProgress,
       wasmPaths: {
         onnxWasm: createOnnxWasmPaths(self.location.origin),
         piperData: `${ASSET_ROOT}/piper/piper_phonemize.data`,
@@ -40,13 +46,17 @@ async function getSession(onProgress) {
 async function synthesizeMessage(event) {
   const {id, text} = event.data || {};
   if (!Number.isSafeInteger(id) || typeof text !== 'string') return;
+  activeRequestId = id;
+  self.postMessage({id, type: 'progress', progress: {stage: 'starting'}});
   try {
-    const session = await getSession(progress => self.postMessage({id, type: 'progress', progress}));
+    const session = await getSession();
     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)});
+  } finally {
+    activeRequestId = null;
   }
 }
 

scripts/check-frontend.sh

@@ -29,6 +29,9 @@ 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 'id="speech-progress" aria-label="Nedladdning av svensk röstmodell"' index.html
+grep -q 'id="speech-progress-value"' index.html
+grep -q 'MB hämtade' 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
@@ -49,6 +52,8 @@ 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 'trackModelDownload' piper-worker.js
+grep -q 'new ReadableStream' piper-download-progress.mjs
 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

tests/piper-download-progress.test.cjs

@@ -0,0 +1,33 @@
+const assert = require('node:assert/strict');
+const test = require('node:test');
+
+test('model response progress forwards each downloaded chunk and preserves the response', async () => {
+  const {trackModelDownload} = await import('../piper-download-progress.mjs');
+  const source = new ReadableStream({
+    start(controller) {
+      controller.enqueue(new Uint8Array([1, 2]));
+      controller.enqueue(new Uint8Array([3, 4, 5]));
+      controller.close();
+    },
+  });
+  const response = new Response(source, {headers: {'content-length': '5'}});
+  const messages = [];
+  const tracked = trackModelDownload(response, {id: 7, postMessage: message => messages.push(message)});
+
+  assert.deepEqual([...new Uint8Array(await tracked.arrayBuffer())], [1, 2, 3, 4, 5]);
+  assert.deepEqual(messages.map(message => message.progress), [
+    {loaded: 2, total: 5},
+    {loaded: 5, total: 5},
+  ]);
+  assert.ok(messages.every(message => message.id === 7 && message.type === 'progress'));
+});
+
+test('model response progress works when content length is absent', async () => {
+  const {trackModelDownload} = await import('../piper-download-progress.mjs');
+  const source = new Response(new Uint8Array([1, 2, 3]));
+  const messages = [];
+  const tracked = trackModelDownload(source, {id: 9, postMessage: message => messages.push(message)});
+
+  assert.equal((await tracked.arrayBuffer()).byteLength, 3);
+  assert.deepEqual(messages.map(message => message.progress), [{loaded: 3, total: 0}]);
+});

tests/voice.test.cjs

@@ -26,6 +26,7 @@ function makeHarness({supported = true, tts = true, piper = false, onTranscript
     constructor(text) { this.text = text; utterances.push(this); }
   }
   const audioSources = [];
+  const piperProgressCallbacks = [];
   class AudioContext {
     constructor() { this.state = 'running'; this.destination = {}; }
     resume() { this.state = 'running'; return Promise.resolve(); }
@@ -49,7 +50,10 @@ function makeHarness({supported = true, tts = true, piper = false, onTranscript
     SpeechSynthesisUtterance: tts ? Utterance : undefined,
     SpeechRecognition: supported ? Recognition : undefined,
     AudioContext,
-    GamePiper: piper ? {synthesize: () => Promise.resolve({arrayBuffer: () => Promise.resolve(new ArrayBuffer(8))})} : undefined,
+    GamePiper: piper ? {synthesize: (_text, onProgress) => {
+      piperProgressCallbacks.push(onProgress);
+      return Promise.resolve({arrayBuffer: () => Promise.resolve(new ArrayBuffer(8))});
+    }} : undefined,
   };
   vm.runInNewContext(source, {window, globalThis: window, Promise, String, Math, Object});
   const controller = window.GameVoice.createVoiceController({
@@ -58,7 +62,7 @@ function makeHarness({supported = true, tts = true, piper = false, onTranscript
     onTranscript,
   });
   return {
-    controller, recognitions, utterances, synthesis, states, timers, audioSources,
+    controller, recognitions, utterances, synthesis, states, timers, audioSources, piperProgressCallbacks,
     runTimer(delay) {
       const match = [...timerDelays.entries()].find(([, value]) => value === delay);
       if (!match) throw new Error(`No timer found with delay ${delay}`);
@@ -250,6 +254,20 @@ test('Piper WASM output uses the unlocked audio context and starts only after lo
   assert.equal(h.controller.getState(), 'IDLE');
 });
 
+test('Piper model download progress is reported as a bounded percentage', async () => {
+  const h = makeHarness({piper: true});
+  h.controller.activateFromUserGesture();
+  h.controller.speak('Ett svar från Piper.');
+  await new Promise(resolve => setImmediate(resolve));
+  h.piperProgressCallbacks[0]({loaded: 31_500_000, total: 63_000_000});
+  assert.equal(h.states.at(-1).state, 'PROCESSING');
+  assert.match(h.states.at(-1).message, /50 procent/);
+  h.piperProgressCallbacks[0]({loaded: 90_000_000, total: 63_000_000});
+  assert.match(h.states.at(-1).message, /100 procent/);
+  h.piperProgressCallbacks[0]({loaded: 10 * 1024 * 1024, total: 0});
+  assert.match(h.states.at(-1).message, /10 MB hämtade/);
+});
+
 test('Piper output keeps per-character pitch and rate stable', async () => {
   const h = makeHarness({piper: true});
   h.controller.activateFromUserGesture();

voice.js

@@ -250,13 +250,26 @@
         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;
+      let lastProgressPercent = -1;
+      let lastProgressMegabytes = -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.`);
+        if (token !== generation) return;
+        if (event?.stage === 'starting') {
+          setState('PROCESSING', 'Startar svensk röstmotor och förbereder modellen.');
+          return;
+        }
+        if (!Number.isFinite(event?.loaded) || event.loaded < 0) return;
+        if (Number.isFinite(event.total) && event.total > 0) {
+          const percent = Math.max(0, Math.min(100, Math.floor((event.loaded / event.total) * 100)));
+          if (percent === lastProgressPercent) return;
+          lastProgressPercent = percent;
+          setState('PROCESSING', `Hämtar svensk röstmodell till enheten: ${percent} procent.`);
+          return;
+        }
+        const megabytes = Math.floor((event.loaded / (1024 * 1024)) * 10) / 10;
+        if (megabytes === lastProgressMegabytes) return;
+        lastProgressMegabytes = megabytes;
+        setState('PROCESSING', `Hämtar svensk röstmodell till enheten: ${megabytes.toLocaleString('sv-SE')} MB hämtade.`);
       };
 
       Promise.resolve()