@steve02081504/fount-p2p 0.0.13 → 0.0.15

package/discovery/peer_clue.mjs

@@ -0,0 +1,23 @@
+import { normalizeHex64 } from '../core/hexIds.mjs'
+
+/** @type {((nodeHash: string) => void) | null} */
+let peerClueListener = null
+
+/**
+ * 由 link registry 注入：peer 首次可见时清 dial 冷却。
+ * @param {((nodeHash: string) => void) | null} listener 回调
+ * @returns {void}
+ */
+export function setDiscoveryPeerClueListener(listener) {
+	peerClueListener = listener
+}
+
+/**
+ * discovery accept 路径：peer 首次进入可见池时通知 registry。
+ * @param {string} nodeHash 对端
+ * @returns {void}
+ */
+export function noteDiscoveryPeerClue(nodeHash) {
+	const hash = normalizeHex64(nodeHash)
+	if (hash) peerClueListener?.(hash)
+}

package/link/handshake.mjs

@@ -4,6 +4,7 @@ import { randomBytes } from 'node:crypto'
 import { isHex64, normalizeHex64 } from '../core/hexIds.mjs'
 import { normalizeTcpPort } from '../core/tcp_port.mjs'
 import { keyPairFromSeed, pubKeyHash, sign, verify } from '../crypto/crypto.mjs'
+import { normalizeLanHosts } from '../discovery/lan_interfaces.mjs'
 import { ensureNodeSeed, getNodeHash } from '../node/identity.mjs'
 
 import { normalizeDtlsFingerprint } from './sdp_fingerprint.mjs'
