@steve02081504/fount-p2p 0.0.38 → 0.0.39

package/AGENTS.md

@@ -58,7 +58,7 @@ Deno / native / BT: [runtime.md](docs/runtime.md).
 - **Fanout vs targeted / timed collect:** [wire.md](docs/wire.md).
 - **Channel encryption:** per-channel `K_ch`, scheme `channel-key` (`CHANNEL_KEY_SCHEME`); decrypted payloads are untrusted outside DAG Ed25519 context.
 - **Denylist vs personal lists:** node `denylist.json` vs per-entity `personal_block.json` / `personal_hide.json`.
-- **Manifest ACL / transfer owner / servicer:** shells register matchers and `registerManifestServicer`; core does not hard-code chat/social types. Non-public manifests are served cross-node only via a registered servicer (default deny).
+- **Manifest ACL / transfer owner / servicer:** ownership is routed by `registerManifestOwner` matchers only; ACL & servicer handlers are keyed by `ownerId` (a `type` may be reused across families but never acts as a routing key). Core does not hard-code chat/social types. Non-public manifests are served cross-node only via a registered servicer; unclaimed non-public is denied (no `type` fallback).
 
 ### Node / network
 

package/docs/evfs.md

@@ -32,10 +32,13 @@ Outer caller timeouts must **not** abort the in-flight work — background fill
 
 - `file-master-key-wrap` / `vault-wrap` / `identity-wrap` manifests carry no author signature, so the remote-acquisition trust boundary is **not** a signature — it is the **fanout target set** plus the **serving node's authorization**.
 - Client: the caller passes the authorized node set (group roster / cabinet members) as `fanoutTargets`. `fed_manifest_get` is sent only to those nodes; a response is accepted when it normalizes, its `ownerEntityHash`+`logicalPath` match the request, and its authenticated `senderNodeHash` belongs to the target set.
-- Server: `handleIncomingManifestGet` refuses non-public manifests unless a **servicer** is registered for the type. Shells call `registerManifestServicer(type, ownerId, handler)`; the handler receives `{ manifest, ownerEntityHash, logicalPath, requesterNodeHash, peerId, payload }` and returns a boolean. `requesterNodeHash` is **always** the transport-authenticated sender nodeHash (`peerId`); the client no longer self-asserts a `nodeHash` in `fed_manifest_get`, so the fanout target node can never be mistaken for the requester — authorization must still be enforced from the trust graph / group membership.
+- Server: `handleIncomingManifestGet` refuses non-public manifests unless a **servicer** is registered for the matched owner family. Shells call `registerManifestOwner(ownerId, match)` to claim ownership and `registerManifestServicer(ownerId, handler)` to serve; the handler receives `{ manifest, ownerEntityHash, logicalPath, requesterNodeHash, peerId, payload }` and returns a boolean. `requesterNodeHash` is **always** the transport-authenticated sender nodeHash (`peerId`); the client no longer self-asserts a `nodeHash` in `fed_manifest_get`, so the fanout target node can never be mistaken for the requester — authorization must still be enforced from the trust graph / group membership.
 - Non-public responses carry the **full manifest including `meta`** (public responses strip meta to `publicSig`): the reader needs `meta.dagParts` / `meta.groupId` to read DAG plaintext.
 - Confidentiality does not rely on manifest secrecy: ciphertext blocks are content-addressed, AES-GCM authenticated, and decryption requires a wrap key held by the shell. A forged manifest can at worst fail the read (DoS), never decrypt content.
 
-## ACL
+## ACL & owner routing
 
-Shells register matchers via the ACL registry. Core does not hard-code chat/social entity types.
+- Ownership is decided **only** by matchers: `registerManifestOwner(ownerId, match)` with `match(manifest, ownerEntityHash)` returning a boolean. `transferKeyDescriptor.type` is **not** a routing key — the same type (e.g. `file-master-key-wrap`) may be reused by several families (chat group, cabinet shared, vault, …).
+- Matchers must be mutually exclusive: a manifest belongs to exactly one family; resolution is first-match in registration order. A broad matcher that claims another family's entities will shadow them, so matchers should key on their own entity namespace (e.g. the `fount:chat:group:` prefix).
+- Local read/write ACL (`registerManifestAcl(ownerId, handler)`) and cross-node serve (`registerManifestServicer(ownerId, handler)`) are both keyed by `ownerId` (same `ownerId` as `registerTransferKeyDependencies`). A claimed family with no handler denies (fail-closed); an unclaimed non-public manifest is denied cross-node — there is no `type` fallback.
+- Core does not hard-code chat/social entity types.

