@steve02081504/fount-p2p 0.0.41 → 0.0.43

package/AGENTS.md

@@ -24,6 +24,8 @@ Detail docs: [transports](docs/transports.md) · [mesh](docs/mesh.md) · [signal
 | `crypto/crypto.mjs` | Node + browser | `@noble/hashes` + `@noble/curves` only — never `node:crypto` |
 | `crypto/key.mjs` / `crypto/channel.mjs`, disk I/O, LAN/BT, `ws`, CLI / `startNode` | Node (+ Deno bridge) | Do not load the whole package via esm.sh in the browser |
 
+**Browser pages reusing package code:** pages import browser-safe package modules (`core/*`, `crypto/crypto.mjs`, `discovery/nostr/constants|_math|_verify|_monitor`) from esm.sh; their bare `@noble/*` deps resolve via an injected importmap. The frontend static test server (`test/frontend/census_page.test.mjs`) serves the whole package root (offline), injects an importmap into served HTML (`https://esm.sh/@steve02081504/fount-p2p/` → local package root, `@noble/` → `https://esm.sh/@noble/`), and runs the page live against a fake relay (`test/helpers/fake_relay.mjs` with `store`), injecting its `ws://` URL via `?relay=` — no demo mode. Page code stays a thin shell — pass display fn + optional relays; logic lives in the package (`discovery/nostr/census_monitor.mjs`).
+
 Deno / native / BT: [runtime.md](docs/runtime.md).
 
 ## Conventions
@@ -33,6 +35,7 @@ Deno / native / BT: [runtime.md](docs/runtime.md).
 - **Heterogeneous backends:** normalize at the load boundary (e.g. `link/rtc/ice_local_hostname.mjs` wraps W3C RTC backends); call sites speak one contract.
 - **File naming:** parent directory is scope — short child names. Tunables default `<dir>/tunables.json` (exception: `schemas/part_query.tunables.json`). Subpath `package.json` exports mirror filenames.
 - **Import boundary:** `test/integration/p2p_shell_import_guard.test.mjs`.
+- **Security fixes are not backward compatible:** fount guarantees the whole network upgrades to the latest build together. Fix wire formats directly — no version fields, no compat branches.
 - **No scattered `trim` / `toLowerCase`:** hex IDs must already be lowercase and without a `0x` prefix — a `0x`-prefixed, mixed-case, or whitespace value is rejected by `isHex64`/`isEntityHash128`, never cleaned. Exceptions: JSONL blank lines, SDP fingerprint, CLI/`scripts` parsing.
 - **No `String(x)` / `x || ''` on typed `string`:** if `@param {string}`, use it directly; `String(...)` / `|| ''` / `?? ''` only at optional / `unknown` / disk / inbound boundaries, or number→string.
 - **Optional methods:** `if (fn) return await fn(...)` / `if (fn) …` — never `typeof x === 'function'`.

package/discovery/lan_interfaces.mjs

@@ -3,12 +3,29 @@ import os from 'node:os'
 /** advert / 组播 beacon 携带的 LAN IPv4 上限 */
 export const MAX_LAN_HOSTS = 4
 
-const IPV4_RE = /^(?:\d{1,3}\.){3}\d{1,3}$/
+/**
+ * 私网 / 链路本地 IPv4（RFC1918 + 169.254/16）。
+ * advert 自报地址只允许这些：否则攻击者可借受害者的拨号对内网/公网发起 TCP 探测（SSRF）。
+ * @param {string} host 候选 IPv4
+ * @returns {boolean} 是否允许作为可拨号 LAN hint
+ */
+function isPrivateLanIpv4(host) {
+	const parts = host.split('.')
+	if (parts.length !== 4) return false
+	const octets = parts.map(part => Number(part))
+	if (octets.some(n => !Number.isInteger(n) || n < 0 || n > 255)) return false
+	const [a, b] = octets
+	if (a === 10) return true
+	if (a === 172 && b >= 16 && b <= 31) return true
+	if (a === 192 && b === 168) return true
+	if (a === 169 && b === 254) return true
+	return false
+}
 
 /**
  * untrusted ingress：清洗 advert body 中的 LAN IPv4 列表。
  * @param {unknown} input 原始 lanHosts
- * @returns {string[]} 去重后的 IPv4 列表
+ * @returns {string[]} 去重后的私网/链路本地 IPv4 列表
  */
 export function normalizeLanHosts(input) {
 	if (!input) return []
@@ -18,7 +35,7 @@ export function normalizeLanHosts(input) {
 	const out = []
 	for (const item of arr) {
 		const host = String(item || '')
-		if (!host || !IPV4_RE.test(host) || seen.has(host)) continue
+		if (!host || !isPrivateLanIpv4(host) || seen.has(host)) continue
 		seen.add(host)
 		out.push(host)
 		if (out.length >= MAX_LAN_HOSTS) break

package/discovery/nostr/census.mjs

@@ -15,45 +15,33 @@
  */
 import { Buffer } from 'node:buffer'
 
-import { isHex64, isSignatureHex128 } from '../../core/hexIds.mjs'
-import { keyPairFromSeed, pubKeyHash, sign, verify } from '../../crypto/crypto.mjs'
+import { isHex64 } from '../../core/hexIds.mjs'
+import { keyPairFromSeed, pubKeyHash, sign } from '../../crypto/crypto.mjs'
 import { ensureNodeSeed, getNodeHash } from '../../node/identity.mjs'
 import { getP2PFeatures, isNodeInitialized } from '../../node/instance.mjs'
 import { nodeDebug } from '../../node/log.mjs'
 
 import {
-	CENSUS_MIN_P,
+	CENSUS_TAG_FOUNT,
+	CENSUS_TAG_X,
+	NOSTR_CENSUS_KIND,
+} from './constants.mjs'
+import {
 	CENSUS_TARGET_EVENTS,
 	estimatePopulation,
 	nextInclusionProbability,
 } from './census_math.mjs'
+import { CENSUS_TTL_MS, buildCensusMessage, verifyCensusBytes } from './census_verify.mjs'
 import { resolveRelayConnectTarget } from './relays.mjs'
 
-/** Nostr census 事件 kind（每节点每窗口至多一条，按 nodeHash 去重）。 */
-export const NOSTR_CENSUS_KIND = 30789
-
-/** census 订阅/发布标签：`t=fount` + `x=census`（subscribeNostrKind 以 rendezvousKey/tagX 匹配）。 */
-const CENSUS_TAG_FOUNT = 'fount'
-const CENSUS_TAG_X = 'census'
+/** census 订阅标签数组（发布用）。 */
 const CENSUS_TAGS = [['t', CENSUS_TAG_FOUNT], ['x', CENSUS_TAG_X]]
 
-/** 事件/窗口存活时间（与 advert TTL 一致）。 */
-const CENSUS_TTL_MS = 10 * 60_000
 /** 发布/统计周期。 */
 const CENSUS_INTERVAL_MS = 10 * 60_000
 /** 冷启动初始包含概率。 */
 const CENSUS_INITIAL_P = 0.5
 
-/**
- * @param {number} ts 时间戳（毫秒）
- * @param {string} nodeHash 64 hex 节点 hash
- * @param {number} p 包含概率
- * @returns {Buffer} 待签名消息
- */
-function buildCensusMessage(ts, nodeHash, p) {
-	return Buffer.from(`fount-census\0${ts}\0${nodeHash}\0${p}`, 'utf8')
-}
-
 /**
  * 用指定 seed 身份构建签名 census 包（nodeHash 由 seed 派生）。
  * 供工具与测试构造任意身份的 peer 包。
@@ -75,47 +63,6 @@ export async function buildCensusPacketFromSeed(seedHex, { p, ts = Date.now() })
 	}
 }
 
-/**
- * 校验 census 包（Untrusted ingress）：canonicalize + 验签 + 时间窗 + p 范围。
- * @param {unknown} packet 原始 census 包
- * @param {number} [now=Date.now()] 当前时间（毫秒）
- * @param {number} [ttlMs=CENSUS_TTL_MS] 允许的时间窗
- * @returns {Promise<{ nodeHash: string, p: number, ts: number } | null>} 校验通过返回 nodeHash/p/ts，否则 null
- */
-export async function verifyCensusPacket(packet, now = Date.now(), ttlMs = CENSUS_TTL_MS) {
-	const nodeHash = isHex64(packet?.nodeHash)
-	const nodePubKey = isHex64(packet?.nodePubKey)
-	const sig = isSignatureHex128(packet?.sig)
-	const ts = Number(packet?.ts)
-	const p = Number(packet?.p)
-	if (!nodeHash || !nodePubKey || !sig || !Number.isFinite(ts)) return null
-	if (Math.abs(now - ts) > ttlMs) return null
-	if (!Number.isFinite(p) || p < CENSUS_MIN_P || p > 1) return null
-	try {
-		if (pubKeyHash(Buffer.from(nodePubKey, 'hex')) !== nodeHash) return null
-	}
-	catch {
-		return null
-	}
-	return await verify(Buffer.from(sig, 'hex'), buildCensusMessage(ts, nodeHash, p), Buffer.from(nodePubKey, 'hex')) ? { nodeHash, p, ts } : null
-}
-
-/**
- * 解 base64 content 字节并校验 census 包。
- * @param {Uint8Array} bytes content 解码字节
- * @param {number} [now=Date.now()] 当前时间（毫秒）
- * @param {number} [ttlMs=CENSUS_TTL_MS] 允许的时间窗
- * @returns {Promise<{ nodeHash: string, p: number, ts: number } | null>} 校验通过结果或 null
- */
-export async function verifyCensusBytes(bytes, now = Date.now(), ttlMs = CENSUS_TTL_MS) {
-	try {
-		return await verifyCensusPacket(JSON.parse(Buffer.from(bytes).toString('utf8')), now, ttlMs)
-	}
-	catch {
-		return null
-	}
-}
-
 /** 窗口事件：nodeHash → { p, at }（模块级，与 visibleByHash 同模式）。 */
 const censusEvents = new Map()
 

package/discovery/nostr/census_monitor.mjs

@@ -0,0 +1,403 @@
+/**
+ * 浏览器端人口统计监控器（无 Node 依赖；WebSocket + Ed25519 验签）。
+ *
+ * 供 pages 等纯前端消费：`createPopulationMonitor({ onUpdate, relays, signal })`。
+ * 开始监听即自动：
+ * 1. 连接全部默认（或传入）relay，订阅 census 事件（kind 30789，t=fount / x=census）；
+ * 2. 经 NIP-66（kind 30166）发现更多 relay 并加入监听（断开自动指数退避重连）；
+ * 3. 每轮刷新取人口估计最大的 relay 作为显示源，把
+ *    `{ estimate, sampleSize, eventsInWindow, relayUrl, relays }` 快照传给 onUpdate。
+ */
+import { base64ToBytes } from '../../core/bytes_codec.mjs'
+
+import {
+	CENSUS_TAG_FOUNT,
+	CENSUS_TAG_X,
+	DEFAULT_RELAY_URLS,
+	NIP66_BOOTSTRAP_RELAYS,
+	NOSTR_CENSUS_KIND,
+} from './constants.mjs'
+import { estimatePopulation } from './census_math.mjs'
+import { CENSUS_TTL_MS, verifyCensusBytes } from './census_verify.mjs'
+
+/** NIP-66 relay 注册 kind。 */
+const NIP66_KIND = 30166
+/** NIP-66 发现周期。 */
+const NIP66_REFRESH_MS = 30 * 60_000
+/** 单次 NIP-66 REQ 上限。 */
+const NIP66_REQ_LIMIT = 300
+/** 监控 relay 数上限（防 socket 爆炸）。 */
+const MAX_MONITOR_RELAYS = 32
+/** relay 帧 content 最大长度（超出直接丢弃，避免先 Base64 解码再被拒）。 */
+const MAX_FRAME_BYTES = 16 * 1024
+/** 并发验签任务上限；达上限时多余帧直接丢弃。 */
+const MAX_INFLIGHT_VERIFICATIONS = 8
+/** 单次连接超时。 */
+const CONNECT_TIMEOUT_MS = 10_000
+/** 断线重连指数退避：初始延迟与上限。 */
+const RECONNECT_BASE_MS = 1_000
+const RECONNECT_MAX_MS = 30_000
+/** 事件入库后刷新防抖。 */
+const REFRESH_DEBOUNCE_MS = 300
+/** 无事件时周期刷新默认间隔（也用于 TTL 逐出）。 */
+const DEFAULT_REFRESH_MS = 5_000
+
+/**
+ * 规范化 Nostr relay URL（浏览器端轻量版）：仅 ws/wss，小写 host，去默认端口与尾部斜杠。
+ * @param {unknown} raw 原始 URL
+ * @returns {string | null} 规范化字符串，无效返回 null
+ */
+function normalizeRelayUrl(raw) {
+	const value = String(raw || '').trim()
+	if (!value) return null
+	let url
+	try { url = new URL(value) } catch { return null }
+	if (url.protocol !== 'wss:' && url.protocol !== 'ws:') return null
+	if (!url.hostname) return null
+	url.hostname = url.hostname.toLowerCase()
+	if (url.port && ((url.protocol === 'wss:' && url.port === '443') || (url.protocol === 'ws:' && url.port === '80')))
+		url.port = ''
+	const path = url.pathname.replace(/\/+$/, '') || '/'
+	url.pathname = path
+	return url.toString().replace(/\/$/, '')
+}
+
+/**
+ * @typedef {{
+ *   url: string,
+ *   ws: WebSocket | null,
+ *   subId: string,
+ *   events: Map<string, { p: number, at: number }>,
+ *   inflight: number,
+ *   reconnectDelayMs: number,
+ *   reconnectTimer: ReturnType<typeof setTimeout> | null,
+ * }} RelaySession
+ */
+
+/**
+ * 创建人口统计监控器：立即连接并监听，返回 `{ stop }` 控制句柄。
+ * @param {{
+ *   onUpdate: (snapshot: { estimate: number, sampleSize: number, eventsInWindow: number, relayUrl: string, relays: number }) => void,
+ *   relays?: string[],
+ *   signal?: AbortSignal,
+ *   refreshMs?: number,
+ *   discover?: boolean,
+ *   nip66Bootstrap?: string[],
+ * }} options 选项
+ * @returns {{ stop: () => void }} 停止函数
+ */
+export function createPopulationMonitor(options = {}) {
+	const {
+		onUpdate,
+		relays,
+		signal,
+		refreshMs = DEFAULT_REFRESH_MS,
+		discover = true,
+		nip66Bootstrap = NIP66_BOOTSTRAP_RELAYS,
+	} = options
+	if (typeof onUpdate !== 'function')
+		throw new Error('p2p: population monitor requires onUpdate callback')
+	/** @type {string[]} */
+	const relayUrls = []
+	for (const raw of relays && relays.length ? relays : DEFAULT_RELAY_URLS) {
+		const url = normalizeRelayUrl(raw)
+		if (url && !relayUrls.includes(url)) relayUrls.push(url)
+	}
+	if (!relayUrls.length)
+		throw new Error('p2p: population monitor requires at least one relay url')
+
+	let stopped = false
+	/** @type {Map<string, RelaySession>} */
+	const sessions = new Map()
+	/** @type {ReturnType<typeof setInterval> | null} */
+	let refreshTimer = null
+	/** @type {ReturnType<typeof setTimeout> | null} */
+	let refreshDebounce = null
+	/** @type {ReturnType<typeof setInterval> | null} */
+	let discoveryTimer = null
+
+	/**
+	 * @param {string} url relay URL
+	 * @returns {RelaySession} 新会话
+	 */
+	function createSession(url) {
+		return {
+			url,
+			ws: null,
+			subId: '',
+			events: new Map(),
+			inflight: 0,
+			reconnectDelayMs: RECONNECT_BASE_MS,
+			reconnectTimer: null,
+		}
+	}
+
+	/**
+	 * 连接会话（含指数退避重连调度）。
+	 * @param {RelaySession} session 会话
+	 * @returns {void}
+	 */
+	function connectSession(session) {
+		if (stopped || session.ws) return
+		const ws = new WebSocket(session.url)
+		session.ws = ws
+		const connectTimer = setTimeout(() => { try { ws.close() } catch { /* ignore */ } }, CONNECT_TIMEOUT_MS)
+		/**
+		 * WebSocket 已连接：订阅 census 事件。
+		 * @returns {void}
+		 */
+		const onOpen = () => {
+			if (session.ws !== ws) return
+			clearTimeout(connectTimer)
+			session.reconnectDelayMs = RECONNECT_BASE_MS
+			session.subId = 'census-' + Math.random().toString(36).slice(2)
+			ws.send(JSON.stringify(['REQ', session.subId, {
+				kinds: [NOSTR_CENSUS_KIND],
+				'#t': [CENSUS_TAG_FOUNT],
+				'#x': [CENSUS_TAG_X],
+			}]))
+		}
+		/**
+		 * @param {MessageEvent} event WebSocket 消息事件
+		 * @returns {void}
+		 */
+		const onMessage = event => {
+			if (session.ws !== ws) return
+			handleRelayMessage(session, event.data)
+		}
+		/**
+		 * 连接关闭：清会话并调度重连。
+		 * @returns {void}
+		 */
+		const onClose = () => {
+			clearTimeout(connectTimer)
+			if (session.ws !== ws) return
+			session.ws = null
+			scheduleReconnect(session)
+		}
+		ws.addEventListener('open', onOpen)
+		ws.addEventListener('message', onMessage)
+		ws.addEventListener('close', onClose)
+		ws.addEventListener('error', () => { /* close follows error */ })
+	}
+
+	/**
+	 * 指数退避调度重连（去重保护）。
+	 * @param {RelaySession} session 会话
+	 * @returns {void}
+	 */
+	function scheduleReconnect(session) {
+		if (stopped || session.reconnectTimer) return
+		session.reconnectTimer = setTimeout(() => {
+			session.reconnectTimer = null
+			connectSession(session)
+		}, session.reconnectDelayMs)
+		session.reconnectDelayMs = Math.min(session.reconnectDelayMs * 2, RECONNECT_MAX_MS)
+	}
+
+	/**
+	 * 处理单条 relay 消息：验签 census 帧并入库。
+	 * @param {RelaySession} session 会话
+	 * @param {unknown} data 消息数据
+	 * @returns {void}
+	 */
+	function handleRelayMessage(session, data) {
+		if (session.inflight >= MAX_INFLIGHT_VERIFICATIONS) return
+		if (typeof data !== 'string' || data.length > MAX_FRAME_BYTES) return
+		let parsed
+		try { parsed = JSON.parse(data) } catch { return }
+		if (parsed?.[0] !== 'EVENT' || parsed[1] !== session.subId) return
+		if (parsed[2]?.kind !== NOSTR_CENSUS_KIND) return
+		const content = parsed[2]?.content
+		if (typeof content !== 'string' || content.length > MAX_FRAME_BYTES) return
+		session.inflight++
+		void (async () => {
+			try {
+				const verified = await verifyCensusBytes(base64ToBytes(content))
+				if (!verified) return
+				const existing = session.events.get(verified.nodeHash)
+				if (existing && verified.ts < existing.at) return
+				session.events.set(verified.nodeHash, { p: verified.p, at: verified.ts })
+				scheduleRefresh()
+			}
+			catch { /* ignore malformed */ }
+			finally { session.inflight-- }
+		})()
+	}
+
+	/**
+	 * 会话快照（逐出过期事件后 HT 估计）。
+	 * @param {RelaySession} session 会话
+	 * @returns {{ estimate: number, sampleSize: number, eventsInWindow: number }} 快照
+	 */
+	function sessionSnapshot(session) {
+		const now = Date.now()
+		const events = []
+		for (const [hash, event] of session.events)
+			if (now - event.at > CENSUS_TTL_MS) session.events.delete(hash)
+			else events.push(event)
+		const { estimate, sampleSize } = estimatePopulation(events)
+		return { estimate, sampleSize, eventsInWindow: events.length }
+	}
+
+	/**
+	 * 取人口估计最大的 relay 作为显示源，回调 onUpdate。
+	 * @returns {void}
+	 */
+	function refresh() {
+		let best = null
+		for (const session of sessions.values()) {
+			const snapshot = sessionSnapshot(session)
+			if (!best || snapshot.estimate > best.snapshot.estimate)
+				best = { url: session.url, snapshot }
+		}
+		const chosen = best || { url: relayUrls[0], snapshot: { estimate: 0, sampleSize: 0, eventsInWindow: 0 } }
+		onUpdate({
+			...chosen.snapshot,
+			relayUrl: chosen.url,
+			relays: sessions.size,
+		})
+	}
+
+	/**
+	 * 防抖调度刷新。
+	 * @returns {void}
+	 */
+	function scheduleRefresh() {
+		if (refreshDebounce || stopped) return
+		refreshDebounce = setTimeout(() => {
+			refreshDebounce = null
+			refresh()
+		}, REFRESH_DEBOUNCE_MS)
+	}
+
+	/**
+	 * 单轮 NIP-66 发现：从引导集 + 现有会话拉 kind 30166 候选，加入监听（有界）。
+	 * @returns {Promise<void>}
+	 */
+	async function runDiscovery() {
+		/** @type {string[]} */
+		const candidates = []
+		/** @type {string[]} */
+		const sources = []
+		for (const url of [...nip66Bootstrap, ...sessions.keys()])
+			if (!sources.includes(url)) sources.push(url)
+		await Promise.allSettled(sources.map(url => collectNip66Candidates(url, candidate => {
+			if (!candidates.includes(candidate)) candidates.push(candidate)
+		})))
+		for (const url of candidates) {
+			if (stopped || sessions.size >= MAX_MONITOR_RELAYS) break
+			if (sessions.has(url)) continue
+			const session = createSession(url)
+			sessions.set(url, session)
+			connectSession(session)
+		}
+	}
+
+	/**
+	 * 从单个中继收集 NIP-66 候选（d tag，wss）。
+	 * @param {string} relayUrl 发现源中继
+	 * @param {(candidate: string) => void} onCandidate 候选回调
+	 * @returns {Promise<void>}
+	 */
+	function collectNip66Candidates(relayUrl, onCandidate) {
+		return new Promise(resolve => {
+			let ws
+			let settled = false
+			/** @type {ReturnType<typeof setTimeout> | null} */
+			let quietTimer = null
+			/**
+			 * @returns {void}
+			 */
+			const finish = () => {
+				if (settled) return
+				settled = true
+				clearTimeout(timer)
+				if (quietTimer) clearTimeout(quietTimer)
+				try { ws?.close() } catch { /* ignore */ }
+				resolve()
+			}
+			/** 收到候选后 500ms 无新候选即结束（兼容不响应 EOSE 的中继）。 */
+			const armQuiet = () => {
+				if (quietTimer) clearTimeout(quietTimer)
+				quietTimer = setTimeout(finish, 500)
+			}
+			const timer = setTimeout(finish, CONNECT_TIMEOUT_MS)
+			try { ws = new WebSocket(relayUrl) } catch { finish(); return }
+			/**
+			 * @param {MessageEvent} event WebSocket 消息事件
+			 * @returns {void}
+			 */
+			const onMessage = event => {
+				if (typeof event.data !== 'string') return
+				let parsed
+				try { parsed = JSON.parse(event.data) } catch { return }
+				if (parsed?.[0] === 'EOSE') { finish(); return }
+				if (parsed?.[0] !== 'EVENT' || parsed[2]?.kind !== NIP66_KIND) return
+				const d = (parsed[2]?.tags || []).find(tag => tag?.[0] === 'd')?.[1]
+				const url = normalizeRelayUrl(d)
+				if (url) {
+					onCandidate(url)
+					armQuiet()
+				}
+			}
+			ws.addEventListener('open', () => {
+				const subId = 'nip66-' + Math.random().toString(36).slice(2)
+				ws.send(JSON.stringify(['REQ', subId, { kinds: [NIP66_KIND, 10166], limit: NIP66_REQ_LIMIT }]))
+			})
+			ws.addEventListener('message', onMessage)
+			ws.addEventListener('close', finish)
+			ws.addEventListener('error', () => { /* close follows error */ })
+		})
+	}
+
+	/**
+	 * 启动周期 NIP-66 发现。
+	 * @returns {void}
+	 */
+	function startDiscovery() {
+		void runDiscovery().catch(() => { })
+		discoveryTimer = setInterval(() => { void runDiscovery().catch(() => { }) }, NIP66_REFRESH_MS)
+		discoveryTimer.unref?.()
+	}
+
+	/**
+	 * 停止监控：关闭全部连接与定时器。
+	 * @returns {void}
+	 */
+	function stop() {
+		if (stopped) return
+		stopped = true
+		signal?.removeEventListener('abort', stop)
+		if (refreshTimer) clearInterval(refreshTimer)
+		refreshTimer = null
+		if (refreshDebounce) clearTimeout(refreshDebounce)
+		refreshDebounce = null
+		if (discoveryTimer) clearInterval(discoveryTimer)
+		discoveryTimer = null
+		for (const session of sessions.values()) {
+			if (session.reconnectTimer) clearTimeout(session.reconnectTimer)
+			session.reconnectTimer = null
+			try { session.ws?.close() } catch { /* ignore */ }
+			session.ws = null
+		}
+		sessions.clear()
+	}
+
+	for (const url of relayUrls) {
+		const session = createSession(url)
+		sessions.set(url, session)
+		connectSession(session)
+	}
+	if (discover) startDiscovery()
+	refresh()
+	if (refreshMs > 0) {
+		refreshTimer = setInterval(refresh, refreshMs)
+		refreshTimer.unref?.()
+	}
+	if (signal) {
+		if (signal.aborted) { stop(); return { stop } }
+		signal.addEventListener('abort', stop, { once: true })
+	}
+	return { stop }
+}

package/discovery/nostr/census_verify.mjs

@@ -0,0 +1,65 @@
+/**
+ * census 包验签（Untrusted ingress；Node 与浏览器共用，无 Node 依赖）。
+ *
+ * 签名体：{ nodeHash, nodePubKey, ts, p, sig }，消息 `fount-census\0ts\0nodeHash\0p`，
+ * 用节点身份（Ed25519）签名，nodeHash = sha256(nodePubKey)。
+ */
+import { hexToBytes } from '../../core/bytes_codec.mjs'
+import { isHex64, isSignatureHex128 } from '../../core/hexIds.mjs'
+import { pubKeyHash, verify } from '../../crypto/crypto.mjs'
+
+import { CENSUS_MIN_P } from './census_math.mjs'
+
+/** 事件/窗口存活时间（与 advert TTL 一致）。 */
+export const CENSUS_TTL_MS = 10 * 60_000
+
+/**
+ * @param {number} ts 时间戳（毫秒）
+ * @param {string} nodeHash 64 hex 节点 hash
+ * @param {number} p 包含概率
+ * @returns {Uint8Array} 待签名消息
+ */
+export function buildCensusMessage(ts, nodeHash, p) {
+	return new TextEncoder().encode(`fount-census\0${ts}\0${nodeHash}\0${p}`)
+}
+
+/**
+ * 校验 census 包（Untrusted ingress）：canonicalize + 验签 + 时间窗 + p 范围。
+ * @param {unknown} packet 原始 census 包
+ * @param {number} [now=Date.now()] 当前时间（毫秒）
+ * @param {number} [ttlMs=CENSUS_TTL_MS] 允许的时间窗
+ * @returns {Promise<{ nodeHash: string, p: number, ts: number } | null>} 校验通过返回 nodeHash/p/ts，否则 null
+ */
+export async function verifyCensusPacket(packet, now = Date.now(), ttlMs = CENSUS_TTL_MS) {
+	const nodeHash = isHex64(packet?.nodeHash)
+	const nodePubKey = isHex64(packet?.nodePubKey)
+	const sig = isSignatureHex128(packet?.sig)
+	const ts = Number(packet?.ts)
+	const p = Number(packet?.p)
+	if (!nodeHash || !nodePubKey || !sig || !Number.isFinite(ts)) return null
+	if (Math.abs(now - ts) > ttlMs) return null
+	if (!Number.isFinite(p) || p < CENSUS_MIN_P || p > 1) return null
+	try {
+		if (pubKeyHash(hexToBytes(nodePubKey)) !== nodeHash) return null
+	}
+	catch {
+		return null
+	}
+	return await verify(hexToBytes(sig), buildCensusMessage(ts, nodeHash, p), hexToBytes(nodePubKey)) ? { nodeHash, p, ts } : null
+}
+
+/**
+ * 解 base64 content 字节并校验 census 包。
+ * @param {Uint8Array} bytes content 解码字节
+ * @param {number} [now=Date.now()] 当前时间（毫秒）
+ * @param {number} [ttlMs=CENSUS_TTL_MS] 允许的时间窗
+ * @returns {Promise<{ nodeHash: string, p: number, ts: number } | null>} 校验通过结果或 null
+ */
+export async function verifyCensusBytes(bytes, now = Date.now(), ttlMs = CENSUS_TTL_MS) {
+	try {
+		return await verifyCensusPacket(JSON.parse(new TextDecoder().decode(bytes)), now, ttlMs)
+	}
+	catch {
+		return null
+	}
+}

package/discovery/nostr/constants.mjs

@@ -41,3 +41,20 @@ export const NIP66_BOOTSTRAP_RELAYS = [
 	'wss://relaypag.es',
 	'wss://monitorlizard.nostr1.com',
 ]
+
+/** 默认公共中继（source='public'，永不淘汰；浏览器端人口统计监控亦以此为默认监听集）。 */
+export const DEFAULT_RELAY_URLS = [
+	'wss://relay.nostr.com',
+	'wss://nos.lol',
+	'wss://nostr.bitcoiner.social',
+	'wss://nostr.mom',
+	'wss://relay.snort.social',
+	'wss://relay.primal.net',
+]
+
+/** Nostr census 事件 kind（每节点每窗口至多一条，按 nodeHash 去重）。 */
+export const NOSTR_CENSUS_KIND = 30789
+
+/** census 订阅/发布标签：`t=fount` + `x=census`（subscribeNostrKind 以 rendezvousKey/tagX 匹配）。 */
+export const CENSUS_TAG_FOUNT = 'fount'
+export const CENSUS_TAG_X = 'census'

package/discovery/nostr/index.mjs

@@ -18,9 +18,9 @@ import {
 } from '../internal/signal_crypto.mjs'
 import { noteDiscoveryPeerClue } from '../peer_clue.mjs'
 
+import { DEFAULT_RELAY_URLS } from './constants.mjs'
 import { createNostrCensus } from './census.mjs'
 import {
-	DEFAULT_RELAY_URLS,
 	getListenRelays,
 	getPeerRoute,
 	getPoolByUrl,

package/discovery/nostr/relays.mjs

@@ -15,6 +15,7 @@ import {
 } from '../../node/storage.mjs'
 
 import {
+	DEFAULT_RELAY_URLS,
 	DEFAULT_RTT_MS,
 	FAILURE_WEIGHT,
 	LAST_GOOD_RELAYS_MAX,
@@ -29,13 +30,6 @@ import {
 } from './constants.mjs'
 import { connectRelay, dedupeRelayUrls, pinnedLookup } from './session.mjs'
 
-/** 默认公共中继（source='public'，永不淘汰）。 */
-export const DEFAULT_RELAY_URLS = [
-	'wss://relay.damus.io',
-	'wss://nos.lol',
-	'wss://relay.primal.net',
-]
-
 /** 持久化写盘节流延迟。 */
 const FLUSH_DELAY_MS = 2_000
 /** probe 单次连接超时。 */