@keri-ts/hosting 2.2.1 → 2.2.2

package/esm/hosting/npm/src/src/http/protocol/context.js

@@ -3,9 +3,10 @@
  *
  * The router is path-first: every endpoint classifier receives the same
  * normalized path plus hosted-prefix projections, so mailbox admin, OOBI, and
- * generic CESR ingress cannot disagree about which local AID a URL addresses.
+ * generic CESR ingress cannot disagree about which local AID a URL addresses. When several local AIDs share
+ * one URL, the request's `CESR-DESTINATION` picks among them.
  */
-import { resolveHostedEndpointPath } from "keri-ts/runtime";
+import { CESR_DESTINATION_HEADER, resolveHostedEndpointPath, } from "keri-ts/runtime";
 import { parseOobiRouteRequest } from "./endpoints/oobi.js";
 /** Snapshot one request into the path-first routing context. */
 export function buildProtocolRequestContext(req, runtime, policy = {}) {
@@ -14,14 +15,17 @@ export function buildProtocolRequestContext(req, runtime, policy = {}) {
     // Resolve the same normalized path against the three hosted path shapes used
     // by the HTTP edge: plain hosted endpoints, mailbox admin endpoints, and
     // generic root-relative CESR ingress.
+    // Several local identifiers may advertise one ingress URL; the path then cannot tell them apart and the
+    // request's own destination does.
+    const destination = req.headers.get(CESR_DESTINATION_HEADER);
     const hosted = runtime
-        ? resolveHostedEndpointPath(runtime.hby, pathname, "", policy.hostedPrefixes)
+        ? resolveHostedEndpointPath(runtime.hby, pathname, "", policy.hostedPrefixes, destination)
         : null;
     const mailboxAdmin = runtime
-        ? resolveHostedEndpointPath(runtime.hby, pathname, "/mailboxes", policy.hostedPrefixes)
+        ? resolveHostedEndpointPath(runtime.hby, pathname, "/mailboxes", policy.hostedPrefixes, destination)
         : null;
     const genericIngress = runtime
-        ? resolveHostedEndpointPath(runtime.hby, pathname, "/", policy.hostedPrefixes)
+        ? resolveHostedEndpointPath(runtime.hby, pathname, "/", policy.hostedPrefixes, destination)
         : null;
     const oobiPath = hosted?.relativePath ?? pathname;
     return {

package/esm/hosting/npm/src/src/http/protocol/endpoints/oobi.js

@@ -69,7 +69,7 @@ export function handleOobiRoute(context, request) {
         endpoint: null,
         relativePath: null,
     };
-    const respondingHabAid = selectResponderHab(runtime, hosted, aid, request.eid, context.policy.hostedPrefixes);
+    const respondingHabAid = selectResponderHab(runtime, hosted, aid, request.eid, context.policy.hostedPrefixes, request.role);
     const hab = respondingHabAid ? runtime.hby.habs.get(respondingHabAid) : undefined;
     if (!hab) {
         if (hosted.kind === "ambiguous" && context.policy.hostedPrefixes) {
@@ -118,8 +118,12 @@ export function defaultOobiAid(runtime, serviceHab, hostedPrefixes) {
  * - the requested AID itself when locally controlled
  * - the explicit endpoint AID when it is locally controlled
  * - the hosted endpoint matched from the request path
+ * - a local identifier that an accepted end-role record of `aid` names as `eid` in the requested role, so a host
+ *   serves the OOBI of an identifier it is the agent of even when it hosts no prefix directly. A non-empty
+ *   `hostedPrefixes` is the operator's stated scope, so the named `eid` must be in it; when it is empty or absent,
+ *   any local identifier qualifies.
  */
-export function selectResponderHab(runtime, hosted, aid, eid, hostedPrefixes) {
+export function selectResponderHab(runtime, hosted, aid, eid, hostedPrefixes, role) {
     const hostedSet = hostedPrefixes ? new Set(hostedPrefixes) : null;
     const hostedCandidate = (candidate) => {
         if (!candidate || !runtime.hby.habs.has(candidate)) {
@@ -154,12 +158,13 @@ export function selectResponderHab(runtime, hosted, aid, eid, hostedPrefixes) {
                 && (aid === hostedAid || eid === hostedAid)) {
                 return hostedAid;
             }
-            return undefined;
+            return endRoleResponder(runtime, aid, role, eid, hostedPrefixes);
         }
         return hostedCandidate(aid)
             ?? hostedCandidate(eid)
             ?? rootHostedCandidate(aid)
-            ?? rootHostedCandidate(eid);
+            ?? rootHostedCandidate(eid)
+            ?? endRoleResponder(runtime, aid, role, eid, hostedPrefixes);
     }
     if (runtime.hby.habs.has(aid)) {
         return aid;
@@ -167,5 +172,19 @@ export function selectResponderHab(runtime, hosted, aid, eid, hostedPrefixes) {
     if (eid && runtime.hby.habs.has(eid)) {
         return eid;
     }
-    return hosted.endpoint?.eid ?? undefined;
+    return hosted.endpoint?.eid ?? endRoleResponder(runtime, aid, role, eid, hostedPrefixes);
+}
+/**
+ * The local identifier an accepted, uncut end-role record of `aid` names as `eid` in `role` (any role when
+ * omitted; only `eid` when given), within `scope` when it is non-empty. Reads accepted state only: a role never accepted, or cut, names nobody.
+ */
+function endRoleResponder(runtime, aid, role, eid, scope) {
+    for (const [keys, end] of runtime.hby.db.ends.getTopItemIter([aid], { topive: true })) {
+        const [, currentRole, agent] = keys;
+        if (!agent || !(end.allowed || end.enabled) || (role && currentRole !== role) || (eid && agent !== eid))
+            continue;
+        if (runtime.hby.habs.has(agent) && (!scope?.length || scope.includes(agent)))
+            return agent;
+    }
+    return undefined;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keri-ts/hosting",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "HTTP host lifecycle, application middleware and protocol route composition",
   "repository": {
     "type": "git",
@@ -32,10 +32,10 @@
     "node": ">=20.3"
   },
   "dependencies": {
-    "cesr-ts": "2.2.0",
+    "cesr-ts": "2.2.1",
     "effection": "^3.6.0",
     "hono": "^4.7.11",
-    "keri-ts": "2.2.1",
+    "keri-ts": "2.2.2",
     "@deno/shim-deno": "~0.18.0"
   },
   "devDependencies": {

package/types/src/http/protocol/context.d.ts

@@ -3,7 +3,8 @@
  *
  * The router is path-first: every endpoint classifier receives the same
  * normalized path plus hosted-prefix projections, so mailbox admin, OOBI, and
- * generic CESR ingress cannot disagree about which local AID a URL addresses.
+ * generic CESR ingress cannot disagree about which local AID a URL addresses. When several local AIDs share
+ * one URL, the request's `CESR-DESTINATION` picks among them.
  */
 import { type AgentRuntime, type ProtocolHostPolicy } from "keri-ts/runtime";
 import type { ProtocolRequestContext } from "./types.js";

package/types/src/http/protocol/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../../src/src/http/protocol/context.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,kBAAkB,EAA6B,MAAM,iBAAiB,CAAC;AAExG,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAEzD,gEAAgE;AAChE,wBAAgB,2BAA2B,CACzC,GAAG,EAAE,OAAO,EACZ,OAAO,CAAC,EAAE,YAAY,EACtB,MAAM,GAAE,kBAAuB,GAC9B,sBAAsB,CA4CxB;AAED,iFAAiF;AACjF,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAO9D"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../../src/src/http/protocol/context.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EACL,KAAK,YAAY,EAEjB,KAAK,kBAAkB,EAExB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAEzD,gEAAgE;AAChE,wBAAgB,2BAA2B,CACzC,GAAG,EAAE,OAAO,EACZ,OAAO,CAAC,EAAE,YAAY,EACtB,MAAM,GAAE,kBAAuB,GAC9B,sBAAsB,CAkDxB;AAED,iFAAiF;AACjF,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAO9D"}

package/types/src/http/protocol/endpoints/oobi.d.ts

@@ -19,6 +19,10 @@ export declare function defaultOobiAid(runtime: AgentRuntime, serviceHab?: Hab,
  * - the requested AID itself when locally controlled
  * - the explicit endpoint AID when it is locally controlled
  * - the hosted endpoint matched from the request path
+ * - a local identifier that an accepted end-role record of `aid` names as `eid` in the requested role, so a host
+ *   serves the OOBI of an identifier it is the agent of even when it hosts no prefix directly. A non-empty
+ *   `hostedPrefixes` is the operator's stated scope, so the named `eid` must be in it; when it is empty or absent,
+ *   any local identifier qualifies.
  */
 export declare function selectResponderHab(runtime: AgentRuntime, hosted: {
     kind: "none" | "one" | "ambiguous";
@@ -27,5 +31,5 @@ export declare function selectResponderHab(runtime: AgentRuntime, hosted: {
         url: string;
         basePath: string;
     } | null;
-}, aid: string, eid?: string, hostedPrefixes?: readonly string[]): string | undefined;
+}, aid: string, eid?: string, hostedPrefixes?: readonly string[], role?: string): string | undefined;
 //# sourceMappingURL=oobi.d.ts.map

package/types/src/http/protocol/endpoints/oobi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oobi.d.ts","sourceRoot":"","sources":["../../../../../src/src/http/protocol/endpoints/oobi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAuC,KAAK,GAAG,EAAuB,MAAM,iBAAiB,CAAC;AAExH,OAAO,KAAK,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE3F,kEAAkE;AAClE,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,GACf,gBAAgB,GAAG,IAAI,CAoCzB;AAED,8EAA8E;AAC9E,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,sBAAsB,GAC9B,aAAa,GAAG,IAAI,CAWtB;AAED,gEAAgE;AAChE,wBAAgB,eAAe,CAC7B,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,gBAAgB,GACxB,QAAQ,CA0DV;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,YAAY,EACrB,UAAU,CAAC,EAAE,GAAG,EAChB,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,GACjC,MAAM,GAAG,SAAS,CAcpB;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE;IACN,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,WAAW,CAAC;IACnC,QAAQ,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;CACjE,EACD,GAAG,EAAE,MAAM,EACX,GAAG,CAAC,EAAE,MAAM,EACZ,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,GACjC,MAAM,GAAG,SAAS,CAqDpB"}
+{"version":3,"file":"oobi.d.ts","sourceRoot":"","sources":["../../../../../src/src/http/protocol/endpoints/oobi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAuC,KAAK,GAAG,EAAuB,MAAM,iBAAiB,CAAC;AAExH,OAAO,KAAK,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE3F,kEAAkE;AAClE,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,GACf,gBAAgB,GAAG,IAAI,CAoCzB;AAED,8EAA8E;AAC9E,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,sBAAsB,GAC9B,aAAa,GAAG,IAAI,CAWtB;AAED,gEAAgE;AAChE,wBAAgB,eAAe,CAC7B,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,gBAAgB,GACxB,QAAQ,CA2DV;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,YAAY,EACrB,UAAU,CAAC,EAAE,GAAG,EAChB,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,GACjC,MAAM,GAAG,SAAS,CAcpB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE;IACN,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,WAAW,CAAC;IACnC,QAAQ,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;CACjE,EACD,GAAG,EAAE,MAAM,EACX,GAAG,CAAC,EAAE,MAAM,EACZ,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,EAClC,IAAI,CAAC,EAAE,MAAM,GACZ,MAAM,GAAG,SAAS,CAsDpB"}