fix: show app version and harden device detection

Author: 刘威

AGENTS.md

@@ -0,0 +1,24 @@
+# Repository Guidelines
+
+## Project Structure & Module Organization
+This repository is an Electron app. Main-process code lives in `src/main`, with ADB lifecycle code in `src/main/adb` and local proxy code in `src/main/proxy`. The preload bridge is `src/preload/index.js`. Renderer HTML, JS, CSS, and bundled browser-side libraries live in `src/renderer`. Build assets and icons are in `assets/` and `img/`. Packaging-only ADB binaries are staged in `bundled-tools/platform-tools`. Utility and manual verification scripts live in `scripts/`.
+
+## Build, Test, and Development Commands
+- `npm start`: run the Electron app locally.
+- `npm run prepare:platform-tools`: download platform-tools into `bundled-tools/platform-tools` for packaging.
+- `npm run build`: build with `electron-builder.yml`.
+- `npm run build:win`, `npm run build:mac`, `npm run build:linux`: platform-specific builds.
+- `npm run debug:auto` or `npm run debug:screenshot`: quick UI/debug helpers.
+- `node scripts/test-browser-features.js` or other `scripts/test-*.js`: ad hoc verification scripts. There is no formal unit test suite yet.
+
+## Coding Style & Naming Conventions
+Use plain JavaScript with CommonJS modules, 2-space indentation, semicolons, and single quotes. Prefer descriptive names over abbreviations. Use `camelCase` for variables/functions, `PascalCase` for classes, and lowercase filenames unless existing files establish a pattern such as `README.md`. Keep renderer logic in `src/renderer/app.js`; keep ADB-specific logic under `src/main/adb`.
+
+## Testing Guidelines
+Testing is script-driven. Add focused validation scripts in `scripts/` when fixing nontrivial behavior, especially around ADB startup, window events, and SSH/terminal flows. Name them by behavior, for example `test-ssh-connection.js`. Before release work, verify the relevant path locally and check application logs under `%APPDATA%/adb-proxy-browser/logs/app.log`.
+
+## Commit & Pull Request Guidelines
+Follow the existing commit style: `fix: ...`, `feat: ...`, `chore: ...`, `ci: ...`. Keep subjects short and imperative. For releases, use a separate version bump commit such as `chore: bump version to 0.7.49`. PRs should state user-visible impact, platform scope, and validation performed. Include screenshots for renderer changes and call out any packaging or workflow changes that affect release artifacts.
+
+## Packaging Notes
+Release builds must use `electron-builder.yml`. The embedded ADB flow depends on `extraResources` copying `bundled-tools/platform-tools` into `resources/platform-tools`, so avoid splitting build config across multiple sources without updating both the workflow and packaging commands.

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "adb-proxy-browser",
-  "version": "0.7.49",
+  "version": "0.7.50",
   "description": "A customized browser that routes traffic through ADB tunnel to phone proxy (Clash)",
   "main": "src/main/index.js",
   "scripts": {

package.json

@@ -10,6 +10,8 @@ const ADB_SERVER_PORT = 5037;
 const HEALTH_CHECK_INTERVAL = 5000;
 const INITIAL_DEVICE_RETRY_COUNT = 6;
 const INITIAL_DEVICE_RETRY_DELAY_MS = 500;
+const BACKGROUND_DEVICE_REFRESH_COUNT = 15;
+const BACKGROUND_DEVICE_REFRESH_DELAY_MS = 2000;
 
 // Platform-specific adb binary paths
 const ADB_PATHS = {
@@ -68,6 +70,8 @@ class DeviceManager extends EventEmitter {
     this._serverRunning = false;
     this._healthCheckInterval = null;
     this._reconnecting = false;
+    this._backgroundRefreshTimeout = null;
+    this._backgroundRefreshRemaining = 0;
   }
 
   /**
@@ -343,6 +347,7 @@ class DeviceManager extends EventEmitter {
       // though a USB device is already authorized. Retry a few times so the UI
       // does not get stuck on "No Devices" after startup.
       await this._updateDevicesWithRetry(INITIAL_DEVICE_RETRY_COUNT, INITIAL_DEVICE_RETRY_DELAY_MS);
+      this._scheduleBackgroundRefreshes();
 
       console.log('[ADB] Device tracking started');
     } catch (err) {
@@ -369,16 +374,123 @@ class DeviceManager extends EventEmitter {
    * Update device list
    */
   async _updateDevices() {
-    if (!this.client) return;
+    if (!this.client) return this.devices;
 
     try {
-      this.devices = await this.client.listDevices();
+      let devices = await this.client.listDevices();
+
+      // adbkit can occasionally return an empty list during server/device warmup
+      // while `adb devices` already reports the device. Fall back to the binary
+      // query so the UI does not stay stuck on "No Devices".
+      if (devices.length === 0) {
+        const cliDevices = await this._listDevicesViaAdbBinary();
+        if (cliDevices.length > 0) {
+          console.warn(`[ADB] adbkit returned 0 devices, using adb binary result (${cliDevices.length})`);
+          devices = cliDevices;
+        }
+      }
+
+      this.devices = devices;
       this.emit('devices:updated', this.devices);
+      return this.devices;
     } catch (err) {
       console.error('[ADB] Failed to list devices:', err.message);
+      const cliDevices = await this._listDevicesViaAdbBinary();
+      if (cliDevices.length > 0) {
+        console.warn(`[ADB] Recovered device list via adb binary after adbkit error (${cliDevices.length})`);
+        this.devices = cliDevices;
+        this.emit('devices:updated', this.devices);
+      }
+      return this.devices;
     }
   }
 
+  async _listDevicesViaAdbBinary() {
+    if (!this._adbPath) return [];
+
+    return new Promise((resolve) => {
+      const proc = spawn(this._adbPath, ['devices'], {
+        stdio: ['ignore', 'pipe', 'pipe']
+      });
+
+      let stdout = '';
+      let stderr = '';
+      let settled = false;
+      const finish = (devices) => {
+        if (settled) return;
+        settled = true;
+        clearTimeout(timeout);
+        resolve(devices);
+      };
+
+      proc.stdout.on('data', (data) => { stdout += data.toString(); });
+      proc.stderr.on('data', (data) => { stderr += data.toString(); });
+
+      proc.on('error', (err) => {
+        console.error('[ADB] Failed to run "adb devices":', err.message);
+        finish([]);
+      });
+
+      proc.on('close', (code) => {
+        if (code !== 0 && stderr.trim()) {
+          console.error(`[ADB] "adb devices" exited with code ${code}: ${stderr.trim()}`);
+          finish([]);
+          return;
+        }
+
+        finish(this._parseAdbDevicesOutput(stdout));
+      });
+
+      const timeout = setTimeout(() => {
+        if (!proc.killed) {
+          proc.kill();
+        }
+        console.warn('[ADB] "adb devices" timed out');
+        finish([]);
+      }, 5000);
+    });
+  }
+
+  _parseAdbDevicesOutput(output) {
+    return output
+      .split(/\r?\n/)
+      .map((line) => line.trim())
+      .filter((line) => line && !line.startsWith('List of devices attached'))
+      .map((line) => {
+        const parts = line.split(/\s+/);
+        if (parts.length < 2) return null;
+        return {
+          id: parts[0],
+          type: parts[1]
+        };
+      })
+      .filter(Boolean);
+  }
+
+  _scheduleBackgroundRefreshes() {
+    if (this.devices.length > 0 || this._backgroundRefreshTimeout) {
+      return;
+    }
+
+    this._backgroundRefreshRemaining = BACKGROUND_DEVICE_REFRESH_COUNT;
+    const tick = async () => {
+      this._backgroundRefreshTimeout = null;
+
+      if (!this.client || this.devices.length > 0 || this._backgroundRefreshRemaining <= 0) {
+        return;
+      }
+
+      this._backgroundRefreshRemaining -= 1;
+      await this._updateDevices();
+
+      if (this.devices.length === 0 && this._backgroundRefreshRemaining > 0) {
+        this._backgroundRefreshTimeout = setTimeout(tick, BACKGROUND_DEVICE_REFRESH_DELAY_MS);
+      }
+    };
+
+    this._backgroundRefreshTimeout = setTimeout(tick, BACKGROUND_DEVICE_REFRESH_DELAY_MS);
+  }
+
   /**
    * Check if ADB server is running
    */
@@ -413,6 +525,12 @@ class DeviceManager extends EventEmitter {
   async close() {
     this._stopHealthCheck();
 
+    if (this._backgroundRefreshTimeout) {
+      clearTimeout(this._backgroundRefreshTimeout);
+      this._backgroundRefreshTimeout = null;
+      this._backgroundRefreshRemaining = 0;
+    }
+
     if (this.tracker) {
       try {
         await this.tracker.end();

src/main/adb/device.js

@@ -755,6 +755,11 @@ function setupIpc() {
     return true;
   });
 
+  // App: Get running version
+  ipcMain.handle('app:getVersion', () => {
+    return app.getVersion();
+  });
+
   // ADB: Check if bundled ADB exists
   ipcMain.handle('adb:hasBundled', () => {
     const { hasBundledAdb } = require('./adb/download');

src/main/index.js

@@ -35,6 +35,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
   // Config
   getConfig: () => ipcRenderer.invoke('config:get'),
   setConfig: (config) => ipcRenderer.invoke('config:set', config),
+  getAppVersion: () => ipcRenderer.invoke('app:getVersion'),
 
   // History
   getHistory: () => ipcRenderer.invoke('history:getAll'),

src/preload/index.js

@@ -18,6 +18,8 @@ const elements = {
   remotePort: document.getElementById('remote-port'),
   proxyType: document.getElementById('proxy-type'),
   btnSettings: document.getElementById('btn-settings'),
+  appVersionChip: document.getElementById('app-version-chip'),
+  appVersionText: document.getElementById('app-version-text'),
 
   // Modal
   settingsModal: document.getElementById('settings-modal'),
@@ -1792,6 +1794,18 @@ async function init() {
   // Setup terminal resize handle
   setupTerminalResize();
 
+  try {
+    const version = await window.electronAPI.getAppVersion();
+    if (elements.appVersionChip) {
+      elements.appVersionChip.textContent = `v${version}`;
+    }
+    if (elements.appVersionText) {
+      elements.appVersionText.textContent = `Version ${version}`;
+    }
+  } catch (err) {
+    console.warn('Failed to load app version:', err);
+  }
+
   // Listen for ADB errors
   window.electronAPI.onAdbError((error) => {
     state.adbError = error;

src/renderer/app.js

@@ -43,6 +43,8 @@
       </div>
 
       <div class="toolbar-right">
+        <span id="app-version-chip" class="app-version-chip" title="Running version">v--</span>
+
         <!-- Connection Status (Compact) -->
         <div class="connection-status" id="connection-status" title="Click to manage connection">
           <span class="status-indicator disconnected"></span>
@@ -105,6 +107,7 @@
           <div class="welcome-container">
             <h1>ADB Proxy Browser</h1>
             <p class="subtitle">Browse through your phone's proxy connection</p>
+            <p id="app-version-text" class="app-version-text">Version --</p>
 
             <!-- Device Status -->
             <div class="device-panel">

src/renderer/index.html

@@ -98,6 +98,20 @@ body {
   gap: 4px;
 }
 
+.app-version-chip {
+  display: inline-flex;
+  align-items: center;
+  height: 24px;
+  padding: 0 8px;
+  border: 1px solid var(--border-color);
+  border-radius: 999px;
+  background-color: var(--bg-primary);
+  color: var(--text-secondary);
+  font-size: 11px;
+  font-weight: 600;
+  letter-spacing: 0.04em;
+}
+
 /* Connection Status (Minimal) */
 .connection-status {
   display: flex;
@@ -374,7 +388,13 @@ body {
 .subtitle {
   color: var(--text-secondary);
   font-size: 14px;
-  margin-bottom: 32px;
+  margin-bottom: 6px;
+}
+
+.app-version-text {
+  color: var(--text-muted);
+  font-size: 12px;
+  margin-bottom: 26px;
 }
 
 /* Device Panel (Compact) */