@steve02081504/fount-p2p 0.0.44 → 0.0.48

package/transport/runtime_bootstrap.mjs

@@ -28,6 +28,15 @@ import { createWebRtcLinkProvider } from '../link/providers/webrtc.mjs'
 import { getSignalingRuntimeConfig, onNodeChange } from '../node/instance.mjs'
 import { isConnectivityDebug, nodeDebug, shortHash } from '../node/log.mjs'
 
+/**
+ * @param {import('../link/providers/index.mjs').LinkProvider} provider 链路提供者
+ * @returns {boolean} 是否由本 registry 自己持有（lan_tcp / ble_gatt 走各自的快速监听路径）
+ */
+function providerIsRegistryOwned(provider) {
+	const { id } = provider
+	return id.startsWith('lan_tcp') || id.startsWith('ble_gatt')
+}
+
 /**
  * @param {import('../link/providers/index.mjs').LinkProvider} provider 链路提供者
  * @returns {boolean} 是否使用原生 probe 路径
@@ -36,6 +45,16 @@ export function providerHasNativeProbe(provider) {
 	return provider.caps?.probe === 'native'
 }
 
+/**
+ * @param {import('../link/providers/index.mjs').LinkProvider} provider 链路提供者
+ * @returns {boolean} 是否需要在 runtime 暖机时补挂监听
+ */
+export function providerNeedsListening(provider) {
+	if (providerIsRegistryOwned(provider)) return false
+	if (providerHasNativeProbe(provider)) return false
+	return !!provider.ensureListening
+}
+
 /**
  * @param {import('../link/providers/index.mjs').LinkProvider | null} ownedLanTcp 本 registry 持有的 lan_tcp
  * @returns {import('../link/providers/index.mjs').LinkProvider[]} 可快速启动监听的 provider 列表
@@ -45,10 +64,8 @@ export function collectFastListenProviders(ownedLanTcp) {
 	const listenProviders = []
 	if (ownedLanTcp) listenProviders.push(ownedLanTcp)
 	for (const provider of listLinkProviders()) {
-		const { id } = provider
-		if (id.startsWith('lan_tcp') || id.startsWith('ble_gatt')) continue
-		if (!provider.ensureListening) continue
-		if (providerHasNativeProbe(provider)) continue
+		if (!providerNeedsListening(provider)) continue
+		// 快速路径只接同步 isAvailable：要等异步探测的 provider 交给 startEnabledProviderListening。
 		if (provider.isAvailable)
 			try {
 				const available = provider.isAvailable()
@@ -202,6 +219,24 @@ export function createRuntimeBootstrap(deps) {
 		return encryptAdvertForScope('network', localIdentity, body)
 	}
 
+	/**
+	 * 为所有「已注册、已启用、尚未监听」的 link provider 启动监听。
+	 * `reconcileLinkProviders()` 重新注册的 provider 只有走到这里才会拿到 onInbound/localIdentity，
+	 * 否则它会静默丢弃全部入站 link-open（见 fount-p2p#38）。
+	 *
+	 * 刻意不看 `isAvailable()`：relay 池为空/未探测时 nostr 的 `isAvailable()` 会是 false，而 relay 列表
+	 * 是在发送时解析的；先挂上监听才能收到入站 link-open，暂时不可用不该让它变哑巴。
+	 * @returns {Promise<void>}
+	 */
+	async function startEnabledProviderListening() {
+		if (!autoRegisterLinkProviders) return
+		await Promise.all(listLinkProviders()
+			.filter(provider => isChannelEnabled(provider.id.split(':')[0]))
+			.filter(provider => providerNeedsListening(provider))
+			.filter(provider => !stopLinkListeners.has(provider.id))
+			.map(provider => startProviderListening(provider)))
+	}
+
 	/**
 	 * @param {number} gen 启动世代
 	 * @returns {Promise<void>}
@@ -212,6 +247,8 @@ export function createRuntimeBootstrap(deps) {
 		signalListenReady = (async () => {
 			await lanListenReady.catch(() => { })
 			if (generation !== gen || !isLive()) return
+			await startEnabledProviderListening().catch(() => { })
+			if (generation !== gen || !isLive()) return
 			if (!listDiscoveryProviders().length) return
 			stopSignalListener = await listenNodeSignals(localIdentity.nodeHash, bytes => {
 				void handleIncomingSignal(bytes).catch(() => { })
@@ -324,11 +361,9 @@ export function createRuntimeBootstrap(deps) {
 			reconcileLinkProviders()
 			reconcileDiscoveryProviders()
 			if (generation !== gen || !isLive()) return
-			if (ownedLanTcp && !stopLinkListeners.has(ownedLanTcp.id))
-				await startProviderListening(ownedLanTcp)
-			if (ownedBleGatt && !stopLinkListeners.has(ownedBleGatt.id)
-				&& await Promise.resolve(ownedBleGatt.isAvailable()))
-				await startProviderListening(ownedBleGatt)
+			// 覆盖本轮新注册/重新注册的 provider（例如关掉再打开 nostr）：只补 ownedLanTcp/BLE
+			// 会让新 provider 永远拿不到 onInbound（见 fount-p2p#38）。
+			await startEnabledProviderListening()
 			signalListenReady = (async () => {
 				if (generation !== gen || !isLive()) return
 				if (!listDiscoveryProviders().length) return

package/utils/async_mutex.mjs

@@ -25,13 +25,21 @@ function mutexState(lockKey) {
  */
 function releaseMutex(lockKey, state) {
 	const next = state.queue.shift()
-	if (next) setTimeout(next, 0)
+	if (next) queueMicrotask(next)
 	else {
 		state.locked = false
 		mutexes.delete(lockKey)
 	}
 }
 
