@steve02081504/fount-p2p 0.0.23 → 0.0.25

package/files/{public_manifest.mjs → manifest/public.mjs}

@@ -1,13 +1,13 @@
 import { Buffer } from 'node:buffer'
 
-import { canonicalStringify } from '../core/canonical_json.mjs'
-import { hashFromPubKeyHex, parseEntityHash } from '../core/entity_id.mjs'
-import { assertSafeEvfsLogicalPath } from '../core/evfs_logical_path.mjs'
-import { isHex64, normalizeHex64 } from '../core/hexIds.mjs'
-import { sign, verify } from '../crypto/crypto.mjs'
+import { canonicalStringify } from '../../core/canonical_json.mjs'
+import { hashFromPubKeyHex, parseEntityHash } from '../../core/entity_id.mjs'
+import { assertSafeEvfsLogicalPath } from '../../core/evfs_logical_path.mjs'
+import { isHex64, normalizeHex64 } from '../../core/hexIds.mjs'
+import { sign, verify } from '../../crypto/crypto.mjs'
+import { putFileManifest, saveFileManifest } from '../evfs.mjs'
 
-import { putFileManifest, saveFileManifest } from './evfs.mjs'
-import { normalizeFileManifest, publicTransferKeyDescriptor } from './manifest.mjs'
+import { normalizeFileManifest, publicTransferKeyDescriptor } from './normalize.mjs'
 
 /** 实体公开 manifest 签名域 */
 export const ENTITY_PUBLIC_MANIFEST_DOMAIN = 'fount-entity-public-manifest'
