@fedify/fedify 2.4.0-dev.2157 → 2.4.0-dev.2164

package/dist/federation/portable-parse-uri.test.mjs

@@ -0,0 +1,348 @@
+import "temporal-polyfill";
+import "urlpattern-polyfill";
+globalThis.addEventListener = () => {};
+import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
+import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
+import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
+import "../std__assert-DvMDRPes.mjs";
+import { t as assert } from "../assert-D1Eafmd_.mjs";
+import { r as ed25519PublicKey } from "../keys-DIJNHW-Y.mjs";
+import { o as createFederation } from "../middleware-B99JjvFn.mjs";
+import { Note, Object as Object$1, Person } from "@fedify/vocab";
+import { test } from "@fedify/fixture";
+import { exportDidKey, parseIri } from "@fedify/vocab-runtime";
+//#region src/federation/portable-parse-uri.test.ts
+const did = await exportDidKey(ed25519PublicKey.publicKey);
+const otherDid = await exportDidKey((await crypto.subtle.generateKey("Ed25519", true, ["sign", "verify"])).publicKey);
+const encodedDid = encodeURIComponent(did);
+const ORIGIN = "https://example.com";
+const NOTE_TYPE_ID = new URL("https://www.w3.org/ns/activitystreams#Note");
+const OBJECT_TYPE_ID = new URL("https://www.w3.org/ns/activitystreams#Object");
+function createTestFederation() {
+	const calls = [];
+	const federation = createFederation({ kv: new MemoryKvStore() });
+	federation.setActorDispatcher("/users/{identifier}", (_ctx, identifier) => {
+		calls.push(`actor:${identifier}`);
+		return new Person({});
+	}).mapActorAlias("/bot", "bot").mapPortableActorId((_ctx, identifier) => {
+		calls.push(`portableActorId:${identifier}`);
+		return null;
+	});
+	federation.setObjectDispatcher(Note, "/users/{identifier}/notes/{id}", () => {
+		calls.push("object");
+		return null;
+	});
+	federation.setInboxListeners("/users/{identifier}/inbox", "/inbox");
+	federation.setOutboxDispatcher("/users/{identifier}/outbox", () => null);
+	federation.setFollowingDispatcher("/users/{identifier}/following", () => null);
+	federation.setFollowersDispatcher("/users/{identifier}/followers", () => null);
+	federation.setLikedDispatcher("/users/{identifier}/liked", () => null);
+	federation.setFeaturedDispatcher("/users/{identifier}/featured", () => null);
+	federation.setFeaturedTagsDispatcher("/users/{identifier}/tags", () => null);
+	federation.setCollectionDispatcher("bookmarks", Object$1, "/users/{identifier}/bookmarks", () => null).mapPortableOwner((_ctx, values) => {
+		calls.push(`portableOwner:${values.identifier}`);
+		return values.identifier;
+	});
+	federation.setOrderedCollectionDispatcher("pins", Note, "/users/{identifier}/pins", () => null);
+	return {
+		federation,
+		ctx: federation.createContext(new URL(ORIGIN)),
+		calls
+	};
+}
+function portableId(path, authority = did) {
+	return parseIri(`ap+ef61://${authority}${path}`);
+}
+function compatibleId(path, origin = ORIGIN, authority = did) {
+	return new URL(`${origin}/.well-known/apgateway/${authority}${path}`);
+}
+function parsePortable(ctx, uri) {
+	return ctx.parseUri(uri, { portable: true });
+}
+test("Context.parseUri() does not recognize portable IDs by default", () => {
+	const { ctx } = createTestFederation();
+	for (const uri of [
+		portableId("/users/alice"),
+		parseIri(`ap://${did}/users/alice`),
+		compatibleId("/users/alice"),
+		compatibleId("/users/alice", "https://gateway.example")
+	]) {
+		assertEquals(ctx.parseUri(uri), null, uri.href);
+		assertEquals(ctx.parseUri(uri, {}), null, uri.href);
+		assertEquals(ctx.parseUri(uri, { portable: false }), null, uri.href);
+	}
+});
+test("Context.parseUri() keeps the results of ordinary URIs", () => {
+	const { ctx } = createTestFederation();
+	for (const path of [
+		"/users/alice",
+		"/bot",
+		"/users/alice/notes/123",
+		"/inbox",
+		"/users/alice/inbox",
+		"/users/alice/outbox",
+		"/users/alice/following",
+		"/users/alice/followers",
+		"/users/alice/liked",
+		"/users/alice/featured",
+		"/users/alice/tags",
+		"/users/alice/bookmarks",
+		"/users/alice/pins",
+		"/nowhere"
+	]) {
+		const uri = new URL(path, ORIGIN);
+		const result = ctx.parseUri(uri);
+		assertEquals(parsePortable(ctx, uri), result, path);
+		if (result != null) assertFalse("authority" in result, path);
+	}
+	assertEquals(parsePortable(ctx, new URL("https://other.example/users/alice")), null);
+	assertEquals(ctx.parseUri(null, { portable: true }), null);
+});
+test("Context.parseUri() recognizes portable IDs", () => {
+	const { ctx, calls } = createTestFederation();
+	const identifier = "alice";
+	const cases = [
+		["/users/alice", {
+			type: "actor",
+			identifier,
+			authority: did
+		}],
+		["/bot", {
+			type: "actor",
+			identifier: "bot",
+			authority: did
+		}],
+		["/users/alice/notes/123", {
+			type: "object",
+			class: Note,
+			typeId: NOTE_TYPE_ID,
+			values: {
+				identifier,
+				id: "123"
+			},
+			authority: did
+		}],
+		["/users/alice/inbox", {
+			type: "inbox",
+			identifier,
+			authority: did
+		}],
+		["/users/alice/outbox", {
+			type: "outbox",
+			identifier,
+			authority: did
+		}],
+		["/users/alice/following", {
+			type: "following",
+			identifier,
+			authority: did
+		}],
+		["/users/alice/followers", {
+			type: "followers",
+			identifier,
+			authority: did
+		}],
+		["/users/alice/liked", {
+			type: "liked",
+			identifier,
+			authority: did
+		}],
+		["/users/alice/featured", {
+			type: "featured",
+			identifier,
+			authority: did
+		}],
+		["/users/alice/tags", {
+			type: "featuredTags",
+			identifier,
+			authority: did
+		}],
+		["/users/alice/bookmarks", {
+			type: "collection",
+			name: "bookmarks",
+			class: Object$1,
+			typeId: OBJECT_TYPE_ID,
+			values: { identifier },
+			authority: did
+		}],
+		["/users/alice/pins", {
+			type: "orderedCollection",
+			name: "pins",
+			class: Note,
+			typeId: NOTE_TYPE_ID,
+			values: { identifier },
+			authority: did
+		}]
+	];
+	for (const [path, expected] of cases) for (const uri of [
+		portableId(path),
+		parseIri(`ap://${did}${path}`),
+		new URL(`ap+ef61://${encodedDid}${path}`),
+		new URL(`ap://${encodedDid}${path}`),
+		compatibleId(path),
+		compatibleId(path, "https://gateway.example"),
+		compatibleId(path, "http://localhost:8000")
+	]) assertEquals(parsePortable(ctx, uri), expected, uri.href);
+	assertEquals(calls, []);
+});
+test("Context.parseUri() round-trips the portable ID helpers", () => {
+	const { ctx } = createTestFederation();
+	const uris = [
+		[ctx.getPortableActorUri("alice", did), "actor"],
+		[ctx.getPortableObjectUri(Note, {
+			identifier: "alice",
+			id: "1"
+		}, did), "object"],
+		[ctx.getPortableInboxUri("alice", did), "inbox"],
+		[ctx.getPortableOutboxUri("alice", did), "outbox"],
+		[ctx.getPortableFollowingUri("alice", did), "following"],
+		[ctx.getPortableFollowersUri("alice", did), "followers"],
+		[ctx.getPortableLikedUri("alice", did), "liked"],
+		[ctx.getPortableFeaturedUri("alice", did), "featured"],
+		[ctx.getPortableFeaturedTagsUri("alice", did), "featuredTags"],
+		[ctx.getPortableCollectionUri("bookmarks", { identifier: "alice" }, did), "collection"],
+		[ctx.getPortableCollectionUri("pins", { identifier: "alice" }, did), "orderedCollection"]
+	];
+	for (const [uri, type] of uris) {
+		const result = parsePortable(ctx, uri);
+		assertEquals(result?.type, type, uri.href);
+		assertEquals(result?.authority, did, uri.href);
+	}
+});
+test("Context.parseUri() returns any DID for the caller to check", () => {
+	const { ctx } = createTestFederation();
+	assertEquals(parsePortable(ctx, portableId("/users/alice", otherDid)), {
+		type: "actor",
+		identifier: "alice",
+		authority: otherDid
+	});
+	assertEquals(parsePortable(ctx, compatibleId("/users/alice", "https://gateway.example", otherDid)), {
+		type: "actor",
+		identifier: "alice",
+		authority: otherDid
+	});
+	assertEquals(parsePortable(ctx, portableId("/users/alice", "did:web:example.com")), {
+		type: "actor",
+		identifier: "alice",
+		authority: "did:web:example.com"
+	});
+	assertEquals(parsePortable(ctx, parseIri(`ap://DID:KEY:${did.slice(8)}/users/alice`)), {
+		type: "actor",
+		identifier: "alice",
+		authority: did
+	});
+	assertEquals(parsePortable(ctx, new URL(`ap://DID%3Akey%3A${did.slice(8)}/users/alice`)), {
+		type: "actor",
+		identifier: "alice",
+		authority: did
+	});
+});
+test("Context.parseUri() ignores the query and fragment of portable IDs", () => {
+	const { ctx } = createTestFederation();
+	const expected = {
+		type: "actor",
+		identifier: "alice",
+		authority: did
+	};
+	const hint = "@gateway=https%3A%2F%2Fgateway.example";
+	for (const uri of [
+		parseIri(`ap://${did}/users/alice?${hint}`),
+		portableId("/users/alice#main-key"),
+		new URL(`${compatibleId("/users/alice").href}?${hint}`),
+		new URL(`${compatibleId("/users/alice").href}#main-key`)
+	]) assertEquals(parsePortable(ctx, uri), expected, uri.href);
+});
+test("Context.parseUri() routes portable paths like ordinary ones", () => {
+	const { ctx } = createTestFederation();
+	for (const path of [
+		"/users/alice/",
+		"/users/alice/notes/",
+		"/users"
+	]) {
+		const ordinary = ctx.parseUri(new URL(path, ORIGIN));
+		const expected = ordinary == null ? null : {
+			...ordinary,
+			authority: did
+		};
+		assertEquals(parsePortable(ctx, portableId(path)), expected, path);
+		assertEquals(parsePortable(ctx, compatibleId(path)), expected, path);
+	}
+});
+test("Context.parseUri() does not recognize unroutable portable IDs", () => {
+	const { ctx } = createTestFederation();
+	for (const uri of [
+		portableId("/nowhere"),
+		compatibleId("/nowhere"),
+		portableId("/inbox"),
+		compatibleId("/inbox"),
+		compatibleId("/inbox", "https://gateway.example"),
+		new URL(`${ORIGIN}/.well-known/apgateway`),
+		new URL(`${ORIGIN}/.well-known/apgateway/users/alice`),
+		new URL(`${ORIGIN}/.well-known/apgateway/hl:zQmdfTbBqBPQ7VNxZEYEj14VmRuZBkqFbiwReogJgS1zR1n`)
+	]) assertEquals(parsePortable(ctx, uri), null, uri.href);
+});
+test("Context.parseUri() does not recognize malformed portable IDs", () => {
+	const { ctx } = createTestFederation();
+	const base64UrlDid = `did:key:u${did.slice(8).slice(1)}`;
+	for (const uri of [
+		new URL(`ap+ef61://${encodeURIComponent(base64UrlDid)}/users/alice`),
+		compatibleId("/users/alice", ORIGIN, base64UrlDid),
+		new URL("ap+ef61://did%3Akey/users/alice"),
+		new URL("ap+ef61://example.com/users/alice"),
+		compatibleId("/users/alice", ORIGIN, "did:"),
+		compatibleId("/users/alice", "https://gateway.example", "did:key"),
+		new URL(`ap+ef61://${encodedDid}/users/%ZZ`),
+		new URL(`${compatibleId("/users/").href}%ZZ`),
+		new URL(`ap+ef61://user:pass@${encodedDid}/users/alice`),
+		new URL(`https://user:pass@gateway.example/.well-known/apgateway/${did}/users/alice`)
+	]) assertEquals(parsePortable(ctx, uri), null, uri.href);
+});
+test("Context.parseUri() prefers the application's routes", () => {
+	const federation = createFederation({ kv: new MemoryKvStore() });
+	federation.setActorDispatcher("/users/{identifier}", () => null);
+	federation.setObjectDispatcher(Note, "/.well-known/apgateway/{+did}/users/{identifier}/notes/{id}", () => null);
+	federation.setNodeInfoDispatcher(`/.well-known/apgateway/${did}/users/alice`, () => ({
+		software: {
+			name: "test",
+			version: "1.0.0"
+		},
+		protocols: ["activitypub"],
+		usage: {
+			users: {},
+			localPosts: 0,
+			localComments: 0
+		}
+	}));
+	const ctx = federation.createContext(new URL(ORIGIN));
+	assertEquals(parsePortable(ctx, compatibleId("/users/alice")), null);
+	assertEquals(parsePortable(ctx, compatibleId("/users/alice", "https://gateway.example")), {
+		type: "actor",
+		identifier: "alice",
+		authority: did
+	});
+	const note = parsePortable(ctx, compatibleId("/users/alice/notes/1"));
+	assert(note?.type === "object");
+	assertEquals(note.values, {
+		did,
+		identifier: "alice",
+		id: "1"
+	});
+	assertFalse("authority" in note);
+	assertEquals(parsePortable(ctx, portableId("/users/alice")), {
+		type: "actor",
+		identifier: "alice",
+		authority: did
+	});
+});
+test("RequestContext.parseUri() recognizes portable IDs", () => {
+	const { federation } = createTestFederation();
+	const ctx = federation.createContext(new Request(compatibleId("/users/alice")), void 0);
+	assertEquals(ctx.parseUri(portableId("/users/alice")), null);
+	assertEquals(ctx.parseUri(portableId("/users/alice", otherDid), { portable: true }), {
+		type: "actor",
+		identifier: "alice",
+		authority: otherDid
+	});
+});
+//#endregion
+export {};

