@steve02081504/fount-p2p 0.0.11 → 0.0.12

package/transport/rtc_connection_budget.mjs

@@ -23,7 +23,7 @@ export function resolveRtcBudgetLimits(limits = {}) {
 		maxActive: Math.max(4, Math.min(128, Number(limits.maxActive) || 32)),
 		maxJoinsPerMin: Math.max(1, Math.min(120, Number(limits.maxJoinsPerMin) || 12)),
 		overloadCooldownMs: Math.max(1000, Number(limits.overloadCooldownMs) || 15_000),
-		trustedPeers: Array.isArray(limits.trustedPeers) ? limits.trustedPeers.map(String) : [],
+		trustedPeers: limits.trustedPeers || [],
 		trustedReserveFraction: Math.max(0.1, Math.min(0.5, Number(limits.trustedReserveFraction) || DEFAULT_TRUSTED_RESERVE_FRACTION)),
 		minTrustedReserved: Math.max(1, Math.floor(Number(limits.minTrustedReserved) || DEFAULT_MIN_TRUSTED_RESERVED)),
 	}
@@ -85,10 +85,14 @@ export function takeRtcJoinSlot(roomKey, peerId, limits = {}, sourceId = 'peer')
 	const isTrusted = peerId && bucket.trustedPeers.has(peerId)
 	const trustedReserved = Math.max(minTrustedReserved, Math.floor(maxActive * trustedReserveFraction))
 	const maxNonTrusted = Math.max(1, maxActive - trustedReserved)
