Various fixes

src/App.tsx

@@ -32,8 +32,10 @@ function App() {
   const join = async (appId: string) => {
     if (!appId) return;
     const res = await startSession({ appId }).unwrap();
-    console.log("Joining debug session at " + res.url);
-    dispatch({ type: WS_CONNECT, payload: { url: res.url } });
+    const primaryUrl = res.fallbackUrl || res.url;
+    const fallbackUrl = res.fallbackUrl ? res.url : undefined;
+    console.log("Joining debug session at " + primaryUrl + (fallbackUrl ? " (fallback: " + fallbackUrl + ")" : ""));
+    dispatch({ type: WS_CONNECT, payload: { url: primaryUrl, fallbackUrl } });
   };
 
   const stop = (appId: string) => {

src/features/DebugConsole/DebugConsole.tsx

@@ -25,10 +25,10 @@ const DebugConsole = ({isConnected, join, stop, clear}: DebugConsoleProps) => {
   const { appId } = useAppParams();
   const dispatch = useAppDispatch();
   const messages = useAppSelector((state: RootState) => state.websocket.messages);
-  const failedUrl = useAppSelector((state: RootState) => state.websocket.failedUrl);
+  const failedUrls = useAppSelector((state: RootState) => state.websocket.failedUrls);
   const searchText = useAppSelector(selectSearchText);
-  const certUrl = failedUrl
-    ? new URL(failedUrl).origin.replace(/^wss:/, 'https:').replace(/^ws:/, 'http:')
+  const certUrls = failedUrls
+    ? failedUrls.map((u: string) => new URL(u).origin.replace(/^wss:/, 'https:').replace(/^ws:/, 'http:'))
     : null;
 
   const { data: doNotLoadConfigOnNextBoot } =
@@ -140,12 +140,17 @@ const DebugConsole = ({isConnected, join, stop, clear}: DebugConsoleProps) => {
           </Button>
           <span className="ps-2">Message Count: {messages.length}</span>
         </div>
-        {certUrl && (
+        {certUrls && certUrls.length > 0 && (
           <Alert variant="warning" className="py-2 px-3 mb-2" style={{ fontSize: '0.82rem' }}>
             <strong>Connection failed.</strong> The debug server may have an untrusted certificate.{' '}
-            <Alert.Link href={certUrl} target="_blank" rel="noreferrer">
-              Open {certUrl} in a new tab
-            </Alert.Link>
+            {certUrls.map((certUrl: string, i: number) => (
+              <span key={certUrl}>
+                {i > 0 && ' or '}
+                <Alert.Link href={certUrl} target="_blank" rel="noreferrer">
+                  Open {certUrl} in a new tab
+                </Alert.Link>
+              </span>
+            ))}
             {', accept the certificate, then try "Start Debug Session" again.'}
           </Alert>
         )}

src/store/apiSlice.ts

@@ -388,6 +388,7 @@ interface MethodParam {
 
 interface DebugSession {
   url: string;
+  fallbackUrl?: string;
 }
 
 export interface MobileControlClient {

src/store/websocketMiddleware.ts

@@ -18,7 +18,7 @@ export const websocketMiddleware: Middleware = (store) => {
     const { type } = action as WsConnectAction | WsDisconnectAction;
 
     if (type === WS_CONNECT) {
-      const { url } = (action as WsConnectAction).payload;
+      const { url, fallbackUrl } = (action as WsConnectAction).payload;
 
       console.log("[ws] Connecting to", url);
 
@@ -29,24 +29,37 @@ export const websocketMiddleware: Middleware = (store) => {
         socket.close();
       }
 
-      socket = new WebSocket(url);
-      socket.onopen = () => store.dispatch(connected());
-      socket.onclose = () => {
-        store.dispatch(disconnected());
-        socket = null;
-      };
-      socket.onerror = (err) => {
-        console.error("WebSocket error", err);
-        store.dispatch(connectionFailed(url));
-      };
-      socket.onmessage = (event: MessageEvent<string>) => {
-        try {
-          store.dispatch(messageReceived(JSON.parse(event.data)));
-        } catch (e) {
-          console.error("Failed to parse WebSocket message", e);
-        }
+      const connectToUrl = (targetUrl: string, fallback?: string) => {
+        socket = new WebSocket(targetUrl);
+        socket.onopen = () => store.dispatch(connected());
+        socket.onclose = () => {
+          store.dispatch(disconnected());
+          socket = null;
+        };
+        socket.onerror = (err) => {
+          console.error("WebSocket error", err);
+          if (fallback) {
+            console.log("[ws] Primary connection failed, falling back to", fallback);
+            connectToUrl(fallback);
+          } else {
+            // Report all attempted URLs (primary + fallback that was tried)
+            const attemptedUrls = fallbackUrl && targetUrl === fallbackUrl
+              ? [url, fallbackUrl]
+              : [targetUrl];
+            store.dispatch(connectionFailed(attemptedUrls));
+          }
+        };
+        socket.onmessage = (event: MessageEvent<string>) => {
+          try {
+            store.dispatch(messageReceived(JSON.parse(event.data)));
+          } catch (e) {
+            console.error("Failed to parse WebSocket message", e);
+          }
+        };
       };
 
+      connectToUrl(url, fallbackUrl);
+
       return;
     }
 

src/store/websocketSlice.ts

@@ -4,13 +4,13 @@ import { LogMessage } from "../shared/types/LogMessage";
 interface WebsocketState {
   messages: LogMessage[];
   isConnected: boolean;
-  failedUrl: string | null;
+  failedUrls: string[] | null;
 }
 
 const initialState: WebsocketState = {
   messages: [],
   isConnected: false,
-  failedUrl: null,
+  failedUrls: null,
 };
 
 const websocketSlice = createSlice({
@@ -34,12 +34,12 @@ const websocketSlice = createSlice({
       state.messages = [];
     },
     /** Dispatched by the middleware when a connection attempt fails */
-    connectionFailed(state, action: PayloadAction<string>) {
-      state.failedUrl = action.payload;
+    connectionFailed(state, action: PayloadAction<string[]>) {
+      state.failedUrls = action.payload;
     },
     /** Dispatched by the middleware when a new connection attempt starts */
     connectionAttemptStarted(state) {
-      state.failedUrl = null;
+      state.failedUrls = null;
     },
   },
 });
@@ -57,7 +57,7 @@ export const WS_DISCONNECT = "websocket/disconnect";
 
 export interface WsConnectAction {
   type: typeof WS_CONNECT;
-  payload: { url: string };
+  payload: { url: string; fallbackUrl?: string };
 }
 
 export interface WsDisconnectAction {