@steve02081504/fount-p2p 0.0.10 → 0.0.12

package/wire/part_ingress.mjs

@@ -116,7 +116,7 @@ export async function handleIncomingPartInvokeRequest(wireContext, payload, wire
 	if (!partpath || !payload.requestId) return
 
 	const response = await dispatchPartInvoke(wireContext, { ...payload, peerId })
-	if (response == null || !isPartInvokeResponse(response)) return
+	if (!isPartInvokeResponse(response)) return
 
 	try {
 		wire.send('part_invoke_response', {
@@ -159,14 +159,12 @@ export async function handleIncomingPartInvokeFireAndForget(wireContext, payload
  * @returns {void}
  */
 export function handleIncomingPartInvokeResponse(payload, peerId = '') {
-	const pending = pendingPartInvoke.get(String(payload?.requestId || ''))
-	if (!pending || payload?.response == null) return
-	const peerKey = String(peerId || payload?.nodeHash || '').trim()
-	if (peerKey) {
-		if (pending.respondedPeers.has(peerKey)) return
-		pending.respondedPeers.add(peerKey)
+	const pending = pendingPartInvoke.get(payload.requestId)
+	if (!pending || !isPartInvokeResponse(payload.response)) return
+	if (peerId) {
+		if (pending.respondedPeers.has(peerId)) return
+		pending.respondedPeers.add(peerId)
 	}
-	if (!isPartInvokeResponse(payload.response)) return
 	pending.responses.push(payload.response)
 	if (pending.responses.length >= pending.maxResponses) pending.finish()
 }

package/wire/part_invoke.mjs

@@ -45,9 +45,9 @@ export function isPartInvokeResponse(value) {
 		const err = value.error
 		return isPlainObject(err)
 			&& typeof err.message === 'string'
-			&& err.message.length > 0
 			&& typeof err.code === 'string'
-			&& err.code.length > 0
+			&& err.message.length
+			&& err.code.length
 	}
 	return true
 }
@@ -57,7 +57,7 @@ export function isPartInvokeResponse(value) {
  * @returns {unknown | null} 成功 `result`；失败或空为 null
  */
 export function unwrapPartInvokeResult(response) {
-	if (!response || !isPartInvokeResponse(response) || 'error' in response) return null
+	if (!isPartInvokeResponse(response) || 'error' in response) return null
 	return response.result ?? null
 }
 
@@ -77,5 +77,5 @@ export function normalizePartpath(value) {
 export function isPartInvoke(value) {
 	if (!isPlainObject(value)) return false
 	const { kind } = value
-	return typeof kind === 'string' && kind.length > 0
+	return typeof kind === 'string' && kind.length
 }

package/wire/part_query.mjs

@@ -132,7 +132,7 @@ export function registerQueryInboundHandler(partpath, kind, handler, state = def
  * @returns {number} 等待下游超时
  */
 export function resolvePartQueryHopTimeoutMs(ttl, tunables = partQueryTunables) {
-	const table = Array.isArray(tunables.hopTimeoutMs) ? tunables.hopTimeoutMs : [1000, 2500, 4000, 6000]
+	const table = tunables.hopTimeoutMs || [1000, 2500, 4000, 6000]
 	const index = Math.max(0, Math.min(table.length - 1, Math.floor(ttl) - 1))
 	return Math.max(1, Math.floor(Number(table[index]) || tunables.defaultTimeoutMs || 4000))
 }
@@ -176,8 +176,7 @@ export function mergeQueryRows(lists, maxHits, rowKey) {
 async function runLocalHandler(state, queryContext, partpath, kind, query) {
 	const handler = state.handlers.get(handlerKey(partpath, kind))
 	if (!handler) return []
-	const rows = await handler(queryContext, query)
-	return Array.isArray(rows) ? rows : []
+	return await handler(queryContext, query) || []
 }
 
 /**

package/wire/part_query.tunables.json

@@ -9,6 +9,11 @@
 	"dedupeMaxSize": 4000,
 	"cacheTtlMs": 300000,
 	"cacheMaxKeys": 256,
-	"hopTimeoutMs": [1000, 2500, 4000, 6000],
+	"hopTimeoutMs": [
+		1000,
+		2500,
+		4000,
+		6000
+	],
 	"defaultTimeoutMs": 4000
 }

package/wire/part_query_cache.mjs

@@ -77,7 +77,7 @@ export function createPartQueryCache(options = {}) {
 		 */
 		set(partpath, kind, query, rows, now = Date.now()) {
 			const key = partQueryCacheKey(partpath, kind, query)
-			if (!key || !Array.isArray(rows)) return
+			if (!key || !rows) return
 			sweep(now)
 			map.touch(key, {
 				rows: rows.slice(0, maxHits),

package/wire/volatile_signature.mjs

@@ -17,7 +17,7 @@ export const MAX_STREAM_VOLATILE_SLICES = 256
  * @returns {object[] | null} 合法切片或 null
  */
 export function boundStreamSlices(slices) {
-	if (!Array.isArray(slices) || slices.length > MAX_STREAM_VOLATILE_SLICES) return null
+	if (!slices?.length || slices.length > MAX_STREAM_VOLATILE_SLICES) return null
 	return slices
 }