+/**
+ * 当前存活的互斥键数量（仅供测试观察锁表是否回落到基线）。
+ * @returns {number} `mutexes` 中的键数量
+ */
+export function activeMutexCount() {
+	return mutexes.size
+}
+
 /**
  * @param {string} key 锁键
  * @param {() => Promise<T>} criticalSection 临界区
@@ -39,15 +47,14 @@ function releaseMutex(lockKey, state) {
  * @template T
  */
 export async function withAsyncMutex(key, criticalSection) {
-	const lockKey = key
-	const state = mutexState(lockKey)
+	const state = mutexState(key)
 	return new Promise((resolve, reject) => {
 		/** 执行临界区并最终释放锁 */
 		const run = () => {
 			Promise.resolve()
 				.then(criticalSection)
 				.then(resolve, reject)
-				.finally(() => releaseMutex(lockKey, state))
+				.finally(() => releaseMutex(key, state))
 		}
 		if (state.locked) state.queue.push(run)
 		else {

package/utils/shuffle.mjs

@@ -7,7 +7,7 @@
 export function shuffleInPlace(arr) {
 	for (let i = arr.length - 1; i > 0; i--) {
 		const j = Math.floor(Math.random() * (i + 1))
-		;[arr[i], arr[j]] = [arr[j], arr[i]]
+			;[arr[i], arr[j]] = [arr[j], arr[i]]
 	}
 	return arr
 }

package/wire/adapter.mjs

@@ -10,4 +10,4 @@
  */
 
 /** Wire 适配器与上下文的类型导出（运行时代码见各 wire 模块）。 */
-export {}
+export { }

package/pages/index.html

@@ -1,36 +0,0 @@
-<!doctype html>
-<html lang="zh-CN">
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<title>fount 人口统计</title>
-	<style>
-		:root { color-scheme: light dark; }
-		body { font-family: system-ui, sans-serif; max-width: 720px; margin: 3rem auto; padding: 0 1rem; line-height: 1.6; }
-		h1 { font-size: 1.4rem; }
-		.card { border: 1px solid #8884; border-radius: 8px; padding: 1rem 1.25rem; margin: 1rem 0; }
-		.metric { font-size: 2rem; font-weight: 700; }
-		label { display: flex; align-items: center; gap: .5rem; margin: 1rem 0; }
-		#status { opacity: .7; font-size: .9rem; }
-		code { background: #8882; padding: .1em .4em; border-radius: 4px; }
-	</style>
-</head>
-<body>
-	<h1>fount 节点人口统计</h1>
-	<p>基于 Nostr census 事件（kind 30789，<code>t=fount</code> / <code>x=census</code>）的采样估计。监听逻辑由包内 <code>census_monitor</code> 封装：自动监听默认/传入 relay 并经 NIP-66 发现更多，取人口最大的 relay 作为显示源。在线节点数 = <code>Σ(1/p)</code>（Horvitz–Thompson 估计）。</p>
-	<label>
-		<input type="checkbox" id="toggle" checked>
-		人口统计（census）
-	</label>
-	<div class="card">
-		<div>在线节点数估计</div>
-		<div class="metric" id="estimate">0</div>
-		<div id="status">初始化…</div>
-	</div>
-	<div class="card">
-		<div>采样事件数 <span id="sample-size">0</span> · 窗口内事件 <span id="window-events">0</span></div>
-	</div>
-	<footer id="footer" style="opacity:.6;font-size:.85rem">通过 URL 参数 ?relay=wss://... 指定中继；缺省监听默认 relay。</footer>
-	<script type="module" src="./index.mjs"></script>
-</body>
-</html>

package/pages/index.mjs

@@ -1,62 +0,0 @@
-/**
- * fount 人口统计前端（薄壳，逻辑由包内 `census_monitor` 封装）。
- * - `createPopulationMonitor` 自动监听全部默认（或传入）relay、经 NIP-66 发现更多，
- *   并取人口估计最大的 relay 作为显示源，把 `{ estimate, sampleSize, eventsInWindow, relayUrl, relays }`
- *   快照连同 relay 地址传给 onUpdate。
- * - 页面只负责：导入监控器、传显示函数与可选 relay 地址。
- */
-import { createPopulationMonitor } from 'https://esm.sh/@steve02081504/fount-p2p/discovery/nostr/census_monitor.mjs'
-
-const statusEl = document.querySelector('#status')
-const toggleEl = document.querySelector('#toggle')
-
-const params = new URLSearchParams(location.search)
-const relayUrl = params.get('relay')
-
-/** @type {{ stop: () => void } | null} */
-let monitor = null
-
-/**
- * @param {{ estimate: number, sampleSize: number, eventsInWindow: number }} snapshot 快照
- * @returns {void}
- */
-function render(snapshot) {
-	document.querySelector('#estimate').textContent = snapshot.estimate.toLocaleString('zh-CN', { maximumFractionDigits: 1 })
-	document.querySelector('#sample-size').textContent = String(snapshot.sampleSize)
-	document.querySelector('#window-events').textContent = String(snapshot.eventsInWindow)
-}
-
-/** @returns {void} 启动 live 监控（默认/传入 relay 全交给库） */
-function startLive() {
-	if (monitor) return
-	try {
-		monitor = createPopulationMonitor({
-			relays: relayUrl ? [relayUrl] : undefined,
-			onUpdate: snapshot => {
-				render(snapshot)
-				statusEl.textContent = `监听 ${snapshot.relayUrl}（census，共 ${snapshot.relays} 个 relay）`
-			},
-		})
-	}
-	catch (error) {
-		statusEl.textContent = `中继配置无效：${String(error?.message || error)}`
-	}
-}
-
-/** @returns {void} 停止监控 */
-function stopLive() {
-	monitor?.stop()
-	monitor = null
-}
-
-toggleEl.addEventListener('change', () => {
-	if (!toggleEl.checked) {
-		stopLive()
-		render({ estimate: 0, sampleSize: 0, eventsInWindow: 0 })
-		statusEl.textContent = '已关闭'
-		return
-	}
-	startLive()
-})
-
-if (toggleEl.checked) startLive()