@steve02081504/fount-p2p 0.0.9 → 0.0.11

package/discovery/nostr.mjs

@@ -1,6 +1,7 @@
 import { randomBytes } from 'node:crypto'
 
 import { schnorr } from '@noble/curves/secp256k1.js'
+import WebSocket from 'ws'
 
 import { sha256Hex } from '../crypto/crypto.mjs'
 
@@ -11,26 +12,69 @@ export const DEFAULT_RELAY_URLS = [
 	'wss://relay.nostr.band',
 ]
 
+/** 单中继 WebSocket 首连超时（短超时 + 并行，避免串行 10s×N）。 */
+export const NOSTR_CONNECT_TIMEOUT_MS = 2_000
+/** 先 close，超时未 CLOSED 再 terminate（给对端优雅关闭的窗口）。 */
+export const NOSTR_CLOSE_GRACE_MS = 1_000
+
 /** Nostr advert 事件 kind。 */
 export const NOSTR_ADVERT_KIND = 27235
 /** Nostr signal 事件 kind。 */
 export const NOSTR_SIGNAL_KIND = 27236
 
 /**
- * 合并默认与用户配置的中继 URL（去重）。
- * @param {string[] | undefined | null} userRelayUrls 用户自定义中继列表
- * @returns {string[]} 合并后的中继 URL 列表
+ * 关掉 WebSocket：已连上则先 close，grace 内未 CLOSED 再 terminate。
+ * 连接中直接 terminate（无握手可优雅收尾）。
+ * @param {import('ws').WebSocket} ws 连接
+ * @returns {void}
  */