package/files/manifest/acl.mjs

@@ -1,38 +1,67 @@
 import { isLogicalEntityHash } from '../../core/logical_entity.mjs'
 import { isWritableLocalEntity } from '../../node/identity.mjs'
 
-import { checkManifestAcl, resolveManifestAclType } from './acl_registry.mjs'
+import { resolveManifestOwner } from './routing.mjs'
 
 /**
+ * @typedef {{
+ *   replicaUsername: string,
+ *   ownerEntityHash: string,
+ *   manifest: import('./normalize.mjs').FileManifest | object,
+ * }} ManifestAclContext
+ */
+
+/** @type {Map<string, (context: ManifestAclContext, logicalPath?: string) => Promise<boolean>>} */
+const aclHandlers = new Map()
+
+/**
+ * 注册本族 manifest 的本地读写授权判定（ownerId 须与 registerManifestOwner 一致）。
+ * @param {string} ownerId 注册方
+ * @param {(context: ManifestAclContext, logicalPath?: string) => Promise<boolean>} handler 授权判定
+ * @returns {void}
+ */
+export function registerManifestAcl(ownerId, handler) {
+	aclHandlers.set(ownerId, handler)
+}
+
+/**
+ * @param {string} ownerId 注册方
+ * @returns {void}
+ */
+export function unregisterManifestAcl(ownerId) {
+	aclHandlers.delete(ownerId)
+}
+
+/**
+ * 本地读授权：仅认 matcher 结果——命中族须注册 ACL handler，否则 deny。
  * @param {string} replicaUsername 请求 replica
  * @param {string} ownerEntityHash 文件 owner
  * @param {import('./normalize.mjs').FileManifest} manifest 清单
  * @returns {Promise<boolean>} 是否允许读
  */
 export async function canReadManifest(replicaUsername, ownerEntityHash, manifest) {
-	const type = resolveManifestAclType(manifest, ownerEntityHash)
-	if (type)
-		return checkManifestAcl(type, { replicaUsername, ownerEntityHash, manifest })
-
-	if (isLogicalEntityHash(ownerEntityHash))
+	const ownerId = resolveManifestOwner(manifest, ownerEntityHash)
+	if (ownerId) {
+		const handler = aclHandlers.get(ownerId)
+		if (handler) return handler({ replicaUsername, ownerEntityHash, manifest })
 		return false
-
-	return true
+	}
+	return !isLogicalEntityHash(ownerEntityHash)
 }
 
 /**
+ * 本地写授权：仅认 matcher 结果（写路径无 manifest，只按 ownerEntityHash 判定）。
  * @param {string} replicaUsername 请求 replica
  * @param {string} ownerEntityHash 所有者
  * @param {string} logicalPath 路径
  * @returns {Promise<boolean>} 是否允许写
  */
 export async function canWriteManifestPath(replicaUsername, ownerEntityHash, logicalPath) {
-	const type = resolveManifestAclType(null, ownerEntityHash)
-	if (type)
-		return checkManifestAcl(type, { replicaUsername, ownerEntityHash, manifest: /** @type {any} */ {} }, logicalPath)
-
-	if (isLogicalEntityHash(ownerEntityHash))
+	const ownerId = resolveManifestOwner(null, ownerEntityHash)
+	if (ownerId) {
+		const handler = aclHandlers.get(ownerId)
+		if (handler) return handler({ replicaUsername, ownerEntityHash, manifest: {} }, logicalPath)
 		return false
-
-	return isWritableLocalEntity(ownerEntityHash)
+	}
+	return !isLogicalEntityHash(ownerEntityHash) && isWritableLocalEntity(ownerEntityHash)
 }

package/files/manifest/fetch.mjs

@@ -8,7 +8,6 @@ import { loadFileManifest, saveFileManifest } from '../evfs.mjs'
 import { beginFedFanoutFetch } from '../fed/fetch_shared.mjs'
 import { canonicalizeFanoutTargets } from '../fetch_fanout.mjs'
 
