github/openclaw
1
1
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-02-19 18:39:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(browser): track original port mapping for EADDRINUSE fallback

Browse Source 
Address review feedback: when port fallback occurs, maintain mapping from
original requested port to the relay server for proper cleanup and reuse.

- Add relayByOriginalPort map to track original port -> relay
- Update ensureChromeExtensionRelayServer to check both maps
- Update stopChromeExtensionRelayServer to clean up both mappings
- Stop function now uses the relay's actual bound port for auth cleanup
This commit is contained in:
Iron9521
2026-02-16 21:04:55 +08:00
committed by Peter Steinberger
parent 0e6daa2e6e
commit 8e55503d77
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/browser/extension-relay.ts
View File

@@ -147,6 +147,8 @@ function rejectUpgrade(socket: Duplex, status: number, bodyText: string) {
const serversByPort = new Map<number, ChromeExtensionRelayServer>();
const relayAuthByPort = new Map<number, string>();
// Track original requested port -> relay when fallback occurs (EADDRINUSE)
const relayByOriginalPort = new Map<number, ChromeExtensionRelayServer>();
function relayAuthTokenForUrl(url: string): string | null {
try {
@@ -185,7 +187,7 @@ export async function ensureChromeExtensionRelayServer(opts: {
throw new Error(`extension relay requires loopback cdpUrl host (got ${info.host})`);
}
const existing = serversByPort.get(info.port);
const existing = serversByPort.get(info.port) ?? relayByOriginalPort.get(info.port);
if (existing) {
return existing;
}
@@ -752,6 +754,8 @@ export async function ensureChromeExtensionRelayServer(opts: {
stop: async () => {
serversByPort.delete(port);
relayAuthByPort.delete(port);
// Also clean up original port mapping if this was a fallback
relayByOriginalPort.delete(info.port);
try {
extensionWs?.close(1001, "server stopping");
} catch {
@@ -774,16 +778,21 @@ export async function ensureChromeExtensionRelayServer(opts: {
relayAuthByPort.set(port, relayAuthToken);
serversByPort.set(port, relay);
// If we fell back to a different port, also map the original requested port
if (port !== info.port) {
relayByOriginalPort.set(info.port, relay);
}
return relay;
}
export async function stopChromeExtensionRelayServer(opts: { cdpUrl: string }): Promise<boolean> {
const info = parseBaseUrl(opts.cdpUrl);
const existing = serversByPort.get(info.port);
const existing = serversByPort.get(info.port) ?? relayByOriginalPort.get(info.port);
if (!existing) {
return false;
}
await existing.stop();
relayAuthByPort.delete(info.port);
// Note: stop() cleans up both serversByPort and relayByOriginalPort
relayAuthByPort.delete(existing.port);
return true;
}