@steve02081504/fount-p2p 0.0.11 → 0.0.13

package/rooms/scoped_link.mjs

@@ -1,187 +1,22 @@
-import { noteAdvertPeerHints } from '../discovery/advert_peer_hints.mjs'
-import { advertiseTopic, subscribeTopic } from '../discovery/index.mjs'
-import { verifySignedAdvert } from '../link/handshake.mjs'
-import { getLinkRegistry } from '../transport/link_registry.mjs'
-import {
-	decryptSignalPacket,
-	encryptSignalPacket,
-	groupRendezvousTopic,
-} from '../transport/signal_crypto.mjs'
+import { createGroupLinkSet } from '../transport/group_link_set.mjs'
 
 /**
- * 在指定 scope 与 roomSecret 下创建 link 层房间（discovery + registry 转发）。
- * @param {object} options 房间选项
- * @param {string} options.scope link registry scope（如 `group:{id}`）
- * @param {string} options.roomSecret 房间 rendezvous 密钥
- * @param {(nodeHash: string) => boolean} [options.allowNode] 是否允许与某 nodeHash 通信
- * @returns {{ start: () => Promise<void>, leave: () => Promise<void>, makeAction: (name: string) => [(payload: unknown, peerId?: string | string[] | null) => Promise<void>, (handler: (payload: unknown, peerId: string) => void) => void], onPeerJoin: (callback: (peerId: string) => void) => () => void, onPeerLeave: (callback: (peerId: string) => void) => () => void, getPeers: () => Record<string, true> }} 房间句柄
+ * scoped 房间：group_link_set 的薄预设（任意 scope + allowNode + 发现即拨）。
+ * @param {object} options - 房间选项
+ * @param {string} options.scope - link registry scope
+ * @param {string} options.roomSecret - rendezvous 密钥
+ * @param {(nodeHash: string) => boolean} [options.allowNode] - 节点准入过滤
+ * @returns {ReturnType<typeof createGroupLinkSet>} scoped link 房间句柄
  */
 export function createScopedLinkRoom(options) {
-	const registry = getLinkRegistry()
-	const scope = String(options.scope)
-	const topic = groupRendezvousTopic(options.roomSecret)
-	const allowNode = typeof options.allowNode === 'function' ? options.allowNode : () => true
-	/** @type {Set<string>} */
-	const discoveredPeers = new Set()
-	/** @type {Set<string>} */
-	const announcedPeers = new Set()
-	/** @type {Set<(peerId: string) => void>} */
-	const joinListeners = new Set()
-	/** @type {Set<(peerId: string) => void>} */
-	const leaveListeners = new Set()
-	/** @type {Set<() => void>} */
-	const cleanups = new Set()
-	/** @type {Map<string, { handler: ((payload: unknown, peerId: string) => void) | null, backlog: Array<{ payload: unknown, peerId: string }> }>} */
-	const actionEntries = new Map()
-
-	/**
-	 * @returns {string[]} 当前已连接且通过 allowNode 过滤的 peer nodeHash 列表
-	 */
-	function activePeerIds() {
-		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}
-	 */
-	function notePeerJoin(peerId) {
-		if (!peerId || announcedPeers.has(peerId)) return
-		announcedPeers.add(peerId)
-		emit(joinListeners, peerId)
-	}
-
-	/**
-	 * @param {string} peerId 节点 hash
-	 * @returns {void}
-	 */
-	function notePeerLeave(peerId) {
-		if (!peerId || !announcedPeers.has(peerId)) return
-		announcedPeers.delete(peerId)
-		emit(leaveListeners, peerId)
-	}
-
-	/**
-	 * @param {string} name action 名称
-	 * @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)
-	}
-
-	return {
-		/**
-		 * @returns {Promise<void>}
-		 */
-		async start() {
-			await registry.ensureRuntime()
-			cleanups.add(registry.subscribeScope(scope, (senderNodeHash, envelope) => {
-				if (!allowNode(senderNodeHash)) return
-				const entry = actionEntries.get(String(envelope?.action || ''))
-				if (!entry) return
-				if (entry.handler) entry.handler(envelope.payload, senderNodeHash)
-				else entry.backlog.push({ payload: envelope.payload, peerId: senderNodeHash })
-			}))
-			cleanups.add(registry.onLinkUp(nodeHash => {
-				if (!discoveredPeers.has(nodeHash) || !allowNode(nodeHash)) return
-				notePeerJoin(nodeHash)
-			}))
-			cleanups.add(registry.onLinkDown(nodeHash => {
-				if (!discoveredPeers.has(nodeHash)) return
-				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)
-			}))
-			cleanups.add(await advertiseTopic(topic, encryptSignalPacket(topic, {
-				type: 'advert',
-				body: await registry.buildLocalAdvert(topic),
-			})))
-			for (const peerId of activePeerIds())
-				notePeerJoin(peerId)
-		},
-		/**
-		 * @returns {Promise<void>}
-		 */
-		async leave() {
-			for (const cleanup of cleanups)
-				try { cleanup() } catch { /* ignore */ }
-			cleanups.clear()
-			for (const peerId of [...announcedPeers])
-				notePeerLeave(peerId)
-		},
-		/**
-		 * @param {string} name action 名称
-		 * @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 })))
-						return
-					}
-					if (peerId)
-						await registry.sendToNodeLink(peerId, { scope, action: actionName, payload })
-					else
-						await Promise.all(activePeerIds().map(targetPeerId =>
-							registry.sendToNodeLink(targetPeerId, { scope, action: actionName, payload })))
-				},
-				handler => {
-					const entry = getActionEntry(actionName)
-					entry.handler = handler
-					for (const pending of entry.backlog.splice(0))
-						handler(pending.payload, pending.peerId)
-				},
-			]
-		},
-		/**
-		 * @param {(peerId: string) => void} callback 新 peer 上线回调
-		 * @returns {() => void} 取消订阅
-		 */
-		onPeerJoin(callback) {
-			joinListeners.add(callback)
-			for (const peerId of activePeerIds())
-				announcedPeers.add(peerId)
-			for (const peerId of announcedPeers)
-				try { callback(peerId) } catch { /* ignore */ }
-			return () => joinListeners.delete(callback)
-		},
-		/**
-		 * @param {(peerId: string) => void} callback peer 离线回调
-		 * @returns {() => void} 取消订阅
-		 */
-		onPeerLeave(callback) {
-			leaveListeners.add(callback)
-			return () => leaveListeners.delete(callback)
-		},
-		/**
-		 * @returns {Record<string, true>} 当前活跃 peer 的 nodeHash 集合
-		 */
-		getPeers() {
-			return Object.fromEntries(activePeerIds().map(peerId => [peerId, true]))
-		},
-	}
+	const { scope, roomSecret, allowNode } = options
+	return createGroupLinkSet({
+		groupId: scope,
+		scope,
+		roomSecret,
+		members: [],
+		allowNode,
+		dialAll: true,
+		autoconnect: true,
+	})
 }

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,17 @@
+import { noteAdvertPeerHints } from '../discovery/advert_peer_hints.mjs'
+
+/**
+ * 解密并验签 advert（`ingestEncryptedAdvert` 别名）。不写 peer hints；写入需 `applyAdvertPeerHints`。Untrusted ingress。
+ */
+export { ingestEncryptedAdvert as ingestSignedAdvert } from '../discovery/adverts.mjs'
+
+/**
+ * 将已验签 advert 的 peer hints 写入本地（apply 侧；与 `ingestSignedAdvert` 分离）。
+ * @param {string} verifiedNodeHash 已验签 nodeHash
+ * @param {object} body advert body
+ * @param {object} [meta] 元数据
+ * @returns {void}
+ */
+export function applyAdvertPeerHints(verifiedNodeHash, body, meta) {
+	noteAdvertPeerHints(verifiedNodeHash, body, meta)
+}