fix(onion): resolve reachability merge conflict in RelayReachability#61
Merged
v0id-byte merged 1 commit intoJul 4, 2026
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation
probe/probeOne冲突,保证中继可达性探测接口语义清晰且不破坏 SSRF 守卫及缓存策略。markBad/markProvenForwarder决策。Description
packages/node/src/relay/reachability.ts恢复私有probe(d: RelayDescriptor)封装并让其委托给现有的probeOne,以解开合并时的语义冲突。probeOne调用,确保inflight使用单一探测 promise 并在完成时正确清理。refresh()中的“仅当探测发起时间早于缓存时间才写回”的保护逻辑以防止竞态写入。Testing
corepack pnpm --filter @v0idchain/node run typecheck,Node 包的类型检查通过(成功)。corepack pnpm -r run typecheck做递归类型检查时被现有的packages/web模块解析问题中断(失败,错误:Cannot find module '@v0idchain/core/browser'),该失败与本次修改无关且在修改前即存在。Codex Task