arcane-os 0.3.3 → 0.3.5

package/runtime/arcane/components/speech.html

@@ -149,7 +149,8 @@
         subscribeAIRuntimeState
     } = await import('../modules/AIRuntimeState.js');
     const {
-        createSTTActivationController
+        createSTTActivationController,
+        formatAIRuntimeProgress
     } = await import('../modules/ComponentContracts.js');
 
     const host = this;
@@ -333,8 +334,13 @@
     muteButton.addEventListener('click', muteToggle, lifecycleListenerOptions);
     window.addEventListener(
         'pagehide',
-        destroy,
-        { once: true, signal: runtimeStateAbortController.signal }
+        handlePageHide,
+        { signal: runtimeStateAbortController.signal }
+    );
+    window.addEventListener(
+        'pageshow',
+        handlePageShow,
+        { signal: runtimeStateAbortController.signal }
     );
 
     subscribeAIRuntimeState(
@@ -723,10 +729,10 @@
             return 'Voice release requested.';
         }
         if (ttsRole.state === 'loading') {
-            return `Voice ${formatRoleProgress(ttsRole.progress, 'loading')}; Cancel is available.`;
+            return `Voice ${formatAIRuntimeProgress(ttsRole.progress, 'loading')}; Cancel is available.`;
         }
         if (ttsRole.state === 'unloading') {
-            return `Voice ${formatRoleProgress(ttsRole.progress, 'releasing')}.`;
+            return `Voice ${formatAIRuntimeProgress(ttsRole.progress, 'releasing')}.`;
         }
         if (ttsRole.state === 'ready') {
             if (host.muted) {
@@ -746,13 +752,6 @@
         return 'Voice unavailable.';
     }
 
-    function formatRoleProgress(progress, fallback) {
-        if (!progress) {
-            return fallback;
-        }
-        return progress.phase;
-    }
-
     function visibleErrorMessage(error, fallback) {
         try {
             if (error?.userSafe === true) {
@@ -1235,11 +1234,14 @@
         }
 
         const generation = ++recordingGeneration;
-        transcriptionOperationId = nextSpeechOperationId('transcription');
+        const operationId = nextSpeechOperationId('transcription');
+        transcriptionOperationId = operationId;
         recordingRequested = true;
         localStatus = {
             message: 'Recording. Release to transcribe.',
-            tone: ''
+            tone: '',
+            owner: 'recording',
+            generation
         };
         renderControls();
         renderStatus();
@@ -1248,6 +1250,9 @@
         try {
             stream = await navigator.mediaDevices.getUserMedia({ audio: true });
         } catch (error) {
+            if (generation !== recordingGeneration || destroyed) {
+                return false;
+            }
             recordingRequested = false;
             resetRecordPress();
             if (
@@ -1268,7 +1273,7 @@
                     {
                         bubbles: true,
                         composed: true,
-                        operationId: transcriptionOperationId,
+                        operationId,
                         publicDetail: {
                             ...publicSpeechErrorFields(
                                 error,
@@ -1278,7 +1283,9 @@
                         }
                     }
                 );
-                transcriptionOperationId = null;
+                if (transcriptionOperationId === operationId) {
+                    transcriptionOperationId = null;
+                }
             } else {
                 reportTranscriptionError(error);
             }
@@ -1287,15 +1294,25 @@
             return false;
         }
 
+        const currentGeneration = generation === recordingGeneration;
         if (
             !recordingRequested
-            || generation !== recordingGeneration
+            || !currentGeneration
             || sttRole.state !== 'ready'
             || sttRole.busy
             || destroyed
         ) {
             stopMediaStream(stream);
-            resetRecordPress();
+            if (currentGeneration) {
+                recordingRequested = false;
+                resetRecordPress();
+                clearRecordingStatus(generation);
+                if (transcriptionOperationId === operationId) {
+                    transcriptionOperationId = null;
+                }
+                renderControls();
+                renderStatus();
+            }
             return false;
         }
 
@@ -1311,6 +1328,7 @@
             const processor = audioContext.createScriptProcessor(4096, 1, 1);
             session = {
                 generation,
+                operationId,
                 recorder,
                 stream,
                 audioContext,
@@ -1349,7 +1367,6 @@
             recorder.start();
             return true;
         } catch (error) {
-            recordingRequested = false;
             if (session) {
                 session.cancelled = true;
                 releaseCaptureSession(session);
@@ -1359,8 +1376,11 @@
             } else {
                 stopMediaStream(stream);
             }
-            resetRecordPress();
-            reportTranscriptionError(error);
+            if (generation === recordingGeneration) {
+                recordingRequested = false;
+                resetRecordPress();
+                reportTranscriptionError(error);
+            }
             return false;
         }
     }
@@ -1377,9 +1397,34 @@
         }
     }
 
