@steve02081504/fount-p2p 0.0.0 → 0.0.1

package/discovery/bt.mjs

@@ -38,6 +38,35 @@ async function loadBleno() {
 	return mod.default ?? mod
 }
 
+/**
+ * 等待 BLE 运行时进入 poweredOn（兼容 noble v1/v2 与 bleno）。
+ * @param {*} runtime noble 或 bleno 实例
+ * @param {number} [timeout] 超时毫秒
+ * @returns {Promise<void>}
+ */
+export async function waitPoweredOn(runtime, timeout) {
+	const wait = runtime.waitForPoweredOnAsync ?? runtime.waitForPoweredOn
+	if (typeof wait !== 'function')
+		throw new Error('p2p: bluetooth runtime missing waitForPoweredOn(Async)')
+	return wait.call(runtime, timeout)
+}
+
+/**
+ * 探测本机 noble 运行时是否具备 BT 扫描所需 API。
+ * @returns {Promise<boolean>}
+ */
+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
+	}
+}
+
 /**
  * 将 advert 映射序列化为可读 characteristic blob。
  * @param {Map<string, Uint8Array>} adverts topic → payload 映射
@@ -144,7 +173,7 @@ export function createBluetoothDiscoveryProvider() {
 				}
 			},
 		})
-		await bleno.waitForPoweredOnAsync(5_000)
+		await waitPoweredOn(bleno, 5_000)
 		await bleno.setServicesAsync([
 			new bleno.PrimaryService({
 				uuid: BT_SERVICE_UUID,
@@ -218,7 +247,7 @@ export function createBluetoothDiscoveryProvider() {
 	async function ensureScanRuntime() {
 		if (scanningStarted) return
 		const noble = await loadNoble()
-		await noble.waitForPoweredOnAsync()
+		await waitPoweredOn(noble, 5_000)
 		noble.on('discover', peripheral => {
 			void inspectPeripheral(peripheral).catch(() => { })
 		})

package/link/handshake.mjs

@@ -10,7 +10,7 @@ import { normalizeDtlsFingerprint } from './sdp_fingerprint.mjs'
 /**
  * Link 握手签名域标识符。
  */
-export const LINK_HANDSHAKE_DOMAIN = 'fount-link-v1'
+export const LINK_HANDSHAKE_DOMAIN = 'fount-link'
 
 /**
  * 构造 link auth 待签名字节串。
@@ -126,7 +126,7 @@ export async function verifyAuth(hello, auth, expectedNonce, remoteFingerprintFr
  * @returns {Uint8Array} 待签名消息字节
  */
 export function buildAdvertMessage(topic, ts, nodeHash) {
-	return Buffer.from(`fount-advert-v1\0${String(topic)}\0${String(ts)}\0${normalizeHex64(nodeHash)}`, 'utf8')
+	return Buffer.from(`fount-advert\0${String(topic)}\0${String(ts)}\0${normalizeHex64(nodeHash)}`, 'utf8')
 }
 
 /**

package/overlay/index.mjs

@@ -4,7 +4,7 @@ import { pubKeyHash, sign, verify } from '../crypto/crypto.mjs'
 import { randomMsgIdHex } from '../link/frame.mjs'
 import { createLruMap } from '../utils/lru.mjs'
 
-const ROUTE_DOMAIN = 'fount-route-v1'
+const ROUTE_DOMAIN = 'fount-route'
 
 /**
  * 构造 overlay 路由签名用的字节序列。

package/package.json

@@ -1,8 +1,8 @@
 {
 	"name": "@steve02081504/fount-p2p",
-	"version": "0.0.0",
+	"version": "0.0.1",
 	"description": "fount federation P2P layer — link, trust graph, mailbox, DAG, EVFS.",
-	"categories": [
+	"keywords": [
 		"network",
 		"p2p",
 		"fount",
@@ -60,14 +60,14 @@
 		"./utils/*": "./utils/*.mjs"
 	},
 	"dependencies": {
-		"@noble/curves": "^1.9.0",
-		"node-datachannel": "^0.11.0"
+		"@noble/curves": "latest",
+		"node-datachannel": "latest"
 	},
 	"devDependencies": {
-		"@steve02081504/exec": "file:../../exec"
+		"@steve02081504/exec": "latest"
 	},
 	"optionalDependencies": {
-		"@stoprocent/bleno": "^0.11.0",
-		"@stoprocent/noble": "^1.9.0"
+		"@stoprocent/bleno": "latest",
+		"@stoprocent/noble": "latest"
 	}
 }

package/transport/link_registry.mjs

@@ -15,7 +15,7 @@ import { createLruMap } from '../utils/lru.mjs'
 
 import { DEFAULT_ICE_SERVERS } from './ice_servers.mjs'
 
-const SIGNAL_DOMAIN = 'fount-signal-v1'
+const SIGNAL_DOMAIN = 'fount-signal'
 const NODE_TOPIC_DOMAIN = 'fount-rdv-node:'
 const GROUP_TOPIC_DOMAIN = 'fount-rdv-group:'
 
@@ -235,11 +235,11 @@ export function createLinkRegistry(opts = {}) {
 			const providerIds = new Set(listDiscoveryProviders().map(provider => provider.id))
 			if (!providerIds.has('mdns'))
 				registerDiscoveryProvider(createMdnsDiscoveryProvider())
-			if (!providerIds.has('bt'))
-				await import('@stoprocent/noble')
-					.then(() => import('../discovery/bt.mjs'))
-					.then(bt => registerDiscoveryProvider(bt.createBluetoothDiscoveryProvider()))
-					.catch(() => { })
+			if (!providerIds.has('bt')) {
+				const bt = await import('../discovery/bt.mjs').catch(() => null)
+				if (await bt?.canUseBluetoothDiscovery?.())
+					registerDiscoveryProvider(bt.createBluetoothDiscoveryProvider())
+			}
 			if (!providerIds.has('nostr'))
 				// 测试通过 initNode({ signaling: { relayOverride } }) 注入共享 loopback relay；生产则回落到用户 relay + 默认公网 relay。
 				// 新 discovery 栈也必须尊重这层 runtime override，否则 live 双节点测试会各打各的公网 relay。