@steve02081504/fount-p2p 0.0.26 → 0.0.28

package/transport/peer_health.mjs

@@ -0,0 +1,127 @@
+import { normalizeHex64 } from '../core/hexIds.mjs'
+import { emitSafe } from '../utils/emit_safe.mjs'
+
+/**
+ * @typedef {{
+ *   nodeHash: string
+ *   connected: boolean
+ *   rttMs: number | null
+ *   avgRttMs: number | null
+ *   lastSeenAt: number
+ *   source: string | null
+ * }} PeerHealthEntry
+ */
+
+/**
+ * 聚合邻居链路健康：在 mesh/link 常态维护期间顺带统计各邻居的 RTT 与可达性。
+ * 订阅 registry 的 link up/down，并对每条活跃链路监听 onRtt/onDown。
+ * @param {object} registry link registry（onLinkUp / onLinkDown）
+ * @returns {{
+ *   getPeerHealth: (nodeHash: string) => PeerHealthEntry | null
+ *   listPeerHealth: () => PeerHealthEntry[]
+ *   onPeerHealth: (listener: (nodeHash: string, entry: PeerHealthEntry) => void) => () => void
+ *   stop: () => void
+ * }} peer health 聚合器
+ */
+export function createPeerHealthTracker(registry) {
+	/** @type {Map<string, PeerHealthEntry>} */
+	const entries = new Map()
+	/** @type {Map<string, () => void>} 每条链路在 registry/link 上的取消订阅回调 */
+	const cleanups = new Map()
+	/** @type {Set<(nodeHash: string, entry: PeerHealthEntry) => void>} */
+	const listeners = new Set()
+
+	/**
+	 * 合并补丁并通知订阅方。
+	 * @param {string} nodeHash 远端节点 64 hex
+	 * @param {Partial<PeerHealthEntry>} patch 补丁
+	 * @returns {void}
+	 */
+	function update(nodeHash, patch) {
+		const entry = entries.get(nodeHash) ?? {
+			nodeHash,
+			connected: false,
+			rttMs: null,
+			avgRttMs: null,
+			lastSeenAt: 0,
+			source: null,
+		}
+		if (patch.connected !== undefined) entry.connected = patch.connected
+		if (patch.rttMs !== undefined) entry.rttMs = patch.rttMs
+		if (patch.avgRttMs !== undefined) entry.avgRttMs = patch.avgRttMs
+		if (patch.lastSeenAt !== undefined) entry.lastSeenAt = patch.lastSeenAt
+		if (patch.source !== undefined) entry.source = patch.source
+		entries.set(nodeHash, entry)
+		emitSafe(listeners, nodeHash, entry)
+	}
+
+	const stopUp = registry.onLinkUp?.((nodeHash, link) => {
+		const hash = normalizeHex64(nodeHash)
+		if (!hash) return
+		const stopRtt = link?.onRtt?.(() => {
+			const stats = link.stats?.() ?? {}
+			update(hash, {
+				rttMs: stats.rttMs ?? null,
+				avgRttMs: stats.avgRttMs ?? null,
+				lastSeenAt: Date.now(),
+			})
+		}) ?? null
+		const stopDown = link?.onDown?.(() => {
+			cleanups.get(hash)?.()
+			cleanups.delete(hash)
+			update(hash, { connected: false, lastSeenAt: Date.now() })
+		}) ?? null
+		update(hash, {
+			connected: true,
+			source: link?.providerId ?? null,
+			lastSeenAt: Date.now(),
+		})
+		cleanups.set(hash, () => {
+			stopRtt?.()
+			stopDown?.()
+		})
+	}) ?? null
+	const stopDown = registry.onLinkDown?.(nodeHash => {
+		const hash = normalizeHex64(nodeHash)
+		if (!hash) return
+		cleanups.get(hash)?.()
+		cleanups.delete(hash)
+		update(hash, { connected: false, lastSeenAt: Date.now() })
+	}) ?? null
+
+	return {
+		/**
+		 * @param {string} nodeHash 远端节点 64 hex
+		 * @returns {PeerHealthEntry | null} 健康记录；无记录时 null
+		 */
+		getPeerHealth(nodeHash) {
+			return entries.get(normalizeHex64(nodeHash)) ?? null
+		},
+		/**
+		 * @returns {PeerHealthEntry[]} 所有邻居健康记录
+		 */
+		listPeerHealth() {
+			return [...entries.values()]
+		},
+		/**
+		 * @param {(nodeHash: string, entry: PeerHealthEntry) => void} listener 变化回调
+		 * @returns {() => void} 取消订阅
+		 */
+		onPeerHealth(listener) {
+			listeners.add(listener)
+			return () => listeners.delete(listener)
+		},
+		/**
+		 * 停止监听并清空聚合。
+		 * @returns {void}
+		 */
+		stop() {
+			stopUp?.()
+			stopDown?.()
+			for (const cleanup of cleanups.values()) cleanup()
+			cleanups.clear()
+			entries.clear()
+			listeners.clear()
+		},
+	}
+}

