@steve02081504/fount-p2p 0.0.1 → 0.0.2

package/README.md

@@ -44,7 +44,8 @@ Root contains only the facade and package metadata; all modules live in layered
 ## Tests
 
 ```bash
-npm test              # pure + integration (--test-force-exit: node-datachannel leaves native handles)
+npm test              # package pure + integration (Node)
+npm run test:fount    # cross-repo bridge (Deno; requires fount on PATH)
 npm run test:live     # RTC / link smoke (requires node-datachannel)
 npm run test:sim      # tunables co-evolution sim (dev only, not published; --social-tunables to write back)
 ```

package/core/entity_id.mjs

@@ -34,18 +34,18 @@ export function hashFromPubKeyHex(pubKeyHex) {
 /**
  * @param {string} nodeHash 成员所属节点 hash
  * @param {string} recoveryPubKeyHex 32 字节 recovery 公钥 hex（稳定身份锚）
- * @returns {string} 用户 entityHash
+ * @returns {string} entityHash
  */
-export function userEntityHashFromRecoveryPubKeyHex(nodeHash, recoveryPubKeyHex) {
+export function entityHashFromRecoveryPubKeyHex(nodeHash, recoveryPubKeyHex) {
 	return encodeEntityHash(nodeHash, hashFromPubKeyHex(recoveryPubKeyHex))
 }
 
 /**
  * @param {string} nodeHash 成员所属节点 hash
  * @param {string} subjectHash 成员签名 pubKeyHash（DAG sender）
- * @returns {string} 用户 entityHash
+ * @returns {string} entityHash
  */
-export function userEntityHashFromSubjectHash(nodeHash, subjectHash) {
+export function entityHashFromSubjectHash(nodeHash, subjectHash) {
 	const node = normalizeHex64(nodeHash)
 	const subject = normalizeHex64(subjectHash)
 	if (!isHex64(node) || !isHex64(subject)) throw new Error('invalid subject hash')

package/deno.json

@@ -0,0 +1,4 @@
+{
+	"nodeModulesDir": "none",
+	"lock": false
+}

package/discovery/bt.mjs

@@ -53,7 +53,7 @@ export async function waitPoweredOn(runtime, timeout) {
 
 /**
  * 探测本机 noble 运行时是否具备 BT 扫描所需 API。
- * @returns {Promise<boolean>}
+ * @returns {Promise<boolean>} noble 可加载且具备 startScanningAsync 与 waitForPoweredOn(Async) 时为 true
  */
 export async function canUseBluetoothDiscovery() {
 	try {

package/entity/profile.mjs

@@ -113,7 +113,7 @@ export async function getProfile(entityHash, replicaUsername = null, options = {
 
 	if (options.skipPresentation) return merged
 
-	let infoDefaults = options.infoDefaults
+	let { infoDefaults } = options
 	if (!infoDefaults && replicaUsername)
 		infoDefaults = await resolveInfoDefaultsForEntity(replicaUsername, parsed.entityHash, locales)
 	if (!infoDefaults)

package/entity/replica.mjs

@@ -1,12 +1,12 @@
 import { parseEntityHash } from '../core/entity_id.mjs'
-import { operatorEntityHashFromKeys, getNodeHash } from '../node/identity.mjs'
+import { entityHashFromKeys, getNodeHash } from '../node/identity.mjs'
 
 /**
  * @param {string} recoveryPubKeyHex 64 位十六进制 recovery 公钥
- * @returns {string | null} 本节点操作者 entityHash
+ * @returns {string | null} 本节点 entityHash
  */
-export function resolveLocalOperatorEntityHash(recoveryPubKeyHex) {
-	return operatorEntityHashFromKeys(getNodeHash(), recoveryPubKeyHex)
+export function resolveLocalEntityHashFromRecoveryPubKeyHex(recoveryPubKeyHex) {
+	return entityHashFromKeys(getNodeHash(), recoveryPubKeyHex)
 }
 
 /**

package/federation/{operator_key_chain.mjs → entity_key_chain.mjs}

@@ -1,5 +1,5 @@
 /**
- * Operator 密钥历史链：entityHash 锚定 recovery 公钥，活跃钥可轮换。
+ * Entity 密钥历史链：entityHash 锚定 recovery 公钥，活跃钥可轮换。
  */
 import { Buffer } from 'node:buffer'
 
@@ -10,7 +10,7 @@ import { isHex64, normalizeHex64 } from '../core/hexIds.mjs'
 /**
  *
  */
-export const OPERATOR_KEY_REVOKE_DOMAIN = 'fount-operator-key-revoke'
+export const ENTITY_KEY_REVOKE_DOMAIN = 'fount-entity-key-revoke'
 
 /**
  * @typedef {{
@@ -19,7 +19,7 @@ export const OPERATOR_KEY_REVOKE_DOMAIN = 'fount-operator-key-revoke'
  *   attestedBy: 'recovery' | 'active' | 'revoked',
  *   validFrom?: number,
  *   revokedGenerations?: number[],
- * }} OperatorKeyHistoryEntry
+ * }} EntityKeyHistoryEntry
  */
 
 /**
@@ -42,7 +42,7 @@ export function activeSenderHashFromPubKeyHex(activePubKeyHex) {
  * @param {string} recoveryPubKeyHex recovery 公钥
  * @param {string} activePubKeyHex 初始活跃公钥
  * @param {number} [validFrom] 生效时间
- * @returns {OperatorKeyHistoryEntry[]} 创世链
+ * @returns {EntityKeyHistoryEntry[]} 创世链
  */
 export function createGenesisKeyHistory(recoveryPubKeyHex, activePubKeyHex, validFrom = Date.now()) {
 	return [{
@@ -54,7 +54,7 @@ export function createGenesisKeyHistory(recoveryPubKeyHex, activePubKeyHex, vali
 }
 
 /**
- * @param {OperatorKeyHistoryEntry[]} keyHistory 密钥历史
+ * @param {EntityKeyHistoryEntry[]} keyHistory 密钥历史
  * @param {number} generation 代际
  * @returns {string | null} 活跃公钥 hex
  */
@@ -64,7 +64,7 @@ export function resolveActiveKeyAtGeneration(keyHistory, generation) {
 }
 
 /**
- * @param {OperatorKeyHistoryEntry[]} keyHistory 密钥历史
+ * @param {EntityKeyHistoryEntry[]} keyHistory 密钥历史
  * @returns {number} 最新代际，无则 -1
  */
 export function resolveLatestActiveGeneration(keyHistory) {
@@ -73,7 +73,7 @@ export function resolveLatestActiveGeneration(keyHistory) {
 }
 
 /**
- * @param {OperatorKeyHistoryEntry[]} keyHistory 密钥历史
+ * @param {EntityKeyHistoryEntry[]} keyHistory 密钥历史
  * @param {number} generation 代际
  * @returns {boolean} 是否已吊销
  */
@@ -84,7 +84,7 @@ export function isActiveGenerationRevoked(keyHistory, generation) {
 }
 
 /**
- * @param {OperatorKeyHistoryEntry[]} keyHistory 密钥历史
+ * @param {EntityKeyHistoryEntry[]} keyHistory 密钥历史
  * @param {string} recoveryPubKeyHex recovery 公钥
  * @param {string} senderPubKeyHash 事件 sender（64 hex pubKeyHash）
  * @returns {boolean} sender 是否为未吊销的活跃钥
@@ -112,18 +112,18 @@ export function isRecoverySender(recoveryPubKeyHex, senderPubKeyHash) {
 
 /**
  * @param {object} state 物化状态
- * @param {object} event operator_key_rotate 事件
+ * @param {object} event entity_key_rotate 事件
  * @returns {object} 更新后状态
  */
-export function reduceOperatorKeyRotate(state, event) {
+export function reduceEntityKeyRotate(state, event) {
 	const generation = Number(event.content?.generation)
 	const activePubKeyHex = normalizeHex64(event.content?.activePubKeyHex || '')
 	if (!Number.isFinite(generation) || generation < 0 || !isHex64(activePubKeyHex))
 		return state
-	state.operatorKeyHistory = state.operatorKeyHistory || []
-	if (state.operatorKeyHistory.some(row => row.generation === generation))
+	state.entityKeyHistory = state.entityKeyHistory || []
+	if (state.entityKeyHistory.some(row => row.generation === generation))
 		return state
-	state.operatorKeyHistory.push({
+	state.entityKeyHistory.push({
 		generation,
 		activePubKeyHex,
 		attestedBy: generation === 0 ? 'recovery' : 'active',
@@ -134,10 +134,10 @@ export function reduceOperatorKeyRotate(state, event) {
 
 /**
  * @param {object} state 物化状态
- * @param {object} event operator_key_revoke 事件
+ * @param {object} event entity_key_revoke 事件
  * @returns {object} 更新后状态
  */
-export function reduceOperatorKeyRevoke(state, event) {
+export function reduceEntityKeyRevoke(state, event) {
 	const newGeneration = Number(event.content?.newGeneration)
 	const activePubKeyHex = normalizeHex64(event.content?.activePubKeyHex || '')
 	const revokeGenerations = Array.isArray(event.content?.revokeGenerations)
@@ -145,17 +145,17 @@ export function reduceOperatorKeyRevoke(state, event) {
 		: []
 	if (!Number.isFinite(newGeneration) || newGeneration < 0 || !isHex64(activePubKeyHex))
 		return state
-	state.operatorKeyHistory = state.operatorKeyHistory || []
+	state.entityKeyHistory = state.entityKeyHistory || []
 	for (const gen of revokeGenerations) {
-		const entry = state.operatorKeyHistory.find(row => row.generation === gen)
+		const entry = state.entityKeyHistory.find(row => row.generation === gen)
 		if (entry) {
 			entry.revokedGenerations = entry.revokedGenerations || []
 			if (!entry.revokedGenerations.includes(gen))
 				entry.revokedGenerations.push(gen)
 		}
 	}
-	if (!state.operatorKeyHistory.some(row => row.generation === newGeneration))
-		state.operatorKeyHistory.push({
+	if (!state.entityKeyHistory.some(row => row.generation === newGeneration))
+		state.entityKeyHistory.push({
 			generation: newGeneration,
 			activePubKeyHex,
 			attestedBy: 'recovery',
@@ -166,35 +166,34 @@ export function reduceOperatorKeyRevoke(state, event) {
 }
 /**
  * @param {object[]} events 时间线事件（拓扑序）
- * @returns {{ recoveryPubKeyHex: string | null, operatorKeyHistory: OperatorKeyHistoryEntry[] }} 折叠密钥链
+ * @returns {{ recoveryPubKeyHex: string | null, entityKeyHistory: EntityKeyHistoryEntry[] }} 折叠密钥链
  */
-export function foldOperatorKeyHistoryFromEvents(events) {
-	/** @type {OperatorKeyHistoryEntry[]} */
-	let operatorKeyHistory = []
+export function foldEntityKeyHistoryFromEvents(events) {
+	/** @type {EntityKeyHistoryEntry[]} */
+	let entityKeyHistory = []
 	for (const event of events || []) {
-		if (event.type === 'operator_key_rotate') {
-			const state = reduceOperatorKeyRotate({ operatorKeyHistory }, event)
-			operatorKeyHistory = state.operatorKeyHistory
+		if (event.type === 'entity_key_rotate') {
+			const state = reduceEntityKeyRotate({ entityKeyHistory }, event)
+			entityKeyHistory = state.entityKeyHistory
 		}
-		if (event.type === 'operator_key_revoke') {
-			const state = reduceOperatorKeyRevoke({ operatorKeyHistory }, event)
-			operatorKeyHistory = state.operatorKeyHistory
+		if (event.type === 'entity_key_revoke') {
+			const state = reduceEntityKeyRevoke({ entityKeyHistory }, event)
+			entityKeyHistory = state.entityKeyHistory
 		}
 	}
-	return { recoveryPubKeyHex: null, operatorKeyHistory }
+	return { recoveryPubKeyHex: null, entityKeyHistory }
 }
 
 /**
  * @param {object} revokeBody 吊销正文
  * @returns {Buffer} 固定域签名消息
  */
-export function operatorKeyRevokeSignBytes(revokeBody) {
+export function entityKeyRevokeSignBytes(revokeBody) {
 	const body = {
 		revokeGenerations: (revokeBody.revokeGenerations || []).map(g => Number(g)),
 		newGeneration: Number(revokeBody.newGeneration),
 		activePubKeyHex: normalizeHex64(revokeBody.activePubKeyHex || ''),
 		entityHash: String(revokeBody.entityHash || '').trim().toLowerCase(),
 	}
-	return Buffer.from(`${OPERATOR_KEY_REVOKE_DOMAIN}\0${canonicalStringify(body)}`, 'utf8')
+	return Buffer.from(`${ENTITY_KEY_REVOKE_DOMAIN}\0${canonicalStringify(body)}`, 'utf8')
 }
-

package/files/chunk_fetch.mjs

@@ -46,7 +46,7 @@ function chunkFetchPeerTargets() {
  */
 export async function fetchChunk(context) {
 	const hash = String(context.ciphertextHash || '').trim().toLowerCase()
-	const username = context.username
+	const { username } = context
 	if (!hash || !username) return null
 
 	if (await hasChunk(hash))

package/files/transfer_key.mjs

@@ -24,8 +24,7 @@ export async function resolveContentKey(descriptor, manifest, deps = {}) {
 		return null
 
 	if (type === 'file-master-key-wrap') {
-		const groupId = descriptor.groupId
-		const fileId = descriptor.fileId
+		const { groupId, fileId } = descriptor
 		if (!groupId || !fileId || !descriptor.wrappedKey || !deps.getGroupFileMasterKey) return null
 		const groupKey = await deps.getGroupFileMasterKey(String(groupId), descriptor.keyGeneration)
 		if (!groupKey) return null
@@ -33,8 +32,7 @@ export async function resolveContentKey(descriptor, manifest, deps = {}) {
 	}
 
 	if (type === 'vault-wrap') {
-		const entityHash = descriptor.entityHash
-		const fileId = descriptor.fileId
+		const { entityHash, fileId } = descriptor
 		if (!entityHash || !fileId || !descriptor.wrappedKey || !deps.getVaultMasterKey) return null
 		const vaultKey = await deps.getVaultMasterKey(String(entityHash))
 		if (!vaultKey) return null

package/governance/join_pow.mjs

@@ -101,7 +101,7 @@ export function verifyJoinPow(powSolution, opts) {
 	if (!powSolution || typeof powSolution !== 'object') return { ok: false, achievedBits: 0 }
 
 	const anchorRef = String(powSolution.anchorRef ?? '').trim()
-	const nonce = powSolution.nonce
+	const { nonce } = powSolution
 	const epoch = Number(powSolution.epoch)
 	const joinerNodeHash = String(powSolution.joinerNodeHash ?? opts.senderNodeHash ?? '').trim().toLowerCase()
 	const senderNodeHash = String(opts.senderNodeHash ?? '').trim().toLowerCase()

package/link/channel_mux.mjs

@@ -131,7 +131,7 @@ export function onBufferedAmountLow(channel, cb) {
  * @returns {{ enqueue: (action: string, bytes: Uint8Array, preferredChannel?: 'control' | 'bulk') => void, flush: (channelName?: 'control' | 'bulk') => void, pending: () => { control: number, bulk: number }, clear: () => void }} 发送队列 API
  */
 export function createChannelSendQueues(opts) {
-	const getChannel = opts.getChannel
+	const { getChannel } = opts
 	const highWatermarkBytes = Math.max(CHANNEL_LOW_THRESHOLD_BYTES, Number(opts.highWatermarkBytes) || CHANNEL_HIGH_WATERMARK_BYTES)
 	/** @type {{ control: Array<{ priority: number, seq: number, bytes: Uint8Array }>, bulk: Array<{ priority: number, seq: number, bytes: Uint8Array }> }} */
 	const queues = { control: [], bulk: [] }

package/link/link.mjs

@@ -326,7 +326,7 @@ export async function createLink(opts) {
 	 * @returns {boolean} 应重新入队则 true
 	 */
 	function shouldRetryQueuedIce(error) {
-		return /without ICE transport/i.test(String(error?.message ?? error ?? ''))
+		return /without ice transport/i.test(String(error?.message ?? error ?? ''))
 	}
 
 	/**

package/link/sdp_fingerprint.mjs

@@ -20,6 +20,6 @@ export function normalizeDtlsFingerprint(value) {
  * @returns {string | null} 规范化 fingerprint，未找到时返回 null
  */
 export function extractDtlsFingerprint(sdp) {
-	const line = String(sdp || '').match(/^a=fingerprint:sha-256\s+([0-9A-Fa-f:]+)$/mu)?.[1]
+	const line = String(sdp || '').match(/^a=fingerprint:sha-256\s+([\d:A-Fa-f]+)$/mu)?.[1]
 	return normalizeDtlsFingerprint(line)
 }

package/mailbox/store.mjs

@@ -162,7 +162,7 @@ export async function storeMailboxRecord(record) {
 	const toPubKeyHash = normalizeHex64(record.toPubKeyHash)
 	if (!isHex64(toPubKeyHash)) return false
 	const hop = normalizeMailboxHop(record.hop)
-	const tier = record.tier
+	const { tier } = record
 	if (!['trusted', 'normal', 'quarantine'].includes(tier)) return false
 	const app = String(record.app || '').trim()
 	if (!app) return false

package/node/denylist.mjs

@@ -69,7 +69,7 @@ export function invalidateDenylistIndex() {
 function getDenylistIndex() {
 	if (cachedIndex) return cachedIndex
 	const raw = readNodeJsonSync(DATA_NAME)
-	const blocked = normalizeDenylist(raw).blocked
+	const { blocked } = normalizeDenylist(raw)
 	cachedIndex = buildDenylistIndex(blocked)
 	return cachedIndex
 }
@@ -111,7 +111,7 @@ export function loadDenylist() {
  * @returns {void}
  */
 export function saveDenylist(list) {
-	const blocked = normalizeDenylist(list).blocked
+	const { blocked } = normalizeDenylist(list)
 	writeNodeJsonSync(DATA_NAME, { blocked })
 	cachedIndex = buildDenylistIndex(blocked)
 }

package/node/identity.mjs

@@ -1,6 +1,6 @@
 import { randomBytes } from 'node:crypto'
 
-import { userEntityHashFromRecoveryPubKeyHex } from '../core/entity_id.mjs'
+import { entityHashFromRecoveryPubKeyHex } from '../core/entity_id.mjs'
 import { isHex64 } from '../core/hexIds.mjs'
 import { nodeHashFromSeed } from '../entity/node_hash.mjs'
 import { normalizeMailboxSettings } from '../mailbox/settings.mjs'
@@ -8,7 +8,7 @@ import { normalizeMailboxSettings } from '../mailbox/settings.mjs'
 import { emitNodeChange } from './instance.mjs'
 import { readNodeJsonSync, writeNodeJsonSync } from './storage.mjs'
 
-const NODE_SEED_HEX_RE = /^[0-9a-f]{64}$/iu
+const NODE_SEED_HEX_RE = /^[\da-f]{64}$/iu
 const NODE_JSON = 'node'
 
 /**
@@ -90,10 +90,10 @@ export function ensureNodeDefaults() {
 /**
  * @param {string} nodeHash 64 位十六进制
  * @param {string} recoveryPubKeyHex 64 位十六进制 recovery 公钥（稳定身份锚）
- * @returns {string | null} 操作者 entityHash
+ * @returns {string | null} entityHash（非法 hex 时 null）
  */
-export function operatorEntityHashFromKeys(nodeHash, recoveryPubKeyHex) {
+export function entityHashFromKeys(nodeHash, recoveryPubKeyHex) {
 	const pub = String(recoveryPubKeyHex || '').trim().toLowerCase().replace(/^0x/iu, '')
 	if (!isHex64(nodeHash) || !isHex64(pub)) return null
-	return userEntityHashFromRecoveryPubKeyHex(nodeHash, pub)
+	return entityHashFromRecoveryPubKeyHex(nodeHash, pub)
 }

package/node/personal_block.mjs

@@ -1,5 +1,5 @@
 /**
- * 按实体的个人列表（Chat 与 Social 共享）。
+ * 按实体的个人列表。
  * **block**：对外联邦公开拉黑（timeline block 事件 + personal_block 索引）；
  * **hide**：纯本地隐藏（personal_hide.json，永不联邦）。
  */

package/overlay/index.mjs

@@ -25,7 +25,7 @@ function routeSignBytes(reqId, path) {
 export function createOverlayRouter(registry, ttl = 3) {
 	const selfNodeHash = registry.localIdentity.nodeHash
 	const selfPubKey = registry.localIdentity.nodePubKey
-	const secretKey = registry.localIdentity.secretKey
+	const { secretKey } = registry.localIdentity
 	const seenReqs = createLruMap(4096)
 	/** @type {Map<string, { resolve: (path: string[]) => void, reject: (err: Error) => void, timer: number }>} */
 	const pendingRoutes = new Map()

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@steve02081504/fount-p2p",
-	"version": "0.0.1",
+	"version": "0.0.2",
 	"description": "fount federation P2P layer — link, trust graph, mailbox, DAG, EVFS.",
 	"keywords": [
 		"network",
@@ -19,6 +19,7 @@
 	},
 	"scripts": {
 		"test": "node --test --test-concurrency=1 --test-force-exit test/pure/*.test.mjs test/integration/*.test.mjs",
+		"test:fount": "deno test -A --config deno.json test/fount/",
 		"test:live": "node --test --test-concurrency=1 --test-force-exit test/live/*.test.mjs",
 		"test:sim": "node --test --test-concurrency=1 --test-force-exit sim/test/*.test.mjs"
 	},

package/transport/stale_peer_log.mjs

@@ -3,9 +3,7 @@
  *
  * 无回退行为——仅在发生处记录异常「身份映射滞后于活跃连接」
  * （群/房间 + peerId + nodeHash），以便追踪 onPeerLeave 遗漏。
- * 计数通过 catchup stats 暴露给测试；磁盘记录可在 debug_logs/ 下 grep。
  */
-import { debugLog } from '../utils/debug_log.mjs'
 
 /** @type {Map<string, number>} scopeId → 累计修剪次数 */
 const pruneCounts = new Map()
@@ -31,7 +29,6 @@ export function recordStalePeerPrune(scope, staleEntries, meta = {}) {
 		lines.push(JSON.stringify(record))
 	}
 	while (recent.length > RECENT_CAP) recent.shift()
-	void debugLog('federation_stale_peer', `${lines.join('\n')}\n`).catch(() => { /* best-effort observability */ })
 }
 
 /**

package/wire/part_invoke.mjs

@@ -76,6 +76,6 @@ export function normalizePartpath(value) {
  */
 export function isPartInvoke(value) {
 	if (!isPlainObject(value)) return false
-	const kind = value.kind
+	const { kind } = value
 	return typeof kind === 'string' && kind.length > 0
 }

package/wire/rate_bucket.mjs

@@ -18,7 +18,7 @@ const buckets = createLruMap(BUCKET_MAP_MAX)
 export function consumeWireRateBucket(bucketKey, limits) {
 	const byteCount = Math.max(0, Number(limits.byteCount) || 0)
 	const maxBytes = Number(limits.maxBytesPerWindow) || 0
-	const maxCount = limits.maxCount
+	const { maxCount } = limits
 	const now = Date.now()
 	let bucket = buckets.get(bucketKey)
 	if (!bucket) {

package/utils/debug_log.mjs

@@ -1,16 +0,0 @@
-import fs from 'node:fs'
-import path from 'node:path'
-
-const dir = path.resolve(process.cwd(), 'debug_logs')
-
-/**
- * P2P 观测落盘：写入进程 cwd 下 `debug_logs/`（与 monorepo `debugLog` 行为对齐）。
- * @param {string} name 日志文件名（不含扩展名）
- * @param {unknown} data 调试数据
- * @returns {Promise<void>}
- */
-export async function debugLog(name, data) {
-	const text = Object(data) instanceof String ? data : JSON.stringify(data)
-	await fs.promises.mkdir(dir, { recursive: true })
-	await fs.promises.appendFile(path.join(dir, `${name}.log`), text)
-}