@steve02081504/fount-p2p 0.0.11 → 0.0.13

package/infra/cli.mjs

@@ -0,0 +1,62 @@
+#!/usr/bin/env node
+
+import { on_shutdown } from 'on-shutdown'
+
+import { ensureNodeDefaults, getNodeHash } from '../node/identity.mjs'
+import { initNode, setNodeLogger } from '../node/instance.mjs'
+import { setConnectivityDebug } from '../node/log.mjs'
+import { getLinkRegistry } from '../transport/link_registry.mjs'
+
+import { resolveNodeDir } from './default_node_dir.mjs'
+import { setInfraPriority, startInfra, stopInfra } from './service.mjs'
+
+/**
+ * @param {string[]} argv - 命令行参数（不含 node 路径）
+ * @returns {{ nodeDir?: string, quiet?: boolean, useLocalReputation?: boolean, help?: boolean }} 解析结果
+ */
+function parseArgs(argv) {
+	/** @type {ReturnType<typeof parseArgs>} */
+	const out = {}
+	for (let i = 0; i < argv.length; i++) {
+		const arg = argv[i]
+		if (arg === '--help' || arg === '-h') out.help = true
+		else if (arg === '--quiet') out.quiet = true
+		else if (arg === '--use-local-reputation') out.useLocalReputation = true
+		else if (arg === '--node-dir') out.nodeDir = argv[++i]
+	}
+	return out
+}
+
+/** 打印 CLI 用法。 */
+function printHelp() {
+	console.log(`Usage: fount-p2p [--node-dir PATH] [--use-local-reputation] [--quiet]
+
+Public-good infra relay node (overlay + mailbox).
+Connectivity debug logs on by default (Nostr/LAN/mesh/dial); --quiet silences.
+Non-CLI shells: setConnectivityDebug(true).
+Default data dir: Windows %LOCALAPPDATA%/fount-p2p/node, else ~/.local/share/fount-p2p/node`)
+}
+
+const args = parseArgs(process.argv.slice(2))
+if (args.help) {
+	printHelp()
+	process.exit(0)
+}
+
+const nodeDir = resolveNodeDir(args.nodeDir)
+initNode({ nodeDir })
+if (args.quiet) {
+	setNodeLogger(null)
+	setConnectivityDebug(false)
+}
+else
+	setConnectivityDebug(true)
+ensureNodeDefaults()
+const nodeHash = getNodeHash()
+await getLinkRegistry().ensureRuntime()
+if (args.useLocalReputation) setInfraPriority({ useLocalReputation: true })
+await startInfra({ logger: args.quiet ? null : console })
+
+console.log(`p2p infra running (nodeDir=${nodeDir} nodeHash=${nodeHash})`)
+
+on_shutdown(stopInfra)

package/infra/debug_log.mjs

@@ -0,0 +1,56 @@
+import { getLinkRegistry } from '../transport/link_registry.mjs'
+
+/** @type {Array<() => void>} */
+const cleanups = []
+
+/**
+ * 挂载 registry link/overlay/node scope 调试日志。
+ * @param {{ info?: Function, warn?: Function, error?: Function, log?: Function } | null} logger - 日志输出目标，null 表示静默
+ * @returns {() => void} 取消 debug 监听的 dispose
+ */
+export function attachInfraDebugLog(logger) {
+	detachInfraDebugLog()
+	if (!logger) return () => { }
+	const registry = getLinkRegistry()
+	/**
+	 * @param {'info' | 'warn' | 'error' | 'log'} level - 日志级别
+	 * @param {string} message - 日志消息
+	 * @param {object} [extra] - 附加字段
+	 */
+	const log = (level, message, extra) => {
+		logger?.[level]?.(message, extra)
+	}
+	cleanups.push(registry.onLinkUp((nodeHash, link) => {
+		log('info', 'p2p:infra link up', {
+			nodeHash,
+			providerId: link?.providerId,
+			level: link?.level,
+		})
+	}))
+	cleanups.push(registry.onLinkDown((nodeHash, reason) => {
+		log('info', 'p2p:infra link down', { nodeHash, reason })
+	}))
+	cleanups.push(registry.subscribeScope('overlay', (from, envelope) => {
+		log('info', 'p2p:infra overlay', {
+			from,
+			action: envelope?.action,
+			path: envelope?.payload?.path,
+		})
+	}))
+	cleanups.push(registry.subscribeScope('node', (from, envelope) => {
+		log('info', 'p2p:infra node', {
+			from,
+			action: envelope?.action,
+		})
+	}))
+	return detachInfraDebugLog
+}
+
+/**
+ * 卸掉 infra debug 监听。
+ * @returns {void}
+ */
+export function detachInfraDebugLog() {
+	for (const cleanup of cleanups.splice(0))
+		try { cleanup() } catch { /* ignore */ }
+}

