Upload app.py

app.py

@@ -3008,8 +3008,8 @@ FRONTEND_HTML = r"""
         </div>
         <div class="settings-actions">
           <button id="saveReachySettings" type="button">Save settings</button>
-          <button id="testReachy" type="button">Open test bridge</button>
-          <button id="openReachyLast" type="button" hidden>Open Reachy</button>
+          <button id="openReachyLast" type="button">Open Reachy bridge</button>
+          <button id="testReachy" type="button">Send test command</button>
           <span class="status-line" id="reachyStatus">Reachy bridge not configured.</span>
           <span class="status-line" id="metricsSyncStatus"></span>
         </div>
@@ -3473,21 +3473,6 @@ FRONTEND_HTML = r"""
       return normalizeForCorrectionCompare(original) === normalizeForCorrectionCompare(corrected);
     }
 
-    function reachyToneBridgeUrl(baseUrl, payload) {
-      const json = JSON.stringify({
-        text: payload.text || "",
-        emotion: payload.emotion || "happy",
-        lang: payload.lang || "en",
-        robotVoice: payload.robotVoice !== false,
-        audioUrl: payload.audioUrl || "",
-        autoRun: true
-      });
-      const config = btoa(unescape(encodeURIComponent(json)));
-      const url = new URL(baseUrl);
-      url.searchParams.set("config", config);
-      return url.toString();
-    }
-
     function reachyAudioUrl(comment, chinese) {
       const url = new URL("/reachy_audio.mp3", window.location.origin);
       url.searchParams.set("comment", comment || "Here is the correction.");
@@ -3496,6 +3481,11 @@ FRONTEND_HTML = r"""
       return url.toString();
     }
 
+    function reachyCommandUrl(baseUrl) {
+      const url = new URL("/api/commands", baseUrl);
+      return url.toString();
+    }
+
     function buildReachyCorrectionPayload(payload, renderedText) {
       const original = payload.original_sentence || currentOriginalSentence || field("#sentence").value.trim();
       const corrected = payload.corrected_sentence || currentCorrectedSentence || extractCorrectedSentence(renderedText) || original;
@@ -3524,7 +3514,7 @@ FRONTEND_HTML = r"""
       };
     }
 
-    function sendReachyPayload(payload, options = {}) {
+    async function sendReachyPayload(payload, options = {}) {
       const settings = currentReachySettings();
       if (!options.force && !settings.enabled) return false;
       const baseUrl = normalizedReachyBridgeBase(settings);
@@ -3534,49 +3524,49 @@ FRONTEND_HTML = r"""
         return false;
       }
       const audioUrl = reachyAudioUrl(payload.comment, payload.chinese_text);
-      const bridgeUrl = reachyToneBridgeUrl(baseUrl, {
+      const command = {
         text: payload.text,
         emotion: payload.emotion,
         lang: payload.lang || "en",
         robotVoice: settings.robotVoice,
-        audioUrl
-      });
-      lastReachyBridgeUrl = bridgeUrl;
+        audioUrl,
+        autoRun: true
+      };
+      lastReachyBridgeUrl = baseUrl;
       if (openReachyLast) {
         openReachyLast.hidden = false;
         openReachyLast.disabled = false;
       }
 
-      const shouldOpen = options.open === true || options.force === true;
-      if (!shouldOpen) {
-        setStatusLine(reachyStatus, "Reachy command ready. Click Open Reachy if needed.", "ok");
+      setStatusLine(reachyStatus, "Sending command to Reachy bridge...", "");
+      try {
+        const response = await fetch(reachyCommandUrl(baseUrl), {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json"
+          },
+          body: JSON.stringify(command)
+        });
+        const result = await response.json().catch(() => ({}));
+        if (!response.ok || result?.ok === false) {
+          throw new Error(result?.error || `HTTP ${response.status}`);
+        }
+        setStatusLine(reachyStatus, "Reachy command queued. Keep the bridge open.", "ok");
         updateSettingsHeader(settings);
         return true;
-      }
-
-      let opened = null;
-      try {
-        opened = window.open(bridgeUrl, "tonebridgeReachyBridge", "noopener,noreferrer");
       } catch (error) {
-        opened = null;
-      }
-      if (!opened) {
-        setStatusLine(reachyStatus, "Reachy bridge ready. Click Open Reachy.", "error");
+        console.warn("Reachy command failed.", error);
+        setStatusLine(reachyStatus, `Reachy command failed: ${error?.message || error}`, "error");
         updateSettingsHeader(settings);
         return false;
       }
-
-      const label = payload.status === "correct" ? "Reachy bridge opened with encouragement." : "Reachy bridge opened with correction.";
-      setStatusLine(reachyStatus, label, "ok");
-      updateSettingsHeader(settings);
-      return true;
     }
 
     function testReachyConnection() {
       const settings = currentReachySettings();
       saveReachySettingsValue(settings);
       updateSettingsHeader(settings);
-      sendReachyPayload({
+      void sendReachyPayload({
         source: "ToneBridge",
         event: "test",
         status: "test",
@@ -3610,6 +3600,7 @@ FRONTEND_HTML = r"""
     function initializeReachySettings() {
       const settings = loadReachySettings();
       applyReachySettings(settings);
+      lastReachyBridgeUrl = normalizedReachyBridgeBase(settings);
       setStatusLine(
         reachyStatus,
         settings.bridgeUrl ? "Reachy bridge configured." : "Reachy bridge not configured.",
@@ -4124,7 +4115,7 @@ FRONTEND_HTML = r"""
         currentOriginalSentence = payload.original_sentence || sentence;
         currentRequestId = payload.request_id || "";
         if (currentRequestId) showFeedbackPanel();
-        sendReachyPayload(buildReachyCorrectionPayload(payload, data));
+        void sendReachyPayload(buildReachyCorrectionPayload(payload, data));
         if (copyCorrected) copyCorrected.disabled = !corrected;
         if (corrected) {
           readingPanel.style.display = "block";
@@ -4189,6 +4180,7 @@ FRONTEND_HTML = r"""
       const settings = currentReachySettings();
       saveReachySettingsValue(settings);
       updateSettingsHeader(settings);
+      lastReachyBridgeUrl = normalizedReachyBridgeBase(settings);
       setStatusLine(reachyStatus, settings.bridgeUrl ? "Reachy bridge settings saved." : "Reachy bridge URL missing.", settings.bridgeUrl ? "ok" : "error");
     });
     testReachy?.addEventListener("click", () => testReachyConnection());