-import { resolveManifestAclType } from './acl_registry.mjs'
 import { normalizeFileManifest } from './normalize.mjs'
 import {
 	manifestFetchExpectedKey,
@@ -16,6 +15,7 @@ import {
 	registerManifestFetchWait,
 } from './pending.mjs'
 import { shouldPreferIncomingPublicManifest } from './public.mjs'
+import { resolveManifestOwner } from './routing.mjs'
 import { getManifestServicer } from './servicer_registry.mjs'
 
 const DEFAULT_MANIFEST_FETCH_TIMEOUT_MS = ms('8s')
@@ -153,9 +153,9 @@ export async function handleIncomingManifestGet(payload, sendResponse, peerId) {
 		return
 	}
 
-	// 非 public：ACL servicer 授权后回完整 manifest（读侧解密依赖 meta.dagParts / groupId）。
-	const aclType = resolveManifestAclType(manifest, ownerEntityHash) || manifest.transferKeyDescriptor.type
-	const servicer = getManifestServicer(aclType)
+	// 非 public：仅认 matcher 命中的族 servicer（无 matcher 即 deny，不按 transferKeyDescriptor.type 兜底路由）。
+	const ownerId = resolveManifestOwner(manifest, ownerEntityHash)
+	const servicer = getManifestServicer(ownerId)
 	if (!servicer) return
 	const allowed = await servicer({
 		manifest,

package/files/manifest/routing.mjs

@@ -0,0 +1,38 @@
+/**
+ * Manifest 族路由：matcher 声明「该 manifest / 实体归哪个族（ownerId）所有」。
+ * matcher 是唯一路由依据（注册序先命中者）；`transferKeyDescriptor.type` 可被多族复用、不参与路由。
+ * 族间 matcher 必须互斥，否则按注册顺序先到先得。
+ */
+
+/** @type {Array<{ ownerId: string, match: (manifest: import('./normalize.mjs').FileManifest | null, ownerEntityHash: string) => boolean }>} */
+const owners = []
+
+/**
+ * @param {string} ownerId 注册方
+ * @param {(manifest: import('./normalize.mjs').FileManifest | null, ownerEntityHash: string) => boolean} match 归属判定
+ * @returns {void}
+ */
+export function registerManifestOwner(ownerId, match) {
+	owners.push({ ownerId, match })
+}
+
+/**
+ * @param {string} ownerId 注册方
+ * @returns {void}
+ */
+export function unregisterManifestOwner(ownerId) {
+	for (let index = owners.length - 1; index >= 0; index--)
+		if (owners[index].ownerId === ownerId) owners.splice(index, 1)
+}
+
+/**
+ * 解析 manifest 归属族；无命中为 null（非 public 跨节点即 deny）。
+ * @param {import('./normalize.mjs').FileManifest | null} manifest manifest（写路径可空）
+ * @param {string} ownerEntityHash 所有者
+ * @returns {string | null} 族 id
+ */
+export function resolveManifestOwner(manifest, ownerEntityHash) {
+	for (const { ownerId, match } of owners)
+		if (match(manifest, ownerEntityHash)) return ownerId
+	return null
+}

package/files/manifest/servicer_registry.mjs

@@ -1,51 +1,43 @@
 /**
- * Manifest servicer 注册表：按 ACL 类型路由，决定跨节点是否对外提供非 public manifest。
- * 服务端缺省 deny；未注册的类型直接不响应 fed_manifest_get。
+ * Manifest servicer 注册表：按族（ownerId）路由，决定跨节点是否对外提供非 public manifest。
+ * type 可被多族复用；路由只经 registerManifestOwner 的 matcher 唯一命中。服务端缺省 deny。
  */
 
-/** @type {Map<string, { ownerId: string, handler: (context: ManifestServicerContext) => Promise<boolean> | boolean }>} */
-const servicersByType = new Map()
+/** @type {Map<string, (context: ManifestServicerContext) => Promise<boolean> | boolean>} */
+const servicersByOwner = new Map()
 
 /**
  * @typedef {{
- *   manifest: import('./normalize.mjs').FileManifest,
- *   ownerEntityHash: string,
- *   logicalPath: string,
- *   requesterNodeHash: string,
- *   peerId: string,
- *   payload: object,
+ * 	manifest: import('./normalize.mjs').FileManifest,
+ * 	ownerEntityHash: string,
+ * 	logicalPath: string,
+ * 	requesterNodeHash: string,
+ * 	peerId: string,
+ * 	payload: object,
  * }} ManifestServicerContext
  */
 
 /**
- * @param {string} type ACL 类型（如 vault-wrap、file-master-key-wrap，或 resolveManifestAclType 匹配结果）
- * @param {string} ownerId 注册方
+ * @param {string} ownerId 注册方（族，须与 registerManifestOwner 一致）
  * @param {(context: ManifestServicerContext) => Promise<boolean> | boolean} handler 授权判定
  * @returns {void}
  */
-export function registerManifestServicer(type, ownerId, handler) {
-	const existing = servicersByType.get(type)
-	if (existing && existing.ownerId !== ownerId)
-		throw new Error(`manifest servicer for '${type}' already registered by '${existing.ownerId}'`)
-	servicersByType.set(type, { ownerId, handler })
+export function registerManifestServicer(ownerId, handler) {
+	servicersByOwner.set(ownerId, handler)
 }
 
 /**
- * @param {string} type ACL 类型
  * @param {string} ownerId 注册方
  * @returns {void}
  */
-export function unregisterManifestServicer(type, ownerId) {
-	const existing = servicersByType.get(type)
-	if (!existing) return
-	if (existing.ownerId === ownerId)
-		servicersByType.delete(type)
+export function unregisterManifestServicer(ownerId) {
+	servicersByOwner.delete(ownerId)
 }
 
 /**
- * @param {string} type ACL 类型
+ * @param {string} ownerId 族 id
  * @returns {(context: ManifestServicerContext) => Promise<boolean> | boolean | undefined} 已注册 handler
  */
-export function getManifestServicer(type) {
-	return servicersByType.get(type)?.handler
+export function getManifestServicer(ownerId) {
+	return servicersByOwner.get(ownerId)
 }

package/files/transfer_key_registry.mjs

@@ -1,3 +1,5 @@
+import { resolveManifestOwner } from './manifest/routing.mjs'
+
 /** @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()
 
@@ -5,14 +7,13 @@ const transferDependenciesByOwner = new Map()
 const dagPlaintextReadersByOwner = new Map()
 
 /**
- * @param {string} ownerId 注册方
+ * @param {string} ownerId 注册方（族，须与 registerManifestOwner 一致）
  * @param {{ getGroupFileMasterKey?: (replicaUsername: string, groupId: string, keyGeneration?: number) => Promise<Buffer | string | null>, getVaultMasterKey?: (replicaUsername: string, entityHash: string) => Promise<Buffer | string | null> }} dependencies 密钥源
  * @returns {void}
  */
 export function registerTransferKeyDependencies(ownerId, dependencies) {
-	const key = ownerId
-	const prev = transferDependenciesByOwner.get(key) || {}
-	transferDependenciesByOwner.set(key, { ...prev, ...dependencies })
+	const prev = transferDependenciesByOwner.get(ownerId) || {}
+	transferDependenciesByOwner.set(ownerId, { ...prev, ...dependencies })
 }
 
 /**
@@ -24,48 +25,13 @@ export function registerDagManifestPlaintextReader(ownerId, reader) {
 	dagPlaintextReadersByOwner.set(ownerId, reader)
 }
 
-/** @type {Array<{ ownerId: string, match: (manifest: import('./manifest/normalize.mjs').FileManifest) => boolean }>} */
-const manifestOwnerMatchers = []
-
-/**
- * @param {string} ownerId 注册方
- * @param {(manifest: import('./manifest/normalize.mjs').FileManifest) => boolean} match manifest 匹配谓词
- * @returns {void}
- */
-export function registerManifestOwnerMatcher(ownerId, match) {
-	manifestOwnerMatchers.push({ ownerId, match })
-}
-
-/**
- * @param {string} ownerId 注册方
- * @returns {void}
- */
-export function unregisterManifestOwnerMatchers(ownerId) {
-	const id = ownerId
-	for (let i = manifestOwnerMatchers.length - 1; i >= 0; i--)
-		if (manifestOwnerMatchers[i].ownerId === id) manifestOwnerMatchers.splice(i, 1)
-}
-
 /**
  * @param {string} ownerId 注册方
  * @returns {void}
  */
 export function unregisterTransferKeyDependencies(ownerId) {
-	const key = ownerId
-	transferDependenciesByOwner.delete(key)
-	dagPlaintextReadersByOwner.delete(key)
-	unregisterManifestOwnerMatchers(key)
-}
-
-/**
- * 从 manifest 推断 transfer key 注册方 id（按 registerManifestOwnerMatcher 注册顺序匹配）。
- * @param {import('./manifest/normalize.mjs').FileManifest} manifest 清单
- * @returns {string | null} 所有者 id
- */
-export function resolveManifestTransferOwnerId(manifest) {
-	for (const { ownerId, match } of manifestOwnerMatchers)
-		if (match(manifest)) return ownerId
-	return null
+	transferDependenciesByOwner.delete(ownerId)
+	dagPlaintextReadersByOwner.delete(ownerId)
 }
 
 /**
@@ -74,7 +40,7 @@ export function resolveManifestTransferOwnerId(manifest) {
  * @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) {
-	const resolved = ownerId || (manifest ? resolveManifestTransferOwnerId(manifest) : null)
+	const resolved = ownerId || (manifest ? resolveManifestOwner(manifest, manifest.ownerEntityHash) : null)
 	if (resolved) return transferDependenciesByOwner.get(resolved) || {}
 	return {}
 }
@@ -85,7 +51,7 @@ export function resolveTransferKeyDependencies(ownerId, manifest) {
  * @returns {Promise<Buffer | null>} 明文；无 reader 或未命中为 null
  */
 export async function readDagManifestPlaintext(replicaUsername, manifest) {
-	const ownerId = resolveManifestTransferOwnerId(manifest)
+	const ownerId = resolveManifestOwner(manifest, manifest.ownerEntityHash)
 	if (ownerId) {
 		const reader = dagPlaintextReadersByOwner.get(ownerId)
 		if (reader)
@@ -93,9 +59,7 @@ export async function readDagManifestPlaintext(replicaUsername, manifest) {
 				const buffer = await reader(replicaUsername, manifest)
 				if (buffer?.length) return buffer
 			}
-			catch { /* fall through */ }
-		return null
+			catch { /* 读取失败则回落到分块路径 */ }
 	}
-
 	return null
 }

package/package.json

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

package/files/manifest/acl_registry.mjs

@@ -1,84 +0,0 @@
-/**
- * Manifest ACL 注册表：按 transferKeyDescriptor.type 路由，不硬编码业务概念。
- */
-
-/** @type {Map<string, { ownerId: string, handler: (context: ManifestAclContext, logicalPath?: string) => Promise<boolean> }>} */
-const handlersByType = new Map()
-
-/** @type {Map<string, { ownerId: string, match: (manifest: import('./normalize.mjs').FileManifest | null | undefined, ownerEntityHash: string) => string | null }>} */
-const matchersByOwner = new Map()
-
-/**
- * @typedef {{
- *   replicaUsername: string,
- *   ownerEntityHash: string,
- *   manifest: import('./normalize.mjs').FileManifest,
- * }} ManifestAclContext
- */
-
-/**
- * @param {string} type transferKeyDescriptor.type（如 vault-wrap、file-master-key-wrap）
- * @param {string} ownerId 注册方
- * @param {(context: ManifestAclContext, logicalPath?: string) => Promise<boolean>} handler ACL 检查
- * @returns {void}
- */
-export function registerManifestAcl(type, ownerId, handler) {
-	const existing = handlersByType.get(type)
-	if (existing && existing.ownerId !== ownerId)
-		throw new Error(`manifest acl handler for '${type}' already registered by '${existing.ownerId}'`)
-	handlersByType.set(type, { ownerId, handler })
-}
-
-/**
- * @param {string} type transferKeyDescriptor.type
- * @param {string} ownerId 注册方
- * @returns {void}
- */
-export function unregisterManifestAcl(type, ownerId) {
-	const existing = handlersByType.get(type)
-	if (!existing) return
-	if (existing.ownerId === ownerId)
-		handlersByType.delete(type)
-}
-
-/**
- * @param {string} ownerId 注册方
- * @param {(manifest: import('./normalize.mjs').FileManifest | null | undefined, ownerEntityHash: string) => string | null} match ACL 类型匹配
- * @returns {void}
- */
-export function registerManifestAclMatcher(ownerId, match) {
-	matchersByOwner.set(ownerId, { ownerId, match })
-}
-
-/**
- * @param {string} ownerId 注册方
- * @returns {void}
- */
-export function unregisterManifestAclMatcher(ownerId) {
-	matchersByOwner.delete(ownerId)
-}
-
-/**
- * @param {import('./normalize.mjs').FileManifest | null | undefined} manifest manifest
- * @param {string} ownerEntityHash 所有者
- * @returns {string | null} ACL 类型
- */
-export function resolveManifestAclType(manifest, ownerEntityHash) {
-	for (const { match } of matchersByOwner.values()) {
-		const type = match(manifest, ownerEntityHash)
-		if (type) return type
-	}
-	return null
-}
-
-/**
- * @param {string} type transferKeyDescriptor.type
- * @param {ManifestAclContext} context 上下文
- * @param {string} [logicalPath] 写路径（仅写 ACL 需要）
- * @returns {Promise<boolean>} 是否允许（未注册为 false）
- */
-export async function checkManifestAcl(type, context, logicalPath) {
-	const row = handlersByType.get(type)
-	if (!row?.handler) return false
-	return row.handler(context, logicalPath)
-}