@steve02081504/fount-p2p 0.0.36 → 0.0.37

package/pages/app.mjs

@@ -0,0 +1,172 @@
+/**
+ * fount 人口统计前端（独立实现，不依赖包内代码）。
+ * - 浏览器原生 WebSocket 订阅 Nostr 中继 kind=30789 / #t=fount / #x=census。
+ * - 本地用 @noble 验签（懒加载，仅 live 模式需要）。
+ * - 在线节点数估计 = Σ(1/p)（HT）。
+ * - `?demo=1`（或无 relay 参数）进入演示模式：喂入 20 条 p=0.1 的样本 → 估计 200。
+ */
+const CENSUS_KIND = 30789
+const CENSUS_TTL_MS = 10 * 60_000
+const CENSUS_SUB_ID = 'census'
+const CENSUS_MIN_P = 0.001
+/** relay 帧 content 最大长度（超出直接丢弃，避免先 Base64 解码再被拒）。 */
+const MAX_FRAME_BYTES = 16 * 1024
+/** 并发验签任务上限；达上限时多余帧直接丢弃。 */
+const MAX_INFLIGHT_VERIFICATIONS = 8
+
+const statusEl = document.querySelector('#status')
+const toggleEl = document.querySelector('#toggle')
+
+const params = new URLSearchParams(location.search)
+const relayUrl = params.get('relay')
+const demoMode = params.get('demo') === '1' || !relayUrl
+
+/** @type {Map<string, { p: number, at: number }>} */
+const events = new Map()
+let webSocket = null
+let enabled = true
+let inflightVerifications = 0
+
+/**
+ * HT 估计；遍历时逐出过期事件，避免窗口 Map 持续增长。
+ * @returns {{ estimate: number, sampleSize: number }} 估计与采样数
+ */
+function estimatePopulation() {
+	let total = 0
+	let sampleSize = 0
+	const now = Date.now()
+	for (const [hash, { p, at }] of events) {
+		if (!Number.isFinite(at) || now - at > CENSUS_TTL_MS) { events.delete(hash); continue }
+		total += 1 / p
+		sampleSize++
+	}
+	return { estimate: total, sampleSize }
+}
+
+let noblePromise = null
+/** @returns {Promise<[object, object]>} noble 模块 */
+function loadNoble() {
+	return noblePromise ||= Promise.all([
+		import('https://esm.sh/@noble/curves@1/ed25519.js'),
+		import('https://esm.sh/@noble/hashes@1/sha2.js'),
+	])
+}
+
+/**
+ * 校验 census 包：nodeHash=sha256(nodePubKey) 且 Ed25519 签名匹配 `fount-census\0ts\0nodeHash\0p`。
+ * @param {object} packet 原始包
+ * @returns {Promise<{ nodeHash: string, p: number, ts: number } | null>} 验签结果
+ */
+async function verifyCensusPacket(packet) {
+	const nodeHash = /^[\da-f]{64}$/u.test(String(packet?.nodeHash ?? '')) ? packet.nodeHash : null
+	const nodePubKey = /^[\da-f]{64}$/u.test(String(packet?.nodePubKey ?? '')) ? packet.nodePubKey : null
+	const sig = /^[\da-f]{128}$/u.test(String(packet?.sig ?? '')) ? packet.sig : null
+	const ts = Number(packet?.ts)
+	const p = Number(packet?.p)
+	if (!nodeHash || !nodePubKey || !sig || !Number.isFinite(ts)) return null
+	if (Math.abs(Date.now() - ts) > CENSUS_TTL_MS) return null
+	if (!Number.isFinite(p) || p < CENSUS_MIN_P || p > 1) return null
+	const [{ ed25519 }, { sha256 }] = await loadNoble()
+	const pubBytes = new Uint8Array(nodePubKey.match(/.{2}/gu).map(hex => parseInt(hex, 16)))
+	if ([...sha256(pubBytes)].map(byte => byte.toString(16).padStart(2, '0')).join('') !== nodeHash) return null
+	const ok = ed25519.verify(
+		new Uint8Array(sig.match(/.{2}/gu).map(hex => parseInt(hex, 16))),
+		new TextEncoder().encode(`fount-census\0${ts}\0${nodeHash}\0${p}`),
+		pubBytes,
+	)
+	return ok ? { nodeHash, p, ts } : null
+}
+
+/** @param {{ nodeHash: string, p: number, ts: number }} verified 已验签 census 包 @returns {void} */
+function ingest(verified) {
+	const existing = events.get(verified.nodeHash)
+	if (existing && verified.ts < existing.at) return
+	events.set(verified.nodeHash, { p: verified.p, at: verified.ts })
+	render()
+}
+
+/** @returns {void} 渲染人口估计 */
+function render() {
+	const { estimate, sampleSize } = estimatePopulation()
+	document.querySelector('#estimate').textContent = estimate.toLocaleString('zh-CN', { maximumFractionDigits: 1 })
+	document.querySelector('#sample-size').textContent = String(sampleSize)
+	document.querySelector('#window-events').textContent = String(events.size)
+}
+
+/** @returns {void} 注入演示数据 */
+function seedDemo() {
+	events.clear()
+	for (let index = 0; index < 20; index++)
+		events.set((index + 1).toString(16).padStart(2, '0').repeat(32), { p: 0.1, at: Date.now() })
+	statusEl.textContent = '演示模式：20 条 p=0.1 样本（HT 估计 = 200）'
+	document.querySelector('#footer').textContent = '演示模式样本为虚构数据；添加 ?relay=wss://... 进入 live 模式。'
+}
+
+/** @returns {void} 连接中继并订阅 */
+function connectRelay() {
+	if (webSocket) {
+		try { webSocket.close() } catch { /* ignore */ }
+		webSocket = null
+	}
+	if (!relayUrl || !enabled) return
+	statusEl.textContent = `连接 ${relayUrl} …`
+	const connection = new WebSocket(relayUrl)
+	webSocket = connection
+	/** WebSocket 已连接后发送 REQ 订阅 census 事件。 */
+	connection.onopen = () => {
+		if (connection !== webSocket || !enabled) return
+		connection.send(JSON.stringify(['REQ', CENSUS_SUB_ID, { kinds: [CENSUS_KIND], '#t': ['fount'], '#x': ['census'] }]))
+		statusEl.textContent = `监听 ${relayUrl}（kind ${CENSUS_KIND}）`
+	}
+	/**
+	 * @param {MessageEvent} rawMessage 中继消息事件
+	 * @returns {void}
+	 */
+	connection.onmessage = rawMessage => {
+		if (connection !== webSocket || !enabled) return
+		if (inflightVerifications >= MAX_INFLIGHT_VERIFICATIONS) return
+		if (typeof rawMessage.data !== 'string' || rawMessage.data.length > MAX_FRAME_BYTES) return
+		let parsed
+		try { parsed = JSON.parse(String(rawMessage.data)) } catch { return }
+		if (parsed?.[0] !== 'EVENT' || parsed[1] !== CENSUS_SUB_ID) return
+		if (parsed[2]?.kind !== CENSUS_KIND) return
+		const content = parsed[2]?.content
+		if (typeof content !== 'string' || content.length > MAX_FRAME_BYTES) return
+		inflightVerifications++
+		void (async () => {
+			try {
+				const verified = await verifyCensusPacket(JSON.parse(atob(content)))
+				if (connection !== webSocket || !enabled) return
+				if (verified) ingest(verified)
+			}
+			catch { /* ignore malformed */ }
+			finally { inflightVerifications-- }
+		})()
+	}
+	/** WebSocket 关闭时更新状态为已断开。 */
+	connection.onclose = () => {
+		if (connection !== webSocket || !enabled) return
+		statusEl.textContent = '已断开'
+	}
+	/** WebSocket 出错时提示中继连接失败。 */
+	connection.onerror = () => {
+		if (connection !== webSocket || !enabled) return
+		statusEl.textContent = '中继连接失败'
+	}
+}
+
+toggleEl.addEventListener('change', () => {
+	enabled = toggleEl.checked
+	if (!enabled) {
+		events.clear()
+		if (webSocket) { try { webSocket.close() } catch { /* ignore */ } webSocket = null }
+		statusEl.textContent = '已关闭'
+	}
+	else if (demoMode) seedDemo()
+	else connectRelay()
+	render()
+})
+
+if (demoMode) seedDemo()
+else connectRelay()
+render()