package/dist/federation/portable.test.mjs

@@ -8,10 +8,10 @@ import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-CYvBmkpC.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { a as signObject, c as verifyPortableObjectProof } from "../proof-C2YwD8a_.mjs";
-import { l as signRequest } from "../http-CGcLv8rh.mjs";
+import { a as signObject, c as verifyPortableObjectProof } from "../proof-CRTPWbVh.mjs";
+import { l as signRequest } from "../http-DRH0n8TD.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-xdukzV3x.mjs";
+import { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-B99JjvFn.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { Collection, Create, Note, Object as Object$1, Person, Tombstone, lookupObject } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";

package/dist/federation/send.test.mjs

@@ -10,10 +10,10 @@ import { t as assertNotEquals } from "../assert_not_equals-CpPK2t89.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { d as verifyRequest } from "../http-CGcLv8rh.mjs";
+import { d as verifyRequest } from "../http-DRH0n8TD.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
-import { t as doesActorOwnKey } from "../owner-D63yPo_i.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-D9SGhxTB.mjs";
+import { t as doesActorOwnKey } from "../owner-DKdtsrEq.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-2dULlZc8.mjs";
 import { Activity, Application, Endpoints, Group, Person, Service } from "@fedify/vocab";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, UrlError } from "@fedify/vocab-runtime";

