@steve02081504/fount-p2p 0.0.11 → 0.0.12

package/rooms/scoped_link.mjs

@@ -1,12 +1,11 @@
-import { noteAdvertPeerHints } from '../discovery/advert_peer_hints.mjs'
 import { advertiseTopic, subscribeTopic } from '../discovery/index.mjs'
-import { verifySignedAdvert } from '../link/handshake.mjs'
+import { ingestSignedAdvert } from '../transport/advert_ingest.mjs'
 import { getLinkRegistry } from '../transport/link_registry.mjs'
 import {
-	decryptSignalPacket,
 	encryptSignalPacket,
 	groupRendezvousTopic,
 } from '../transport/signal_crypto.mjs'
+import { emitSafe } from '../utils/emit_safe.mjs'
 
 /**
  * 在指定 scope 与 roomSecret 下创建 link 层房间（discovery + registry 转发）。
@@ -18,9 +17,9 @@ import {
  */
 export function createScopedLinkRoom(options) {
 	const registry = getLinkRegistry()
-	const scope = String(options.scope)
+	const { scope } = options
 	const topic = groupRendezvousTopic(options.roomSecret)
-	const allowNode = typeof options.allowNode === 'function' ? options.allowNode : () => true
+	const allowNode = options.allowNode ?? (() => true)
 	/** @type {Set<string>} */
 	const discoveredPeers = new Set()
 	/** @type {Set<string>} */
@@ -41,16 +40,6 @@ export function createScopedLinkRoom(options) {
 		return [...discoveredPeers].filter(nodeHash => allowNode(nodeHash) && registry.getLink(nodeHash))
 	}
 
-	/**
-	 * @param {Set<(peerId: string) => void>} listeners 回调集合
-	 * @param {string} peerId 节点 hash
-	 * @returns {void}
-	 */
-	function emit(listeners, peerId) {
-		for (const listener of listeners)
-			try { listener(peerId) } catch { /* ignore */ }
-	}
-
 	/**
 	 * @param {string} peerId 节点 hash
 	 * @returns {void}
@@ -58,7 +47,7 @@ export function createScopedLinkRoom(options) {
 	function notePeerJoin(peerId) {
 		if (!peerId || announcedPeers.has(peerId)) return
 		announcedPeers.add(peerId)
-		emit(joinListeners, peerId)
+		emitSafe(joinListeners, peerId)
 	}
 
 	/**
@@ -68,7 +57,7 @@ export function createScopedLinkRoom(options) {
 	function notePeerLeave(peerId) {
 		if (!peerId || !announcedPeers.has(peerId)) return
 		announcedPeers.delete(peerId)
-		emit(leaveListeners, peerId)
+		emitSafe(leaveListeners, peerId)
 	}
 
 	/**
@@ -76,10 +65,9 @@ export function createScopedLinkRoom(options) {
 	 * @returns {{ handler: ((payload: unknown, peerId: string) => void) | null, backlog: Array<{ payload: unknown, peerId: string }> }} action 槽（含待处理 backlog）
 	 */
 	function getActionEntry(name) {
-		const key = String(name)
-		if (!actionEntries.has(key))
-			actionEntries.set(key, { handler: null, backlog: [] })
-		return actionEntries.get(key)
+		if (!actionEntries.has(name))
+			actionEntries.set(name, { handler: null, backlog: [] })
+		return actionEntries.get(name)
 	}
 
 	return {
@@ -90,7 +78,7 @@ export function createScopedLinkRoom(options) {
 			await registry.ensureRuntime()
 			cleanups.add(registry.subscribeScope(scope, (senderNodeHash, envelope) => {
 				if (!allowNode(senderNodeHash)) return
-				const entry = actionEntries.get(String(envelope?.action || ''))
+				const entry = actionEntries.get(envelope.action)
 				if (!entry) return
 				if (entry.handler) entry.handler(envelope.payload, senderNodeHash)
 				else entry.backlog.push({ payload: envelope.payload, peerId: senderNodeHash })
@@ -104,14 +92,11 @@ export function createScopedLinkRoom(options) {
 				notePeerLeave(nodeHash)
 			}))
 			cleanups.add(await subscribeTopic(topic, async (bytes, meta) => {
-				const packet = decryptSignalPacket(topic, bytes)
-				if (packet?.type !== 'advert' || !packet.body) return
-				const verifiedNodeHash = await verifySignedAdvert(topic, packet.body)
-				if (!verifiedNodeHash || !allowNode(verifiedNodeHash)) return
-				noteAdvertPeerHints(verifiedNodeHash, packet.body, meta)
-				discoveredPeers.add(verifiedNodeHash)
-				await registry.ensureLinkToNode(verifiedNodeHash).catch(() => null)
-				if (registry.getLink(verifiedNodeHash)) notePeerJoin(verifiedNodeHash)
+				const ingested = await ingestSignedAdvert(topic, bytes, meta)
+				if (!ingested || !allowNode(ingested.verifiedNodeHash)) return
+				discoveredPeers.add(ingested.verifiedNodeHash)
+				await registry.ensureLinkToNode(ingested.verifiedNodeHash).catch(() => null)
+				if (registry.getLink(ingested.verifiedNodeHash)) notePeerJoin(ingested.verifiedNodeHash)
 			}))
 			cleanups.add(await advertiseTopic(topic, encryptSignalPacket(topic, {
 				type: 'advert',
@@ -135,22 +120,21 @@ export function createScopedLinkRoom(options) {
 		 * @returns {[(payload: unknown, peerId?: string | string[] | null) => Promise<void>, (handler: (payload: unknown, peerId: string) => void) => void]} [send, onReceive] 发送与订阅元组
 		 */
 		makeAction(name) {
-			const actionName = String(name)
 			return [
 				async (payload, peerId = null) => {
 					if (Array.isArray(peerId)) {
 						await Promise.all(peerId.map(targetPeerId =>
-							registry.sendToNodeLink(targetPeerId, { scope, action: actionName, payload })))
+							registry.sendToNodeLink(targetPeerId, { scope, action: name, payload })))
 						return
 					}
 					if (peerId)
-						await registry.sendToNodeLink(peerId, { scope, action: actionName, payload })
+						await registry.sendToNodeLink(peerId, { scope, action: name, payload })
 					else
 						await Promise.all(activePeerIds().map(targetPeerId =>
-							registry.sendToNodeLink(targetPeerId, { scope, action: actionName, payload })))
+							registry.sendToNodeLink(targetPeerId, { scope, action: name, payload })))
 				},
 				handler => {
-					const entry = getActionEntry(actionName)
+					const entry = getActionEntry(name)
 					entry.handler = handler
 					for (const pending of entry.backlog.splice(0))
 						handler(pending.payload, pending.peerId)

package/schemas/discovery.mjs

@@ -34,8 +34,7 @@ function sanitizeDiscoveryAdvertisement(ad) {
  * @returns {object[]} 已清扫广告
  */
 function sanitizeDiscoveryAdvertisements(ads) {
-	if (!Array.isArray(ads)) return []
-	return ads.slice(0, MAX_DISCOVERY_ADS).map(sanitizeDiscoveryAdvertisement).filter(Boolean)
+	return (ads || []).slice(0, MAX_DISCOVERY_ADS).map(sanitizeDiscoveryAdvertisement).filter(Boolean)
 }
 
 /**

package/schemas/federation_pull.mjs

@@ -30,8 +30,8 @@ export function parsePullAttestation(attestation) {
 	const signature = String(attestation.signature || '').trim().toLowerCase()
 	if (!isHex64(requesterPubKeyHash) || !groupId || !Number.isFinite(timestamp) || !isSignatureHex128(signature))
 		return null
-	const wantIds = Array.isArray(attestation.wantIds)
-		? [...new Set(attestation.wantIds.map(id => String(id).trim().toLowerCase()).filter(id => EVENT_ID_HEX.test(id)))]
+	const wantIds = attestation.wantIds?.length
+		? [...new Set(attestation.wantIds.map(id => id.trim().toLowerCase()).filter(id => EVENT_ID_HEX.test(id)))]
 		: undefined
 	return {
 		requesterPubKeyHash,

package/schemas/part_query.mjs

@@ -107,7 +107,7 @@ export function parsePartQueryReq(value, tunables = partQueryTunables) {
 	if (!Object.prototype.hasOwnProperty.call(value, 'query')) return null
 	if (measureJsonBytes(value.query) > (tunables.maxQueryBytes ?? 2048)) return null
 	const ttl = clampPartQueryTtl(value.ttl, tunables.maxTtl)
-	if (ttl == null) return null
+	if (!ttl) return null
 	const budget = clampPartQueryBudget(value.budget, tunables.maxHits)
 	return {
 		requestId,

package/schemas/remote_event.mjs

@@ -9,7 +9,7 @@ export function validateRemoteEventShape(event) {
 	if (!event?.type || typeof event.type !== 'string')
 		throw new Error('remote event: type required')
 	assertHex64(event.id, 'remote event.id')
-	if (!Array.isArray(event.prev_event_ids))
+	if (!event.prev_event_ids)
 		throw new Error('remote event: prev_event_ids must be array')
 	for (const parentId of event.prev_event_ids)
 		assertHex64(parentId, 'remote event.prev_event_id')

package/transport/advert_ingest.mjs

@@ -0,0 +1,20 @@
+import { noteAdvertPeerHints } from '../discovery/advert_peer_hints.mjs'
+import { verifySignedAdvert } from '../link/handshake.mjs'
+
+import { decryptSignalPacket } from './signal_crypto.mjs'
+
+/**
+ * 解密验签 advert，写入 peer hints；失败返回 null。
+ * @param {string} topic rendezvous 主题
+ * @param {Uint8Array} bytes 加密 advert 载荷
+ * @param {object} [meta] 发现元数据（如 relayUrl）
+ * @returns {Promise<{ verifiedNodeHash: string, body: object } | null>} 验签后的节点与 body
+ */
+export async function ingestSignedAdvert(topic, bytes, meta) {
+	const packet = decryptSignalPacket(topic, bytes)
+	if (packet?.type !== 'advert' || !packet.body) return null
+	const verifiedNodeHash = await verifySignedAdvert(topic, packet.body)
+	if (!verifiedNodeHash) return null
+	noteAdvertPeerHints(verifiedNodeHash, packet.body, meta)
+	return { verifiedNodeHash, body: packet.body }
+}

package/transport/group_link_set.mjs

@@ -1,18 +1,16 @@
-import { noteAdvertPeerHints } from '../discovery/advert_peer_hints.mjs'
 import { advertiseTopic, subscribeTopic } from '../discovery/index.mjs'
-import { verifySignedAdvert } from '../link/handshake.mjs'
 import { loadPeerPoolView } from '../node/network.mjs'
 import { loadReputation } from '../node/reputation_store.mjs'
+import { emitSafe } from '../utils/emit_safe.mjs'
 
+import { ingestSignedAdvert } from './advert_ingest.mjs'
 import { getLinkRegistry } from './link_registry.mjs'
 import { resolveFederationPoolLimits, selectLinkTargetsFromMembers } from './peer_pool.mjs'
 import {
-	decryptSignalPacket,
 	encryptSignalPacket,
 	groupRendezvousTopic,
 } from './signal_crypto.mjs'
 
-
 /**
  * 创建基于 link registry 的群组联邦房间。
  * @param {object} options 选项
@@ -25,10 +23,10 @@ import {
 export function createGroupLinkSet(options) {
 	const registry = options.registry ?? getLinkRegistry()
 	const autoconnect = options.autoconnect !== false
-	const groupId = String(options.groupId)
+	const { groupId } = options
 	const scope = `group:${groupId}`
 	const topic = groupRendezvousTopic(options.roomSecret)
-	const members = new Set((Array.isArray(options.members) ? options.members : []).map(String))
+	const members = new Set(options.members || [])
 	const selfNodeHash = registry.localIdentity.nodeHash
 	const groupSettings = options.groupSettings ?? {}
 	// 初始成员是调用方明确知道的引导集合（如 introducer/creator/seed），作为必连锚点保证引导期连通。
@@ -59,17 +57,6 @@ export function createGroupLinkSet(options) {
 		cleanups.add(cleanup)
 	}
 
-	/**
-	 * 向 peer 事件监听器集合广播。
-	 * @param {Set<(peerId: string) => void>} listeners 监听器集合
-	 * @param {string} peerId 目标 peer id
-	 * @returns {void}
-	 */
-	function emitPeerListeners(listeners, peerId) {
-		for (const listener of listeners)
-			try { listener(peerId) } catch { /* ignore */ }
-	}
-
 	/**
 	 * 记录 peer 加入并通知监听器。
 	 * @param {string} peerId 加入的 peer id
@@ -78,7 +65,7 @@ export function createGroupLinkSet(options) {
 	function notePeerJoin(peerId) {
 		if (!peerId || announcedPeers.has(peerId)) return
 		announcedPeers.add(peerId)
-		emitPeerListeners(peerJoinListeners, peerId)
+		emitSafe(peerJoinListeners, peerId)
 	}
 
 	/**
@@ -89,7 +76,7 @@ export function createGroupLinkSet(options) {
 	function notePeerLeave(peerId) {
 		if (!peerId || !announcedPeers.has(peerId)) return
 		announcedPeers.delete(peerId)
-		emitPeerListeners(peerLeaveListeners, peerId)
+		emitSafe(peerLeaveListeners, peerId)
 	}
 
 	/**
@@ -98,13 +85,12 @@ export function createGroupLinkSet(options) {
 	 * @returns {void}
 	 */
 	function notePeerCandidate(nodeHash) {
-		const normalized = String(nodeHash || '')
-		if (!normalized || normalized === selfNodeHash || members.has(normalized)) return
-		members.add(normalized)
+		if (!nodeHash || nodeHash === selfNodeHash || members.has(nodeHash)) return
+		members.add(nodeHash)
 		registry.registerScopeInterest(scope, [...members])
 		// 若链路先于"得知其群成员身份"建立（如 warmup/连节点先连上，之后才收到其群 advert/envelope），
 		// onLinkUp 当时因 !members.has 被跳过，这里补发 peer-join，触发 bootstrap flush（member_join 自证推送）。
-		if (registry.getLink(normalized)) notePeerJoin(normalized)
+		if (registry.getLink(nodeHash)) notePeerJoin(nodeHash)
 		scheduleDial()
 	}
 
@@ -143,10 +129,9 @@ export function createGroupLinkSet(options) {
 	 * @returns {{ handler: ((payload: unknown, peerId: string) => void) | null, backlog: Array<{ payload: unknown, peerId: string }> }} action 条目
 	 */
 	function getActionEntry(name) {
-		const key = String(name)
-		if (!actionEntries.has(key))
-			actionEntries.set(key, { handler: null, backlog: [] })
-		return actionEntries.get(key)
+		if (!actionEntries.has(name))
+			actionEntries.set(name, { handler: null, backlog: [] })
+		return actionEntries.get(name)
 	}
 
 	/**
@@ -171,7 +156,7 @@ export function createGroupLinkSet(options) {
 		registry.registerScopeInterest(scope, [...members])
 		registerCleanup(registry.subscribeScope(scope, (senderNodeHash, envelope) => {
 			notePeerCandidate(senderNodeHash)
-			const entry = actionEntries.get(String(envelope?.action || ''))
+			const entry = actionEntries.get(envelope.action)
 			if (entry)
 				if (entry.handler) entry.handler(envelope.payload, senderNodeHash)
 				else entry.backlog.push({ payload: envelope.payload, peerId: senderNodeHash })
@@ -188,13 +173,10 @@ export function createGroupLinkSet(options) {
 			notePeerLeave(nodeHash)
 		}))
 		registerCleanup(await subscribeTopic(topic, async (bytes, meta) => {
-			const packet = decryptSignalPacket(topic, bytes)
-			if (packet?.type !== 'advert' || !packet.body) return
-			const verifiedNodeHash = await verifySignedAdvert(topic, packet.body)
-			if (!verifiedNodeHash || verifiedNodeHash === selfNodeHash) return
-			noteAdvertPeerHints(verifiedNodeHash, packet.body, meta)
+			const ingested = await ingestSignedAdvert(topic, bytes, meta)
+			if (!ingested || ingested.verifiedNodeHash === selfNodeHash) return
 			// 发现新成员：并入成员集并去抖重算稀疏建链目标（notePeerCandidate 内部会 scheduleDial）。
-			notePeerCandidate(verifiedNodeHash)
+			notePeerCandidate(ingested.verifiedNodeHash)
 		}))
 		registerCleanup(await advertiseTopic(topic, encryptSignalPacket(topic, {
 			type: 'advert',
@@ -229,7 +211,7 @@ export function createGroupLinkSet(options) {
 		 * @returns {string | null} 对端 id；无链路时为 null
 		 */
 		getPeerIdByNodeHash(nodeHash) {
-			return registry.getLink(nodeHash) ? String(nodeHash) : null
+			return registry.getLink(nodeHash) ? nodeHash : null
 		},
 		/**
 		 * 向单个 peer 发送 scope action。
@@ -239,7 +221,7 @@ export function createGroupLinkSet(options) {
 		 * @returns {Promise<boolean>} 是否发送成功
 		 */
 		async sendToPeer(peerId, actionName, payload) {
-			return await registry.sendToNodeLink(peerId, { scope, action: String(actionName), payload })
+			return await registry.sendToNodeLink(peerId, { scope, action: actionName, payload })
 		},
 		/**
 		 * 向单个或全部在线成员发送 action。
@@ -252,7 +234,7 @@ export function createGroupLinkSet(options) {
 			if (peerId) return await this.sendToPeer(peerId, actionName, payload) ? 1 : 0
 			let sent = 0
 			for (const { peerId: targetPeerId } of activeRoster())
-				if (await registry.sendToNodeLink(targetPeerId, { scope, action: String(actionName), payload })) sent++
+				if (await registry.sendToNodeLink(targetPeerId, { scope, action: actionName, payload })) sent++
 			return sent
 		},
 		/**
@@ -299,17 +281,16 @@ export function createGroupLinkSet(options) {
 		 * @returns {[(payload: unknown, peerId?: string | string[] | null) => Promise<void>, (handler: (payload: unknown, peerId: string) => void) => void]} send 与 on 函数对
 		 */
 		makeAction(name) {
-			const actionName = String(name)
 			return [
 				async (payload, peerId = null) => {
 					if (Array.isArray(peerId)) {
-						await Promise.all(peerId.map(targetPeerId => this.sendToPeer(targetPeerId, actionName, payload)))
+						await Promise.all(peerId.map(targetPeerId => this.sendToPeer(targetPeerId, name, payload)))
 						return
 					}
-					await this.send(actionName, payload, peerId)
+					await this.send(name, payload, peerId)
 				},
 				handler => {
-					const entry = getActionEntry(actionName)
+					const entry = getActionEntry(name)
 					entry.handler = handler
 					for (const pending of entry.backlog.splice(0))
 						handler(pending.payload, pending.peerId)

package/transport/ice_servers.mjs

@@ -46,7 +46,7 @@ function normalizeIceEntry(raw) {
  * @returns {{ urls: string, username?: string, credential?: string }[]} 合法 ICE 列表
  */
 export function resolveIceServers(groupSettings) {
-	const fromSettings = Array.isArray(groupSettings?.iceServers) ? groupSettings.iceServers : []
+	const fromSettings = groupSettings?.iceServers || []
 	const out = []
 	for (const raw of fromSettings) {
 		const entry = normalizeIceEntry(raw)
@@ -62,7 +62,7 @@ export function resolveIceServers(groupSettings) {
  * @returns {{ urls: string, username?: string, credential?: string }[]} 校验后的 ICE 列表
  */
 export function sanitizeIceServersForSettings(raw) {
-	if (!Array.isArray(raw)) return [...DEFAULT_ICE_SERVERS]
+	if (!raw?.length) return [...DEFAULT_ICE_SERVERS]
 	const out = []
 	for (const item of raw) {
 		const entry = normalizeIceEntry(item)