@steve02081504/fount-p2p 0.0.11 → 0.0.12

package/transport/link_registry.mjs

@@ -2,21 +2,18 @@ import { Buffer } from 'node:buffer'
 
 import { compareHex64Asc, normalizeHex64 } from '../core/hexIds.mjs'
 import { keyPairFromSeed } from '../crypto/crypto.mjs'
-import { noteAdvertPeerHints } from '../discovery/advert_peer_hints.mjs'
 import { subscribeTopic } from '../discovery/index.mjs'
-import { verifySignedAdvert } from '../link/handshake.mjs'
 import { listLinkProviders } from '../link/providers/index.mjs'
 import { ensureNodeSeed, getNodeHash } from '../node/identity.mjs'
 import { createOverlayRouter } from '../overlay/index.mjs'
+import { emitSafe } from '../utils/emit_safe.mjs'
 import { createLruMap } from '../utils/lru.mjs'
 
+import { ingestSignedAdvert } from './advert_ingest.mjs'
 import { DEFAULT_ICE_SERVERS } from './ice_servers.mjs'
 import { createOfferAnswerDial } from './offer_answer.mjs'
 import { createRuntimeBootstrap } from './runtime_bootstrap.mjs'
-import {
-	decryptSignalPacket,
-	nodeRendezvousTopic,
-} from './signal_crypto.mjs'
+import { nodeRendezvousTopic } from './signal_crypto.mjs'
 
 /**
  * 解析或从节点种子推导本地身份。
@@ -104,8 +101,8 @@ export function createLinkRegistry(options = {}) {
 	 * @returns {boolean} 候选链应保留为规范链时 true
 	 */
 	function linkIsPreferred(link, remoteNodeHash, against = null) {
-		const level = Number(link.level) || 0
-		const againstLevel = Number(against?.level) || 0
+		const level = link.level || 0
+		const againstLevel = against?.level || 0
 		if (against && level !== againstLevel) return level > againstLevel
 		const cmp = compareHex64Asc(localIdentity.nodeHash, remoteNodeHash)
 		return link.initiator ? cmp < 0 : cmp > 0
@@ -125,8 +122,7 @@ export function createLinkRegistry(options = {}) {
 			const wasCanonical = links.get(remoteNodeHash) === link
 			if (!wasCanonical) return
 			links.delete(remoteNodeHash)
-			for (const listener of linkDownListeners)
-				try { listener(remoteNodeHash, reason) } catch { /* ignore */ }
+			emitSafe(linkDownListeners, remoteNodeHash, reason)
 		})
 	}
 
@@ -140,15 +136,14 @@ export function createLinkRegistry(options = {}) {
 		const normalized = normalizeHex64(remoteNodeHash)
 		const existing = links.get(normalized)
 		if (existing && existing !== candidate && !linkIsPreferred(candidate, normalized, existing)) {
-			await candidate.close(Number(candidate.level) !== Number(existing.level) ? 'provider-loser' : 'glare-loser')
+			await candidate.close(candidate.level !== existing.level ? 'provider-loser' : 'glare-loser')
 			return
 		}
 		links.set(normalized, candidate)
 		wireLink(normalized, candidate)
 		if (existing && existing !== candidate)
-			await existing.close(Number(candidate.level) !== Number(existing.level) ? 'provider-replaced' : 'glare-replaced')
-		for (const listener of linkUpListeners)
-			try { listener(normalized, candidate) } catch { /* ignore */ }
+			await existing.close(candidate.level !== existing.level ? 'provider-replaced' : 'glare-replaced')
+		emitSafe(linkUpListeners, normalized, candidate)
 	}
 
 	/**
@@ -177,6 +172,10 @@ export function createLinkRegistry(options = {}) {
 		autoRegisterDiscoveryProviders: options.autoRegisterDiscoveryProviders !== false,
 		autoRegisterLinkProviders: options.autoRegisterLinkProviders !== false,
 		onInboundLink,
+		/**
+		 * @param {Uint8Array} bytes 入站信令字节
+		 * @returns {void}
+		 */
 		handleIncomingSignal: bytes => handleIncomingSignal(bytes),
 	})
 
