@steve02081504/fount-p2p 0.0.8 → 0.0.10

package/README.md

@@ -54,7 +54,7 @@ During development: `node scripts/check-imports.mjs` validates relative imports.
 
 ## Optional dependencies
 
-- `@stoprocent/noble` / `@stoprocent/bleno` — Bluetooth discovery (attempted by default; skipped when not installed)
+- `@stoprocent/noble` / `@stoprocent/bleno` — Bluetooth (optionalDependencies). Unavailable when there is no adapter, load fails, or the radio never reaches poweredOn — other discovery/link paths continue.
 
 Group chunk remote storage (S3, etc.) is implemented by the shell as `GroupStoragePlugin` and injected; see `node/storage_plugins.mjs` for the local reference implementation.
 

package/discovery/bt/index.mjs

@@ -1,7 +1,7 @@
 import { Buffer } from 'node:buffer'
 
 import { getBtPeerHint } from './peer_hints.mjs'
-import { loadBleno, loadNoble, resolveBtRole, waitPoweredOn } from './runtime.mjs'
+import { canUseBluetoothRuntime, loadBleno, loadNoble, resolveBtRole, waitPoweredOn } from './runtime.mjs'
 
 /** 重导出 waitPoweredOn，供 discovery 调用方使用。 */
 export { waitPoweredOn } from './runtime.mjs'
