FIX: flatten Tor guard, refresh Orbot status, sanitize persisted settings

Author: chaitika

blue_modules/torManager.ts

@@ -60,7 +60,13 @@ class TorManager {
     try {
       const stored = await AsyncStorage.getItem(TOR_SETTINGS_KEY);
       if (stored) {
-        this._settings = { ...DEFAULT_SETTINGS, ...JSON.parse(stored) };
+        const parsed = JSON.parse(stored) as Partial<TorSettings>;
+        const port = parsed.socksPort;
+        this._settings = {
+          enabled: typeof parsed.enabled === 'boolean' ? parsed.enabled : DEFAULT_SETTINGS.enabled,
+          torOnly: typeof parsed.torOnly === 'boolean' ? parsed.torOnly : DEFAULT_SETTINGS.torOnly,
+          socksPort: typeof port === 'number' && Number.isInteger(port) && port >= 1 && port <= 65535 ? port : DEFAULT_SETTINGS.socksPort,
+        };
       }
     } catch (e) {
       console.warn('[TorManager] Failed to load settings:', e);
@@ -120,6 +126,12 @@ class TorManager {
     }
   }
 
+  markUnavailable(): void {
+    if (this._status === 'connected') {
+      this._setStatus('unavailable');
+    }
+  }
+
   /** Android only. On iOS, returns false — users must configure manually. */
   static async isOrbotInstalled(): Promise<boolean> {
     if (Platform.OS !== 'android') return false;

helpers/silent-payments/IndexerHttpClient.ts

@@ -18,51 +18,50 @@ export class IndexerHttpClient {
   private async executeGet<T>(endpoint: string, errorContext: string): Promise<T> {
     const torManager = TorManager.getInstance();
 
-    // Try Tor/onion route first when available
-    if (torManager.settings.enabled && this.onionUrl) {
-      if (torManager.isReady) {
-        for (let attempt = 1; attempt <= RETRY_ATTEMPTS; attempt++) {
-          try {
-            const response = await socks5Fetch(`${this.onionUrl}${endpoint}`, {
-              method: 'GET',
-              headers: { 'Content-Type': 'application/json' },
-              timeout: this.timeout,
-              socksHost: DEFAULT_SOCKS_HOST,
-              socksPort: torManager.socksPort,
-            });
-
-            if (!response.ok) {
-              throw new Error(`HTTP error! status: ${response.status}`);
-            }
-
-            return await response.json();
-          } catch (torError) {
-            const message = torError instanceof Error ? torError.message : String(torError);
-            console.warn(`[IndexerHttpClient] Tor attempt ${attempt}/${RETRY_ATTEMPTS} failed: ${message}`);
-
-            if (attempt < RETRY_ATTEMPTS) {
-              const delay = Math.min(1000 * Math.pow(2, attempt - 1), 8000);
-              await new Promise(resolve => setTimeout(resolve, delay));
-            }
+    if (torManager.settings.enabled && this.onionUrl && torManager.isReady) {
+      for (let attempt = 1; attempt <= RETRY_ATTEMPTS; attempt++) {
+        try {
+          const response = await socks5Fetch(`${this.onionUrl}${endpoint}`, {
+            method: 'GET',
+            headers: { 'Content-Type': 'application/json' },
+            timeout: this.timeout,
+            socksHost: DEFAULT_SOCKS_HOST,
+            socksPort: torManager.socksPort,
+          });
+
+          if (!response.ok) {
+            throw new Error(`HTTP error! status: ${response.status}`);
+          }
+
+          return await response.json();
+        } catch (torError) {
+          const message = torError instanceof Error ? torError.message : String(torError);
+          console.warn(`[IndexerHttpClient] Tor attempt ${attempt}/${RETRY_ATTEMPTS} failed: ${message}`);
+
+          if (attempt < RETRY_ATTEMPTS) {
+            const delay = Math.min(1000 * Math.pow(2, attempt - 1), 8000);
+            await new Promise(resolve => setTimeout(resolve, delay));
           }
         }
       }
 
-      if (torManager.isTorOnly) {
-        throw new Error(
-          `${errorContext}: Tor-only mode is enabled but Tor is unavailable. ` +
-          'Clearnet fallback is blocked. Ensure Orbot is running.',
-        );
-      }
+      torManager.markUnavailable();
+    }
 
-      console.warn('[IndexerHttpClient] Tor unavailable, falling back to clearnet');
-    } else if (torManager.isTorOnly) {
+    if (torManager.isTorOnly) {
       throw new Error(
-        `${errorContext}: Tor-only mode is enabled but no .onion URL is configured. ` +
-        'Set an onion URL or disable Tor-only mode.',
+        this.onionUrl
+          ? `${errorContext}: Tor-only mode is enabled but Tor is unavailable. ` +
+            'Clearnet fallback is blocked. Ensure Orbot is running.'
+          : `${errorContext}: Tor-only mode is enabled but no .onion URL is configured. ` +
+            'Set an onion URL or disable Tor-only mode.',
       );
     }
 
+    if (torManager.settings.enabled && this.onionUrl) {
+      console.warn('[IndexerHttpClient] Tor unavailable, falling back to clearnet');
+    }
+
     // Clearnet fallback
     try {
       const response = await fetchWithRetries(`${this.baseUrl}${endpoint}`, {

screen/settings/TorSettings.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { StyleSheet, View, Switch, TextInput, ActivityIndicator, Platform, TouchableOpacity } from 'react-native';
+import { StyleSheet, View, Switch, TextInput, ActivityIndicator, Platform, TouchableOpacity, AppState } from 'react-native';
 import { BlueCard, BlueText } from '../../BlueComponents';
 import { useSettings } from '../../hooks/context/useSettings';
 import { useTheme } from '../../components/themes';
@@ -9,17 +9,16 @@ import { BlueSpacing20 } from '../../components/BlueSpacing';
 import TorManager, { type TorStatus } from '../../blue_modules/torManager';
 import loc from '../../loc';
 
-const STATUS_LABELS: Record<TorStatus, string> = {
-  disabled: loc.settings.tor_status_disabled,
-  checking: loc.settings.tor_status_checking,
-  connected: loc.settings.tor_status_connected,
-  unavailable: loc.settings.tor_status_unavailable,
-};
-
 const TorSettings: React.FC = () => {
   const { colors } = useTheme();
   const { isTorEnabled, setIsTorEnabled, isTorOnly, setIsTorOnly, torSocksPort, setTorSocksPort, torStatus, settingsInitialized } =
     useSettings();
+  const statusLabels: Record<TorStatus, string> = {
+    disabled: loc.settings.tor_status_disabled,
+    checking: loc.settings.tor_status_checking,
+    connected: loc.settings.tor_status_connected,
+    unavailable: loc.settings.tor_status_unavailable,
+  };
   const [portInput, setPortInput] = useState(String(torSocksPort));
   const [orbotInstalled, setOrbotInstalled] = useState<boolean | null>(null);
   const [showAdvanced, setShowAdvanced] = useState(false);
@@ -41,9 +40,16 @@ const TorSettings: React.FC = () => {
   );
 
   useEffect(() => {
-    TorManager.isOrbotInstalled()
-      .then(setOrbotInstalled)
-      .catch(() => setOrbotInstalled(null));
+    const check = () => {
+      TorManager.isOrbotInstalled()
+        .then(setOrbotInstalled)
+        .catch(() => setOrbotInstalled(null));
+    };
+    check();
+    const sub = AppState.addEventListener('change', state => {
+      if (state === 'active') check();
+    });
+    return () => sub.remove();
   }, []);
 
   useEffect(() => {
@@ -146,7 +152,7 @@ const TorSettings: React.FC = () => {
 
             <View style={styles.statusRow}>
               <BlueText>{loc.settings.tor_status_label}</BlueText>
-              <BlueText style={[styles.statusValue, { color: statusColors[torStatus] }]}>{STATUS_LABELS[torStatus]}</BlueText>
+              <BlueText style={[styles.statusValue, { color: statusColors[torStatus] }]}>{statusLabels[torStatus]}</BlueText>
               {torStatus === 'checking' && <ActivityIndicator size="small" style={styles.spinner} />}
             </View>
 

tests/unit/IndexerHttpClient.test.ts

@@ -32,6 +32,7 @@ const torState = (overrides: Partial<{ enabled: boolean; isReady: boolean; isTor
   isReady: overrides.isReady ?? true,
   isTorOnly: overrides.isTorOnly ?? false,
   socksPort: overrides.socksPort ?? 9050,
+  markUnavailable: jest.fn(),
 });
 
 describe('IndexerHttpClient routing', () => {
@@ -131,4 +132,18 @@ describe('IndexerHttpClient routing', () => {
     expect(mockedSocks5Fetch).not.toHaveBeenCalled();
     expect(mockedFetchWithRetries).toHaveBeenCalledTimes(1);
   });
+
+  it('marks Tor unavailable after exhausting retries so subsequent calls skip the loop', async () => {
+    const state = torState();
+    torManagerGetInstance.mockReturnValue(state);
+    mockedSocks5Fetch.mockRejectedValue(new Error('SOCKS5 timeout'));
+    mockedFetchWithRetries.mockResolvedValue(okResponse({ height: 900004 }));
+
+    const client = new IndexerHttpClient(baseUrl, 30000, onionUrl);
+    const promise = client.get<{ height: number }>(endpoint, errCtx);
+    await jest.advanceTimersByTimeAsync(3000);
+    await promise;
+
+    expect(state.markUnavailable).toHaveBeenCalledTimes(1);
+  });
 });