@fedify/fedify 2.4.0-dev.2115 → 2.4.0-dev.2122

package/dist/{builder-CZcBWrBd.mjs → builder-BCXywsZF.mjs}

@@ -1,7 +1,7 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-CCABdw7r.mjs";
+import { n as version, t as name } from "./deno-BZrnW0Qz.mjs";
 import { s as isPortableId } from "./portable-key-id-T7lecIbt.mjs";
 import { t as ActivityListenerSet } from "./activity-listener-C-BSbKI7.mjs";
 import { getLogger } from "@logtape/logtape";
@@ -89,7 +89,7 @@ var FederationBuilderImpl = class {
 	* specified.
 	*/
 	async build(options) {
-		const { FederationImpl } = await import("./middleware-U9IuzvDO.mjs");
+		const { FederationImpl } = await import("./middleware-B7bmtONC.mjs");
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -705,7 +705,7 @@ function warnMismatchedTombstoneId(context, cls, values, tombstone) {
 		});
 		return;
 	}
-	if (tombstone.id.protocol === "ap:" || tombstone.id.protocol === "ap+ef61:") return;
+	if (isPortableId(tombstone.id)) return;
 	const expected = context.getObjectUri(cls, values);
 	if (tombstone.id.href !== expected.href) logger.warn("Object dispatcher for {class} returned a tombstone with an id property {tombstoneId} that does not match the object URI {objectUri}.  Set the property with Context.getObjectUri().", {
 		class: cls.name,

package/dist/compat/transformers.test.mjs

@@ -5,7 +5,7 @@ import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-mrXWWNY-.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { E as autoIdAssigner, T as actorDehydrator, n as FederationImpl } from "../middleware-BpwKvOpU.mjs";
+import { E as autoIdAssigner, T as actorDehydrator, n as FederationImpl } from "../middleware-CgOqRkK-.mjs";
 import { Follow, Person } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
 //#region src/compat/transformers.test.ts

package/dist/{compound-proof-CDuP9MIX.mjs → compound-proof-Fxd45Oy5.mjs}

@@ -3,8 +3,8 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { s as isPortableId, t as getCanonicalPortableId } from "./portable-key-id-T7lecIbt.mjs";
 import { n as preloadedOnlyDocumentLoader } from "./public-audience--klBIOk1.mjs";
-import { c as getNormalizationContextLoader } from "./ld-CnT0f1nU.mjs";
-import { a as verifyMapLocalProof, c as verifyPortableObjectProofPolicy } from "./proof-xdPYGPaA.mjs";
+import { c as getNormalizationContextLoader } from "./ld-u4JOD4iO.mjs";
+import { a as verifyMapLocalProof, c as verifyPortableObjectProofPolicy } from "./proof-BCOg7Njv.mjs";
 import { fromCompatibleEf61Id, parseIri } from "@fedify/vocab-runtime";
 import jsonld from "@fedify/vocab-runtime/jsonld";
 //#region src/sig/compound-proof.ts

package/dist/{deno-CCABdw7r.mjs → deno-BZrnW0Qz.mjs}

@@ -3,6 +3,6 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.4.0-dev.2115+e2feaf2b";
+var version = "2.4.0-dev.2122+bdc0ce8d";
 //#endregion
 export { version as n, name as t };

package/dist/{docloader-Bby5g2iu.mjs → docloader-3BHaS20Z.mjs}

@@ -1,8 +1,8 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { c as validateCryptoKey } from "./key-CkNxztNV.mjs";
-import { n as doubleKnock } from "./http-BcLnr2do.mjs";
+import { c as validateCryptoKey } from "./key-PyYvun0F.mjs";
+import { n as doubleKnock } from "./http-B9BQDNIy.mjs";
 import { getLogger } from "@logtape/logtape";
 import { curry } from "es-toolkit";
 import { UrlError, createActivityPubRequest, getRemoteDocument, logRequest, validatePublicUrl } from "@fedify/vocab-runtime";

package/dist/federation/builder.test.mjs

@@ -6,7 +6,7 @@ import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import { t as assertExists } from "../assert_exists-cffSpJ7X.mjs";
 import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import "../std__assert-DvMDRPes.mjs";
-import { r as createFederationBuilder } from "../builder-CZcBWrBd.mjs";
+import { r as createFederationBuilder } from "../builder-BCXywsZF.mjs";
 import { DisallowedOperatorError, DisallowedVarSpecModifierError, DuplicateRouteVariableError, RouteTemplateOptionsNotMatchedError, RouterError } from "@fedify/uri-template";
 import { Activity, Note, Person } from "@fedify/vocab";
 import { test } from "@fedify/fixture";

package/dist/federation/compound-fanout.test.mjs

@@ -6,11 +6,11 @@ import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { n as exportJwk } from "../key-CkNxztNV.mjs";
+import { n as exportJwk } from "../key-PyYvun0F.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "../outgoing-jsonld-4IJqPYos.mjs";
-import { i as signObject, u as verifyProof } from "../proof-xdPYGPaA.mjs";
+import { i as signObject, u as verifyProof } from "../proof-BCOg7Njv.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { n as FederationImpl } from "../middleware-BpwKvOpU.mjs";
+import { n as FederationImpl } from "../middleware-CgOqRkK-.mjs";
 import { Create, DataIntegrityProof, Note } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { exportDidKey, parseIri } from "@fedify/vocab-runtime";

package/dist/federation/handler-compound-proof.test.mjs

@@ -5,10 +5,10 @@ import { r as createRequestContext, t as createInboxContext } from "../context-C
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
-import { a as compactJsonLd, m as verifyCompactJsonLd, p as signJsonLd } from "../ld-CnT0f1nU.mjs";
-import { l as signRequest } from "../http-BcLnr2do.mjs";
+import { a as compactJsonLd, m as verifyCompactJsonLd, p as signJsonLd } from "../ld-u4JOD4iO.mjs";
+import { l as signRequest } from "../http-B9BQDNIy.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, n as ed25519PrivateKey, r as ed25519PublicKey } from "../keys-DIJNHW-Y.mjs";
-import { f as handleInbox, o as createFederation } from "../middleware-BpwKvOpU.mjs";
+import { f as handleInbox, o as createFederation } from "../middleware-CgOqRkK-.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-C-BSbKI7.mjs";
 import { t as map_local_create_note_default } from "../map-local-create-note-B0SeXJms.mjs";
 import { Create } from "@fedify/vocab";

package/dist/federation/handler.test.mjs

@@ -10,12 +10,12 @@ import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
 import { r as parseAcceptSignature } from "../accept-CPVqki78.mjs";
-import { o as generateCryptoKeyPair } from "../key-CkNxztNV.mjs";
-import { a as compactJsonLd, p as signJsonLd } from "../ld-CnT0f1nU.mjs";
-import { i as signObject } from "../proof-xdPYGPaA.mjs";
-import { l as signRequest } from "../http-BcLnr2do.mjs";
+import { o as generateCryptoKeyPair } from "../key-PyYvun0F.mjs";
+import { a as compactJsonLd, p as signJsonLd } from "../ld-u4JOD4iO.mjs";
+import { i as signObject } from "../proof-BCOg7Njv.mjs";
+import { l as signRequest } from "../http-B9BQDNIy.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { d as handleCustomCollection, f as handleInbox, g as respondWithObjectIfAcceptable, h as respondWithObject, l as handleActor, m as handleOutbox, o as createFederation, p as handleObject, u as handleCollection } from "../middleware-BpwKvOpU.mjs";
+import { d as handleCustomCollection, f as handleInbox, g as respondWithObjectIfAcceptable, h as respondWithObject, l as handleActor, m as handleOutbox, o as createFederation, p as handleObject, u as handleCollection } from "../middleware-CgOqRkK-.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-C-BSbKI7.mjs";
 import { Activity, Create, CryptographicKey, Multikey, Note, Person, Tombstone } from "@fedify/vocab";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";

package/dist/federation/hashlink-media.test.mjs

@@ -10,8 +10,8 @@ import "../std__assert-DvMDRPes.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-CYvBmkpC.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
 import { r as ed25519PublicKey } from "../keys-DIJNHW-Y.mjs";
-import { o as createFederation, x as parseHashlinkGatewayRequest } from "../middleware-BpwKvOpU.mjs";
-import { r as createFederationBuilder } from "../builder-CZcBWrBd.mjs";
+import { o as createFederation, x as parseHashlinkGatewayRequest } from "../middleware-CgOqRkK-.mjs";
+import { r as createFederationBuilder } from "../builder-BCXywsZF.mjs";
 import { n as RouterError } from "../router-u5O5KCQr.mjs";
 import { Note } from "@fedify/vocab";
 import { createTestMeterProvider, mockDocumentLoader, test } from "@fedify/fixture";

package/dist/federation/idempotency.test.mjs

@@ -4,9 +4,9 @@ globalThis.addEventListener = () => {};
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
-import { i as signObject } from "../proof-xdPYGPaA.mjs";
+import { i as signObject } from "../proof-BCOg7Njv.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
-import { o as createFederation } from "../middleware-BpwKvOpU.mjs";
+import { o as createFederation } from "../middleware-CgOqRkK-.mjs";
 import { Create, Follow, Person } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 //#region src/federation/idempotency.test.ts

package/dist/federation/metrics.test.mjs

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
-import { _ as recordKeyLookup, a as instrumentDocumentLoader, b as recordWebFingerHandle, c as recordCircuitBreakerStateChange, d as recordCollectionRequest, f as recordCollectionTotalItems, g as recordInboxActivity, h as recordFanoutRecipients, i as getRemoteHost, l as recordCollectionDispatchDuration, m as recordDocumentFetch, p as recordDocumentCache, r as getFederationMetrics, t as classifyFetchError, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "../metrics-em_7lwhG.mjs";
+import { _ as recordKeyLookup, a as instrumentDocumentLoader, b as recordWebFingerHandle, c as recordCircuitBreakerStateChange, d as recordCollectionRequest, f as recordCollectionTotalItems, g as recordInboxActivity, h as recordFanoutRecipients, i as getRemoteHost, l as recordCollectionDispatchDuration, m as recordDocumentFetch, p as recordDocumentCache, r as getFederationMetrics, t as classifyFetchError, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "../metrics-DCLoLvLz.mjs";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 import { FetchError } from "@fedify/vocab-runtime";
 import { DataPointType, MeterProvider, MetricReader } from "@opentelemetry/sdk-metrics";

package/dist/federation/middleware.test.mjs

@@ -16,14 +16,14 @@ import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-CYvBmkpC.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { g as recordInboxActivity } from "../metrics-em_7lwhG.mjs";
-import { a as compactJsonLd, h as verifyJsonLd, p as signJsonLd, s as detachSignature } from "../ld-CnT0f1nU.mjs";
-import { i as signObject, o as verifyObject } from "../proof-xdPYGPaA.mjs";
-import { d as verifyRequest, l as signRequest } from "../http-BcLnr2do.mjs";
+import { g as recordInboxActivity } from "../metrics-DCLoLvLz.mjs";
+import { a as compactJsonLd, h as verifyJsonLd, p as signJsonLd, s as detachSignature } from "../ld-u4JOD4iO.mjs";
+import { i as signObject, o as verifyObject } from "../proof-BCOg7Njv.mjs";
+import { d as verifyRequest, l as signRequest } from "../http-B9BQDNIy.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-Bby5g2iu.mjs";
-import { S as handleBenchmarkTrigger, i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-BpwKvOpU.mjs";
-import { t as doesActorOwnKey } from "../owner-9LiHmOv1.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-3BHaS20Z.mjs";
+import { S as handleBenchmarkTrigger, i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-CgOqRkK-.mjs";
+import { t as doesActorOwnKey } from "../owner-CPFM-sqo.mjs";
 import { t as CircuitBreaker } from "../circuit-breaker-C5NqoLBJ.mjs";
 import { t as TaskCodec } from "../codec-C6rTrpIp.mjs";
 import { t as markCircuitBreakerLegacySweepDone } from "../circuit-breaker-test-utils-DW6YC_Pe.mjs";

package/dist/federation/mod.cjs

@@ -1,6 +1,6 @@
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_federation = require("../federation-DYr384xz.cjs");
+const require_federation = require("../federation-Ml6NrgRV.cjs");
 exports.CircuitBreaker = require_federation.CircuitBreaker;
 exports.InProcessMessageQueue = require_federation.InProcessMessageQueue;
 exports.MemoryKvStore = require_federation.MemoryKvStore;

package/dist/federation/mod.js

@@ -1,6 +1,6 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { a as respondWithObjectIfAcceptable, c as digest, d as parseCircuitBreakerKvState, f as createFederationBuilder, i as respondWithObject, l as CircuitBreaker, n as handleWebFinger, o as SendActivityError, r as createExponentialBackoffPolicy, s as buildCollectionSynchronizationHeader, t as createFederation, u as normalizeCircuitBreakerOptions } from "../middleware-DhIBngkj.js";
+import { a as respondWithObjectIfAcceptable, c as digest, d as parseCircuitBreakerKvState, f as createFederationBuilder, i as respondWithObject, l as CircuitBreaker, n as handleWebFinger, o as SendActivityError, r as createExponentialBackoffPolicy, s as buildCollectionSynchronizationHeader, t as createFederation, u as normalizeCircuitBreakerOptions } from "../middleware-DWlAGlyP.js";
 import { getLogger } from "@logtape/logtape";
 import { Router as Router$1, RouterError as RouterError$1, assertPath, isPath } from "@fedify/uri-template";
 import { isEqual } from "es-toolkit";

package/dist/federation/outgoing-proof.test.mjs

@@ -7,12 +7,12 @@ import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { n as exportJwk } from "../key-CkNxztNV.mjs";
-import { s as detachSignature } from "../ld-CnT0f1nU.mjs";
-import { i as signObject } from "../proof-xdPYGPaA.mjs";
+import { n as exportJwk } from "../key-PyYvun0F.mjs";
+import { s as detachSignature } from "../ld-u4JOD4iO.mjs";
+import { i as signObject } from "../proof-BCOg7Njv.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { c as assertPortableActorActivity, n as FederationImpl, o as createFederation } from "../middleware-BpwKvOpU.mjs";
-import { a as verifyCompoundPortableObjectProofs } from "../compound-proof-CDuP9MIX.mjs";
+import { c as assertPortableActorActivity, n as FederationImpl, o as createFederation } from "../middleware-CgOqRkK-.mjs";
+import { a as verifyCompoundPortableObjectProofs } from "../compound-proof-Fxd45Oy5.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { Create, Note, Person } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";

package/dist/federation/portable-actor.test.mjs

@@ -1,4 +1,4 @@
-import "temporal-polyfill";
+import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
@@ -8,10 +8,10 @@ import { t as assertInstanceOf } from "../assert_instance_of-mrXWWNY-.mjs";
 import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { i as signObject, s as verifyPortableObjectProof } from "../proof-xdPYGPaA.mjs";
-import { d as verifyRequest, l as signRequest } from "../http-BcLnr2do.mjs";
+import { i as signObject, s as verifyPortableObjectProof } from "../proof-BCOg7Njv.mjs";
+import { d as verifyRequest, l as signRequest } from "../http-B9BQDNIy.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-BpwKvOpU.mjs";
+import { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-CgOqRkK-.mjs";
 import { n as RouterError } from "../router-u5O5KCQr.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { Note, Person, Tombstone, lookupObject } from "@fedify/vocab";
@@ -53,6 +53,8 @@ const users = {
 	tampered: did,
 	https: did,
 	tombstone: did,
+	"signed-tombstone": did,
+	"wrong-key-tombstone": did,
 	"mutated-id": did,
 	compatible: did,
 	"a b/ç": did
@@ -88,6 +90,12 @@ function createTestFederation(options = {}) {
 				return await sign(actor.clone({ id: toCompatibleEf61Id(actor.id, ORIGIN) }));
 			}
 			case "tombstone": return new Tombstone({ id: ctx.getPortableActorUri(identifier, userDid) });
+			case "signed-tombstone": return await sign(new Tombstone({
+				id: ctx.getPortableActorUri(identifier, userDid),
+				formerType: Person,
+				deleted: Temporal.Instant.from("2026-01-01T00:00:00Z")
+			}));
+			case "wrong-key-tombstone": return await sign(new Tombstone({ id: ctx.getPortableActorUri(identifier, userDid) }), otherKeyPair.privateKey, otherKeyId);
 			case "unsigned": return await portableActor(ctx, identifier, userDid);
 			case "wrong-key": return await sign(await portableActor(ctx, identifier, userDid), otherKeyPair.privateKey, otherKeyId);
 			case "tampered": return (await sign(await portableActor(ctx, identifier, userDid))).clone({ name: "Tampered" });
@@ -260,6 +268,7 @@ test("Federation.fetch() serves portable actors through the actor dispatcher", a
 			gatewayRequest("/users/missing"),
 			gatewayRequest("/users/https"),
 			gatewayRequest("/users/tombstone"),
+			gatewayRequest("/users/tombstone", { method: "HEAD" }),
 			gatewayRequest("/users/alice", { authority: otherDid }),
 			gatewayRequest("/users/mutated-id")
 		]) {
@@ -278,13 +287,36 @@ test("Federation.fetch() serves portable actors through the actor dispatcher", a
 		for (const identifier of [
 			"unsigned",
 			"wrong-key",
-			"tampered"
+			"tampered",
+			"wrong-key-tombstone"
 		]) {
 			const response = await federation.fetch(gatewayRequest(`/users/${identifier}`), { contextData: void 0 });
 			assertEquals(response.status, 500, identifier);
 			assertEquals(await response.text(), "Internal server error.");
 		}
 	});
+	await t.step("serves a signed tombstone with 410 Gone", async () => {
+		const response = await federation.fetch(gatewayRequest("/users/signed-tombstone"), { contextData: void 0 });
+		assertEquals(response.status, 410);
+		assertEquals(response.headers.get("Content-Type"), PORTABLE_OBJECT_CONTENT_TYPE);
+		assertEquals(response.headers.get("Vary"), "Accept");
+		const json = await response.json();
+		assertEquals(json.type, "Tombstone");
+		assertEquals(json.id, `ap+ef61://${did}/users/signed-tombstone`);
+		assertEquals(json.deleted, "2026-01-01T00:00:00Z");
+		assertEquals((await verifyPortableObjectProof(json, { contextLoader: mockDocumentLoader })).verified, true);
+	});
+	await t.step("responds to HEAD for a tombstone without a body", async () => {
+		const response = await federation.fetch(gatewayRequest("/users/signed-tombstone", { method: "HEAD" }), { contextData: void 0 });
+		assertEquals(response.status, 410);
+		assertEquals(response.headers.get("Content-Type"), PORTABLE_OBJECT_CONTENT_TYPE);
+		assertEquals(response.body, null);
+	});
+	await t.step("keeps ordinary tombstone requests unchanged", async () => {
+		const response = await federation.fetch(new Request(`${ORIGIN}/users/signed-tombstone`, { headers: { Accept: ACCEPT } }), { contextData: void 0 });
+		assertEquals(response.status, 410);
+		assertEquals(response.headers.get("Content-Type"), "application/activity+json");
+	});
 	await t.step("keeps ordinary actor requests unchanged", async () => {
 		const response = await federation.fetch(new Request(`${ORIGIN}/users/https`, { headers: { Accept: ACCEPT } }), { contextData: void 0 });
 		assertEquals(response.status, 200);
@@ -329,6 +361,21 @@ test("Federation.fetch() authorizes portable actor requests", async (t) => {
 		})).status, 401);
 		assertEquals(unauthorized, true);
 	});
+	await t.step("authorizes before serving a tombstone", async () => {
+		for (const identifier of ["signed-tombstone", "tombstone"]) {
+			identifiers.length = 0;
+			let unauthorized = false;
+			assertEquals((await federation.fetch(gatewayRequest(`/users/${identifier}`), {
+				contextData: void 0,
+				onUnauthorized() {
+					unauthorized = true;
+					return new Response("Unauthorized", { status: 401 });
+				}
+			})).status, 401, identifier);
+			assertEquals(unauthorized, true, identifier);
+			assertEquals(identifiers, [identifier]);
+		}
+	});
 	await t.step("denies a request whose target was tampered with", async () => {
 		const signed = await signRequest(gatewayRequest("/users/alice"), rsaPrivateKey3, rsaPublicKey3.id);
 		assertEquals((await federation.fetch(new Request(gatewayUrl("/actor"), { headers: signed.headers }), { contextData: void 0 })).status, 401);

package/dist/federation/portable-gateway-keys.test.mjs

@@ -7,10 +7,10 @@ import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
-import { p as signJsonLd } from "../ld-CnT0f1nU.mjs";
-import { l as signRequest } from "../http-BcLnr2do.mjs";
+import { p as signJsonLd } from "../ld-u4JOD4iO.mjs";
+import { l as signRequest } from "../http-B9BQDNIy.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { f as handleInbox, n as FederationImpl, o as createFederation } from "../middleware-BpwKvOpU.mjs";
+import { f as handleInbox, n as FederationImpl, o as createFederation } from "../middleware-CgOqRkK-.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-C-BSbKI7.mjs";
 import { t as KvKeyCache } from "../keycache-BInaECGj.mjs";
 import { Create, CryptographicKey, Person } from "@fedify/vocab";

package/dist/federation/portable-inbox.test.mjs

@@ -8,11 +8,11 @@ import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { p as signJsonLd } from "../ld-CnT0f1nU.mjs";
-import { i as signObject } from "../proof-xdPYGPaA.mjs";
-import { f as verifyRequestDetailed, l as signRequest } from "../http-BcLnr2do.mjs";
+import { p as signJsonLd } from "../ld-u4JOD4iO.mjs";
+import { i as signObject } from "../proof-BCOg7Njv.mjs";
+import { f as verifyRequestDetailed, l as signRequest } from "../http-B9BQDNIy.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 { _ as coversDelivery, o as createFederation, v as forwardPortableInboxActivity, y as resolvePortableInboxForwardingOptions } from "../middleware-BpwKvOpU.mjs";
+import { _ as coversDelivery, o as createFederation, v as forwardPortableInboxActivity, y as resolvePortableInboxForwardingOptions } from "../middleware-CgOqRkK-.mjs";
 import { Create, CryptographicKey, Follow, Note, Person, Tombstone } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { exportDidKey, formatIri, parseIri } from "@fedify/vocab-runtime";

package/dist/federation/portable.test.mjs

@@ -1,4 +1,4 @@
-import "temporal-polyfill";
+import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.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 { i as signObject, s as verifyPortableObjectProof } from "../proof-xdPYGPaA.mjs";
-import { l as signRequest } from "../http-BcLnr2do.mjs";
+import { i as signObject, s as verifyPortableObjectProof } from "../proof-BCOg7Njv.mjs";
+import { l as signRequest } from "../http-B9BQDNIy.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-BpwKvOpU.mjs";
+import { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-CgOqRkK-.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";
@@ -220,18 +220,6 @@ test("Federation.fetch() applies the FEP-ef61 proof policy to portable objects",
 			inbox: parseIri(`ap+ef61://${did}/objects/unsigned-actor/inbox`),
 			outbox: parseIri(`ap+ef61://${did}/objects/unsigned-actor/outbox`),
 			gateways: [new URL("https://example.com/")]
-		})),
-		"tombstone": () => sign(new Tombstone({
-			id: parseIri(`ap+ef61://${did}/objects/tombstone`),
-			formerType: Note
-		})),
-		"unsigned-tombstone": () => Promise.resolve(new Tombstone({
-			id: parseIri(`ap+ef61://${did}/objects/unsigned-tombstone`),
-			formerType: Note
-		})),
-		"mismatched-tombstone": () => sign(new Tombstone({
-			id: parseIri(`ap+ef61://${did}/objects/other`),
-			formerType: Note
 		}))
 	};
 	federation.setObjectDispatcher(Object$1, "/objects/{id}", (_ctx, { id }) => objects[id]?.() ?? null);
@@ -246,10 +234,7 @@ test("Federation.fetch() applies the FEP-ef61 proof policy to portable objects",
 		"activity": 200,
 		"actor": 200,
 		"mutated-id": 404,
-		"unsigned-actor": 500,
-		"tombstone": 200,
-		"unsigned-tombstone": 500,
-		"mismatched-tombstone": 404
+		"unsigned-actor": 500
 	})) await t.step(`${id} → ${status}`, async () => {
 		const response = await federation.fetch(gatewayRequest(`/objects/${id}`), { contextData: void 0 });
 		assertEquals(response.status, status);
@@ -260,17 +245,129 @@ test("Federation.fetch() applies the FEP-ef61 proof policy to portable objects",
 		assertEquals(response.status, 500);
 		assertEquals(response.body, null);
 	});
-	await t.step("serves a signed tombstone with its body", async () => {
-		const response = await federation.fetch(gatewayRequest("/objects/tombstone"), { contextData: void 0 });
-		assertEquals(response.status, 200);
-		const body = await response.json();
-		assertEquals(body.type, "Tombstone");
-		assertEquals(body.id, `ap+ef61://${did}/objects/tombstone`);
+});
+test("Federation.fetch() serves tombstones of portable objects", async (t) => {
+	const federation = createTestFederation();
+	const compatible = (path) => new URL(`https://example.com/.well-known/apgateway/${did}${path}`);
+	const tombstoneFromJsonLd = (path, properties) => Tombstone.fromJsonLd({
+		"@context": "https://www.w3.org/ns/activitystreams",
+		type: "Tombstone",
+		id: `ap+ef61://${did}${path}`,
+		...properties
+	}, {
+		contextLoader: mockDocumentLoader,
+		documentLoader: mockDocumentLoader
 	});
-	await t.step("responds to HEAD for a tombstone without a body", async () => {
-		const response = await federation.fetch(gatewayRequest("/objects/tombstone", { method: "HEAD" }), { contextData: void 0 });
-		assertEquals(response.status, 200);
-		assertEquals(response.body, null);
+	const tombstones = {
+		"signed": () => sign(new Tombstone({
+			id: parseIri(`ap+ef61://${did}/notes/signed`),
+			formerType: Note,
+			deleted: Temporal.Instant.from("2026-01-01T00:00:00Z")
+		})),
+		"compatible": () => sign(new Tombstone({
+			id: compatible("/notes/compatible"),
+			formerType: Note
+		})),
+		"signed-collection": async () => sign(await tombstoneFromJsonLd("/notes/signed-collection", { totalItems: 0 })),
+		"unsigned": () => Promise.resolve(new Tombstone({
+			id: parseIri(`ap+ef61://${did}/notes/unsigned`),
+			formerType: Note
+		})),
+		"wrong-did": () => sign(new Tombstone({ id: parseIri(`ap+ef61://${did}/notes/wrong-did`) }), otherKeyPair.privateKey, otherKeyId),
+		"tampered": async () => (await sign(new Tombstone({ id: parseIri(`ap+ef61://${did}/notes/tampered`) }))).clone({ formerType: Note }),
+		"unsigned-collection": () => tombstoneFromJsonLd("/notes/unsigned-collection", { totalItems: 0 }),
+		"link": () => tombstoneFromJsonLd("/notes/link", { href: "https://example.com/" }),
+		"mismatched": () => sign(new Tombstone({ id: parseIri(`ap+ef61://${did}/notes/other`) })),
+		"mutated-id": async () => {
+			const signed = await sign(new Tombstone({ id: parseIri(`ap+ef61://${did}/notes/original`) }));
+			const tombstone = await Tombstone.fromJsonLd(await signed.toJsonLd({ contextLoader: mockDocumentLoader }), {
+				contextLoader: mockDocumentLoader,
+				documentLoader: mockDocumentLoader
+			});
+			tombstone.id.pathname = tombstone.id.pathname.replace(/original$/, "mutated-id");
+			return tombstone;
+		}
+	};
+	federation.setObjectDispatcher(Note, "/notes/{id}", (_ctx, { id }) => tombstones[id]?.() ?? null).authorize((ctx) => ctx.request.headers.get("X-Deny") == null);
+	for (const [id, reason] of globalThis.Object.entries({
+		"unsigned": "missingProof",
+		"wrong-did": "verificationMethodMismatch",
+		"tampered": "invalidProof",
+		"unsigned-collection": "unsecuredCollection",
+		"link": "unsupportedObjectType"
+	})) {
+		const result = await verifyPortableObjectProof(await (await tombstones[id]()).toJsonLd({ contextLoader: mockDocumentLoader }), { contextLoader: mockDocumentLoader });
+		assert(!result.verified, id);
+		assertEquals(result.reason.type, reason, id);
+	}
+	for (const [id, status] of globalThis.Object.entries({
+		"signed": 410,
+		"compatible": 410,
+		"signed-collection": 410,
+		"unsigned": 404,
+		"wrong-did": 500,
+		"tampered": 500,
+		"unsigned-collection": 500,
+		"link": 500,
+		"mismatched": 404,
+		"mutated-id": 404
+	})) await t.step(`${id} → ${status}`, async () => {
+		let notFound = false;
+		const response = await federation.fetch(gatewayRequest(`/notes/${id}`), {
+			contextData: void 0,
+			onNotFound() {
+				notFound = true;
+				return new Response("Not found", { status: 404 });
+			}
+		});
+		assertEquals(response.status, status);
+		assertEquals(notFound, status === 404);
+		if (status === 410) {
+			assertEquals(response.headers.get("Content-Type"), PORTABLE_OBJECT_CONTENT_TYPE);
+			assertEquals(response.headers.get("Vary"), "Accept");
+			const body = await response.json();
+			assertEquals(body.type, "Tombstone");
+			assert((await verifyPortableObjectProof(body, { contextLoader: mockDocumentLoader })).verified);
+		} else if (status === 500) assertEquals(await response.text(), "Internal server error.");
+	});
+	await t.step("serves the tombstone as the dispatcher returns it", async () => {
+		let response = await federation.fetch(gatewayRequest("/notes/signed"), { contextData: void 0 });
+		let body = await response.json();
+		assertEquals(body.id, `ap+ef61://${did}/notes/signed`);
+		assertEquals(body.formerType, "as:Note");
+		assertEquals(body.deleted, "2026-01-01T00:00:00Z");
+		response = await federation.fetch(gatewayRequest("/notes/compatible"), { contextData: void 0 });
+		body = await response.json();
+		assertEquals(body.id, compatible("/notes/compatible").href);
+	});
+	await t.step("responds to HEAD without a body", async () => {
+		for (const [id, status] of [["signed", 410], ["unsigned", 404]]) {
+			const response = await federation.fetch(gatewayRequest(`/notes/${id}`, { method: "HEAD" }), { contextData: void 0 });
+			assertEquals(response.status, status, id);
+			assertEquals(response.body, null, id);
+			if (status === 410) {
+				assertEquals(response.headers.get("Content-Type"), PORTABLE_OBJECT_CONTENT_TYPE);
+				assertEquals(response.headers.get("Vary"), "Accept");
+			}
+		}
+	});
+	await t.step("authorizes before serving a tombstone", async () => {
+		for (const id of ["signed", "unsigned"]) {
+			let unauthorized = false;
+			assertEquals((await federation.fetch(gatewayRequest(`/notes/${id}`, { headers: { "X-Deny": "1" } }), {
+				contextData: void 0,
+				onUnauthorized() {
+					unauthorized = true;
+					return new Response("Unauthorized", { status: 401 });
+				}
+			})).status, 401, id);
+			assertEquals(unauthorized, true, id);
+		}
+	});
+	await t.step("does not warn about tombstones with compatible IDs", async () => {
+		assertEquals((await captureWarnings(async () => {
+			assertEquals((await federation.fetch(gatewayRequest("/notes/compatible"), { contextData: void 0 })).status, 410);
+		})).filter((record) => record.category[2] === "object"), []);
 	});
 });
 test("Federation.fetch() authorizes portable object requests", async (t) => {

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-BcLnr2do.mjs";
+import { d as verifyRequest } from "../http-B9BQDNIy.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-9LiHmOv1.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-Bf8rSWch.mjs";
+import { t as doesActorOwnKey } from "../owner-CPFM-sqo.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-C8eOPat3.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-dbCShlCb.mjs";
 import "../../testing-BWq1dCzx.mjs";
-import { o as createFederation } from "../../middleware-BpwKvOpU.mjs";
+import { o as createFederation } from "../../middleware-CgOqRkK-.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-dbCShlCb.mjs";
 import "../../testing-BWq1dCzx.mjs";
-import { o as createFederation } from "../../middleware-BpwKvOpU.mjs";
-import { r as createFederationBuilder } from "../../builder-CZcBWrBd.mjs";
+import { o as createFederation } from "../../middleware-CgOqRkK-.mjs";
+import { r as createFederationBuilder } from "../../builder-BCXywsZF.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-tAtwv6vX.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "../temporal-vjHOhBpy.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/temporal.test.ts
 test("hasMalformedKnownTemporalLiteral() detects expanded proof timestamps", async () => {