@steve02081504/fount-p2p 0.0.9 → 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()
 }
 
 /**

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/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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@steve02081504/fount-p2p",
-	"version": "0.0.9",
+	"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