@steve02081504/fount-p2p 0.0.35 → 0.0.36

package/AGENTS.md

@@ -33,7 +33,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`.
-- **No scattered `trim` / `toLowerCase`:** hex IDs must already be lowercase; `normalizeHex64` strips an optional `0x` only — mixed case / whitespace is rejected. Exceptions: JSONL blank lines, SDP fingerprint, CLI/`scripts` parsing.
+- **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/core/entity_id.mjs

@@ -7,7 +7,7 @@ import {
 	isEntityHash128,
 	parseEntityHash,
 } from './entity_id_parse.mjs'
-import { isHex64, normalizeHex64 } from './hexIds.mjs'
+import { isHex64 } from './hexIds.mjs'
 
 /**
  * entityHash 编解码与校验（re-export）。
@@ -24,8 +24,8 @@ export {
  * @returns {string} 64 位 nodeHash / subjectHash（pubKeyHash）
  */
 export function hashFromPubKeyHex(pubKeyHex) {
-	const hex = normalizeHex64(pubKeyHex)
-	if (!isHex64(hex)) throw new Error('invalid pubKeyHex')
+	const hex = isHex64(pubKeyHex)
+	if (!hex) throw new Error('invalid pubKeyHex')
 	const bytes = hexToBytes(hex)
 	if (bytes.length !== 32) throw new Error('invalid pubKeyHex')
 	return pubKeyHash(bytes)
@@ -46,8 +46,8 @@ export function entityHashFromRecoveryPubKeyHex(nodeHash, recoveryPubKeyHex) {
  * @returns {string} entityHash
  */
 export function entityHashFromSubjectHash(nodeHash, subjectHash) {
-	const node = normalizeHex64(nodeHash)
-	const subject = normalizeHex64(subjectHash)
-	if (!isHex64(node) || !isHex64(subject)) throw new Error('invalid subject hash')
+	const node = isHex64(nodeHash)
+	const subject = isHex64(subjectHash)
+	if (!node || !subject) throw new Error('invalid subject hash')
 	return encodeEntityHash(node, subject)
 }

package/core/entity_id_parse.mjs

@@ -1,14 +1,14 @@
-import { isHex64, normalizeHex64 } from './hexIds.mjs'
+import { isHex64 } from './hexIds.mjs'
 
 /** 128 位小写 hex：`nodeHash(64)` + `subjectHash(64)`。 */
 export const ENTITY_HASH_RE = /^[\da-f]{128}$/u
 
 /**
  * @param {unknown} value 待校验值
- * @returns {boolean} 是否为合法 128 位 hex
+ * @returns {string | null} 合法时返回原 128 位实体hash，否则 null（含 0x 前缀/大写/空白）
  */
 export function isEntityHash128(value) {
-	return ENTITY_HASH_RE.test(String(value ?? '').replace(/^0x/iu, ''))
+	return ENTITY_HASH_RE.test(value) ? value : null
 }
 
 /**
@@ -16,7 +16,7 @@ export function isEntityHash128(value) {
  * @returns {{ entityHash: string, nodeHash: string, subjectHash: string } | null} 解析结果；非法时 null
  */
 export function parseEntityHash(entityHash) {
-	const raw = String(entityHash ?? '').replace(/^0x/iu, '')
+	const raw = String(entityHash ?? '')
 	if (!ENTITY_HASH_RE.test(raw)) return null
 	return {
 		entityHash: raw,
@@ -31,9 +31,9 @@ export function parseEntityHash(entityHash) {
  * @returns {string} 128 位 entityHash
  */
 export function encodeEntityHash(nodeHash, subjectHash) {
-	const node = normalizeHex64(nodeHash)
-	const subject = normalizeHex64(subjectHash)
-	if (!isHex64(node) || !isHex64(subject))
+	const node = isHex64(nodeHash)
+	const subject = isHex64(subjectHash)
+	if (!node || !subject)
 		throw new Error('invalid entity hash parts')
 	return node + subject
 }

package/core/hexIds.mjs

@@ -10,21 +10,12 @@ export const BLOB_STORAGE_LOCATOR_RE = /^blob:([\da-f]{64})$/u
 /** `local:…/chunks/<64hex>.bin` 群分块路径。 */
 export const LOCAL_CHUNK_FILE_RE = /^local:[^/]+\/chunks\/([\da-f]{64})\.bin$/u
 
-/**
- * @param {unknown} value 原始字符串
- * @returns {string} 去可选 0x 前缀后的字符串（不修大小写/空白）
- */
-export function normalizeHex64(value) {
-	return String(value ?? '').replace(/^0x/iu, '')
-}
-
 /**
  * @param {unknown} value 待校验值
- * @returns {string | null} 合法时返回规范化 64 位 hex，否则 null
+ * @returns {string | null} 合法时返回原 64 位 hex，否则 null（含 0x 前缀/大写/空白）
  */
 export function isHex64(value) {
-	const normalized = normalizeHex64(value)
-	return HEX_ID_64.test(normalized) ? normalized : null
+	return HEX_ID_64.test(value) ? value : null
 }
 
 /**
@@ -34,22 +25,19 @@ export function isHex64(value) {
  * @returns {number} 排序比较结果
  */
 export function compareHex64Asc(a, b) {
-	const sa = normalizeHex64(a)
-	const sb = normalizeHex64(b)
-	return sa < sb ? -1 : sa > sb ? 1 : 0
+	return a < b ? -1 : a > b ? 1 : 0
 }
 
 /**
- * 外部入站专用：规范化并断言 64 位小写 hex。
+ * 外部入站专用：断言小写 64 位 hex（不清理 0x 前缀，直接拒绝）。
  * @param {unknown} value 原始值
  * @param {string} [label='hex64'] 字段名（错误信息）
  * @returns {string} 小写 64 位 hex
  */
 export function assertHex64(value, label = 'hex64') {
-	const normalized = normalizeHex64(value)
-	if (!HEX_ID_64.test(normalized))
+	if (!HEX_ID_64.test(value))
 		throw new Error(`${label} must be 64 hex characters`)
-	return normalized
+	return value
 }
 
 /**

package/crypto/checkpoint_sign.mjs

@@ -27,8 +27,8 @@ export async function signCheckpoint(payload, secretKey) {
  * @returns {Promise<boolean>} 合法为 true
  */
 export async function verifyCheckpointSignature(checkpoint, ownerPublicKey) {
-	const raw = String(checkpoint.checkpoint_signature || '')
-	if (!isSignatureHex128(raw)) return false
+	const raw = isSignatureHex128(checkpoint.checkpoint_signature)
+	if (!raw) return false
 	const body = { ...checkpoint }
 	delete body.checkpoint_signature
 	const messageBytes = Buffer.from(canonicalStringify(body), 'utf8')
@@ -41,7 +41,7 @@ export async function verifyCheckpointSignature(checkpoint, ownerPublicKey) {
  * @returns {boolean} 签名格式合法为 true
  */
 export function isSignedCheckpoint(checkpoint) {
-	return !!isSignatureHex128(String(checkpoint?.checkpoint_signature || ''))
+	return !!isSignatureHex128(checkpoint?.checkpoint_signature)
 }
 
 /**
@@ -60,7 +60,7 @@ export async function verifyRemoteCheckpoint(checkpoint) {
 	const ownerHash = checkpoint.members_record?.delegatedOwnerPubKeyHash
 	const owner = checkpoint.members_record?.members?.[ownerHash]
 	const pubHex = owner?.pubKeyHex
-	if (!pubHex || !isHex64(pubHex))
+	if (!isHex64(pubHex))
 		return { valid: false, reason: 'delegated owner pubkey missing' }
 	if (!await verifyCheckpointSignature(checkpoint, Buffer.from(pubHex, 'hex')))
 		return { valid: false, reason: 'checkpoint signature invalid' }

package/dag/canonicalize_row.mjs

@@ -2,17 +2,14 @@
  * DAG / 时间线签名行入库前的共用 hex 规范化（非权限校验）。
  */
 import { isEntityHash128 } from '../core/entity_id.mjs'
-import { assertHex64, HEX_ID_64, normalizeHex64 } from '../core/hexIds.mjs'
+import { assertHex64 } from '../core/hexIds.mjs'
 /**
  * @param {Record<string, unknown>} obj 可变对象
  * @param {string} key 字段名
  */
 function canonicalizeHexField(obj, key) {
 	if (!obj[key]) return
-	const normalized = normalizeHex64(obj[key])
-	if (!HEX_ID_64.test(normalized))
-		throw new Error(`${key} must be 64 hex characters`)
-	obj[key] = normalized
+	obj[key] = assertHex64(obj[key], key)
 }
 
 /**
@@ -28,8 +25,8 @@ export function canonicalizeRowContent(content, hexKeys, entityHashKeys = new Se
 		canonicalizeHexField(out, key)
 	for (const key of entityHashKeys) {
 		if (!out[key]) continue
-		const entityHash = String(out[key] || '')
-		if (!isEntityHash128(entityHash))
+		const entityHash = isEntityHash128(out[key])
+		if (!entityHash)
 			throw new Error(`${key} must be 128 hex characters`)
 		out[key] = entityHash
 	}

package/discovery/adverts.mjs

@@ -1,4 +1,3 @@
-import { normalizeHex64 } from '../core/hexIds.mjs'
 import { buildSignedAdvert, verifySignedAdvert } from '../link/handshake.mjs'
 
 import {
@@ -95,7 +94,7 @@ export async function ingestNetworkAdvert(bytes) {
  * @returns {Promise<{ verifiedNodeHash: string, body: object } | null>} 验签成功返回 nodeHash 与 advert body，否则 null
  */
 export async function ingestNodeAdvert(nodeHash, bytes) {
-	return ingestEncryptedAdvert(nodeRendezvousKey(normalizeHex64(nodeHash)), bytes)
+	return ingestEncryptedAdvert(nodeRendezvousKey(nodeHash), bytes)
 }
 
 /**

package/discovery/bt/index.mjs

@@ -1,6 +1,6 @@
 import { Buffer } from 'node:buffer'
 
-import { isHex64, normalizeHex64 } from '../../core/hexIds.mjs'
+import { isHex64 } from '../../core/hexIds.mjs'
 import { nodeDebug, shortHash } from '../../node/log.mjs'
 import { noteAdvertPeerHints } from '../advert_peer_hints.mjs'
 import { ingestNetworkAdvert } from '../adverts.mjs'
@@ -31,8 +31,8 @@ const visibleByHash = new Map()
  * @returns {void}
  */
 export function noteBtVisibleNode(nodeHash, now = Date.now()) {
-	const hash = normalizeHex64(nodeHash)
-	if (!isHex64(hash)) return
+	const hash = isHex64(nodeHash)
+	if (!hash) return
 	visibleByHash.set(hash, now)
 }
 
@@ -176,7 +176,7 @@ export function createBluetoothDiscoveryProvider() {
 			onWriteRequest(_connection, data, _offset, _withoutResponse, callback) {
 				try {
 					const parsed = JSON.parse(Buffer.from(data).toString('utf8'))
-					const to = normalizeHex64(parsed?.to)
+					const to = parsed?.to
 					const bytes = Uint8Array.from(Buffer.from(String(parsed?.data || ''), 'base64'))
 					if (isHex64(to) && bytes.byteLength)
 						for (const listener of signalListeners.get(to) || [])
@@ -268,7 +268,7 @@ export function createBluetoothDiscoveryProvider() {
 	 * @returns {Promise<boolean>} 是否经 GATT 发出
 	 */
 	async function sendNodeSignalViaGatt(toNodeHash, bytes) {
-		const hash = normalizeHex64(toNodeHash)
+		const hash = toNodeHash
 		const hint = getBtPeerHint(hash)
 		if (!hint) return false
 		const blob = Buffer.from(JSON.stringify({
@@ -353,8 +353,8 @@ export function createBluetoothDiscoveryProvider() {
 		 * @returns {Promise<boolean>} 有 BT hint 且 GATT 可达时为 true
 		 */
 		async connectToNode(nodeHash) {
-			const hash = normalizeHex64(nodeHash)
-			if (!isHex64(hash)) return false
+			const hash = isHex64(nodeHash)
+			if (!hash) return false
 			if (!getBtPeerHint(hash)) return false
 			return await sendNodeSignalViaGatt(hash, new Uint8Array([0])).catch(() => false)
 		},
@@ -370,8 +370,8 @@ export function createBluetoothDiscoveryProvider() {
 			const refresh = async () => {
 				const body = await getBeacon?.()
 				if (!body?.nodeHash || !body.advertBytes?.byteLength) return
-				const hash = normalizeHex64(body.nodeHash)
-				if (!isHex64(hash)) return
+				const hash = isHex64(body.nodeHash)
+				if (!hash) return
 				localNodeHash = hash
 				localPresence.set(hash, Uint8Array.from(body.advertBytes))
 				noteBtVisibleNode(hash)
@@ -401,8 +401,8 @@ export function createBluetoothDiscoveryProvider() {
 		 */
 		async listenNodeSignals(localNodeHash, onSignal) {
 			if (role === 'scan') return () => { }
-			const hash = normalizeHex64(localNodeHash)
-			if (!isHex64(hash)) throw new Error('p2p: invalid nodeHash')
+			const hash = isHex64(localNodeHash)
+			if (!hash) throw new Error('p2p: invalid nodeHash')
 			await ensurePeripheralRuntime()
 			if (!signalListeners.has(hash)) signalListeners.set(hash, new Set())
 			signalListeners.get(hash).add(onSignal)

package/discovery/bt/peer_hints.mjs

@@ -1,4 +1,3 @@
-import { normalizeHex64 } from '../../core/hexIds.mjs'
 import { createTtlMap } from '../../utils/ttl_map.mjs'
 
 /** BT peer hint 存活时间。 */
@@ -14,9 +13,8 @@ const hints = createTtlMap(BT_PEER_HINT_TTL_MS)
  * @returns {void}
  */
 export function noteBtPeerHint(nodeHash, peripheralId) {
-	const hash = normalizeHex64(nodeHash)
-	if (!hash || !peripheralId) return
-	hints.set(hash, { peripheralId })
+	if (!nodeHash || !peripheralId) return
+	hints.set(nodeHash, { peripheralId })
 }
 
 /**
@@ -26,9 +24,8 @@ export function noteBtPeerHint(nodeHash, peripheralId) {
  * @returns {{ peripheralId: string } | null} hint 或 null
  */
 export function getBtPeerHint(nodeHash, now = Date.now()) {
-	const hash = normalizeHex64(nodeHash)
-	if (!hash) return null
-	return hints.get(hash, now)
+	if (!nodeHash) return null
+	return hints.get(nodeHash, now)
 }
 
 /**

package/discovery/index.mjs

@@ -1,4 +1,3 @@
-import { normalizeHex64 } from '../core/hexIds.mjs'
 import { nodeDebug, shortHash } from '../node/log.mjs'
 
 import { ingestGroupAdvert, ingestNodeAdvert } from './adverts.mjs'
@@ -149,10 +148,9 @@ export async function listVisibleNodeHashes(options = {}) {
  * @returns {Promise<void>}
  */
 export async function prepareConnectToNode(nodeHash, options = {}) {
-	const hash = normalizeHex64(nodeHash)
 	for (const provider of listDiscoveryProviders()) {
 		if (!provider.connectToNode) continue
-		try { await provider.connectToNode(hash, options) }
+		try { await provider.connectToNode(nodeHash, options) }
 		catch { /* prepare next medium */ }
 	}
 }
@@ -164,20 +162,19 @@ export async function prepareConnectToNode(nodeHash, options = {}) {
  * @returns {Promise<boolean>} 是否建链成功
  */
 export async function connectToNode(nodeHash, options = {}) {
-	const hash = normalizeHex64(nodeHash)
 	if (!linkDialer) {
-		await prepareConnectToNode(hash, options)
-		nodeDebug('p2p:discovery connect skip', { peer: shortHash(hash), reason: 'no-dialer' })
+		await prepareConnectToNode(nodeHash, options)
+		nodeDebug('p2p:discovery connect skip', { peer: shortHash(nodeHash), reason: 'no-dialer' })
 		return false
 	}
 	try {
-		const ok = !!await linkDialer(hash)
-		nodeDebug(ok ? 'p2p:discovery connect ok' : 'p2p:discovery connect miss', { peer: shortHash(hash) })
+		const ok = !!await linkDialer(nodeHash)
+		nodeDebug(ok ? 'p2p:discovery connect ok' : 'p2p:discovery connect miss', { peer: shortHash(nodeHash) })
 		return ok
 	}
 	catch (error) {
 		nodeDebug('p2p:discovery connect fail', {
-			peer: shortHash(hash),
+			peer: shortHash(nodeHash),
 			err: String(error?.message || error),
 		})
 		return false
@@ -271,8 +268,7 @@ export async function startGroupPresence(roomSecret, getBeacon) {
  * @returns {Promise<void>}
  */
 export async function sendNodeSignalPacket(toNodeHash, packet) {
-	const hash = normalizeHex64(toNodeHash)
-	await sendNodeSignal(hash, encryptSignalPacket(nodeRendezvousKey(hash), packet))
+	await sendNodeSignal(toNodeHash, encryptSignalPacket(nodeRendezvousKey(toNodeHash), packet))
 }
 
 /**
@@ -282,7 +278,7 @@ export async function sendNodeSignalPacket(toNodeHash, packet) {
  * @returns {object | null} 解密 JSON
  */
 export function decryptNodeSignalPacket(localNodeHash, bytes) {
-	return decryptSignalPacket(nodeRendezvousKey(normalizeHex64(localNodeHash)), bytes)
+	return decryptSignalPacket(nodeRendezvousKey(localNodeHash), bytes)
 }
 
 /**

package/discovery/internal/signal_crypto.mjs

@@ -1,7 +1,6 @@
 import { Buffer } from 'node:buffer'
 import { createCipheriv, createDecipheriv, createHash, randomBytes } from 'node:crypto'
 
-import { normalizeHex64 } from '../../core/hexIds.mjs'
 import { sha256Hex } from '../../crypto/crypto.mjs'
 import { createLruMap } from '../../utils/lru.mjs'
 
@@ -19,7 +18,7 @@ export const SIGNAL_KEY_CACHE_MAX = 512
  * @returns {string} rendezvous 键
  */
 export function nodeRendezvousKey(nodeHash) {
-	return sha256Hex(`${NODE_RENDEZVOUS_DOMAIN}${normalizeHex64(nodeHash)}`)
+	return sha256Hex(`${NODE_RENDEZVOUS_DOMAIN}${nodeHash}`)
 }
 
 /**

package/discovery/lan.mjs

@@ -2,7 +2,7 @@ import { Buffer } from 'node:buffer'
 import dgram from 'node:dgram'
 
 import { base64ToBytes, bytesToBase64 } from '../core/bytes_codec.mjs'
-import { isHex64, normalizeHex64 } from '../core/hexIds.mjs'
+import { isHex64 } from '../core/hexIds.mjs'
 import { nodeDebug, shortHash } from '../node/log.mjs'
 
 import { noteAdvertPeerHints } from './advert_peer_hints.mjs'
@@ -25,8 +25,8 @@ const visibleByHash = new Map()
  * @returns {void}
  */
 export function noteLanVisibleNode(nodeHash, now = Date.now()) {
-	const hash = normalizeHex64(nodeHash)
-	if (!isHex64(hash)) return
+	const hash = isHex64(nodeHash)
+	if (!hash) return
 	visibleByHash.set(hash, now)
 }
 
@@ -61,7 +61,7 @@ export async function acceptLanPresenceAdvert(advertBytes, meta = {}) {
 	if (!advertBytes?.byteLength) return null
 	const ingested = await ingestNetworkAdvert(advertBytes)
 	if (!ingested) return null
-	const skipHash = meta.skipNodeHash ? normalizeHex64(meta.skipNodeHash) : null
+	const skipHash = isHex64(meta.skipNodeHash)
 	if (skipHash && ingested.verifiedNodeHash === skipHash) return ingested
 	const firstSeen = !visibleByHash.has(ingested.verifiedNodeHash)
 	noteLanVisibleNode(ingested.verifiedNodeHash)
@@ -93,9 +93,8 @@ export function createLanDiscoveryProvider(options = {}) {
 	let refs = 0
 	/** @type {ReturnType<typeof setInterval> | null} */
 	let beaconTimer = null
-	const seededSelf = normalizeHex64(options.localNodeHash)
 	/** @type {string | null} */
-	let selfNodeHash = isHex64(seededSelf)
+	let selfNodeHash = isHex64(options.localNodeHash)
 	/** @type {Set<string>} */
 	const joinedAddresses = new Set()
 
@@ -249,8 +248,7 @@ export function createLanDiscoveryProvider(options = {}) {
 		 * @returns {Promise<boolean>} 存在 peer hint 时为 true
 		 */
 		async connectToNode(nodeHash) {
-			const hash = normalizeHex64(nodeHash)
-			return isHex64(hash) && !!getLanPeerHint(hash)
+			return !!getLanPeerHint(nodeHash)
 		},
 		/**
 		 * @param {() => Promise<{ nodeHash?: string, tcpPort?: number, advertBytes?: Uint8Array, advertBody?: object } | null>} getBeacon 本机 beacon
@@ -264,7 +262,7 @@ export function createLanDiscoveryProvider(options = {}) {
 			const send = async () => {
 				const body = await getBeacon?.()
 				if (!body) return
-				if (body.nodeHash) selfNodeHash = normalizeHex64(body.nodeHash)
+				if (body.nodeHash) selfNodeHash = body.nodeHash
 				const advertBytes = body.advertBytes?.byteLength
 					? body.advertBytes
 					: null

package/discovery/lan_peer_hints.mjs

@@ -1,4 +1,3 @@
-import { normalizeHex64 } from '../core/hexIds.mjs'
 import { normalizeTcpPort } from '../core/tcp_port.mjs'
 import { createTtlMap } from '../utils/ttl_map.mjs'
 
@@ -19,14 +18,13 @@ const hints = createTtlMap(LAN_PEER_HINT_TTL_MS)
  * @returns {void}
  */
 export function noteLanPeerHint(nodeHash, endpoint) {
-	const hash = normalizeHex64(nodeHash)
 	const host = String(endpoint?.host || '')
 	const port = normalizeTcpPort(endpoint?.port)
-	if (!hash || !host || !port) return
-	const existing = hints.get(hash)?.endpoints ?? []
+	if (!nodeHash || !host || !port) return
+	const existing = hints.get(nodeHash)?.endpoints ?? []
 	const next = existing.filter(item => !(item.host === host && item.port === port))
 	next.unshift({ host, port })
-	hints.set(hash, { endpoints: next.slice(0, MAX_ENDPOINTS) })
+	hints.set(nodeHash, { endpoints: next.slice(0, MAX_ENDPOINTS) })
 }
 
 /**
@@ -46,9 +44,8 @@ export function getLanPeerHint(nodeHash, now = Date.now()) {
  * @returns {{ host: string, port: number }[]} hint 列表
  */
 export function listLanPeerHints(nodeHash, now = Date.now()) {
-	const hash = normalizeHex64(nodeHash)
-	if (!hash) return []
-	return hints.get(hash, now)?.endpoints ?? []
+	if (!nodeHash) return []
+	return hints.get(nodeHash, now)?.endpoints ?? []
 }
 
 /**

package/discovery/nostr.mjs

@@ -4,7 +4,7 @@ import { schnorr } from '@noble/curves/secp256k1.js'
 import WebSocket from 'ws'
 
 import { base64ToBytes, hexToBytes, bytesToBase64, bytesToHex } from '../core/bytes_codec.mjs'
-import { isHex64, normalizeHex64 } from '../core/hexIds.mjs'
+import { isHex64 } from '../core/hexIds.mjs'
 import { sha256Hex } from '../crypto/crypto.mjs'
 import { getNodeTransportSettings } from '../node/identity.mjs'
 import { getSignalingRuntimeConfig } from '../node/instance.mjs'
@@ -80,8 +80,8 @@ function listPoolHashes(pool, now, ttlMs) {
  * @returns {void}
  */
 export function noteNostrVisibleNode(nodeHash, now = Date.now()) {
-	const hash = normalizeHex64(nodeHash)
-	if (!isHex64(hash)) return
+	const hash = isHex64(nodeHash)
+	if (!hash) return
 	visibleByHash.set(hash, now)
 }
 
@@ -93,8 +93,8 @@ export function noteNostrVisibleNode(nodeHash, now = Date.now()) {
  * @returns {void}
  */
 export function noteNostrGroupVisibleNode(roomSecret, nodeHash, now = Date.now()) {
-	const hash = normalizeHex64(nodeHash)
-	if (!roomSecret || !isHex64(hash)) return
+	const hash = isHex64(nodeHash)
+	if (!roomSecret || !hash) return
 	let pool = visibleByGroup.get(roomSecret)
 	if (!pool) {
 		pool = new Map()
@@ -137,7 +137,7 @@ export async function acceptNostrAdvert(rendezvousKey, bytes, options = {}) {
 	const ingested = await ingestEncryptedAdvert(rendezvousKey, bytes)
 	if (!ingested) return null
 	const hash = ingested.verifiedNodeHash
-	const skipHash = options.skipNodeHash ? normalizeHex64(options.skipNodeHash) : null
+	const skipHash = isHex64(options.skipNodeHash)
 	if (skipHash && hash === skipHash) return hash
 	const { roomSecret } = options
 	let firstSeen = true
@@ -761,9 +761,8 @@ export function createNostrDiscoveryProvider(options = {}) {
 		return dedupeRelayUrls(options.relayUrls)
 	}
 	const secretKey = randomBytes(32)
-	const seededSelf = normalizeHex64(options.localNodeHash)
 	/** @type {string | null} */
-	let selfNodeHash = isHex64(seededSelf)
+	let selfNodeHash = isHex64(options.localNodeHash)
 	const NETWORK_SUB_KEY = 'network'
 	/**
 	 * @typedef {{ stop: () => void, held: boolean, listeners: Set<(bytes: Uint8Array, meta: object) => void> }} AdvertSubEntry
@@ -778,8 +777,8 @@ export function createNostrDiscoveryProvider(options = {}) {
 	 * @returns {void}
 	 */
 	function noteSelfNodeHash(nodeHash) {
-		const hash = normalizeHex64(nodeHash)
-		if (isHex64(hash)) selfNodeHash = hash
+		const hash = isHex64(nodeHash)
+		if (hash) selfNodeHash = hash
 	}
 
 	/**
@@ -873,8 +872,8 @@ export function createNostrDiscoveryProvider(options = {}) {
 	 * @returns {() => void} 取消 listener
 	 */
 	function ensureNodeAdvertSubscription(nodeHash, listener) {
-		const hash = normalizeHex64(nodeHash)
-		if (!isHex64(hash)) return () => { }
+		const hash = isHex64(nodeHash)
+		if (!hash) return () => { }
 		return ensureAdvertSubscription('node:' + hash, {
 			rendezvousKey: nodeRendezvousKey(hash),
 		}, listener)
@@ -907,8 +906,8 @@ export function createNostrDiscoveryProvider(options = {}) {
 		 * @returns {Promise<boolean>} 是否已准备
 		 */
 		async connectToNode(nodeHash) {
-			const hash = normalizeHex64(nodeHash)
-			if (!isHex64(hash)) return false
+			const hash = isHex64(nodeHash)
+			if (!hash) return false
 			ensureNodeAdvertSubscription(hash)
 			return true
 		},
@@ -959,8 +958,8 @@ export function createNostrDiscoveryProvider(options = {}) {
 		 * @returns {Promise<void>}
 		 */
 		async sendNodeSignal(toNodeHash, bytes) {
-			const hash = normalizeHex64(toNodeHash)
-			if (!isHex64(hash)) throw new Error('nostr: invalid nodeHash')
+			const hash = isHex64(toNodeHash)
+			if (!hash) throw new Error('nostr: invalid nodeHash')
 			const rendezvousKey = nodeRendezvousKey(hash)
 			const event = await signNostrEvent(
 				NOSTR_SIGNAL_KIND,
@@ -976,8 +975,8 @@ export function createNostrDiscoveryProvider(options = {}) {
 		 * @returns {Promise<() => void>} 取消函数
 		 */
 		async listenNodeSignals(localNodeHash, onSignal) {
-			const hash = normalizeHex64(localNodeHash)
-			if (!isHex64(hash)) throw new Error('nostr: invalid nodeHash')
+			const hash = isHex64(localNodeHash)
+			if (!hash) throw new Error('nostr: invalid nodeHash')
 			noteSelfNodeHash(hash)
 			const rendezvousKey = nodeRendezvousKey(hash)
 			const existing = nodeSignalSubs.get(hash)
@@ -1001,8 +1000,8 @@ export function createNostrDiscoveryProvider(options = {}) {
 		 * @returns {Promise<() => void>} 取消函数
 		 */
 		async watchNodeAdvert(nodeHash, onAdvert) {
-			const hash = normalizeHex64(nodeHash)
-			if (!isHex64(hash)) throw new Error('nostr: invalid nodeHash')
+			const hash = isHex64(nodeHash)
+			if (!hash) throw new Error('nostr: invalid nodeHash')
 			return ensureNodeAdvertSubscription(hash, onAdvert)
 		},
 		/**

package/discovery/peer_clue.mjs

@@ -1,5 +1,3 @@
-import { normalizeHex64 } from '../core/hexIds.mjs'
-
 /** @type {((nodeHash: string) => void) | null} */
 let peerClueListener = null
 
@@ -18,6 +16,5 @@ export function setDiscoveryPeerClueListener(listener) {
  * @returns {void}
  */
 export function noteDiscoveryPeerClue(nodeHash) {
-	const hash = normalizeHex64(nodeHash)
-	if (hash) peerClueListener?.(hash)
+	if (nodeHash) peerClueListener?.(nodeHash)
 }