@steve02081504/fount-p2p 0.0.35 → 0.0.36

package/timeline/verify_remote.mjs

@@ -3,7 +3,7 @@
  */
 import { Buffer } from 'node:buffer'
 
-import { isHex64, isSignatureHex128, normalizeHex64 } from '../core/hexIds.mjs'
+import { isHex64, isSignatureHex128 } from '../core/hexIds.mjs'
 import { pubKeyHash, verify } from '../crypto/crypto.mjs'
 import { eventBodyForSign, signPayloadBytes } from '../dag/index.mjs'
 
@@ -12,12 +12,12 @@ import { eventBodyForSign, signPayloadBytes } from '../dag/index.mjs'
  * @returns {Promise<boolean>} 验签是否通过
  */
 export async function verifyTimelineRemoteSignature(event) {
-	const sender = normalizeHex64(event?.sender)
-	if (!isHex64(sender)) return false
-	const signatureHex = String(event?.signature || '')
-	if (!isSignatureHex128(signatureHex)) return false
-	const pubKeyHex = normalizeHex64(event?.senderPubKey)
-	if (!isHex64(pubKeyHex)) return false
+	const sender = isHex64(event?.sender)
+	if (!sender) return false
+	const signatureHex = isSignatureHex128(event?.signature)
+	if (!signatureHex) return false
+	const pubKeyHex = isHex64(event?.senderPubKey)
+	if (!pubKeyHex) return false
 	const publicKeyBytes = new Uint8Array(Buffer.from(pubKeyHex, 'hex'))
 	if (pubKeyHash(publicKeyBytes) !== sender) return false
 	const signatureBytes = new Uint8Array(Buffer.from(signatureHex, 'hex'))

package/transport/link_registry.mjs

@@ -1,6 +1,6 @@
 import { Buffer } from 'node:buffer'
 
-import { compareHex64Asc, normalizeHex64 } from '../core/hexIds.mjs'
+import { compareHex64Asc, isHex64 } from '../core/hexIds.mjs'
 import { keyPairFromSeed } from '../crypto/crypto.mjs'
 import { noteAdvertPeerHints } from '../discovery/advert_peer_hints.mjs'
 import { watchVerifiedNodeAdvert, setDiscoveryLinkDialer, prepareConnectToNode } from '../discovery/index.mjs'
@@ -34,8 +34,8 @@ const DIAL_COOLDOWN_MAX_MS = ms('10m')
 function resolveLocalIdentity(localIdentity) {
 	if (localIdentity?.nodeHash && localIdentity?.nodePubKey && localIdentity?.secretKey)
 		return {
-			nodeHash: normalizeHex64(localIdentity.nodeHash),
-			nodePubKey: normalizeHex64(localIdentity.nodePubKey),
+			nodeHash: localIdentity.nodeHash,
+			nodePubKey: localIdentity.nodePubKey,
 			secretKey: localIdentity.secretKey,
 		}
 	const secretKey = Buffer.from(ensureNodeSeed(), 'hex')
@@ -154,7 +154,7 @@ export function createLinkRegistry(options = {}) {
 	 * @returns {Promise<void>}
 	 */
 	async function registerResolvedLink(remoteNodeHash, candidate) {
-		const normalized = normalizeHex64(remoteNodeHash)
+		const normalized = remoteNodeHash
 		const existing = links.get(normalized)
 		if (existing && existing !== candidate && !linkIsPreferred(candidate, normalized, existing)) {
 			await candidate.close(candidate.level !== existing.level ? 'provider-loser' : 'glare-loser')
@@ -176,7 +176,7 @@ export function createLinkRegistry(options = {}) {
 		void (async () => {
 			try {
 				await link.ready
-				const remote = normalizeHex64(link.nodeHash)
+				const remote = isHex64(link.nodeHash)
 				if (!remote) {
 					await link.close('inbound-no-nodehash')
 					return
@@ -241,7 +241,7 @@ export function createLinkRegistry(options = {}) {
 		 * @param {string} remoteNodeHash 远端 nodeHash
 		 * @returns {object | null} 已有规范链路
 		 */
-		getCanonicalLink: remoteNodeHash => links.get(normalizeHex64(remoteNodeHash)),
+		getCanonicalLink: remoteNodeHash => links.get(remoteNodeHash),
 	}))
 
 	/**
@@ -271,7 +271,7 @@ export function createLinkRegistry(options = {}) {
 	async function ensureDirectLinkToNode(remoteNodeHash) {
 		await bootstrap.ensureRuntime()
 		await bootstrap.whenSignalListening()
-		const normalized = normalizeHex64(remoteNodeHash)
+		const normalized = remoteNodeHash
 		if (!normalized || normalized === localIdentity.nodeHash) return null
 		if (links.has(normalized)) return links.get(normalized)
 		if (inflights.has(normalized)) return await inflights.get(normalized)
@@ -356,7 +356,7 @@ export function createLinkRegistry(options = {}) {
 			 * @param {string} nodeHash 目标 nodeHash
 			 * @returns {object | null} 已有链路或 null
 			 */
-			getLink: nodeHash => links.get(normalizeHex64(nodeHash)) || null,
+			getLink: nodeHash => links.get(nodeHash) || null,
 			ensureLinkToNode: ensureDirectLinkToNode,
 			/**
 			 * @param {(nodeHash: string) => void} listener link up 回调
@@ -380,10 +380,9 @@ export function createLinkRegistry(options = {}) {
 	exploreLinkHashes = meshKeepalive.exploreLinkHashes
 	setDiscoveryLinkDialer(ensureDirectLinkToNode)
 	setDiscoveryPeerClueListener(nodeHash => {
-		const hash = normalizeHex64(nodeHash)
-		if (!hash) return
-		dialCooldown.delete(hash)
-		recentAdverts.touch(hash, Date.now())
+		if (!nodeHash) return
+		dialCooldown.delete(nodeHash)
+		recentAdverts.touch(nodeHash, Date.now())
 	})
 
 	/**
@@ -401,7 +400,7 @@ export function createLinkRegistry(options = {}) {
 	 * @returns {Promise<boolean>} 是否发送成功
 	 */
 	async function sendDirectToNodeLink(remoteNodeHash, envelope) {
-		const normalized = normalizeHex64(remoteNodeHash)
+		const normalized = remoteNodeHash
 		if (!normalized) return false
 		const link = links.get(normalized)
 		if (!link) return false
@@ -591,7 +590,7 @@ export function createLinkRegistry(options = {}) {
 		 * @returns {object | null} 链路实例；不存在时 null
 		 */
 		getLink(nodeHash) {
-			return links.get(normalizeHex64(nodeHash)) || null
+			return links.get(nodeHash) || null
 		},
 		/**
 		 * 列出所有活跃链路。
@@ -607,8 +606,7 @@ export function createLinkRegistry(options = {}) {
 		 * @returns {Promise<void>}
 		 */
 		async closeLink(nodeHash, reason = 'manual-close') {
-			const normalized = normalizeHex64(nodeHash)
-			const link = links.get(normalized)
+			const link = links.get(nodeHash)
 			if (!link) return
 			await link.close(reason)
 		},
@@ -638,7 +636,7 @@ export function createLinkRegistry(options = {}) {
 		 * @returns {void}
 		 */
 		registerScopeInterest(scope, nodeHashes) {
-			scopeInterests.set(scope, new Set((nodeHashes || []).map(normalizeHex64).filter(Boolean)))
+			scopeInterests.set(scope, new Set((nodeHashes || []).filter(isHex64)))
 		},
 		/**
 		 * 释放 scope 兴趣。
@@ -673,8 +671,7 @@ export function createLinkRegistry(options = {}) {
 		 * @returns {Promise<() => void>} 取消函数
 		 */
 		async watchNodeAdvert(nodeHash, onAdvert) {
-			const hash = normalizeHex64(nodeHash)
-			return await watchVerifiedNodeAdvert(hash, async (verifiedNodeHash, body, meta) => {
+			return await watchVerifiedNodeAdvert(nodeHash, async (verifiedNodeHash, body, meta) => {
 				noteAdvertPeerHints(verifiedNodeHash, body, meta)
 				recentAdverts.touch(verifiedNodeHash, Date.now())
 				dialCooldown.delete(verifiedNodeHash)

package/transport/mesh_keepalive.mjs

@@ -1,4 +1,3 @@
-import { normalizeHex64 } from '../core/hexIds.mjs'
 import { listVisibleNodeHashes as discoveryListVisible } from '../discovery/index.mjs'
 import { nodeDebug, shortHash } from '../node/log.mjs'
 import { applyNetworkHint, loadPeerPoolView, promoteExplorePeer } from '../node/network.mjs'
@@ -54,15 +53,14 @@ export function createMeshKeepalive(deps) {
 	 * @returns {void}
 	 */
 	function syncExploreMark(nodeHash, trustedPeers) {
-		const hash = normalizeHex64(nodeHash)
-		if (!hash) return
+		if (!nodeHash) return
 		const trusted = trustedPeers ?? loadPeerPoolView().trustedPeers
-		if (trusted.includes(hash)) {
-			exploreLinks.delete(hash)
-			exploreStableSince.delete(hash)
+		if (trusted.includes(nodeHash)) {
+			exploreLinks.delete(nodeHash)
+			exploreStableSince.delete(nodeHash)
 			return
 		}
-		exploreLinks.add(hash)
+		exploreLinks.add(nodeHash)
 	}
 
 	/**
@@ -187,10 +185,9 @@ export function createMeshKeepalive(deps) {
 				syncExploreMark(nodeHash)
 			}) ?? null
 			stopLinkDown = registry.onLinkDown((nodeHash, reason) => {
-				const hash = normalizeHex64(nodeHash)
-				exploreLinks.delete(hash)
-				exploreStableSince.delete(hash)
-				nodeDebug('p2p:mesh link down', { peer: shortHash(hash), reason })
+				exploreLinks.delete(nodeHash)
+				exploreStableSince.delete(nodeHash)
+				nodeDebug('p2p:mesh link down', { peer: shortHash(nodeHash), reason })
 				// 主动关链不立刻补洞（避免 budget-evict 刚踢又连）；意外断链用 tick 按 N/K 重选，而非粘住原对端。
 				if (isMeshIntentionalClose(reason)) return
 				void runTick()

package/transport/offer_answer.mjs

@@ -1,6 +1,6 @@
 import { randomBytes } from 'node:crypto'
 
-import { normalizeHex64 } from '../core/hexIds.mjs'
+import { isHex64 } from '../core/hexIds.mjs'
 import { decryptNodeSignalPacket, sendNodeSignalPacket } from '../discovery/index.mjs'
 import { listLinkProviders } from '../link/providers/index.mjs'
 import { nodeDebug, shortHash } from '../node/log.mjs'
@@ -92,7 +92,7 @@ export function createOfferAnswerDial(deps) {
 	 * @returns {ReturnType<typeof createBufferedSignalSession>} 该连接的缓冲信令会话
 	 */
 	function createConnSession(remoteNodeHash, connId) {
-		const normalized = normalizeHex64(remoteNodeHash)
+		const normalized = remoteNodeHash
 		return createBufferedSignalSession(async message => {
 			await sendNodeSignalPacket(normalized, {
 				type: 'signal',
@@ -153,7 +153,7 @@ export function createOfferAnswerDial(deps) {
 	 */
 	async function handleSignalPacket(packet) {
 		if (packet?.type !== 'signal') return
-		const remoteNodeHash = normalizeHex64(packet.from)
+		const remoteNodeHash = isHex64(packet.from)
 		const connId = String(packet.connId || '')
 		if (!remoteNodeHash || remoteNodeHash === localIdentity.nodeHash || !connId) return
 		let session = signalSessions.get(connId)

package/transport/peer_health.mjs

@@ -1,4 +1,3 @@
-import { normalizeHex64 } from '../core/hexIds.mjs'
 import { emitSafe } from '../utils/emit_safe.mjs'
 
 /**
@@ -56,37 +55,35 @@ export function createPeerHealthTracker(registry) {
 	}
 
 	const stopUp = registry.onLinkUp?.((nodeHash, link) => {
-		const hash = normalizeHex64(nodeHash)
-		if (!hash) return
+		if (!nodeHash) return
 		const stopRtt = link?.onRtt?.(() => {
 			const stats = link.stats?.() ?? {}
-			update(hash, {
+			update(nodeHash, {
 				rttMs: stats.rttMs ?? null,
 				avgRttMs: stats.avgRttMs ?? null,
 				lastSeenAt: Date.now(),
 			})
 		}) ?? null
 		const stopDown = link?.onDown?.(() => {
-			cleanups.get(hash)?.()
-			cleanups.delete(hash)
-			update(hash, { connected: false, lastSeenAt: Date.now() })
+			cleanups.get(nodeHash)?.()
+			cleanups.delete(nodeHash)
+			update(nodeHash, { connected: false, lastSeenAt: Date.now() })
 		}) ?? null
-		update(hash, {
+		update(nodeHash, {
 			connected: true,
 			source: link?.providerId ?? null,
 			lastSeenAt: Date.now(),
 		})
-		cleanups.set(hash, () => {
+		cleanups.set(nodeHash, () => {
 			stopRtt?.()
 			stopDown?.()
 		})
 	}) ?? null
 	const stopDown = registry.onLinkDown?.(nodeHash => {
-		const hash = normalizeHex64(nodeHash)
-		if (!hash) return
-		cleanups.get(hash)?.()
-		cleanups.delete(hash)
-		update(hash, { connected: false, lastSeenAt: Date.now() })
+		if (!nodeHash) return
+		cleanups.get(nodeHash)?.()
+		cleanups.delete(nodeHash)
+		update(nodeHash, { connected: false, lastSeenAt: Date.now() })
 	}) ?? null
 
 	return {
@@ -95,7 +92,7 @@ export function createPeerHealthTracker(registry) {
 		 * @returns {PeerHealthEntry | null} 健康记录；无记录时 null
 		 */
 		getPeerHealth(nodeHash) {
-			return entries.get(normalizeHex64(nodeHash)) ?? null
+			return entries.get(nodeHash) ?? null
 		},
 		/**
 		 * @returns {PeerHealthEntry[]} 所有邻居健康记录

package/trust_graph/send.mjs

@@ -1,4 +1,4 @@
-import { isHex64, normalizeHex64 } from '../core/hexIds.mjs'
+import { isHex64 } from '../core/hexIds.mjs'
 import { getNodeHash } from '../node/identity.mjs'
 import { loadReputation } from '../node/reputation_store.mjs'
 import { listFederationRoomSlots } from '../registries/room_provider.mjs'
@@ -20,8 +20,8 @@ import trustGraphTunables from './tunables.json' with { type: 'json' }
  * @returns {Promise<boolean>} 是否已发送
  */
 export async function sendToNode(username, targetNodeHash, actionName, payload, graph) {
-	const target = normalizeHex64(targetNodeHash)
-	if (!isHex64(target)) return false
+	const target = isHex64(targetNodeHash)
+	if (!target) return false
 
 	// 已直连 peer 不经 trust-graph scope 也应能收发 node scope action（非成员 CAS chunk / follow hint 等）
 	if (await sendToNodeLink(target, { scope: 'node', action: actionName, payload }))