@steve02081504/fount-p2p 0.0.11 → 0.0.12

package/README.md

@@ -45,7 +45,7 @@ Facade entry: `index.mjs` (`startNode`, `createGroupLinkSet`, `registerDiscovery
 
 | Module | Role |
 |---|---|
-| `link_registry.mjs` | Fount-network facade: dial fallback, scope/overlay |
+| `link_registry.mjs` | fount-network facade: dial fallback, scope/overlay |
 | `runtime_bootstrap.mjs` | Progressive `ensureRuntime` (register + background listen / discovery / BT) |
 | `offer_answer.mjs` | Discovery-signal glare for offer/answer providers |
 | `signal_crypto.mjs` | Rendezvous topics + AES-GCM signal packets |

package/core/bytes_codec.mjs

@@ -2,23 +2,78 @@
  * Base64 / hex / bytes 互转（无 Node 依赖，浏览器与 Node 共用）。
  */
 
+const HEX = '0123456789abcdef'
+
+/**
+ * @param {number} code UTF-16 码元（期望为 0-9 / a-f / A-F）
+ * @returns {number} 0–15；非法为 -1
+ */
+function hexNibble(code) {
+	if (code >= 48 && code <= 57) return code - 48
+	if (code >= 97 && code <= 102) return code - 87
+	if (code >= 65 && code <= 70) return code - 55
+	return -1
+}
+
 /**
- * @param {Uint8Array} u8 原始字节
- * @returns {string} 标准 Base64 文本
+ * @param {Uint8Array} bytes 原始字节
+ * @returns {string} 小写 hex
+ */
+export function bytesToHex(bytes) {
+	let out = ''
+	for (let index = 0; index < bytes.length; index++) {
+		const byte = bytes[index]
+		out += HEX[byte >> 4] + HEX[byte & 15]
+	}
+	return out
+}
+
+/**
+ * @param {string} hex hex 文本（可含空白；大小写不敏感）
+ * @returns {Uint8Array} 解码后的字节
  */
-export function u8ToB64(u8) {
+export function hexToBytes(hex) {
+	const text = hex.trim().toLowerCase()
+	if (text.length % 2) throw new Error('p2p: hex length must be even')
+	const out = new Uint8Array(text.length / 2)
+	for (let index = 0; index < out.length; index++) {
+		const high = hexNibble(text.charCodeAt(index * 2))
+		const low = hexNibble(text.charCodeAt(index * 2 + 1))
+		if (high < 0 || low < 0) throw new Error('p2p: invalid hex')
+		out[index] = (high << 4) | low
+	}
+	return out
+}
+
+/**
+ * ArrayBuffer / TypedArray / Uint8Array → Uint8Array；`allowString` 时接受文本。
+ * @param {unknown} value 待转换值
+ * @param {{ allowString?: boolean }} [options] `allowString` 时把非字节输入当文本编码
+ * @returns {Uint8Array} 字节视图（可能与输入共享底层 buffer）
+ */
+export function toBytes(value, options = {}) {
+	if (value instanceof Uint8Array) return value
+	if (value instanceof ArrayBuffer) return new Uint8Array(value)
+	if (ArrayBuffer.isView(value)) return new Uint8Array(value.buffer, value.byteOffset, value.byteLength)
+	if (options.allowString)
+		return new TextEncoder().encode(typeof value === 'string' ? value : String(value ?? ''))
+	throw new Error('p2p: bytes must be Uint8Array-compatible')
+}
+
+/**
+ * @param {Uint8Array} bytes 原始字节
+ * @returns {string} 标准 Base64
+ */
+export function bytesToBase64(bytes) {
 	let binary = ''
-	for (let index = 0; index < u8.length; index++) binary += String.fromCharCode(u8[index])
+	for (let index = 0; index < bytes.length; index++) binary += String.fromCharCode(bytes[index])
 	return btoa(binary)
 }
 
 /**
- * @param {string} b64 标准 Base64 文本
+ * @param {string} base64 标准 Base64
  * @returns {Uint8Array} 解码后的字节
  */
-export function b64ToU8(b64) {
-	const bin = atob(b64)
-	const out = new Uint8Array(bin.length)
-	for (let i = 0; i < bin.length; i++) out[i] = bin.charCodeAt(i)
-	return out
+export function base64ToBytes(base64) {
+	return Uint8Array.from(atob(base64), char => char.charCodeAt(0))
 }

package/core/tcp_port.mjs

@@ -4,7 +4,7 @@
  * @returns {number | null} 有效端口或 null（未提供 / 非法）
  */
 export function normalizeTcpPort(port) {
-	if (port == null || port === '') return null
+	if (!port) return null
 	const value = Number(port)
 	if (!Number.isInteger(value) || value < 1 || value > 65535) return null
 	return value

package/crypto/checkpoint_sign.mjs

@@ -49,9 +49,9 @@ export function isSignedCheckpoint(checkpoint) {
  * @returns {Promise<{ valid: boolean, reason?: string }>} 校验结果；`valid` 为 false 时 `reason` 说明原因
  */
 export async function verifyRemoteCheckpoint(checkpoint) {
-	if (!checkpoint || typeof checkpoint !== 'object')
+	if (!checkpoint)
 		return { valid: false, reason: 'checkpoint missing or not an object' }
-	if (!Array.isArray(checkpoint.eventIdsInEpoch) || checkpoint.eventIdsInEpoch.length === 0)
+	if (!checkpoint.eventIdsInEpoch?.length)
 		return { valid: false, reason: 'eventIdsInEpoch missing or empty' }
 	const root = merkleRoot(checkpoint.eventIdsInEpoch)
 	if (checkpoint.epoch_root_hash !== root)

package/dag/canonicalize_row.mjs

@@ -8,7 +8,7 @@ import { assertHex64, HEX_ID_64, normalizeHex64 } from '../core/hexIds.mjs'
  * @param {string} key 字段名
  */
 function canonicalizeHexField(obj, key) {
-	if (obj[key] == null || obj[key] === '') return
+	if (!obj[key]) return
 	const normalized = normalizeHex64(obj[key])
 	if (!HEX_ID_64.test(normalized))
 		throw new Error(`${key} must be 64 hex characters`)
@@ -27,7 +27,7 @@ export function canonicalizeRowContent(content, hexKeys, entityHashKeys = new Se
 	for (const key of hexKeys)
 		canonicalizeHexField(out, key)
 	for (const key of entityHashKeys) {
-		if (out[key] == null || out[key] === '') continue
+		if (!out[key]) continue
 		const entityHash = String(out[key]).toLowerCase()
 		if (!isEntityHash128(entityHash))
 			throw new Error(`${key} must be 128 hex characters`)
@@ -54,7 +54,7 @@ export function canonicalizeSignedRow(event, options = {}) {
 	const out = options.prepare ? options.prepare({ ...event }) : { ...event }
 	out.id = assertHex64(out.id, 'id')
 	out.sender = assertHex64(out.sender, 'sender')
-	if (Array.isArray(out.prev_event_ids))
+	if (out.prev_event_ids)
 		out.prev_event_ids = out.prev_event_ids.map((id, index) =>
 			assertHex64(id, `prev_event_ids[${index}]`),
 		)

package/dag/index.mjs

@@ -51,8 +51,7 @@ export function computeLocalTipsHash(tipIds) {
  * @returns {string[]} 去重并字典序排序后的父事件 id 数组
  */
 export function sortedPrevEventIds(raw) {
-	if (!Array.isArray(raw)) return []
-	return [...new Set(raw.filter(id => EVENT_ID_HEX.test(String(id))))].sort()
+	return [...new Set((raw || []).filter(id => EVENT_ID_HEX.test(id)))].sort()
 }
 
 /**
@@ -226,7 +225,7 @@ export function topologicalCanonicalOrder(metas) {
 
 	while (ready.size) {
 		const next = ready.pop()
-		if (next == null) break
+		if (!next) break
 		ordered.push(next)
 		for (const childId of children.get(next) || []) {
 			const remaining = (parentCount.get(childId) || 0) - 1

package/discovery/bt/index.mjs

@@ -46,10 +46,10 @@ function serializeAdvertBlob(adverts) {
 function parseAdvertBlob(raw) {
 	try {
 		const parsed = JSON.parse(Buffer.from(raw).toString('utf8'))
-		if (!Array.isArray(parsed?.entries)) return []
+		if (!parsed?.entries?.length) return []
 		return parsed.entries.map(entry => ({
-			topic: String(entry?.topic || ''),
-			bytes: Uint8Array.from(Buffer.from(String(entry?.data || ''), 'base64')),
+			topic: entry.topic || '',
+			bytes: Uint8Array.from(Buffer.from(entry.data || '', 'base64')),
 		})).filter(entry => entry.topic && entry.bytes.byteLength)
 	}
 	catch {
@@ -148,10 +148,10 @@ export function createBluetoothDiscoveryProvider() {
 					const parsed = JSON.parse(Buffer.from(data).toString('utf8'))
 					const topic = String(parsed?.topic || '')
 					const bytes = Uint8Array.from(Buffer.from(String(parsed?.data || ''), 'base64'))
-					if (topic && bytes.byteLength) 
+					if (topic && bytes.byteLength)
 						for (const listener of signalListeners.get(topic) || [])
 							listener(bytes, { provider: 'bt' })
-					
+
 					callback(bleno.Characteristic.RESULT_SUCCESS)
 				}
 				catch {

package/discovery/bt/runtime.mjs

@@ -1,8 +1,8 @@
+import { spawn } from 'node:child_process'
 import { existsSync, readdirSync } from 'node:fs'
 import { dirname, join } from 'node:path'
 import process from 'node:process'
 import { fileURLToPath } from 'node:url'
-import { spawn } from 'node:child_process'
 
 /**
  * 解析 Bluetooth 角色（scan / dual）。
@@ -92,14 +92,14 @@ export async function canUseBluetoothRuntime(timeoutMs = 3000) {
 		cachedRuntimeOk = false
 		return false
 	}
-	if (!probeInflight) {
+	if (!probeInflight)
 		probeInflight = probeBluetoothInSubprocess(timeoutMs)
 			.then(ok => {
 				cachedRuntimeOk = ok
 				return ok
 			})
 			.finally(() => { probeInflight = null })
-	}
+
 	return probeInflight
 }
 

package/discovery/mdns.mjs

@@ -129,7 +129,13 @@ export function createMdnsDiscoveryProvider(options = {}) {
 		bucket.get(topic).add(listener)
 		const release = acquire()
 		return () => {
-			bucket.get(topic)?.delete(listener)
+			const set = bucket.get(topic)
+			if (!set) {
+				release()
+				return
+			}
+			set.delete(listener)
+			if (!set.size) bucket.delete(topic)
 			release()
 		}
 	}

package/discovery/nostr.mjs

@@ -3,6 +3,7 @@ import { randomBytes } from 'node:crypto'
 import { schnorr } from '@noble/curves/secp256k1.js'
 import WebSocket from 'ws'
 
+import { base64ToBytes, hexToBytes, bytesToBase64, bytesToHex } from '../core/bytes_codec.mjs'
 import { sha256Hex } from '../crypto/crypto.mjs'
 
 /** 默认 Nostr 中继 URL 列表。 */
@@ -57,15 +58,9 @@ function dropWebSocket(ws) {
  */
 function dedupeRelayUrls(urls) {
 	const seen = new Set()
-	/** @type {string[]} */
-	const out = []
-	for (const url of Array.isArray(urls) ? urls : []) {
-		const trimmed = String(url || '').trim()
-		if (!trimmed || seen.has(trimmed)) continue
-		seen.add(trimmed)
-		out.push(trimmed)
-	}
-	return out
+	return (urls || [])
+		.map(url => url.trim())
+		.filter(trimmed => trimmed && !seen.has(trimmed) && (seen.add(trimmed), true))
 }
 
 /**
@@ -74,50 +69,10 @@ function dedupeRelayUrls(urls) {
  * @returns {string[]} 合并后的中继 URL 列表
  */
 export function mergeSignalingRelayUrls(userRelayUrls) {
-	const merged = dedupeRelayUrls([...DEFAULT_RELAY_URLS, ...Array.isArray(userRelayUrls) ? userRelayUrls : []])
+	const merged = dedupeRelayUrls([...DEFAULT_RELAY_URLS, ...userRelayUrls || []])
 	return merged.length ? merged : [...DEFAULT_RELAY_URLS]
 }
 
-/**
- * 字节数组转十六进制字符串。
- * @param {Uint8Array} bytes 输入字节
- * @returns {string} 小写 hex 字符串
- */
-function bytesToHex(bytes) {
-	return [...bytes].map(byte => byte.toString(16).padStart(2, '0')).join('')
-}
-
-/**
- * 十六进制字符串转字节数组。
- * @param {string} hex 输入 hex 字符串
- * @returns {Uint8Array} 解码后的字节
- */
-function hexToBytes(hex) {
-	const normalized = String(hex || '').trim().toLowerCase()
-	const out = new Uint8Array(Math.floor(normalized.length / 2))
-	for (let index = 0; index < out.length; index++)
-		out[index] = parseInt(normalized.slice(index * 2, index * 2 + 2), 16)
-	return out
-}
-
-/**
- * 字节数组转 base64 字符串。
- * @param {Uint8Array} bytes 输入字节
- * @returns {string} base64 编码
- */
-function bytesToBase64(bytes) {
-	return btoa(String.fromCharCode(...bytes))
-}
-
-/**
- * base64 字符串转字节数组。
- * @param {string} base64 输入 base64 字符串
- * @returns {Uint8Array} 解码后的字节
- */
-function base64ToBytes(base64) {
-	return Uint8Array.from(atob(base64).split('').map(ch => ch.charCodeAt(0)))
-}
-
 /**
  * 签名 Nostr 事件。
  * @param {number} kind 事件 kind
@@ -231,6 +186,37 @@ function connectRelaysProgressive(relayUrls, onOpen, signal, sockets) {
 		}).catch(() => { /* 单路失败正常降级 */ })
 }
 
+/**
+ * 订阅指定 kind 的 Nostr 事件（渐进连中继，立即返回 cleanup）。
+ * @param {string[]} relayUrls 中继 URL 列表
+ * @param {{ kind: number, topic: string, tagX: string, onPayload: (bytes: Uint8Array, meta: { relayUrl: string, event: object }) => void }} options 订阅选项
+ * @returns {() => void} 取消订阅
+ */
+function subscribeNostrKind(relayUrls, options) {
+	const { kind, topic, tagX, onPayload } = options
+	const abortController = new AbortController()
+	/** @type {import('ws').WebSocket[]} */
+	const sockets = []
+	const subscriptionId = randomBytes(8).toString('hex')
+	connectRelaysProgressive(relayUrls, (ws, relayUrl) => {
+		ws.on('message', data => {
+			if (abortController.signal.aborted) return
+			let parsed
+			try { parsed = JSON.parse(String(data)) } catch { return }
+			if (parsed?.[0] !== 'EVENT') return
+			const nostrEvent = parsed[2]
+			if (nostrEvent?.kind !== kind) return
+			try { onPayload(base64ToBytes(nostrEvent.content), { relayUrl, event: nostrEvent }) }
+			catch { /* ignore */ }
+		})
+		ws.send(JSON.stringify(['REQ', subscriptionId, { kinds: [kind], '#t': [topic], '#x': [tagX] }]))
+	}, abortController.signal, sockets)
+	return () => {
+		abortController.abort()
+		for (const ws of sockets) dropWebSocket(ws)
+	}
+}
+
 /**
  * 创建 Nostr discovery provider。
  * subscribe/onSignal/advertise 首调用不阻塞等公网中继；连上后渐进生效。
@@ -240,9 +226,7 @@ function connectRelaysProgressive(relayUrls, onOpen, signal, sockets) {
  * @returns {import('./index.mjs').DiscoveryProvider} Nostr 发现提供者
  */
 export function createNostrDiscoveryProvider(options = {}) {
-	const relayUrls = options.relayUrls != null
-		? dedupeRelayUrls(options.relayUrls)
-		: [...DEFAULT_RELAY_URLS]
+	const relayUrls = dedupeRelayUrls(options.relayUrls || DEFAULT_RELAY_URLS)
 	const secretKey = randomBytes(32)
 	return {
 		id: 'nostr',
@@ -255,25 +239,25 @@ export function createNostrDiscoveryProvider(options = {}) {
 		 * @returns {Promise<() => void>} 取消广播函数
 		 */
 		async advertise(topic, bytes) {
-			const ac = new AbortController()
+			const abortController = new AbortController()
 			/**
 			 * 向中继发布当前 advert。
 			 * @returns {Promise<void>}
 			 */
 			const publish = async () => {
-				if (ac.signal.aborted) return
+				if (abortController.signal.aborted) return
 				const event = await signNostrEvent(
 					NOSTR_ADVERT_KIND,
 					[['t', topic], ['x', 'advert']],
 					bytesToBase64(bytes),
 					secretKey,
 				)
-				await publishEvent(relayUrls, event, ac.signal)
+				await publishEvent(relayUrls, event, abortController.signal)
 			}
 			void publish().catch(() => { })
 			const timer = setInterval(() => { void publish().catch(() => { }) }, 5 * 60_000)
 			return () => {
-				ac.abort()
+				abortController.abort()
 				clearInterval(timer)
 			}
 		},
@@ -284,27 +268,12 @@ export function createNostrDiscoveryProvider(options = {}) {
 		 * @returns {Promise<() => void>} 取消订阅函数
 		 */
 		async subscribe(topic, onAdvert) {
-			const ac = new AbortController()
-			/** @type {import('ws').WebSocket[]} */
-			const sockets = []
-			const subscriptionId = randomBytes(8).toString('hex')
-			connectRelaysProgressive(relayUrls, (ws, relayUrl) => {
-				ws.on('message', data => {
-					if (ac.signal.aborted) return
-					let parsed
-					try { parsed = JSON.parse(String(data)) } catch { return }
-					if (!Array.isArray(parsed) || parsed[0] !== 'EVENT') return
-					const nostrEvent = parsed[2]
-					if (nostrEvent?.kind !== NOSTR_ADVERT_KIND) return
-					try { onAdvert(base64ToBytes(String(nostrEvent.content || '')), { relayUrl, event: nostrEvent }) }
-					catch { /* ignore */ }
-				})
-				ws.send(JSON.stringify(['REQ', subscriptionId, { kinds: [NOSTR_ADVERT_KIND], '#t': [topic], '#x': ['advert'] }]))
-			}, ac.signal, sockets)
-			return () => {
-				ac.abort()
-				for (const ws of sockets) dropWebSocket(ws)
-			}
+			return subscribeNostrKind(relayUrls, {
+				kind: NOSTR_ADVERT_KIND,
+				topic,
+				tagX: 'advert',
+				onPayload: onAdvert,
+			})
 		},
 		/**
 		 * 向中继发布 signal 事件（按需发送，仍等待至少一路成功）。
@@ -329,27 +298,12 @@ export function createNostrDiscoveryProvider(options = {}) {
 		 * @returns {Promise<() => void>} 取消订阅函数
 		 */
 		async onSignal(topic, onSignal) {
-			const ac = new AbortController()
-			/** @type {import('ws').WebSocket[]} */
-			const sockets = []
-			const subscriptionId = randomBytes(8).toString('hex')
-			connectRelaysProgressive(relayUrls, (ws, relayUrl) => {
-				ws.on('message', data => {
-					if (ac.signal.aborted) return
-					let parsed
-					try { parsed = JSON.parse(String(data)) } catch { return }
-					if (!Array.isArray(parsed) || parsed[0] !== 'EVENT') return
-					const nostrEvent = parsed[2]
-					if (nostrEvent?.kind !== NOSTR_SIGNAL_KIND) return
-					try { onSignal(base64ToBytes(String(nostrEvent.content || '')), { relayUrl, event: nostrEvent }) }
-					catch { /* ignore */ }
-				})
-				ws.send(JSON.stringify(['REQ', subscriptionId, { kinds: [NOSTR_SIGNAL_KIND], '#t': [topic], '#x': ['signal'] }]))
-			}, ac.signal, sockets)
-			return () => {
-				ac.abort()
-				for (const ws of sockets) dropWebSocket(ws)
-			}
+			return subscribeNostrKind(relayUrls, {
+				kind: NOSTR_SIGNAL_KIND,
+				topic,
+				tagX: 'signal',
+				onPayload: onSignal,
+			})
 		},
 	}
 }

package/federation/chunk_fetch_pending.mjs

@@ -1,4 +1,4 @@
-import { b64ToU8 } from '../core/bytes_codec.mjs'
+import { base64ToBytes } from '../core/bytes_codec.mjs'
 import { verifiedChunkBytes } from '../files/chunk_fetch_verify.mjs'
 
 /** @type {Map<string, { expectedHash: string, timer: ReturnType<typeof setTimeout>, resolve: (v: Uint8Array | null) => void, reject?: (e: Error) => void }>} */
@@ -109,14 +109,13 @@ export function resolveChunkFetchWait(key, expectedHash, bytes) {
  * @returns {boolean} 是否命中 pending
  */
 export function resolvePendingChunkFetch(payload) {
-	const requestId = String(payload?.requestId || '')
+	const requestId = typeof payload?.requestId === 'string' ? payload.requestId : ''
 	if (!requestId) return false
 	const entry = pendingChunkFetches.get(requestId)
 	if (!entry) return false
-	if (payload?.dataB64) {
+	if (typeof payload?.dataBase64 === 'string') {
 		try {
-			const bytes = b64ToU8(String(payload.dataB64))
-			return resolveChunkFetchWait(requestId, entry.expectedHash, bytes)
+			return resolveChunkFetchWait(requestId, entry.expectedHash, base64ToBytes(payload.dataBase64))
 		}
 		catch { /* keep waiting */ }
 		return false

package/federation/dag_order_cache.mjs

@@ -56,7 +56,7 @@ export function resolveEventTopologicalOrder(events, cache, options = {}) {
 	const tipsHash = computeLocalTipsHash(tips)
 	const eventCount = events.length
 
-	if (cache && Array.isArray(cache.order) && cache.order.length) {
+	if (cache?.order?.length) {
 		if (cache.tipsHash === tipsHash && cache.eventCount === eventCount) {
 			const ok = cache.order.length === eventCount && cache.order.every(id => byId.has(id))
 			if (ok) return cache.order

package/federation/entity_key_chain.mjs

@@ -131,9 +131,8 @@ export function reduceEntityKeyRotate(state, event) {
 export function reduceEntityKeyRevoke(state, event) {
 	const newGeneration = Number(event.content?.newGeneration)
 	const activePubKeyHex = normalizeHex64(event.content?.activePubKeyHex || '')
-	const revokeGenerations = Array.isArray(event.content?.revokeGenerations)
-		? event.content.revokeGenerations.map(g => Number(g)).filter(Number.isFinite)
-		: []
+	const revokeGenerations = (event.content?.revokeGenerations || [])
+		.map(Number).filter(Number.isFinite)
 	if (!Number.isFinite(newGeneration) || newGeneration < 0 || !isHex64(activePubKeyHex))
 		return state
 	state.entityKeyHistory = state.entityKeyHistory || []
@@ -181,7 +180,7 @@ export function foldEntityKeyHistoryFromEvents(events) {
  */
 export function entityKeyRevokeSignBytes(revokeBody) {
 	const body = {
-		revokeGenerations: (revokeBody.revokeGenerations || []).map(g => Number(g)),
+		revokeGenerations: (revokeBody.revokeGenerations || []).map(Number),
 		newGeneration: Number(revokeBody.newGeneration),
 		activePubKeyHex: normalizeHex64(revokeBody.activePubKeyHex || ''),
 		entityHash: String(revokeBody.entityHash || '').trim().toLowerCase(),

package/federation/topo_order_memo.mjs

@@ -1,5 +1,10 @@
-/** @type {Map<string, { fp: string, order: string[] }>} */
-const memoByKey = new Map()
+import { createLruMap } from '../utils/lru.mjs'
+
+/** 进程内拓扑序 memo 上限（每条目持有整份 order 数组） */
+const MEMO_MAX = 64
+
+/** @type {ReturnType<typeof createLruMap<string, { fp: string, order: string[] }>>} */
+const memoByKey = createLruMap(MEMO_MAX)
 
 /**
  * 进程内拓扑序 memo；`resolveOrder` 可接入磁盘缓存等实现。
@@ -12,11 +17,13 @@ const memoByKey = new Map()
 export function resolveTopologicalOrderMemoCached(memoKey, fingerprint, resolveOrder, options = {}) {
 	if (!options.force) {
 		const cached = memoByKey.get(memoKey)
-		if (cached?.fp === fingerprint && cached.order.length)
+		if (cached?.fp === fingerprint && cached.order.length) {
+			memoByKey.touch(memoKey, cached)
 			return cached.order
+		}
 	}
 	const order = resolveOrder()
-	memoByKey.set(memoKey, { fp: fingerprint, order })
+	memoByKey.touch(memoKey, { fp: fingerprint, order })
 	return order
 }
 

package/files/chunk_fetch.mjs

@@ -1,6 +1,6 @@
 import { randomUUID } from 'node:crypto'
 
-import { u8ToB64 } from '../core/bytes_codec.mjs'
+import { bytesToBase64 } from '../core/bytes_codec.mjs'
 import {
 	MAX_PENDING_CHUNK_FETCHES,
 	pendingChunkFetches,
@@ -78,5 +78,5 @@ export async function handleIncomingChunkGet(username, payload, sendResponse, pe
 	if (!await hasChunk(hash)) return
 	const chunkBytes = await getChunk(hash)
 	if (!chunkBytes?.length) return
-	sendResponse({ requestId: payload.requestId, dataB64: u8ToB64(chunkBytes) }, peerId)
+	sendResponse({ requestId: payload.requestId, dataBase64: bytesToBase64(chunkBytes) }, peerId)
 }

package/files/evfs.mjs

@@ -86,7 +86,7 @@ export async function storeManifestParts(manifest, partBytes) {
  */
 export async function readManifestPlaintext(replicaUsername, manifest, options = {}) {
 	const dagGroupId = manifest.meta?.groupId
-	if (Array.isArray(manifest.meta?.dagParts) && dagGroupId) {
+	if (manifest.meta?.dagParts?.length && dagGroupId) {
 		const dagPlain = await readDagManifestPlaintext(replicaUsername, manifest)
 		if (dagPlain) return dagPlain
 	}
@@ -110,7 +110,7 @@ export async function readManifestPlaintext(replicaUsername, manifest, options =
  */
 export async function readManifestPlaintextStream(replicaUsername, manifest, options = {}) {
 	const dagGroupId = manifest.meta?.groupId
-	if (Array.isArray(manifest.meta?.dagParts) && dagGroupId) {
+	if (manifest.meta?.dagParts?.length && dagGroupId) {
 		const plain = await readManifestPlaintext(replicaUsername, manifest, options)
 		if (!plain) return null
 		return Readable.from([plain])

package/link/channel_mux.mjs

@@ -57,7 +57,7 @@ const DEFAULT_ACTION_PRIORITIES = Object.freeze({
  * @returns {number} 优先级（未知 action 默认 5）
  */
 export function resolveActionPriority(action) {
-	return DEFAULT_ACTION_PRIORITIES[String(action || '').trim()] ?? 5
+	return DEFAULT_ACTION_PRIORITIES[action] ?? 5
 }
 
 /**
@@ -67,12 +67,11 @@ export function resolveActionPriority(action) {
  * @returns {'control' | 'bulk'} 目标通道名
  */
 export function pickChannel(action, byteLength) {
-	const normalized = String(action || '').trim()
-	if (normalized === 'ping' || normalized === 'pong' || normalized.startsWith('route_'))
+	if (action === 'ping' || action === 'pong' || action.startsWith('route_'))
 		return CHANNEL_CONTROL
-	if (Number(byteLength) > BULK_CHANNEL_MIN_BYTES)
+	if (byteLength > BULK_CHANNEL_MIN_BYTES)
 		return CHANNEL_BULK
-	return resolveActionPriority(normalized) <= 3 ? CHANNEL_CONTROL : CHANNEL_BULK
+	return resolveActionPriority(action) <= 3 ? CHANNEL_CONTROL : CHANNEL_BULK
 }
 
 /**
@@ -162,13 +161,14 @@ export function createChannelSendQueues(options) {
 	const flush = channelName => {
 		scheduled[channelName] = false
 		const channel = getChannel(channelName)
-		if (!channel || channel.readyState !== 'open') return
+		if (channel?.readyState !== 'open') return
 		const queue = queues[channelName]
-		while (queue.length) {
-			if (readBufferedAmount(channel) > highWatermarkBytes) return
-			const item = queue.shift()
-			channel.send(item.bytes)
+		let i = 0
+		while (i < queue.length) {
+			if (readBufferedAmount(channel) > highWatermarkBytes) break
+			channel.send(queue[i++].bytes)
 		}
+		if (i > 0) queue.splice(0, i)
 	}
 
 	return {