@@ -198,13 +197,25 @@ export function createLinkRegistry(options = {}) {
 	 */
 	async function trimToBudget() {
 		if (links.size < maxActive) return
-		const candidates = [...links.entries()]
-			.sort((left, right) => scopeWeight(left[0]) - scopeWeight(right[0]) || compareHex64Asc(left[0], right[0]))
-		const victim = candidates[0]
-		if (victim) await victim[1].close('budget-evict')
+		let victimHash = null
+		let victimLink = null
+		let victimWeight = Infinity
+		for (const [nodeHash, link] of links) {
+			const weight = scopeWeight(nodeHash)
+			if (
+				victimHash == null
+				|| weight < victimWeight
+				|| (weight === victimWeight && compareHex64Asc(nodeHash, victimHash) < 0)
+			) {
+				victimHash = nodeHash
+				victimLink = link
+				victimWeight = weight
+			}
+		}
+		if (victimLink) await victimLink.close('budget-evict')
 	}
 
-	;({ handleIncomingSignal, dialOfferAnswer } = createOfferAnswerDial({
+	; ({ handleIncomingSignal, dialOfferAnswer } = createOfferAnswerDial({
 		localIdentity,
 		iceServers,
 		selfTopic,
@@ -327,8 +338,9 @@ export function createLinkRegistry(options = {}) {
 	async function relayEnvelopeToNode(remoteNodeHash, envelope) {
 		if (!links.size || envelope?.scope === 'overlay') return false
 		try {
-			const path = await getOverlayRouter().discoverRoute(remoteNodeHash)
-			await getOverlayRouter().relay(path, envelope)
+			const overlay = getOverlayRouter()
+			const path = await overlay.discoverRoute(remoteNodeHash)
+			await overlay.relay(path, envelope)
 			return true
 		}
 		catch {
@@ -347,6 +359,17 @@ export function createLinkRegistry(options = {}) {
 			|| await relayEnvelopeToNode(remoteNodeHash, envelope)
 	}
 
+	/**
+	 * 同步结果直接返回；thenable 才 await（避免每条 envelope 造 microtask）。
+	 * @param {unknown} value 可能为 Promise 的返回值
+	 * @returns {Promise<unknown>} 已 resolve 的值
+	 */
+	async function maybeAwait(value) {
+		if (value != null && typeof /** @type {{ then?: unknown }} */ value.then === 'function')
+			return await value
+		return value
+	}
+
 	/**
 	 * 将入站 envelope 派发到 scope 监听器（经 authorizer 校验）。
 	 * @param {string} senderNodeHash 发送方节点 64 hex
@@ -355,16 +378,16 @@ export function createLinkRegistry(options = {}) {
 	 * @returns {Promise<void>}
 	 */
 	async function dispatchEnvelope(senderNodeHash, envelope, link) {
-		const scope = String(envelope?.scope || '')
+		const scope = envelope.scope || ''
 		for (const [prefix, authorizer] of scopeAuthorizers.entries())
 			if (scope.startsWith(prefix)) {
-				const allowed = await Promise.resolve(authorizer(scope, senderNodeHash, envelope, link))
+				const allowed = await maybeAwait(authorizer(scope, senderNodeHash, envelope, link))
 				if (!allowed) return
 			}
 		for (const [prefix, listeners] of scopeListeners.entries())
 			if (scope.startsWith(prefix))
 				for (const listener of listeners)
-					await Promise.resolve(listener(senderNodeHash, envelope, link))
+					await maybeAwait(listener(senderNodeHash, envelope, link))
 	}
 
 	/**
@@ -374,7 +397,7 @@ export function createLinkRegistry(options = {}) {
 	 * @returns {() => void} 取消订阅函数
 	 */
 	function subscribeScope(prefix, listener) {
-		return subscribeBucket(scopeListeners, String(prefix), listener)
+		return subscribeBucket(scopeListeners, prefix, listener)
 	}
 
 	/**
@@ -384,8 +407,8 @@ export function createLinkRegistry(options = {}) {
 	 * @returns {() => void} 取消注册函数
 	 */
 	function registerScopeAuthorizer(prefix, authorizer) {
-		scopeAuthorizers.set(String(prefix), authorizer)
-		return () => scopeAuthorizers.delete(String(prefix))
+		scopeAuthorizers.set(prefix, authorizer)
+		return () => scopeAuthorizers.delete(prefix)
 	}
 
 	return {
@@ -448,7 +471,7 @@ export function createLinkRegistry(options = {}) {
 		 * @returns {void}
 		 */
 		registerScopeInterest(scope, nodeHashes) {
-			scopeInterests.set(String(scope), new Set((Array.isArray(nodeHashes) ? nodeHashes : []).map(normalizeHex64).filter(Boolean)))
+			scopeInterests.set(scope, new Set((nodeHashes || []).map(normalizeHex64).filter(Boolean)))
 		},
 		/**
 		 * 释放 scope 兴趣。
@@ -456,7 +479,7 @@ export function createLinkRegistry(options = {}) {
 		 * @returns {void}
 		 */
 		releaseScopeInterest(scope) {
-			scopeInterests.delete(String(scope))
+			scopeInterests.delete(scope)
 		},
 		registerScopeAuthorizer,
 		subscribeScope,
@@ -469,13 +492,10 @@ export function createLinkRegistry(options = {}) {
 		async subscribeNodeAdvert(nodeHash, onAdvert) {
 			const topic = nodeRendezvousTopic(nodeHash)
 			return await subscribeTopic(topic, async (bytes, meta) => {
-				const packet = decryptSignalPacket(topic, bytes)
-				if (packet?.type !== 'advert') return
-				const verifiedNodeHash = await verifySignedAdvert(topic, packet.body)
-				if (!verifiedNodeHash) return
-				noteAdvertPeerHints(verifiedNodeHash, packet.body, meta)
-				recentAdverts.touch(verifiedNodeHash, Date.now())
-				await Promise.resolve(onAdvert(verifiedNodeHash, packet.body))
+				const ingested = await ingestSignedAdvert(topic, bytes, meta)
+				if (!ingested) return
+				recentAdverts.touch(ingested.verifiedNodeHash, Date.now())
+				await Promise.resolve(onAdvert(ingested.verifiedNodeHash, ingested.body))
 			})
 		},
 		recentAdverts,
@@ -500,83 +520,71 @@ export function createLinkRegistry(options = {}) {
 
 let defaultRegistry = null
 
+/**
+ * 默认 registry 尚未创建时暂存的 scope authorizer 条目。
+ * 注册阶段不应触发 createLinkRegistry / resolveLocalIdentity；绑定在 getLinkRegistry flush 时完成。
+ * @type {Array<{ prefix: string, authorizer: Function, unregister: (() => void) | null }>}
+ */
+const pendingScopeAuthorizers = []
+
 /**
  * 获取进程级默认 link registry 单例。
  * @returns {ReturnType<typeof createLinkRegistry>} 默认 registry
  */
 export function getLinkRegistry() {
-	return defaultRegistry ||= createLinkRegistry()
+	if (defaultRegistry) return defaultRegistry
+	defaultRegistry = createLinkRegistry()
+	for (const entry of pendingScopeAuthorizers)
+		entry.unregister = defaultRegistry.registerScopeAuthorizer(entry.prefix, entry.authorizer)
+	pendingScopeAuthorizers.length = 0
+	return defaultRegistry
 }
 
 /**
- * 默认 registry 的 ensureLinkToNode 代理。
- * @param {...any} args 转发参数
- * @returns {ReturnType<ReturnType<typeof createLinkRegistry>['ensureLinkToNode']>} 链路实例
- */
-export const ensureLinkToNode = (...args) => getLinkRegistry().ensureLinkToNode(...args)
-/**
- * 默认 registry 的 getLink 代理。
- * @param {...any} args 转发参数
- * @returns {ReturnType<ReturnType<typeof createLinkRegistry>['getLink']>} 链路实例
- */
-export const getLink = (...args) => getLinkRegistry().getLink(...args)
-/**
- * 默认 registry 的 listLinks 代理。
- * @param {...any} args 转发参数
- * @returns {ReturnType<ReturnType<typeof createLinkRegistry>['listLinks']>} 链路列表
- */
-export const listLinks = (...args) => getLinkRegistry().listLinks(...args)
-/**
- * 默认 registry 的 closeLink 代理。
- * @param {...any} args 转发参数
- * @returns {ReturnType<ReturnType<typeof createLinkRegistry>['closeLink']>} 关闭完成
- */
-export const closeLink = (...args) => getLinkRegistry().closeLink(...args)
-/**
- * 默认 registry 的 sendToNodeLink 代理。
- * @param {...any} args 转发参数
- * @returns {ReturnType<ReturnType<typeof createLinkRegistry>['sendToNodeLink']>} 是否成功
- */
-export const sendToNodeLink = (...args) => getLinkRegistry().sendToNodeLink(...args)
-/**
- * 默认 registry 的 relayEnvelopeToNode 代理。
- * @param {...any} args 转发参数
- * @returns {ReturnType<ReturnType<typeof createLinkRegistry>['relayEnvelopeToNode']>} 是否成功
- */
-export const relayEnvelopeToNode = (...args) => getLinkRegistry().relayEnvelopeToNode(...args)
-/**
- * 默认 registry 的 onLinkUp 代理。
- * @param {...any} args 转发参数
- * @returns {ReturnType<ReturnType<typeof createLinkRegistry>['onLinkUp']>} 取消订阅函数
+ * 默认 registry 方法代理。
+ * @param {string} name registry 方法名
+ * @returns {(...args: unknown[]) => unknown} 绑定到 getLinkRegistry()[name] 的函数
  */
-export const onLinkUp = (...args) => getLinkRegistry().onLinkUp(...args)
-/**
- * 默认 registry 的 onLinkDown 代理。
- * @param {...any} args 转发参数
- * @returns {ReturnType<ReturnType<typeof createLinkRegistry>['onLinkDown']>} 取消订阅函数
- */
-export const onLinkDown = (...args) => getLinkRegistry().onLinkDown(...args)
-/**
- * 默认 registry 的 registerScopeInterest 代理。
- * @param {...any} args 转发参数
- * @returns {ReturnType<ReturnType<typeof createLinkRegistry>['registerScopeInterest']>} 无返回值
- */
-export const registerScopeInterest = (...args) => getLinkRegistry().registerScopeInterest(...args)
-/**
- * 默认 registry 的 releaseScopeInterest 代理。
- * @param {...any} args 转发参数
- * @returns {ReturnType<ReturnType<typeof createLinkRegistry>['releaseScopeInterest']>} 无返回值
- */
-export const releaseScopeInterest = (...args) => getLinkRegistry().releaseScopeInterest(...args)
-/**
- * 默认 registry 的 registerScopeAuthorizer 代理。
- * @param {...any} args 转发参数
- * @returns {ReturnType<ReturnType<typeof createLinkRegistry>['registerScopeAuthorizer']>} 取消注册函数
- */
-export const registerScopeAuthorizer = (...args) => getLinkRegistry().registerScopeAuthorizer(...args)
+const bindRegistryMethod = name => (...args) => getLinkRegistry()[name](...args)
+
+/** @type {(...args: unknown[]) => unknown} */
+export const ensureLinkToNode = bindRegistryMethod('ensureLinkToNode')
+/** @type {(...args: unknown[]) => unknown} */
+export const getLink = bindRegistryMethod('getLink')
+/** @type {(...args: unknown[]) => unknown} */
+export const listLinks = bindRegistryMethod('listLinks')
+/** @type {(...args: unknown[]) => unknown} */
+export const closeLink = bindRegistryMethod('closeLink')
+/** @type {(...args: unknown[]) => unknown} */
+export const sendToNodeLink = bindRegistryMethod('sendToNodeLink')
+/** @type {(...args: unknown[]) => unknown} */
+export const relayEnvelopeToNode = bindRegistryMethod('relayEnvelopeToNode')
+/** @type {(...args: unknown[]) => unknown} */
+export const onLinkUp = bindRegistryMethod('onLinkUp')
+/** @type {(...args: unknown[]) => unknown} */
+export const onLinkDown = bindRegistryMethod('onLinkDown')
+/** @type {(...args: unknown[]) => unknown} */
+export const registerScopeInterest = bindRegistryMethod('registerScopeInterest')
+/** @type {(...args: unknown[]) => unknown} */
+export const releaseScopeInterest = bindRegistryMethod('releaseScopeInterest')
+/** @type {(...args: unknown[]) => unknown} */
+export const subscribeScope = bindRegistryMethod('subscribeScope')
+
 /**
- * 默认 registry 的 subscribeScope 代理。
- * @param {...any} args 转发参数
- * @returns {ReturnType<ReturnType<typeof createLinkRegistry>['subscribeScope']>} 取消订阅函数
+ * 注册默认 registry 的 scope authorizer。
+ * 不急切创建 registry（不必 resolveLocalIdentity）；首次 getLinkRegistry 时 flush。
+ * @param {string} prefix scope 前缀
+ * @param {Function} authorizer 校验函数
+ * @returns {() => void} 取消注册函数
  */
-export const subscribeScope = (...args) => getLinkRegistry().subscribeScope(...args)
+export function registerScopeAuthorizer(prefix, authorizer) {
+	if (defaultRegistry) return defaultRegistry.registerScopeAuthorizer(prefix, authorizer)
+
+	const entry = { prefix, authorizer, unregister: null }
+	pendingScopeAuthorizers.push(entry)
+	return () => {
+		const index = pendingScopeAuthorizers.indexOf(entry)
+		if (index !== -1) pendingScopeAuthorizers.splice(index, 1)
+		entry.unregister?.()
+	}
+}

package/transport/offer_answer.mjs

@@ -6,6 +6,9 @@ import { listLinkProviders } from '../link/providers/index.mjs'
 
 import { decryptSignalPacket, encryptSignalPacket, nodeRendezvousTopic } from './signal_crypto.mjs'
 
+/** accept/dial 挂起期间 ICE 信令 backlog 上限，防无 handler 时无限堆积 */
+const SIGNAL_BACKLOG_MAX = 64
+
 /**
  * 创建带 backlog 的缓冲信令会话。
  * @param {(message: unknown) => Promise<void>} sendRemote 远端发送回调
@@ -37,12 +40,13 @@ export function createBufferedSignalSession(sendRemote) {
 			return () => handlers.delete(handler)
 		},
 		/**
-		 * 投递信令消息；无 handler 时入 backlog。
+		 * 投递信令消息；无 handler 时入 backlog（有界）。
 		 * @param {unknown} message 信令消息
 		 * @returns {void}
 		 */
 		deliver(message) {
 			if (!handlers.size) {
+				if (backlog.length >= SIGNAL_BACKLOG_MAX) backlog.shift()
 				backlog.push(message)
 				return
 			}
@@ -157,7 +161,7 @@ export function createOfferAnswerDial(deps) {
 	 */
 	async function handleIncomingSignal(bytes) {
 		const packet = decryptSignalPacket(selfTopic, bytes)
-		if (!packet || packet.type !== 'signal') return
+		if (packet?.type !== 'signal') return
 		const remoteNodeHash = normalizeHex64(packet.from)
 		const connId = String(packet.connId || '')
 		if (!remoteNodeHash || remoteNodeHash === localIdentity.nodeHash || !connId) return

package/transport/peer_pool.mjs

@@ -8,6 +8,7 @@ import { loadPeerPoolView, mergeNetworkPeerPools } from '../node/network.mjs'
 import { loadReputation } from '../node/reputation_store.mjs'
 import { isQuarantinedPure } from '../reputation/engine.mjs'
 import { clampReputationScore } from '../reputation/math.mjs'
+import { shuffleInPlace } from '../utils/shuffle.mjs'
 
 /**
  * 解析联邦池槽位参数（从 groupSettings 读取，含低功耗缩减）。
@@ -91,14 +92,8 @@ export function mergeTrustedWithAnchors(existingTrusted, rankedCandidates, limit
  */
 export function selectExploreWithSourceQuota(exploreIds, exploreSources, k, maxPerSource = EXPLORE_MAX_PER_SOURCE) {
 	if (k <= 0 || !exploreIds.length) return []
-	if (!exploreSources?.size) {
-		const copy = [...exploreIds]
-		for (let i = copy.length - 1; i > 0; i--) {
-			const j = Math.floor(Math.random() * (i + 1))
-				;[copy[i], copy[j]] = [copy[j], copy[i]]
-		}
-		return copy.slice(0, k)
-	}
+	if (!exploreSources?.size)
+		return shuffleInPlace([...exploreIds]).slice(0, k)
 	/** @type {Map<string, string[]>} */
 	const bySource = new Map()
 	for (const id of exploreIds) {
@@ -106,11 +101,7 @@ export function selectExploreWithSourceQuota(exploreIds, exploreSources, k, maxP
 		if (!bySource.has(src)) bySource.set(src, [])
 		bySource.get(src).push(id)
 	}
-	for (const ids of bySource.values())
-		for (let i = ids.length - 1; i > 0; i--) {
-			const j = Math.floor(Math.random() * (i + 1))
-				;[ids[i], ids[j]] = [ids[j], ids[i]]
-		}
+	for (const ids of bySource.values()) shuffleInPlace(ids)
 	const out = []
 	/** @type {Map<string, number>} */
 	const picked = new Map()
@@ -148,7 +139,7 @@ export function selectPeerIdsFromPool({ roster, peers, rep, limits, selfNodeHash
 	const blocked = new Set(peers.blockedPeers)
 	const roomSet = inRoomNodeHashes instanceof Set
 		? inRoomNodeHashes
-		: new Set(Array.isArray(inRoomNodeHashes) ? inRoomNodeHashes : [])
+		: new Set(inRoomNodeHashes || [])
 	const onlineAll = roster.filter(
 		rosterEntry => rosterEntry.peerId
 			&& rosterEntry.remoteNodeHash
@@ -175,10 +166,11 @@ export function selectPeerIdsFromPool({ roster, peers, rep, limits, selfNodeHash
 	}
 
 	const anchoredTrusted = peers.trustedPeers.filter(nodeHash => trustedSet.has(nodeHash))
-	const extraTrusted = [...trustedSet]
-		.filter(nodeHash => !anchoredTrusted.includes(nodeHash))
-		.sort((a, b) => repScore(b, rep) - repScore(a, rep))
-	for (const nodeId of [...anchoredTrusted, ...extraTrusted].slice(0, limits.trustedSlots)) {
+	for (const nodeId of mergeTrustedWithAnchors(
+		anchoredTrusted,
+		[...trustedSet].sort((a, b) => repScore(b, rep) - repScore(a, rep)),
+		limits,
+	)) {
 		if (outPeerIds.size >= limits.maxPeers) break
 		pushNode(nodeId)
 	}
@@ -216,15 +208,14 @@ export function selectPeerIdsFromPool({ roster, peers, rep, limits, selfNodeHash
  * @returns {string[]} 应建链的 nodeHash 列表（去重）
  */
 export function selectLinkTargetsFromMembers({ members, selfNodeHash, rep, peers, limits, anchors = [] }) {
-	const self = String(selfNodeHash || '')
 	const blocked = new Set(peers?.blockedPeers || [])
 	const now = Date.now()
-	const candidates = [...new Set([...members].map(id => String(id)))]
-		.filter(id => id && id !== self && !blocked.has(id) && !isQuarantinedPure(rep, id, now))
+	const candidates = [...new Set(members)]
+		.filter(id => id && id !== selfNodeHash && !blocked.has(id) && !isQuarantinedPure(rep, id, now))
 	const ranked = candidates.slice().sort((a, b) => repScore(b, rep) - repScore(a, rep))
 	const candidateSet = new Set(candidates)
 	// 锚点（如 introducer/creator/seed）必连、且不占 trustedSlots——保证引导期连通。
-	const forced = [...new Set([...anchors].map(id => String(id)))].filter(id => candidateSet.has(id))
+	const forced = [...new Set(anchors)].filter(id => candidateSet.has(id))
 	const chosen = new Set(forced)
 	// trusted 槽只从非锚点候选填：既有 trusted 优先保留，再按信誉补至 trustedSlots。
 	const nonForced = ranked.filter(id => !chosen.has(id))
@@ -237,29 +228,24 @@ export function selectLinkTargetsFromMembers({ members, selfNodeHash, rep, peers
 }
 
 /**
- * 将新 PEX 节点线索合并进 explore 池，并按信誉重新填充 trusted 槽。
- * 纯计算版本，不含 I/O：接受 peers 对象，返回新对象。
- *
+ * 将候选 id 并入 explore，并按信誉重填 trusted。
  * @param {{
  *   peers: { trustedPeers: string[], explorePeers: string[], blockedPeers: string[] },
  *   rep: { byNodeHash?: Record<string, { score?: number }> },
- *   hints: string[],
+ *   addIds: Iterable<string>,
  *   limits: ReturnType<typeof resolveFederationPoolLimits>,
- * }} options 合并参数（peers、rep、hints、limits）
- * @returns {{ trustedPeers: string[], explorePeers: string[] }} 更新后的 trusted/explore 列表
+ * }} options 池状态与增量
+ * @returns {{ trustedPeers: string[], explorePeers: string[] }} 重算后的 trusted/explore
  */
-export function applyPexHints({ peers, rep, hints, limits }) {
-	const ids = [...new Set(
-		(Array.isArray(hints) ? hints : [])
-			.map(id => String(id).trim())
-			.filter(Boolean),
-	)]
+function rebuildExploreAndTrusted(options) {
+	const { peers, rep, addIds, limits } = options
+	const blocked = new Set(peers.blockedPeers)
 	const explore = new Set(peers.explorePeers)
-	for (const id of ids)
-		if (!peers.blockedPeers.includes(id)) explore.add(id)
-	const newExplorePeers = [...explore].slice(-500)
+	for (const id of addIds)
+		if (id && !blocked.has(id)) explore.add(id)
+	const newExplorePeers = [...explore].filter(id => !blocked.has(id)).slice(-500)
 	const ranked = [...new Set([...peers.trustedPeers, ...newExplorePeers])]
-		.filter(id => !peers.blockedPeers.includes(id))
+		.filter(id => !blocked.has(id))
 		.sort((a, b) => repScore(b, rep) - repScore(a, rep))
 	return {
 		trustedPeers: mergeTrustedWithAnchors(peers.trustedPeers, ranked, limits, peers.blockedPeers),
@@ -268,32 +254,39 @@ export function applyPexHints({ peers, rep, hints, limits }) {
 }
 
 /**
- * 从 roster 观测中更新 explore 池并重新填充 trusted 槽（纯计算版本）。
- *
+ * PEX 线索并入 explore 并重填 trusted（纯计算）。
  * @param {{
  *   peers: { trustedPeers: string[], explorePeers: string[], blockedPeers: string[] },
  *   rep: { byNodeHash?: Record<string, { score?: number }> },
- *   roster: Array<{ remoteNodeHash?: string }>,
+ *   hints: string[],
  *   limits: ReturnType<typeof resolveFederationPoolLimits>,
- * }} options roster 更新参数（peers、rep、roster、limits）
- * @returns {{ trustedPeers: string[], explorePeers: string[] }} 更新后的 trusted/explore 列表
+ * }} options 池状态与 PEX hints
+ * @returns {{ trustedPeers: string[], explorePeers: string[] }} 重算后的 trusted/explore
  */
-export function applyRosterToPeerPool({ peers, rep, roster, limits }) {
-	const explore = new Set(peers.explorePeers)
-	for (const rosterEntry of roster) {
-		const nodeId = rosterEntry.remoteNodeHash?.trim()
-		if (nodeId && !peers.blockedPeers.includes(nodeId)) explore.add(nodeId)
-	}
-	const newExplorePeers = [...explore]
-		.filter(id => !peers.blockedPeers.includes(id))
-		.slice(-500)
-	const candidates = [...new Set([...peers.trustedPeers, ...newExplorePeers])]
-		.filter(id => !peers.blockedPeers.includes(id))
-		.sort((a, b) => repScore(b, rep) - repScore(a, rep))
-	return {
-		trustedPeers: mergeTrustedWithAnchors(peers.trustedPeers, candidates, limits, peers.blockedPeers),
-		explorePeers: newExplorePeers,
-	}
+export function applyPexHints(options) {
+	const { peers, rep, hints, limits } = options
+	return rebuildExploreAndTrusted({
+		peers, rep, limits,
+		addIds: hints || [],
+	})
+}
+
+/**
+ * roster 观测并入 explore 并重填 trusted（纯计算）。
+ * @param {{
+ *   peers: { trustedPeers: string[], explorePeers: string[], blockedPeers: string[] },
+ *   rep: { byNodeHash?: Record<string, { score?: number }> },
+ *   roster: { remoteNodeHash?: string }[],
+ *   limits: ReturnType<typeof resolveFederationPoolLimits>,
+ * }} options 池状态与 roster
+ * @returns {{ trustedPeers: string[], explorePeers: string[] }} 重算后的 trusted/explore
+ */
+export function applyRosterToPeerPool(options) {
+	const { peers, rep, roster, limits } = options
+	return rebuildExploreAndTrusted({
+		peers, rep, limits,
+		addIds: roster.map(entry => entry.remoteNodeHash).filter(Boolean),
+	})
 }
 
 /**
@@ -308,17 +301,13 @@ export function pickFederationTargetPeerIds(groupId, roster, groupSettings, self
 	const limits = resolveFederationPoolLimits(groupSettings)
 	const peers = loadPeerPoolView(groupId)
 	const rep = loadReputation()
-	const inRoomNodeHashes = roster
-		.map(p => p.remoteNodeHash)
-		.map(id => String(id).trim())
-		.filter(Boolean)
 	return selectPeerIdsFromPool({
 		roster,
 		peers,
 		rep,
 		limits,
 		selfNodeHash,
-		inRoomNodeHashes,
+		inRoomNodeHashes: roster.map(entry => entry.remoteNodeHash).filter(Boolean),
 		hintSources: peers.hintSources,
 	})
 }

package/transport/remote_user_room.mjs

@@ -12,15 +12,13 @@ import { USER_ROOM_SCOPE } from './room_scopes.mjs'
  * }} RemoteUserRoomSlot
  */
 
-/** @type {Map<string, RemoteUserRoomSlot | null>} nodeHash → slot（null 表示加入失败/进行中） */
+/** @type {Map<string, RemoteUserRoomSlot>} nodeHash → slot */
 const slots = new Map()
 /** @type {Map<string, Promise<RemoteUserRoomSlot | null>>} nodeHash → 进行中的 promise */
 const inflights = new Map()
 
 registerFederationRoomProvider('remote-user-room', () => {
-	return [...slots.values()]
-		.filter(Boolean)
-		.map(s => s.roomSlot)
+	return [...slots.values()].map(s => s.roomSlot)
 })
 
 /**
@@ -32,16 +30,14 @@ registerFederationRoomProvider('remote-user-room', () => {
 export async function ensureRemoteUserRoom(username, targetNodeHash) {
 	void username
 	const key = targetNodeHash.toLowerCase()
-	if (slots.has(key)) return slots.get(key) || null
-	const existing = inflights.get(key)
-	if (existing) return await existing
+	const existing = slots.get(key)
+	if (existing) return existing
+	const inflight = inflights.get(key)
+	if (inflight) return await inflight
 
 	const task = (async () => {
 		try {
-			if (!await ensureLinkToNode(key)) {
-				slots.set(key, null)
-				return null
-			}
+			if (!await ensureLinkToNode(key)) return null
 
 			/** @type {import('../registries/room_provider.mjs').FederationRoomSlot} */
 			const roomSlot = {
@@ -66,17 +62,20 @@ export async function ensureRemoteUserRoom(username, targetNodeHash) {
 				 * @returns {void}
 				 */
 				sendToPeer(peerId, actionName, payload) {
-					void getLink(key)?.send({ scope: 'node', action: String(actionName), payload }).catch(() => { })
+					void getLink(key)?.send({ scope: 'node', action: actionName, payload }).catch(() => { })
 				},
 			}
 
 			const slot = {
 				roomSlot,
 				/**
-				 * 关闭远端用户房间链路。
+				 * 关闭远端用户房间链路并释放槽位。
 				 * @returns {Promise<void>} 关闭完成
 				 */
-				leave() { return closeLink(key, 'remote-user-room-release') },
+				leave() {
+					slots.delete(key)
+					return closeLink(key, 'remote-user-room-release')
+				},
 			}
 			slots.set(key, slot)
 			invalidateTrustGraphCache()
@@ -84,7 +83,6 @@ export async function ensureRemoteUserRoom(username, targetNodeHash) {
 		}
 		catch (error) {
 			console.error('p2p: failed to join remote user room', key, error)
-			slots.set(key, null)
 			return null
 		}
 		finally {