fix websocket, tts and config

feruzm · feruzm · commit 5be38bf8305f · 2026-01-16T19:47:54.000+02:00
diff --git a/apps/self-hosted/src/features/auth/utils/hive-auth.ts b/apps/self-hosted/src/features/auth/utils/hive-auth.ts
@@ -87,6 +87,16 @@ export async function loginWithHiveAuth(
     const key = generateKey();
     let uuid: string | null = null;
     let authTimeout: ReturnType<typeof setTimeout> | null = null;
+    let settled = false;
+
+    // Create challenge once to ensure consistent timestamps between auth_req and QR data
+    const challenge: HiveAuthChallenge = {
+      key_type: 'posting',
+      challenge: JSON.stringify({
+        login: true,
+        ts: Date.now(),
+      }),
+    };
 
     const cleanup = () => {
       if (authTimeout) {
@@ -98,16 +108,22 @@ export async function loginWithHiveAuth(
       }
     };
 
-    ws.onopen = () => {
-      // Send auth request
-      const challenge: HiveAuthChallenge = {
-        key_type: 'posting',
-        challenge: JSON.stringify({
-          login: true,
-          ts: Date.now(),
-        }),
-      };
+    const safeReject = (error: Error) => {
+      if (!settled) {
+        settled = true;
+        reject(error);
+      }
+    };
 
+    const safeResolve = () => {
+      if (!settled) {
+        settled = true;
+        resolve();
+      }
+    };
+
+    ws.onopen = () => {
+      // Send auth request using the pre-created challenge
       const authReq = {
         cmd: 'auth_req',
         account: username,
@@ -131,13 +147,7 @@ export async function loginWithHiveAuth(
           case 'auth_wait':
             if (msg.uuid) {
               uuid = msg.uuid;
-              const challenge: HiveAuthChallenge = {
-                key_type: 'posting',
-                challenge: JSON.stringify({
-                  login: true,
-                  ts: Date.now(),
-                }),
-              };
+              // Reuse the same challenge for QR data
               const qrData = generateQRData(username, uuid, key, challenge);
               callbacks.onQRCode?.(qrData);
               callbacks.onWaiting?.();
@@ -154,33 +164,33 @@ export async function loginWithHiveAuth(
               };
               callbacks.onSuccess?.(session);
               cleanup();
-              resolve();
+              safeResolve();
             }
             break;
 
           case 'auth_nack':
             callbacks.onError?.('Authentication rejected');
             cleanup();
-            reject(new Error('Authentication rejected'));
+            safeReject(new Error('Authentication rejected'));
             break;
 
           case 'auth_err':
             callbacks.onError?.(msg.error || 'Authentication error');
             cleanup();
-            reject(new Error(msg.error || 'Authentication error'));
+            safeReject(new Error(msg.error || 'Authentication error'));
             break;
         }
       } catch (error) {
         callbacks.onError?.('Failed to parse response');
         cleanup();
-        reject(error);
+        safeReject(error instanceof Error ? error : new Error('Failed to parse response'));
       }
     };
 
     ws.onerror = () => {
       callbacks.onError?.('WebSocket connection error');
       cleanup();
-      reject(new Error('WebSocket connection error'));
+      safeReject(new Error('WebSocket connection error'));
     };
 
     ws.onclose = () => {
@@ -189,14 +199,19 @@ export async function loginWithHiveAuth(
         clearTimeout(authTimeout);
         authTimeout = null;
       }
+      // Reject if the Promise hasn't been settled yet
+      if (!settled) {
+        callbacks.onError?.('WebSocket closed before authentication completed');
+        safeReject(new Error('WebSocket closed before authentication completed'));
+      }
     };
 
     // Timeout after 5 minutes
     authTimeout = setTimeout(() => {
       if (ws.readyState === WebSocket.OPEN) {
         callbacks.onError?.('Authentication timeout');
         cleanup();
-        reject(new Error('Authentication timeout'));
+        safeReject(new Error('Authentication timeout'));
       }
     }, 5 * 60 * 1000);
   });
@@ -213,6 +228,7 @@ export async function broadcastWithHiveAuth(
   return new Promise((resolve, reject) => {
     const ws = new WebSocket(HIVEAUTH_API);
     let signTimeout: ReturnType<typeof setTimeout> | null = null;
+    let settled = false;
 
     const cleanup = () => {
       if (signTimeout) {
@@ -224,6 +240,20 @@ export async function broadcastWithHiveAuth(
       }
     };
 
+    const safeReject = (error: Error) => {
+      if (!settled) {
+        settled = true;
+        reject(error);
+      }
+    };
+
+    const safeResolve = () => {
+      if (!settled) {
+        settled = true;
+        resolve();
+      }
+    };
+
     ws.onopen = () => {
       const signReq = {
         cmd: 'sign_req',
@@ -252,32 +282,32 @@ export async function broadcastWithHiveAuth(
           case 'sign_ack':
             callbacks?.onSuccess?.(msg.data);
             cleanup();
-            resolve();
+            safeResolve();
             break;
 
           case 'sign_nack':
             callbacks?.onError?.('Transaction rejected');
             cleanup();
-            reject(new Error('Transaction rejected'));
+            safeReject(new Error('Transaction rejected'));
             break;
 
           case 'sign_err':
             callbacks?.onError?.(msg.error || 'Signing error');
             cleanup();
-            reject(new Error(msg.error || 'Signing error'));
+            safeReject(new Error(msg.error || 'Signing error'));
             break;
         }
       } catch (error) {
         callbacks?.onError?.('Failed to parse response');
         cleanup();
-        reject(error);
+        safeReject(error instanceof Error ? error : new Error('Failed to parse response'));
       }
     };
 
     ws.onerror = () => {
       callbacks?.onError?.('WebSocket connection error');
       cleanup();
-      reject(new Error('WebSocket connection error'));
+      safeReject(new Error('WebSocket connection error'));
     };
 
     ws.onclose = () => {
@@ -286,14 +316,19 @@ export async function broadcastWithHiveAuth(
         clearTimeout(signTimeout);
         signTimeout = null;
       }
+      // Reject if the Promise hasn't been settled yet
+      if (!settled) {
+        callbacks?.onError?.('WebSocket closed before signing completed');
+        safeReject(new Error('WebSocket closed before signing completed'));
+      }
     };
 
     // Timeout after 2 minutes for signing
     signTimeout = setTimeout(() => {
       if (ws.readyState === WebSocket.OPEN) {
         callbacks?.onError?.('Signing timeout');
         cleanup();
-        reject(new Error('Signing timeout'));
+        safeReject(new Error('Signing timeout'));
       }
     }, 2 * 60 * 1000);
   });
diff --git a/apps/self-hosted/src/features/blog/components/text-to-speech-button.tsx b/apps/self-hosted/src/features/blog/components/text-to-speech-button.tsx
@@ -136,6 +136,7 @@ export function TextToSpeechButton({ text, title, className }: Props) {
             onClick={handleStop}
             className="p-1 text-theme-muted hover:text-red-500 transition-colors rounded"
             title={t('stop')}
+            aria-label={t('stop')}
           >
             <UilStopCircle className="w-4 h-4" />
           </button>
@@ -158,6 +159,7 @@ export function TextToSpeechButton({ text, title, className }: Props) {
             onClick={handleStop}
             className="p-1 text-theme-muted hover:text-red-500 transition-colors rounded"
             title={t('stop')}
+            aria-label={t('stop')}
           >
             <UilStopCircle className="w-4 h-4" />
           </button>
@@ -169,24 +171,68 @@ export function TextToSpeechButton({ text, title, className }: Props) {
 
 // Helper to split text into chunks for speech synthesis
 function splitIntoChunks(text: string, maxLength: number): string[] {
-  const sentences = text.match(/[^.!?]+[.!?]+/g) || [text];
+  // Match sentences with punctuation, and also capture trailing text without punctuation
+  const sentenceRegex = /[^.!?]+[.!?]+|[^.!?]+$/g;
+  const sentences = text.match(sentenceRegex) || [text];
   const chunks: string[] = [];
   let currentChunk = '';
 
+  // Helper to split a long sentence into word-boundary chunks
+  const splitLongSentence = (sentence: string): string[] => {
+    const words = sentence.split(/\s+/);
+    const subChunks: string[] = [];
+    let subChunk = '';
+
+    for (const word of words) {
+      if (subChunk.length + word.length + 1 > maxLength) {
+        if (subChunk) {
+          subChunks.push(subChunk.trim());
+        }
+        // If a single word is longer than maxLength, add it anyway
+        subChunk = word;
+      } else {
+        subChunk += (subChunk ? ' ' : '') + word;
+      }
+    }
+
+    if (subChunk) {
+      subChunks.push(subChunk.trim());
+    }
+
+    return subChunks;
+  };
+
   for (const sentence of sentences) {
-    if ((currentChunk + sentence).length > maxLength) {
+    const trimmedSentence = sentence.trim();
+    if (!trimmedSentence) continue;
+
+    // If the sentence itself is too long, split it at word boundaries
+    if (trimmedSentence.length > maxLength) {
+      // First, flush the current chunk if any
+      if (currentChunk) {
+        chunks.push(currentChunk.trim());
+        currentChunk = '';
+      }
+      // Split the long sentence and add sub-chunks
+      const subChunks = splitLongSentence(trimmedSentence);
+      for (const subChunk of subChunks) {
+        chunks.push(subChunk);
+      }
+    } else if ((currentChunk + ' ' + trimmedSentence).length > maxLength) {
+      // Adding this sentence would exceed the limit
       if (currentChunk) {
         chunks.push(currentChunk.trim());
       }
-      currentChunk = sentence;
+      currentChunk = trimmedSentence;
     } else {
-      currentChunk += sentence;
+      currentChunk += (currentChunk ? ' ' : '') + trimmedSentence;
     }
   }
 
+  // Always push the final chunk
   if (currentChunk) {
     chunks.push(currentChunk.trim());
   }
 
-  return chunks;
+  return chunks.filter(chunk => chunk.length > 0);
 }
diff --git a/apps/self-hosted/src/features/floating-menu/components/config-editor.tsx b/apps/self-hosted/src/features/floating-menu/components/config-editor.tsx
@@ -101,7 +101,7 @@ function ArrayFieldEditor({
         className={`${inputClassName} font-mono`}
         style={{
           ...inputStyle,
-          borderColor: isValid ? inputStyle.border : '#ef4444',
+          borderColor: isValid ? FLOATING_MENU_THEME.borderColor : '#ef4444',
         }}
         rows={4}
         aria-label={field.label}