package/transport/remote_user_room.mjs

@@ -23,21 +23,19 @@ registerFederationRoomProvider('remote-user-room', () => {
 
 /**
  * 加入目标节点的用户房间（幂等）。
- * @param {string} username 本地 replica 用户名
  * @param {string} targetNodeHash 目标节点 64 hex
  * @returns {Promise<RemoteUserRoomSlot>} 房间槽
  */
-export async function ensureRemoteUserRoom(username, targetNodeHash) {
-	const key = targetNodeHash.toLowerCase()
-	const existing = slots.get(key)
+export async function ensureRemoteUserRoom(targetNodeHash) {
+	const existing = slots.get(targetNodeHash)
 	if (existing) return existing
-	const inflight = inflights.get(key)
+	const inflight = inflights.get(targetNodeHash)
 	if (inflight) return await inflight
 
 	const task = (async () => {
 		try {
-			if (!await ensureLinkToNode(key))
-				throw new Error(`p2p: ensureRemoteUserRoom link failed for ${key}`)
+			if (!await ensureLinkToNode(targetNodeHash))
+				throw new Error(`p2p: ensureRemoteUserRoom link failed for ${targetNodeHash}`)
 
 			/** @type {import('../registries/room_provider.mjs').FederationRoomSlot} */
 			const roomSlot = {
@@ -46,13 +44,13 @@ export async function ensureRemoteUserRoom(username, targetNodeHash) {
 				 * 返回远端用户房间 roster（链路存在时含目标节点）。
 				 * @returns {Array<{ peerId: string, remoteNodeHash: string }>} roster 列表
 				 */
-				getRoster: () => getLink(key) ? [{ peerId: key, remoteNodeHash: key }] : [],
+				getRoster: () => getLink(targetNodeHash) ? [{ peerId: targetNodeHash, remoteNodeHash: targetNodeHash }] : [],
 				/**
 				 * 按 nodeHash 查找 peer id。
 				 * @param {string} nh 目标节点 64 hex
 				 * @returns {string | null} 对端 id；无链路时为 null
 				 */
-				getPeerIdByNodeHash: nh => getLink(nh) ? String(nh) : null,
+				getPeerIdByNodeHash: nh => getLink(nh) ? nh : null,
 				/**
 				 * 经 node scope 向远端 peer 发送 action。始终走当前规范链路（`getLink`），
 				 * 因为 glare 双 PC 择一后最初返回的链路可能已被关闭，规范链在 registry 内。
@@ -62,7 +60,7 @@ export async function ensureRemoteUserRoom(username, targetNodeHash) {
 				 * @returns {void}
 				 */
 				sendToPeer(peerId, actionName, payload) {
-					void getLink(key)?.send({ scope: 'node', action: actionName, payload }).catch(() => { })
+					void getLink(targetNodeHash)?.send({ scope: 'node', action: actionName, payload }).catch(() => { })
 				},
 			}
 
@@ -73,19 +71,19 @@ export async function ensureRemoteUserRoom(username, targetNodeHash) {
 				 * @returns {Promise<void>} 关闭完成
 				 */
 				leave() {
-					slots.delete(key)
-					return closeLink(key, 'remote-user-room-release')
+					slots.delete(targetNodeHash)
+					return closeLink(targetNodeHash, 'remote-user-room-release')
 				},
 			}
-			slots.set(key, slot)
+			slots.set(targetNodeHash, slot)
 			bumpLocalDataRevision()
 			return slot
 		}
 		finally {
-			inflights.delete(key)
+			inflights.delete(targetNodeHash)
 		}
 	})()
 
-	inflights.set(key, task)
+	inflights.set(targetNodeHash, task)
 	return await task
 }

package/transport/rtc_connection_budget.mjs

@@ -48,7 +48,7 @@ function bucketFor(roomKey, limits = {}) {
 		budgets.set(roomKey, bucket)
 	}
 	for (const id of resolveRtcBudgetLimits(limits).trustedPeers || [])
-		bucket.trustedPeers.add(String(id))
+		bucket.trustedPeers.add(id)
 	return bucket
 }
 
@@ -89,7 +89,7 @@ export function takeRtcJoinSlot(roomKey, peerId, limits = {}, sourceId = 'peer')
 	for (const id of bucket.active)
 		if (!bucket.trustedPeers.has(id)) nonTrustedCount++
 	if (!isTrusted) {
-		const source = String(sourceId || 'peer')
+		const source = sourceId || 'peer'
 		let sameSource = 0
 		for (const peerSource of bucket.sourceByPeer.values())
 			if (peerSource === source) sameSource++
@@ -108,7 +108,7 @@ export function takeRtcJoinSlot(roomKey, peerId, limits = {}, sourceId = 'peer')
 	bucket.joinTimestamps.push(now)
 	if (peerId) {
 		bucket.active.add(peerId)
-		bucket.sourceByPeer.set(peerId, String(sourceId || 'peer'))
+		bucket.sourceByPeer.set(peerId, sourceId || 'peer')
 	}
 	return true
 }
@@ -123,9 +123,9 @@ export function takeRtcJoinSlot(roomKey, peerId, limits = {}, sourceId = 'peer')
 export function annotateRtcPeerNodeHash(roomKey, peerId, nodeHash, limits = {}) {
 	const bucket = budgets.get(roomKey)
 	if (!bucket || !peerId || !nodeHash) return
-	bucket.peerNodeHash.set(peerId, String(nodeHash).trim())
+	bucket.peerNodeHash.set(peerId, nodeHash)
 	for (const trusted of resolveRtcBudgetLimits(limits).trustedPeers || [])
-		if (String(trusted).trim() === String(nodeHash).trim())
+		if (trusted === nodeHash)
 			bucket.trustedPeers.add(peerId)
 
 }
@@ -139,7 +139,7 @@ export function annotateRtcPeerNodeHash(roomKey, peerId, nodeHash, limits = {})
 export function setRtcPeerSource(roomKey, peerId, sourceId) {
 	const bucket = budgets.get(roomKey)
 	if (!bucket || !peerId) return
-	bucket.sourceByPeer.set(peerId, String(sourceId || 'peer'))
+	bucket.sourceByPeer.set(peerId, sourceId || 'peer')
 }
 
 /**

package/transport/runtime_bootstrap.mjs

@@ -41,14 +41,14 @@ export function collectFastListenProviders(ownedLanTcp) {
 	const listenProviders = []
 	if (ownedLanTcp) listenProviders.push(ownedLanTcp)
 	for (const provider of listLinkProviders()) {
-		const id = String(provider.id)
+		const { id } = provider
 		if (id.startsWith('lan_tcp') || id.startsWith('ble_gatt')) continue
-		if (typeof provider.ensureListening !== 'function') continue
+		if (!provider.ensureListening) continue
 		if (providerHasNativeProbe(provider)) continue
-		if (typeof provider.isAvailable === 'function')
+		if (provider.isAvailable)
 			try {
 				const available = provider.isAvailable()
-				if (available && typeof available.then === 'function') continue
+				if (available?.then) continue
 				if (!available) continue
 			}
 			catch { continue }
@@ -166,7 +166,7 @@ export function createRuntimeBootstrap(deps) {
 	 * @returns {number | null} 本机 lan_tcp 监听端口，未就绪为 null
 	 */
 	function lanTcpPort() {
-		const endpoint = typeof ownedLanTcp?.localEndpoint === 'function' ? ownedLanTcp.localEndpoint() : null
+		const endpoint = ownedLanTcp?.localEndpoint ? ownedLanTcp.localEndpoint() : null
 		return normalizeTcpPort(endpoint?.port)
 	}
 
@@ -199,13 +199,13 @@ export function createRuntimeBootstrap(deps) {
 	 * @returns {Promise<void>}
 	 */
 	async function startProviderListening(provider) {
-		if (typeof provider.ensureListening !== 'function') return
+		if (!provider.ensureListening) return
 		try {
 			const stop = await provider.ensureListening({
 				localIdentity,
 				onInbound: onInboundLink,
 			})
-			if (typeof stop === 'function') stopLinkListeners.push(stop)
+			if (stop) stopLinkListeners.push(stop)
 		}
 		catch { /* provider listen unavailable */ }
 	}
@@ -228,18 +228,18 @@ export function createRuntimeBootstrap(deps) {
 			if (!providerIds.has('bt')) {
 				const bt = await import('../discovery/bt/index.mjs').catch(() => null)
 				if (generation !== gen || !isLive()) return
-				if (await bt?.canUseBluetoothDiscovery?.()) {
+				if (await bt?.canUseBluetoothRuntime?.()) {
 					if (generation !== gen || !isLive()) return
 					const provider = bt.createBluetoothDiscoveryProvider()
 					registerDiscoveryProvider(provider)
 					if (generation !== gen || !isLive()) return
-					if (typeof provider.startPresence === 'function')
+					if (provider.startPresence)
 						try {
 							const stop = await provider.startPresence(async () => ({
 								nodeHash: localIdentity.nodeHash,
 								advertBytes: await buildNetworkAdvertBytes(),
 							}))
-							if (typeof stop === 'function' && generation === gen && isLive()) {
+							if (stop && generation === gen && isLive()) {
 								const prev = stopPresence
 								/**
 								 * 停止 presence 广播并链式调用上一轮清理。
@@ -248,12 +248,12 @@ export function createRuntimeBootstrap(deps) {
 							}
 						}
 						catch { /* ignore */ }
-					if (provider.caps?.canSignal && typeof provider.listenNodeSignals === 'function')
+					if (provider.caps?.canSignal && provider.listenNodeSignals)
 						try {
 							const stop = await provider.listenNodeSignals(localIdentity.nodeHash, bytes => {
 								void handleIncomingSignal(bytes).catch(() => { })
 							})
-							if (typeof stop === 'function' && generation === gen && isLive()) {
+							if (stop && generation === gen && isLive()) {
 								const prev = stopSignalListener
 								/**
 								 * 停止信令监听并链式调用上一轮清理。

package/trust_graph/cache.mjs

@@ -22,10 +22,9 @@ export function invalidateTrustGraphCache() {
  * @returns {Promise<Map<string, object>>} 合并后的信任图
  */
 export async function getCachedTrustGraph(username, build, ttlMs = DEFAULT_TTL_MS) {
-	const key = String(username || '')
 	const now = Date.now()
 	const dataRevision = getLocalDataRevision()
-	const cached = cacheByUsername.get(key)
+	const cached = cacheByUsername.get(username)
 	if (
 		cached
 		&& cached.revision === revision
@@ -35,6 +34,6 @@ export async function getCachedTrustGraph(username, build, ttlMs = DEFAULT_TTL_M
 		return cached.graph
 
 	const graph = await build()
-	cacheByUsername.set(key, { graph, builtAt: now, revision, dataRevision })
+	cacheByUsername.set(username, { graph, builtAt: now, revision, dataRevision })
 	return graph
 }

package/trust_graph/engine.mjs

@@ -89,7 +89,7 @@ export function mergeGraph(inputs, tunables = trustGraphTunables) {
 		const rawWeight = Number(hint.weight ?? tunables.hintDefaultWeight)
 		if (Number.isFinite(rawWeight) && rawWeight > 0)
 			ev.hintWeightSum += rawWeight
-		ev.hintSources.add(String(hint.source ?? 'unknown'))
+		ev.hintSources.add(hint.source ?? 'unknown')
 	}
 
 	for (const room of inputs.roomRosters || [])

package/trust_graph/registry.mjs

@@ -13,7 +13,7 @@ export const DEFAULT_TRUST_GRAPH_OWNER = 'default'
  * @returns {void}
  */
 export function registerTrustGraphProvider(ownerId, implementation) {
-	providersByOwner.set(String(ownerId), implementation)
+	providersByOwner.set(ownerId, implementation)
 }
 
 /** @returns {void} */
@@ -26,7 +26,7 @@ export function clearTrustGraphProvider() {
  * @returns {import('./registry.mjs').TrustGraphProvider} 已注册实现
  */
 export function requireTrustGraphProvider(ownerId = DEFAULT_TRUST_GRAPH_OWNER) {
-	const implementation = providersByOwner.get(String(ownerId))
+	const implementation = providersByOwner.get(ownerId)
 	if (!implementation)
 		throw new Error(`p2p: registerTrustGraphProvider('${ownerId}') must run before trust graph fanout`)
 	return implementation

package/trust_graph/send.mjs

@@ -20,7 +20,7 @@ import trustGraphTunables from './tunables.json' with { type: 'json' }
  * @returns {Promise<boolean>} 是否已发送
  */
 export async function sendToNode(username, targetNodeHash, actionName, payload, graph) {
-	const target = normalizeHex64(targetNodeHash) || String(targetNodeHash || '').trim().toLowerCase()
+	const target = normalizeHex64(targetNodeHash)
 	if (!isHex64(target)) return false
 
 	// 已直连 peer 不经 trust-graph scope 也应能收发 node scope action（非成员 CAS chunk / follow hint 等）

package/utils/async_mutex.mjs

@@ -39,7 +39,7 @@ function releaseMutex(lockKey, state) {
  * @template T
  */
 export async function withAsyncMutex(key, criticalSection) {
-	const lockKey = String(key)
+	const lockKey = key
 	const state = mutexState(lockKey)
 	return new Promise((resolve, reject) => {
 		/**

package/wire/ingress.mjs

@@ -46,6 +46,6 @@ export function isSignedDagEventRow(event) {
  */
 export function extractInboundSignedEvent(payload, groupId) {
 	if (!isSignedDagEventRow(payload)) return null
-	if (payload.groupId && String(payload.groupId) !== groupId) return null
+	if (payload.groupId && payload.groupId !== groupId) return null
 	return payload
 }

package/wire/part/ingress.mjs

@@ -21,15 +21,15 @@ import { handleIncomingPartInvokeResponse } from './pending.mjs'
  * @returns {object | null} 白名单字段
  */
 function parsePartTimelinePut(data, partpath) {
-	const timelineEntityHash = String(data.timelineEntityHash || '').trim().toLowerCase()
+	const timelineEntityHash = String(data.timelineEntityHash || '')
 	if (!timelineEntityHash || !isPlainObject(data.event)) return null
 	return {
 		type: 'part_timeline_put',
 		partpath,
 		timelineEntityHash,
 		event: data.event,
-		...data.nodeHash ? { nodeHash: String(data.nodeHash).trim() } : {},
-		...data.groupId ? { groupId: String(data.groupId).trim() } : {},
+		...data.nodeHash ? { nodeHash: String(data.nodeHash) } : {},
+		...data.groupId ? { groupId: String(data.groupId) } : {},
 	}
 }
 
@@ -60,8 +60,8 @@ async function dispatchPartInvoke(wireContext, payload) {
 	if (!partpath || !isPlainObject(invoke)) return null
 	return dispatchRpcInbound({
 		replicaUsername: wireContext.replicaUsername,
-		requesterNodeHash: payload.peerId ? String(payload.peerId).trim() : null,
-		groupId: payload.groupId ? String(payload.groupId).trim() : undefined,
+		requesterNodeHash: payload.peerId || null,
+		groupId: payload.groupId || undefined,
 		peerId: payload.peerId,
 	}, {
 		type: 'part_invoke',
@@ -93,7 +93,7 @@ export function attachPartWire(wireContext, wire, options = {}) {
 			if (!message) return
 			void dispatchDeliveryInbound({
 				replicaUsername: wireContext.replicaUsername,
-				requesterNodeHash: peerId ? String(peerId).trim() : null,
+				requesterNodeHash: peerId || null,
 			}, message)
 		},
 		/**

package/wire/part/query.mjs

@@ -48,11 +48,11 @@ export function attachPartQueryWire(wireContext, wire, dependencies = {}) {
 			const request = parsePartQueryReq(data)
 			if (!request) return
 			if (!state.takeDedupe(request.requestId)) return
-			const source = String(peerId || request.originNodeHash || '').trim().toLowerCase()
+			const source = peerId || request.originNodeHash
 			if (source && !consumeWireRateBucket(`part_query:${source}`, {
 				maxCount: partQueryTunables.ratePerSourcePerMin,
 			})) return
-			void processIncomingPartQueryRequest(wireContext, wire, request, String(peerId || ''), deps)
+			void processIncomingPartQueryRequest(wireContext, wire, request, peerId, deps)
 		},
 		/**
 		 * @param {unknown} data part_query_res 载荷
@@ -61,7 +61,7 @@ export function attachPartQueryWire(wireContext, wire, dependencies = {}) {
 		part_query_res(data, peerId) {
 			const response = parsePartQueryRes(data)
 			if (!response) return
-			handleIncomingPartQueryResponse(response, String(peerId || ''), deps)
+			handleIncomingPartQueryResponse(response, peerId, deps)
 		},
 	})
 }

package/wire/volatile_signature.mjs

@@ -28,10 +28,9 @@ export function boundStreamSlices(slices) {
  * @returns {Uint8Array} 验签消息字节
  */
 export function streamChunkSignBytes(pendingStreamId, chunkSeq, slices) {
-	const streamId = String(pendingStreamId ?? '')
 	const sequence = Number.isFinite(Number(chunkSeq)) ? String(chunkSeq) : '0'
 	const body = JSON.stringify(slices ?? [])
-	return new TextEncoder().encode(`${CHUNK_DOMAIN}\0${streamId}\0${sequence}\0${body}`)
+	return new TextEncoder().encode(`${CHUNK_DOMAIN}\0${pendingStreamId}\0${sequence}\0${body}`)
 }
 
 /**
@@ -51,11 +50,9 @@ export async function signStreamSignatureHex(bytes, secretKey) {
  * @returns {Promise<boolean>} 验签是否通过
  */
 export async function verifyStreamSignatureHex(bytes, signatureHex, publicKeyHex) {
-	const signature = String(signatureHex || '').trim().toLowerCase()
-	const publicKey = String(publicKeyHex || '').trim().toLowerCase()
-	if (!isSignatureHex128(signature) || !isHex64(publicKey)) return false
+	if (!isSignatureHex128(signatureHex) || !isHex64(publicKeyHex)) return false
 	try {
-		return await verify(Buffer.from(signature, 'hex'), bytes, Buffer.from(publicKey, 'hex'))
+		return await verify(Buffer.from(signatureHex, 'hex'), bytes, Buffer.from(publicKeyHex, 'hex'))
 	}
 	catch {
 		return false
@@ -69,8 +66,6 @@ export async function verifyStreamSignatureHex(bytes, signatureHex, publicKeyHex
  * @returns {{ publicKey: Uint8Array, secretKey: Uint8Array }} 密钥对
  */
 export function streamKeyPairFromUserSeed(username, seedMaterial) {
-	const user = String(username ?? '')
-	const material = String(seedMaterial ?? '')
-	const seed = createHash('sha256').update(`fount-stream-sign\0${user}\0${material}`).digest()
+	const seed = createHash('sha256').update(`fount-stream-sign\0${username}\0${seedMaterial}`).digest()
 	return keyPairFromSeed(seed)
 }