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

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

@@ -1,8 +1,8 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-CkjiYK_Z.mjs";
-import { s as isPortableId } from "./portable-key-id-Bva5iT3W.mjs";
+import { n as version, t as name } from "./deno-CCABdw7r.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";
 import { Router, RouterError, assertPath } from "@fedify/uri-template";
@@ -89,7 +89,7 @@ var FederationBuilderImpl = class {
 	* specified.
 	*/
 	async build(options) {
-		const { FederationImpl } = await import("./middleware-6p2dYEVA.mjs");
+		const { FederationImpl } = await import("./middleware-U9IuzvDO.mjs");
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -297,8 +297,8 @@ var FederationBuilderImpl = class {
 		const variables = 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: SpanKind.SERVER,
 					attributes: {
 						"fedify.object.type": cls.typeId.href,
@@ -321,6 +321,8 @@ var FederationBuilderImpl = class {
 						span.end();
 					}
 				});
+				if (object instanceof Tombstone) warnMismatchedTombstoneId(ctx, cls, values, object);
+				return object;
 			},
 			parameters: variables
 		};
@@ -690,6 +692,28 @@ var FederationBuilderImpl = class {
 function createFederationBuilder() {
 	return new FederationBuilderImpl();
 }
+function warnMismatchedTombstoneId(context, cls, values, tombstone) {
+	const logger = 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

package/dist/compat/mod.d.cts

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { Xt as ActivityTransformer, n as Context } from "../context-mDTxTw-S.cjs";
+import { Zt as ActivityTransformer, n as Context } from "../context-SMNOiiY6.cjs";
 import { Activity } from "@fedify/vocab";
 
 //#region src/compat/transformers.d.ts

package/dist/compat/mod.d.ts

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { Xt as ActivityTransformer, n as Context } from "../context-CfJE_oQu.js";
+import { Zt as ActivityTransformer, n as Context } from "../context-tOiJfBoD.js";
 import { Activity } from "@fedify/vocab";
 
 //#region src/compat/transformers.d.ts

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-FnITXhtz.mjs";
+import { E as autoIdAssigner, T as actorDehydrator, n as FederationImpl } from "../middleware-BpwKvOpU.mjs";
 import { Follow, Person } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
 //#region src/compat/transformers.test.ts

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

@@ -1,10 +1,10 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { s as isPortableId, t as getCanonicalPortableId } from "./portable-key-id-Bva5iT3W.mjs";
+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-wiJbqJHa.mjs";
-import { a as verifyMapLocalProof, c as verifyPortableObjectProofPolicy } from "./proof-BE4T5zF6.mjs";
+import { c as getNormalizationContextLoader } from "./ld-CnT0f1nU.mjs";
+import { a as verifyMapLocalProof, c as verifyPortableObjectProofPolicy } from "./proof-xdPYGPaA.mjs";
 import { fromCompatibleEf61Id, parseIri } from "@fedify/vocab-runtime";
 import jsonld from "@fedify/vocab-runtime/jsonld";
 //#region src/sig/compound-proof.ts

package/dist/{context-mDTxTw-S.d.cts → context-SMNOiiY6.d.cts}

@@ -1,6 +1,6 @@
 /// <reference lib="esnext.temporal" />
 import { o as JsonValue, s as NodeInfo, t as GetNodeInfoOptions } from "./client-D-XP_Ccb.cjs";
-import { o as VerifyRequestFailureReason, t as HttpMessageSignaturesSpec } from "./http-xlG-jRdB.cjs";
+import { o as VerifyRequestFailureReason, t as HttpMessageSignaturesSpec } from "./http-D76Py0M4.cjs";
 import { n as GetKeyOwnerOptions } from "./owner-BF0L9cMt.cjs";
 import { n as KvStore, t as KvKey } from "./kv-BhNbN8Ed.cjs";
 import { Activity, Actor, Collection, CryptographicKey, Hashtag, Link, LookupObjectOptions, Multikey, Object as Object$1, Recipient, Tombstone, TraverseCollectionOptions } from "@fedify/vocab";
@@ -180,14 +180,18 @@ type ActorAliasMapper<TContextData> = (context: RequestContext<TContextData>, re
   username: string;
 } | null>;
 /**
-* A callback that dispatches an object.
+* A callback that dispatches an object or a {@link Tombstone}.
+*
+* Return a {@link Tombstone} if the object has been deleted; Fedify then
+* responds with `410 Gone` and the serialized tombstone.  Return `null` if
+* the object is not found.
 *
 * @template TContextData The context data to pass to the {@link Context}.
 * @template TObject The type of object to dispatch.
 * @template TParam The parameter names of the requested URL.
 * @since 0.7.0
 */
-type ObjectDispatcher<TContextData, TObject extends Object$1, TParam extends string> = (context: RequestContext<TContextData>, values: Record<TParam, string>) => TObject | null | Promise<TObject | null>;
+type ObjectDispatcher<TContextData, TObject extends Object$1, TParam extends string> = (context: RequestContext<TContextData>, values: Record<TParam, string>) => TObject | Tombstone | null | Promise<TObject | Tombstone | null>;
 /**
 * A callback that dispatches a collection.
 *
@@ -1538,7 +1542,9 @@ interface Federatable<TContextData> extends TaskRegistry<TContextData> {
   *             based on URI Template
   *             ([RFC 6570](https://tools.ietf.org/html/rfc6570)).  The path
   *             must have one or more variables.
-  * @param dispatcher An object dispatcher callback to register.
+  * @param dispatcher An object dispatcher callback to register.  It may
+  *                   return an object, a `Tombstone` if the object has been
+  *                   deleted, or `null` if the object is not found.
   */
   setObjectDispatcher<TObject extends Object$1, TParam extends string>(cls: ConstructorWithTypeId<TObject>, path: `${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}`, dispatcher: ObjectDispatcher<TContextData, TObject, TParam>): ObjectCallbackSetters<TContextData, TObject, TParam>;
   /**
@@ -1552,7 +1558,9 @@ interface Federatable<TContextData> extends TaskRegistry<TContextData> {
   *             based on URI Template
   *             ([RFC 6570](https://tools.ietf.org/html/rfc6570)).  The path
   *             must have one or more variables.
-  * @param dispatcher An object dispatcher callback to register.
+  * @param dispatcher An object dispatcher callback to register.  It may
+  *                   return an object, a `Tombstone` if the object has been
+  *                   deleted, or `null` if the object is not found.
   */
   setObjectDispatcher<TObject extends Object$1, TParam extends string>(cls: ConstructorWithTypeId<TObject>, path: `${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}`, dispatcher: ObjectDispatcher<TContextData, TObject, TParam>): ObjectCallbackSetters<TContextData, TObject, TParam>;
   /**
@@ -1566,7 +1574,9 @@ interface Federatable<TContextData> extends TaskRegistry<TContextData> {
   *             based on URI Template
   *             ([RFC 6570](https://tools.ietf.org/html/rfc6570)).  The path
   *             must have one or more variables.
-  * @param dispatcher An object dispatcher callback to register.
+  * @param dispatcher An object dispatcher callback to register.  It may
+  *                   return an object, a `Tombstone` if the object has been
+  *                   deleted, or `null` if the object is not found.
   */
   setObjectDispatcher<TObject extends Object$1, TParam extends string>(cls: ConstructorWithTypeId<TObject>, path: `${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}`, dispatcher: ObjectDispatcher<TContextData, TObject, TParam>): ObjectCallbackSetters<TContextData, TObject, TParam>;
   /**
@@ -1580,7 +1590,9 @@ interface Federatable<TContextData> extends TaskRegistry<TContextData> {
   *             based on URI Template
   *             ([RFC 6570](https://tools.ietf.org/html/rfc6570)).  The path
   *             must have one or more variables.
-  * @param dispatcher An object dispatcher callback to register.
+  * @param dispatcher An object dispatcher callback to register.  It may
+  *                   return an object, a `Tombstone` if the object has been
+  *                   deleted, or `null` if the object is not found.
   */
   setObjectDispatcher<TObject extends Object$1, TParam extends string>(cls: ConstructorWithTypeId<TObject>, path: `${string}${Rfc6570Expression<TParam>}${string}${Rfc6570Expression<TParam>}${string}${Rfc6570Expression<TParam>}${string}`, dispatcher: ObjectDispatcher<TContextData, TObject, TParam>): ObjectCallbackSetters<TContextData, TObject, TParam>;
   /**
@@ -1594,7 +1606,9 @@ interface Federatable<TContextData> extends TaskRegistry<TContextData> {
   *             based on URI Template
   *             ([RFC 6570](https://tools.ietf.org/html/rfc6570)).  The path
   *             must have one or more variables.
-  * @param dispatcher An object dispatcher callback to register.
+  * @param dispatcher An object dispatcher callback to register.  It may
+  *                   return an object, a `Tombstone` if the object has been
+  *                   deleted, or `null` if the object is not found.
   */
   setObjectDispatcher<TObject extends Object$1, TParam extends string>(cls: ConstructorWithTypeId<TObject>, path: `${string}${Rfc6570Expression<TParam>}${string}${Rfc6570Expression<TParam>}${string}`, dispatcher: ObjectDispatcher<TContextData, TObject, TParam>): ObjectCallbackSetters<TContextData, TObject, TParam>;
   /**
@@ -1608,7 +1622,9 @@ interface Federatable<TContextData> extends TaskRegistry<TContextData> {
   *             based on URI Template
   *             ([RFC 6570](https://tools.ietf.org/html/rfc6570)).  The path
   *             must have one or more variables.
-  * @param dispatcher An object dispatcher callback to register.
+  * @param dispatcher An object dispatcher callback to register.  It may
+  *                   return an object, a `Tombstone` if the object has been
+  *                   deleted, or `null` if the object is not found.
   */
   setObjectDispatcher<TObject extends Object$1, TParam extends string>(cls: ConstructorWithTypeId<TObject>, path: `${string}${Rfc6570Expression<TParam>}${string}`, dispatcher: ObjectDispatcher<TContextData, TObject, TParam>): ObjectCallbackSetters<TContextData, TObject, TParam>;
   /**
@@ -3389,6 +3405,23 @@ interface GetActorOptions {
   readonly tombstone?: "suppress" | "passthrough";
 }
 /**
+* Options for {@link RequestContext.getObject}.
+* @since 2.4.0
+*/
+interface GetObjectOptions {
+  /**
+  * Controls how tombstoned objects are returned.
+  *
+  * By default, or if set to `"suppress"`, a {@link Tombstone} is returned as
+  * `null`, unless it is an instance of the requested class, e.g., when
+  * the requested class is `Object` or `Tombstone` itself.  In that case,
+  * the tombstone is returned as is, as it is an object of the requested
+  * class.  Set this to `"passthrough"` to always receive a {@link Tombstone}
+  * result instead of `null`.
+  */
+  readonly tombstone?: "suppress" | "passthrough";
+}
+/**
 * A context for a request.
 */
 interface RequestContext<TContextData> extends Context<TContextData> {
@@ -3553,13 +3586,62 @@ interface RequestContext<TContextData> extends Context<TContextData> {
   * @param cls The class to instantiate.
   * @param values The values to pass to the object dispatcher.
   * @returns The object of the given class with the given values, or `null`
-  *          if the object is not found.
+  *          if the object is not found.  Tombstoned objects are suppressed
+  *          unless the tombstone is an instance of `cls`.
   * @throws {Error} If no object dispatcher is available for the class.
   * @throws {TypeError} If values are invalid.
   * @since 0.7.0
   */
   getObject<TObject extends Object$1>(cls: ConstructorWithTypeId<TObject>, values: Record<string, string>): Promise<TObject | null>;
   /**
+  * Gets an object of the given class, or a {@link Tombstone}, with the given
+  * values.
+  * @param cls The class to instantiate.
+  * @param values The values to pass to the object dispatcher.
+  * @param options Options for getting the object.  Set `options.tombstone`
+  *                to `"passthrough"` to receive tombstoned objects instead
+  *                of `null`.
+  * @returns The object of the given class with the given values,
+  *          a tombstone, or `null` if the object is not found.
+  * @throws {Error} If no object dispatcher is available for the class.
+  * @throws {TypeError} If values are invalid.
+  * @since 2.4.0
+  */
+  getObject<TObject extends Object$1>(cls: ConstructorWithTypeId<TObject>, values: Record<string, string>, options: GetObjectOptions & {
+    readonly tombstone: "passthrough";
+  }): Promise<TObject | Tombstone | null>;
+  /**
+  * Gets an object of the given class with the given values.
+  * @param cls The class to instantiate.
+  * @param values The values to pass to the object dispatcher.
+  * @param options Options for getting the object.
+  * @returns The object of the given class with the given values, or `null`
+  *          if the object is not found.  Tombstoned objects are suppressed
+  *          unless `options.tombstone` is `"passthrough"` or the tombstone
+  *          is an instance of `cls`.
+  * @throws {Error} If no object dispatcher is available for the class.
+  * @throws {TypeError} If values are invalid.
+  * @since 2.4.0
+  */
+  getObject<TObject extends Object$1>(cls: ConstructorWithTypeId<TObject>, values: Record<string, string>, options: GetObjectOptions & {
+    readonly tombstone?: "suppress" | undefined;
+  }): Promise<TObject | null>;
+  /**
+  * Gets an object of the given class, or a {@link Tombstone}, with the given
+  * values.
+  * @param cls The class to instantiate.
+  * @param values The values to pass to the object dispatcher.
+  * @param options Options for getting the object.
+  * @returns The object of the given class with the given values,
+  *          a tombstone, or `null` if the object is not found.  This broad
+  *          overload is used when the caller passes an options value whose
+  *          `tombstone` mode is not known statically.
+  * @throws {Error} If no object dispatcher is available for the class.
+  * @throws {TypeError} If values are invalid.
+  * @since 2.4.0
+  */
+  getObject<TObject extends Object$1>(cls: ConstructorWithTypeId<TObject>, values: Record<string, string>, options: GetObjectOptions): Promise<TObject | Tombstone | null>;
+  /**
   * Gets the public key of the sender, if any exists and it is verified.
   * Otherwise, `null` is returned.
   *
@@ -3966,4 +4048,4 @@ interface ActorKeyPair extends CryptoKeyPair {
   readonly multikey: Multikey;
 }
 //#endregion
-export { InProcessMessageQueueOptions as $, ObjectCallbackSetters as A, InboxErrorHandler as At, TaskDefinition as B, PortableActorIdMapper as Bt, FederationOptions as C, CollectionCursor as Ct, InboxChallengePolicy as D, CustomCollectionDispatcher as Dt, IdempotencyStrategy as E, CustomCollectionCursor as Et, FederationOrigin as F, ObjectDispatcher as Ft, CreateExponentialBackoffPolicyOptions as G, SendActivityError as Gt, TaskEnqueueOptions as H, UnverifiedActivityHandler as Ht, FederationQueueOptions as I, OutboxErrorHandler as It, createExponentialBackoffPolicy as J, buildCollectionSynchronizationHeader as Jt, RetryContext as K, SenderKeyPair as Kt, createFederation as L, OutboxListener as Lt, PortableInboxForwardingOptions as M, MediaUploaderCallback as Mt, Rfc6570Expression as N, NodeInfoDispatcher as Nt, InboxListenerSetters as O, HashlinkMediaDispatcher as Ot, FederationKvPrefixes as P, ObjectAuthorizePredicate as Pt, InProcessMessageQueue as Q, Message as R, OutboxListenerErrorHandler as Rt, FederationFetchOptions as S, CollectionCounter as St, IdempotencyKeyCallback as T, CustomCollectionCounter as Tt, TaskHandler as U, UnverifiedActivityReason as Ut, TaskDefinitionOptions as V, SharedInboxKeyDispatcher as Vt, TaskRegistry as W, WebFingerLinksDispatcher as Wt, respondWithObject as X, ActivityTransformer as Xt, RespondWithObjectOptions as Y, digest as Yt, respondWithObjectIfAcceptable as Z, CustomCollectionCallbackSetters as _, ActorAliasMapper as _t, GetSignedKeyOptions as a, CircuitBreaker as at, FederationBenchmarkOptions as b, ActorKeyPairsDispatcher as bt, ParseUriResult as c, CircuitBreakerCreateOptions as ct, RouteActivityOptions as d, CircuitBreakerOptions as dt, MessageQueue as et, SendActivityOptions as f, CircuitBreakerState as ft, ConstructorWithTypeId as g, parseCircuitBreakerKvState as gt, CollectionCallbackSetters as h, normalizeCircuitBreakerOptions as ht, GetActorOptions as i, ParallelMessageQueue as it, OutboxListenerSetters as j, InboxListener as jt, MediaUploaderSetters as k, HashlinkMediaRequest as kt, PortableRequest as l, CircuitBreakerFailurePolicy as lt, ActorCallbackSetters as m, NormalizedCircuitBreakerOptions as mt, Context as n, MessageQueueEnqueueOptions as nt, InboxContext as o, CircuitBreakerActivityDrop as ot, SendActivityOptionsForCollection as p, CircuitBreakerStateChange as pt, RetryPolicy as q, PageItems as qt, ForwardActivityOptions as r, MessageQueueListenOptions as rt, OutboxContext as s, CircuitBreakerBeforeSendDecision as st, ActorKeyPair as t, MessageQueueDepth as tt, RequestContext as u, CircuitBreakerKvState as ut, Federatable as v, ActorDispatcher as vt, FederationStartQueueOptions as w, CollectionDispatcher as wt, FederationBuilder as x, AuthorizePredicate as xt, Federation as y, ActorHandleMapper as yt, createFederationBuilder as z, OutboxPermanentFailureHandler as zt };
+export { InProcessMessageQueue as $, MediaUploaderSetters as A, HashlinkMediaRequest as At, createFederationBuilder as B, OutboxPermanentFailureHandler as Bt, FederationFetchOptions as C, CollectionCounter as Ct, IdempotencyStrategy as D, CustomCollectionCursor as Dt, IdempotencyKeyCallback as E, CustomCollectionCounter as Et, FederationKvPrefixes as F, ObjectAuthorizePredicate as Ft, TaskRegistry as G, WebFingerLinksDispatcher as Gt, TaskDefinitionOptions as H, SharedInboxKeyDispatcher as Ht, FederationOrigin as I, ObjectDispatcher as It, RetryPolicy as J, PageItems as Jt, CreateExponentialBackoffPolicyOptions as K, SendActivityError as Kt, FederationQueueOptions as L, OutboxErrorHandler as Lt, OutboxListenerSetters as M, InboxListener as Mt, PortableInboxForwardingOptions as N, MediaUploaderCallback as Nt, InboxChallengePolicy as O, CustomCollectionDispatcher as Ot, Rfc6570Expression as P, NodeInfoDispatcher as Pt, respondWithObjectIfAcceptable as Q, createFederation as R, OutboxListener as Rt, FederationBuilder as S, AuthorizePredicate as St, FederationStartQueueOptions as T, CollectionDispatcher as Tt, TaskEnqueueOptions as U, UnverifiedActivityHandler as Ut, TaskDefinition as V, PortableActorIdMapper as Vt, TaskHandler as W, UnverifiedActivityReason as Wt, RespondWithObjectOptions as X, digest as Xt, createExponentialBackoffPolicy as Y, buildCollectionSynchronizationHeader as Yt, respondWithObject as Z, ActivityTransformer as Zt, ConstructorWithTypeId as _, parseCircuitBreakerKvState as _t, GetObjectOptions as a, ParallelMessageQueue as at, Federation as b, ActorHandleMapper as bt, OutboxContext as c, CircuitBreakerBeforeSendDecision as ct, RequestContext as d, CircuitBreakerKvState as dt, InProcessMessageQueueOptions as et, RouteActivityOptions as f, CircuitBreakerOptions as ft, CollectionCallbackSetters as g, normalizeCircuitBreakerOptions as gt, ActorCallbackSetters as h, NormalizedCircuitBreakerOptions as ht, GetActorOptions as i, MessageQueueListenOptions as it, ObjectCallbackSetters as j, InboxErrorHandler as jt, InboxListenerSetters as k, HashlinkMediaDispatcher as kt, ParseUriResult as l, CircuitBreakerCreateOptions as lt, SendActivityOptionsForCollection as m, CircuitBreakerStateChange as mt, Context as n, MessageQueueDepth as nt, GetSignedKeyOptions as o, CircuitBreaker as ot, SendActivityOptions as p, CircuitBreakerState as pt, RetryContext as q, SenderKeyPair as qt, ForwardActivityOptions as r, MessageQueueEnqueueOptions as rt, InboxContext as s, CircuitBreakerActivityDrop as st, ActorKeyPair as t, MessageQueue as tt, PortableRequest as u, CircuitBreakerFailurePolicy as ut, CustomCollectionCallbackSetters as v, ActorAliasMapper as vt, FederationOptions as w, CollectionCursor as wt, FederationBenchmarkOptions as x, ActorKeyPairsDispatcher as xt, Federatable as y, ActorDispatcher as yt, Message as z, OutboxListenerErrorHandler as zt };

package/dist/{context-CfJE_oQu.d.ts → context-tOiJfBoD.d.ts}

@@ -1,6 +1,6 @@
 /// <reference lib="esnext.temporal" />
 import { o as JsonValue, s as NodeInfo, t as GetNodeInfoOptions } from "./client-D-XP_Ccb.js";
-import { o as VerifyRequestFailureReason, t as HttpMessageSignaturesSpec } from "./http-n2v6DPxu.js";
+import { o as VerifyRequestFailureReason, t as HttpMessageSignaturesSpec } from "./http-BrQgkJay.js";
 import { n as GetKeyOwnerOptions } from "./owner-BSzr5-I8.js";
 import { n as KvStore, t as KvKey } from "./kv-BhNbN8Ed.js";
 import { Router } from "@fedify/uri-template";
@@ -182,14 +182,18 @@ type ActorAliasMapper<TContextData> = (context: RequestContext<TContextData>, re
   username: string;
 } | null>;
 /**
-* A callback that dispatches an object.
+* A callback that dispatches an object or a {@link Tombstone}.
+*
+* Return a {@link Tombstone} if the object has been deleted; Fedify then
+* responds with `410 Gone` and the serialized tombstone.  Return `null` if
+* the object is not found.
 *
 * @template TContextData The context data to pass to the {@link Context}.
 * @template TObject The type of object to dispatch.
 * @template TParam The parameter names of the requested URL.
 * @since 0.7.0
 */
-type ObjectDispatcher<TContextData, TObject extends Object$1, TParam extends string> = (context: RequestContext<TContextData>, values: Record<TParam, string>) => TObject | null | Promise<TObject | null>;
+type ObjectDispatcher<TContextData, TObject extends Object$1, TParam extends string> = (context: RequestContext<TContextData>, values: Record<TParam, string>) => TObject | Tombstone | null | Promise<TObject | Tombstone | null>;
 /**
 * A callback that dispatches a collection.
 *
@@ -1540,7 +1544,9 @@ interface Federatable<TContextData> extends TaskRegistry<TContextData> {
   *             based on URI Template
   *             ([RFC 6570](https://tools.ietf.org/html/rfc6570)).  The path
   *             must have one or more variables.
-  * @param dispatcher An object dispatcher callback to register.
+  * @param dispatcher An object dispatcher callback to register.  It may
+  *                   return an object, a `Tombstone` if the object has been
+  *                   deleted, or `null` if the object is not found.
   */
   setObjectDispatcher<TObject extends Object$1, TParam extends string>(cls: ConstructorWithTypeId<TObject>, path: `${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}`, dispatcher: ObjectDispatcher<TContextData, TObject, TParam>): ObjectCallbackSetters<TContextData, TObject, TParam>;
   /**
@@ -1554,7 +1560,9 @@ interface Federatable<TContextData> extends TaskRegistry<TContextData> {
   *             based on URI Template
   *             ([RFC 6570](https://tools.ietf.org/html/rfc6570)).  The path
   *             must have one or more variables.
-  * @param dispatcher An object dispatcher callback to register.
+  * @param dispatcher An object dispatcher callback to register.  It may
+  *                   return an object, a `Tombstone` if the object has been
+  *                   deleted, or `null` if the object is not found.
   */
   setObjectDispatcher<TObject extends Object$1, TParam extends string>(cls: ConstructorWithTypeId<TObject>, path: `${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}`, dispatcher: ObjectDispatcher<TContextData, TObject, TParam>): ObjectCallbackSetters<TContextData, TObject, TParam>;
   /**
@@ -1568,7 +1576,9 @@ interface Federatable<TContextData> extends TaskRegistry<TContextData> {
   *             based on URI Template
   *             ([RFC 6570](https://tools.ietf.org/html/rfc6570)).  The path
   *             must have one or more variables.
-  * @param dispatcher An object dispatcher callback to register.
+  * @param dispatcher An object dispatcher callback to register.  It may
+  *                   return an object, a `Tombstone` if the object has been
+  *                   deleted, or `null` if the object is not found.
   */
   setObjectDispatcher<TObject extends Object$1, TParam extends string>(cls: ConstructorWithTypeId<TObject>, path: `${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}`, dispatcher: ObjectDispatcher<TContextData, TObject, TParam>): ObjectCallbackSetters<TContextData, TObject, TParam>;
   /**
@@ -1582,7 +1592,9 @@ interface Federatable<TContextData> extends TaskRegistry<TContextData> {
   *             based on URI Template
   *             ([RFC 6570](https://tools.ietf.org/html/rfc6570)).  The path
   *             must have one or more variables.
-  * @param dispatcher An object dispatcher callback to register.
+  * @param dispatcher An object dispatcher callback to register.  It may
+  *                   return an object, a `Tombstone` if the object has been
+  *                   deleted, or `null` if the object is not found.
   */
   setObjectDispatcher<TObject extends Object$1, TParam extends string>(cls: ConstructorWithTypeId<TObject>, path: `${string}${Rfc6570Expression<TParam>}${string}${Rfc6570Expression<TParam>}${string}${Rfc6570Expression<TParam>}${string}`, dispatcher: ObjectDispatcher<TContextData, TObject, TParam>): ObjectCallbackSetters<TContextData, TObject, TParam>;
   /**
@@ -1596,7 +1608,9 @@ interface Federatable<TContextData> extends TaskRegistry<TContextData> {
   *             based on URI Template
   *             ([RFC 6570](https://tools.ietf.org/html/rfc6570)).  The path
   *             must have one or more variables.
-  * @param dispatcher An object dispatcher callback to register.
+  * @param dispatcher An object dispatcher callback to register.  It may
+  *                   return an object, a `Tombstone` if the object has been
+  *                   deleted, or `null` if the object is not found.
   */
   setObjectDispatcher<TObject extends Object$1, TParam extends string>(cls: ConstructorWithTypeId<TObject>, path: `${string}${Rfc6570Expression<TParam>}${string}${Rfc6570Expression<TParam>}${string}`, dispatcher: ObjectDispatcher<TContextData, TObject, TParam>): ObjectCallbackSetters<TContextData, TObject, TParam>;
   /**
@@ -1610,7 +1624,9 @@ interface Federatable<TContextData> extends TaskRegistry<TContextData> {
   *             based on URI Template
   *             ([RFC 6570](https://tools.ietf.org/html/rfc6570)).  The path
   *             must have one or more variables.
-  * @param dispatcher An object dispatcher callback to register.
+  * @param dispatcher An object dispatcher callback to register.  It may
+  *                   return an object, a `Tombstone` if the object has been
+  *                   deleted, or `null` if the object is not found.
   */
   setObjectDispatcher<TObject extends Object$1, TParam extends string>(cls: ConstructorWithTypeId<TObject>, path: `${string}${Rfc6570Expression<TParam>}${string}`, dispatcher: ObjectDispatcher<TContextData, TObject, TParam>): ObjectCallbackSetters<TContextData, TObject, TParam>;
   /**
@@ -3391,6 +3407,23 @@ interface GetActorOptions {
   readonly tombstone?: "suppress" | "passthrough";
 }
 /**
+* Options for {@link RequestContext.getObject}.
+* @since 2.4.0
+*/
+interface GetObjectOptions {
+  /**
+  * Controls how tombstoned objects are returned.
+  *
+  * By default, or if set to `"suppress"`, a {@link Tombstone} is returned as
+  * `null`, unless it is an instance of the requested class, e.g., when
+  * the requested class is `Object` or `Tombstone` itself.  In that case,
+  * the tombstone is returned as is, as it is an object of the requested
+  * class.  Set this to `"passthrough"` to always receive a {@link Tombstone}
+  * result instead of `null`.
+  */
+  readonly tombstone?: "suppress" | "passthrough";
+}
+/**
 * A context for a request.
 */
 interface RequestContext<TContextData> extends Context<TContextData> {
@@ -3555,13 +3588,62 @@ interface RequestContext<TContextData> extends Context<TContextData> {
   * @param cls The class to instantiate.
   * @param values The values to pass to the object dispatcher.
   * @returns The object of the given class with the given values, or `null`
-  *          if the object is not found.
+  *          if the object is not found.  Tombstoned objects are suppressed
+  *          unless the tombstone is an instance of `cls`.
   * @throws {Error} If no object dispatcher is available for the class.
   * @throws {TypeError} If values are invalid.
   * @since 0.7.0
   */
   getObject<TObject extends Object$1>(cls: ConstructorWithTypeId<TObject>, values: Record<string, string>): Promise<TObject | null>;
   /**
+  * Gets an object of the given class, or a {@link Tombstone}, with the given
+  * values.
+  * @param cls The class to instantiate.
+  * @param values The values to pass to the object dispatcher.
+  * @param options Options for getting the object.  Set `options.tombstone`
+  *                to `"passthrough"` to receive tombstoned objects instead
+  *                of `null`.
+  * @returns The object of the given class with the given values,
+  *          a tombstone, or `null` if the object is not found.
+  * @throws {Error} If no object dispatcher is available for the class.
+  * @throws {TypeError} If values are invalid.
+  * @since 2.4.0
+  */
+  getObject<TObject extends Object$1>(cls: ConstructorWithTypeId<TObject>, values: Record<string, string>, options: GetObjectOptions & {
+    readonly tombstone: "passthrough";
+  }): Promise<TObject | Tombstone | null>;
+  /**
+  * Gets an object of the given class with the given values.
+  * @param cls The class to instantiate.
+  * @param values The values to pass to the object dispatcher.
+  * @param options Options for getting the object.
+  * @returns The object of the given class with the given values, or `null`
+  *          if the object is not found.  Tombstoned objects are suppressed
+  *          unless `options.tombstone` is `"passthrough"` or the tombstone
+  *          is an instance of `cls`.
+  * @throws {Error} If no object dispatcher is available for the class.
+  * @throws {TypeError} If values are invalid.
+  * @since 2.4.0
+  */
+  getObject<TObject extends Object$1>(cls: ConstructorWithTypeId<TObject>, values: Record<string, string>, options: GetObjectOptions & {
+    readonly tombstone?: "suppress" | undefined;
+  }): Promise<TObject | null>;
+  /**
+  * Gets an object of the given class, or a {@link Tombstone}, with the given
+  * values.
+  * @param cls The class to instantiate.
+  * @param values The values to pass to the object dispatcher.
+  * @param options Options for getting the object.
+  * @returns The object of the given class with the given values,
+  *          a tombstone, or `null` if the object is not found.  This broad
+  *          overload is used when the caller passes an options value whose
+  *          `tombstone` mode is not known statically.
+  * @throws {Error} If no object dispatcher is available for the class.
+  * @throws {TypeError} If values are invalid.
+  * @since 2.4.0
+  */
+  getObject<TObject extends Object$1>(cls: ConstructorWithTypeId<TObject>, values: Record<string, string>, options: GetObjectOptions): Promise<TObject | Tombstone | null>;
+  /**
   * Gets the public key of the sender, if any exists and it is verified.
   * Otherwise, `null` is returned.
   *
@@ -3968,4 +4050,4 @@ interface ActorKeyPair extends CryptoKeyPair {
   readonly multikey: Multikey;
 }
 //#endregion
-export { InProcessMessageQueueOptions as $, ObjectCallbackSetters as A, InboxErrorHandler as At, TaskDefinition as B, PortableActorIdMapper as Bt, FederationOptions as C, CollectionCursor as Ct, InboxChallengePolicy as D, CustomCollectionDispatcher as Dt, IdempotencyStrategy as E, CustomCollectionCursor as Et, FederationOrigin as F, ObjectDispatcher as Ft, CreateExponentialBackoffPolicyOptions as G, SendActivityError as Gt, TaskEnqueueOptions as H, UnverifiedActivityHandler as Ht, FederationQueueOptions as I, OutboxErrorHandler as It, createExponentialBackoffPolicy as J, buildCollectionSynchronizationHeader as Jt, RetryContext as K, SenderKeyPair as Kt, createFederation as L, OutboxListener as Lt, PortableInboxForwardingOptions as M, MediaUploaderCallback as Mt, Rfc6570Expression as N, NodeInfoDispatcher as Nt, InboxListenerSetters as O, HashlinkMediaDispatcher as Ot, FederationKvPrefixes as P, ObjectAuthorizePredicate as Pt, InProcessMessageQueue as Q, Message as R, OutboxListenerErrorHandler as Rt, FederationFetchOptions as S, CollectionCounter as St, IdempotencyKeyCallback as T, CustomCollectionCounter as Tt, TaskHandler as U, UnverifiedActivityReason as Ut, TaskDefinitionOptions as V, SharedInboxKeyDispatcher as Vt, TaskRegistry as W, WebFingerLinksDispatcher as Wt, respondWithObject as X, ActivityTransformer as Xt, RespondWithObjectOptions as Y, digest as Yt, respondWithObjectIfAcceptable as Z, CustomCollectionCallbackSetters as _, ActorAliasMapper as _t, GetSignedKeyOptions as a, CircuitBreaker as at, FederationBenchmarkOptions as b, ActorKeyPairsDispatcher as bt, ParseUriResult as c, CircuitBreakerCreateOptions as ct, RouteActivityOptions as d, CircuitBreakerOptions as dt, MessageQueue as et, SendActivityOptions as f, CircuitBreakerState as ft, ConstructorWithTypeId as g, parseCircuitBreakerKvState as gt, CollectionCallbackSetters as h, normalizeCircuitBreakerOptions as ht, GetActorOptions as i, ParallelMessageQueue as it, OutboxListenerSetters as j, InboxListener as jt, MediaUploaderSetters as k, HashlinkMediaRequest as kt, PortableRequest as l, CircuitBreakerFailurePolicy as lt, ActorCallbackSetters as m, NormalizedCircuitBreakerOptions as mt, Context as n, MessageQueueEnqueueOptions as nt, InboxContext as o, CircuitBreakerActivityDrop as ot, SendActivityOptionsForCollection as p, CircuitBreakerStateChange as pt, RetryPolicy as q, PageItems as qt, ForwardActivityOptions as r, MessageQueueListenOptions as rt, OutboxContext as s, CircuitBreakerBeforeSendDecision as st, ActorKeyPair as t, MessageQueueDepth as tt, RequestContext as u, CircuitBreakerKvState as ut, Federatable as v, ActorDispatcher as vt, FederationStartQueueOptions as w, CollectionDispatcher as wt, FederationBuilder as x, AuthorizePredicate as xt, Federation as y, ActorHandleMapper as yt, createFederationBuilder as z, OutboxPermanentFailureHandler as zt };
+export { InProcessMessageQueue as $, MediaUploaderSetters as A, HashlinkMediaRequest as At, createFederationBuilder as B, OutboxPermanentFailureHandler as Bt, FederationFetchOptions as C, CollectionCounter as Ct, IdempotencyStrategy as D, CustomCollectionCursor as Dt, IdempotencyKeyCallback as E, CustomCollectionCounter as Et, FederationKvPrefixes as F, ObjectAuthorizePredicate as Ft, TaskRegistry as G, WebFingerLinksDispatcher as Gt, TaskDefinitionOptions as H, SharedInboxKeyDispatcher as Ht, FederationOrigin as I, ObjectDispatcher as It, RetryPolicy as J, PageItems as Jt, CreateExponentialBackoffPolicyOptions as K, SendActivityError as Kt, FederationQueueOptions as L, OutboxErrorHandler as Lt, OutboxListenerSetters as M, InboxListener as Mt, PortableInboxForwardingOptions as N, MediaUploaderCallback as Nt, InboxChallengePolicy as O, CustomCollectionDispatcher as Ot, Rfc6570Expression as P, NodeInfoDispatcher as Pt, respondWithObjectIfAcceptable as Q, createFederation as R, OutboxListener as Rt, FederationBuilder as S, AuthorizePredicate as St, FederationStartQueueOptions as T, CollectionDispatcher as Tt, TaskEnqueueOptions as U, UnverifiedActivityHandler as Ut, TaskDefinition as V, PortableActorIdMapper as Vt, TaskHandler as W, UnverifiedActivityReason as Wt, RespondWithObjectOptions as X, digest as Xt, createExponentialBackoffPolicy as Y, buildCollectionSynchronizationHeader as Yt, respondWithObject as Z, ActivityTransformer as Zt, ConstructorWithTypeId as _, parseCircuitBreakerKvState as _t, GetObjectOptions as a, ParallelMessageQueue as at, Federation as b, ActorHandleMapper as bt, OutboxContext as c, CircuitBreakerBeforeSendDecision as ct, RequestContext as d, CircuitBreakerKvState as dt, InProcessMessageQueueOptions as et, RouteActivityOptions as f, CircuitBreakerOptions as ft, CollectionCallbackSetters as g, normalizeCircuitBreakerOptions as gt, ActorCallbackSetters as h, NormalizedCircuitBreakerOptions as ht, GetActorOptions as i, MessageQueueListenOptions as it, ObjectCallbackSetters as j, InboxErrorHandler as jt, InboxListenerSetters as k, HashlinkMediaDispatcher as kt, ParseUriResult as l, CircuitBreakerCreateOptions as lt, SendActivityOptionsForCollection as m, CircuitBreakerStateChange as mt, Context as n, MessageQueueDepth as nt, GetSignedKeyOptions as o, CircuitBreaker as ot, SendActivityOptions as p, CircuitBreakerState as pt, RetryContext as q, SenderKeyPair as qt, ForwardActivityOptions as r, MessageQueueEnqueueOptions as rt, InboxContext as s, CircuitBreakerActivityDrop as st, ActorKeyPair as t, MessageQueue as tt, PortableRequest as u, CircuitBreakerFailurePolicy as ut, CustomCollectionCallbackSetters as v, ActorAliasMapper as vt, FederationOptions as w, CollectionCursor as wt, FederationBenchmarkOptions as x, ActorKeyPairsDispatcher as xt, Federatable as y, ActorDispatcher as yt, Message as z, OutboxListenerErrorHandler as zt };

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

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

package/dist/{docloader-C1hAJnWc.mjs → docloader-Bby5g2iu.mjs}

@@ -1,8 +1,8 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { s as validateCryptoKey } from "./key-I8gLBkcf.mjs";
-import { n as doubleKnock } from "./http-BU-8fUrz.mjs";
+import { c as validateCryptoKey } from "./key-CkNxztNV.mjs";
+import { n as doubleKnock } from "./http-BcLnr2do.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-CHht75pX.mjs";
+import { r as createFederationBuilder } from "../builder-CZcBWrBd.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 { t as exportJwk } from "../key-I8gLBkcf.mjs";
+import { n as exportJwk } from "../key-CkNxztNV.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "../outgoing-jsonld-4IJqPYos.mjs";
-import { i as signObject, u as verifyProof } from "../proof-BE4T5zF6.mjs";
+import { i as signObject, u as verifyProof } from "../proof-xdPYGPaA.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-FnITXhtz.mjs";
+import { n as FederationImpl } from "../middleware-BpwKvOpU.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-wiJbqJHa.mjs";
-import { l as signRequest } from "../http-BU-8fUrz.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 rsaPrivateKey3, c as rsaPublicKey3, n as ed25519PrivateKey, r as ed25519PublicKey } from "../keys-DIJNHW-Y.mjs";
-import { f as handleInbox, o as createFederation } from "../middleware-FnITXhtz.mjs";
+import { f as handleInbox, o as createFederation } from "../middleware-BpwKvOpU.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";