package/dist/federation/tasks/enqueue.test.mjs

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import { t as MemoryKvStore } from "../../kv-DCHkaJ9-.mjs";
 import { a as numberSchema, i as makeSchema, n as baseOptions, o as stringSchema, t as MockQueue } from "../../tasks-IG3pHfvZ.mjs";
 import "../../testing-C1itIjqW.mjs";
-import { o as createFederation } from "../../middleware-xdukzV3x.mjs";
+import { o as createFederation } from "../../middleware-B99JjvFn.mjs";
 import { n as ParallelMessageQueue } from "../../mq-Dm1Wmtm-.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { delay } from "es-toolkit";

package/dist/federation/tasks/tasks.test.mjs

@@ -4,8 +4,8 @@ globalThis.addEventListener = () => {};
 import { t as MemoryKvStore } from "../../kv-DCHkaJ9-.mjs";
 import { a as numberSchema, i as makeSchema, n as baseOptions, o as stringSchema, t as MockQueue } from "../../tasks-IG3pHfvZ.mjs";
 import "../../testing-C1itIjqW.mjs";
-import { o as createFederation } from "../../middleware-xdukzV3x.mjs";
-import { r as createFederationBuilder } from "../../builder-CLaS4-yA.mjs";
+import { o as createFederation } from "../../middleware-B99JjvFn.mjs";
+import { r as createFederationBuilder } from "../../builder-BqRmnx7p.mjs";
 import { t as TaskCodec } from "../../codec-C6rTrpIp.mjs";
 import { t as InProcessMessageQueue } from "../../mq-Dm1Wmtm-.mjs";
 import { W3CTraceContextPropagator } from "@opentelemetry/core";

