@steve02081504/fount-p2p 0.0.34 → 0.0.35

package/core/hexIds.mjs

@@ -20,10 +20,11 @@ export function normalizeHex64(value) {
 
 /**
  * @param {unknown} value 待校验值
- * @returns {boolean} 是否为 64 位小写 hex
+ * @returns {string | null} 合法时返回规范化 64 位 hex，否则 null
  */
 export function isHex64(value) {
-	return HEX_ID_64.test(normalizeHex64(value))
+	const normalized = normalizeHex64(value)
+	return HEX_ID_64.test(normalized) ? normalized : null
 }
 
 /**
@@ -53,8 +54,9 @@ export function assertHex64(value, label = 'hex64') {
 
 /**
  * @param {unknown} value 待校验值
- * @returns {boolean} 是否为 128 位签名 hex
+ * @returns {string | null} 合法时返回 128 位签名 hex，否则 null
  */
 export function isSignatureHex128(value) {
-	return SIGNATURE_HEX_128.test(String(value ?? ''))
+	const normalized = String(value ?? '')
+	return SIGNATURE_HEX_128.test(normalized) ? normalized : null
 }

package/crypto/checkpoint_sign.mjs

@@ -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(String(checkpoint?.checkpoint_signature || ''))
 }
 
 /**

package/discovery/lan.mjs

@@ -95,7 +95,7 @@ export function createLanDiscoveryProvider(options = {}) {
 	let beaconTimer = null
 	const seededSelf = normalizeHex64(options.localNodeHash)
 	/** @type {string | null} */
-	let selfNodeHash = isHex64(seededSelf) ? seededSelf : null
+	let selfNodeHash = isHex64(seededSelf)
 	/** @type {Set<string>} */
 	const joinedAddresses = new Set()
 

package/discovery/nostr.mjs

@@ -763,7 +763,7 @@ export function createNostrDiscoveryProvider(options = {}) {
 	const secretKey = randomBytes(32)
 	const seededSelf = normalizeHex64(options.localNodeHash)
 	/** @type {string | null} */
-	let selfNodeHash = isHex64(seededSelf) ? seededSelf : null
+	let selfNodeHash = isHex64(seededSelf)
 	const NETWORK_SUB_KEY = 'network'
 	/**
 	 * @typedef {{ stop: () => void, held: boolean, listeners: Set<(bytes: Uint8Array, meta: object) => void> }} AdvertSubEntry

package/link/handshake.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)
 }
 
 /**

package/node/network.mjs

@@ -53,9 +53,7 @@ export function normalizeNetwork(raw) {
 	 * @returns {string[]} 去重 nodeHash 列表
 	 */
 	const pickIds = key => [...new Set(
-		(file[key] || [])
-			.map(id => normalizeHex64(id))
-			.filter(id => isHex64(id)),
+		(file[key] || []).map(isHex64).filter(Boolean),
 	)]
 	const hints = (file.hints || [])
 		.map(hint => ({
@@ -221,9 +219,9 @@ export function promoteExplorePeer(nodeHash) {
 export function replaceNetworkPeerPools(pools = {}) {
 	const net = loadNetwork()
 	if (Array.isArray(pools.trustedPeers))
-		net.trustedPeers = pools.trustedPeers.map(id => normalizeHex64(id)).filter(id => isHex64(id))
+		net.trustedPeers = pools.trustedPeers.map(isHex64).filter(Boolean)
 	if (Array.isArray(pools.explorePeers))
-		net.explorePeers = pools.explorePeers.map(id => normalizeHex64(id)).filter(id => isHex64(id))
+		net.explorePeers = pools.explorePeers.map(isHex64).filter(Boolean)
 	net.lastRosterAt = Date.now()
 	saveNetwork(net)
 }

package/node/reputation_sync.mjs

@@ -73,9 +73,7 @@ function loadSyncConfig() {
  * @returns {string[]} 规范化去重后的 64-hex 列表
  */
 function normalizeHashList(list) {
-	return [...new Set((Array.isArray(list) ? list : [])
-		.map(id => normalizeHex64(id))
-		.filter(id => isHex64(id)))]
+	return [...new Set((Array.isArray(list) ? list : []).map(isHex64).filter(Boolean))]
 }
 
 /** 将当前 sync 配置写盘 */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@steve02081504/fount-p2p",
-	"version": "0.0.34",
+	"version": "0.0.35",
 	"description": "fount federation P2P layer — link, trust graph, mailbox, DAG, EVFS.",
 	"keywords": [
 		"network",

package/schemas/discovery.mjs

@@ -19,7 +19,7 @@ function sanitizeDiscoveryAdvertisement(ad) {
 		title: String(ad.title || '').slice(0, 200),
 		blurb: String(ad.blurb || '').slice(0, 500),
 		advertiserPubKeyHash,
-		advertiserNodeHash: isHex64(advertiserNodeHash) ? advertiserNodeHash : String(ad.advertiserNodeHash || ''),
+		advertiserNodeHash: isHex64(advertiserNodeHash) || String(ad.advertiserNodeHash || ''),
 		observedAt: Number(ad.observedAt) || 0,
 		signature,
 	}