@@ -32,11 +32,11 @@ export function publicManifestSignBytes(fields) {
 }
 
 /**
- * @param {import('./manifest.mjs').FileManifest} manifest 清单
+ * @param {import('./normalize.mjs').FileManifest} manifest 清单
  * @param {number} publishedAt 发布时间
  * @param {Uint8Array | Buffer} entitySecretKey recovery 私钥种子
  * @param {string} entityPubKeyHex recovery 公钥 hex
- * @returns {Promise<import('./manifest.mjs').FileManifest>} 带 publicSig 的清单
+ * @returns {Promise<import('./normalize.mjs').FileManifest>} 带 publicSig 的清单
  */
 export async function attachPublicManifestSig(manifest, publishedAt, entitySecretKey, entityPubKeyHex) {
 	const pubKeyHex = normalizeHex64(entityPubKeyHex)
@@ -63,7 +63,7 @@ export async function attachPublicManifestSig(manifest, publishedAt, entitySecre
 
 /**
  * @param {unknown} input 原始 manifest
- * @returns {Promise<import('./manifest.mjs').FileManifest | null>} 验签通过的清单；非法为 null
+ * @returns {Promise<import('./normalize.mjs').FileManifest | null>} 验签通过的清单；非法为 null
  */
 export async function verifySignedPublicManifest(input) {
 	const manifest = normalizeFileManifest(input)
@@ -105,7 +105,7 @@ export async function verifySignedPublicManifest(input) {
 
 /**
  * @param {object | null | undefined} localManifest 本地已有清单
- * @param {import('./manifest.mjs').FileManifest} incoming 入站已验签清单
+ * @param {import('./normalize.mjs').FileManifest} incoming 入站已验签清单
  * @returns {boolean} 是否应以 incoming 覆盖本地缓存
  */
 export function shouldPreferIncomingPublicManifest(localManifest, incoming) {
@@ -125,7 +125,7 @@ export function shouldPreferIncomingPublicManifest(localManifest, incoming) {
  * @param {Uint8Array | Buffer} parameters.entitySecretKey recovery 私钥种子
  * @param {string} parameters.entityPubKeyHex recovery 公钥 hex
  * @param {number} [parameters.publishedAt] 发布时间（默认 Date.now）
- * @returns {Promise<import('./manifest.mjs').FileManifest>} 已签名并落盘的公开清单
+ * @returns {Promise<import('./normalize.mjs').FileManifest>} 已签名并落盘的公开清单
  */
 export async function publishPublicFile(parameters) {
 	const {

package/files/transfer_key.mjs

@@ -8,8 +8,8 @@ import {
 } from '../crypto/key.mjs'
 
 /**
- * @typedef {import('./manifest.mjs').FileManifest} FileManifest
- * @typedef {import('./manifest.mjs').TransferKeyDescriptor} TransferKeyDescriptor
+ * @typedef {import('./manifest/normalize.mjs').FileManifest} FileManifest
+ * @typedef {import('./manifest/normalize.mjs').TransferKeyDescriptor} TransferKeyDescriptor
  */
 
 /**

package/files/transfer_key_registry.mjs

@@ -1,7 +1,7 @@
 /** @type {Map<string, { getGroupFileMasterKey?: (replicaUsername: string, groupId: string, keyGeneration?: number) => Promise<Buffer | string | null>, getVaultMasterKey?: (replicaUsername: string, entityHash: string) => Promise<Buffer | string | null> }>} */
 const transferDependenciesByOwner = new Map()
 
-/** @type {Map<string, (replicaUsername: string, manifest: import('./manifest.mjs').FileManifest) => Promise<Buffer | null>>} */
+/** @type {Map<string, (replicaUsername: string, manifest: import('./manifest/normalize.mjs').FileManifest) => Promise<Buffer | null>>} */
 const dagPlaintextReadersByOwner = new Map()
 
 /**
@@ -17,19 +17,19 @@ export function registerTransferKeyDependencies(ownerId, dependencies) {
 
 /**
  * @param {string} ownerId 注册方
- * @param {(replicaUsername: string, manifest: import('./manifest.mjs').FileManifest) => Promise<Buffer | null>} reader dagParts 明文读取
+ * @param {(replicaUsername: string, manifest: import('./manifest/normalize.mjs').FileManifest) => Promise<Buffer | null>} reader dagParts 明文读取
  * @returns {void}
  */
 export function registerDagManifestPlaintextReader(ownerId, reader) {
 	dagPlaintextReadersByOwner.set(String(ownerId), reader)
 }
 
-/** @type {Array<{ ownerId: string, match: (manifest: import('./manifest.mjs').FileManifest) => boolean }>} */
+/** @type {Array<{ ownerId: string, match: (manifest: import('./manifest/normalize.mjs').FileManifest) => boolean }>} */
 const manifestOwnerMatchers = []
 
 /**
  * @param {string} ownerId 注册方
- * @param {(manifest: import('./manifest.mjs').FileManifest) => boolean} match manifest 匹配谓词
+ * @param {(manifest: import('./manifest/normalize.mjs').FileManifest) => boolean} match manifest 匹配谓词
  * @returns {void}
  */
 export function registerManifestOwnerMatcher(ownerId, match) {
@@ -59,7 +59,7 @@ export function unregisterTransferKeyDependencies(ownerId) {
 
 /**
  * 从 manifest 推断 transfer key 注册方 id（按 registerManifestOwnerMatcher 注册顺序匹配）。
- * @param {import('./manifest.mjs').FileManifest} manifest 清单
+ * @param {import('./manifest/normalize.mjs').FileManifest} manifest 清单
  * @returns {string | null} 所有者 id
  */
 export function resolveManifestTransferOwnerId(manifest) {
@@ -70,7 +70,7 @@ export function resolveManifestTransferOwnerId(manifest) {
 
 /**
  * @param {string} [ownerId] 显式注册方；省略时按 manifest 推断
- * @param {import('./manifest.mjs').FileManifest} [manifest] 用于推断 ownerId
+ * @param {import('./manifest/normalize.mjs').FileManifest} [manifest] 用于推断 ownerId
  * @returns {{ getGroupFileMasterKey?: (replicaUsername: string, groupId: string, keyGeneration?: number) => Promise<Buffer | string | null>, getVaultMasterKey?: (replicaUsername: string, entityHash: string) => Promise<Buffer | string | null> }} 依赖
  */
 export function resolveTransferKeyDependencies(ownerId, manifest) {
@@ -81,7 +81,7 @@ export function resolveTransferKeyDependencies(ownerId, manifest) {
 
 /**
  * @param {string} replicaUsername 副本用户名
- * @param {import('./manifest.mjs').FileManifest} manifest 清单
+ * @param {import('./manifest/normalize.mjs').FileManifest} manifest 清单
  * @returns {Promise<Buffer | null>} 明文；无 reader 或未命中为 null
  */
 export async function readDagManifestPlaintext(replicaUsername, manifest) {

package/index.mjs

@@ -32,7 +32,6 @@ import {
 	unlockReputationMax,
 } from './node/reputation_sync.mjs'
 import { getRoutingProfile, setRoutingProfile } from './node/routing_profile.mjs'
-import { createScopedLinkRoom } from './rooms/scoped_link.mjs'
 import { createGroupLinkSet } from './transport/group_link_set.mjs'
 import {
 	configureLinkRegistry,
@@ -42,9 +41,10 @@ import {
 	reloadDiscoveryRelays,
 	sendToNodeLink,
 } from './transport/link_registry.mjs'
+import { attachNodeScopeDefaultFeatures } from './transport/node_scope/features.mjs'
+import { ensureNodeScope } from './transport/node_scope/wire.mjs'
+import { createScopedLinkRoom } from './transport/scoped_link.mjs'
 import {
-	attachUserRoomDefaultWires,
-	ensureNodeScope,
 	ensureUserRoom,
 	getUserRoomSlot,
 } from './transport/user_room.mjs'
@@ -54,7 +54,7 @@ import {
  */
 export {
 	attachReputationSyncWire,
-	attachUserRoomDefaultWires,
+	attachNodeScopeDefaultFeatures,
 	configureLinkRegistry,
 	createGroupLinkSet,
 	createScopedLinkRoom,

package/infra/service.mjs

@@ -2,7 +2,7 @@
 import { isNodeInitialized } from '../node/instance.mjs'
 import { setOverlayRateGate, clearOverlayRateGate } from '../overlay/index.mjs'
 import { getLinkRegistry } from '../transport/link_registry.mjs'
-import { attachNodeScopeMailbox } from '../transport/node_scope.mjs'
+import { attachNodeScopeMailbox } from '../transport/node_scope/features.mjs'
 
 import { attachInfraDebugLog, detachInfraDebugLog } from './debug_log.mjs'
 import {

package/link/handshake.mjs

@@ -9,9 +9,6 @@ import { ensureNodeSeed, getNodeHash } from '../node/identity.mjs'
 
 import { normalizeDtlsFingerprint } from './sdp_fingerprint.mjs'
 
-/** advert / peer-hint 端口规范化（re-export，调用方可直接从 core/tcp_port 导入） */
-export const normalizeAdvertTcpPort = normalizeTcpPort
-
 /**
  * Link 握手签名域标识符。
  */

package/mailbox/deliver_or_store.mjs

@@ -23,7 +23,6 @@ import {
  * @returns {Promise<string | null>} 已验证的 remote nodeHash
  */
 async function resolveRemoteNodeHashForPeer(username, peerId) {
-	void username
 	if (!peerId) return null
 	const entry = activeLinkRoster().find(row => row.peerId === peerId)
 	const remote = entry?.remoteNodeHash?.trim().toLowerCase()
@@ -51,7 +50,6 @@ async function resolveRelayHopForIngress(record) {
  * @returns {Promise<{ maxHop: number, relayFanoutTrusted: number, relayFanoutNormal: number, wantFanout: number, batterySaver: boolean }>} 按在线 peer 数缩放的路由
  */
 async function resolveRouting(username) {
-	void username
 	const { batterySaver, mailbox } = getNodeTransportSettings()
 	const peerCount = activeLinkRoster().length
 	return resolveMailboxRoutingForPeerCount(peerCount, mailbox, batterySaver)

package/mailbox/parse.mjs

@@ -1,9 +1,9 @@
 import { assertHex64 } from '../core/hexIds.mjs'
+import { isPlainObject } from '../core/object.mjs'
 import {
 	assertMailboxPubKeyHash,
 	assertMailboxRecordShape,
 } from '../schemas/mailbox.mjs'
-import { isPlainObject } from '../wire/ingress.mjs'
 
 /**
  * @typedef {import('../schemas/mailbox.mjs').MailboxWireErr} MailboxParseErr

package/mailbox/store.mjs

@@ -11,19 +11,10 @@ import {
 	sortMailboxForRetention,
 } from './importance.mjs'
 import {
-	MAX_BUCKET_BYTES,
-	MAX_BUCKET_ENTRIES,
-	mailboxBucketKey,
-	mailboxRecordBytes,
 	pruneMailboxBuckets,
 	pruneMailboxGlobalFair,
 } from './prune.mjs'
 
-/**
- * mailbox 桶裁剪与计量辅助（re-export）。
- */
-export { MAX_BUCKET_BYTES, MAX_BUCKET_ENTRIES, mailboxBucketKey, mailboxRecordBytes }
-
 /** 单条 mailbox envelope JSON 字节上限 */
 export const MAX_ENTRY_BYTES = 256 * 1024
 

package/mailbox/wire.mjs

@@ -1,3 +1,5 @@
+import { subscribeWire } from '../wire/subscribe.mjs'
+
 import {
 	ingestMailboxGive,
 	ingestMailboxPut,
@@ -5,23 +7,30 @@ import {
 } from './deliver_or_store.mjs'
 import { parseMailboxGive, parseMailboxPut, parseMailboxWant } from './parse.mjs'
 
-/**
- * @typedef {{ replicaUsername?: string }} MailboxWireContext
- */
+/** @typedef {import('../wire/adapter.mjs').WireContext} MailboxWireContext */
+/** @typedef {import('../wire/adapter.mjs').WireAdapter} WireAdapter */
 
 /**
  * @param {MailboxWireContext} wireContext 入站上下文
- * @param {{ on: (name: string, handler: (payload: unknown, peerId: string) => void) => (() => void) | void, send: (name: string, payload: unknown, peerId: string | null) => void }} wire Trystero 适配器
+ * @param {WireAdapter} wire action 表
  * @returns {() => void} 取消挂载的 dispose
  */
 export function attachMailboxWire(wireContext, wire) {
-	const offs = [
-		wire.on('mailbox_put', (payload, peerId) => {
+	return subscribeWire(wire, {
+		/**
+		 * @param {unknown} payload mailbox_put 载荷
+		 * @param {string} peerId 对端 nodeHash
+		 */
+		mailbox_put(payload, peerId) {
 			const put = parseMailboxPut(payload)
 			if (!put.ok) return
 			void ingestMailboxPut(wireContext, put.value, peerId).catch(error => console.error('mailbox: put ingest failed', error))
-		}),
-		wire.on('mailbox_want', (payload, peerId) => {
+		},
+		/**
+		 * @param {unknown} payload mailbox_want 载荷
+		 * @param {string} peerId 对端 nodeHash
+		 */
+		mailbox_want(payload, peerId) {
 			const want = parseMailboxWant(payload)
 			if (!want.ok) return
 			void respondMailboxWant(want.value, (giveWire, targetPeerId) => {
@@ -30,15 +39,14 @@ export function attachMailboxWire(wireContext, wire) {
 				}
 				catch { /* disconnected */ }
 			}, peerId).catch(error => console.error('mailbox: want failed', error))
-		}),
-		wire.on('mailbox_give', payload => {
+		},
+		/**
+		 * @param {unknown} payload mailbox_give 载荷
+		 */
+		mailbox_give(payload) {
 			const give = parseMailboxGive(payload)
 			if (!give.ok) return
 			void ingestMailboxGive(wireContext, give.value).catch(error => console.error('mailbox: give ingest failed', error))
-		}),
-	]
-	return () => {
-		for (const off of offs)
-			try { off?.() } catch { /* ignore */ }
-	}
+		},
+	})
 }

package/node/reputation_sync.mjs

@@ -2,7 +2,9 @@ import { randomUUID } from 'node:crypto'
 
 import { isHex64, normalizeHex64 } from '../core/hexIds.mjs'
 import { sendToNodeLink } from '../transport/link_registry.mjs'
-import { attachNodeScopeFeature, ensureNodeScope, getNodeScopeWire } from '../transport/node_scope.mjs'
+import { attachNodeScopeFeature } from '../transport/node_scope/features.mjs'
+import { ensureNodeScope, getNodeScopeWire } from '../transport/node_scope/wire.mjs'
+import { subscribeWire } from '../wire/subscribe.mjs'
 
 import {
 	loadReputation,
@@ -226,34 +228,36 @@ function exportScoreTable() {
 export function attachReputationSyncWire() {
 	ensureNodeScope()
 	if (!getNodeScopeWire()) throw new Error('p2p: attachReputationSyncWire requires node scope wire')
-	const dispose = attachNodeScopeFeature('rep_sync', wire => {
-		const offs = [
-			wire.on('rep_sync_req', (payload, peerId) => {
-				const requester = normalizeHex64(peerId)
-				if (!requester || !getReputationExportAllowlist().includes(requester)) return
-				try {
-					wire.send('rep_sync_res', {
-						requestId: payload?.requestId,
-						...exportScoreTable(),
-					}, peerId)
-				}
-				catch { /* disconnected */ }
-			}),
-			wire.on('rep_sync_res', (payload, peerId) => {
-				const requestId = String(payload?.requestId || '')
-				const pending = pendingPulls.get(requestId)
-				if (!pending) return
-				if (normalizeHex64(peerId) !== pending.donor) return
-				clearTimeout(pending.timer)
-				pendingPulls.delete(requestId)
-				pending.resolve(payload)
-			}),
-		]
-		return () => {
-			for (const off of offs)
-				try { off?.() } catch { /* ignore */ }
-		}
-	})
+	const dispose = attachNodeScopeFeature('rep_sync', wire => subscribeWire(wire, {
+		/**
+		 * @param {unknown} payload rep_sync_req 载荷
+		 * @param {string} peerId 对端 nodeHash
+		 */
+		rep_sync_req(payload, peerId) {
+			const requester = normalizeHex64(peerId)
+			if (!requester || !getReputationExportAllowlist().includes(requester)) return
+			try {
+				wire.send('rep_sync_res', {
+					requestId: payload?.requestId,
+					...exportScoreTable(),
+				}, peerId)
+			}
+			catch { /* disconnected */ }
+		},
+		/**
+		 * @param {unknown} payload rep_sync_res 载荷
+		 * @param {string} peerId 对端 nodeHash
+		 */
+		rep_sync_res(payload, peerId) {
+			const requestId = String(payload?.requestId || '')
+			const pending = pendingPulls.get(requestId)
+			if (!pending) return
+			if (normalizeHex64(peerId) !== pending.donor) return
+			clearTimeout(pending.timer)
+			pendingPulls.delete(requestId)
+			pending.resolve(payload)
+		},
+	}))
 	syncWireDisposers.add(dispose)
 	return () => {
 		if (!syncWireDisposers.delete(dispose)) return

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@steve02081504/fount-p2p",
-	"version": "0.0.23",
+	"version": "0.0.25",
 	"description": "fount federation P2P layer — link, trust graph, mailbox, DAG, EVFS.",
 	"keywords": [
 		"network",
@@ -11,7 +11,7 @@
 	"type": "module",
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/steve02081504/fount-p2p.git",
+		"url": "git+https://github.com/steve02081504/fount-p2p.git",
 		"directory": "."
 	},
 	"engines": {
@@ -31,7 +31,7 @@
 		"!scripts/**"
 	],
 	"bin": {
-		"fount-p2p": "./infra/cli.mjs"
+		"fount-p2p": "infra/cli.mjs"
 	},
 	"exports": {
 		".": "./index.mjs",
@@ -41,19 +41,15 @@
 		"./crypto": "./crypto/crypto.mjs",
 		"./crypto/*": "./crypto/*.mjs",
 		"./wire/*": "./wire/*.mjs",
+		"./wire/part/*": "./wire/part/*.mjs",
 		"./schemas/*": "./schemas/*.mjs",
 		"./node/*": "./node/*.mjs",
 		"./discovery": "./discovery/index.mjs",
 		"./discovery/bt": "./discovery/bt/index.mjs",
 		"./discovery/bt/*": "./discovery/bt/*.mjs",
 		"./discovery/*": "./discovery/*.mjs",
-		"./transport/link_registry": "./transport/link_registry.mjs",
-		"./transport/user_room": "./transport/user_room.mjs",
-		"./transport/group_link_set": "./transport/group_link_set.mjs",
-		"./transport/node_scope": "./transport/node_scope.mjs",
-		"./transport/room_scopes": "./transport/room_scopes.mjs",
-		"./transport/remote_user_room": "./transport/remote_user_room.mjs",
-		"./rooms/*": "./rooms/*.mjs",
+		"./transport/node_scope/*": "./transport/node_scope/*.mjs",
+		"./transport/*": "./transport/*.mjs",
 		"./overlay": "./overlay/index.mjs",
 		"./overlay/*": "./overlay/*.mjs",
 		"./trust_graph/*": "./trust_graph/*.mjs",
@@ -62,7 +58,11 @@
 		"./dag/*": "./dag/*.mjs",
 		"./timeline/*": "./timeline/*.mjs",
 		"./files/*": "./files/*.mjs",
+		"./files/chunk/*": "./files/chunk/*.mjs",
+		"./files/manifest/*": "./files/manifest/*.mjs",
+		"./files/fed/*": "./files/fed/*.mjs",
 		"./federation/*": "./federation/*.mjs",
+		"./federation/part_query/*": "./federation/part_query/*.mjs",
 		"./governance/*": "./governance/*.mjs",
 		"./registries/*": "./registries/*.mjs",
 		"./permissions": "./permissions/index.mjs",

package/registries/inbound.mjs

@@ -1,4 +1,18 @@
-/** @typedef {import('../wire/part_invoke.mjs').PartInvokeResponse} PartInvokeResponse */
+/**
+ * @typedef {{ message: string, code: string }} PartInvokeError
+ */
+
+/**
+ * @typedef {object} PartInvokeResultResponse
+ * @property {unknown} result
+ */
+
+/**
+ * @typedef {object} PartInvokeErrorResponse
+ * @property {PartInvokeError} error
+ */
+
+/** @typedef {PartInvokeResultResponse | PartInvokeErrorResponse} PartInvokeResponse */
 
 /**
  * @typedef {{
@@ -29,7 +43,7 @@ const deliveryHandlers = new Map()
  * @returns {void}
  */
 export function registerRpcInboundHandler(type, handler) {
-	rpcHandlers.set(String(type || '').trim(), handler)
+	rpcHandlers.set(type, handler)
 }
 
 /**
@@ -38,7 +52,7 @@ export function registerRpcInboundHandler(type, handler) {
  * @returns {void}
  */
 export function registerDeliveryInboundHandler(type, handler) {
-	deliveryHandlers.set(String(type || '').trim(), handler)
+	deliveryHandlers.set(type, handler)
 }
 
 /**
@@ -47,9 +61,7 @@ export function registerDeliveryInboundHandler(type, handler) {
  * @returns {Promise<PartInvokeResponse | null>} 处理器返回值
  */
 export async function dispatchRpcInbound(inboundContext, message) {
-	const type = String(message?.type || '').trim()
-	if (!type) return null
-	const handler = rpcHandlers.get(type)
+	const handler = rpcHandlers.get(message.type)
 	if (!handler) return null
 	return handler(inboundContext, message)
 }
@@ -60,9 +72,7 @@ export async function dispatchRpcInbound(inboundContext, message) {
  * @returns {Promise<void>}
  */
 export async function dispatchDeliveryInbound(inboundContext, message) {
-	const type = String(message?.type || '').trim()
-	if (!type) return
-	const handler = deliveryHandlers.get(type)
+	const handler = deliveryHandlers.get(message.type)
 	if (!handler) return
 	await handler(inboundContext, message)
 }

package/registries/part_path.mjs

@@ -1,5 +1,3 @@
-import { normalizePartpath } from '../wire/part_invoke.mjs'
-
 /** @type {Map<string, string>} shell 逻辑名 → partpath */
 const shellPartpaths = new Map()
 
@@ -10,10 +8,7 @@ const shellPartpaths = new Map()
  * @returns {void}
  */
 export function registerShellPartpath(shellKey, partpath) {
-	const key = String(shellKey || '').trim()
-	const path = normalizePartpath(partpath)
-	if (!key || !path) throw new Error('invalid_shell_partpath_registration')
-	shellPartpaths.set(key, path)
+	shellPartpaths.set(shellKey, partpath)
 }
 
 /**
@@ -21,7 +16,7 @@ export function registerShellPartpath(shellKey, partpath) {
  * @returns {void}
  */
 export function unregisterShellPartpath(shellKey) {
-	shellPartpaths.delete(String(shellKey || '').trim())
+	shellPartpaths.delete(shellKey)
 }
 
 /**
@@ -29,7 +24,7 @@ export function unregisterShellPartpath(shellKey) {
  * @returns {string} 已注册的 partpath
  */
 export function getShellPartpath(shellKey) {
-	const path = shellPartpaths.get(String(shellKey || '').trim())
+	const path = shellPartpaths.get(shellKey)
 	if (!path) throw new Error(`shell partpath not registered: ${shellKey}`)
 	return path
 }

package/schemas/discovery.mjs

@@ -1,5 +1,5 @@
 import { assertHex64, isHex64, isSignatureHex128, normalizeHex64 } from '../core/hexIds.mjs'
-import { isPlainObject } from '../wire/ingress.mjs'
+import { isPlainObject } from '../core/object.mjs'
 
 const MAX_DISCOVERY_ADS = 64
 

package/schemas/federation_pull.mjs

@@ -2,8 +2,8 @@
  * 联邦补拉 attestation / HPKE 响应 wire 解析（无 attestation/envelope 即丢弃）。
  */
 import { isHex64, isSignatureHex128, normalizeHex64 } from '../core/hexIds.mjs'
+import { isPlainObject } from '../core/object.mjs'
 import { EVENT_ID_HEX } from '../dag/index.mjs'
-import { isPlainObject } from '../wire/ingress.mjs'
 
 /** @typedef {{ requesterPubKeyHash: string, groupId: string, requestId: string, timestamp: number, wantIds?: string[], signature: string }} PullAttestation */
 

package/schemas/part_query.mjs

@@ -2,9 +2,10 @@ import { Buffer } from 'node:buffer'
 
 import { canonicalStringify } from '../core/canonical_json.mjs'
 import { isHex64, normalizeHex64 } from '../core/hexIds.mjs'
-import { isPlainObject } from '../wire/ingress.mjs'
-import { normalizePartpath } from '../wire/part_invoke.mjs'
-import partQueryTunables from '../wire/part_query.tunables.json' with { type: 'json' }
+import { isPlainObject } from '../core/object.mjs'
+import { parsePartpath } from '../core/partpath.mjs'
+
+import partQueryTunables from './part_query.tunables.json' with { type: 'json' }
 
 /**
  * @typedef {{
@@ -100,7 +101,7 @@ export function parsePartQueryReq(value, tunables = partQueryTunables) {
 	if (!requestId) return null
 	const originNodeHash = normalizeHex64(value.originNodeHash)
 	if (!isHex64(originNodeHash)) return null
-	const partpath = normalizePartpath(value.partpath)
+	const partpath = parsePartpath(value.partpath)
 	if (!partpath) return null
 	const kind = String(value.kind || '').trim()
 	if (!kind) return null
@@ -143,7 +144,7 @@ export function parsePartQueryRes(value, tunables = partQueryTunables) {
  * @returns {string | null} 规范化三元组的缓存材料；非法 null
  */
 export function normalizePartQueryCacheMaterial(partpath, kind, query) {
-	const path = normalizePartpath(partpath)
+	const path = parsePartpath(partpath)
 	const k = String(kind || '').trim()
 	if (!path || !k) return null
 	if (measureJsonBytes(query) > partQueryTunables.maxQueryBytes) return null

package/transport/group_link_set.mjs

@@ -1,9 +1,9 @@
+import { noteAdvertPeerHints } from '../discovery/advert_peer_hints.mjs'
 import { listVisibleNodeHashes, startGroupPresence, watchVerifiedGroupAdverts } from '../discovery/index.mjs'
 import { loadPeerPoolView } from '../node/network.mjs'
 import { loadReputation } from '../node/reputation_store.mjs'
 import { emitSafe } from '../utils/emit_safe.mjs'
 
-import { applyAdvertPeerHints } from './advert_ingest.mjs'
 import { getLinkRegistry } from './link_registry.mjs'
 import { resolveFederationPoolLimits, selectLinkTargetsFromMembers } from './peer_pool.mjs'
 import { loadTransportTunables } from './tunables.mjs'
@@ -208,7 +208,7 @@ export function createGroupLinkSet(options) {
 		registerCleanup(await watchVerifiedGroupAdverts(roomSecret, async (verifiedNodeHash, body, meta) => {
 			if (verifiedNodeHash === selfNodeHash) return
 			if (!allowNode(verifiedNodeHash)) return
-			applyAdvertPeerHints(verifiedNodeHash, body, meta)
+			noteAdvertPeerHints(verifiedNodeHash, body, meta)
 			notePeerCandidate(verifiedNodeHash)
 		}))
 

package/transport/link_registry.mjs

@@ -2,6 +2,7 @@ import { Buffer } from 'node:buffer'
 
 import { compareHex64Asc, normalizeHex64 } from '../core/hexIds.mjs'
 import { keyPairFromSeed } from '../crypto/crypto.mjs'
+import { noteAdvertPeerHints } from '../discovery/advert_peer_hints.mjs'
 import { watchVerifiedNodeAdvert, setDiscoveryLinkDialer, prepareConnectToNode } from '../discovery/index.mjs'
 import { setDiscoveryPeerClueListener } from '../discovery/peer_clue.mjs'
 import { listLinkProviders } from '../link/providers/index.mjs'
@@ -13,7 +14,6 @@ import { ms } from '../utils/duration.mjs'
 import { emitSafe } from '../utils/emit_safe.mjs'
 import { createLruMap } from '../utils/lru.mjs'
 
-import { applyAdvertPeerHints } from './advert_ingest.mjs'
 import { DEFAULT_ICE_SERVERS } from './ice_servers.mjs'
 import { createMeshKeepalive } from './mesh_keepalive.mjs'
 import { createOfferAnswerDial } from './offer_answer.mjs'
@@ -650,7 +650,7 @@ export function createLinkRegistry(options = {}) {
 		async watchNodeAdvert(nodeHash, onAdvert) {
 			const hash = normalizeHex64(nodeHash)
 			return await watchVerifiedNodeAdvert(hash, async (verifiedNodeHash, body, meta) => {
-				applyAdvertPeerHints(verifiedNodeHash, body, meta)
+				noteAdvertPeerHints(verifiedNodeHash, body, meta)
 				recentAdverts.touch(verifiedNodeHash, Date.now())
 				dialCooldown.delete(verifiedNodeHash)
 				await Promise.resolve(onAdvert(verifiedNodeHash, body))