@fedify/fedify 2.0.0-pr.490.2 → 2.0.0-pr.559.4

package/dist/federation/middleware.test.js

@@ -3,38 +3,40 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { Activity, Announce, Create, Invite, Multikey, Note, Object as Object$1, Offer, Person, RouterError, getTypeId, lookupObject } from "../lookup-Dj9-mgOn.js";
+import { mockDocumentLoader, test } from "../dist-B5f6a8Tt.js";
 import { assertEquals } from "../assert_equals-DSbWqCm3.js";
 import { assert } from "../assert-MZs1qjMx.js";
 import { assertInstanceOf } from "../assert_instance_of-DHz7EHNU.js";
-import { MemoryKvStore } from "../kv-CRZrzyXm.js";
-import { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, createFederation } from "../middleware-BIqFwRwI.js";
-import "../client-pY7-3icS.js";
-import "../types-C2XVl6gj.js";
-import "../actor-BT-e5fn9.js";
-import "../key-x7E5PYI0.js";
-import { signRequest, verifyRequest } from "../http-DH47B-h3.js";
-import { detachSignature, signJsonLd, verifyJsonLd } from "../ld-CRPaU6c8.js";
-import { doesActorOwnKey } from "../owner-CIWnopkT.js";
-import { signObject, verifyObject } from "../proof-D-5ri6rf.js";
-import { fetchDocumentLoader, getAuthenticatedDocumentLoader } from "../docloader-DndkGj0O.js";
-import "../kv-cache-DN9pfMBe.js";
-import "../inbox-CEyHvxOo.js";
-import "../builder-4syLV1-z.js";
-import "../collection-BzWsN9pB.js";
-import "../keycache-BRXuBDuy.js";
-import "../negotiation-C4nFufNk.js";
-import "../retry-CfF8Gn4d.js";
-import "../send-CPGk9QKZ.js";
-import { mockDocumentLoader, test } from "../testing-BslrM_9E.js";
+import { MemoryKvStore } from "../kv-QzKcOQgP.js";
+import "../deno-DGx1JZHr.js";
+import { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, createFederation } from "../middleware-WokE4qxc.js";
+import "../client-Dg7OfUDA.js";
+import { RouterError } from "../router-D9eI0s4b.js";
+import "../types-CPz01LGH.js";
+import "../key-BCtt1Ugy.js";
+import { signRequest, verifyRequest } from "../http-LGtYlSfN.js";
+import { detachSignature, signJsonLd, verifyJsonLd } from "../ld-QlZPwGEH.js";
+import { doesActorOwnKey } from "../owner-Cejm-F7S.js";
+import { signObject, verifyObject } from "../proof-BOQBHd-i.js";
+import { fetchDocumentLoader, getAuthenticatedDocumentLoader } from "../docloader-D8UHsyqD.js";
+import "../kv-cache-B__dHl7g.js";
+import "../inbox-DbtWQY2D.js";
+import "../builder-DTlQwmVF.js";
+import "../collection-CcnIw1qY.js";
+import "../keycache-DRxpZ5r9.js";
+import "../negotiation-5NPJL6zp.js";
+import "../retry-D4GJ670a.js";
+import "../send-jFxXfsN8.js";
 import { assertStrictEquals } from "../std__assert-DWivtrGR.js";
 import { assertFalse, assertRejects } from "../assert_rejects-Ce45JcFg.js";
 import { assertThrows } from "../assert_throws-BNXdRGWP.js";
 import { assertNotEquals } from "../assert_not_equals-C80BG-_5.js";
-import { ed25519Multikey, ed25519PrivateKey, ed25519PublicKey, rsaPrivateKey2, rsaPrivateKey3, rsaPublicKey2, rsaPublicKey3 } from "../keys-DLk_8H-l.js";
-import { esm_default } from "../esm-VlKMJQqV.js";
+import { ed25519Multikey, ed25519PrivateKey, ed25519PublicKey, rsaPrivateKey2, rsaPrivateKey3, rsaPublicKey2, rsaPublicKey3 } from "../keys-ZbcByPg9.js";
+import { esm_default } from "../esm-DGl7uK1r.js";
+import * as vocab from "@fedify/vocab";
+import { getTypeId, lookupObject } from "@fedify/vocab";
 
-//#region src/testing/fixtures/example.com/create.json
+//#region ../fixture/src/fixtures/example.com/create.json
 var __context$2 = "https://www.w3.org/ns/activitystreams";
 var type$2 = "Create";
 var id$2 = "https://example.com/create";
@@ -47,7 +49,7 @@ var create_default = {
 };
 
 //#endregion
-//#region src/testing/fixtures/example.com/person.json
+//#region ../fixture/src/fixtures/example.com/person.json
 var __context$1 = ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"];
 var id$1 = "https://example.com/person";
 var type$1 = "Person";
@@ -71,7 +73,7 @@ var person_default = {
 };
 
 //#endregion