@@ -15,19 +15,11 @@ const MAX_SIGNAL_BLOB_BYTES = 8 * 1024
 const PERIPHERAL_RESCAN_MS = 15_000
 
 /**
- * 探测本机 noble 运行时是否具备 BT 扫描所需 API。
- * @returns {Promise<boolean>} noble 可加载且具备 startScanningAsync 与 waitForPoweredOn(Async) 时为 true
+ * 探测本机 BT discovery 是否可用；失败则回落其它 discovery，不抛错。
+ * @returns {Promise<boolean>} 可用为 true
  */
 export async function canUseBluetoothDiscovery() {
-	try {
-		const noble = await loadNoble()
-		if (typeof noble.startScanningAsync !== 'function') return false
-		const wait = noble.waitForPoweredOnAsync ?? noble.waitForPoweredOn
-		return typeof wait === 'function'
-	}
-	catch {
-		return false
-	}
+	return canUseBluetoothRuntime()
 }
 
 /**
@@ -252,14 +244,15 @@ export function createBluetoothDiscoveryProvider() {
 
 	/**
 	 * Central：按 peer hint 连接并对端 signal characteristic 写短包。
+	 * 无 hint 时返回 false（正常降级，不算错误）。
 	 * @param {string} topic 信令 topic
 	 * @param {string} to 目标 nodeHash
 	 * @param {Uint8Array} bytes 载荷
-	 * @returns {Promise<void>}
+	 * @returns {Promise<boolean>} 是否投递
 	 */
 	async function sendSignalViaGatt(topic, to, bytes) {
 		const hint = getBtPeerHint(to)
-		if (!hint) throw new Error('p2p: bt signal missing peer hint')
+		if (!hint) return false
 		const blob = Buffer.from(JSON.stringify({
 			topic: String(topic),
 			to: String(to),
@@ -324,20 +317,13 @@ export function createBluetoothDiscoveryProvider() {
 		finally {
 			try { await peripheral.disconnectAsync() } catch { /* ignore */ }
 		}
+		return true
 	}
 
 	return {
 		id: 'bt',
 		priority: 20,
 		caps: { canDiscover: true, canSignal: true, canRelay: false },
-		/**
-		 * 是否具备对该 peer 的 GATT 信令能力（需未过期 BT peer hint）。
-		 * @param {string} to 目标 nodeHash
-		 * @returns {boolean} 有 hint 则可尝试
-		 */
-		canSignalTo(to) {
-			return !!getBtPeerHint(to)
-		},
 		/**
 		 * 广播指定 topic 的 advert。
 		 * @param {string} topic advert 主题
@@ -364,14 +350,14 @@ export function createBluetoothDiscoveryProvider() {
 			return addListener(advertListeners, String(topic), onAdvert)
 		},
 		/**
-		 * 经 GATT 向近场 peer 发送信令。
+		 * 经 GATT 向近场 peer 发送信令；无 peer hint 时返回 false。
 		 * @param {string} topic 信令 topic
 		 * @param {string} to 目标 nodeHash
 		 * @param {Uint8Array} bytes 载荷
-		 * @returns {Promise<void>}
+		 * @returns {Promise<boolean>} 是否投递
 		 */
-		async sendSignal(topic, to, bytes) {
-			await sendSignalViaGatt(topic, to, bytes)
+		sendSignal(topic, to, bytes) {
+			return sendSignalViaGatt(topic, to, bytes)
 		},
 		/**
 		 * 监听经本机 peripheral signal characteristic 写入的信令。

package/discovery/bt/runtime.mjs

@@ -1,3 +1,4 @@
+import { existsSync, readdirSync } from 'node:fs'
 import process from 'node:process'
 
 /**
@@ -13,20 +14,69 @@ export function resolveBtRole() {
 }
 
 /**
- * 加载 Noble BLE central。
+ * 廉价硬件探测：明确无适配器时跳过 noble/bleno import（加载本身会拉起 native，无适配器时常在 teardown SIGSEGV）。
+ * @returns {boolean | null} true=有迹象，false=明确无，null=未知（继续尝试加载，失败则回落）
+ */
+export function probeBluetoothHardware() {
+	if (process.platform === 'linux') try {
+		const dir = '/sys/class/bluetooth'
+		if (!existsSync(dir)) return false
+		return readdirSync(dir).some(name => name && !name.startsWith('.'))
+	}
+	catch {
+		return false
+	}
+	return null
+}
+
+/** @type {boolean | null} canUseBluetoothRuntime 缓存 */
+let cachedRuntimeOk = null
+
+/**
+ * 探测 BT 栈是否真正可用（有适配器迹象 → 能 load → poweredOn）。
+ * 任一步失败返回 false，调用方回落其它 discovery/link；不抛错。
+ * @param {number} [timeoutMs=3000] waitPoweredOn 超时
+ * @returns {Promise<boolean>} 可用为 true
+ */
+export async function canUseBluetoothRuntime(timeoutMs = 3000) {
+	if (cachedRuntimeOk !== null) return cachedRuntimeOk
+	if (probeBluetoothHardware() === false) {
+		cachedRuntimeOk = false
+		return false
+	}
+	try {
+		const noble = await loadNoble()
+		if (!noble.startScanningAsync) {
+			cachedRuntimeOk = false
+			return false
+		}
+		await waitPoweredOn(noble, timeoutMs)
+		cachedRuntimeOk = true
+	}
+	catch {
+		cachedRuntimeOk = false
+	}
+	return cachedRuntimeOk
+}
+
+/**
+ * 加载 Noble BLE central。明确无适配器时直接抛错，避免无意义的 native import。
  * @returns {Promise<any>} noble 运行时
  */
 export async function loadNoble() {
+	if (probeBluetoothHardware() === false)
+		throw new Error('p2p: no bluetooth adapter')
 	const mod = await import('@stoprocent/noble')
-	if (typeof mod.withBindings === 'function') return mod.withBindings('default')
-	return mod.default ?? mod
+	return mod?.withBindings?.('default') || mod?.default || mod
 }
 
 /**
- * 加载 Bleno BLE peripheral。
+ * 加载 Bleno BLE peripheral。明确无适配器时直接抛错，避免无意义的 native import。
  * @returns {Promise<any>} bleno 运行时
  */
 export async function loadBleno() {
+	if (probeBluetoothHardware() === false)
+		throw new Error('p2p: no bluetooth adapter')
 	const mod = await import('@stoprocent/bleno')
 	if (typeof mod.withBindings === 'function') return mod.withBindings('default')
 	return mod.default ?? mod
@@ -40,7 +90,7 @@ export async function loadBleno() {
  */
 export async function waitPoweredOn(runtime, timeout) {
 	const wait = runtime.waitForPoweredOnAsync ?? runtime.waitForPoweredOn
-	if (typeof wait !== 'function')
+	if (!wait)
 		throw new Error('p2p: bluetooth runtime missing waitForPoweredOn(Async)')
 	return wait.call(runtime, timeout)
 }

package/discovery/index.mjs

@@ -1,4 +1,4 @@
-/** @typedef {{ id: string, priority: number, caps: { canDiscover?: boolean, canSignal?: boolean, canRelay?: boolean }, advertise?: (topic: string, bytes: Uint8Array) => (() => void) | Promise<() => void>, subscribe?: (topic: string, onAdvert: (bytes: Uint8Array, meta?: object) => void) => (() => void) | Promise<() => void>, canSignalTo?: (to: string) => boolean, sendSignal?: (topic: string, to: string, bytes: Uint8Array) => void | Promise<void>, onSignal?: (topic: string, onSignal: (bytes: Uint8Array, meta?: object) => void) => (() => void) | Promise<() => void> }} DiscoveryProvider */
+/** @typedef {{ id: string, priority: number, caps: { canDiscover?: boolean, canSignal?: boolean, canRelay?: boolean }, advertise?: (topic: string, bytes: Uint8Array) => (() => void) | Promise<() => void>, subscribe?: (topic: string, onAdvert: (bytes: Uint8Array, meta?: object) => void) => (() => void) | Promise<() => void>, sendSignal?: (topic: string, to: string, bytes: Uint8Array) => boolean | void | Promise<boolean | void>, onSignal?: (topic: string, onSignal: (bytes: Uint8Array, meta?: object) => void) => (() => void) | Promise<() => void> }} DiscoveryProvider */
 
 /** @type {Map<string, DiscoveryProvider>} */
 const providers = new Map()
@@ -33,6 +33,7 @@ export function listDiscoveryProviders() {
 
 /**
  * 通过所有可用 provider 广播 topic advert。
+ * 单路失败静默（正常降级）；其它 provider 仍可成功。
  * @param {string} topic advert 主题
  * @param {Uint8Array} bytes advert 载荷
  * @returns {Promise<() => void>} 统一取消函数
@@ -45,10 +46,7 @@ export async function advertiseTopic(topic, bytes) {
 		try {
 			cleanup = await provider.advertise(topic, bytes)
 		}
-		catch (error) {
-			console.warn(`p2p: discovery advertise failed for ${provider.id}`, error)
-			continue
-		}
+		catch { continue }
 		if (typeof cleanup === 'function') cleanups.push(cleanup)
 	}
 	return () => {
@@ -59,6 +57,7 @@ export async function advertiseTopic(topic, bytes) {
 
 /**
  * 通过所有可用 provider 订阅 topic advert。
+ * 单路失败静默（正常降级）。
  * @param {string} topic advert 主题
  * @param {(bytes: Uint8Array, meta?: object) => void} onAdvert advert 回调
  * @returns {Promise<() => void>} 统一取消函数
@@ -71,10 +70,7 @@ export async function subscribeTopic(topic, onAdvert) {
 		try {
 			cleanup = await provider.subscribe(topic, onAdvert)
 		}
-		catch (error) {
-			console.warn(`p2p: discovery subscribe failed for ${provider.id}`, error)
-			continue
-		}
+		catch { continue }
 		if (typeof cleanup === 'function') cleanups.push(cleanup)
 	}
 	return () => {
@@ -85,6 +81,8 @@ export async function subscribeTopic(topic, onAdvert) {
 
 /**
  * 通过 discovery provider 发送信令。
+ * provider 返回 `false` = 本路不可达（正常降级，不计成功）；其它返回值 / void = 已投递。
+ * 单路 throw 静默；全部未投递才 throw。
  * @param {string} topic 信令 topic
  * @param {string} to 目标节点标识
  * @param {Uint8Array} bytes 信令载荷
@@ -95,19 +93,19 @@ export async function sendSignal(topic, to, bytes) {
 	if (!capable.length) throw new Error('p2p: no discovery provider can signal')
 	let sent = false
 	let lastError = null
-	for (const provider of capable) if (provider?.canSignalTo?.(to)) try {
-		await Promise.resolve(provider.sendSignal(topic, to, bytes))
-		sent = true
+	for (const provider of capable) try {
+		if (await Promise.resolve(provider.sendSignal(topic, to, bytes)) !== false)
+			sent = true
 	}
 	catch (error) {
 		lastError = error
-		console.warn(`p2p: discovery signal failed for ${provider.id}`, error)
 	}
 	if (!sent) throw lastError || new Error('p2p: no discovery provider delivered signal')
 }
 
 /**
  * 通过所有可用 provider 监听信令。
+ * 单路失败静默（正常降级）。
  * @param {string} topic 信令 topic
  * @param {(bytes: Uint8Array, meta?: object) => void} onSignal 信令回调
  * @returns {Promise<() => void>} 统一取消函数
@@ -120,10 +118,7 @@ export async function listenSignals(topic, onSignal) {
 		try {
 			cleanup = await provider.onSignal(topic, onSignal)
 		}
-		catch (error) {
-			console.warn(`p2p: discovery signal listener failed for ${provider.id}`, error)
-			continue
-		}
+		catch { continue }
 		if (typeof cleanup === 'function') cleanups.push(cleanup)
 	}
 	return () => {

package/files/chunk_responder.mjs

@@ -94,14 +94,12 @@ export function attachTrustGraphFedChunkResponder(username, room, fedOut, guardG
 				 */
 				const send = () => {
 					try { sendChunkData(resp, pid) }
-					catch (error) {
-						console.warn('federation: trust-graph chunk response failed', error)
-					}
+					catch { /* peer gone — normal */ }
 				}
 				if (fedOut) fedOut.enqueue(6, send)
 				else send()
 			})
-		})().catch(error => console.warn('federation: trust-graph chunk handler failed', error))
+		})().catch(() => { /* peer/handler race — normal degrade */ })
 	})
 
 	getChunkData(data => {
@@ -120,14 +118,12 @@ export function attachTrustGraphFedChunkResponder(username, room, fedOut, guardG
 				 */
 				const send = () => {
 					try { sendManifestData(resp, pid) }
-					catch (error) {
-						console.warn('federation: trust-graph manifest response failed', error)
-					}
+					catch { /* peer gone — normal */ }
 				}
 				if (fedOut) fedOut.enqueue(6, send)
 				else send()
 			})
-		})().catch(error => console.warn('federation: trust-graph manifest handler failed', error))
+		})().catch(() => { /* peer/handler race — normal degrade */ })
 	})
 
 	getManifestData(data => {

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()
 }
 
 /**

package/link/rtc.mjs

@@ -8,7 +8,7 @@ import { wrapRtcPeerConnectionForMdns } from '../transport/rtc_mdns_filter.mjs'
  * libdatachannel 的原生线程在 pc.close() 后仍需时间回收；进程退出时若原生资源未同步销毁，
  * Windows 上会触发堆损坏（退出码 0xC0000374）。
  */
-const { cleanup = undefined } = await import('node-datachannel').catch(console.error)
+const { cleanup = undefined } = await import('node-datachannel').catch(() => ({}))
 process.on('exit', () => {
 	try { cleanup?.() } catch { /* already torn down */ }
 })

package/package.json

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

package/transport/link_registry.mjs

@@ -315,7 +315,9 @@ export function createLinkRegistry(options = {}) {
 		/** @type {import('../link/providers/index.mjs').LinkProvider[]} */
 		const listenProviders = []
 		if (ownedLanTcp) listenProviders.push(ownedLanTcp)
-		if (ownedBleGatt) listenProviders.push(ownedBleGatt)
+		// 无适配器时 isAvailable 应在 import native 前返回 false；勿无条件 ensureListening（会 loadBleno）。
+		if (ownedBleGatt && await Promise.resolve(ownedBleGatt.isAvailable()))
+			listenProviders.push(ownedBleGatt)
 		for (const provider of await listAvailableLinkProviders()) {
 			const id = String(provider.id)
 			if (id.startsWith('lan_tcp') || id.startsWith('ble_gatt')) continue
@@ -347,9 +349,7 @@ export function createLinkRegistry(options = {}) {
 				})
 				if (typeof stop === 'function') stopLinkListeners.push(stop)
 			}
-			catch (error) {
-				console.warn(`p2p: link provider listening failed for ${provider.id}`, error)
-			}
+			catch { /* provider listen unavailable — normal degrade */ }
 		
 		if (listDiscoveryProviders().length) {
 			stopSignalListener = await listenSignals(selfTopic, bytes => {
@@ -591,16 +591,12 @@ export function createLinkRegistry(options = {}) {
 						// soft-fail 返回 null（不 throw）；必须 continue 才能落到更低 level。
 						const link = await dialOfferAnswer(provider, normalized)
 						if (link) return link
-						console.warn(`p2p: link dial failed for ${provider.id}: soft-fail`)
 						continue
 					}
 					const link = await dialProvider(provider, normalized)
 					if (link) return link
-					console.warn(`p2p: link dial failed for ${provider.id}: soft-fail`)
-				}
-				catch (error) {
-					console.warn(`p2p: link dial failed for ${provider.id}: ${error?.message ?? error}`)
 				}
+				catch { /* dial failed — try next provider */ }
 			
 			return null
 		})().finally(() => inflights.delete(normalized))