package/pages/index.html

@@ -0,0 +1,36 @@
+<!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>Σ(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"></footer>
+	<script type="module" src="./app.mjs"></script>
+</body>
+</html>

package/reputation/engine.mjs

@@ -301,8 +301,7 @@ export function applyDecayCollusionAfterSlashPure(data, targetPubKeyHash, invite
 	for (let hop = 1; hop <= effectiveMaxHop(); hop++) {
 		const upstream = new Set()
 		for (const edge of inviteEdges) {
-			const to = edge.to
-			const from = edge.from
+			const { to, from } = edge
 			if (frontier.has(to) && from) upstream.add(from)
 		}
 		if (!upstream.size) break

package/transport/runtime_bootstrap.mjs

@@ -10,7 +10,12 @@ import {
 	unregisterDiscoveryProvider,
 } from '../discovery/index.mjs'
 import { createLanDiscoveryProvider } from '../discovery/lan.mjs'
-import { createNostrDiscoveryProvider, resolveNostrRelayUrls } from '../discovery/nostr.mjs'
+import { MAX_ADVERT_RELAY_POOL } from '../discovery/nostr/constants.mjs'
+import {
+	createNostrDiscoveryProvider,
+	resolveNostrRelayUrls,
+} from '../discovery/nostr/index.mjs'
+import { getListenRelays, getWorkingRelays, loadRelayPool, startNostrRelayDiscovery } from '../discovery/nostr/relays.mjs'
 import { createBleGattLinkProvider } from '../link/providers/ble_gatt.mjs'
 import {
 	listLinkProviders,
@@ -18,7 +23,7 @@ import {
 	unregisterLinkProvider,
 } from '../link/providers/index.mjs'
 import { createLanTcpLinkProvider } from '../link/providers/lan_tcp.mjs'
-import { createNostrLinkProvider } from '../link/providers/nostr.mjs'
+import { createNostrLinkProvider } from '../link/providers/nostr/index.mjs'
 import { createWebRtcLinkProvider } from '../link/providers/webrtc.mjs'
 import { getSignalingRuntimeConfig, onNodeChange } from '../node/instance.mjs'
 import { isConnectivityDebug, nodeDebug, shortHash } from '../node/log.mjs'
@@ -88,6 +93,8 @@ export function createRuntimeBootstrap(deps) {
 	let stopPresence = null
 	/** @type {(() => void) | null} */
 	let stopSignalListener = null
+	/** @type {(() => void) | null} */
+	let stopRelayDiscovery = null
 	/** @type {Map<string, () => void>} */
 	const stopLinkListeners = new Map()
 	/** @type {ReturnType<typeof createLanTcpLinkProvider> | null} */
@@ -153,7 +160,21 @@ export function createRuntimeBootstrap(deps) {
 	async function buildLocalAdvert(scope = 'node') {
 		await whenListening()
 		const tcpPort = lanTcpPort()
-		return await buildSignedAdvertForScope(scope, localIdentity, tcpPort ?? undefined)
+		// 仅 network 域注入 relay 字段；LAN 域传空对象（签名消息仍含空的 relays: 段）。
+		return buildSignedAdvertForScope(
+			scope,
+			localIdentity,
+			tcpPort ?? undefined,
+			scope === 'network'
+				? {
+					pool: getWorkingRelays()
+						.filter(entry => entry.rttMs != null)
+						.slice(0, MAX_ADVERT_RELAY_POOL)
+						.map(entry => ({ url: entry.url, rttMs: entry.rttMs })),
+					listen: getListenRelays().map(entry => entry.url),
+				}
+				: { pool: [], listen: [] },
+		)
 	}
 
 	/**
@@ -296,6 +317,10 @@ export function createRuntimeBootstrap(deps) {
 			stopSignalListener?.()
 			stopPresence = null
 			stopSignalListener = null
+			// 重启 NIP-66 发现（不重新 loadRelayPool：避免用磁盘旧数据覆盖内存中的 poolEntries/peerRoutes）。
+			stopRelayDiscovery?.()
+			stopRelayDiscovery = null
+			if (isChannelEnabled('nostr')) stopRelayDiscovery = startNostrRelayDiscovery()
 			reconcileLinkProviders()
 			reconcileDiscoveryProviders()
 			if (generation !== gen || !isLive()) return
@@ -337,6 +362,15 @@ export function createRuntimeBootstrap(deps) {
 		runtimeStart = (async () => {
 			runtimeStarted = true
 			const gen = generation
+			// 先加载/播种 relay 池，再启动 NIP-66 发现（首轮异步，不阻塞 startup）。
+			loadRelayPool()
+			if (isChannelEnabled('nostr')) {
+				if (!stopRelayDiscovery) stopRelayDiscovery = startNostrRelayDiscovery()
+			}
+			else {
+				stopRelayDiscovery?.()
+				stopRelayDiscovery = null
+			}
 			reconcileLinkProviders()
 			if (autoRegisterDiscoveryProviders)
 				reconcileDiscoveryProviders()
@@ -407,6 +441,8 @@ export function createRuntimeBootstrap(deps) {
 		stopSignalListener?.()
 		stopPresence = null
 		stopSignalListener = null
+		stopRelayDiscovery?.()
+		stopRelayDiscovery = null
 		await Promise.race([
 			runtimeWarm?.catch(() => { }) ?? Promise.resolve(),
 			new Promise(resolve => setTimeout(resolve, 500)),