-//#region src/testing/fixtures/example.com/person2.json
+//#region ../fixture/src/fixtures/example.com/person2.json
 var __context = [
 	"https://www.w3.org/ns/activitystreams",
 	"https://w3id.org/security/v1",
@@ -257,7 +259,7 @@ test({
 			assertStrictEquals(ctx.federation, federation);
 			assertThrows(() => ctx.getNodeInfoUri(), RouterError);
 			assertThrows(() => ctx.getActorUri("handle"), RouterError);
-			assertThrows(() => ctx.getObjectUri(Note, {
+			assertThrows(() => ctx.getObjectUri(vocab.Note, {
 				handle: "handle",
 				id: "id"
 			}), RouterError);
@@ -274,7 +276,7 @@ test({
 			assertEquals(ctx.parseUri(null), null);
 			assertEquals(await ctx.getActorKeyPairs("handle"), []);
 			await assertRejects(() => ctx.getDocumentLoader({ identifier: "handle" }), Error, "No actor key pairs dispatcher registered");
-			await assertRejects(() => ctx.sendActivity({ identifier: "handle" }, [], new Create({})), Error, "No actor key pairs dispatcher registered");
+			await assertRejects(() => ctx.sendActivity({ identifier: "handle" }, [], new vocab.Create({})), Error, "No actor key pairs dispatcher registered");
 			federation.setNodeInfoDispatcher("/nodeinfo/2.1", () => ({
 				software: {
 					name: "Example",
@@ -289,7 +291,7 @@ test({
 			}));
 			ctx = federation.createContext(new URL("https://example.com/"), 123);
 			assertEquals(ctx.getNodeInfoUri(), new URL("https://example.com/nodeinfo/2.1"));
-			federation.setActorDispatcher("/users/{identifier}", () => new Person({})).setKeyPairsDispatcher(() => [{
+			federation.setActorDispatcher("/users/{identifier}", () => new vocab.Person({})).setKeyPairsDispatcher(() => [{
 				privateKey: rsaPrivateKey2,
 				publicKey: rsaPublicKey2.publicKey
 			}, {
@@ -313,7 +315,7 @@ test({
 					id: new URL("https://example.com/users/handle#main-key"),
 					owner: new URL("https://example.com/users/handle")
 				}),
-				multikey: new Multikey({
+				multikey: new vocab.Multikey({
 					id: new URL("https://example.com/users/handle#main-key"),
 					controller: new URL("https://example.com/users/handle"),
 					publicKey: rsaPublicKey2.publicKey
@@ -326,7 +328,7 @@ test({
 					id: new URL("https://example.com/users/handle#key-2"),
 					owner: new URL("https://example.com/users/handle")
 				}),
-				multikey: new Multikey({
+				multikey: new vocab.Multikey({
 					id: new URL("https://example.com/users/handle#key-2"),
 					controller: new URL("https://example.com/users/handle"),
 					publicKey: ed25519PublicKey.publicKey
@@ -354,8 +356,8 @@ test({
 				document: true
 			});
 			assertEquals(await ctx.lookupObject("https://example.com/object"), null);
-			await assertRejects(() => ctx.sendActivity({ identifier: "handle" }, [], new Create({})), TypeError, "The activity to send must have at least one actor property.");
-			await ctx.sendActivity({ identifier: "handle" }, [], new Create({ actor: new URL("https://example.com/users/handle") }));
+			await assertRejects(() => ctx.sendActivity({ identifier: "handle" }, [], new vocab.Create({})), TypeError, "The activity to send must have at least one actor property.");
+			await ctx.sendActivity({ identifier: "handle" }, [], new vocab.Create({ actor: new URL("https://example.com/users/handle") }));
 			esm_default.get("https://example.com/object", () => new Response(JSON.stringify({
 				"@context": "https://www.w3.org/ns/activitystreams",
 				type: "Object",
@@ -368,21 +370,21 @@ test({
 				contextLoaderFactory: () => mockDocumentLoader
 			});
 			const ctx2 = federation2.createContext(new URL("https://example.com/"), 123);
-			assertEquals(await ctx2.lookupObject("https://example.com/object"), new Object$1({
+			assertEquals(await ctx2.lookupObject("https://example.com/object"), new vocab.Object({
 				id: new URL("https://example.com/object"),
 				name: "Fetched object"
 			}));
-			federation.setObjectDispatcher(Note, "/users/{identifier}/notes/{id}", (_ctx, values) => {
-				return new Note({ summary: `Note ${values.id} by ${values.identifier}` });
+			federation.setObjectDispatcher(vocab.Note, "/users/{identifier}/notes/{id}", (_ctx, values) => {
+				return new vocab.Note({ summary: `Note ${values.id} by ${values.identifier}` });
 			});
 			ctx = federation.createContext(new URL("https://example.com/"), 123);
-			assertEquals(ctx.getObjectUri(Note, {
+			assertEquals(ctx.getObjectUri(vocab.Note, {
 				identifier: "john",
 				id: "123"
 			}), new URL("https://example.com/users/john/notes/123"));
 			assertEquals(ctx.parseUri(new URL("https://example.com/users/john/notes/123")), {
 				type: "object",
-				class: Note,
+				class: vocab.Note,
 				typeId: new URL("https://www.w3.org/ns/activitystreams#Note"),
 				values: {
 					identifier: "john",
@@ -485,7 +487,7 @@ test({
 				}
 			}));
 			assertEquals(ctx.getNodeInfoUri(), new URL("https://ap.example.com/nodeinfo/2.1"));
-			federation.setActorDispatcher("/users/{identifier}", () => new Person({}));
+			federation.setActorDispatcher("/users/{identifier}", () => new vocab.Person({}));
 			assertEquals(ctx.getActorUri("handle"), new URL("https://ap.example.com/users/handle"));
 			assertEquals(ctx.parseUri(new URL("https://ap.example.com/users/handle")), {
 				type: "actor",
@@ -497,16 +499,16 @@ test({
 				handle: "handle",
 				identifier: "handle"
 			});
-			federation.setObjectDispatcher(Note, "/users/{identifier}/notes/{id}", (_ctx, values) => {
-				return new Note({ summary: `Note ${values.id} by ${values.identifier}` });
+			federation.setObjectDispatcher(vocab.Note, "/users/{identifier}/notes/{id}", (_ctx, values) => {
+				return new vocab.Note({ summary: `Note ${values.id} by ${values.identifier}` });
 			});
-			assertEquals(ctx.getObjectUri(Note, {
+			assertEquals(ctx.getObjectUri(vocab.Note, {
 				identifier: "john",
 				id: "123"
 			}), new URL("https://ap.example.com/users/john/notes/123"));
 			assertEquals(ctx.parseUri(new URL("https://ap.example.com/users/john/notes/123")), {
 				type: "object",
-				class: Note,
+				class: vocab.Note,
 				typeId: new URL("https://www.w3.org/ns/activitystreams#Note"),
 				values: {
 					identifier: "john",
@@ -515,7 +517,7 @@ test({
 			});
 			assertEquals(ctx.parseUri(new URL("https://example.com:1234/users/john/notes/123")), {
 				type: "object",
-				class: Note,
+				class: vocab.Note,
 				typeId: new URL("https://www.w3.org/ns/activitystreams#Note"),
 				values: {
 					identifier: "john",
@@ -702,7 +704,7 @@ test({
 			assertEquals(ctx.hostname, "example.com");
 			assertEquals(ctx.data, 123);
 			await assertRejects(() => ctx.getActor("someone"), Error);
-			await assertRejects(() => ctx.getObject(Note, {
+			await assertRejects(() => ctx.getObject(vocab.Note, {
 				handle: "someone",
 				id: "123"
 			}), Error);
@@ -733,23 +735,23 @@ test({
 			assertEquals(await signedCtx2.getSignedKeyOwner(), expectedOwner);
 			assertEquals(await signedCtx2.getSignedKey(), rsaPublicKey3);
 			assertEquals(await signedCtx2.getSignedKeyOwner(), expectedOwner);
-			federation.setActorDispatcher("/users/{identifier}", (_ctx, identifier) => new Person({ preferredUsername: identifier }));
+			federation.setActorDispatcher("/users/{identifier}", (_ctx, identifier) => new vocab.Person({ preferredUsername: identifier }));
 			const ctx2 = federation.createContext(req, 789);
 			assertEquals(ctx2.request, req);
 			assertEquals(ctx2.url, new URL("https://example.com/"));
 			assertEquals(ctx2.data, 789);
-			assertEquals(await ctx2.getActor("john"), new Person({ preferredUsername: "john" }));
-			federation.setObjectDispatcher(Note, "/users/{identifier}/notes/{id}", (_ctx, values) => {
-				return new Note({ summary: `Note ${values.id} by ${values.identifier}` });
+			assertEquals(await ctx2.getActor("john"), new vocab.Person({ preferredUsername: "john" }));
+			federation.setObjectDispatcher(vocab.Note, "/users/{identifier}/notes/{id}", (_ctx, values) => {
+				return new vocab.Note({ summary: `Note ${values.id} by ${values.identifier}` });
 			});
 			const ctx3 = federation.createContext(req, 123);
 			assertEquals(ctx3.request, req);
 			assertEquals(ctx3.url, new URL("https://example.com/"));
 			assertEquals(ctx3.data, 123);
-			assertEquals(await ctx2.getObject(Note, {
+			assertEquals(await ctx2.getObject(vocab.Note, {
 				identifier: "john",
 				id: "123"
-			}), new Note({ summary: "Note 123 by john" }));
+			}), new vocab.Note({ summary: "Note 123 by john" }));
 		});
 		await t.step("RequestContext.clone()", () => {
 			const federation = createFederation({ kv });
@@ -797,7 +799,7 @@ test("Federation.fetch()", async (t) => {
 		});
 		federation.setActorDispatcher("/users/{identifier}", (ctx, identifier) => {
 			dispatches.push(identifier);
-			return new Person({
+			return new vocab.Person({
 				id: ctx.getActorUri(identifier),
 				inbox: ctx.getInboxUri(identifier),
 				preferredUsername: identifier
@@ -811,7 +813,7 @@ test("Federation.fetch()", async (t) => {
 		federation.setInboxDispatcher("/users/{identifier}/inbox", () => {
 			return { items: [] };
 		});
-		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(Create, (_ctx, activity) => {
+		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(vocab.Create, (_ctx, activity) => {
 			inbox.push(activity.id.toString());
 			return;
 		});
@@ -969,7 +971,7 @@ test("Federation.setInboxListeners()", async (t) => {
 			}
 		});
 		const inbox = [];
-		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(Create, (ctx, create) => {
+		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(vocab.Create, (ctx, create) => {
 			inbox.push([ctx, create]);
 		});
 		let response = await federation.fetch(new Request("https://example.com/inbox", {
@@ -978,7 +980,7 @@ test("Federation.setInboxListeners()", async (t) => {
 		}), { contextData: void 0 });
 		assertEquals(inbox, []);
 		assertEquals(response.status, 404);
-		federation.setActorDispatcher("/users/{identifier}", (_, identifier) => identifier === "john" ? new Person({}) : null).setKeyPairsDispatcher(() => [{
+		federation.setActorDispatcher("/users/{identifier}", (_, identifier) => identifier === "john" ? new vocab.Person({}) : null).setKeyPairsDispatcher(() => [{
 			privateKey: rsaPrivateKey2,
 			publicKey: rsaPublicKey2.publicKey
 		}]);
@@ -986,7 +988,7 @@ test("Federation.setInboxListeners()", async (t) => {
 			documentLoader: mockDocumentLoader,
 			contextLoader: mockDocumentLoader
 		};
-		const activity = () => new Create({
+		const activity = () => new vocab.Create({
 			id: new URL("https://example.com/activities/" + crypto.randomUUID()),
 			actor: new URL("https://example.com/person2")
 		});
@@ -1103,18 +1105,18 @@ test("Federation.setInboxListeners()", async (t) => {
 				};
 			}
 		});
-		federation.setActorDispatcher("/users/{identifier}", (_, identifier) => identifier === "john" ? new Person({}) : null).setKeyPairsDispatcher(() => [{
+		federation.setActorDispatcher("/users/{identifier}", (_, identifier) => identifier === "john" ? new vocab.Person({}) : null).setKeyPairsDispatcher(() => [{
 			privateKey: rsaPrivateKey2,
 			publicKey: rsaPublicKey2.publicKey
 		}]);
 		const error = /* @__PURE__ */ new Error("test");
 		const errors = [];
-		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(Create, () => {
+		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(vocab.Create, () => {
 			throw error;
 		}).onError((_, e) => {
 			errors.push(e);
 		});
-		const activity = new Create({ actor: new URL("https://example.com/person") });
+		const activity = new vocab.Create({ actor: new URL("https://example.com/person") });
 		let request = new Request("https://example.com/users/john/inbox", {
 			method: "POST",
 			headers: {
@@ -1173,8 +1175,8 @@ test("FederationImpl.sendActivity()", async (t) => {
 		let json = await cl.request.json();
 		if (await verifyJsonLd(json, options)) verified.push("ld");
 		json = detachSignature(json);
-		let activity = await verifyObject(Activity, json, options);
-		if (activity == null) activity = await Activity.fromJsonLd(json, options);
+		let activity = await verifyObject(vocab.Activity, json, options);
+		if (activity == null) activity = await vocab.Activity.fromJsonLd(json, options);
 		else verified.push("proof");
 		const key = await verifyRequest(request, options);
 		if (key != null && await doesActorOwnKey(activity, key, options)) verified.push("http");
@@ -1188,7 +1190,7 @@ test("FederationImpl.sendActivity()", async (t) => {
 	});
 	const context = federation.createContext(new URL("https://example.com/"));
 	await t.step("success", async () => {
-		const activity = new Create({
+		const activity = new vocab.Create({
 			id: new URL("https://example.com/activity/1"),
 			actor: new URL("https://example.com/person")
 		});
@@ -1263,7 +1265,7 @@ test("FederationImpl.processQueuedTask()", async (t) => {
 			kv,
 			queue
 		});
-		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(Create, () => {
+		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(vocab.Create, () => {
 			throw new Error("Intended error for testing");
 		});
 		await assertRejects(() => federation.processQueuedTask(void 0, {
@@ -1325,7 +1327,7 @@ test("FederationImpl.processQueuedTask()", async (t) => {
 			kv,
 			queue
 		});
-		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(Create, () => {
+		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(vocab.Create, () => {
 			throw new Error("Intended error for testing");
 		});
 		const outboxMessage = {
@@ -1381,6 +1383,166 @@ test("FederationImpl.processQueuedTask()", async (t) => {
 		}]);
 	});
 });
+test("FederationImpl.processQueuedTask() permanent failure", async (t) => {
+	esm_default.spyGlobal();
+	esm_default.post("https://gone.example/inbox", {
+		status: 410,
+		body: "Gone"
+	});
+	esm_default.post("https://notfound.example/inbox", {
+		status: 404,
+		body: "Not Found"
+	});
+	esm_default.post("https://error.example/inbox", {
+		status: 500,
+		body: "Internal Server Error"
+	});
+	esm_default.post("https://legal.example/inbox", {
+		status: 451,
+		body: "Unavailable For Legal Reasons"
+	});
+	function setup(options = {}) {
+		const kv = new MemoryKvStore();
+		const queuedMessages = [];
+		const queue = {
+			...options.nativeRetrial ? { nativeRetrial: true } : {},
+			enqueue(message, _options) {
+				queuedMessages.push(message);
+				return Promise.resolve();
+			},
+			listen(_handler, _options) {
+				return Promise.resolve();
+			}
+		};
+		const federation = new FederationImpl({
+			kv,
+			queue,
+			...options.permanentFailureStatusCodes ? { permanentFailureStatusCodes: options.permanentFailureStatusCodes } : {}
+		});
+		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox");
+		return {
+			federation,
+			queuedMessages
+		};
+	}
+	function createOutboxMessage(inbox, activityId, actorIds) {
+		return {
+			type: "outbox",
+			id: crypto.randomUUID(),
+			baseUrl: "https://example.com",
+			keys: [],
+			activity: {
+				"@context": "https://www.w3.org/ns/activitystreams",
+				type: "Create",
+				id: activityId,
+				actor: "https://example.com/users/alice",
+				object: {
+					type: "Note",
+					content: "test"
+				}
+			},
+			activityType: "https://www.w3.org/ns/activitystreams#Create",
+			inbox,
+			sharedInbox: false,
+			...actorIds != null ? { actorIds } : {},
+			started: (/* @__PURE__ */ new Date()).toISOString(),
+			attempt: 0,
+			headers: {},
+			traceContext: {}
+		};
+	}
+	await t.step("410 Gone triggers permanent failure handler", async () => {
+		const { federation, queuedMessages } = setup();
+		let handlerCalled = false;
+		let handlerValues = {};
+		federation.setOutboxPermanentFailureHandler((_ctx, values) => {
+			handlerCalled = true;
+			handlerValues = { ...values };
+		});
+		await federation.processQueuedTask(void 0, createOutboxMessage("https://gone.example/inbox", "https://example.com/activity/1", ["https://gone.example/users/bob", "https://gone.example/users/charlie"]));
+		assert(handlerCalled, "Permanent failure handler should be called");
+		assertEquals(handlerValues.inbox, new URL("https://gone.example/inbox"));
+		assertEquals(handlerValues.statusCode, 410);
+		assertInstanceOf(handlerValues.activity, vocab.Create);
+		assertEquals(handlerValues.actorIds, [new URL("https://gone.example/users/bob"), new URL("https://gone.example/users/charlie")]);
+		assertEquals(queuedMessages, []);
+	});
+	await t.step("404 Not Found triggers permanent failure handler", async () => {
+		const { federation, queuedMessages } = setup();
+		let handlerCalled = false;
+		let handlerStatusCode = 0;
+		federation.setOutboxPermanentFailureHandler((_ctx, values) => {
+			handlerCalled = true;
+			handlerStatusCode = values.statusCode;
+		});
+		await federation.processQueuedTask(void 0, createOutboxMessage("https://notfound.example/inbox", "https://example.com/activity/2", ["https://notfound.example/users/bob"]));
+		assert(handlerCalled, "Permanent failure handler should be called");
+		assertEquals(handlerStatusCode, 404);
+		assertEquals(queuedMessages, []);
+	});
+	await t.step("500 error does NOT trigger permanent failure handler", async () => {
+		const { federation, queuedMessages } = setup();
+		let handlerCalled = false;
+		federation.setOutboxPermanentFailureHandler(() => {
+			handlerCalled = true;
+		});
+		await federation.processQueuedTask(void 0, createOutboxMessage("https://error.example/inbox", "https://example.com/activity/3", ["https://error.example/users/bob"]));
+		assertFalse(handlerCalled, "Permanent failure handler should NOT be called");
+		assertEquals(queuedMessages.length, 1);
+		assertEquals(queuedMessages[0].attempt, 1);
+	});
+	await t.step("custom permanentFailureStatusCodes", async () => {
+		const { federation, queuedMessages } = setup({ permanentFailureStatusCodes: [
+			404,
+			410,
+			451
+		] });
+		let handlerCalled = false;
+		let handlerStatusCode = 0;
+		federation.setOutboxPermanentFailureHandler((_ctx, values) => {
+			handlerCalled = true;
+			handlerStatusCode = values.statusCode;
+		});
+		await federation.processQueuedTask(void 0, createOutboxMessage("https://legal.example/inbox", "https://example.com/activity/4", ["https://legal.example/users/bob"]));
+		assert(handlerCalled, "Permanent failure handler should be called for 451");
+		assertEquals(handlerStatusCode, 451);
+		assertEquals(queuedMessages, []);
+	});
+	await t.step("handler exception is caught and logged", async () => {
+		const { federation, queuedMessages } = setup();
+		federation.setOutboxPermanentFailureHandler(() => {
+			throw new Error("Handler error that should be ignored");
+		});
+		await federation.processQueuedTask(void 0, createOutboxMessage("https://gone.example/inbox", "https://example.com/activity/5", ["https://gone.example/users/bob"]));
+		assertEquals(queuedMessages, []);
+	});
+	await t.step("permanent failure skips retry without handler registered", async () => {
+		const { federation, queuedMessages } = setup();
+		await federation.processQueuedTask(void 0, createOutboxMessage("https://gone.example/inbox", "https://example.com/activity/6", []));
+		assertEquals(queuedMessages, []);
+	});
+	await t.step("nativeRetrial: permanent failure does not re-throw", async () => {
+		const { federation, queuedMessages } = setup({ nativeRetrial: true });
+		let handlerCalled = false;
+		federation.setOutboxPermanentFailureHandler(() => {
+			handlerCalled = true;
+		});
+		await federation.processQueuedTask(void 0, createOutboxMessage("https://gone.example/inbox", "https://example.com/activity/7", ["https://gone.example/users/bob"]));
+		assert(handlerCalled, "Permanent failure handler should be called");
+		assertEquals(queuedMessages, []);
+	});
+	await t.step("actorIds missing from message defaults to empty array", async () => {
+		const { federation, queuedMessages } = setup();
+		let handlerActorIds = [];
+		federation.setOutboxPermanentFailureHandler((_ctx, values) => {
+			handlerActorIds = values.actorIds;
+		});
+		await federation.processQueuedTask(void 0, createOutboxMessage("https://gone.example/inbox", "https://example.com/activity/8"));
+		assertEquals(handlerActorIds, []);
+		assertEquals(queuedMessages, []);
+	});
+	esm_default.hardReset();
+});
 test("ContextImpl.lookupObject()", async (t) => {
 	esm_default.spyGlobal();
 	esm_default.get("begin:https://localhost/.well-known/webfinger", {
@@ -1410,7 +1572,7 @@ test("ContextImpl.lookupObject()", async (t) => {
 		});
 		const ctx = federation.createContext(new URL("https://example.com/"));
 		const result = await ctx.lookupObject("@test@localhost");
-		assertInstanceOf(result, Person);
+		assertInstanceOf(result, vocab.Person);
 		assertEquals(result.id, new URL("https://localhost/actor"));
 		assertEquals(result.preferredUsername, "test");
 	});
@@ -1459,8 +1621,8 @@ test("ContextImpl.sendActivity()", async (t) => {
 		let json = await cl.request.json();
 		if (await verifyJsonLd(json, options)) verified.push("ld");
 		json = detachSignature(json);
-		let activity = await verifyObject(Activity, json, options);
-		if (activity == null) activity = await Activity.fromJsonLd(json, options);
+		let activity = await verifyObject(vocab.Activity, json, options);
+		if (activity == null) activity = await vocab.Activity.fromJsonLd(json, options);
 		else verified.push("proof");
 		const key = await verifyRequest(request, options);
 		if (key != null && await doesActorOwnKey(activity, key, options)) verified.push("http");
@@ -1475,7 +1637,7 @@ test("ContextImpl.sendActivity()", async (t) => {
 	federation.setActorDispatcher("/{identifier}", async (ctx, identifier) => {
 		if (identifier !== "1") return null;
 		const keys = await ctx.getActorKeyPairs(identifier);
-		return new Person({
+		return new vocab.Person({
 			id: ctx.getActorUri(identifier),
 			preferredUsername: "john",
 			publicKey: keys[0].cryptographicKey,
@@ -1496,7 +1658,7 @@ test("ContextImpl.sendActivity()", async (t) => {
 		inboxId: new URL("https://example.com/inbox")
 	}] }));
 	await t.step("success", async () => {
-		const activity = new Create({ actor: new URL("https://example.com/person") });
+		const activity = new vocab.Create({ actor: new URL("https://example.com/person") });
 		const ctx = new ContextImpl({
 			data: void 0,
 			federation,
@@ -1585,7 +1747,7 @@ test("ContextImpl.sendActivity()", async (t) => {
 	federation2.setActorDispatcher("/{identifier}", async (ctx, identifier) => {
 		if (identifier !== "john") return null;
 		const keys = await ctx.getActorKeyPairs(identifier);
-		return new Person({
+		return new vocab.Person({
 			id: ctx.getActorUri(identifier),
 			preferredUsername: "john",
 			publicKey: keys[0].cryptographicKey,
@@ -1609,7 +1771,7 @@ test("ContextImpl.sendActivity()", async (t) => {
 		contextLoader: fetchDocumentLoader
 	});
 	await t.step("fanout: \"force\"", async () => {
-		const activity = new Create({
+		const activity = new vocab.Create({
 			id: new URL("https://example.com/activity/1"),
 			actor: new URL("https://example.com/person")
 		});
@@ -1633,12 +1795,13 @@ test("ContextImpl.sendActivity()", async (t) => {
 				sharedInbox: false
 			} },
 			keys: queue.messages[0].type === "fanout" ? queue.messages[0].keys : [],
+			orderingKey: void 0,
 			traceContext: {}
 		}]);
 	});
 	queue.clear();
 	await t.step("fanout: \"skip\"", async () => {
-		const activity = new Create({
+		const activity = new vocab.Create({
 			id: new URL("https://example.com/activity/1"),
 			actor: new URL("https://example.com/person")
 		});
@@ -1653,7 +1816,7 @@ test("ContextImpl.sendActivity()", async (t) => {
 	});
 	queue.clear();
 	await t.step("fanout: \"auto\"", async () => {
-		const activity = new Create({
+		const activity = new vocab.Create({
 			id: new URL("https://example.com/activity/1"),
 			actor: new URL("https://example.com/person")
 		});
@@ -1702,7 +1865,7 @@ test("ContextImpl.sendActivity()", async (t) => {
 			documentLoader: fetchDocumentLoader,
 			contextLoader: fetchDocumentLoader
 		});
-		const activity = new Create({
+		const activity = new vocab.Create({
 			id: new URL("https://example.com/activity/1"),
 			actor: ctx.getActorUri("1"),
 			to: ctx.getFollowersUri("1")
@@ -1719,7 +1882,7 @@ test("ContextImpl.sendActivity()", async (t) => {
 			documentLoader: fetchDocumentLoader,
 			contextLoader: fetchDocumentLoader
 		});
-		const activity = new Create({
+		const activity = new vocab.Create({
 			id: new URL("https://example.com/activity/2"),
 			actor: ctx.getActorUri("1"),
 			to: ctx.getFollowersUri("1")
@@ -1730,6 +1893,57 @@ test("ContextImpl.sendActivity()", async (t) => {
 		});
 		assertNotEquals(collectionSyncHeader, null);
 	});
+	queue.clear();
+	await t.step("orderingKey with fanout: \"force\"", async () => {
+		const activity = new vocab.Create({
+			id: new URL("https://example.com/activity/ordering-1"),
+			actor: new URL("https://example.com/person")
+		});
+		await ctx2.sendActivity({ username: "john" }, {
+			id: new URL("https://example.com/recipient"),
+			inboxId: new URL("https://example.com/inbox")
+		}, activity, {
+			fanout: "force",
+			orderingKey: "https://example.com/note/1"
+		});
+		assertEquals(queue.messages.length, 1);
+		const fanoutMessage = queue.messages[0];
+		assertEquals(fanoutMessage.type, "fanout");
+		if (fanoutMessage.type === "fanout") assertEquals(fanoutMessage.orderingKey, "https://example.com/note/1");
+	});
+	queue.clear();
+	await t.step("orderingKey with fanout: \"skip\"", async () => {
+		const activity = new vocab.Create({
+			id: new URL("https://example.com/activity/ordering-2"),
+			actor: new URL("https://example.com/person")
+		});
+		await ctx2.sendActivity({ username: "john" }, {
+			id: new URL("https://example.com/recipient"),
+			inboxId: new URL("https://example.com/inbox")
+		}, activity, {
+			fanout: "skip",
+			orderingKey: "https://example.com/note/2"
+		});
+		assertEquals(queue.messages.length, 1);
+		const outboxMessage = queue.messages[0];
+		assertEquals(outboxMessage.type, "outbox");
+		if (outboxMessage.type === "outbox") assertEquals(outboxMessage.orderingKey, "https://example.com/note/2\nhttps://example.com");
+	});
+	queue.clear();
+	await t.step("orderingKey not specified", async () => {
+		const activity = new vocab.Create({
+			id: new URL("https://example.com/activity/ordering-3"),
+			actor: new URL("https://example.com/person")
+		});
+		await ctx2.sendActivity({ username: "john" }, {
+			id: new URL("https://example.com/recipient"),
+			inboxId: new URL("https://example.com/inbox")
+		}, activity, { fanout: "force" });
+		assertEquals(queue.messages.length, 1);
+		const fanoutMessage2 = queue.messages[0];
+		assertEquals(fanoutMessage2.type, "fanout");
+		if (fanoutMessage2.type === "fanout") assertEquals(fanoutMessage2.orderingKey, void 0);
+	});
 	esm_default.hardReset();
 });
 test({
@@ -1741,7 +1955,7 @@ test({
 	async fn() {
 		const federation = new FederationImpl({ kv: new MemoryKvStore() });
 		const activities = [];
-		federation.setInboxListeners("/u/{identifier}/i", "/i").on(Offer, (ctx$1, offer) => {
+		federation.setInboxListeners("/u/{identifier}/i", "/i").on(vocab.Offer, (ctx$1, offer) => {
 			activities.push([ctx$1.recipient, offer]);
 		});
 		const ctx = new ContextImpl({
@@ -1751,52 +1965,52 @@ test({
 			documentLoader: mockDocumentLoader,
 			contextLoader: fetchDocumentLoader
 		});
-		assertFalse(await ctx.routeActivity(null, new Offer({ actor: new URL("https://example.com/person") })));
+		assertFalse(await ctx.routeActivity(null, new vocab.Offer({ actor: new URL("https://example.com/person") })));
 		assertEquals(activities, []);
-		const signedOffer = await signObject(new Offer({ actor: new URL("https://example.com/person2") }), ed25519PrivateKey, ed25519Multikey.id);
+		const signedOffer = await signObject(new vocab.Offer({ actor: new URL("https://example.com/person2") }), ed25519PrivateKey, ed25519Multikey.id);
 		assert(await ctx.routeActivity(null, signedOffer));
 		assertEquals(activities, [[null, signedOffer]]);
-		const signedInvite = await signObject(new Invite({ actor: new URL("https://example.com/person2") }), ed25519PrivateKey, ed25519Multikey.id);
+		const signedInvite = await signObject(new vocab.Invite({ actor: new URL("https://example.com/person2") }), ed25519PrivateKey, ed25519Multikey.id);
 		assert(await ctx.routeActivity("id", signedInvite));
 		assertEquals(activities, [[null, signedOffer], ["id", signedInvite]]);
-		assertFalse(await ctx.routeActivity(null, new Create({
+		assertFalse(await ctx.routeActivity(null, new vocab.Create({
 			id: new URL("https://example.com/not-found"),
 			actor: new URL("https://example.com/person")
 		})));
 		assertEquals(activities, [[null, signedOffer], ["id", signedInvite]]);
-		assertFalse(await ctx.routeActivity(null, new Create({
+		assertFalse(await ctx.routeActivity(null, new vocab.Create({
 			id: new URL("https://example.com/person"),
 			actor: new URL("https://example.com/person")
 		})));
 		assertEquals(activities, [[null, signedOffer], ["id", signedInvite]]);
-		assertFalse(await ctx.routeActivity(null, new Announce({
+		assertFalse(await ctx.routeActivity(null, new vocab.Announce({
 			id: new URL("https://example.com/announce#diffrent-id"),
 			actor: new URL("https://example.com/person")
 		})));
 		assertEquals(activities, [[null, signedOffer], ["id", signedInvite]]);
-		assertFalse(await ctx.routeActivity(null, new Announce({
+		assertFalse(await ctx.routeActivity(null, new vocab.Announce({
 			id: new URL("https://example.com/announce"),
 			actor: new URL("https://example.com/person")
 		})));
 		assertEquals(activities, [[null, signedOffer], ["id", signedInvite]]);
-		assertFalse(await ctx.routeActivity(null, new Create({
+		assertFalse(await ctx.routeActivity(null, new vocab.Create({
 			id: new URL("https://example.com/cross-origin-actor"),
 			actor: new URL("https://cross-origin.com/actor")
 		})));
 		assertEquals(activities, [[null, signedOffer], ["id", signedInvite]]);
-		assert(await ctx.routeActivity(null, new Create({
+		assert(await ctx.routeActivity(null, new vocab.Create({
 			id: new URL("https://example.com/create"),
 			actor: new URL("https://example.com/person")
 		})));
 		assertEquals(activities, [[null, signedOffer], ["id", signedInvite]]);
-		assert(await ctx.routeActivity(null, new Invite({
+		assert(await ctx.routeActivity(null, new vocab.Invite({
 			id: new URL("https://example.com/invite"),
 			actor: new URL("https://example.com/person")
 		})));
 		assertEquals(activities, [
 			[null, signedOffer],
 			["id", signedInvite],
-			[null, new Invite({
+			[null, new vocab.Invite({
 				id: new URL("https://example.com/invite"),
 				actor: new URL("https://example.com/person"),
 				object: new URL("https://example.com/object")
@@ -1818,15 +2032,15 @@ test("ContextImpl.getCollectionUri()", () => {
 	const dispatcher = (_ctx, _values) => ({ items: [] });
 	let url;
 	const strName = "registered";
-	federation.setCollectionDispatcher(strName, Object$1, "/string-route/{id}", dispatcher);
+	federation.setCollectionDispatcher(strName, vocab.Object, "/string-route/{id}", dispatcher);
 	url = ctx.getCollectionUri(strName, values);
 	assertEquals(url.href, `${base}/string-route/123`);
 	const unnamedSymName = Symbol(strName);
-	federation.setCollectionDispatcher(unnamedSymName, Object$1, "/symbol-route/{id}", dispatcher);
+	federation.setCollectionDispatcher(unnamedSymName, vocab.Object, "/symbol-route/{id}", dispatcher);
 	url = ctx.getCollectionUri(unnamedSymName, values);
 	assertEquals(url.href, `${base}/symbol-route/123`);
 	const namedSymName = Symbol.for(strName);
-	federation.setCollectionDispatcher(namedSymName, Object$1, "/named-symbol-route/{id}", dispatcher);
+	federation.setCollectionDispatcher(namedSymName, vocab.Object, "/named-symbol-route/{id}", dispatcher);
 	url = ctx.getCollectionUri(namedSymName, values);
 	assertEquals(url.href, `${base}/named-symbol-route/123`);
 	const notReg = "not-registered";
@@ -1848,8 +2062,8 @@ test("InboxContextImpl.forwardActivity()", async (t) => {
 		let json = await cl.request.json();
 		if (await verifyJsonLd(json, options)) verified.push("ld");
 		json = detachSignature(json);
-		let activity = await verifyObject(Activity, json, options);
-		if (activity == null) activity = await Activity.fromJsonLd(json, options);
+		let activity = await verifyObject(vocab.Activity, json, options);
+		if (activity == null) activity = await vocab.Activity.fromJsonLd(json, options);
 		else verified.push("proof");
 		const key = await verifyRequest(request, options);
 		if (key != null && await doesActorOwnKey(activity, key, options)) verified.push("http");
@@ -1908,7 +2122,7 @@ test("InboxContextImpl.forwardActivity()", async (t) => {
 		assertEquals(verified, []);
 	});
 	await t.step("Object Integrity Proofs", async () => {
-		const activity = await signObject(new Create({
+		const activity = await signObject(new vocab.Create({
 			id: new URL("https://example.com/activity"),
 			actor: new URL("https://example.com/person2")
 		}), ed25519PrivateKey, ed25519Multikey.id, {