-	const nonTrustedCount = [...bucket.active].filter(id => !bucket.trustedPeers.has(id)).length
+	let nonTrustedCount = 0
+	for (const id of bucket.active)
+		if (!bucket.trustedPeers.has(id)) nonTrustedCount++
 	if (!isTrusted) {
 		const source = String(sourceId || 'peer')
-		const sameSource = [...bucket.sourceByPeer.entries()].filter(([, s]) => s === source).length
+		let sameSource = 0
+		for (const peerSource of bucket.sourceByPeer.values())
+			if (peerSource === source) sameSource++
 		const sourceCap = Math.max(1, Math.floor(maxActive * MAX_SOURCE_SLOT_FRACTION))
 		if (sameSource >= sourceCap) return false
 		if (nonTrustedCount >= maxNonTrusted && bucket.active.size >= maxActive) {
@@ -149,6 +153,16 @@ export function releaseRtcPeer(roomKey, peerId) {
 	bucket.active.delete(peerId)
 	bucket.sourceByPeer.delete(peerId)
 	bucket.peerNodeHash.delete(peerId)
+	// 房间空闲后丢掉桶，避免 leave 过的 roomKey 永久占内存
+	if (!bucket.active.size) budgets.delete(roomKey)
+}
+
+/**
+ * 当前预算桶数量（测试用）。
+ * @returns {number} 房间桶数
+ */
+export function rtcBudgetRoomCount() {
+	return budgets.size
 }
 
 /** RTC 过载时跳过的非关键联邦 action */
@@ -180,5 +194,5 @@ const NON_CRITICAL_FED_ACTIONS = new Set([
  */
 export function isFederationActionAllowedUnderLoad(roomKey, actionName, limits = {}) {
 	if (!isRtcRoomOverloaded(roomKey, limits)) return true
-	return !NON_CRITICAL_FED_ACTIONS.has(String(actionName || '').trim())
+	return !NON_CRITICAL_FED_ACTIONS.has(actionName)
 }

package/transport/runtime_bootstrap.mjs

@@ -40,7 +40,7 @@ export function collectFastListenProviders(ownedLanTcp) {
 		if (id.startsWith('lan_tcp') || id.startsWith('ble_gatt')) continue
 		if (typeof provider.ensureListening !== 'function') continue
 		if (providerHasNativeProbe(provider)) continue
-		if (typeof provider.isAvailable === 'function') {
+		if (typeof provider.isAvailable === 'function')
 			try {
 				const available = provider.isAvailable()
 				// 未标 probe:native 却返回 thenable：跳过，勿 await。
@@ -48,7 +48,7 @@ export function collectFastListenProviders(ownedLanTcp) {
 				if (!available) continue
 			}
 			catch { continue }
-		}
+
 		listenProviders.push(provider)
 	}
 	return listenProviders
@@ -200,6 +200,9 @@ export function createRuntimeBootstrap(deps) {
 	function chainStop(kind, stop) {
 		if (kind === 'signal') {
 			const prev = stopSignalListener
+			/**
+			 *
+			 */
 			stopSignalListener = () => {
 				try { stop() } catch { /* ignore */ }
 				prev?.()
@@ -207,6 +210,9 @@ export function createRuntimeBootstrap(deps) {
 			return
 		}
 		const prev = stopAdvert
+		/**
+		 *
+		 */
 		stopAdvert = () => {
 			try { stop() } catch { /* ignore */ }
 			prev?.()

package/transport/signal_crypto.mjs

@@ -3,11 +3,15 @@ import { createCipheriv, createDecipheriv, createHash, randomBytes } from 'node:
 
 import { normalizeHex64 } from '../core/hexIds.mjs'
 import { sha256Hex } from '../crypto/crypto.mjs'
+import { createLruMap } from '../utils/lru.mjs'
 
 const SIGNAL_DOMAIN = 'fount-signal'
 const NODE_TOPIC_DOMAIN = 'fount-rdv-node:'
 const GROUP_TOPIC_DOMAIN = 'fount-rdv-group:'
 
+/** topic → AES-256 密钥缓存上限（群/节点 topic 会随时间增长，须有界） */
+export const SIGNAL_KEY_CACHE_MAX = 512
+
 /**
  * 由 nodeHash 派生节点 rendezvous topic。
  * @param {string} nodeHash 节点 64 hex
@@ -23,16 +27,34 @@ export function nodeRendezvousTopic(nodeHash) {
  * @returns {string} rendezvous topic 哈希
  */
 export function groupRendezvousTopic(roomSecret) {
-	return sha256Hex(`${GROUP_TOPIC_DOMAIN}${String(roomSecret || '')}`)
+	return sha256Hex(`${GROUP_TOPIC_DOMAIN}${roomSecret}`)
 }
 
+/** topic → AES-256 密钥 LRU */
+const signalKeysByTopic = createLruMap(SIGNAL_KEY_CACHE_MAX)
+
 /**
- * 由 topic 派生信令 AES 密钥。
+ * 由 topic 派生信令 AES 密钥（同 topic 复用，避免每包 SHA-256）。
  * @param {string} topic rendezvous 主题
  * @returns {Buffer} AES-256 密钥
  */
 function signalKeyForTopic(topic) {
-	return createHash('sha256').update(`${SIGNAL_DOMAIN}:${String(topic)}`).digest()
+	let cached = signalKeysByTopic.get(topic)
+	if (cached) {
+		signalKeysByTopic.touch(topic, cached)
+		return cached
+	}
+	cached = createHash('sha256').update(`${SIGNAL_DOMAIN}:${topic}`).digest()
+	signalKeysByTopic.touch(topic, cached)
+	return cached
+}
+
+/**
+ * 当前密钥缓存条目数（测试用）。
+ * @returns {number} 缓存大小
+ */
+export function signalKeyCacheSize() {
+	return signalKeysByTopic.size
 }
 
 /**

package/transport/user_room.mjs

@@ -3,12 +3,24 @@ import { createHash } from 'node:crypto'
 import { attachMailboxWire } from '../mailbox/wire.mjs'
 import { ensureNodeDefaults, getNodeHash } from '../node/identity.mjs'
 import { registerFederationRoomProvider } from '../registries/room_provider.mjs'
+import { shuffleInPlace } from '../utils/shuffle.mjs'
 import { attachPartWire } from '../wire/part_ingress.mjs'
 import { attachPartQueryWire } from '../wire/part_query.mjs'
 
 import { listLinks, sendToNodeLink, subscribeScope, getLinkRegistry } from './link_registry.mjs'
 import { USER_ROOM_SCOPE } from './room_scopes.mjs'
 
+/**
+ * 经 node scope 向对端发 action。
+ * @param {string} peerId 对端 nodeHash
+ * @param {string} action 动作名
+ * @param {unknown} payload 载荷
+ * @returns {Promise<boolean>} 是否发出
+ */
+const sendNodeAction = (peerId, action, payload) =>
+	sendToNodeLink(peerId, { scope: 'node', action, payload })
+
+
 /**
  * 在 node scope action 表上注册 fed_chunk_get / fed_chunk_data handler，
  * 供用户房间（本地 + 远端）双向 chunk 传输使用。
@@ -63,9 +75,8 @@ function createNodeScopeWire() {
 		 * @returns {void}
 		 */
 		on(name, handler) {
-			const key = String(name)
-			if (!nodeActionHandlers.has(key)) nodeActionHandlers.set(key, new Set())
-			nodeActionHandlers.get(key).add(handler)
+			if (!nodeActionHandlers.has(name)) nodeActionHandlers.set(name, new Set())
+			nodeActionHandlers.get(name).add(handler)
 		},
 		/**
 		 * 向指定 peer 发送 node scope action。
@@ -76,7 +87,7 @@ function createNodeScopeWire() {
 		 */
 		send(name, payload, peerId) {
 			if (!peerId) return
-			void sendToNodeLink(peerId, { scope: 'node', action: String(name), payload }).catch(() => { })
+			void sendNodeAction(peerId, name, payload).catch(() => { })
 		},
 	}
 }
@@ -96,9 +107,9 @@ function activeLinkRoster() {
  */
 async function ensureNodeScopeRuntime(wireContext) {
 	if (nodeScopeCleanup) return
-	nodeScopeReplicaUsername = String(wireContext.replicaUsername || nodeScopeReplicaUsername || '')
+	nodeScopeReplicaUsername = wireContext.replicaUsername || nodeScopeReplicaUsername || ''
 	nodeScopeCleanup = subscribeScope('node', (senderNodeHash, envelope) => {
-		const handlers = nodeActionHandlers.get(String(envelope?.action || ''))
+		const handlers = nodeActionHandlers.get(envelope.action)
 		if (!handlers?.size) return
 		for (const handler of handlers)
 			try { handler(envelope.payload, senderNodeHash) } catch { /* ignore */ }
@@ -188,7 +199,7 @@ export async function ensureUserRoom(wireContext = {}) {
 				 * @returns {void}
 				 */
 				sendToPeer(peerId, actionName, payload) {
-					void sendToNodeLink(peerId, { scope: 'node', action: String(actionName), payload }).catch(() => { })
+					void sendNodeAction(peerId, actionName, payload).catch(() => { })
 				},
 				/**
 				 * 返回当前活跃链路 roster。
@@ -201,7 +212,7 @@ export async function ensureUserRoom(wireContext = {}) {
 				 * @returns {string | null} 对端 id；无链路时为 null
 				 */
 				getPeerIdByNodeHash(nodeHash) {
-					return getLinkRegistry().getLink(nodeHash) ? String(nodeHash) : null
+					return getLinkRegistry().getLink(nodeHash) ? nodeHash : null
 				},
 			}
 			return userRoomSlot
@@ -234,15 +245,11 @@ export async function deliverToUserRoomPeers(username, actionName, payload, exce
 	if (!slot) return 0
 	const body = { ...payload, nodeHash: getNodeHash() }
 	let sent = 0
-	const peers = [...slot.getRoster()
-		.filter(({ peerId }) => peerId && peerId !== exceptPeerId)]
-	for (let swapIndex = peers.length - 1; swapIndex > 0; swapIndex--) {
-		const pickIndex = Math.floor(Math.random() * (swapIndex + 1))
-		;[peers[swapIndex], peers[pickIndex]] = [peers[pickIndex], peers[swapIndex]]
-	}
+	const peers = shuffleInPlace(slot.getRoster()
+		.filter(({ peerId }) => peerId && peerId !== exceptPeerId))
 	for (const { peerId } of peers)
 		try {
-			if (await sendToNodeLink(peerId, { scope: 'node', action: String(actionName), payload: body }))
+			if (await sendNodeAction(peerId, actionName, body))
 				sent++
 			if (sent >= fanoutLimit) break
 		}

package/trust_graph/send.mjs

@@ -26,7 +26,7 @@ export async function sendToNode(username, targetNodeHash, actionName, payload,
 	await ensureUserRoom({ replicaUsername: username })
 
 	// 已直连 peer 不经 trust-graph scope 也应能收发 node scope action（非成员 CAS chunk / follow hint 等）
-	if (await sendToNodeLink(target, { scope: 'node', action: String(actionName), payload }))
+	if (await sendToNodeLink(target, { scope: 'node', action: actionName, payload }))
 		return true
 
 	const merged = graph ?? await buildMergedGraph(username)

package/utils/emit_safe.mjs

@@ -0,0 +1,11 @@
+/**
+ * 调用一组 listener，单次抛错不影响其余。
+ * @param {Iterable<Function>} listeners 回调集合
+ * @param {...unknown} args 传给每个 listener 的参数
+ * @returns {void}
+ */
+export function emitSafe(listeners, ...args) {
+	for (const listener of listeners)
+		try { listener(...args) }
+		catch { /* ignore */ }
+}

package/utils/shuffle.mjs

@@ -0,0 +1,13 @@
+/**
+ * Fisher–Yates 原地洗牌。
+ * @template T
+ * @param {T[]} arr 待洗牌数组（原地修改）
+ * @returns {T[]} 同一数组引用
+ */
+export function shuffleInPlace(arr) {
+	for (let i = arr.length - 1; i > 0; i--) {
+		const j = Math.floor(Math.random() * (i + 1))
+		;[arr[i], arr[j]] = [arr[j], arr[i]]
+	}
+	return arr
+}

package/utils/ttl_map.mjs

@@ -1,21 +1,46 @@
 /**
- * 带 TTL 的 Map：get 时惰性过期删除。
+ * 带 TTL 的 Map：get 时惰性过期；set 时在超上限下先清过期再 LRU 驱逐。
  * @template T
  * @param {number} ttlMs 存活毫秒
- * @returns {{ ttlMs: number, set: (key: string, value: T) => void, get: (key: string, now?: number) => T | null, clear: () => void }} TTL Map 句柄
+ * @param {number} [maxSize=4096] 最大条目（防只写不读时过期项堆积）
+ * @returns {{ ttlMs: number, maxSize: number, size: () => number, set: (key: string, value: T) => void, get: (key: string, now?: number) => T | null, clear: () => void }} TTL Map 句柄
  */
-export function createTtlMap(ttlMs) {
+export function createTtlMap(ttlMs, maxSize = 4096) {
+	const cap = Math.max(1, Math.floor(Number(maxSize) || 4096))
 	/** @type {Map<string, { value: T, seenAt: number }>} */
 	const map = new Map()
+
+	/**
+	 * 删除过期项；若仍满则按插入序驱逐最旧。
+	 * @param {number} now 当前时间
+	 * @returns {void}
+	 */
+	function prune(now) {
+		for (const [key, entry] of map)
+			if (now - entry.seenAt > ttlMs) map.delete(key)
+		while (map.size >= cap) {
+			const oldest = map.keys().next().value
+			map.delete(oldest)
+		}
+	}
+
 	return {
 		ttlMs,
+		maxSize: cap,
+		/**
+		 * @returns {number} 当前条目数（含未 get 的过期项）
+		 */
+		size: () => map.size,
 		/**
 		 * @param {string} key 键
 		 * @param {T} value 值
 		 * @returns {void}
 		 */
 		set(key, value) {
-			map.set(key, { value, seenAt: Date.now() })
+			const now = Date.now()
+			if (map.has(key)) map.delete(key)
+			if (map.size >= cap) prune(now)
+			map.set(key, { value, seenAt: now })
 		},
 		/**
 		 * @param {string} key 键

package/wire/ingress.mjs

@@ -19,7 +19,7 @@ export function isPlainObject(value) {
  * @returns {Record<string, unknown> | null} 解析失败或非对象时为 null
  */
 export function parseInboundJson(raw) {
-	if (raw == null) return null
+	if (!raw) return null
 	const text = typeof raw === 'string'
 		? raw
 		: Buffer.isBuffer(raw)

package/wire/part_ingress.mjs

@@ -116,7 +116,7 @@ export async function handleIncomingPartInvokeRequest(wireContext, payload, wire
 	if (!partpath || !payload.requestId) return
 
 	const response = await dispatchPartInvoke(wireContext, { ...payload, peerId })
-	if (response == null || !isPartInvokeResponse(response)) return
+	if (!isPartInvokeResponse(response)) return
 
 	try {
 		wire.send('part_invoke_response', {
@@ -159,14 +159,12 @@ export async function handleIncomingPartInvokeFireAndForget(wireContext, payload
  * @returns {void}
  */
 export function handleIncomingPartInvokeResponse(payload, peerId = '') {
-	const pending = pendingPartInvoke.get(String(payload?.requestId || ''))
-	if (!pending || payload?.response == null) return
-	const peerKey = String(peerId || payload?.nodeHash || '').trim()
-	if (peerKey) {
-		if (pending.respondedPeers.has(peerKey)) return
-		pending.respondedPeers.add(peerKey)
+	const pending = pendingPartInvoke.get(payload.requestId)
+	if (!pending || !isPartInvokeResponse(payload.response)) return
+	if (peerId) {
+		if (pending.respondedPeers.has(peerId)) return
+		pending.respondedPeers.add(peerId)
 	}
-	if (!isPartInvokeResponse(payload.response)) return
 	pending.responses.push(payload.response)
 	if (pending.responses.length >= pending.maxResponses) pending.finish()
 }

package/wire/part_invoke.mjs

@@ -45,9 +45,9 @@ export function isPartInvokeResponse(value) {
 		const err = value.error
 		return isPlainObject(err)
 			&& typeof err.message === 'string'
-			&& err.message.length > 0
 			&& typeof err.code === 'string'
-			&& err.code.length > 0
+			&& err.message.length
+			&& err.code.length
 	}
 	return true
 }
@@ -57,7 +57,7 @@ export function isPartInvokeResponse(value) {
  * @returns {unknown | null} 成功 `result`；失败或空为 null
  */
 export function unwrapPartInvokeResult(response) {
-	if (!response || !isPartInvokeResponse(response) || 'error' in response) return null
+	if (!isPartInvokeResponse(response) || 'error' in response) return null
 	return response.result ?? null
 }
 
@@ -77,5 +77,5 @@ export function normalizePartpath(value) {
 export function isPartInvoke(value) {
 	if (!isPlainObject(value)) return false
 	const { kind } = value
-	return typeof kind === 'string' && kind.length > 0
+	return typeof kind === 'string' && kind.length
 }

package/wire/part_query.mjs

@@ -132,7 +132,7 @@ export function registerQueryInboundHandler(partpath, kind, handler, state = def
  * @returns {number} 等待下游超时
  */
 export function resolvePartQueryHopTimeoutMs(ttl, tunables = partQueryTunables) {
-	const table = Array.isArray(tunables.hopTimeoutMs) ? tunables.hopTimeoutMs : [1000, 2500, 4000, 6000]
+	const table = tunables.hopTimeoutMs || [1000, 2500, 4000, 6000]
 	const index = Math.max(0, Math.min(table.length - 1, Math.floor(ttl) - 1))
 	return Math.max(1, Math.floor(Number(table[index]) || tunables.defaultTimeoutMs || 4000))
 }
@@ -176,8 +176,7 @@ export function mergeQueryRows(lists, maxHits, rowKey) {
 async function runLocalHandler(state, queryContext, partpath, kind, query) {
 	const handler = state.handlers.get(handlerKey(partpath, kind))
 	if (!handler) return []
-	const rows = await handler(queryContext, query)
-	return Array.isArray(rows) ? rows : []
+	return await handler(queryContext, query) || []
 }
 
 /**

package/wire/part_query.tunables.json

@@ -9,6 +9,11 @@
 	"dedupeMaxSize": 4000,
 	"cacheTtlMs": 300000,
 	"cacheMaxKeys": 256,
-	"hopTimeoutMs": [1000, 2500, 4000, 6000],
+	"hopTimeoutMs": [
+		1000,
+		2500,
+		4000,
+		6000
+	],
 	"defaultTimeoutMs": 4000
 }

package/wire/part_query_cache.mjs

@@ -77,7 +77,7 @@ export function createPartQueryCache(options = {}) {
 		 */
 		set(partpath, kind, query, rows, now = Date.now()) {
 			const key = partQueryCacheKey(partpath, kind, query)
-			if (!key || !Array.isArray(rows)) return
+			if (!key || !rows) return
 			sweep(now)
 			map.touch(key, {
 				rows: rows.slice(0, maxHits),

package/wire/volatile_signature.mjs

@@ -17,7 +17,7 @@ export const MAX_STREAM_VOLATILE_SLICES = 256
  * @returns {object[] | null} 合法切片或 null
  */
 export function boundStreamSlices(slices) {
-	if (!Array.isArray(slices) || slices.length > MAX_STREAM_VOLATILE_SLICES) return null
+	if (!slices?.length || slices.length > MAX_STREAM_VOLATILE_SLICES) return null
 	return slices
 }