@steve02081504/fount-p2p 0.0.12 → 0.0.13

package/node/signaling_config.mjs

@@ -1,32 +1,51 @@
 import process from 'node:process'
 
-/** @typedef {'none' | 'rewrite-loopback' | 'drop'} MdnsCandidatePolicy */
+/** @typedef {'none' | 'rewrite-loopback' | 'drop'} IceLocalHostnamePolicy */
 
 /**
  * @typedef {{
  *   relayOverride: string[] | null
- *   mdnsPolicy: MdnsCandidatePolicy
+ *   iceLocalHostnamePolicy: IceLocalHostnamePolicy
  *   trickleIceOff: boolean
  * }} SignalingRuntimeConfig
  */
 
+const ICE_LOCAL_HOSTNAME_POLICIES = new Set(['none', 'rewrite-loopback', 'drop'])
+
 /**
- * 生产默认：win32 丢弃 .local host candidate；其它平台不过滤。
- * @returns {SignalingRuntimeConfig} 生产默认信令配置
+ * 生产默认：win32 丢弃 `.local` host candidate；其它平台不过滤。
+ * @returns {SignalingRuntimeConfig} 默认信令运行时配置
  */
 export function defaultSignalingRuntimeConfig() {
-	const mdnsPolicy = process.platform === 'win32' ? 'drop' : 'none'
+	const iceLocalHostnamePolicy = process.platform === 'win32' ? 'drop' : 'none'
 	return {
 		relayOverride: null,
-		mdnsPolicy,
-		trickleIceOff: mdnsPolicy !== 'none',
+		iceLocalHostnamePolicy,
+		trickleIceOff: iceLocalHostnamePolicy !== 'none',
 	}
 }
 
 /**
- * 生产默认信令配置；测试通过 initNode({ signaling }) 注入。
- * @returns {SignalingRuntimeConfig} 生产默认信令配置
+ * @param {Partial<SignalingRuntimeConfig>} [patch] 合并字段
+ * @returns {SignalingRuntimeConfig} 合并后的信令运行时配置
  */
