@steve02081504/fount-p2p 0.0.11 → 0.0.13

package/wire/part_ingress.mjs

@@ -18,7 +18,7 @@ export const pendingPartInvoke = new Map()
 /**
  * @typedef {{
  *   send: (name: string, payload: unknown, peerId: string | null) => void
- *   on: (name: string, handler: (payload: unknown, peerId: string) => void) => void
+ *   on: (name: string, handler: (payload: unknown, peerId: string) => void) => (() => void) | void
  * }} PartWireAdapter
  */
 
@@ -73,35 +73,39 @@ async function dispatchPartInvoke(wireContext, payload) {
  * @param {PartWireContext} wireContext 入站上下文
  * @param {PartWireAdapter} wire Trystero 适配器
  * @param {{ allowPartInvoke?: (payload: object) => boolean }} [options] 入站过滤
- * @returns {void}
+ * @returns {() => void} 取消挂载的 dispose
  */
 export function attachPartWire(wireContext, wire, options = {}) {
-	wire.on('part_timeline_put', data => {
-		if (!isPlainObject(data)) return
-		const partpath = normalizePartpath(data.partpath)
-		if (!partpath) return
-		const message = parsePartTimelinePut(data, partpath)
-		if (!message) return
-		void dispatchDeliveryInbound({
-			replicaUsername: wireContext.replicaUsername,
-			requesterNodeHash: data.nodeHash ? String(data.nodeHash).trim() : null,
-		}, message)
-	})
-
-	wire.on('part_invoke', (data, peerId) => {
-		if (!isPlainObject(data)) return
-		if (options.allowPartInvoke?.(data) === false) return
-		const payload = { ...data, peerId }
-		if (payload.requestId)
-			void handleIncomingPartInvokeRequest(wireContext, payload, wire, peerId)
-		else
-			void handleIncomingPartInvokeFireAndForget(wireContext, payload, wire, peerId)
-	})
-
-	wire.on('part_invoke_response', (data, peerId) => {
-		if (!isPlainObject(data)) return
-		handleIncomingPartInvokeResponse(data, peerId)
-	})
+	const offs = [
+		wire.on('part_timeline_put', data => {
+			if (!isPlainObject(data)) return
+			const partpath = normalizePartpath(data.partpath)
+			if (!partpath) return
+			const message = parsePartTimelinePut(data, partpath)
+			if (!message) return
+			void dispatchDeliveryInbound({
+				replicaUsername: wireContext.replicaUsername,
+				requesterNodeHash: data.nodeHash ? String(data.nodeHash).trim() : null,
+			}, message)
+		}),
+		wire.on('part_invoke', (data, peerId) => {
+			if (!isPlainObject(data)) return
+			if (options.allowPartInvoke?.(data) === false) return
+			const payload = { ...data, peerId }
+			if (payload.requestId)
+				void handleIncomingPartInvokeRequest(wireContext, payload, wire, peerId)
+			else
+				void handleIncomingPartInvokeFireAndForget(wireContext, payload, wire, peerId)
+		}),
+		wire.on('part_invoke_response', (data, peerId) => {
+			if (!isPlainObject(data)) return
+			handleIncomingPartInvokeResponse(data, peerId)
+		}),
+	]
+	return () => {
+		for (const off of offs)
+			try { off?.() } catch { /* ignore */ }
+	}
 }
 
 /**
@@ -116,7 +120,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 +163,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

@@ -9,9 +9,9 @@ import {
 	parsePartQueryReq,
 	parsePartQueryRes,
 } from '../schemas/part_query.mjs'
+import { sendToNodeLink } from '../transport/link_registry.mjs'
 import { buildMergedGraph } from '../trust_graph/build.mjs'
 import { pickTopFromGraph } from '../trust_graph/engine.mjs'
-import { DEFAULT_TRUST_GRAPH_OWNER, requireTrustGraphProvider } from '../trust_graph/registry.mjs'
 import { resolveFederationFanoutTopK } from '../trust_graph/resolve.mjs'
 import trustGraphTunables from '../trust_graph/tunables.json' with { type: 'json' }
 
@@ -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) || []
 }
 
 /**
@@ -211,8 +210,9 @@ async function selectQueryNeighbors(username, exclude, dependencies) {
  * @returns {Promise<boolean>} 是否发出
  */
 async function deliverQuery(username, nodeHash, action, payload, dependencies) {
+	void username
 	if (dependencies.deliver) return Boolean(await dependencies.deliver(nodeHash, action, payload))
-	return requireTrustGraphProvider(DEFAULT_TRUST_GRAPH_OWNER).sendToNode(username, nodeHash, action, payload)
+	return sendToNodeLink(nodeHash, { scope: 'node', action, payload })
 }
 
 /**
@@ -327,27 +327,32 @@ async function processIncomingRequest(wireContext, wire, request, peerId, depend
  * @param {{ replicaUsername?: string }} wireContext 入站上下文
  * @param {PartWireAdapter} wire wire
  * @param {PartQueryDependencies} [dependencies] 可注入依赖（含 per-node state）
- * @returns {void}
+ * @returns {() => void} 取消挂载的 dispose
  */
 export function attachPartQueryWire(wireContext, wire, dependencies = {}) {
 	const state = resolveState(dependencies)
-	wire.on('part_query_req', (data, peerId) => {
-		if (!isPlainObject(data)) return
-		const request = parsePartQueryReq(data)
-		if (!request) return
-		if (!state.takeDedupe(request.requestId)) return
-		const source = String(peerId || request.originNodeHash || '').trim().toLowerCase()
-		if (source && !consumeWireRateBucket(`part_query:${source}`, {
-			maxCount: partQueryTunables.ratePerSourcePerMin,
-		})) return
-		void processIncomingRequest(wireContext, wire, request, String(peerId || ''), dependencies)
-	})
-
-	wire.on('part_query_res', (data, peerId) => {
-		const response = parsePartQueryRes(data)
-		if (!response) return
-		handleIncomingPartQueryResponse(response, String(peerId || ''), dependencies)
-	})
+	const offs = [
+		wire.on('part_query_req', (data, peerId) => {
+			if (!isPlainObject(data)) return
+			const request = parsePartQueryReq(data)
+			if (!request) return
+			if (!state.takeDedupe(request.requestId)) return
+			const source = String(peerId || request.originNodeHash || '').trim().toLowerCase()
+			if (source && !consumeWireRateBucket(`part_query:${source}`, {
+				maxCount: partQueryTunables.ratePerSourcePerMin,
+			})) return
+			void processIncomingRequest(wireContext, wire, request, String(peerId || ''), dependencies)
+		}),
+		wire.on('part_query_res', (data, peerId) => {
+			const response = parsePartQueryRes(data)
+			if (!response) return
+			handleIncomingPartQueryResponse(response, String(peerId || ''), dependencies)
+		}),
+	]
+	return () => {
+		for (const off of offs)
+			try { off?.() } catch { /* ignore */ }
+	}
 }
 
 /**

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
 }
 

package/discovery/mdns.mjs

@@ -1,191 +0,0 @@
-import { Buffer } from 'node:buffer'
-import dgram from 'node:dgram'
-
-const DEFAULT_PORT = 53531
-const DEFAULT_GROUP = '239.255.42.99'
-
-/**
- * 轻量 multicast 发现插件：不做完整 DNS-SD，只复用 mDNS 的 LAN multicast 发现思路。
- * 引用计数为 0 时关闭 UDP socket，避免 shutdown 后句柄拖住进程。
- *
- * @param {{ port?: number, group?: string }} [options] 组播端口与组地址
- * @returns {import('./index.mjs').DiscoveryProvider} mDNS 发现提供者
- */
-export function createMdnsDiscoveryProvider(options = {}) {
-	const port = Number(options.port) || DEFAULT_PORT
-	const group = String(options.group || DEFAULT_GROUP)
-	/** @type {import('node:dgram').Socket | null} */
-	let socket = null
-	let bound = false
-	let bindPromise = null
-	let refs = 0
-	/** @type {Map<string, Set<Function>>} */
-	const advertListeners = new Map()
-	/** @type {Map<string, Set<Function>>} */
-	const signalListeners = new Map()
-
-	/**
-	 * 懒创建或返回当前 UDP socket。
-	 * @returns {import('node:dgram').Socket} 用于组播 bind/send 的 socket
-	 */
-	function getSocket() {
-		return socket ||= dgram.createSocket({ type: 'udp4', reuseAddr: true })
-	}
-
-	/**
-	 * 绑定 UDP socket 并注册组播消息处理器。
-	 * @returns {Promise<void>}
-	 */
-	async function ensureBound() {
-		if (bound) return
-		if (!bindPromise)
-			bindPromise = (async () => {
-				const sock = getSocket()
-				await new Promise((resolve, reject) => {
-					sock.once('error', reject)
-					sock.bind(port, '0.0.0.0', () => {
-						sock.off('error', reject)
-						sock.addMembership(group)
-						sock.setMulticastTTL(1)
-						resolve()
-					})
-				})
-				// acquire 已全部释放：关掉刚 bind 的 socket，避免泄漏句柄。
-				if (refs <= 0) {
-					try { sock.close() } catch { /* ignore */ }
-					if (socket === sock) socket = null
-					bound = false
-					return
-				}
-				sock.on('message', (raw, rinfo) => {
-					let packet
-					try { packet = JSON.parse(String(raw)) } catch { return }
-					const listeners = packet.type === 'advert'
-						? advertListeners.get(String(packet.topic || ''))
-						: signalListeners.get(String(packet.topic || ''))
-					if (!listeners?.size) return
-					const bytes = Uint8Array.from(Buffer.from(String(packet.data || ''), 'base64'))
-					const meta = {
-						provider: 'mdns',
-						address: String(rinfo?.address || ''),
-					}
-					for (const listener of listeners)
-						listener(bytes, meta)
-				})
-				bound = true
-			})()
-				.finally(() => {
-					if (!bound) bindPromise = null
-				})
-		await bindPromise
-	}
-
-	/**
-	 * 向组播组发送 advert 或 signal 包。
-	 * @param {'advert' | 'signal'} type 包类型
-	 * @param {string} topic topic 名称
-	 * @param {Uint8Array} bytes 载荷字节
-	 * @returns {Promise<void>}
-	 */
-	async function multicast(type, topic, bytes) {
-		await ensureBound()
-		const sock = getSocket()
-		const packet = Buffer.from(JSON.stringify({
-			type,
-			topic,
-			data: Buffer.from(bytes).toString('base64'),
-		}))
-		await new Promise((resolve, reject) => {
-			sock.send(packet, port, group, error => error ? reject(error) : resolve())
-		})
-	}
-
-	/**
-	 * 占用 socket；归还后若无引用则关闭。
-	 * @returns {() => void} 释放函数
-	 */
-	function acquire() {
-		refs++
-		void ensureBound().catch(() => { })
-		return () => {
-			refs = Math.max(0, refs - 1)
-			if (refs > 0 || !socket) return
-			try { socket.close() } catch { /* ignore */ }
-			socket = null
-			bound = false
-			bindPromise = null
-		}
-	}
-
-	/**
-	 * 向 topic bucket 注册监听器。
-	 * @param {Map<string, Set<Function>>} bucket topic → 监听器集合
-	 * @param {string} topic 订阅 topic
-	 * @param {Function} listener 回调函数
-	 * @returns {() => void} 取消订阅函数
-	 */
-	function addListener(bucket, topic, listener) {
-		if (!bucket.has(topic)) bucket.set(topic, new Set())
-		bucket.get(topic).add(listener)
-		const release = acquire()
-		return () => {
-			bucket.get(topic)?.delete(listener)
-			release()
-		}
-	}
-
-	return {
-		id: 'mdns',
-		priority: 10,
-		caps: { canDiscover: true, canSignal: true, canRelay: false },
-		/**
-		 * 周期性组播广播 advert（首发后台，不阻塞调用方）。
-		 * @param {string} topic advert 主题
-		 * @param {Uint8Array} bytes advert 载荷
-		 * @returns {Promise<() => void>} 取消广播函数
-		 */
-		async advertise(topic, bytes) {
-			const release = acquire()
-			void multicast('advert', topic, bytes).catch(() => { })
-			const timer = setInterval(() => { void multicast('advert', topic, bytes).catch(() => { }) }, 30_000)
-			return () => {
-				clearInterval(timer)
-				release()
-			}
-		},
-		/**
-		 * 订阅组播 advert（立即返回；UDP bind 后台完成）。
-		 * @param {string} topic advert 主题
-		 * @param {Function} onAdvert advert 回调
-		 * @returns {Promise<() => void>} 取消订阅函数
-		 */
-		async subscribe(topic, onAdvert) {
-			return addListener(advertListeners, topic, onAdvert)
-		},
-		/**
-		 * 组播发送信令（忽略单播目标）。
-		 * @param {string} topic 信令 topic
-		 * @param {string} _to 目标标识（未使用）
-		 * @param {Uint8Array} bytes 信令载荷
-		 * @returns {Promise<void>}
-		 */
-		async sendSignal(topic, _to, bytes) {
-			const release = acquire()
-			try {
-				await multicast('signal', topic, bytes)
-			}
-			finally {
-				release()
-			}
-		},
-		/**
-		 * 订阅组播信令（立即返回；UDP bind 后台完成）。
-		 * @param {string} topic 信令 topic
-		 * @param {Function} onSignal 信令回调
-		 * @returns {Promise<() => void>} 取消订阅函数
-		 */
-		async onSignal(topic, onSignal) {
-			return addListener(signalListeners, topic, onSignal)
-		},
-	}
-}

package/transport/signal_crypto.mjs

@@ -1,82 +0,0 @@
-import { Buffer } from 'node:buffer'
-import { createCipheriv, createDecipheriv, createHash, randomBytes } from 'node:crypto'
-
-import { normalizeHex64 } from '../core/hexIds.mjs'
-import { sha256Hex } from '../crypto/crypto.mjs'
-
-const SIGNAL_DOMAIN = 'fount-signal'
-const NODE_TOPIC_DOMAIN = 'fount-rdv-node:'
-const GROUP_TOPIC_DOMAIN = 'fount-rdv-group:'
-
-/**
- * 由 nodeHash 派生节点 rendezvous topic。
- * @param {string} nodeHash 节点 64 hex
- * @returns {string} rendezvous topic 哈希
- */
-export function nodeRendezvousTopic(nodeHash) {
-	return sha256Hex(`${NODE_TOPIC_DOMAIN}${normalizeHex64(nodeHash)}`)
-}
-
-/**
- * 由房间密钥派生群组 rendezvous topic。
- * @param {string} roomSecret 房间密钥
- * @returns {string} rendezvous topic 哈希
- */
-export function groupRendezvousTopic(roomSecret) {
-	return sha256Hex(`${GROUP_TOPIC_DOMAIN}${String(roomSecret || '')}`)
-}
-
-/**
- * 由 topic 派生信令 AES 密钥。
- * @param {string} topic rendezvous 主题
- * @returns {Buffer} AES-256 密钥
- */
-function signalKeyForTopic(topic) {
-	return createHash('sha256').update(`${SIGNAL_DOMAIN}:${String(topic)}`).digest()
-}
-
-/**
- * 加密信令包为 AES-GCM 字节序列。
- * @param {string} topic rendezvous 主题
- * @param {unknown} packet 待加密 JSON 对象
- * @returns {Uint8Array} 加密后的字节
- */
-export function encryptSignalPacket(topic, packet) {
-	const iv = randomBytes(12)
-	const cipher = createCipheriv('aes-256-gcm', signalKeyForTopic(topic), iv)
-	const ciphertext = Buffer.concat([
-		cipher.update(Buffer.from(JSON.stringify(packet), 'utf8')),
-		cipher.final(),
-	])
-	return Buffer.from(JSON.stringify({
-		iv: iv.toString('base64'),
-		authTag: cipher.getAuthTag().toString('base64'),
-		ciphertext: ciphertext.toString('base64'),
-	}))
-}
-
-/**
- * 解密信令包；失败时返回 null。
- * @param {string} topic rendezvous 主题
- * @param {Uint8Array} bytes 加密字节
- * @returns {object | null} 解密后的 JSON 对象
- */
-export function decryptSignalPacket(topic, bytes) {
-	try {
-		const payload = JSON.parse(Buffer.from(bytes).toString('utf8'))
-		const decipher = createDecipheriv(
-			'aes-256-gcm',
-			signalKeyForTopic(topic),
-			Buffer.from(payload.iv, 'base64'),
-		)
-		decipher.setAuthTag(Buffer.from(payload.authTag, 'base64'))
-		const plain = Buffer.concat([
-			decipher.update(Buffer.from(payload.ciphertext, 'base64')),
-			decipher.final(),
-		])
-		return JSON.parse(plain.toString('utf8'))
-	}
-	catch {
-		return null
-	}
-}