@steve02081504/fount-p2p 0.0.34 → 0.0.36

package/federation/entity_key_chain.mjs

@@ -5,7 +5,7 @@ import { Buffer } from 'node:buffer'
 
 import { canonicalStringify } from '../core/canonical_json.mjs'
 import { hashFromPubKeyHex } from '../core/entity_id.mjs'
-import { isHex64, normalizeHex64 } from '../core/hexIds.mjs'
+import { isHex64 } from '../core/hexIds.mjs'
 
 /**
  * entity 密钥撤销签名的域分隔前缀。
@@ -28,9 +28,10 @@ export const ENTITY_KEY_REVOKE_DOMAIN = 'fount-entity-key-revoke'
  * @returns {EntityKeyHistoryEntry[]} 创世链
  */
 export function createGenesisKeyHistory(activePubKeyHex, validFrom = Date.now()) {
+	if (!activePubKeyHex) return []
 	return [{
 		generation: 0,
-		activePubKeyHex: normalizeHex64(activePubKeyHex),
+		activePubKeyHex,
 		attestedBy: 'recovery',
 		validFrom,
 	}]
@@ -63,8 +64,8 @@ export function isActiveGenerationRevoked(keyHistory, generation) {
  * @returns {boolean} sender 是否为未吊销的活跃钥
  */
 export function isValidActiveSender(keyHistory, senderPubKeyHash) {
-	const sender = normalizeHex64(senderPubKeyHash)
-	if (!isHex64(sender)) return false
+	const sender = isHex64(senderPubKeyHash)
+	if (!sender) return false
 	for (const entry of keyHistory || []) {
 		if (isActiveGenerationRevoked(keyHistory, entry.generation)) continue
 		if (hashFromPubKeyHex(entry.activePubKeyHex) === sender)
@@ -79,7 +80,7 @@ export function isValidActiveSender(keyHistory, senderPubKeyHash) {
  * @returns {boolean} 是否为 recovery 钥签名
  */
 export function isRecoverySender(recoveryPubKeyHex, senderPubKeyHash) {
-	return hashFromPubKeyHex(recoveryPubKeyHex) === normalizeHex64(senderPubKeyHash)
+	return hashFromPubKeyHex(recoveryPubKeyHex) === senderPubKeyHash
 }
 
 /**
@@ -89,8 +90,8 @@ export function isRecoverySender(recoveryPubKeyHex, senderPubKeyHash) {
  */
 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))
+	const activePubKeyHex = isHex64(event.content?.activePubKeyHex || '')
+	if (!Number.isFinite(generation) || generation < 0 || !activePubKeyHex)
 		return state
 	state.entityKeyHistory = state.entityKeyHistory || []
 	if (state.entityKeyHistory.some(row => row.generation === generation))
@@ -111,7 +112,7 @@ export function reduceEntityKeyRotate(state, event) {
  */
 export function reduceEntityKeyRevoke(state, event) {
 	const newGeneration = Number(event.content?.newGeneration)
-	const activePubKeyHex = normalizeHex64(event.content?.activePubKeyHex || '')
+	const activePubKeyHex = event.content?.activePubKeyHex
 	const revokeGenerations = (event.content?.revokeGenerations || [])
 		.map(Number).filter(Number.isFinite)
 	if (!Number.isFinite(newGeneration) || newGeneration < 0 || !isHex64(activePubKeyHex))
@@ -163,7 +164,7 @@ export function entityKeyRevokeSignBytes(revokeBody) {
 	const body = {
 		revokeGenerations: (revokeBody.revokeGenerations || []).map(Number),
 		newGeneration: Number(revokeBody.newGeneration),
-		activePubKeyHex: normalizeHex64(revokeBody.activePubKeyHex || ''),
+		activePubKeyHex: revokeBody.activePubKeyHex || '',
 		entityHash: String(revokeBody.entityHash || ''),
 	}
 	return Buffer.from(`${ENTITY_KEY_REVOKE_DOMAIN}\0${canonicalStringify(body)}`, 'utf8')

package/federation/message_rate_limit.mjs

@@ -1,8 +1,6 @@
 /**
  * 群级消息限速纯函数（无 I/O，供单测与 governance 复用）。
  */
-import { normalizeHex64 } from '../core/hexIds.mjs'
-
 /**
  * @param {object} event DAG 事件
  * @returns {string} 限速实体键
@@ -10,7 +8,7 @@ import { normalizeHex64 } from '../core/hexIds.mjs'
 export function messageRateEntityKey(event) {
 	const charId = String(event?.charId || '')
 	if (charId) return `char:${charId}`
-	return normalizeHex64(event?.sender)
+	return event?.sender || ''
 }
 
 /**

package/files/manifest/normalize.mjs

@@ -40,8 +40,8 @@ const TRANSFER_TYPES = new Set(['public', 'file-master-key-wrap', 'vault-wrap',
  */
 export function normalizeFileManifest(input) {
 	if (!input || typeof input !== 'object') return null
-	const ownerEntityHash = String(input.ownerEntityHash || '')
-	if (!isEntityHash128(ownerEntityHash)) return null
+	const ownerEntityHash = isEntityHash128(input.ownerEntityHash)
+	if (!ownerEntityHash) return null
 	const logicalPath = String(input.logicalPath || '').replace(/^\/+/, '').replace(/\\/g, '/')
 	if (!logicalPath) return null
 	const ceMode = String(input.ceMode || 'convergent')

package/files/manifest/public.mjs

@@ -3,7 +3,7 @@ import { Buffer } from 'node:buffer'
 import { canonicalStringify } from '../../core/canonical_json.mjs'
 import { hashFromPubKeyHex, parseEntityHash } from '../../core/entity_id.mjs'
 import { assertSafeEvfsLogicalPath } from '../../core/evfs_logical_path.mjs'
-import { isHex64, isSignatureHex128, normalizeHex64 } from '../../core/hexIds.mjs'
+import { isHex64, isSignatureHex128 } from '../../core/hexIds.mjs'
 import { sign, verify } from '../../crypto/crypto.mjs'
 import { putFileManifest, saveFileManifest } from '../evfs.mjs'
 
@@ -39,7 +39,7 @@ export function publicManifestSignBytes(fields) {
  * @returns {Promise<import('./normalize.mjs').FileManifest>} 带 publicSig 的清单
  */
 export async function attachPublicManifestSig(manifest, publishedAt, entitySecretKey, entityPubKeyHex) {
-	const pubKeyHex = normalizeHex64(entityPubKeyHex)
+	const pubKeyHex = entityPubKeyHex
 	const message = publicManifestSignBytes({
 		ownerEntityHash: manifest.ownerEntityHash,
 		logicalPath: manifest.logicalPath,
@@ -73,9 +73,9 @@ export async function verifySignedPublicManifest(input) {
 	const publicSig = input?.meta?.publicSig
 	if (!publicSig || typeof publicSig !== 'object') return null
 	const publishedAt = Number(publicSig.publishedAt) || 0
-	const pubKeyHex = normalizeHex64(publicSig.pubKeyHex)
-	const sigHex = String(publicSig.sigHex || '')
-	if (!isHex64(pubKeyHex) || !isSignatureHex128(sigHex) || publishedAt <= 0) return null
+	const pubKeyHex = isHex64(publicSig.pubKeyHex)
+	const sigHex = isSignatureHex128(publicSig.sigHex)
+	if (!pubKeyHex || !sigHex || publishedAt <= 0) return null
 
 	const parsed = parseEntityHash(manifest.ownerEntityHash)
 	if (!parsed) return null

package/governance/branch.mjs

@@ -1,4 +1,3 @@
-import { normalizeHex64 } from '../core/hexIds.mjs'
 import { sortedPrevEventIds } from '../dag/index.mjs'
 import { getGovernanceAuthzTypes } from '../registries/event_type.mjs'
 
@@ -105,7 +104,7 @@ function governanceAuthzScoreForTip(tipId, byId, reputationBySender) {
 	for (const eventId of ancestorClosureFromTip(tipId, byId)) {
 		const event = byId.get(eventId)
 		if (!event || !getGovernanceAuthzTypes().has(event.type)) continue
-		const sender = normalizeHex64(event.sender)
+		const sender = event.sender
 		if (sender) score += Number(reputationBySender[sender] ?? 0)
 	}
 	return score

package/governance/join_pow.mjs

@@ -3,8 +3,6 @@
  */
 import { createHash } from 'node:crypto'
 
-import { normalizeHex64 } from '../core/hexIds.mjs'
-
 import admissionTunables from './tunables.json' with { type: 'json' }
 
 /** 默认 epoch 窗口（1 小时） */
@@ -105,8 +103,8 @@ export function verifyJoinPow(powSolution, options) {
 	const anchorRef = String(powSolution.anchorRef ?? '')
 	const { nonce } = powSolution
 	const epoch = Number(powSolution.epoch)
-	const joinerNodeHash = normalizeHex64(powSolution.joinerNodeHash ?? options.senderNodeHash)
-	const senderNodeHash = normalizeHex64(options.senderNodeHash)
+	const joinerNodeHash = powSolution.joinerNodeHash ?? options.senderNodeHash
+	const senderNodeHash = options.senderNodeHash
 
 	if (!anchorRef || nonce == null || !Number.isFinite(epoch)) return { ok: false, achievedBits: 0 }
 	if (!joinerNodeHash || joinerNodeHash !== senderNodeHash) return { ok: false, achievedBits: 0 }

package/governance/owner_succession_ballot.mjs

@@ -4,7 +4,7 @@
 import { Buffer } from 'node:buffer'
 
 import { canonicalStringify } from '../core/canonical_json.mjs'
-import { isHex64, isSignatureHex128, normalizeHex64 } from '../core/hexIds.mjs'
+import { isHex64, isSignatureHex128 } from '../core/hexIds.mjs'
 import { pubKeyHash, verify } from '../crypto/crypto.mjs'
 
 const BALLOT_DOMAIN = 'fount-owner-succession'
@@ -15,7 +15,7 @@ const BALLOT_DOMAIN = 'fount-owner-succession'
  */
 export function ownerSuccessionBallotSignBytes(ballot) {
 	const body = {
-		proposedOwnerPubKeyHash: normalizeHex64(ballot.proposedOwnerPubKeyHash),
+		proposedOwnerPubKeyHash: ballot.proposedOwnerPubKeyHash,
 		groupId: ballot.groupId,
 		ballotId: ballot.ballotId,
 	}
@@ -42,9 +42,9 @@ export async function verifyOwnerSuccessionThreshold(ballot, adminPubKeyHashes,
 	let valid = 0
 
 	for (const entry of ballot.adminSignatures || []) {
-		const pubKeyHex = normalizeHex64(entry.pubKeyHex)
-		const signatureHex = entry.signature
-		if (!isHex64(pubKeyHex) || !isSignatureHex128(signatureHex)) continue
+		const pubKeyHex = isHex64(entry.pubKeyHex)
+		const signatureHex = isSignatureHex128(entry.signature)
+		if (!pubKeyHex || !signatureHex) continue
 
 		const hash = pubKeyHash(Buffer.from(pubKeyHex, 'hex'))
 		if (!admins.has(hash) || seen.has(hash)) continue

package/infra/priority.mjs

@@ -1,4 +1,3 @@
-import { normalizeHex64 } from '../core/hexIds.mjs'
 import { loadReputation } from '../node/reputation_store.mjs'
 import { pickNodeScoreFromReputation } from '../reputation/pick_score.mjs'
 import { getLinkRegistry } from '../transport/link_registry.mjs'
@@ -38,7 +37,7 @@ export function applyPriorityToRegistry() {
 	registry.setPriorityWeightFunction(nodeHash => {
 		const score = pickNodeScoreFromReputation(
 			loadReputation(),
-			normalizeHex64(nodeHash) || nodeHash,
+			nodeHash,
 		)
 		return Math.floor(score * PRIORITY_BOOST)
 	})

package/link/handshake.mjs

@@ -1,7 +1,7 @@
 import { Buffer } from 'node:buffer'
 import { randomBytes } from 'node:crypto'
 
-import { isHex64, isSignatureHex128, normalizeHex64 } from '../core/hexIds.mjs'
+import { isHex64, isSignatureHex128 } from '../core/hexIds.mjs'
 import { normalizeTcpPort } from '../core/tcp_port.mjs'
 import { keyPairFromSeed, pubKeyHash, sign, verify } from '../crypto/crypto.mjs'
 import { normalizeLanHosts } from '../discovery/lan_interfaces.mjs'
@@ -22,8 +22,7 @@ export const LINK_HANDSHAKE_DOMAIN = 'fount-link'
 export function normalizeLinkBinding(value) {
 	const dtls = normalizeDtlsFingerprint(value)
 	if (dtls) return dtls
-	const hex = normalizeHex64(value)
-	return isHex64(hex) ? hex : null
+	return isHex64(value)
 }
 
 /**
@@ -34,9 +33,9 @@ export function normalizeLinkBinding(value) {
  * @returns {Uint8Array} 待签名消息字节
  */
 export function buildAuthMessage(peerNonce, localBinding, localNodeHash) {
-	const nonce = normalizeHex64(peerNonce)
+	const nonce = peerNonce
 	const binding = normalizeLinkBinding(localBinding)
-	const nodeHash = normalizeHex64(localNodeHash)
+	const nodeHash = localNodeHash
 	if (!/^[\da-f]{64}$/u.test(nonce))
 		throw new Error('p2p: auth nonce must be 64 hex characters')
 	if (!binding)
@@ -57,10 +56,10 @@ export function buildHello(options = {}) {
 		const derived = keyPairFromSeed(Buffer.from(ensureNodeSeed(), 'hex'))
 		publicKey = derived.publicKey
 	}
-	const nodeHash = normalizeHex64(options.nodeHash || getNodeHash())
-	const nodePubKey = normalizeHex64(options.nodePubKey || Buffer.from(publicKey).toString('hex'))
-	const nonce = normalizeHex64(options.nonce || randomBytes(32).toString('hex'))
-	if (!isHex64(nodeHash) || !isHex64(nodePubKey) || !isHex64(nonce))
+	const nodeHash = isHex64(options.nodeHash || getNodeHash())
+	const nodePubKey = isHex64(options.nodePubKey || Buffer.from(publicKey).toString('hex'))
+	const nonce = isHex64(options.nonce || randomBytes(32).toString('hex'))
+	if (!nodeHash || !nodePubKey || !nonce)
 		throw new Error('p2p: invalid hello fields')
 	if (pubKeyHash(Buffer.from(nodePubKey, 'hex')) !== nodeHash)
 		throw new Error('p2p: hello nodePubKey does not match nodeHash')
@@ -79,7 +78,7 @@ export async function buildAuth(peerNonce, localBinding, options = {}) {
 		? Buffer.from(options.secretKey)
 		: Buffer.from(ensureNodeSeed(), 'hex')
 	const { publicKey, secretKey } = keyPairFromSeed(seed)
-	const nodeHash = normalizeHex64(options.nodeHash || pubKeyHash(publicKey))
+	const nodeHash = options.nodeHash || pubKeyHash(publicKey)
 	if (nodeHash !== pubKeyHash(publicKey))
 		throw new Error('p2p: auth nodeHash does not match secretKey')
 	const message = buildAuthMessage(peerNonce, localBinding, nodeHash)
@@ -93,10 +92,10 @@ export async function buildAuth(peerNonce, localBinding, options = {}) {
  * @returns {{ nodeHash: string, nodePubKey: string, nonce: string } | null} 规范化 hello 或 null
  */
 export function parseHello(hello) {
-	const nodeHash = normalizeHex64(hello?.nodeHash)
-	const nodePubKey = normalizeHex64(hello?.nodePubKey)
-	const nonce = normalizeHex64(hello?.nonce)
-	if (!isHex64(nodeHash) || !isHex64(nodePubKey) || !isHex64(nonce)) return null
+	const nodeHash = isHex64(hello?.nodeHash)
+	const nodePubKey = isHex64(hello?.nodePubKey)
+	const nonce = isHex64(hello?.nonce)
+	if (!nodeHash || !nodePubKey || !nonce) return null
 	try {
 		if (pubKeyHash(Buffer.from(nodePubKey, 'hex')) !== nodeHash) return null
 	}
@@ -117,11 +116,11 @@ export function parseHello(hello) {
 export async function verifyAuth(hello, auth, expectedNonce, remoteBinding) {
 	const parsedHello = parseHello(hello)
 	if (!parsedHello) return null
-	const signatureHex = String(auth?.sig ?? '')
+	const signatureHex = isSignatureHex128(auth?.sig)
 	const binding = normalizeLinkBinding(remoteBinding)
-	if (!isSignatureHex128(signatureHex) || !binding) return null
-	const normalizedNonce = normalizeHex64(expectedNonce)
-	if (!isHex64(normalizedNonce)) return null
+	if (!signatureHex || !binding) return null
+	const normalizedNonce = isHex64(expectedNonce)
+	if (!normalizedNonce) return null
 	const message = buildAuthMessage(normalizedNonce, binding, parsedHello.nodeHash)
 	const ok = await verify(
 		Buffer.from(signatureHex, 'hex'),
@@ -141,7 +140,7 @@ export async function verifyAuth(hello, auth, expectedNonce, remoteBinding) {
  * @returns {Uint8Array} 待签名消息字节
  */
 export function buildAdvertMessage(rendezvousKey, ts, nodeHash, tcpPort = null, lanHosts = null) {
-	const base = `fount-advert\0${rendezvousKey}\0${ts}\0${normalizeHex64(nodeHash)}`
+	const base = `fount-advert\0${rendezvousKey}\0${ts}\0${nodeHash}`
 	const port = normalizeTcpPort(tcpPort)
 	let message = port ? `${base}\0${port}` : base
 	const hosts = normalizeLanHosts(lanHosts)
@@ -161,8 +160,8 @@ export async function buildSignedAdvert(rendezvousKey, ts = Date.now(), options
 		? Buffer.from(options.secretKey)
 		: Buffer.from(ensureNodeSeed(), 'hex')
 	const { publicKey, secretKey } = keyPairFromSeed(seed)
-	const nodeHash = normalizeHex64(options?.nodeHash || pubKeyHash(publicKey))
-	const nodePubKey = normalizeHex64(options?.nodePubKey || Buffer.from(publicKey).toString('hex'))
+	const nodeHash = options?.nodeHash || pubKeyHash(publicKey)
+	const nodePubKey = options?.nodePubKey || Buffer.from(publicKey).toString('hex')
 	if (pubKeyHash(Buffer.from(nodePubKey, 'hex')) !== nodeHash)
 		throw new Error('p2p: advert nodePubKey does not match nodeHash')
 	const tcpPort = normalizeTcpPort(options?.tcpPort)
@@ -194,8 +193,8 @@ export async function verifySignedAdvert(rendezvousKey, advert, now = Date.now()
 	const parsedHello = parseHello({ nodeHash: advert?.nodeHash, nodePubKey: advert?.nodePubKey, nonce: '0'.repeat(64) })
 	if (!parsedHello) return null
 	const ts = Number(advert?.ts)
-	const sig = String(advert?.sig ?? '')
-	if (!Number.isFinite(ts) || Math.abs(now - ts) > maxSkewMs || !isSignatureHex128(sig)) return null
+	const sig = isSignatureHex128(advert?.sig)
+	if (!Number.isFinite(ts) || Math.abs(now - ts) > maxSkewMs || !sig) return null
 	const hasTcpPortField = !!advert?.tcpPort
 	const tcpPort = normalizeTcpPort(advert?.tcpPort)
 	if (hasTcpPortField && !tcpPort) return null

package/link/pipe.mjs

@@ -1,5 +1,4 @@
 import { toBytes } from '../core/bytes_codec.mjs'
-import { normalizeHex64 } from '../core/hexIds.mjs'
 import { ms } from '../utils/duration.mjs'
 import { emitSafe } from '../utils/emit_safe.mjs'
 import { createLruMap } from '../utils/lru.mjs'
@@ -92,7 +91,7 @@ export function createLinkPipe(options) {
 	const heartbeatMs = Number(options.heartbeatMs) || ms('15s')
 	const idleTimeoutMs = Number(options.idleTimeoutMs) || ms('45s')
 	const handshakeTimeoutMs = Number(options.handshakeTimeoutMs) || ms('10s')
-	const targetNodeHash = normalizeHex64(options.nodeHash || '')
+	const targetNodeHash = options.nodeHash || ''
 	let closed = false
 	let ready = false
 	let closeReason = 'closed'

package/link/providers/ble_gatt.mjs

@@ -1,7 +1,6 @@
 import { Buffer } from 'node:buffer'
 import { randomBytes } from 'node:crypto'
 
-import { normalizeHex64 } from '../../core/hexIds.mjs'
 import { getBtPeerHint } from '../../discovery/bt/peer_hints.mjs'
 import { canUseBluetoothRuntime, loadBleno, loadNoble, resolveBtRole, waitPoweredOn } from '../../discovery/bt/runtime.mjs'
 import { asLinkHandle } from '../pipe.mjs'
@@ -55,7 +54,7 @@ async function openGattPipe(options) {
 
 	if (options.initiator)
 		await Promise.resolve(options.write(Buffer.from(
-			buildLinkOpen(normalizeHex64(options.linkId), options.localIdentity?.nodeHash),
+			buildLinkOpen(options.linkId, options.localIdentity?.nodeHash),
 			'utf8',
 		)))
 
@@ -69,7 +68,7 @@ async function openGattPipe(options) {
  * @returns {Promise<import('./index.mjs').LinkHandle>} 已就绪的 link
  */
 async function dialBleGatt(options) {
-	const remoteNodeHash = normalizeHex64(options.nodeHash)
+	const remoteNodeHash = options.nodeHash
 	const hint = getBtPeerHint(remoteNodeHash)
 	if (!hint) throw new Error('p2p: ble_gatt no peer hint')
 	const noble = await loadNoble()

package/link/providers/lan_tcp.mjs

@@ -2,7 +2,6 @@ import { Buffer } from 'node:buffer'
 import { randomBytes } from 'node:crypto'
 import net from 'node:net'
 
-import { normalizeHex64 } from '../../core/hexIds.mjs'
 import { getLanPeerHint, listLanPeerHints } from '../../discovery/lan_peer_hints.mjs'
 import { asLinkHandle } from '../pipe.mjs'
 
@@ -186,7 +185,7 @@ async function openTcpPipe(options) {
 		pipe.handleInbound(payload)
 
 	if (options.initiator)
-		codec.write(buildLinkOpen(normalizeHex64(options.linkId), options.localIdentity?.nodeHash))
+		codec.write(buildLinkOpen(options.linkId, options.localIdentity?.nodeHash))
 
 	await pipe.startHandshake()
 	return asLinkHandle(pipe)
@@ -198,7 +197,7 @@ async function openTcpPipe(options) {
  * @returns {Promise<import('./index.mjs').LinkHandle>} 已就绪的 link
  */
 async function dialLanTcp(options) {
-	const remoteNodeHash = normalizeHex64(options.nodeHash)
+	const remoteNodeHash = options.nodeHash
 	const hints = listLanPeerHints(remoteNodeHash)
 	if (!hints.length) throw new Error('p2p: lan_tcp no peer hint')
 

package/link/providers/link_id_pipe.mjs

@@ -1,6 +1,6 @@
 import { Buffer } from 'node:buffer'
 
-import { normalizeHex64 } from '../../core/hexIds.mjs'
+import { isHex64 } from '../../core/hexIds.mjs'
 import { createLinkPipe } from '../pipe.mjs'
 
 /**
@@ -25,7 +25,7 @@ export function parseLinkOpen(raw) {
 	}
 	catch { return null }
 	if (parsed?.type !== 'link-open' || !parsed.linkId) return null
-	return { linkId: String(parsed.linkId), from: normalizeHex64(parsed.from) || null }
+	return { linkId: String(parsed.linkId), from: isHex64(parsed.from) }
 }
 
 /**
@@ -34,7 +34,7 @@ export function parseLinkOpen(raw) {
  * @returns {ReturnType<typeof createLinkPipe>} link pipe
  */
 export function createLinkIdBoundPipe(options) {
-	const linkId = normalizeHex64(options.linkId)
+	const linkId = options.linkId
 	if (!linkId) throw new Error(`p2p: ${options.providerId || 'link'} linkId required`)
 	return createLinkPipe({
 		...options,

package/link/providers/nostr.mjs

@@ -2,7 +2,7 @@ import { Buffer } from 'node:buffer'
 import { randomBytes } from 'node:crypto'
 
 import { base64ToBytes, bytesToBase64 } from '../../core/bytes_codec.mjs'
-import { normalizeHex64 } from '../../core/hexIds.mjs'
+import { isHex64 } from '../../core/hexIds.mjs'
 import { getDiscoveryProvider, sendNodeSignalPacket } from '../../discovery/index.mjs'
 import { NOSTR_SIGNAL_KIND, resolveNostrRelayUrls } from '../../discovery/nostr.mjs'
 import { ms } from '../../utils/duration.mjs'
@@ -317,9 +317,9 @@ export function createNostrLinkProvider(options = {}) {
 	 */
 	async function deliverPacket(packet) {
 		if (packet?.type !== 'link') return
-		const linkId = normalizeHex64(packet.linkId)
-		const from = normalizeHex64(packet.from)
-		if (!linkId || !from) return
+		const linkId = packet.linkId
+		const from = packet.from
+		if (!isHex64(linkId) || !isHex64(from)) return
 		if (localIdentity?.nodeHash && from === localIdentity.nodeHash) return
 
 		const op = String(packet.op || '')
@@ -375,8 +375,8 @@ export function createNostrLinkProvider(options = {}) {
 		 */
 		async dial(dialOptions) {
 			if (!isAvailable()) return null
-			const remoteNodeHash = normalizeHex64(dialOptions.nodeHash)
-			if (!remoteNodeHash) return null
+			const remoteNodeHash = dialOptions.nodeHash
+			if (!isHex64(remoteNodeHash)) return null
 			localIdentity = dialOptions.localIdentity || localIdentity
 			if (!localIdentity?.nodeHash) throw new Error('p2p: nostr dial requires localIdentity')
 			await refreshPayloadCap(resolveRelayUrls())

package/mailbox/deliver_or_store.mjs

@@ -1,4 +1,4 @@
-import { normalizeHex64 } from '../core/hexIds.mjs'
+import { isHex64 } from '../core/hexIds.mjs'
 import { getNodeTransportSettings, getNodeHash } from '../node/identity.mjs'
 import { activeLinkRoster, deliverToUserRoomPeers } from '../transport/user_room.mjs'
 import { DEFAULT_TRUST_GRAPH_OWNER, requireTrustGraphProvider } from '../trust_graph/registry.mjs'
@@ -25,7 +25,7 @@ import {
 async function resolveRemoteNodeHashForPeer(username, peerId) {
 	if (!peerId) return null
 	const entry = activeLinkRoster().find(row => row.peerId === peerId)
-	const remote = normalizeHex64(entry?.remoteNodeHash)
+	const remote = entry?.remoteNodeHash
 	return remote || null
 }
 
@@ -62,8 +62,8 @@ async function resolveRouting(username) {
  */
 export async function deliverOrStoreMailboxPut(username, options) {
 	const routing = await resolveRouting(username)
-	const toPubKeyHash = normalizeHex64(options.toPubKeyHash)
-	if (!toPubKeyHash) return { stored: false, delivered: false, relayed: 0 }
+	const toPubKeyHash = options.toPubKeyHash
+	if (!isHex64(toPubKeyHash)) return { stored: false, delivered: false, relayed: 0 }
 	const hop = normalizeMailboxHop(options.hop)
 	if (hop >= routing.maxHop) return { stored: false, delivered: false, relayed: 0 }
 	const tier = mailboxTierFromHop(hop)
@@ -76,8 +76,8 @@ export async function deliverOrStoreMailboxPut(username, options) {
 		fromNodeHash: options.record?.fromNodeHash || nodeHash,
 	}
 	const stored = await storeMailboxRecord(record)
-	const toNodeHash = normalizeHex64(options.toNodeHash)
-	const delivered = toNodeHash && isMailboxRecordWithinSizeLimit(record)
+	const toNodeHash = options.toNodeHash
+	const delivered = isHex64(toNodeHash) && isMailboxRecordWithinSizeLimit(record)
 		? await requireTrustGraphProvider(DEFAULT_TRUST_GRAPH_OWNER).sendToNode(username, toNodeHash, 'mailbox_put', { nodeHash, record })
 		: false
 
@@ -114,8 +114,8 @@ export async function publishMailboxRecord(username, toPubKeyHash, record, toNod
 export async function ingestMailboxPut(wireContext, put, peerId = '') {
 	const { record } = put
 	if (!record?.envelope || !record?.toPubKeyHash) return
-	const fromNode = normalizeHex64(put.nodeHash)
-	if (!fromNode || !takeIncomingMailboxPutSlot(fromNode)) return
+	const fromNode = put.nodeHash
+	if (!isHex64(fromNode) || !takeIncomingMailboxPutSlot(fromNode)) return
 	const username = wireContext.replicaUsername || ''
 	if (!username) return
 	if (peerId) {
@@ -143,8 +143,8 @@ export async function ingestMailboxPut(wireContext, put, peerId = '') {
  */
 export async function respondMailboxWant(want, sendGive, peerId) {
 	const { getMailboxRecords, takeMailboxForRecipient } = await import('./store.mjs')
-	const recipient = normalizeHex64(want.toPubKeyHash)
-	if (!recipient) return
+	const recipient = want.toPubKeyHash
+	if (!isHex64(recipient)) return
 	const ids = want.ids || []
 	const rows = (ids.length
 		? await getMailboxRecords(ids)
@@ -179,7 +179,7 @@ export async function ingestMailboxGive(wireContext, give) {
 export async function requestMailboxFromNetwork(username, toPubKeyHash) {
 	const routing = await resolveRouting(username)
 	const { listMailboxIdsForRecipient } = await import('./store.mjs')
-	const recipient = normalizeHex64(toPubKeyHash)
+	const recipient = toPubKeyHash
 	if (!recipient) return
 	await deliverToUserRoomPeers(username, 'mailbox_want', {
 		toPubKeyHash: recipient,

package/mailbox/prune.mjs

@@ -1,7 +1,6 @@
 /**
  * Mailbox 公平淘汰（纯函数，供 store 与单测复用）。
  */
-import { normalizeHex64 } from '../core/hexIds.mjs'
 
 /** 单收件人×发送者桶：条数上限 */
 export const MAX_BUCKET_ENTRIES = 10
@@ -31,9 +30,9 @@ export function mailboxRecordBytes(record) {
  * @returns {string} 公平淘汰桶键
  */
 export function mailboxBucketKey(record) {
-	const to = normalizeHex64(record.toPubKeyHash) || ''
-	const from = normalizeHex64(record.fromNodeHash)
-		|| normalizeHex64(record.envelope?.sender)
+	const to = record.toPubKeyHash || ''
+	const from = record.fromNodeHash
+		|| record.envelope?.sender
 		|| 'unknown'
 	return `${to}\0${from}`
 }

package/mailbox/rate.mjs

@@ -1,7 +1,7 @@
 /**
  * Mailbox 入站 put 限速（按来源节点，节点级单例）。
  */
-import { normalizeHex64 } from '../core/hexIds.mjs'
+import { isHex64 } from '../core/hexIds.mjs'
 
 const DEFAULT_WINDOW_MS = 60_000
 const DEFAULT_MAX_PUTS = 20
@@ -62,7 +62,8 @@ function evictLruIfNeeded(key) {
  */
 export function takeIncomingMailboxPutSlot(fromNodeHash, limits) {
 	const { windowMs, maxPuts } = resolveMailboxRateLimits(limits)
-	const key = normalizeHex64(fromNodeHash)
+	const key = fromNodeHash
+	if (!isHex64(key)) return false
 	const now = Date.now()
 	if (inboundByKey.size >= MAX_KEYS) sweepExpiredEntries(now)
 	evictLruIfNeeded(key)

package/mailbox/store.mjs

@@ -1,7 +1,7 @@
 import { mkdir, readFile } from 'node:fs/promises'
 import { dirname } from 'node:path'
 
-import { isHex64, normalizeHex64 } from '../core/hexIds.mjs'
+import { isHex64 } from '../core/hexIds.mjs'
 import { jsonlMutexKey, writeJsonl } from '../dag/storage.mjs'
 import { mailboxStorePath } from '../node/user_paths.mjs'
 import { withAsyncMutex } from '../utils/async_mutex.mjs'
@@ -150,7 +150,7 @@ export function mailboxEnvelopeId(envelope) {
  */
 export async function storeMailboxRecord(record) {
 	if (!isMailboxRecordWithinSizeLimit(record)) return false
-	const toPubKeyHash = normalizeHex64(record.toPubKeyHash)
+	const toPubKeyHash = record.toPubKeyHash
 	if (!isHex64(toPubKeyHash)) return false
 	const hop = normalizeMailboxHop(record.hop)
 	const { tier } = record
@@ -178,7 +178,7 @@ export async function storeMailboxRecord(record) {
 			envelope: record.envelope,
 			storedAt: Date.now(),
 			expiresAt: Date.now() + ttlMs,
-			fromNodeHash: normalizeHex64(record.fromNodeHash),
+			fromNodeHash: record.fromNodeHash,
 			hop,
 			tier,
 			importance: Number.isFinite(Number(record.importance)) ? Number(record.importance) : undefined,
@@ -193,9 +193,8 @@ export async function storeMailboxRecord(record) {
  * @returns {Promise<string[]>} record id 列表
  */
 export async function listMailboxIdsForRecipient(toPubKeyHash) {
-	const recipient = normalizeHex64(toPubKeyHash)
 	return (await readAll())
-		.filter(record => record.toPubKeyHash === recipient)
+		.filter(record => record.toPubKeyHash === toPubKeyHash)
 		.map(record => record.id)
 }
 
@@ -224,8 +223,7 @@ export async function deleteMailboxRecords(ids) {
  * @returns {Promise<MailboxRecord[]>} 待发记录（不删除）
  */
 export async function takeMailboxForRecipient(toPubKeyHash) {
-	const recipient = normalizeHex64(toPubKeyHash)
-	return (await readAll()).filter(record => record.toPubKeyHash === recipient)
+	return (await readAll()).filter(record => record.toPubKeyHash === toPubKeyHash)
 }
 
 /**
@@ -233,9 +231,8 @@ export async function takeMailboxForRecipient(toPubKeyHash) {
  * @returns {Promise<number>} 未过期条数
  */
 export async function countMailboxPendingForRecipient(toPubKeyHash) {
-	const recipient = normalizeHex64(toPubKeyHash)
 	const now = Date.now()
-	return (await readAll()).filter(record => record.toPubKeyHash === recipient && record.expiresAt > now).length
+	return (await readAll()).filter(record => record.toPubKeyHash === toPubKeyHash && record.expiresAt > now).length
 }
 
 /**