+    function clearRecordingStatus(generation) {
+        if (
+            localStatus?.owner === 'recording'
+            && localStatus.generation === generation
+        ) {
+            localStatus = null;
+        }
+    }
+
     function stop() {
+        const pendingCaptureStart = recordingRequested && !captureSession;
+        const generation = recordingGeneration;
+        const operationId = transcriptionOperationId;
         recordingRequested = false;
         clearSilenceTimer();
+        if (pendingCaptureStart) {
+            // getUserMedia cannot be cancelled synchronously. Retire this
+            // generation so its eventual settlement cannot touch a retry.
+            recordingGeneration += 1;
+            resetRecordPress();
+            clearRecordingStatus(generation);
+            if (transcriptionOperationId === operationId) {
+                transcriptionOperationId = null;
+            }
+            renderControls();
+            renderStatus();
+            return true;
+        }
         if (captureSession && captureSession.recorder.state !== 'inactive') {
             captureSession.recorder.stop();
         }
@@ -1387,22 +1432,32 @@
     }
 
     async function finalizeCapture(session) {
+        const currentGeneration = session.generation === recordingGeneration;
+        const currentOperation = transcriptionOperationId === session.operationId;
         releaseCaptureSession(session);
         if (captureSession === session) {
             captureSession = null;
         }
-        recordingRequested = false;
-        resetRecordPress();
+        if (currentGeneration) {
+            recordingRequested = false;
+            resetRecordPress();
+        }
 
         if (
             session.cancelled
-            || session.generation !== recordingGeneration
+            || !currentGeneration
             || sttRole.state !== 'ready'
             || sttRole.busy
             || destroyed
         ) {
-            renderControls();
-            renderStatus();
+            if (currentGeneration) {
+                clearRecordingStatus(session.generation);
+                if (currentOperation) {
+                    transcriptionOperationId = null;
+                }
+                renderControls();
+                renderStatus();
+            }
             return false;
         }
 
@@ -1415,12 +1470,13 @@
             'audio.webm',
             { type: 'audio/webm' }
         );
-        return transcribeAudio(audioFile);
+        return transcribeAudio(audioFile, session.operationId);
     }
 
-    async function transcribeAudio(audioFile) {
+    async function transcribeAudio(audioFile, operationId = null) {
         const generation = ++transcriptionGeneration;
-        transcriptionOperationId = transcriptionOperationId
+        transcriptionOperationId = operationId
+            || transcriptionOperationId
             || nextSpeechOperationId('transcription');
         const controller = new AbortController();
         transcriptionAbortController?.abort();
@@ -1636,6 +1692,26 @@
         keyboardRecording = false;
     }
 
+    function handlePageHide(event) {
+        if (event.persisted === true) {
+            return;
+        }
+        destroy();
+    }
+
+    function handlePageShow(event) {
+        if (event.persisted !== true || destroyed) {
+            return;
+        }
+        restoreFromPageCache();
+    }
+
+    function restoreFromPageCache() {
+        synchronizeAIMutedState();
+        renderControls();
+        renderStatus();
+    }
+
     function destroy() {
         if (destroyed) {
             return;
@@ -1644,7 +1720,8 @@
         destroyed = true;
         runtimeStateAbortController.abort();
         sttActivationController.destroy();
-        window.removeEventListener('pagehide', destroy);
+        window.removeEventListener('pagehide', handlePageHide);
+        window.removeEventListener('pageshow', handlePageShow);
         microphonePermissionStatus?.removeEventListener?.(
             'change',
             microphonePermissionListener

package/runtime/arcane/components/voice-transcription.html

@@ -212,8 +212,13 @@
     completeButton.addEventListener('click',completeStream,lifecycleListenerOptions);
     window.addEventListener(
         'pagehide',
-        destroy,
-        {once:true,signal:runtimeStateAbortController.signal}
+        handlePageHide,
+        {signal:runtimeStateAbortController.signal}
+    );
+    window.addEventListener(
+        'pageshow',
+        handlePageShow,
+        {signal:runtimeStateAbortController.signal}
     );
 
     const sttActivationController=createSTTActivationController(
@@ -982,6 +987,24 @@
         };
     }
 
+    function handlePageHide(event){
+        if(event.persisted===true){
+            return;
+        }
+        destroy();
+    }
+
+    function handlePageShow(event){
+        if(event.persisted!==true||destroyed){
+            return;
+        }
+        restoreFromPageCache();
+    }
+
+    function restoreFromPageCache(){
+        renderState();
+    }
+
     function destroy(){
         if(destroyed){
             return true;
@@ -989,7 +1012,8 @@
         destroyed=true;
         runtimeStateAbortController.abort();
         sttActivationController.destroy();
-        window.removeEventListener('pagehide',destroy);
+        window.removeEventListener('pagehide',handlePageHide);
+        window.removeEventListener('pageshow',handlePageShow);
         if(!cancelSTTOperation('component-destroyed')){
             sessionGeneration++;
         }