package/dist/federation/temporal.test.mjs

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { t as hasMalformedKnownTemporalLiteral } from "../temporal-q6FSekcN.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "../temporal-Dhsk6aUT.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/temporal.test.ts
 test("hasMalformedKnownTemporalLiteral() detects expanded proof timestamps", async () => {

package/dist/federation/webfinger.test.mjs

@@ -6,7 +6,7 @@ import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import { t as assertNotEquals } from "../assert_not_equals-CpPK2t89.mjs";
 import "../std__assert-DvMDRPes.mjs";
-import { o as createFederation, s as handleWebFinger } from "../middleware-xdukzV3x.mjs";
+import { o as createFederation, s as handleWebFinger } from "../middleware-B99JjvFn.mjs";
 import { Image, Link, Person, Tombstone } from "@fedify/vocab";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 import { parseIri } from "@fedify/vocab-runtime";

package/dist/{federation-2e8XrN7q.cjs → federation-DFCnp94y.cjs}

@@ -1,10 +1,10 @@
 const { URLPattern } = require("urlpattern-polyfill");
 const require_rolldown_runtime = require("./rolldown-runtime-Dmm3t92W.cjs");
 const require_transformers = require("./transformers-BalCrSsr.cjs");
-const require_http = require("./http-BObQoB0j.cjs");
+const require_http = require("./http-R4g1McwE.cjs");
 const require_types = require("./types-poIao40f.cjs");
-const require_portable_collection = require("./portable-collection-B8ojoQ50.cjs");
-const require_kv_cache = require("./kv-cache-D2fnB8qu.cjs");
+const require_portable_collection = require("./portable-collection-UajqDrSL.cjs");
+const require_kv_cache = require("./kv-cache-Ct-KWRta.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_uri_template = require("@fedify/uri-template");
 let _fedify_vocab = require("@fedify/vocab");
@@ -2497,10 +2497,13 @@ async function routeActivity({ context: ctx, json, originalJson, normalizedActiv
 const Temporal$9 = require_http.Temporal;
 const KEY_CACHE_GENERATION = "2";
 const COMPATIBLE_KEY_SEGMENT = "__compatible";
-const MAX_COMPATIBLE_KEY_TTL = Temporal$9.Duration.from({ hours: 1 });
+const MAX_OWNER_BYTES = 32 * 1024;
 function isCompatibleKeyEntry(value) {
 	return value != null && typeof value === "object" && "key" in value && "expires" in value && typeof value.expires === "number";
 }
+function isJsonObject(value) {
+	return value != null && typeof value === "object" && !Array.isArray(value);
+}
 var KvKeyCache = class {
 	kv;
 	prefix;
@@ -2582,30 +2585,48 @@ var KvKeyCache = class {
 			keyId.href
 		];
 		const isExpired = (entry) => entry.expires <= now().epochMilliseconds;
-		const keyTtl = Math.min(this.keyTtl.total("millisecond"), MAX_COMPATIBLE_KEY_TTL.total("millisecond"));
+		const keyTtl = Math.min(this.keyTtl.total("millisecond"), require_http.MAX_PORTABLE_KEY_TTL.total("millisecond"));
 		const unavailableKeyTtl = this.unavailableKeyTtl.total("millisecond");
-		return {
-			get: async (keyId) => {
-				const entry = await this.kv.get(entryKey(keyId));
-				if (entry === void 0) return void 0;
-				if (!isCompatibleKeyEntry(entry) || isExpired(entry)) {
-					await this.kv.delete(entryKey(keyId));
-					return;
-				}
-				if (entry.key === null) return null;
-				let key;
+		const getEntry = async (keyId) => {
+			const entry = await this.kv.get(entryKey(keyId));
+			if (entry === void 0) return void 0;
+			if (!isCompatibleKeyEntry(entry) || isExpired(entry)) {
+				await this.kv.delete(entryKey(keyId));
+				return;
+			}
+			if (entry.key === null) return null;
+			let expires;
+			try {
+				expires = Temporal$9.Instant.fromEpochMilliseconds(entry.expires);
+			} catch (error) {
+				if (!(error instanceof RangeError)) throw error;
+				await this.kv.delete(entryKey(keyId));
+				return;
+			}
+			let key;
+			try {
+				key = await _fedify_vocab.CryptographicKey.fromJsonLd(entry.key, this.options);
+			} catch {
 				try {
-					key = await _fedify_vocab.CryptographicKey.fromJsonLd(entry.key, this.options);
+					key = await _fedify_vocab.Multikey.fromJsonLd(entry.key, this.options);
 				} catch {
-					try {
-						key = await _fedify_vocab.Multikey.fromJsonLd(entry.key, this.options);
-					} catch {
-						await this.kv.delete(entryKey(keyId));
-						return;
-					}
+					await this.kv.delete(entryKey(keyId));
+					return;
 				}
-				return isExpired(entry) ? void 0 : key;
+			}
+			if (isExpired(entry)) return void 0;
+			return {
+				key,
+				...isJsonObject(entry.owner) ? { owner: entry.owner } : {},
+				expires
+			};
+		};
+		return {
+			get: async (keyId) => {
+				const entry = await getEntry(keyId);
+				return entry == null ? entry : entry.key;
 			},
+			getEntry,
 			set: async (keyId, key, options) => {
 				const serialized = key == null ? null : await key.toJsonLd(this.options);
 				const current = now();
@@ -2616,10 +2637,13 @@ var KvKeyCache = class {
 					await this.kv.delete(entryKey(keyId));
 					return;
 				}
+				const owner = key == null || options?.owner == null || new TextEncoder().encode(JSON.stringify(options.owner)).length > MAX_OWNER_BYTES ? void 0 : options.owner;
 				await this.kv.set(entryKey(keyId), {
 					key: serialized,
-					expires
+					expires,
+					...owner == null ? {} : { owner }
 				}, { ttl: Temporal$9.Duration.from({ milliseconds: ttl }) });
+				return key == null ? void 0 : Temporal$9.Instant.fromEpochMilliseconds(expires);
 			},
 			delete: async (keyId) => {
 				await this.kv.delete(entryKey(keyId));
@@ -2823,6 +2847,43 @@ function parsePortableGatewayRequest(url) {
 	};
 }
 /**
+* Recognizes an FEP-ef61 portable ID, i.e., an `ap:` or `ap+ef61:` URI, or
+* a compatible identifier on any gateway, and splits it into its DID and
+* the object path to route.
+*
+* It accepts the same IDs as the gateway endpoint does: the query, e.g.,
+* location hints, and the fragment are ignored, and a malformed DID, or
+* a `did:key` DID that is not encoded in base58-btc, is refused.
+*
+* @param uri The ID to recognize.
+* @returns The DID normalized as an FEP-fe34 origin, and the object path,
+*          or `null` if the ID is not a portable ID or is malformed.
+*/
+function parsePortableId(uri) {
+	if (uri.username !== "" || uri.password !== "") return null;
+	if (uri.protocol !== "ap:" && uri.protocol !== "ap+ef61:") {
+		const request = parsePortableGatewayRequest(uri);
+		if (request?.type !== "object") return null;
+		return {
+			authority: request.portableRequest.authority,
+			path: request.path
+		};
+	}
+	try {
+		const id = (0, _fedify_vocab_runtime.parseIri)(uri);
+		(0, _fedify_vocab_runtime.canonicalizePortableUri)((0, _fedify_vocab_runtime.formatIri)(id));
+		const authority = (0, _fedify_vocab_runtime.getFe34Origin)(id);
+		assertBase58BtcDidKey(authority);
+		return {
+			authority,
+			path: id.pathname
+		};
+	} catch (error) {
+		if (error instanceof TypeError) return null;
+		throw error;
+	}
+}
+/**
 * Builds a portable ID from a DID authority and an object path.
 * @param authority The bare DID, e.g., `did:key:z6Mk...`.
 * @param path The object path, e.g., `/notes/123`.
@@ -9484,12 +9545,25 @@ var ContextImpl = class ContextImpl {
 		if (path === null) throw new _fedify_uri_template.RouterError(`No collection dispatcher registered for "${String(name)}".`);
 		return buildPortableUri(requirePortableAuthority(authority), path);
 	}
-	parseUri(uri) {
+	parseUri(uri, options = {}) {
 		if (uri == null) return null;
-		if (uri.origin !== this.origin && uri.origin !== this.canonicalOrigin) return null;
-		const route = this.federation.router.route(uri.pathname);
-		if (route == null) return null;
-		else if (route.name === "sharedInbox") return {
+		if (uri.origin === this.origin || uri.origin === this.canonicalOrigin) {
+			const route = this.federation.router.route(uri.pathname);
+			if (route != null) return this.#parseRoute(route);
+		}
+		if (!options.portable) return null;
+		const portable = parsePortableId(uri);
+		if (portable == null) return null;
+		const route = this.federation.router.route(portable.path);
+		if (route == null || route.name === "sharedInbox") return null;
+		const result = this.#parseRoute(route);
+		return result == null ? null : {
+			...result,
+			authority: portable.authority
+		};
+	}
+	#parseRoute(route) {
+		if (route.name === "sharedInbox") return {
 			type: "inbox",
 			identifier: void 0
 		};