package/infra/default_node_dir.mjs

@@ -0,0 +1,22 @@
+import os from 'node:os'
+import path from 'node:path'
+
+/**
+ * @returns {string} 平台默认 node 数据目录
+ */
+export function defaultNodeDir() {
+	if (process.platform === 'win32') {
+		const base = process.env.LOCALAPPDATA || path.join(os.homedir(), 'AppData', 'Local')
+		return path.join(base, 'fount-p2p', 'node')
+	}
+	return path.join(os.homedir(), '.local', 'share', 'fount-p2p', 'node')
+}
+
+/**
+ * @param {string | undefined} override - CLI 或调用方覆盖
+ * @returns {string} 解析后的绝对 node 目录
+ */
+export function resolveNodeDir(override) {
+	const trimmed = String(override || '').trim()
+	return trimmed ? path.resolve(trimmed) : defaultNodeDir()
+}

package/infra/priority.mjs

@@ -0,0 +1,56 @@
+import { normalizeHex64 } from '../core/hexIds.mjs'
+import { getReputationTable } from '../node/reputation_sync.mjs'
+import { pickNodeScoreFromReputation } from '../reputation/pick_score.mjs'
+import { getLinkRegistry } from '../transport/link_registry.mjs'
+
+
+/** @type {{ useLocalReputation: boolean }} */
+let priorityConfig = { useLocalReputation: false }
+
+const PRIORITY_BOOST = 1000
+
+/**
+ * 配置 infra 路由加权（是否用本地 reputation）。
+ * @param {{ useLocalReputation?: boolean }} config - 是否用本地 reputation 加权路由
+ * @returns {void}
+ */
+export function setInfraPriority(config = {}) {
+	priorityConfig = {
+		useLocalReputation: Boolean(config.useLocalReputation),
+	}
+	applyPriorityToRegistry()
+}
+
+/**
+ * @returns {{ useLocalReputation: boolean }} 当前 priority 配置副本
+ */
+export function getInfraPriority() {
+	return { ...priorityConfig }
+}
+
+/**
+ * @returns {void}
+ */
+export function applyPriorityToRegistry() {
+	const registry = getLinkRegistry()
+	if (!priorityConfig.useLocalReputation) {
+		registry.setPriorityWeightFunction(null)
+		return
+	}
+	registry.setPriorityWeightFunction(nodeHash => {
+		const score = pickNodeScoreFromReputation(
+			getReputationTable(),
+			normalizeHex64(nodeHash) || nodeHash,
+		)
+		return Math.floor(score * PRIORITY_BOOST)
+	})
+}
+
+/**
+ * stopInfra：卸 weight，并重置 priority 配置，避免再次 startInfra 幽灵恢复加权。
+ * @returns {void}
+ */
+export function clearInfraPriorityFromRegistry() {
+	priorityConfig = { useLocalReputation: false }
+	getLinkRegistry().setPriorityWeightFunction(null)
+}

package/infra/service.mjs

