@steve02081504/fount-p2p 0.0.16 → 0.0.18

package/discovery/bt/runtime.mjs

@@ -1,8 +1,5 @@
-import { spawn } from 'node:child_process'
 import { existsSync, readdirSync } from 'node:fs'
-import { dirname, join } from 'node:path'
 import process from 'node:process'
-import { fileURLToPath } from 'node:url'
 
 /**
  * 解析 Bluetooth 角色（scan / dual）。
@@ -31,50 +28,34 @@ export function probeBluetoothHardware() {
 
 /** @type {boolean | null} canUseBluetoothRuntime 缓存 */
 let cachedRuntimeOk = null
-/** @type {Promise<boolean> | null} 并发 canUse 合并为一次子进程探测 */
+/** @type {Promise<boolean> | null} 并发 canUse 合并为一次进程内探测 */
 let probeInflight = null
 
-const PROBE_CHILD = join(dirname(fileURLToPath(import.meta.url)), 'probe_child.mjs')
-
 /**
- * 在子进程中探测 BT（父进程 waitPoweredOn 会拖住事件循环；stop() 还可能 AV）。
+ * 进程内 BT 可用性探测：load → poweredOn → stop。
+ * 需要 @stoprocent/noble>=2.5.9（Windows stop() 与事件循环释放，见 stoprocent/noble#95）。
  * @param {number} timeoutMs waitPoweredOn 超时
- * @returns {Promise<boolean>} 子进程 exit 0 为可用
+ * @returns {Promise<boolean>} poweredOn 且 stop 成功为 true
  */
-function probeBluetoothInSubprocess(timeoutMs) {
-	return new Promise(resolve => {
-		const child = spawn(process.execPath, [PROBE_CHILD, String(timeoutMs)], {
-			stdio: 'ignore',
-			windowsHide: true,
-		})
-		// 探测是旁路缓存填充；勿拖住父进程事件循环 / shutdown 退出。
-		child.unref()
-		let settled = false
-		/**
-		 * @param {boolean} ok 探测结果
-		 * @returns {void}
-		 */
-		const finish = ok => {
-			if (settled) return
-			settled = true
-			clearTimeout(timer)
-			resolve(ok)
-		}
-		const timer = setTimeout(() => {
-			child.kill('SIGKILL')
-			finish(false)
-		}, timeoutMs + 5_000)
-		timer.unref()
-		child.once('error', () => finish(false))
-		child.once('exit', (code, signal) => {
-			if (signal) finish(false)
-			else finish(code === 0)
-		})
-	})
+async function probeBluetoothInProcess(timeoutMs) {
+	/** @type {any} */
+	let noble = null
+	try {
+		noble = await loadNoble()
+		if (!noble?.startScanningAsync) return false
+		await waitPoweredOn(noble, timeoutMs)
+		return true
+	}
+	catch {
+		return false
+	}
+	finally {
+		if (noble) try { noble.stop() } catch { /* ignore */ }
+	}
 }
 
 /**
- * 探测 BT 栈是否真正可用（硬件迹象 → 子进程 load → poweredOn）。
+ * 探测 BT 栈是否真正可用（硬件迹象 → 进程内 load → poweredOn → stop）。
  * 任一步失败返回 false；不抛错。
  * @param {number} [timeoutMs=3000] waitPoweredOn 超时
  * @returns {Promise<boolean>} 可用为 true
@@ -86,7 +67,7 @@ export async function canUseBluetoothRuntime(timeoutMs = 3000) {
 		return false
 	}
 	if (!probeInflight)
-		probeInflight = probeBluetoothInSubprocess(timeoutMs)
+		probeInflight = probeBluetoothInProcess(timeoutMs)
 			.then(ok => {
 				cachedRuntimeOk = ok
 				return ok

package/files/manifest_fetch.mjs

@@ -15,9 +15,12 @@ import { fanoutFedFetch } from './fetch_fanout.mjs'
 import { normalizeFileManifest } from './manifest.mjs'
 import { shouldPreferIncomingPublicManifest } from './public_manifest.mjs'
 
+const DEFAULT_MANIFEST_FETCH_TIMEOUT_MS = 8000
+
 /**
  * 拉取公开 manifest；默认不写盘。`cache: true` 或 `cachePublicManifest` 才缓存。
- * @param {{ username: string, ownerEntityHash: string, logicalPath: string, cache?: boolean }} context - 拉取上下文
+ * 本地已有 publicSig 时仍会 fanout 再校验，按 publishedAt 择新；超时则回退本地。
+ * @param {{ username: string, ownerEntityHash: string, logicalPath: string, cache?: boolean, timeoutMs?: number }} context - 拉取上下文
  * @returns {Promise<import('./manifest.mjs').FileManifest | null>} 验签后的 manifest，失败为 null
  */
 export async function fetchPublicManifest(context) {
@@ -27,16 +30,19 @@ export async function fetchPublicManifest(context) {
 	if (!ownerEntityHash || !logicalPath || !username) return null
 
 	const local = await loadFileManifest(ownerEntityHash, logicalPath)
-	if (local?.transferKeyDescriptor?.type === 'public' && local?.meta?.publicSig)
-		return local
+	const hasLocalPublic = local?.transferKeyDescriptor?.type === 'public' && !!local?.meta?.publicSig
 
-	if (pendingManifestFetches.size >= MAX_PENDING_MANIFEST_FETCHES) return null
+	if (pendingManifestFetches.size >= MAX_PENDING_MANIFEST_FETCHES)
+		return hasLocalPublic ? local : null
 
+	const timeoutMs = Number(context.timeoutMs) > 0
+		? Number(context.timeoutMs)
+		: DEFAULT_MANIFEST_FETCH_TIMEOUT_MS
 	const requestId = randomUUID()
 	const { done } = registerManifestFetchWait(
 		requestId,
 		manifestFetchExpectedKey(ownerEntityHash, logicalPath),
-		8000,
+		timeoutMs,
 	)
 	const { nodeHash } = await resolveNodeHash(username)
 	const payload = {
@@ -47,11 +53,14 @@ export async function fetchPublicManifest(context) {
 	}
 	await fanoutFedFetch(username, 'fed_manifest_get', payload)
 	const result = await done
-	if (!result) return null
 
-	if (context.cache === true)
-		await cachePublicManifest(ownerEntityHash, logicalPath, result)
-	return result
+	if (result && (!hasLocalPublic || shouldPreferIncomingPublicManifest(local, result))) {
+		if (context.cache === true)
+			await cachePublicManifest(ownerEntityHash, logicalPath, result)
+		return result
+	}
+	if (hasLocalPublic) return local
+	return null
 }
 
 /**

package/package.json

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

package/discovery/bt/probe_child.mjs

@@ -1,21 +0,0 @@
-/**
- * 子进程 BT 可用性探测：load → poweredOn → stop → exit。
- * 由 `canUseBluetoothRuntime` spawn；勿在父进程直接跑 waitPoweredOn（会拖住事件循环）。
- * argv[2]：waitPoweredOn 超时毫秒（默认 3000）。
- */
-import process from 'node:process'
-
-import { loadNoble, waitPoweredOn } from './runtime.mjs'
-
-const timeoutMs = Number(process.argv[2] || 3000)
-
-try {
-	const noble = await loadNoble()
-	if (!noble?.startScanningAsync) process.exit(2)
-	await waitPoweredOn(noble, timeoutMs)
-	try { noble.stop() } catch { /* Windows 上 stop 偶发崩；子进程反正要退出 */ }
-	process.exit(0)
-}
-catch {
-	process.exit(1)
-}