@steve02081504/fount-p2p 0.0.13 → 0.0.15

package/README.md

@@ -44,6 +44,14 @@ npx @steve02081504/fount-p2p
 
 Default `nodeDir`: Windows `%LOCALAPPDATA%/fount-p2p/node`; elsewhere `~/.local/share/fount-p2p/node`.
 
+Deno (optional; WebRTC needs explicit native scripts — **not** blanket `--allow-scripts`):
+
+```bash
+deno run -A --minimum-dependency-age=0 --node-modules-dir=auto --allow-scripts=npm:node-datachannel npm:@steve02081504/fount-p2p
+```
+
+See [docs/runtime.md](./docs/runtime.md).
+
 ```javascript
 import { initNode, startNode, startInfra, stopInfra, setInfraPriority } from '@steve02081504/fount-p2p'
 

package/deno.json

@@ -1,4 +1,7 @@
 {
 	"nodeModulesDir": "none",
-	"lock": false
+	"lock": false,
+	"allowScripts": [
+		"npm:node-datachannel"
+	]
 }

package/discovery/advert_peer_hints.mjs

@@ -1,13 +1,15 @@
 import { normalizeTcpPort } from '../core/tcp_port.mjs'
 
 import { noteBtPeerHint } from './bt/peer_hints.mjs'
+import { normalizeLanHosts } from './lan_interfaces.mjs'
 import { noteLanPeerHint } from './lan_peer_hints.mjs'
 
 /**
  * 从已验证的 discovery advert + provider meta 写入 LAN/BT peer hints。
  * 任意 discovery 路径（node / group / scoped）收到 advert 时都应调用。
+ * meta.address（观测地址）优先于 body.lanHosts（自报地址）。
  * @param {string} verifiedNodeHash 验签通过的 nodeHash
- * @param {{ tcpPort?: unknown } | null | undefined} body advert body
+ * @param {{ tcpPort?: unknown, lanHosts?: unknown } | null | undefined} body advert body
  * @param {{ address?: unknown, peripheralId?: unknown } | null | undefined} meta discovery provider meta
  * @returns {void}
  */
@@ -15,7 +17,11 @@ export function noteAdvertPeerHints(verifiedNodeHash, body, meta) {
 	if (meta?.peripheralId)
 		noteBtPeerHint(verifiedNodeHash, meta.peripheralId)
 	const tcpPort = normalizeTcpPort(body?.tcpPort)
+	if (tcpPort == null) return
+	// lanHosts 先写（差→优，unshift 后优在前），再写观测 address，使 address 最优先
+	for (const host of normalizeLanHosts(body?.lanHosts).toReversed())
+		noteLanPeerHint(verifiedNodeHash, { host, port: tcpPort })
 	const address = String(meta?.address || '').trim()
-	if (tcpPort != null && address)
+	if (address)
 		noteLanPeerHint(verifiedNodeHash, { host: address, port: tcpPort })
 }

package/discovery/adverts.mjs

@@ -8,6 +8,7 @@ import {
 	networkRendezvousKey,
 	nodeRendezvousKey,
 } from './internal/signal_crypto.mjs'
+import { listMulticastIpv4Addresses } from './lan_interfaces.mjs'
 
 /** @typedef {'node' | 'network' | { roomSecret: string }} AdvertScope */
 
@@ -33,9 +34,13 @@ export function rendezvousKeyForScope(scope, selfNodeHash) {
  */
 export async function buildSignedAdvertForScope(scope, localIdentity, tcpPort) {
 	const key = rendezvousKeyForScope(scope, localIdentity.nodeHash)
+	const lanHosts = scope === 'network' && tcpPort != null
+		? listMulticastIpv4Addresses()
+		: []
 	return await buildSignedAdvert(key, Date.now(), {
 		...localIdentity,
 		...tcpPort != null ? { tcpPort } : {},
+		...lanHosts.length ? { lanHosts } : {},
 	})
 }
 

package/discovery/bt/index.mjs

@@ -4,6 +4,7 @@ import { isHex64, normalizeHex64 } from '../../core/hexIds.mjs'
 import { nodeDebug, shortHash } from '../../node/log.mjs'
 import { noteAdvertPeerHints } from '../advert_peer_hints.mjs'
 import { ingestNetworkAdvert } from '../adverts.mjs'
+import { noteDiscoveryPeerClue } from '../peer_clue.mjs'
 
 import { getBtPeerHint } from './peer_hints.mjs'
 import { canUseBluetoothRuntime, loadBleno, loadNoble, resolveBtRole, waitPoweredOn } from './runtime.mjs'
@@ -106,11 +107,13 @@ export async function acceptBtScannedPresence(bytes, meta) {
 	const firstSeen = !visibleByHash.has(ingested.verifiedNodeHash)
 	noteBtVisibleNode(ingested.verifiedNodeHash)
 	noteAdvertPeerHints(ingested.verifiedNodeHash, ingested.body, meta)
-	if (firstSeen)
+	if (firstSeen) {
+		noteDiscoveryPeerClue(ingested.verifiedNodeHash)
 		nodeDebug('p2p:bt peer visible', {
 			peer: shortHash(ingested.verifiedNodeHash),
 			peripheralId,
 		})
+	}
 	return ingested
 }
 

package/discovery/lan.mjs

@@ -5,8 +5,11 @@ import { base64ToBytes, bytesToBase64 } from '../core/bytes_codec.mjs'
 import { isHex64, normalizeHex64 } from '../core/hexIds.mjs'
 import { nodeDebug, shortHash } from '../node/log.mjs'
 
+import { noteAdvertPeerHints } from './advert_peer_hints.mjs'
 import { ingestNetworkAdvert } from './adverts.mjs'
-import { getLanPeerHint, noteLanPeerHint } from './lan_peer_hints.mjs'
+import { listMulticastIpv4Addresses } from './lan_interfaces.mjs'
+import { getLanPeerHint } from './lan_peer_hints.mjs'
+import { noteDiscoveryPeerClue } from './peer_clue.mjs'
 
 const DEFAULT_PORT = 53531
 const DEFAULT_GROUP = '239.255.42.99'
@@ -51,31 +54,33 @@ export function clearLanVisibleNodes() {
 /**
  * Untrusted ingress：验签 network advert 后写入可见池 / peer hint。
  * @param {Uint8Array} advertBytes 加密 network advert
- * @param {{ address?: string }} [meta] 发送方地址
+ * @param {{ address?: string, skipNodeHash?: string }} [meta] 发送方地址 / 本机 nodeHash（过滤自回环）
  * @returns {Promise<{ verifiedNodeHash: string, body: object } | null>} 验签结果
  */
 export async function acceptLanPresenceAdvert(advertBytes, meta = {}) {
 	if (!advertBytes?.byteLength) return null
 	const ingested = await ingestNetworkAdvert(advertBytes, meta)
 	if (!ingested) return null
+	const skipHash = meta.skipNodeHash ? normalizeHex64(meta.skipNodeHash) : null
+	if (skipHash && ingested.verifiedNodeHash === skipHash) return ingested
 	const firstSeen = !visibleByHash.has(ingested.verifiedNodeHash)
 	noteLanVisibleNode(ingested.verifiedNodeHash)
-	const host = String(meta.address || '').trim()
-	const tcpPort = Number(ingested.body?.tcpPort)
-	if (host && Number.isFinite(tcpPort) && tcpPort > 0)
-		noteLanPeerHint(ingested.verifiedNodeHash, { host, port: tcpPort })
-	if (firstSeen)
+	noteAdvertPeerHints(ingested.verifiedNodeHash, ingested.body, meta)
+	if (firstSeen) {
+		noteDiscoveryPeerClue(ingested.verifiedNodeHash)
+		const host = String(meta.address || '').trim()
 		nodeDebug('p2p:lan peer visible', {
 			peer: shortHash(ingested.verifiedNodeHash),
 			host: host || undefined,
-			tcpPort: tcpPort > 0 ? tcpPort : undefined,
+			tcpPort: ingested.body?.tcpPort,
 		})
+	}
 	return ingested
 }
 
 /**
  * LAN UDP presence：段内 beacon，非 topic 订阅模型。
- * @param {{ port?: number, group?: string }} [options] 配置
+ * @param {{ port?: number, group?: string, localNodeHash?: string }} [options] 配置
  * @returns {import('./index.mjs').DiscoveryProvider} LAN 发现提供者
  */
 export function createLanDiscoveryProvider(options = {}) {
@@ -88,9 +93,33 @@ export function createLanDiscoveryProvider(options = {}) {
 	let refs = 0
 	/** @type {ReturnType<typeof setInterval> | null} */
 	let beaconTimer = null
+	const seededSelf = normalizeHex64(options.localNodeHash)
+	/** @type {string | null} */
+	let selfNodeHash = isHex64(seededSelf) ? seededSelf : null
+	/** @type {Set<string>} */
+	const joinedAddresses = new Set()
+
+	/**
+	 * 在每个本机 IPv4 接口上加入组播组；全部失败则回退到默认接口。
+	 * @param {import('node:dgram').Socket} sock UDP socket
+	 * @returns {void}
+	 */
+	function ensureMemberships(sock) {
+		for (const addr of listMulticastIpv4Addresses()) {
+			if (joinedAddresses.has(addr)) continue
+			try {
+				sock.addMembership(group, addr)
+				joinedAddresses.add(addr)
+			}
+			catch { /* ignore per-interface join failure */ }
+		}
+		if (!joinedAddresses.size)
+			try { sock.addMembership(group) } catch { /* ignore */ }
+	}
 
 	/**
-	 * @returns {import('node:dgram').Socket} 复用的组播 UDP socket
+	 * 懒创建复用的 udp4 socket（reuseAddr，便于同机多实例绑同一 port）。
+	 * @returns {import('node:dgram').Socket} 组播 presence socket
 	 */
 	function getSocket() {
 		return socket ||= dgram.createSocket({ type: 'udp4', reuseAddr: true })
@@ -108,7 +137,7 @@ export function createLanDiscoveryProvider(options = {}) {
 					sock.once('error', reject)
 					sock.bind(port, '0.0.0.0', () => {
 						sock.off('error', reject)
-						sock.addMembership(group)
+						ensureMemberships(sock)
 						sock.setMulticastTTL(1)
 						resolve()
 					})
@@ -117,6 +146,7 @@ export function createLanDiscoveryProvider(options = {}) {
 					try { sock.close() } catch { /* ignore */ }
 					if (socket === sock) socket = null
 					bound = false
+					joinedAddresses.clear()
 					return
 				}
 				sock.on('message', (raw, rinfo) => {
@@ -131,8 +161,11 @@ export function createLanDiscoveryProvider(options = {}) {
 					}
 					catch { return }
 					if (!advertBytes?.byteLength) return
-					void acceptLanPresenceAdvert(advertBytes, { address: rinfo?.address, provider: 'lan' })
-						.catch(() => { })
+					void acceptLanPresenceAdvert(advertBytes, {
+						address: rinfo?.address,
+						provider: 'lan',
+						skipNodeHash: selfNodeHash || undefined,
+					}).catch(() => { })
 				})
 				bound = true
 			})().finally(() => {
@@ -148,10 +181,33 @@ export function createLanDiscoveryProvider(options = {}) {
 	async function multicastBeacon(beacon) {
 		await ensureBound()
 		const sock = getSocket()
+		ensureMemberships(sock)
 		const packet = Buffer.from(JSON.stringify({ type: 'presence', ...beacon }))
-		await new Promise((resolve, reject) => {
+		const addrs = listMulticastIpv4Addresses()
+		/**
+		 * @param {string | undefined} ifaceAddr 组播出口地址
+		 * @returns {Promise<void>}
+		 */
+		const sendOnce = ifaceAddr => new Promise((resolve, reject) => {
+			if (ifaceAddr) sock.setMulticastInterface(ifaceAddr)
 			sock.send(packet, port, group, error => error ? reject(error) : resolve())
 		})
+		if (!addrs.length) {
+			await sendOnce()
+			return
+		}
+		let sent = 0
+		/** @type {unknown} */
+		let lastError = null
+		for (const addr of addrs)
+			try {
+				await sendOnce(addr)
+				sent++
+			}
+			catch (error) {
+				lastError = error
+			}
+		if (!sent) throw lastError || new Error('p2p: lan multicast send failed')
 	}
 
 	/**
@@ -164,6 +220,8 @@ export function createLanDiscoveryProvider(options = {}) {
 			refs = Math.max(0, refs - 1)
 			if (refs > 0 || !socket) return
 			if (beaconTimer) { clearInterval(beaconTimer); beaconTimer = null }
+			selfNodeHash = null
+			joinedAddresses.clear()
 			try { socket.close() } catch { /* ignore */ }
 			socket = null
 			bound = false
@@ -206,6 +264,7 @@ export function createLanDiscoveryProvider(options = {}) {
 			const send = async () => {
 				const body = await getBeacon?.()
 				if (!body) return
+				if (body.nodeHash) selfNodeHash = normalizeHex64(body.nodeHash)
 				const advertBytes = body.advertBytes?.byteLength
 					? body.advertBytes
 					: null

package/discovery/lan_interfaces.mjs

@@ -0,0 +1,78 @@
+import os from 'node:os'
+
+/** advert / 组播 beacon 携带的 LAN IPv4 上限 */
+export const MAX_LAN_HOSTS = 4
+
+const IPV4_RE = /^(?:\d{1,3}\.){3}\d{1,3}$/
+
+/**
+ * untrusted ingress：清洗 advert body 中的 LAN IPv4 列表。
+ * @param {unknown} input 原始 lanHosts
+ * @returns {string[]} 去重后的 IPv4 列表
+ */
+export function normalizeLanHosts(input) {
+	if (!input) return []
+	const arr = Array.isArray(input) ? input : [input]
+	const seen = new Set()
+	/** @type {string[]} */
+	const out = []
+	for (const item of arr) {
+		const host = String(item || '').trim()
+		if (!host || !IPV4_RE.test(host) || seen.has(host)) continue
+		seen.add(host)
+		out.push(host)
+		if (out.length >= MAX_LAN_HOSTS) break
+	}
+	return out
+}
+
+/**
+ * @param {string} addr IPv4
+ * @returns {number} 排序权重（越小越优先）
+ */
+function lanAddressRank(addr) {
+	if (addr.startsWith('169.254.')) return 100
+	if (addr.startsWith('192.168.56.')) return 90
+	if (addr.startsWith('192.168.')) return 10
+	if (addr.startsWith('10.')) return 20
+	const match = /^172\.(\d+)\./u.exec(addr)
+	if (match && Number(match[1]) >= 16 && Number(match[1]) <= 31) return 30
+	return 50
+}
+
+/**
+ * @param {string[]} addrs IPv4 列表
+ * @returns {string[]} 按 LAN 可达性优先排序
+ */
+function prioritizeLanAddresses(addrs) {
+	return [...addrs].sort((left, right) => lanAddressRank(left) - lanAddressRank(right))
+}
+
+/**
+ * @param {string | number} family os.networkInterfaces family
+ * @returns {boolean} 是否 IPv4
+ */
+function isIpv4Family(family) {
+	return family === 'IPv4' || family === 4
+}
+
+/**
+ * 本机可用于 LAN 组播 / advert 的非 internal IPv4 地址。
+ * @returns {string[]} 去重、排序后的地址列表
+ */
+export function listMulticastIpv4Addresses() {
+	const seen = new Set()
+	/** @type {string[]} */
+	const addrs = []
+	for (const ifaces of Object.values(os.networkInterfaces())) {
+		if (!ifaces) continue
+		for (const iface of ifaces) {
+			if (iface.internal || !isIpv4Family(iface.family)) continue
+			const addr = String(iface.address || '').trim()
+			if (!addr || seen.has(addr)) continue
+			seen.add(addr)
+			addrs.push(addr)
+		}
+	}
+	return prioritizeLanAddresses(addrs).slice(0, MAX_LAN_HOSTS)
+}

package/discovery/lan_peer_hints.mjs

@@ -5,11 +5,15 @@ import { createTtlMap } from '../utils/ttl_map.mjs'
 /** LAN peer hint 存活时间。 */
 export const LAN_PEER_HINT_TTL_MS = 5 * 60_000
 
-/** @type {ReturnType<typeof createTtlMap<{ host: string, port: number }>>} */
+/** 单 peer 保留的 endpoint 上限。 */
+const MAX_ENDPOINTS = 8
+
+/** @type {ReturnType<typeof createTtlMap<{ endpoints: { host: string, port: number }[] }>>} */
 const hints = createTtlMap(LAN_PEER_HINT_TTL_MS)
 
 /**
  * 记录 LAN 上观察到的 nodeHash → host:port。
+ * 最新写入排在最前（dial / getLanPeerHint 优先用新观测）。
  * @param {string} nodeHash 节点 64 hex
  * @param {{ host: string, port: number }} endpoint 端点
  * @returns {void}
@@ -19,19 +23,32 @@ export function noteLanPeerHint(nodeHash, endpoint) {
 	const host = String(endpoint?.host || '').trim()
 	const port = normalizeTcpPort(endpoint?.port)
 	if (!hash || !host || !port) return
-	hints.set(hash, { host, port })
+	const existing = hints.get(hash)?.endpoints ?? []
+	const next = existing.filter(item => !(item.host === host && item.port === port))
+	next.unshift({ host, port })
+	hints.set(hash, { endpoints: next.slice(0, MAX_ENDPOINTS) })
 }
 
 /**
- * 查询未过期的 LAN peer hint。
+ * 查询未过期的首个 LAN peer hint（最新观测）。
  * @param {string} nodeHash 节点 64 hex
  * @param {number} [now=Date.now()] 当前时间（测试可注入）
  * @returns {{ host: string, port: number } | null} hint 或 null
  */
 export function getLanPeerHint(nodeHash, now = Date.now()) {
+	return listLanPeerHints(nodeHash, now)[0] ?? null
+}
+
+/**
+ * 查询未过期的全部 LAN peer hint（最新在前）。
+ * @param {string} nodeHash 节点 64 hex
+ * @param {number} [now=Date.now()] 当前时间（测试可注入）
+ * @returns {{ host: string, port: number }[]} hint 列表
+ */
+export function listLanPeerHints(nodeHash, now = Date.now()) {
 	const hash = normalizeHex64(nodeHash)
-	if (!hash) return null
-	return hints.get(hash, now)
+	if (!hash) return []
+	return hints.get(hash, now)?.endpoints ?? []
 }
 
 /**