Skip to content

fix(onion): resolve reachability merge conflict in RelayReachability #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
v0id-byte merged 1 commit into from
Jul 4, 2026
Merged

fix(onion): resolve reachability merge conflict in RelayReachability #61

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions packages/node/src/relay/reachability.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,14 @@ export class RelayReachability {
* 描述符里的私网/回环 host（如残留 127.0.0.1 死中继、或解析到内网的恶意主机名）→ **直接判不可达，绝不真的去连**。
*/
private probe(d: RelayDescriptor): Promise<boolean> {
return this.probeOne(d);
}

/**
* 探测一个 cell 端点：开一个 WS（443→wss，与拨号同款），open=可达，error/超时=不可达。即开即关，不收发任何 cell。
* 只读 host/port（不需要完整 RelayDescriptor），供中继自检（探自己的广播地址）复用同一套探测逻辑。
*/
probeOne(d: { host: string; port: number }): Promise<boolean> {
const url = `${d.port === 443 ? 'wss' : 'ws'}://${wsHost(d.host)}:${d.port}`;
return new Promise<boolean>((resolve) => {
let done = false;
let ws: WebSocket | undefined;
Expand Down Expand Up @@ -129,7 +132,6 @@ export class RelayReachability {
return ok;
})
.finally(() => this.inflight.delete(d.address));
p = this.probeOne(d).finally(() => this.inflight.delete(d.address));
this.inflight.set(d.address, p);
}
await p;
Expand Down
Loading