Merge pull request #31 from Geeks-Zone/fix/openclaw-bridge-ws-fallback

fix(openclaw): evitar fallback HTTP espurio e atrelar WS ao provider ativo

Author: actus7

components/chat/chat-page.tsx

@@ -78,6 +78,7 @@ import { Skeleton } from "@/components/ui/skeleton";
 
 import { apiFetch, apiJson, apiJsonRequest, testProviderCredentials } from "@/lib/api";
 import {
+  isBridgeConnectionError,
   loadOpenClawBridgeSessionKey,
   OpenClawBridgeClient,
   type OpenClawBridgeEvent,
@@ -359,15 +360,11 @@ export function ChatPage() {
 
   const getBridgeClient = useCallback(async () => {
     const baseUrl = normalizeGatewayBaseUrl(openclaw.bridgeSettings.baseUrl);
-    const currentClient = bridgeClientRef.current;
-    if (!currentClient || currentClient.baseUrl !== baseUrl) {
-      currentClient?.disconnect();
-      bridgeClientRef.current = new OpenClawBridgeClient(baseUrl);
-    }
-
-    const client = bridgeClientRef.current;
-    if (!client) {
-      throw new Error("Bridge client unavailable.");
+    let client = bridgeClientRef.current;
+    if (!client || client.baseUrl !== baseUrl) {
+      client?.disconnect();
+      client = new OpenClawBridgeClient(baseUrl);
+      bridgeClientRef.current = client;
     }
     await client.connect();
     return client;
@@ -418,11 +415,25 @@ export function ChatPage() {
   }, []);
 
   useEffect(() => {
+    const isOpenClawBridgeActive =
+      selectedProviderId === OPENCLAW_PROVIDER_ID && openclaw.mode === "bridge";
+    const baseUrl = openclaw.bridgeSettings.baseUrl.trim();
+
     bridgeClientRef.current?.disconnect();
     bridgeClientRef.current = null;
     bridgeRunRef.current = null;
     setBridgeFallbackMode(false);
-  }, [openclaw.bridgeSettings.baseUrl]);
+
+    if (!isOpenClawBridgeActive || !baseUrl) {
+      return;
+    }
+
+    const client = new OpenClawBridgeClient(normalizeGatewayBaseUrl(baseUrl));
+    bridgeClientRef.current = client;
+    void client.connect().catch(() => {
+      // erros de conexão são reportados no envio/fluxo; aqui apenas garantimos que não propagam
+    });
+  }, [selectedProviderId, openclaw.mode, openclaw.bridgeSettings.baseUrl]);
 
   // Smart auto-scroll: scroll to bottom only if user hasn't scrolled up
   useEffect(() => {
@@ -1150,6 +1161,9 @@ export function ChatPage() {
           });
           setBridgeFallbackMode(false);
         } catch (bridgeError) {
+          if (!isBridgeConnectionError(bridgeError)) {
+            throw bridgeError;
+          }
           setMessages((current) =>
             current.map((message) =>
               message.id === assistantMessageId

lib/openclaw-bridge-client.ts

@@ -95,6 +95,20 @@ function buildBridgeWebSocketUrl(baseUrl: string): string {
   return url.toString();
 }
 
+const BRIDGE_CONNECTION_ERROR_MESSAGES = [
+  "Bridge WS connection failed",
+  "Bridge WS disconnected",
+  "Bridge WS connection timed out",
+  "Bridge WS not connected",
+];
+
+export function isBridgeConnectionError(error: unknown): boolean {
+  if (!(error instanceof Error)) {
+    return false;
+  }
+  return BRIDGE_CONNECTION_ERROR_MESSAGES.some((prefix) => error.message.startsWith(prefix));
+}
+
 export function loadOpenClawBridgeSessionKey(conversationId: string): string {
   if (typeof window === "undefined" || !conversationId) {
     return "";
@@ -291,12 +305,21 @@ export class OpenClawBridgeClient {
     }
 
     const pending = this.#pendingRequests.get(requestId);
-    if (!pending || !pending.types.has(event.type)) {
+    if (!pending) {
       return;
     }
 
-    this.#pendingRequests.delete(requestId);
-    pending.resolve(event);
+    if (pending.types.has(event.type)) {
+      this.#pendingRequests.delete(requestId);
+      pending.resolve(event);
+      return;
+    }
+
+    if (event.type === "run.error") {
+      this.#pendingRequests.delete(requestId);
+      const message = "error" in event && event.error ? event.error : "bridge run.error";
+      pending.reject(new Error(message));
+    }
   }
 
   #failPendingRequests(error: Error) {