-export function mergeSignalingRelayUrls(userRelayUrls) {
+function dropWebSocket(ws) {
+	if (ws.readyState === WebSocket.CLOSED) return
+	if (ws.readyState === WebSocket.CONNECTING) {
+		try { ws.terminate() } catch { /* ignore */ }
+		return
+	}
+	const timer = setTimeout(() => {
+		if (ws.readyState !== WebSocket.CLOSED)
+			try { ws.terminate() } catch { /* ignore */ }
+	}, NOSTR_CLOSE_GRACE_MS)
+	// Grace is polite to the peer; must not pin the process after shutdown.
+	timer.unref()
+	ws.once('close', () => clearTimeout(timer))
+	try {
+		ws.close()
+	}
+	catch {
+		clearTimeout(timer)
+		try { ws.terminate() } catch { /* ignore */ }
+	}
+}
+
+/**
+ * 去重并清洗中继 URL 列表。
+ * @param {string[] | undefined | null} urls 原始列表
+ * @returns {string[]} 清洗后的列表
+ */
+function dedupeRelayUrls(urls) {
 	const seen = new Set()
 	/** @type {string[]} */
-	const merged = []
-	for (const url of [...DEFAULT_RELAY_URLS, ...Array.isArray(userRelayUrls) ? userRelayUrls : []]) {
+	const out = []
+	for (const url of Array.isArray(urls) ? urls : []) {
 		const trimmed = String(url || '').trim()
 		if (!trimmed || seen.has(trimmed)) continue
 		seen.add(trimmed)
-		merged.push(trimmed)
+		out.push(trimmed)
 	}
+	return out
+}
+
+/**
+ * 合并默认与用户配置的中继 URL（去重）。
+ * @param {string[] | undefined | null} userRelayUrls 用户自定义中继列表
+ * @returns {string[]} 合并后的中继 URL 列表
+ */
+export function mergeSignalingRelayUrls(userRelayUrls) {
+	const merged = dedupeRelayUrls([...DEFAULT_RELAY_URLS, ...Array.isArray(userRelayUrls) ? userRelayUrls : []])
 	return merged.length ? merged : [...DEFAULT_RELAY_URLS]
 }
 
@@ -92,40 +136,67 @@ async function signNostrEvent(kind, tags, content, secretKey) {
 }
 
 /**
- * 连接 Nostr 中继 WebSocket。
+ * 连接 Nostr 中继 WebSocket（`ws` 包，支持 terminate）。
  * @param {string} relayUrl 中继 URL
- * @returns {Promise<WebSocket>} 已打开的 WebSocket
+ * @param {number} [timeoutMs] 超时毫秒
+ * @param {AbortSignal} [signal] 取消信号
+ * @returns {Promise<import('ws').WebSocket>} 已打开的 WebSocket
  */
-function connectRelay(relayUrl) {
+function connectRelay(relayUrl, timeoutMs = NOSTR_CONNECT_TIMEOUT_MS, signal) {
 	return new Promise((resolve, reject) => {
+		if (signal?.aborted) {
+			reject(new Error('nostr: aborted'))
+			return
+		}
 		const ws = new WebSocket(relayUrl)
-		const timer = setTimeout(() => {
-			try { ws.close() } catch { /* ignore */ }
-			reject(new Error(`nostr: connect timeout for ${relayUrl}`))
-		}, 10_000)
-		ws.addEventListener('open', () => {
+		let settled = false
+		/**
+		 * @param {Error} error 失败原因
+		 * @returns {void}
+		 */
+		const fail = error => {
+			if (settled) return
+			settled = true
 			clearTimeout(timer)
-			resolve(ws)
-		}, { once: true })
-		ws.addEventListener('error', () => {
+			signal?.removeEventListener('abort', onAbort)
+			dropWebSocket(ws)
+			reject(error)
+		}
+		/**
+		 * @returns {void}
+		 */
+		const onAbort = () => fail(new Error('nostr: aborted'))
+		const timer = setTimeout(() => fail(new Error(`nostr: connect timeout for ${relayUrl}`)), timeoutMs)
+		timer.unref()
+		signal?.addEventListener('abort', onAbort, { once: true })
+		ws.once('open', () => {
+			if (settled) return
+			settled = true
 			clearTimeout(timer)
-			reject(new Error(`nostr: websocket error for ${relayUrl}`))
-		}, { once: true })
+			signal?.removeEventListener('abort', onAbort)
+			resolve(ws)
+		})
+		ws.once('error', () => {
+			fail(new Error(`nostr: websocket error for ${relayUrl}`))
+		})
 	})
 }
 
 /**
- * 向多个中继发布 Nostr 事件。
+ * 向多个中继并行发布 Nostr 事件（任一成功即可）。
  * @param {string[]} relayUrls 中继 URL 列表
  * @param {object} event 待发布事件
+ * @param {AbortSignal} [signal] 取消信号
  * @returns {Promise<void>}
  */
-async function publishEvent(relayUrls, event) {
+async function publishEvent(relayUrls, event, signal) {
 	let published = false
 	let lastError = null
 	await Promise.allSettled(relayUrls.map(async relayUrl => {
-		const ws = await connectRelay(relayUrl)
+		if (signal?.aborted) throw new Error('nostr: aborted')
+		const ws = await connectRelay(relayUrl, NOSTR_CONNECT_TIMEOUT_MS, signal)
 		try {
+			if (signal?.aborted) throw new Error('nostr: aborted')
 			ws.send(JSON.stringify(['EVENT', event]))
 			published = true
 		}
@@ -134,74 +205,94 @@ async function publishEvent(relayUrls, event) {
 			throw error
 		}
 		finally {
-			setTimeout(() => { try { ws.close() } catch { /* ignore */ } }, 250)
+			dropWebSocket(ws)
 		}
 	}))
 	if (!published) throw lastError || new Error('nostr: no relay accepted publish')
 }
 
+/**
+ * 并行渐进连接中继：立刻返回，连上后回调；abort 后 stop 接入并 drop 已开 socket。
+ * @param {string[]} relayUrls 中继列表
+ * @param {(ws: import('ws').WebSocket, relayUrl: string) => void} onOpen 连上回调
+ * @param {AbortSignal} signal 取消信号
+ * @param {import('ws').WebSocket[]} sockets 已打开 socket 收集
+ * @returns {void}
+ */
+function connectRelaysProgressive(relayUrls, onOpen, signal, sockets) {
+	for (const relayUrl of relayUrls)
+		void connectRelay(relayUrl, NOSTR_CONNECT_TIMEOUT_MS, signal).then(ws => {
+			if (signal.aborted) {
+				dropWebSocket(ws)
+				return
+			}
+			sockets.push(ws)
+			onOpen(ws, relayUrl)
+		}).catch(() => { /* 单路失败正常降级 */ })
+}
+
 /**
  * 创建 Nostr discovery provider。
- * @param {{ relayUrls?: string[] }} [options] 可选中继 URL 覆盖
+ * subscribe/onSignal/advertise 首调用不阻塞等公网中继；连上后渐进生效。
+ * `options.relayUrls` 为最终列表（调用方 `mergeSignalingRelayUrls`，或直接传入 `relayOverride`）。
+ * 省略 / `undefined` → 默认公网中继；显式 `[]` 表示无中继（不再回填默认）。
+ * @param {{ relayUrls?: string[] | null }} [options] 可选最终中继 URL 列表
  * @returns {import('./index.mjs').DiscoveryProvider} Nostr 发现提供者
  */
 export function createNostrDiscoveryProvider(options = {}) {
-	const relayUrls = mergeSignalingRelayUrls(options.relayUrls)
+	const relayUrls = options.relayUrls != null
+		? dedupeRelayUrls(options.relayUrls)
+		: [...DEFAULT_RELAY_URLS]
 	const secretKey = randomBytes(32)
 	return {
 		id: 'nostr',
 		priority: 100,
 		caps: { canDiscover: true, canSignal: true, canRelay: false },
 		/**
-		 * 周期性向中继发布 advert 事件。
+		 * 周期性向中继发布 advert 事件（首发后台，不阻塞 ensureRuntime）。
 		 * @param {string} topic advert 主题
 		 * @param {Uint8Array} bytes advert 载荷
 		 * @returns {Promise<() => void>} 取消广播函数
 		 */
 		async advertise(topic, bytes) {
-			let closed = false
+			const ac = new AbortController()
 			/**
 			 * 向中继发布当前 advert。
 			 * @returns {Promise<void>}
 			 */
 			const publish = async () => {
-				if (closed) return
+				if (ac.signal.aborted) return
 				const event = await signNostrEvent(
 					NOSTR_ADVERT_KIND,
 					[['t', topic], ['x', 'advert']],
 					bytesToBase64(bytes),
 					secretKey,
 				)
-				await publishEvent(relayUrls, event)
+				await publishEvent(relayUrls, event, ac.signal)
 			}
-			await publish()
+			void publish().catch(() => { })
 			const timer = setInterval(() => { void publish().catch(() => { }) }, 5 * 60_000)
 			return () => {
-				closed = true
+				ac.abort()
 				clearInterval(timer)
 			}
 		},
 		/**
-		 * 订阅中继上的 advert 事件。
+		 * 订阅中继上的 advert 事件（并行渐进连中继，立即返回 cleanup）。
 		 * @param {string} topic advert 主题
 		 * @param {Function} onAdvert advert 回调
 		 * @returns {Promise<() => void>} 取消订阅函数
 		 */
 		async subscribe(topic, onAdvert) {
-			let closed = false
+			const ac = new AbortController()
+			/** @type {import('ws').WebSocket[]} */
 			const sockets = []
 			const subscriptionId = randomBytes(8).toString('hex')
-			let connected = 0
-			for (const relayUrl of relayUrls) {
-				let ws
-				try { ws = await connectRelay(relayUrl) }
-				catch { continue }
-				connected++
-				sockets.push(ws)
-				ws.addEventListener('message', event => {
-					if (closed) return
+			connectRelaysProgressive(relayUrls, (ws, relayUrl) => {
+				ws.on('message', data => {
+					if (ac.signal.aborted) return
 					let parsed
-					try { parsed = JSON.parse(String(event.data)) } catch { return }
+					try { parsed = JSON.parse(String(data)) } catch { return }
 					if (!Array.isArray(parsed) || parsed[0] !== 'EVENT') return
 					const nostrEvent = parsed[2]
 					if (nostrEvent?.kind !== NOSTR_ADVERT_KIND) return
@@ -209,16 +300,14 @@ export function createNostrDiscoveryProvider(options = {}) {
 					catch { /* ignore */ }
 				})
 				ws.send(JSON.stringify(['REQ', subscriptionId, { kinds: [NOSTR_ADVERT_KIND], '#t': [topic], '#x': ['advert'] }]))
-			}
-			if (!connected) throw new Error('nostr: no relay available for advert subscribe')
+			}, ac.signal, sockets)
 			return () => {
-				closed = true
-				for (const ws of sockets)
-					try { ws.close() } catch { /* ignore */ }
+				ac.abort()
+				for (const ws of sockets) dropWebSocket(ws)
 			}
 		},
 		/**
-		 * 向中继发布 signal 事件。
+		 * 向中继发布 signal 事件（按需发送，仍等待至少一路成功）。
 		 * @param {string} topic 信令 topic
 		 * @param {string} to 目标节点标识
 		 * @param {Uint8Array} bytes 信令载荷
@@ -234,26 +323,21 @@ export function createNostrDiscoveryProvider(options = {}) {
 			await publishEvent(relayUrls, event)
 		},
 		/**
-		 * 订阅中继上的 signal 事件。
+		 * 订阅中继上的 signal 事件（并行渐进连中继，立即返回 cleanup）。
 		 * @param {string} topic 信令 topic
 		 * @param {Function} onSignal 信令回调
 		 * @returns {Promise<() => void>} 取消订阅函数
 		 */
 		async onSignal(topic, onSignal) {
-			let closed = false
+			const ac = new AbortController()
+			/** @type {import('ws').WebSocket[]} */
 			const sockets = []
 			const subscriptionId = randomBytes(8).toString('hex')
-			let connected = 0
-			for (const relayUrl of relayUrls) {
-				let ws
-				try { ws = await connectRelay(relayUrl) }
-				catch { continue }
-				connected++
-				sockets.push(ws)
-				ws.addEventListener('message', event => {
-					if (closed) return
+			connectRelaysProgressive(relayUrls, (ws, relayUrl) => {
+				ws.on('message', data => {
+					if (ac.signal.aborted) return
 					let parsed
-					try { parsed = JSON.parse(String(event.data)) } catch { return }
+					try { parsed = JSON.parse(String(data)) } catch { return }
 					if (!Array.isArray(parsed) || parsed[0] !== 'EVENT') return
 					const nostrEvent = parsed[2]
 					if (nostrEvent?.kind !== NOSTR_SIGNAL_KIND) return
@@ -261,12 +345,10 @@ export function createNostrDiscoveryProvider(options = {}) {
 					catch { /* ignore */ }
 				})
 				ws.send(JSON.stringify(['REQ', subscriptionId, { kinds: [NOSTR_SIGNAL_KIND], '#t': [topic], '#x': ['signal'] }]))
-			}
-			if (!connected) throw new Error('nostr: no relay available for signal subscribe')
+			}, ac.signal, sockets)
 			return () => {
-				closed = true
-				for (const ws of sockets)
-					try { ws.close() } catch { /* ignore */ }
+				ac.abort()
+				for (const ws of sockets) dropWebSocket(ws)
 			}
 		},
 	}

package/link/providers/ble_gatt.mjs

@@ -3,7 +3,7 @@ import { randomBytes } from 'node:crypto'
 
 import { normalizeHex64 } from '../../core/hexIds.mjs'
 import { getBtPeerHint } from '../../discovery/bt/peer_hints.mjs'
-import { loadBleno, loadNoble, resolveBtRole, waitPoweredOn } from '../../discovery/bt/runtime.mjs'
+import { canUseBluetoothRuntime, loadBleno, loadNoble, resolveBtRole, waitPoweredOn } from '../../discovery/bt/runtime.mjs'
 import { asLinkHandle, coercePipeInbound, createLinkPipe } from '../pipe.mjs'
 
 import { LINK_LEVEL_BLE_GATT } from './levels.mjs'
@@ -14,23 +14,12 @@ export const BLE_DATA_SERVICE_UUID = 'f017f017f017f017f017f017f017f019'
 export const BLE_DATA_CHAR_UUID = 'f017f017f017f017f017f017f017f01a'
 const BT_DEVICE_NAME = 'fount-bt'
 
-let cachedAvailable = null
-
 /**
- * 探测 BLE GATT 数据链路是否可用（至少 noble central）。
+ * 探测 BLE GATT 数据链路是否可用；失败则回落其它 link provider。
  * @returns {Promise<boolean>} 可用为 true
  */
 export async function canUseBleGattLink() {
-	if (cachedAvailable !== null) return cachedAvailable
-	try {
-		const noble = await loadNoble()
-		const wait = noble.waitForPoweredOnAsync ?? noble.waitForPoweredOn
-		cachedAvailable = typeof noble.startScanningAsync === 'function' && typeof wait === 'function'
-	}
-	catch {
-		cachedAvailable = false
-	}
-	return cachedAvailable
+	return canUseBluetoothRuntime()
 }
 
 /**
@@ -301,7 +290,7 @@ export function createBleGattLinkProvider() {
 	return {
 		id: instanceId,
 		level: LINK_LEVEL_BLE_GATT,
-		caps: { needsOfferAnswer: false, needsDiscoverySignal: false },
+		caps: { needsOfferAnswer: false, needsDiscoverySignal: false, probe: 'native' },
 		isAvailable: canUseBleGattLink,
 		/**
 		 * @param {{ nodeHash: string }} remote 远端

package/link/providers/index.mjs

@@ -15,7 +15,7 @@
  * @typedef {{
  *   id: string,
  *   level: number,
- *   caps?: { needsOfferAnswer?: boolean, needsDiscoverySignal?: boolean },
+ *   caps?: { needsOfferAnswer?: boolean, needsDiscoverySignal?: boolean, probe?: 'sync' | 'native' },
  *   isAvailable: () => boolean | Promise<boolean>,
  *   canReach?: (remote: { nodeHash: string, hints?: object }) => boolean | Promise<boolean>,
  *   dial: (options: object) => Promise<LinkHandle | null>,
@@ -57,7 +57,7 @@ export function listLinkProviders() {
 }
 
 /**
- * 清空全部 link provider（测试用）。
+ * 清空全部 link provider。
  * @returns {void}
  */
 export function clearLinkProviders() {
@@ -69,17 +69,15 @@ export function clearLinkProviders() {
  * @returns {Promise<LinkProvider[]>} 按 level 降序的可用列表
  */
 export async function listAvailableLinkProviders() {
-	const available = []
-	for (const provider of listLinkProviders()) 
+	const results = await Promise.all(listLinkProviders().map(async provider => {
 		try {
-			if (await Promise.resolve(provider.isAvailable()))
-				available.push(provider)
+			return await Promise.resolve(provider.isAvailable()) ? provider : null
 		}
 		catch {
-			/* probe failure → skip */
+			return null
 		}
-	
-	return available
+	}))
+	return results.filter(Boolean)
 }
 
 /** 重导出 level 常量。 */

package/link/providers/lan_tcp.mjs

@@ -283,7 +283,7 @@ export function createLanTcpLinkProvider() {
 	return {
 		id: instanceId,
 		level: LINK_LEVEL_LAN_TCP,
-		caps: { needsOfferAnswer: false, needsDiscoverySignal: false },
+		caps: { needsOfferAnswer: false, needsDiscoverySignal: false, probe: 'sync' },
 		/**
 		 * @returns {boolean} 始终可用
 		 */

package/link/providers/webrtc.mjs

@@ -365,7 +365,7 @@ export function createWebRtcLinkProvider(options = {}) {
 	return {
 		id: 'webrtc',
 		level: LINK_LEVEL_WEBRTC,
-		caps: { needsOfferAnswer: true, needsDiscoverySignal: true },
+		caps: { needsOfferAnswer: true, needsDiscoverySignal: true, probe: 'native' },
 		isAvailable: canUseWebRtcLink,
 		/**
 		 * @param {object} dialOptions dial 参数（含 signal / iceServers 等）

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@steve02081504/fount-p2p",
-	"version": "0.0.9",
+	"version": "0.0.11",
 	"description": "fount federation P2P layer — link, trust graph, mailbox, DAG, EVFS.",
 	"keywords": [
 		"network",
@@ -61,7 +61,8 @@
 	},
 	"dependencies": {
 		"@noble/curves": "latest",
-		"node-datachannel": "latest"
+		"node-datachannel": "latest",
+		"ws": "latest"
 	},
 	"devDependencies": {
 		"@steve02081504/exec": "latest"

package/rooms/scoped_link.mjs

@@ -1,12 +1,12 @@
 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 {
-	groupRendezvousTopic,
 	decryptSignalPacket,
 	encryptSignalPacket,
-	getLinkRegistry,
-} from '../transport/link_registry.mjs'
+	groupRendezvousTopic,
+} from '../transport/signal_crypto.mjs'
 
 /**
  * 在指定 scope 与 roomSecret 下创建 link 层房间（discovery + registry 转发）。

package/transport/group_link_set.mjs

@@ -4,13 +4,13 @@ import { verifySignedAdvert } from '../link/handshake.mjs'
 import { loadPeerPoolView } from '../node/network.mjs'
 import { loadReputation } from '../node/reputation_store.mjs'
 
+import { getLinkRegistry } from './link_registry.mjs'
+import { resolveFederationPoolLimits, selectLinkTargetsFromMembers } from './peer_pool.mjs'
 import {
-	groupRendezvousTopic,
 	decryptSignalPacket,
 	encryptSignalPacket,
-	getLinkRegistry,
-} from './link_registry.mjs'
-import { resolveFederationPoolLimits, selectLinkTargetsFromMembers } from './peer_pool.mjs'
+	groupRendezvousTopic,
+} from './signal_crypto.mjs'
 
 
 /**

package/transport/ice_servers.mjs

@@ -3,11 +3,20 @@
  */
 
 const ICE_URL_RE = /^(stun|turn|turns):/iu
-const MAX_ICE_SERVERS = 8
+const MAX_ICE_SERVERS = 12
 
 /** @type {{ urls: string, username?: string, credential?: string }[]} */
 export const DEFAULT_ICE_SERVERS = [
+	// Global first — ICE tries in order; regional CN servers are fallback when global STUN is blocked.
 	{ urls: 'stun:stun.l.google.com:19302' },
+	{ urls: 'stun:stun.cloudflare.com:3478' },
+	{ urls: 'stun:global.stun.twilio.com:3478' },
+	{ urls: 'stun:stun.nextcloud.com:3478' },
+	{ urls: 'stun:stun.voip.blackberry.com:3478' },
+	{ urls: 'stun:stun.freeswitch.org:3478' },
+	{ urls: 'stun:stun.chat.bilibili.com:3478' },
+	{ urls: 'stun:stun.hitv.com:3478' },
+	{ urls: 'stun:stun.miwifi.com:3478' },
 ]
 
 /**