@@ -0,0 +1,140 @@
+
+import { isNodeInitialized } from '../node/instance.mjs'
+import { setOverlayRateGate, clearOverlayRateGate } from '../overlay/index.mjs'
+import { getLinkRegistry } from '../transport/link_registry.mjs'
+import { attachNodeScopeMailbox } from '../transport/node_scope.mjs'
+
+import { attachInfraDebugLog, detachInfraDebugLog } from './debug_log.mjs'
+import {
+	applyPriorityToRegistry,
+	clearInfraPriorityFromRegistry,
+	getInfraPriority,
+	setInfraPriority,
+} from './priority.mjs'
+import infraTunables from './tunables.json' with { type: 'json' }
+
+/** @type {Map<string, { tokens: number, updatedAt: number }>} */
+const overlayRateBuckets = new Map()
+
+/**
+ * Token bucket：桶容量 = burst，补充速率 = perMin/min。
+ * @param {Map<string, { tokens: number, updatedAt: number }>} buckets - 每 sender 桶状态
+ * @param {string} sender - 发送方 nodeHash
+ * @param {number} now - 当前时间戳（ms）
+ * @param {{ perMin: number, burst: number }} limits - 限速参数
+ * @returns {boolean} 是否允许本次 overlay 动作
+ */
+export function consumeOverlayRateToken(buckets, sender, now, limits) {
+	const perMin = Math.max(1, limits.perMin)
+	const burst = Math.max(1, limits.burst)
+	const refillPerMs = perMin / 60_000
+	let bucket = buckets.get(sender)
+	if (!bucket) bucket = { tokens: burst, updatedAt: now }
+	const elapsed = Math.max(0, now - bucket.updatedAt)
+	bucket.tokens = Math.min(burst, bucket.tokens + elapsed * refillPerMs)
+	bucket.updatedAt = now
+	if (bucket.tokens < 1) {
+		buckets.set(sender, bucket)
+		return false
+	}
+	bucket.tokens -= 1
+	buckets.set(sender, bucket)
+	return true
+}
+
+/**
+ * @returns {void}
+ */
+function installOverlayRateLimit() {
+	const limits = {
+		perMin: Math.max(1, Number(infraTunables.overlayRatePerMin) || 120),
+		burst: Math.max(1, Number(infraTunables.overlayRateBurst) || 30),
+	}
+	setOverlayRateGate((sender, action) => {
+		if (action !== 'route_req' && action !== 'relay') return true
+		return consumeOverlayRateToken(overlayRateBuckets, sender, Date.now(), limits)
+	})
+}
+
+/**
+ * @returns {void}
+ */
+function removeOverlayRateLimit() {
+	clearOverlayRateGate()
+	overlayRateBuckets.clear()
+}
+
+/** @type {boolean} */
+let infraRunning = false
+
+/** @type {(() => void) | null} */
+let mailboxDispose = null
+
+/** @type {(() => void) | null} */
+let debugDispose = null
+
+/** @type {number | null} */
+let savedMaxActive = null
+
+/**
+ * @returns {boolean} infra relay 是否在运行
+ */
+export function isInfraRunning() {
+	return infraRunning
+}
+
+/**
+ * 启动 public-good infra：overlay、mailbox、rate limit、priority、debug log。
+ * @param {{ maxActive?: number, logger?: { info?: Function, warn?: Function, error?: Function, log?: Function } | null }} [options] - maxActive 与 debug logger
+ * @returns {Promise<void>}
+ */
+export async function startInfra(options = {}) {
+	if (!isNodeInitialized()) throw new Error('p2p: startInfra requires initNode')
+	if (infraRunning) {
+		if (options.maxActive != null) await getLinkRegistry().setMaxActive(options.maxActive)
+		if (options.logger !== undefined) {
+			detachInfraDebugLog()
+			debugDispose = attachInfraDebugLog(options.logger ?? null)
+		}
+		applyPriorityToRegistry()
+		return
+	}
+	const registry = getLinkRegistry()
+	await registry.ensureRuntime()
+	registry.ensureOverlayRouter()
+	installOverlayRateLimit()
+	savedMaxActive = registry.getMaxActive()
+	if (options.maxActive != null)
+		await registry.setMaxActive(options.maxActive)
+	else
+		await registry.setMaxActive(infraTunables.defaultMaxActive ?? savedMaxActive)
+	if (!mailboxDispose) mailboxDispose = attachNodeScopeMailbox()
+	const logger = options.logger === undefined ? console : options.logger ?? null
+	debugDispose = attachInfraDebugLog(logger)
+	applyPriorityToRegistry()
+	infraRunning = true
+}
+
+/**
+ * 卸掉 infra 自己挂的面（mailbox / rate / debug / priority / maxActive 恢复）。
+ * 不碰用户另行 attach 的 wires，不绑信誉同步。
+ * @returns {Promise<void>}
+ */
+export async function stopInfra() {
+	if (!infraRunning) return
+	debugDispose?.()
+	debugDispose = null
+	detachInfraDebugLog()
+	clearInfraPriorityFromRegistry()
+	removeOverlayRateLimit()
+	mailboxDispose?.()
+	mailboxDispose = null
+	const registry = getLinkRegistry()
+	if (savedMaxActive != null)
+		await registry.setMaxActive(savedMaxActive)
+	savedMaxActive = null
+	infraRunning = false
+}
+
+/** 再导出：infra 路由加权配置（见 `priority.mjs`）。 */
+export { getInfraPriority, setInfraPriority }

