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

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

@@ -7,15 +7,15 @@ 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-wiJbqJHa.mjs";
-import { l as signRequest } from "../http-BU-8fUrz.mjs";
+import { p as signJsonLd } from "../ld-CnT0f1nU.mjs";
+import { l as signRequest } from "../http-BcLnr2do.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-FnITXhtz.mjs";
+import { f as handleInbox, n as FederationImpl, o as createFederation } from "../middleware-BpwKvOpU.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-C-BSbKI7.mjs";
-import { t as KvKeyCache } from "../keycache-BUDHB5rY.mjs";
+import { t as KvKeyCache } from "../keycache-BInaECGj.mjs";
 import { Create, CryptographicKey, Person } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
-import { encodeMultibase, exportDidKey, parseIri } from "@fedify/vocab-runtime";
+import { FetchError, encodeMultibase, exportDidKey, parseIri } from "@fedify/vocab-runtime";
 import serialize from "json-canon";
 //#region src/federation/portable-gateway-keys.test.ts
 const did = await exportDidKey(ed25519PublicKey.publicKey);
@@ -255,8 +255,8 @@ function createLoader(responses) {
 		});
 	};
 }
-async function deliver(body, gateways, { kv = new MemoryKvStore(), httpSignature = true, actor } = {}) {
-	const documentLoader = createLoader({ [compatibleActorId(gateway)]: actor ?? await actorDocument(gateways) });
+async function deliver(body, gateways, { kv = new MemoryKvStore(), httpSignature = true, actor, documentLoader } = {}) {
+	documentLoader ??= createLoader({ [compatibleActorId(gateway)]: actor ?? await actorDocument(gateways) });
 	const unsigned = new Request("https://local.example/inbox", {
 		method: "POST",
 		body: JSON.stringify(body),
@@ -332,6 +332,23 @@ test("handleInbox() requires proofs of portable actors despite gateway signature
 		dispatched: 1
 	});
 });
+test("handleInbox() fetches an unreachable gateway key once", async () => {
+	const fetched = [];
+	const documentLoader = (url) => {
+		if (url.replace(/#.*$/, "") !== compatibleActorId(gateway)) return mockDocumentLoader(url);
+		fetched.push(url);
+		return Promise.reject(new FetchError(url, "HTTP 503", new Response(null, { status: 503 })));
+	};
+	const kv = new MemoryKvStore();
+	for (let i = 0; i < 3; i++) {
+		const { status } = await deliver(await createJson(`unreachable-${i}`), [gateway], {
+			kv,
+			documentLoader
+		});
+		assertEquals(status, 401);
+	}
+	assertEquals(fetched.length, 1);
+});
 test("handleInbox() does not need gateway signatures for portable actors", async () => {
 	assertEquals(await deliver(await sign(await createJson("signed")), [otherGateway]), {
 		status: 202,

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-wiJbqJHa.mjs";
-import { i as signObject } from "../proof-BE4T5zF6.mjs";
-import { f as verifyRequestDetailed, l as signRequest } from "../http-BU-8fUrz.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 { 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-FnITXhtz.mjs";
+import { _ as coversDelivery, o as createFederation, v as forwardPortableInboxActivity, y as resolvePortableInboxForwardingOptions } from "../middleware-BpwKvOpU.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

@@ -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-BE4T5zF6.mjs";
-import { l as signRequest } from "../http-BU-8fUrz.mjs";
+import { i as signObject, s as verifyPortableObjectProof } from "../proof-xdPYGPaA.mjs";
+import { l as signRequest } from "../http-BcLnr2do.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-FnITXhtz.mjs";
+import { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-BpwKvOpU.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,6 +220,18 @@ 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);
@@ -234,7 +246,10 @@ test("Federation.fetch() applies the FEP-ef61 proof policy to portable objects",
 		"activity": 200,
 		"actor": 200,
 		"mutated-id": 404,
-		"unsigned-actor": 500
+		"unsigned-actor": 500,
+		"tombstone": 200,
+		"unsigned-tombstone": 500,
+		"mismatched-tombstone": 404
 	})) await t.step(`${id} → ${status}`, async () => {
 		const response = await federation.fetch(gatewayRequest(`/objects/${id}`), { contextData: void 0 });
 		assertEquals(response.status, status);
@@ -245,6 +260,18 @@ 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`);
+	});
+	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);
+	});
 });
 test("Federation.fetch() authorizes portable object requests", async (t) => {
 	const federation = createTestFederation();

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-BU-8fUrz.mjs";
+import { d as verifyRequest } from "../http-BcLnr2do.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-BJp47LxN.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-BFITuKHw.mjs";
+import { t as doesActorOwnKey } from "../owner-9LiHmOv1.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-Bf8rSWch.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-FnITXhtz.mjs";
+import { o as createFederation } from "../../middleware-BpwKvOpU.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-FnITXhtz.mjs";
-import { r as createFederationBuilder } from "../../builder-CHht75pX.mjs";
+import { o as createFederation } from "../../middleware-BpwKvOpU.mjs";
+import { r as createFederationBuilder } from "../../builder-CZcBWrBd.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-CyDDbE4i.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "../temporal-tAtwv6vX.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-FnITXhtz.mjs";
+import { o as createFederation, s as handleWebFinger } from "../middleware-BpwKvOpU.mjs";
 import { Image, Link, Person, Tombstone } from "@fedify/vocab";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 import { parseIri } from "@fedify/vocab-runtime";

package/dist/{federation-C1dL6SiT.cjs → federation-DYr384xz.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-Cala2Grs.cjs");
+const require_http = require("./http-B4mQvNcv.cjs");
 const require_types = require("./types-Be2zbyeG.cjs");
-const require_owner = require("./owner-DCt8W_Cv.cjs");
-const require_kv_cache = require("./kv-cache-Bl5EBFrU.cjs");
+const require_owner = require("./owner-BtoMCv6Z.cjs");
+const require_kv_cache = require("./kv-cache-Dqp_E-1g.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_uri_template = require("@fedify/uri-template");
 let _fedify_vocab = require("@fedify/vocab");
@@ -342,8 +342,8 @@ var FederationBuilderImpl = class {
 		const variables = _fedify_uri_template.Router.variables(path);
 		this.router.add(path, routeName);
 		const callbacks = {
-			dispatcher: (ctx, values) => {
-				return this._getTracer().startActiveSpan("activitypub.dispatch_object", {
+			dispatcher: async (ctx, values) => {
+				const object = await this._getTracer().startActiveSpan("activitypub.dispatch_object", {
 					kind: _opentelemetry_api.SpanKind.SERVER,
 					attributes: {
 						"fedify.object.type": cls.typeId.href,
@@ -366,6 +366,8 @@ var FederationBuilderImpl = class {
 						span.end();
 					}
 				});
+				if (object instanceof _fedify_vocab.Tombstone) warnMismatchedTombstoneId(ctx, cls, values, object);
+				return object;
 			},
 			parameters: variables
 		};
@@ -735,6 +737,28 @@ var FederationBuilderImpl = class {
 function createFederationBuilder() {
 	return new FederationBuilderImpl();
 }
+function warnMismatchedTombstoneId(context, cls, values, tombstone) {
+	const logger = (0, _logtape_logtape.getLogger)([
+		"fedify",
+		"federation",
+		"object"
+	]);
+	if (tombstone.id == null) {
+		logger.warn("Object dispatcher for {class} returned a tombstone without an id property.  Set the property with Context.getObjectUri().", {
+			class: cls.name,
+			values
+		});
+		return;
+	}
+	if (tombstone.id.protocol === "ap:" || tombstone.id.protocol === "ap+ef61:") 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,
+		values,
+		tombstoneId: tombstone.id.href,
+		objectUri: expected.href
+	});
+}
 /**
 * Warns about an FEP-ef61 portable actor identified by a compatible identifier
 * that is malformed, or is not on the actor's first gateway, where FEP-ef61
@@ -2212,6 +2236,11 @@ async function routeActivity({ context: ctx, json, originalJson, normalizedActiv
 //#region src/federation/keycache.ts
 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 });
+function isCompatibleKeyEntry(value) {
+	return value != null && typeof value === "object" && "key" in value && "expires" in value && typeof value.expires === "number";
+}
 var KvKeyCache = class {
 	kv;
 	prefix;
@@ -2274,6 +2303,69 @@ var KvKeyCache = class {
 		const serialized = await key.toJsonLd(this.options);
 		await this.kv.set(this.#entryKey(keyId), serialized, { ttl: this.keyTtl });
 	}
+	/**
+	* Returns the namespace of keys at FEP-ef61 compatible identifiers looked
+	* up for the given purpose.  Its entries carry the time they expire, which
+	* is checked when they are read, so that an entry is never used after
+	* the proof that vouched for its key expired, however late the underlying
+	* store evicts it.
+	* @param scope The purpose of the lookups.
+	* @returns The namespace.
+	* @internal
+	*/
+	compatibleKeyScope(scope) {
+		const now = this.options.now ?? (() => Temporal$9.Now.instant());
+		const entryKey = (keyId) => [
+			...this.prefix,
+			COMPATIBLE_KEY_SEGMENT,
+			scope,
+			keyId.href
+		];
+		const isExpired = (entry) => entry.expires <= now().epochMilliseconds;
+		const keyTtl = Math.min(this.keyTtl.total("millisecond"), MAX_COMPATIBLE_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;
+				try {
+					key = await _fedify_vocab.CryptographicKey.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;
+					}
+				}
+				return isExpired(entry) ? void 0 : key;
+			},
+			set: async (keyId, key, options) => {
+				const serialized = key == null ? null : await key.toJsonLd(this.options);
+				const current = now();
+				let expires = current.epochMilliseconds + (key == null ? unavailableKeyTtl : keyTtl);
+				if (options?.expires != null) expires = Math.min(expires, options.expires.epochMilliseconds);
+				const ttl = expires - current.epochMilliseconds;
+				if (ttl <= 0) {
+					await this.kv.delete(entryKey(keyId));
+					return;
+				}
+				await this.kv.set(entryKey(keyId), {
+					key: serialized,
+					expires
+				}, { ttl: Temporal$9.Duration.from({ milliseconds: ttl }) });
+			},
+			delete: async (keyId) => {
+				await this.kv.delete(entryKey(keyId));
+			}
+		};
+	}
 	async getFetchError(keyId) {
 		const cached = await this.kv.get(this.#getFetchErrorKey(keyId));
 		if (cached == null || typeof cached !== "object") return void 0;
@@ -3427,6 +3519,13 @@ async function handleObject(request, { values, context, objectDispatcher, author
 		if (!await authorizePredicate(context, values)) return await onUnauthorized(request);
 	}
 	const jsonLd = await object.toJsonLd(context);
+	if (object instanceof _fedify_vocab.Tombstone) return new Response(request.method === "HEAD" ? null : JSON.stringify(jsonLd), {
+		status: 410,
+		headers: {
+			"Content-Type": "application/activity+json",
+			Vary: "Accept"
+		}
+	});
 	return new Response(JSON.stringify(jsonLd), { headers: {
 		"Content-Type": "application/activity+json",
 		Vary: "Accept"
@@ -3560,13 +3659,13 @@ function recordCollectionMetrics(meterProvider, base, result, options = {}) {
 * @param parameters The parameters for handling the collection.
 * @returns A promise that resolves to an HTTP response.
 */
-async function handleCollection(request, { name: name$1, identifier, uriGetter, filter, filterPredicate, context, collectionCallbacks, tracerProvider, meterProvider, onUnauthorized, onNotFound }) {
-	const spanName = name$1.trim().replace(/\s+/g, "_");
+async function handleCollection(request, { name: name$2, identifier, uriGetter, filter, filterPredicate, context, collectionCallbacks, tracerProvider, meterProvider, onUnauthorized, onNotFound }) {
+	const spanName = name$2.trim().replace(/\s+/g, "_");
 	tracerProvider = tracerProvider ?? _opentelemetry_api.trace.getTracerProvider();
 	const tracer = tracerProvider.getTracer(require_http.name, require_http.version);
 	const cursor = new URL(request.url).searchParams.get("cursor");
 	const metricBase = {
-		kind: getCollectionMetricKind(name$1),
+		kind: getCollectionMetricKind(name$2),
 		page: cursor != null,
 		dispatcher: "built_in"
 	};
@@ -3607,7 +3706,7 @@ async function handleCollection(request, { name: name$1, identifier, uriGetter,
 							span.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
 							return await onNotFound(request);
 						}
-						const items = filterCollectionItems(page.items, name$1, filterPredicate);
+						const items = filterCollectionItems(page.items, name$2, filterPredicate);
 						itemCount = items.length;
 						span.setAttribute("fedify.collection.items", itemCount);
 						return items;
@@ -3647,7 +3746,7 @@ async function handleCollection(request, { name: name$1, identifier, uriGetter,
 		} else {
 			const uri = new URL(baseUri);
 			uri.searchParams.set("cursor", cursor);
-			const pageOrResponse = await tracer.startActiveSpan(`activitypub.dispatch_collection_page ${name$1}`, {
+			const pageOrResponse = await tracer.startActiveSpan(`activitypub.dispatch_collection_page ${name$2}`, {
 				kind: _opentelemetry_api.SpanKind.SERVER,
 				attributes: {
 					"activitypub.collection.id": uri.href,
@@ -3663,7 +3762,7 @@ async function handleCollection(request, { name: name$1, identifier, uriGetter,
 						span.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
 						return await onNotFound(request);
 					}
-					const items = filterCollectionItems(page.items, name$1, filterPredicate);
+					const items = filterCollectionItems(page.items, name$2, filterPredicate);
 					itemCount = items.length;
 					span.setAttribute("fedify.collection.items", itemCount);
 					return {
@@ -4851,8 +4950,8 @@ var CustomCollectionHandler = class {
 	* @param CollectionPage The CollectionPage constructor.
 	* @param filterPredicate Optional filter predicate for items.
 	*/
-	constructor(name$2, values, context, callbacks, tracerProvider = _opentelemetry_api.trace.getTracerProvider(), meterProvider, Collection, CollectionPage, filterPredicate) {
-		this.name = name$2;
+	constructor(name$1, values, context, callbacks, tracerProvider = _opentelemetry_api.trace.getTracerProvider(), meterProvider, Collection, CollectionPage, filterPredicate) {
+		this.name = name$1;
 		this.values = values;
 		this.context = context;
 		this.callbacks = callbacks;
@@ -9341,7 +9440,7 @@ var RequestContextImpl = class RequestContextImpl extends ContextImpl {
 		if (actor instanceof _fedify_vocab.Tombstone && options?.tombstone !== "passthrough") return null;
 		return actor;
 	}
-	async getObject(cls, values) {
+	async getObject(cls, values, options) {
 		const callbacks = this.federation.objectCallbacks[cls.typeId.href];
 		if (callbacks == null) throw new Error("No object dispatcher registered.");
 		for (const param of callbacks.parameters) if (!(param in values)) throw new TypeError(`Missing parameter: ${param}`);
@@ -9351,13 +9450,15 @@ var RequestContextImpl = class RequestContextImpl extends ContextImpl {
 			actorDispatcherClass: this.#invokedFromObjectDispatcher.cls.name,
 			actorDispatcherValues: this.#invokedFromObjectDispatcher.values
 		});
-		return await callbacks.dispatcher(new RequestContextImpl({
+		const object = await callbacks.dispatcher(new RequestContextImpl({
 			...this,
 			invokedFromObjectDispatcher: {
 				cls,
 				values
 			}
 		}), values);
+		if (object instanceof _fedify_vocab.Tombstone && !(object instanceof cls) && options?.tombstone !== "passthrough") return null;
+		return object;
 	}
 	#signedKey = void 0;
 	async getSignedKey(options = {}) {