Skip to content

Commit 0a782b1

Browse files
committed
fix: register adb device listeners before init
- create the device manager in AdbManager constructor - bind server/device listeners before async adb init starts - fix packaged builds where devices:updated was never forwarded to the UI - bump version to 0.7.49
1 parent cfe654d commit 0a782b1

3 files changed

Lines changed: 9 additions & 13 deletions

File tree

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "adb-proxy-browser",
3-
"version": "0.7.48",
3+
"version": "0.7.49",
44
"description": "A customized browser that routes traffic through ADB tunnel to phone proxy (Clash)",
55
"main": "src/main/index.js",
66
"scripts": {

src/main/adb/index.js

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,15 @@ const PortForwarder = require('./forward');
99
class AdbManager {
1010
constructor() {
1111
this.client = null;
12-
this.deviceManager = null;
12+
this.deviceManager = getDeviceManager();
1313
this.portForwarder = null;
1414
this.initialized = false;
1515
this.serverError = null;
16+
17+
this.deviceManager.on('server:error', (err) => {
18+
this.serverError = err;
19+
console.warn('[ADB] Server error:', err.message);
20+
});
1621
}
1722

1823
/**
@@ -21,15 +26,6 @@ class AdbManager {
2126
async init() {
2227
if (this.initialized) return;
2328

24-
// Initialize device manager (it checks if ADB server is running)
25-
this.deviceManager = getDeviceManager();
26-
27-
// Listen for server errors
28-
this.deviceManager.on('server:error', (err) => {
29-
this.serverError = err;
30-
console.warn('[ADB] Server error:', err.message);
31-
});
32-
3329
try {
3430
// This will check if ADB server is running before loading adbkit
3531
await this.deviceManager.init();

0 commit comments

Comments
 (0)