package/infra/tunables.json

@@ -0,0 +1,5 @@
+{
+	"defaultMaxActive": 96,
+	"overlayRatePerMin": 120,
+	"overlayRateBurst": 30
+}

package/link/channel_mux.mjs

@@ -57,7 +57,7 @@ const DEFAULT_ACTION_PRIORITIES = Object.freeze({
  * @returns {number} 优先级（未知 action 默认 5）
  */
 export function resolveActionPriority(action) {
-	return DEFAULT_ACTION_PRIORITIES[String(action || '').trim()] ?? 5
+	return DEFAULT_ACTION_PRIORITIES[action] ?? 5
 }
 
 /**
@@ -67,12 +67,11 @@ export function resolveActionPriority(action) {
  * @returns {'control' | 'bulk'} 目标通道名
  */
 export function pickChannel(action, byteLength) {
-	const normalized = String(action || '').trim()
-	if (normalized === 'ping' || normalized === 'pong' || normalized.startsWith('route_'))
+	if (action === 'ping' || action === 'pong' || action.startsWith('route_'))
 		return CHANNEL_CONTROL
-	if (Number(byteLength) > BULK_CHANNEL_MIN_BYTES)
+	if (byteLength > BULK_CHANNEL_MIN_BYTES)
 		return CHANNEL_BULK
-	return resolveActionPriority(normalized) <= 3 ? CHANNEL_CONTROL : CHANNEL_BULK
+	return resolveActionPriority(action) <= 3 ? CHANNEL_CONTROL : CHANNEL_BULK
 }
 
 /**
@@ -162,13 +161,14 @@ export function createChannelSendQueues(options) {
 	const flush = channelName => {
 		scheduled[channelName] = false
 		const channel = getChannel(channelName)
-		if (!channel || channel.readyState !== 'open') return
+		if (channel?.readyState !== 'open') return
 		const queue = queues[channelName]
-		while (queue.length) {
-			if (readBufferedAmount(channel) > highWatermarkBytes) return
-			const item = queue.shift()
-			channel.send(item.bytes)
+		let i = 0
+		while (i < queue.length) {
+			if (readBufferedAmount(channel) > highWatermarkBytes) break
+			channel.send(queue[i++].bytes)
 		}
+		if (i > 0) queue.splice(0, i)
 	}
 
 	return {