@steve02081504/fount-p2p 0.0.25 → 0.0.27

package/trust_graph/send.mjs

@@ -20,7 +20,7 @@ import trustGraphTunables from './tunables.json' with { type: 'json' }
  * @returns {Promise<boolean>} 是否已发送
  */
 export async function sendToNode(username, targetNodeHash, actionName, payload, graph) {
-	const target = normalizeHex64(targetNodeHash) || String(targetNodeHash || '').trim().toLowerCase()
+	const target = normalizeHex64(targetNodeHash)
 	if (!isHex64(target)) return false
 
 	// 已直连 peer 不经 trust-graph scope 也应能收发 node scope action（非成员 CAS chunk / follow hint 等）

package/utils/async_mutex.mjs

@@ -39,7 +39,7 @@ function releaseMutex(lockKey, state) {
  * @template T
  */
 export async function withAsyncMutex(key, criticalSection) {
-	const lockKey = String(key)
+	const lockKey = key
 	const state = mutexState(lockKey)
 	return new Promise((resolve, reject) => {
 		/**

package/wire/ingress.mjs

@@ -46,6 +46,6 @@ export function isSignedDagEventRow(event) {
  */
 export function extractInboundSignedEvent(payload, groupId) {
 	if (!isSignedDagEventRow(payload)) return null
-	if (payload.groupId && String(payload.groupId) !== groupId) return null
+	if (payload.groupId && payload.groupId !== groupId) return null
 	return payload
 }

package/wire/part/fanout.mjs

@@ -61,10 +61,11 @@ export function partInvokeErrorMessages(results) {
 /**
  * 向 trust-graph top-K 扇出 part_invoke，收集 part_invoke_response。
  * 调用方须已挂载 `attachPartWire`（否则收不到 response）。
+ * `timeoutMs` 端到端约束：fanout 挂起（discoverRoute / stuck send）也不阻塞返回。
  * @param {string} username trust graph 上下文
  * @param {string} partpath part 路径
  * @param {PartInvoke} invoke 调用体
- * @param {number} [timeoutMs=2500] 超时
+ * @param {number} [timeoutMs=2500] 端到端超时
  * @param {number} [maxResponses=6] 最多响应数
  * @returns {Promise<PartInvokeResponse[]>} 邻居 PartInvokeResponse（含 error）
  */
@@ -85,15 +86,16 @@ export async function collectPartInvokeResponses(username, partpath, invoke, tim
 		pendingPartInvoke.set(requestId, { responses, finish, maxResponses, respondedPeers: new Set() })
 	})
 
-	const sent = await requireTrustGraphProvider(DEFAULT_TRUST_GRAPH_OWNER).fanoutToTopNodes(
+	// 勿 await fanout：否则 timeout 已触发也要等扇出 settle（#13）
+	void requireTrustGraphProvider(DEFAULT_TRUST_GRAPH_OWNER).fanoutToTopNodes(
 		username,
 		'part_invoke',
 		buildPartInvokePayload(partpath, invoke, nodeHash, requestId),
 		maxResponses,
-	)
-
-	const pending = pendingPartInvoke.get(requestId)
-	if (pending && sent === 0) pending.finish()
+	).then(sent => {
+		const pending = pendingPartInvoke.get(requestId)
+		if (pending && sent === 0) pending.finish()
+	}, () => { /* pending wait 超时负责 settle */ })
 
 	return waitForResponses
 }

package/wire/part/ingress.mjs

@@ -21,15 +21,15 @@ import { handleIncomingPartInvokeResponse } from './pending.mjs'
  * @returns {object | null} 白名单字段
  */
 function parsePartTimelinePut(data, partpath) {
-	const timelineEntityHash = String(data.timelineEntityHash || '').trim().toLowerCase()
+	const timelineEntityHash = String(data.timelineEntityHash || '')
 	if (!timelineEntityHash || !isPlainObject(data.event)) return null
 	return {
 		type: 'part_timeline_put',
 		partpath,
 		timelineEntityHash,
 		event: data.event,
-		...data.nodeHash ? { nodeHash: String(data.nodeHash).trim() } : {},
-		...data.groupId ? { groupId: String(data.groupId).trim() } : {},
+		...data.nodeHash ? { nodeHash: String(data.nodeHash) } : {},
+		...data.groupId ? { groupId: String(data.groupId) } : {},
 	}
 }
 
@@ -60,8 +60,8 @@ async function dispatchPartInvoke(wireContext, payload) {
 	if (!partpath || !isPlainObject(invoke)) return null
 	return dispatchRpcInbound({
 		replicaUsername: wireContext.replicaUsername,
-		requesterNodeHash: payload.peerId ? String(payload.peerId).trim() : null,
-		groupId: payload.groupId ? String(payload.groupId).trim() : undefined,
+		requesterNodeHash: payload.peerId || null,
+		groupId: payload.groupId || undefined,
 		peerId: payload.peerId,
 	}, {
 		type: 'part_invoke',
@@ -93,7 +93,7 @@ export function attachPartWire(wireContext, wire, options = {}) {
 			if (!message) return
 			void dispatchDeliveryInbound({
 				replicaUsername: wireContext.replicaUsername,
-				requesterNodeHash: peerId ? String(peerId).trim() : null,
+				requesterNodeHash: peerId || null,
 			}, message)
 		},
 		/**

package/wire/part/query.mjs

@@ -48,11 +48,11 @@ export function attachPartQueryWire(wireContext, wire, dependencies = {}) {
 			const request = parsePartQueryReq(data)
 			if (!request) return
 			if (!state.takeDedupe(request.requestId)) return
-			const source = String(peerId || request.originNodeHash || '').trim().toLowerCase()
+			const source = peerId || request.originNodeHash
 			if (source && !consumeWireRateBucket(`part_query:${source}`, {
 				maxCount: partQueryTunables.ratePerSourcePerMin,
 			})) return
-			void processIncomingPartQueryRequest(wireContext, wire, request, String(peerId || ''), deps)
+			void processIncomingPartQueryRequest(wireContext, wire, request, peerId, deps)
 		},
 		/**
 		 * @param {unknown} data part_query_res 载荷
@@ -61,7 +61,7 @@ export function attachPartQueryWire(wireContext, wire, dependencies = {}) {
 		part_query_res(data, peerId) {
 			const response = parsePartQueryRes(data)
 			if (!response) return
-			handleIncomingPartQueryResponse(response, String(peerId || ''), deps)
+			handleIncomingPartQueryResponse(response, peerId, deps)
 		},
 	})
 }

package/wire/volatile_signature.mjs

@@ -28,10 +28,9 @@ export function boundStreamSlices(slices) {
  * @returns {Uint8Array} 验签消息字节
  */
 export function streamChunkSignBytes(pendingStreamId, chunkSeq, slices) {
-	const streamId = String(pendingStreamId ?? '')
 	const sequence = Number.isFinite(Number(chunkSeq)) ? String(chunkSeq) : '0'
 	const body = JSON.stringify(slices ?? [])
-	return new TextEncoder().encode(`${CHUNK_DOMAIN}\0${streamId}\0${sequence}\0${body}`)
+	return new TextEncoder().encode(`${CHUNK_DOMAIN}\0${pendingStreamId}\0${sequence}\0${body}`)
 }
 
 /**
@@ -51,11 +50,9 @@ export async function signStreamSignatureHex(bytes, secretKey) {
  * @returns {Promise<boolean>} 验签是否通过
  */
 export async function verifyStreamSignatureHex(bytes, signatureHex, publicKeyHex) {
-	const signature = String(signatureHex || '').trim().toLowerCase()
-	const publicKey = String(publicKeyHex || '').trim().toLowerCase()
-	if (!isSignatureHex128(signature) || !isHex64(publicKey)) return false
+	if (!isSignatureHex128(signatureHex) || !isHex64(publicKeyHex)) return false
 	try {
-		return await verify(Buffer.from(signature, 'hex'), bytes, Buffer.from(publicKey, 'hex'))
+		return await verify(Buffer.from(signatureHex, 'hex'), bytes, Buffer.from(publicKeyHex, 'hex'))
 	}
 	catch {
 		return false
@@ -69,8 +66,6 @@ export async function verifyStreamSignatureHex(bytes, signatureHex, publicKeyHex
  * @returns {{ publicKey: Uint8Array, secretKey: Uint8Array }} 密钥对
  */
 export function streamKeyPairFromUserSeed(username, seedMaterial) {
-	const user = String(username ?? '')
-	const material = String(seedMaterial ?? '')
-	const seed = createHash('sha256').update(`fount-stream-sign\0${user}\0${material}`).digest()
+	const seed = createHash('sha256').update(`fount-stream-sign\0${username}\0${seedMaterial}`).digest()
 	return keyPairFromSeed(seed)
 }