-export function resolveSignalingRuntimeConfig() {
-	return defaultSignalingRuntimeConfig()
+export function resolveSignalingRuntimeConfig(patch = {}) {
+	const base = defaultSignalingRuntimeConfig()
+	if (!patch || typeof patch !== 'object') return base
+	const policyRaw = patch.iceLocalHostnamePolicy
+	const iceLocalHostnamePolicy = ICE_LOCAL_HOSTNAME_POLICIES.has(/** @type {string} */ policyRaw)
+		? /** @type {IceLocalHostnamePolicy} */ policyRaw
+		: base.iceLocalHostnamePolicy
+	let { relayOverride } = base
+	if (Object.prototype.hasOwnProperty.call(patch, 'relayOverride'))
+		relayOverride = patch.relayOverride == null
+			? null
+			: [...new Set((Array.isArray(patch.relayOverride) ? patch.relayOverride : [])
+				.map(url => String(url || '').trim())
+				.filter(url => url.startsWith('wss://')))]
+	return {
+		relayOverride,
+		iceLocalHostnamePolicy,
+		trickleIceOff: patch.trickleIceOff !== undefined ? !!patch.trickleIceOff : iceLocalHostnamePolicy !== 'none',
+	}
 }

package/overlay/index.mjs

@@ -6,6 +6,26 @@ import { createLruMap } from '../utils/lru.mjs'
 
 const ROUTE_DOMAIN = 'fount-route'
 
+/** @type {((senderNodeHash: string, action: string) => boolean) | null} */
+let overlayRateGate = null
+
+/**
+ * 安装 overlay 入站限速门（返回 false 则丢弃）。
+ * @param {((senderNodeHash: string, action: string) => boolean) | null} rateGate 返回 false 则丢弃
+ * @returns {void}
+ */
+export function setOverlayRateGate(rateGate) {
+	overlayRateGate = typeof rateGate === 'function' ? rateGate : null
+}
+
+/**
+ * 清除 overlay 限速门。
+ * @returns {void}
+ */
+export function clearOverlayRateGate() {
+	overlayRateGate = null
+}
+
 /**
  * 构造 overlay 路由签名用的字节序列。
  * @param {string} reqId 路由请求 id
@@ -27,7 +47,7 @@ export function createOverlayRouter(registry, ttl = 3) {
 	const selfPubKey = registry.localIdentity.nodePubKey
 	const { secretKey } = registry.localIdentity
 	const seenReqs = createLruMap(4096)
-	/** @type {Map<string, { resolve: (path: string[]) => void, reject: (err: Error) => void, timer: number }>} */
+	/** @type {Map<string, { resolve: (path: string[]) => void, reject: (error: Error) => void, timer: number }>} */
 	const pendingRoutes = new Map()
 	/** @type {Set<(body: unknown, meta: { path: string[], from: string }) => void>} */
 	const relayListeners = new Set()
@@ -52,6 +72,7 @@ export function createOverlayRouter(registry, ttl = 3) {
 		const payload = envelope?.payload
 		const action = envelope?.action || ''
 		if (!payload) return
+		if (overlayRateGate && !overlayRateGate(senderNodeHash, action)) return
 		if (action === 'route_req') {
 			const reqId = payload.reqId || ''
 			const target = payload.target || ''

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@steve02081504/fount-p2p",
-	"version": "0.0.12",
+	"version": "0.0.13",
 	"description": "fount federation P2P layer — link, trust graph, mailbox, DAG, EVFS.",
 	"keywords": [
 		"network",
@@ -30,8 +30,13 @@
 		"!sim/**",
 		"!scripts/**"
 	],
+	"bin": {
+		"fount-p2p": "./infra/cli.mjs"
+	},
 	"exports": {
 		".": "./index.mjs",
+		"./infra": "./infra/service.mjs",
+		"./link": "./link/providers/index.mjs",
 		"./core/*": "./core/*.mjs",
 		"./crypto": "./crypto/crypto.mjs",
 		"./crypto/*": "./crypto/*.mjs",
@@ -42,7 +47,12 @@
 		"./discovery/bt": "./discovery/bt/index.mjs",
 		"./discovery/bt/*": "./discovery/bt/*.mjs",
 		"./discovery/*": "./discovery/*.mjs",
-		"./transport/*": "./transport/*.mjs",
+		"./transport/link_registry": "./transport/link_registry.mjs",
+		"./transport/user_room": "./transport/user_room.mjs",
+		"./transport/group_link_set": "./transport/group_link_set.mjs",
+		"./transport/node_scope": "./transport/node_scope.mjs",
+		"./transport/room_scopes": "./transport/room_scopes.mjs",
+		"./transport/remote_user_room": "./transport/remote_user_room.mjs",
 		"./rooms/*": "./rooms/*.mjs",
 		"./overlay": "./overlay/index.mjs",
 		"./overlay/*": "./overlay/*.mjs",
@@ -62,6 +72,7 @@
 	"dependencies": {
 		"@noble/curves": "latest",
 		"node-datachannel": "latest",
+		"on-shutdown": "latest",
 		"ws": "latest"
 	},
 	"devDependencies": {

package/rooms/scoped_link.mjs

@@ -1,171 +1,22 @@
-import { advertiseTopic, subscribeTopic } from '../discovery/index.mjs'
-import { ingestSignedAdvert } from '../transport/advert_ingest.mjs'
-import { getLinkRegistry } from '../transport/link_registry.mjs'
-import {
-	encryptSignalPacket,
-	groupRendezvousTopic,
-} from '../transport/signal_crypto.mjs'
-import { emitSafe } from '../utils/emit_safe.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 } = options
-	const topic = groupRendezvousTopic(options.roomSecret)
-	const allowNode = 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 {string} peerId 节点 hash
-	 * @returns {void}
-	 */
-	function notePeerJoin(peerId) {
-		if (!peerId || announcedPeers.has(peerId)) return
-		announcedPeers.add(peerId)
-		emitSafe(joinListeners, peerId)
-	}
-
-	/**
-	 * @param {string} peerId 节点 hash
-	 * @returns {void}
-	 */
-	function notePeerLeave(peerId) {
-		if (!peerId || !announcedPeers.has(peerId)) return
-		announcedPeers.delete(peerId)
-		emitSafe(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) {
-		if (!actionEntries.has(name))
-			actionEntries.set(name, { handler: null, backlog: [] })
-		return actionEntries.get(name)
-	}
-
-	return {
-		/**
-		 * @returns {Promise<void>}
-		 */
-		async start() {
-			await registry.ensureRuntime()
-			cleanups.add(registry.subscribeScope(scope, (senderNodeHash, envelope) => {
-				if (!allowNode(senderNodeHash)) return
-				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 })
-			}))
-			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 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',
-				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) {
-			return [
-				async (payload, peerId = null) => {
-					if (Array.isArray(peerId)) {
-						await Promise.all(peerId.map(targetPeerId =>
-							registry.sendToNodeLink(targetPeerId, { scope, action: name, payload })))
-						return
-					}
-					if (peerId)
-						await registry.sendToNodeLink(peerId, { scope, action: name, payload })
-					else
-						await Promise.all(activePeerIds().map(targetPeerId =>
-							registry.sendToNodeLink(targetPeerId, { scope, action: name, payload })))
-				},
-				handler => {
-					const entry = getActionEntry(name)
-					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/transport/advert_ingest.mjs

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