@@ -139,20 +140,24 @@ export async function verifyAuth(hello, auth, expectedNonce, remoteBinding) {
  * @param {number} ts 时间戳（毫秒）
  * @param {string} nodeHash 节点 nodeHash
  * @param {number | null} [tcpPort=null] 可选 LAN TCP 监听端口（签入消息）
+ * @param {unknown} [lanHosts=null] 可选 LAN IPv4 列表（签入消息）
  * @returns {Uint8Array} 待签名消息字节
  */
-export function buildAdvertMessage(rendezvousKey, ts, nodeHash, tcpPort = null) {
+export function buildAdvertMessage(rendezvousKey, ts, nodeHash, tcpPort = null, lanHosts = null) {
 	const base = `fount-advert\0${String(rendezvousKey)}\0${String(ts)}\0${normalizeHex64(nodeHash)}`
 	const port = normalizeTcpPort(tcpPort)
-	return Buffer.from(port ? `${base}\0${port}` : base, 'utf8')
+	let message = port ? `${base}\0${port}` : base
+	const hosts = normalizeLanHosts(lanHosts)
+	if (hosts.length) message += `\0${hosts.join(',')}`
+	return Buffer.from(message, 'utf8')
 }
 
 /**
- * 构造带签名的 discovery advert。
+ * 构造带签名的 discovery advert（tcpPort / lanHosts 一并签入消息）。
  * @param {string} rendezvousKey discovery 内部汇合键
  * @param {number} [ts=Date.now()] 时间戳（毫秒）
- * @param {{ secretKey?: Uint8Array, nodeHash?: string, nodePubKey?: string, tcpPort?: number } | null} [options] 签名身份与可选 tcpPort
- * @returns {Promise<{ nodeHash: string, nodePubKey: string, ts: number, sig: string, tcpPort?: number }>} 签名 advert
+ * @param {{ secretKey?: Uint8Array, nodeHash?: string, nodePubKey?: string, tcpPort?: number, lanHosts?: unknown } | null} [options] 签名身份；可选 LAN 监听端口与本机 IPv4 列表
+ * @returns {Promise<{ nodeHash: string, nodePubKey: string, ts: number, sig: string, tcpPort?: number, lanHosts?: string[] }>} 签名 advert
  */
 export async function buildSignedAdvert(rendezvousKey, ts = Date.now(), options = null) {
 	const seed = options?.secretKey
@@ -166,7 +171,8 @@ export async function buildSignedAdvert(rendezvousKey, ts = Date.now(), options
 	const tcpPort = normalizeTcpPort(options?.tcpPort)
 	if (options?.tcpPort && !tcpPort)
 		throw new Error('p2p: advert tcpPort invalid')
-	const message = buildAdvertMessage(rendezvousKey, ts, nodeHash, tcpPort)
+	const lanHosts = normalizeLanHosts(options?.lanHosts)
+	const message = buildAdvertMessage(rendezvousKey, ts, nodeHash, tcpPort, lanHosts)
 	const sig = await sign(message, secretKey)
 	const advert = {
 		nodeHash,
@@ -175,6 +181,7 @@ export async function buildSignedAdvert(rendezvousKey, ts = Date.now(), options
 		sig: Buffer.from(sig).toString('hex'),
 	}
 	if (tcpPort) advert.tcpPort = tcpPort
+	if (lanHosts.length) advert.lanHosts = lanHosts
 	return advert
 }
 
@@ -195,7 +202,8 @@ export async function verifySignedAdvert(rendezvousKey, advert, now = Date.now()
 	const hasTcpPortField = !!advert?.tcpPort
 	const tcpPort = normalizeTcpPort(advert?.tcpPort)
 	if (hasTcpPortField && !tcpPort) return null
-	const message = buildAdvertMessage(rendezvousKey, ts, parsedHello.nodeHash, tcpPort)
+	const lanHosts = normalizeLanHosts(advert?.lanHosts)
+	const message = buildAdvertMessage(rendezvousKey, ts, parsedHello.nodeHash, tcpPort, lanHosts)
 	const ok = await verify(Buffer.from(sig, 'hex'), message, Buffer.from(parsedHello.nodePubKey, 'hex'))
 	return ok ? parsedHello.nodeHash : null
 }

package/link/providers/lan_tcp.mjs

@@ -3,13 +3,50 @@ import { randomBytes } from 'node:crypto'
 import net from 'node:net'
 
 import { normalizeHex64 } from '../../core/hexIds.mjs'
-import { getLanPeerHint } from '../../discovery/lan_peer_hints.mjs'
+import { getLanPeerHint, listLanPeerHints } from '../../discovery/lan_peer_hints.mjs'
 import { asLinkHandle } from '../pipe.mjs'
 
 import { LINK_LEVEL_LAN_TCP } from './levels.mjs'
 import { buildLinkOpen, createLinkIdBoundPipe, parseLinkOpen } from './link_id_pipe.mjs'
 
 const MAX_FRAME_BYTES = 1 << 20
+/** LAN TCP 单 endpoint 连接超时。 */
+const LAN_TCP_CONNECT_TIMEOUT_MS = 3_000
+
+/**
+ * @param {string} host 目标 host
+ * @param {number} port 目标 port
+ * @param {number} [timeoutMs=LAN_TCP_CONNECT_TIMEOUT_MS] 超时
+ * @returns {Promise<import('node:net').Socket>} 已连接 socket
+ */
+function connectTcp(host, port, timeoutMs = LAN_TCP_CONNECT_TIMEOUT_MS) {
+	return new Promise((resolve, reject) => {
+		const conn = net.createConnection({ host, port })
+		const timer = setTimeout(() => {
+			conn.destroy()
+			reject(new Error(`p2p: lan_tcp connect timeout ${host}:${port}`))
+		}, timeoutMs)
+		/**
+		 * @param {Error} error 连接错误
+		 * @returns {void}
+		 */
+		const onError = error => {
+			clearTimeout(timer)
+			conn.off('connect', onConnect)
+			reject(error)
+		}
+		/**
+		 * @returns {void}
+		 */
+		function onConnect() {
+			clearTimeout(timer)
+			conn.off('error', onError)
+			resolve(conn)
+		}
+		conn.once('error', onError)
+		conn.once('connect', onConnect)
+	})
+}
 
 /**
  * 在 socket 上挂 length-prefix 编解码（u32be + payload）。
@@ -168,41 +205,33 @@ async function openTcpPipe(options) {
  */
 async function dialLanTcp(options) {
 	const remoteNodeHash = normalizeHex64(options.nodeHash)
-	const hint = getLanPeerHint(remoteNodeHash)
-	if (!hint) throw new Error('p2p: lan_tcp no peer hint')
+	const hints = listLanPeerHints(remoteNodeHash)
+	if (!hints.length) throw new Error('p2p: lan_tcp no peer hint')
 
-	const socket = await new Promise((resolve, reject) => {
-		const conn = net.createConnection({ host: hint.host, port: hint.port })
-		/**
-		 * @param {Error} error 连接错误
-		 * @returns {void}
-		 */
-		const onError = error => {
-			conn.off('connect', onConnect)
-			reject(error)
+	let lastError = null
+	for (const hint of hints) {
+		/** @type {import('node:net').Socket | null} */
+		let socket = null
+		try {
+			socket = await connectTcp(hint.host, hint.port)
+			const link = await openTcpPipe({
+				initiator: true,
+				linkId: randomBytes(32).toString('hex'),
+				nodeHash: remoteNodeHash,
+				localIdentity: options.localIdentity,
+				socket,
+				host: hint.host,
+				port: hint.port,
+			})
+			await link.ready
+			return link
 		}
-		/**
-		 * @returns {void}
-		 */
-		function onConnect() {
-			conn.off('error', onError)
-			resolve(conn)
+		catch (error) {
+			lastError = error
+			try { socket?.destroy() } catch { /* ignore */ }
 		}
-		conn.once('error', onError)
-		conn.once('connect', onConnect)
-	})
-
-	const link = await openTcpPipe({
-		initiator: true,
-		linkId: randomBytes(32).toString('hex'),
-		nodeHash: remoteNodeHash,
-		localIdentity: options.localIdentity,
-		socket,
-		host: hint.host,
-		port: hint.port,
-	})
-	await link.ready
-	return link
+	}
+	throw lastError || new Error('p2p: lan_tcp dial failed')
 }
 
 /**

package/link/providers/webrtc.mjs

@@ -1,4 +1,5 @@
 import { getSignalingRuntimeConfig } from '../../node/instance.mjs'
+import { nodeDebug } from '../../node/log.mjs'
 import { ms } from '../../utils/duration.mjs'
 import { createLruMap } from '../../utils/lru.mjs'
 import {
@@ -33,6 +34,13 @@ function formatErrorReason(error) {
 
 let cachedAvailable = null
 
+/**
+ * @returns {boolean} 是否跑在 Deno
+ */
+function isDenoRuntime() {
+	return typeof globalThis.Deno !== 'undefined'
+}
+
 /**
  * 探测 WebRTC（node-datachannel）是否可用。
  * @returns {Promise<boolean>} 可用为 true
@@ -43,8 +51,14 @@ export async function canUseWebRtcLink() {
 		await loadNodeRtcPolyfill()
 		cachedAvailable = true
 	}
-	catch {
+	catch (error) {
 		cachedAvailable = false
+		const reason = formatErrorReason(error)
+		nodeDebug('p2p:webrtc unavailable', {
+			err: isDenoRuntime()
+				? `${reason} | deno: see docs/runtime.md (node-datachannel scripts only)`
+				: reason,
+		})
 	}
 	return cachedAvailable
 }

package/link/rtc.mjs

@@ -4,15 +4,23 @@ import { toBytes } from '../core/bytes_codec.mjs'
 import { getSignalingRuntimeConfig } from '../node/instance.mjs'
 import { wrapRtcPeerConnectionForIceLocalHostname } from '../transport/rtc_ice_local_hostname.mjs'
 
+/** @type {boolean} */
+let exitCleanupHooked = false
+
 /**
- * 注册进程退出时销毁 libdatachannel 全部原生资源（仅一次）。
+ * 注册进程退出时销毁 libdatachannel 原生资源（首次成功加载后挂一次）。
  * libdatachannel 的原生线程在 pc.close() 后仍需时间回收；进程退出时若原生资源未同步销毁，
  * Windows 上会触发堆损坏（退出码 0xC0000374）。
+ * @returns {Promise<void>}
  */
-const { cleanup = undefined } = await import('node-datachannel').catch(() => ({}))
-process.on('exit', () => {
-	try { cleanup?.() } catch { /* already torn down */ }
-})
+async function ensureNodeDatachannelExitCleanup() {
+	if (exitCleanupHooked) return
+	exitCleanupHooked = true
+	const { cleanup = undefined } = await import('node-datachannel').catch(() => ({}))
+	process.on('exit', () => {
+		try { cleanup?.() } catch { /* already torn down */ }
+	})
+}
 
 /**
  * 加载 node-datachannel polyfill，并按配置包装 RTCPeerConnection。
@@ -20,6 +28,7 @@ process.on('exit', () => {
  */
 export async function loadNodeRtcPolyfill() {
 	const mod = await import('node-datachannel/polyfill')
+	await ensureNodeDatachannelExitCleanup()
 	const { iceLocalHostnamePolicy } = getSignalingRuntimeConfig()
 	return {
 		RTCPeerConnection: wrapRtcPeerConnectionForIceLocalHostname(mod.RTCPeerConnection, mod.RTCIceCandidate, iceLocalHostnamePolicy),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@steve02081504/fount-p2p",
-	"version": "0.0.13",
+	"version": "0.0.15",
 	"description": "fount federation P2P layer — link, trust graph, mailbox, DAG, EVFS.",
 	"keywords": [
 		"network",

package/transport/link_registry.mjs

@@ -3,11 +3,13 @@ import { Buffer } from 'node:buffer'
 import { compareHex64Asc, normalizeHex64 } from '../core/hexIds.mjs'
 import { keyPairFromSeed } from '../crypto/crypto.mjs'
 import { watchVerifiedNodeAdvert, setDiscoveryLinkDialer, prepareConnectToNode } from '../discovery/index.mjs'
+import { setDiscoveryPeerClueListener } from '../discovery/peer_clue.mjs'
 import { listLinkProviders } from '../link/providers/index.mjs'
 import { ensureNodeSeed, getNodeHash } from '../node/identity.mjs'
 import { nodeDebug, shortHash } from '../node/log.mjs'
 import { loadPeerPoolView } from '../node/network.mjs'
 import { createOverlayRouter } from '../overlay/index.mjs'
+import { ms } from '../utils/duration.mjs'
 import { emitSafe } from '../utils/emit_safe.mjs'
 import { createLruMap } from '../utils/lru.mjs'
 
@@ -18,6 +20,11 @@ import { createOfferAnswerDial } from './offer_answer.mjs'
 import { pickMeshEvictionVictim } from './peer_pool.mjs'
 import { createRuntimeBootstrap } from './runtime_bootstrap.mjs'
 
+/** dial exhausted 后的初始冷却。 */
+const DIAL_COOLDOWN_BASE_MS = ms('30s')
+/** dial 冷却上限。 */
+const DIAL_COOLDOWN_MAX_MS = ms('10m')
+
 /**
  * 解析或从节点种子推导本地身份。
  * @param {{ nodeHash?: string, nodePubKey?: string, secretKey?: Uint8Array } | undefined} localIdentity 可选的预置身份
@@ -84,6 +91,8 @@ export function createLinkRegistry(options = {}) {
 	const links = new Map()
 	/** @type {Map<string, Promise<object | null>>} */
 	const inflights = new Map()
+	/** @type {Map<string, { until: number, failures: number }> & { touch: (key: string, value: { until: number, failures: number }) => void }} */
+	const dialCooldown = createLruMap(1024)
 	/** @type {Map<string, ReturnType<typeof import('./offer_answer.mjs').createBufferedSignalSession>>} */
 	const signalSessions = new Map()
 	/** @type {Map<string, Set<string>>} */
@@ -265,6 +274,19 @@ export function createLinkRegistry(options = {}) {
 		if (!normalized || normalized === localIdentity.nodeHash) return null
 		if (links.has(normalized)) return links.get(normalized)
 		if (inflights.has(normalized)) return await inflights.get(normalized)
+		const cool = dialCooldown.get(normalized)
+		const now = Date.now()
+		if (cool) {
+			if (now < cool.until) {
+				nodeDebug('p2p:dial cooldown', {
+					peer: shortHash(normalized),
+					failures: cool.failures,
+					retryInMs: cool.until - now,
+				})
+				return null
+			}
+			dialCooldown.delete(normalized)
+		}
 		const task = (async () => {
 			nodeDebug('p2p:dial start', { peer: shortHash(normalized) })
 			await prepareConnectToNode(normalized)
@@ -289,6 +311,7 @@ export function createLinkRegistry(options = {}) {
 					if (provider.caps?.needsOfferAnswer) {
 						const link = await dialOfferAnswer(provider, normalized)
 						if (link) {
+							dialCooldown.delete(normalized)
 							nodeDebug('p2p:dial ok', { peer: shortHash(normalized), provider: provider.id })
 							return link
 						}
@@ -297,6 +320,7 @@ export function createLinkRegistry(options = {}) {
 					}
 					const link = await dialProvider(provider, normalized)
 					if (link) {
+						dialCooldown.delete(normalized)
 						nodeDebug('p2p:dial ok', { peer: shortHash(normalized), provider: provider.id })
 						return link
 					}
@@ -310,7 +334,10 @@ export function createLinkRegistry(options = {}) {
 					})
 				}
 
-			nodeDebug('p2p:dial exhausted', { peer: shortHash(normalized) })
+			const failures = (cool?.failures || 0) + 1
+			const delay = Math.min(DIAL_COOLDOWN_MAX_MS, DIAL_COOLDOWN_BASE_MS * (2 ** Math.min(failures - 1, 5)))
+			dialCooldown.touch(normalized, { until: Date.now() + delay, failures })
+			nodeDebug('p2p:dial exhausted', { peer: shortHash(normalized), cooldownMs: delay, failures })
 			return null
 		})().finally(() => inflights.delete(normalized))
 		inflights.set(normalized, task)
@@ -351,6 +378,12 @@ export function createLinkRegistry(options = {}) {
 	})
 	exploreLinkHashes = meshKeepalive.exploreLinkHashes
 	setDiscoveryLinkDialer(ensureDirectLinkToNode)
+	setDiscoveryPeerClueListener(nodeHash => {
+		const hash = normalizeHex64(nodeHash)
+		if (!hash) return
+		dialCooldown.delete(hash)
+		recentAdverts.touch(hash, Date.now())
+	})
 
 	/**
 	 *
@@ -619,6 +652,7 @@ export function createLinkRegistry(options = {}) {
 			return await watchVerifiedNodeAdvert(hash, async (verifiedNodeHash, body, meta) => {
 				applyAdvertPeerHints(verifiedNodeHash, body, meta)
 				recentAdverts.touch(verifiedNodeHash, Date.now())
+				dialCooldown.delete(verifiedNodeHash)
 				await Promise.resolve(onAdvert(verifiedNodeHash, body))
 			})
 		},
@@ -631,6 +665,7 @@ export function createLinkRegistry(options = {}) {
 		async shutdown() {
 			await meshKeepalive?.stop()
 			setDiscoveryLinkDialer(null)
+			setDiscoveryPeerClueListener(null)
 			await bootstrap.shutdown()
 			overlayRouter?.close()
 			overlayRouter = null
@@ -638,6 +673,7 @@ export function createLinkRegistry(options = {}) {
 				await link.close('registry-shutdown')
 			links.clear()
 			inflights.clear()
+			dialCooldown.clear()
 			for (const session of signalSessions.values()) session.clear()
 			signalSessions.clear()
 		},

package/transport/runtime_bootstrap.mjs

@@ -116,7 +116,9 @@ export function createRuntimeBootstrap(deps) {
 	function registerDiscoveryDefaults() {
 		const providerIds = new Set(listDiscoveryProviders().map(provider => provider.id))
 		if (!providerIds.has('lan'))
-			registerDiscoveryProvider(createLanDiscoveryProvider())
+			registerDiscoveryProvider(createLanDiscoveryProvider({
+				localNodeHash: localIdentity.nodeHash,
+			}))
 		if (!providerIds.has('nostr'))
 			registerNostrProvider()
 	}
@@ -128,6 +130,7 @@ export function createRuntimeBootstrap(deps) {
 		unregisterDiscoveryProvider('nostr')
 		registerDiscoveryProvider(createNostrDiscoveryProvider({
 			getRelayUrls: resolveNostrRelayUrls,
+			localNodeHash: localIdentity.nodeHash,
 		}))
 	}