@fedify/fedify 2.3.0-dev.1131 → 2.3.0-dev.1145

package/dist/federation/builder.test.mjs

@@ -1,12 +1,12 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as RouterError } from "../router-BT_F5748.mjs";
-import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import { r as assertExists } from "../std__assert-BTEgfoJo.mjs";
-import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
-import { t as MemoryKvStore } from "../kv-QHE0oeM3.mjs";
-import { r as createFederationBuilder } from "../builder-DckAhD27.mjs";
+import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
+import { r as assertExists } from "../std__assert-BBjXFNOb.mjs";
+import { t as assertThrows } from "../assert_throws-BOkhLGYc.mjs";
+import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
+import { r as createFederationBuilder } from "../builder-ShiR1K6b.mjs";
+import { DisallowedOperatorError, DisallowedVarSpecModifierError, DuplicateRouteVariableError, RouteTemplateOptionsNotMatchedError, RouterError } from "@fedify/uri-template";
 import { Activity, Note, Person } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
 //#region src/federation/builder.test.ts
@@ -74,6 +74,21 @@ test("FederationBuilder", async (t) => {
 		assertEquals(impl.router.build("inbox", { identifier: "user1" }), "/users/user1/inbox");
 		await builder.build({ kv });
 	});
+	await t.step("should snapshot router state on build", async () => {
+		const builder = createFederationBuilder();
+		const kv = new MemoryKvStore();
+		const noteRouteName = `object:${Note.typeId.href}`;
+		builder.setActorDispatcher("/users/{identifier}", () => null);
+		const impl1 = await builder.build({ kv });
+		builder.setObjectDispatcher(Note, "/notes/{id}", () => null);
+		assertEquals(impl1.router.route("/notes/1"), null);
+		const impl2 = await builder.build({ kv });
+		assertEquals(impl2.router.route("/notes/1")?.name, noteRouteName);
+		impl1.router.add("/leaked/{id}", "leaked");
+		assertEquals(impl1.router.route("/leaked/1")?.name, "leaked");
+		assertEquals(impl2.router.route("/leaked/1"), null);
+		assertEquals((await builder.build({ kv })).router.route("/leaked/1"), null);
+	});
 	await t.step("should build with default options", async () => {
 		const builder = createFederationBuilder();
 		const kv = new MemoryKvStore();
@@ -89,15 +104,128 @@ test("FederationBuilder", async (t) => {
 		assertThrows(() => builder.setOutboxListeners("/users/{identifier}/outbox/{extra}"), RouterError);
 		assertThrows(() => builder.setOutboxListeners("/users/{identifier}/outbox/{identifier}"), RouterError);
 		const builderAfterInvalid = createFederationBuilder();
-		assertThrows(() => builderAfterInvalid.setOutboxListeners("/users/{identifier}/outbox/{extra}"), RouterError);
+		assertThrows(() => builderAfterInvalid.setOutboxListeners("/users/{identifier}/outbox/{extra}"), RouteTemplateOptionsNotMatchedError);
+		assertThrows(() => builderAfterInvalid.setOutboxListeners("/users/{identifier:3}/outbox"), DisallowedVarSpecModifierError);
+		assertThrows(() => builderAfterInvalid.setOutboxListeners("/users/{identifier*}/outbox"), DisallowedVarSpecModifierError);
+		assertThrows(() => builderAfterInvalid.setOutboxListeners("/users/{identifier,identifier}/outbox"), DuplicateRouteVariableError);
 		builderAfterInvalid.setOutboxListeners("/users/{identifier}/outbox");
 		const builder2 = createFederationBuilder();
-		builder2.setOutboxListeners("/users{/identifier}/outbox");
+		builder2.setOutboxListeners("/users/{identifier}/outbox");
 		assertThrows(() => builder2.setOutboxDispatcher("/actors/{identifier}/outbox", () => ({ items: [] })), RouterError);
 		const builder3 = createFederationBuilder();
-		assertThrows(() => builder3.setOutboxListeners("/users{?identifier}/outbox"), RouterError);
+		assertThrows(() => builder3.setOutboxListeners("/users{?identifier}/outbox"), DisallowedOperatorError);
+		const builder3a = createFederationBuilder();
+		assertThrows(() => builder3a.setOutboxListeners("/users{;identifier}/outbox"), DisallowedOperatorError);
+		const builder3b = createFederationBuilder();
+		assertThrows(() => builder3b.setOutboxListeners("/users{.identifier}/outbox"), DisallowedOperatorError);
 		const builder4 = createFederationBuilder();
-		assertThrows(() => builder4.setOutboxDispatcher("/users{?identifier}/outbox", () => ({ items: [] })), RouterError);
+		assertThrows(() => builder4.setOutboxDispatcher("/users{?identifier}/outbox", () => ({ items: [] })), DisallowedOperatorError);
+		const builder5 = createFederationBuilder();
+		assertThrows(() => builder5.setOutboxDispatcher("/users/{identifier:3}/outbox", () => ({ items: [] })), DisallowedVarSpecModifierError);
+	});
+	await t.step("rejects non-segment-boundary identifier operators at registration for required-identifier routes", () => {
+		assertThrows(() => createFederationBuilder().setActorDispatcher("/users{/identifier}", () => null), DisallowedOperatorError);
+		assertThrows(() => createFederationBuilder().setActorDispatcher("{/identifier}", () => null), DisallowedOperatorError);
+		assertThrows(() => createFederationBuilder().setActorDispatcher("/users/{/identifier}", () => null), DisallowedOperatorError);
+		assertThrows(() => createFederationBuilder().setActorDispatcher("/users{?identifier}", () => null), DisallowedOperatorError);
+		assertThrows(() => createFederationBuilder().setInboxListeners("/users{/identifier}/inbox"), DisallowedOperatorError);
+		assertThrows(() => createFederationBuilder().setOutboxListeners("/users{/identifier}/outbox"), DisallowedOperatorError);
+		assertThrows(() => createFederationBuilder().setActorDispatcher("/users/{identifier:3}", () => null), DisallowedVarSpecModifierError);
+		assertThrows(() => createFederationBuilder().setActorDispatcher("/users/{identifier*}", () => null), DisallowedVarSpecModifierError);
+		createFederationBuilder().setActorDispatcher("/users/{identifier}", () => null);
+		createFederationBuilder().setInboxListeners("/users/{identifier}/inbox");
+	});
+	await t.step("every required-identifier setter rejects every omissible operator", () => {
+		const omissibleExprs = [
+			"{/identifier}",
+			"{?identifier}",
+			"{;identifier}",
+			"{.identifier}"
+		];
+		const registrars = [
+			["setActorDispatcher", (expr) => createFederationBuilder().setActorDispatcher(`/users${expr}`, () => null)],
+			["setInboxListeners", (expr) => createFederationBuilder().setInboxListeners(`/users${expr}/inbox`)],
+			["setOutboxListeners", (expr) => createFederationBuilder().setOutboxListeners(`/users${expr}/outbox`)],
+			["setOutboxDispatcher", (expr) => createFederationBuilder().setOutboxDispatcher(`/users${expr}/outbox`, () => ({ items: [] }))],
+			["setFollowingDispatcher", (expr) => createFederationBuilder().setFollowingDispatcher(`/users${expr}/following`, () => ({ items: [] }))],
+			["setFollowersDispatcher", (expr) => createFederationBuilder().setFollowersDispatcher(`/users${expr}/followers`, () => ({ items: [] }))],
+			["setLikedDispatcher", (expr) => createFederationBuilder().setLikedDispatcher(`/users${expr}/liked`, () => ({ items: [] }))],
+			["setFeaturedDispatcher", (expr) => createFederationBuilder().setFeaturedDispatcher(`/users${expr}/featured`, () => ({ items: [] }))],
+			["setFeaturedTagsDispatcher", (expr) => createFederationBuilder().setFeaturedTagsDispatcher(`/users${expr}/tags`, () => ({ items: [] }))]
+		];
+		for (const [name, register] of registrars) {
+			for (const expr of omissibleExprs) assertThrows(() => register(expr), DisallowedOperatorError, void 0, `${name} must reject ${expr} at registration`);
+			register("{identifier}");
+		}
+	});
+	await t.step("empty or missing identifier segments produce a runtime no-match", async () => {
+		const kv = new MemoryKvStore();
+		const builder = createFederationBuilder();
+		builder.setActorDispatcher("/users/{identifier}", () => null);
+		builder.setInboxListeners("/users/{identifier}/inbox");
+		builder.setOutboxDispatcher("/users/{identifier}/outbox", () => ({ items: [] }));
+		builder.setObjectDispatcher(Note, "/notes/{id}", () => null);
+		const impl = await builder.build({ kv });
+		assertEquals(impl.router.route("/users/alice")?.name, "actor");
+		assertEquals(impl.router.route("/users/alice/inbox")?.name, "inbox");
+		assertEquals(impl.router.route("/users/alice/outbox")?.name, "outbox");
+		assertEquals(impl.router.route("/notes/1")?.name, `object:${Note.typeId.href}`);
+		assertEquals(impl.router.route("/users/"), null);
+		assertEquals(impl.router.route("/users//inbox"), null);
+		assertEquals(impl.router.route("/users//outbox"), null);
+		assertEquals(impl.router.route("/notes/"), null);
+	});
+	await t.step("object dispatcher optional-operator routes no-match when unbound", async () => {
+		const kv = new MemoryKvStore();
+		const objectName = `object:${Note.typeId.href}`;
+		const query = createFederationBuilder();
+		query.setObjectDispatcher(Note, "/notes{?id}", () => null);
+		const queryImpl = await query.build({ kv });
+		assertEquals(queryImpl.router.route("/notes"), null);
+		assertEquals(queryImpl.router.route("/notes?id=1")?.name, objectName);
+		const matrix = createFederationBuilder();
+		matrix.setObjectDispatcher(Note, "/notes{;id}", () => null);
+		const matrixImpl = await matrix.build({ kv });
+		assertEquals(matrixImpl.router.route("/notes"), null);
+		assertEquals(matrixImpl.router.route("/notes;id=1")?.name, objectName);
+		const label = createFederationBuilder();
+		label.setObjectDispatcher(Note, "/notes{.id}", () => null);
+		const labelImpl = await label.build({ kv });
+		assertEquals(labelImpl.router.route("/notes"), null);
+		assertEquals(labelImpl.router.route("/notes.1")?.name, objectName);
+	});
+	await t.step("custom collection routes no-match empty or unbound variables", async () => {
+		const kv = new MemoryKvStore();
+		const builder = createFederationBuilder();
+		builder.setCollectionDispatcher("samples", Note, "/groups/{id}", () => ({ items: [] }));
+		builder.setCollectionDispatcher("optionals", Note, "/optional-groups{?id}", () => ({ items: [] }));
+		builder.setCollectionDispatcher("matrixOptionals", Note, "/matrix-groups{;id}", () => ({ items: [] }));
+		builder.setCollectionDispatcher("labelOptionals", Note, "/label-groups{.id}", () => ({ items: [] }));
+		const impl = await builder.build({ kv });
+		assertEquals(impl.router.route("/groups/1"), {
+			name: "collection:samples",
+			values: { id: "1" },
+			template: "/groups/{id}"
+		});
+		assertEquals(impl.router.route("/optional-groups?id=1"), {
+			name: "collection:optionals",
+			values: { id: "1" },
+			template: "/optional-groups{?id}"
+		});
+		assertEquals(impl.router.route("/matrix-groups;id=1"), {
+			name: "collection:matrixOptionals",
+			values: { id: "1" },
+			template: "/matrix-groups{;id}"
+		});
+		assertEquals(impl.router.route("/label-groups.1"), {
+			name: "collection:labelOptionals",
+			values: { id: "1" },
+			template: "/label-groups{.id}"
+		});
+		assertEquals(impl.router.route("/groups/"), null);
+		assertEquals(impl.router.route("/optional-groups"), null);
+		assertEquals(impl.router.route("/matrix-groups"), null);
+		assertEquals(impl.router.route("/label-groups"), null);
 	});
 	await t.step("should pass build options correctly", async () => {
 		const builder = createFederationBuilder();

package/dist/federation/collection.test.mjs

@@ -1,9 +1,9 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-BTEgfoJo.mjs";
-import { n as digest, t as buildCollectionSynchronizationHeader } from "../collection-Cc3DVAhE.mjs";
+import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
+import "../std__assert-BBjXFNOb.mjs";
+import { n as digest, t as buildCollectionSynchronizationHeader } from "../collection-CA3V5zyK.mjs";
 import { test } from "@fedify/fixture";
 import { decodeHex } from "byte-encodings/hex";
 //#region src/federation/collection.test.ts

package/dist/federation/handler.test.mjs

@@ -1,18 +1,18 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as createOutboxContext, r as createRequestContext, t as createInboxContext } from "../context-BAE7AKLA.mjs";
-import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-BTEgfoJo.mjs";
-import { n as assertGreaterOrEqual } from "../assert_rejects-DQP-q39h.mjs";
-import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
-import { t as assert } from "../assert-DikXweDx.mjs";
-import { r as parseAcceptSignature } from "../accept-CgDcxvjV.mjs";
-import { s as signRequest } from "../http-IywnQdiX.mjs";
-import { a as rsaPrivateKey3, c as rsaPublicKey3, s as rsaPublicKey2 } from "../keys-CSYsOMFG.mjs";
-import { t as MemoryKvStore } from "../kv-QHE0oeM3.mjs";
-import { c as handleActor, d as handleInbox, f as handleObject, h as respondWithObjectIfAcceptable, l as handleCollection, m as respondWithObject, o as createFederation, p as handleOutbox, u as handleCustomCollection } from "../middleware-BB0IbDow.mjs";
-import { t as ActivityListenerSet } from "../activity-listener-BeTGV3wc.mjs";
+import { n as createOutboxContext, r as createRequestContext, t as createInboxContext } from "../context-DVoTs_wM.mjs";
+import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
+import "../std__assert-BBjXFNOb.mjs";
+import { n as assertGreaterOrEqual } from "../assert_rejects-DN60FHPX.mjs";
+import { t as assertInstanceOf } from "../assert_instance_of-DBC5X09g.mjs";
+import { t as assert } from "../assert-OguE97r2.mjs";
+import { r as parseAcceptSignature } from "../accept-CceiKpCy.mjs";
+import { s as signRequest } from "../http-QzW9IWfs.mjs";
+import { a as rsaPrivateKey3, c as rsaPublicKey3, s as rsaPublicKey2 } from "../keys-C3kae-6B.mjs";
+import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
+import { c as handleActor, d as handleInbox, f as handleObject, h as respondWithObjectIfAcceptable, l as handleCollection, m as respondWithObject, o as createFederation, p as handleOutbox, u as handleCustomCollection } from "../middleware-CyJDCmNg.mjs";
+import { t as ActivityListenerSet } from "../activity-listener-tztVvlNb.mjs";
 import { Activity, Create, Note, Person, Tombstone } from "@fedify/vocab";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError } from "@fedify/vocab-runtime";

package/dist/federation/idempotency.test.mjs

@@ -1,12 +1,12 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-BTEgfoJo.mjs";
-import { n as ed25519PrivateKey, r as ed25519PublicKey, t as ed25519Multikey } from "../keys-CSYsOMFG.mjs";
-import { r as signObject } from "../proof-BYlrRSmZ.mjs";
-import { t as MemoryKvStore } from "../kv-QHE0oeM3.mjs";
-import { o as createFederation } from "../middleware-BB0IbDow.mjs";
+import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
+import "../std__assert-BBjXFNOb.mjs";
+import { n as ed25519PrivateKey, r as ed25519PublicKey, t as ed25519Multikey } from "../keys-C3kae-6B.mjs";
+import { r as signObject } from "../proof-CSo0S8OK.mjs";
+import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
+import { o as createFederation } from "../middleware-CyJDCmNg.mjs";
 import { Create, Follow, Person } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 //#region src/federation/idempotency.test.ts

package/dist/federation/inbox.test.mjs

@@ -1,9 +1,9 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
-import { t as ActivityListenerSet } from "../activity-listener-BeTGV3wc.mjs";
+import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
+import { t as assertThrows } from "../assert_throws-BOkhLGYc.mjs";
+import { t as ActivityListenerSet } from "../activity-listener-tztVvlNb.mjs";
 import { Activity, Create, Invite, Offer, Update } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
 //#region src/federation/inbox.test.ts

package/dist/federation/keycache.test.mjs

@@ -1,11 +1,11 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
-import { t as assert } from "../assert-DikXweDx.mjs";
-import { t as MemoryKvStore } from "../kv-QHE0oeM3.mjs";
-import { t as KvKeyCache } from "../keycache-BeU0LCII.mjs";
+import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
+import { t as assertInstanceOf } from "../assert_instance_of-DBC5X09g.mjs";
+import { t as assert } from "../assert-OguE97r2.mjs";
+import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
+import { t as KvKeyCache } from "../keycache-BYMd8q7F.mjs";
 import { CryptographicKey, Multikey } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
 //#region src/federation/keycache.test.ts

package/dist/federation/kv.test.mjs

@@ -1,9 +1,9 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-BTEgfoJo.mjs";
-import { t as MemoryKvStore } from "../kv-QHE0oeM3.mjs";
+import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
+import "../std__assert-BBjXFNOb.mjs";
+import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/kv.test.ts
 test("MemoryKvStore", async (t) => {

package/dist/federation/metrics.test.mjs

@@ -1,10 +1,10 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-BTEgfoJo.mjs";
-import { t as assertRejects } from "../assert_rejects-DQP-q39h.mjs";
-import { a as instrumentDocumentLoader, c as recordDocumentCache, d as recordInboxActivity, f as recordKeyLookup, l as recordDocumentFetch, m as recordOutboxEnqueue, p as recordOutboxActivity, t as classifyFetchError, u as recordFanoutRecipients } from "../metrics-BTOMkW8C.mjs";
+import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
+import "../std__assert-BBjXFNOb.mjs";
+import { t as assertRejects } from "../assert_rejects-DN60FHPX.mjs";
+import { a as instrumentDocumentLoader, c as recordDocumentCache, d as recordInboxActivity, f as recordKeyLookup, h as recordWebFingerHandle, l as recordDocumentFetch, m as recordOutboxEnqueue, p as recordOutboxActivity, t as classifyFetchError, u as recordFanoutRecipients } from "../metrics-E0hAHtLZ.mjs";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 import { FetchError } from "@fedify/vocab-runtime";
 //#region src/federation/metrics.test.ts
@@ -213,6 +213,65 @@ test("recordDocumentCache() records hit and miss as a counter", () => {
 	assertEquals(measurements[1].attributes["activitypub.lookup.result"], "miss");
 	assertEquals(measurements[1].attributes["activitypub.remote.host"], "w3id.org");
 });
+test("recordWebFingerHandle() records counter and duration with all attributes", () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	recordWebFingerHandle(meterProvider, {
+		durationMs: 17,
+		result: "resolved",
+		scheme: "acct",
+		statusCode: 200
+	});
+	const counters = recorder.getMeasurements("webfinger.handle");
+	assertEquals(counters.length, 1);
+	assertEquals(counters[0].type, "counter");
+	assertEquals(counters[0].value, 1);
+	assertEquals(counters[0].attributes["webfinger.handle.result"], "resolved");
+	assertEquals(counters[0].attributes["webfinger.resource.scheme"], "acct");
+	assertEquals(counters[0].attributes["http.response.status_code"], 200);
+	const durations = recorder.getMeasurements("webfinger.handle.duration");
+	assertEquals(durations.length, 1);
+	assertEquals(durations[0].type, "histogram");
+	assertEquals(durations[0].value, 17);
+	assertEquals(durations[0].attributes["webfinger.handle.result"], "resolved");
+	assertEquals(durations[0].attributes["webfinger.resource.scheme"], "acct");
+	assertEquals(durations[0].attributes["http.response.status_code"], 200);
+});
+test("recordWebFingerHandle() records each non-resolved result with the matching status code", () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	for (const [result, statusCode] of [
+		["invalid", 400],
+		["not_found", 404],
+		["tombstoned", 410]
+	]) recordWebFingerHandle(meterProvider, {
+		durationMs: 1,
+		result,
+		scheme: "acct",
+		statusCode
+	});
+	const counters = recorder.getMeasurements("webfinger.handle");
+	assertEquals(counters.length, 3);
+	assertEquals(counters.map((m) => m.attributes["webfinger.handle.result"]), [
+		"invalid",
+		"not_found",
+		"tombstoned"
+	]);
+	assertEquals(counters.map((m) => m.attributes["http.response.status_code"]), [
+		400,
+		404,
+		410
+	]);
+});
+test("recordWebFingerHandle() omits optional attributes when not provided", () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	recordWebFingerHandle(meterProvider, {
+		durationMs: 0,
+		result: "error"
+	});
+	const counter = recorder.getMeasurement("webfinger.handle");
+	assertEquals(counter?.attributes["webfinger.handle.result"], "error");
+	assertEquals("webfinger.resource.scheme" in (counter?.attributes ?? {}), false);
+	assertEquals("http.response.status_code" in (counter?.attributes ?? {}), false);
+});
 test("classifyFetchError() classifies FetchError with 404 as not_found", () => {
 	assertEquals(classifyFetchError(new FetchError("https://example.com/k", "not found", new Response("", { status: 404 }))), {
 		result: "not_found",

package/dist/federation/middleware.test.mjs

@@ -1,25 +1,25 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as RouterError } from "../router-BT_F5748.mjs";
-import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import { r as assertExists } from "../std__assert-BTEgfoJo.mjs";
-import { r as assertFalse, t as assertRejects } from "../assert_rejects-DQP-q39h.mjs";
-import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
-import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
-import { t as assertNotEquals } from "../assert_not_equals--wG9hV7u.mjs";
-import { t as assertStrictEquals } from "../assert_strict_equals-Dmjbg-bA.mjs";
-import { t as assert } from "../assert-DikXweDx.mjs";
-import { t as esm_default } from "../esm-sdtqOUPu.mjs";
-import { l as verifyRequest, s as signRequest } from "../http-IywnQdiX.mjs";
-import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-CSYsOMFG.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-k6huZLQL.mjs";
-import { a as signJsonLd, o as verifyJsonLd, r as detachSignature } from "../ld-BGwiJpl3.mjs";
-import { t as doesActorOwnKey } from "../owner-CIt4hvmM.mjs";
-import { i as verifyObject, r as signObject } from "../proof-BYlrRSmZ.mjs";
-import { t as MemoryKvStore } from "../kv-QHE0oeM3.mjs";
-import { i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-BB0IbDow.mjs";
+import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
+import { r as assertExists } from "../std__assert-BBjXFNOb.mjs";
+import { r as assertFalse, t as assertRejects } from "../assert_rejects-DN60FHPX.mjs";
+import { t as assertInstanceOf } from "../assert_instance_of-DBC5X09g.mjs";
+import { t as assertThrows } from "../assert_throws-BOkhLGYc.mjs";
+import { t as assertNotEquals } from "../assert_not_equals-DkVK8oqV.mjs";
+import { t as assertStrictEquals } from "../assert_strict_equals-XEgZAlrj.mjs";
+import { t as assert } from "../assert-OguE97r2.mjs";
+import { t as esm_default } from "../esm-BQRw925N.mjs";
+import { l as verifyRequest, s as signRequest } from "../http-QzW9IWfs.mjs";
+import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-C3kae-6B.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-BdDN0Aqx.mjs";
+import { a as signJsonLd, o as verifyJsonLd, r as detachSignature } from "../ld-eZbar1rr.mjs";
+import { t as doesActorOwnKey } from "../owner-ByO_Fw6U.mjs";
+import { i as verifyObject, r as signObject } from "../proof-CSo0S8OK.mjs";
+import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
+import { i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-CyJDCmNg.mjs";
 import { configure, reset } from "@logtape/logtape";
+import { RouterError } from "@fedify/uri-template";
 import * as vocab from "@fedify/vocab";
 import { getTypeId, lookupObject } from "@fedify/vocab";
 import { SpanStatusCode } from "@opentelemetry/api";
@@ -938,6 +938,18 @@ test("Federation.fetch()", async (t) => {
 		assertEquals(inbox, []);
 		assertEquals(response.status, 404);
 	});
+	await t.step("empty identifier segment is Not Found, dispatcher not invoked", async () => {
+		const { federation, dispatches } = createTestContext();
+		assertEquals((await federation.fetch(new Request("https://example.com/users/", {
+			method: "GET",
+			headers: { "Accept": "application/activity+json" }
+		}), { contextData: void 0 })).status, 404);
+		assertEquals((await federation.fetch(new Request("https://example.com/users//inbox", {
+			method: "POST",
+			headers: { "accept": "application/ld+json" }
+		}), { contextData: void 0 })).status, 404);
+		assertEquals(dispatches.includes(""), false);
+	});
 	await t.step("onNotAcceptable with GET", async () => {
 		const { federation } = createTestContext();
 		let notAcceptableCalled = false;

package/dist/federation/mod.cjs

@@ -2,7 +2,9 @@ const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("../chunk-DDcVe30Y.cjs");
-const require_middleware = require("../middleware-B2rtdpFV.cjs");
+const require_middleware = require("../middleware-BUl1BH4x.cjs");
+let _logtape_logtape = require("@logtape/logtape");
+let _fedify_uri_template = require("@fedify/uri-template");
 let es_toolkit = require("es-toolkit");
 //#region src/federation/kv.ts
 /**
@@ -347,11 +349,161 @@ var ParallelMessageQueue = class ParallelMessageQueue {
 	}
 };
 //#endregion
+//#region src/federation/router.ts
+const logger = (0, _logtape_logtape.getLogger)([
+	"fedify",
+	"federation",
+	"router",
+	"deprecated"
+]);
+let deprecationWarned = false;
+function warnDeprecated() {
+	if (deprecationWarned) return;
+	deprecationWarned = true;
+	logger.warn("The `Router` and `RouterError` classes from `@fedify/fedify` are deprecated.  Please use `Router` from `@fedify/uri-template` instead.");
+}
+/**
+* URL router and constructor based on URI Template
+* ([RFC 6570](https://tools.ietf.org/html/rfc6570)).
+*
+* @deprecated Import `Router` from `@fedify/uri-template` instead.  This class
+*             remains only for compatibility with older Fedify code.  The
+*             `@fedify/uri-template` router is the replacement implementation
+*             and should be used directly in new code.
+*/
+var Router = class Router {
+	#router;
+	/**
+	* Create a new {@link Router}.
+	* @param options Options for the router.
+	* @deprecated Use `new Router(options)` from `@fedify/uri-template`
+	*             instead.
+	*/
+	constructor(options) {
+		this.#router = convertRouterError(() => new _fedify_uri_template.Router(options));
+	}
+	/**
+	* Whether to ignore trailing slashes when matching paths.
+	* @deprecated Use `Router` from `@fedify/uri-template` instead.  This
+	*             accessor forwards to the underlying `@fedify/uri-template`
+	*             router so that post-construction mutation keeps working as
+	*             in older Fedify code.
+	*/
+	get trailingSlashInsensitive() {
+		return this.#router.trailingSlashInsensitive;
+	}
+	set trailingSlashInsensitive(value) {
+		this.#router.trailingSlashInsensitive = value;
+	}
+	/**
+	* Clones this router.
+	* @deprecated Use `Router` from `@fedify/uri-template` instead.
+	*/
+	clone() {
+		return convertRouterError(() => {
+			const clone = new Router();
+			clone.#router = this.#router.clone();
+			return clone;
+		});
+	}
+	/**
+	* Checks if a path name exists in the router.
+	* @param name The name of the path.
+	* @returns `true` if the path name exists, otherwise `false`.
+	* @deprecated Use `Router` from `@fedify/uri-template` instead.
+	*/
+	has(name) {
+		return convertRouterError(() => this.#router.has(name));
+	}
+	/**
+	* Adds a new path rule to the router.
+	* @param template The path pattern.
+	* @param name The name of the path.
+	* @returns The names of the variables in the path pattern.
+	* @deprecated Use `Router` from `@fedify/uri-template` instead.  In this
+	*             compatibility class, `add()` both registers the route and
+	*             returns the variables in the path pattern.  In
+	*             `@fedify/uri-template`, these two responsibilities are split:
+	*             `router.add(template, name)` registers the route and returns
+	*             `void`, while the pure static method
+	*             `Router.variables(template)` returns the variable names.  To
+	*             migrate, call `Router.variables(template)` when variables are
+	*             needed, then call `router.add(template, name)` to register the
+	*             route.
+	*/
+	add(template, name) {
+		return convertRouterError(() => {
+			(0, _fedify_uri_template.assertPath)(template);
+			this.#router.add(template, name);
+			return _fedify_uri_template.Router.variables(template);
+		});
+	}
+	/**
+	* Resolves a path name and values from a URL, if any match.
+	* @param url The URL to resolve.
+	* @returns The name of the path and its values, if any match.  Otherwise,
+	*          `null`.
+	* @deprecated Use `Router` from `@fedify/uri-template` instead.  Unlike the
+	*             stricter `@fedify/uri-template` router, this compatibility
+	*             method keeps the old Fedify 2.x contract of returning `null`
+	*             (rather than throwing) for inputs that are not router paths.
+	*/
+	route(url) {
+		return convertRouterError(() => {
+			if (!(0, _fedify_uri_template.isPath)(url)) return null;
+			return this.#router.route(url);
+		});
+	}
+	/**
+	* Constructs a URL/path from a path name and values.
+	* @param name The name of the path.
+	* @param values The values to expand the path with.
+	* @returns The URL/path, if the name exists.  Otherwise, `null`.
+	* @deprecated Use `Router` from `@fedify/uri-template` instead.
+	*/
+	build(name, values) {
+		return convertRouterError(() => this.#router.build(name, values));
+	}
+};
+/**
+* An error thrown by the {@link Router}.
+* @deprecated Import `RouterError` from `@fedify/uri-template` instead.
+*/
+var RouterError = class extends _fedify_uri_template.RouterError {
+	/**
+	* Treats every `RouterError` from `@fedify/uri-template` as an instance of
+	* this deprecated class.
+	*
+	* @deprecated Import `RouterError` from `@fedify/uri-template` instead.
+	*/
+	static [Symbol.hasInstance](instance) {
+		return instance instanceof _fedify_uri_template.RouterError;
+	}
+	/**
+	* Create a new {@link RouterError}.
+	* @param message The error message.
+	* @deprecated Import `RouterError` from `@fedify/uri-template` instead.
+	*/
+	constructor(message) {
+		super(message);
+		warnDeprecated();
+	}
+};
+function convertRouterError(func) {
+	try {
+		warnDeprecated();
+		return func();
+	} catch (error) {
+		if (error instanceof _fedify_uri_template.RouterError) throw new RouterError(error.message);
+		throw error;
+	}
+}
+//#endregion
 exports.InProcessMessageQueue = InProcessMessageQueue;
 exports.MemoryKvStore = MemoryKvStore;
 exports.ParallelMessageQueue = ParallelMessageQueue;
-exports.Router = require_middleware.Router;
-exports.RouterError = require_middleware.RouterError;
+exports.Router = Router;
+exports.RouterError = RouterError;
 exports.SendActivityError = require_middleware.SendActivityError;
 exports.buildCollectionSynchronizationHeader = require_middleware.buildCollectionSynchronizationHeader;
 exports.createExponentialBackoffPolicy = require_middleware.createExponentialBackoffPolicy;

package/dist/federation/mod.d.cts

@@ -1,6 +1,6 @@
 /// <reference lib="esnext.temporal" />
-import { $ as CollectionCursor, A as FederationKvPrefixes, B as Router, C as IdempotencyKeyCallback, D as ObjectCallbackSetters, E as InboxListenerSetters, F as RetryContext, G as respondWithObject, H as RouterOptions, I as RetryPolicy, J as ActorDispatcher, K as respondWithObjectIfAcceptable, L as createExponentialBackoffPolicy, M as FederationQueueOptions, N as createFederation, O as OutboxListenerSetters, P as CreateExponentialBackoffPolicyOptions, Q as CollectionCounter, R as Message, S as FederationStartQueueOptions, T as InboxChallengePolicy, U as RouterRouteResult, V as RouterError, W as RespondWithObjectOptions, X as ActorKeyPairsDispatcher, Y as ActorHandleMapper, Z as AuthorizePredicate, _ as Federatable, _t as SendActivityError, a as GetSignedKeyOptions, at as InboxListener, b as FederationFetchOptions, bt as buildCollectionSynchronizationHeader, c as ParseUriResult, ct as ObjectDispatcher, d as SendActivityOptions, dt as OutboxListenerErrorHandler, et as CollectionDispatcher, f as SendActivityOptionsForCollection, ft as OutboxPermanentFailureHandler, g as CustomCollectionCallbackSetters, gt as WebFingerLinksDispatcher, h as ConstructorWithTypeId, ht as UnverifiedActivityReason, i as GetActorOptions, it as InboxErrorHandler, j as FederationOrigin, k as Rfc6570Expression, l as RequestContext, lt as OutboxErrorHandler, m as CollectionCallbackSetters, mt as UnverifiedActivityHandler, n as Context, nt as CustomCollectionCursor, o as InboxContext, ot as NodeInfoDispatcher, p as ActorCallbackSetters, pt as SharedInboxKeyDispatcher, q as ActorAliasMapper, r as ForwardActivityOptions, rt as CustomCollectionDispatcher, s as OutboxContext, st as ObjectAuthorizePredicate, t as ActorKeyPair, tt as CustomCollectionCounter, u as RouteActivityOptions, ut as OutboxListener, v as Federation, vt as SenderKeyPair, w as IdempotencyStrategy, x as FederationOptions, xt as digest, y as FederationBuilder, yt as PageItems, z as createFederationBuilder } from "../context-tc6VOOOL.cjs";
+import { $ as CustomCollectionDispatcher, A as FederationKvPrefixes, B as RespondWithObjectOptions, C as IdempotencyKeyCallback, D as ObjectCallbackSetters, E as InboxListenerSetters, F as RetryContext, G as ActorHandleMapper, H as respondWithObjectIfAcceptable, I as RetryPolicy, J as CollectionCounter, K as ActorKeyPairsDispatcher, L as createExponentialBackoffPolicy, M as FederationQueueOptions, N as createFederation, O as OutboxListenerSetters, P as CreateExponentialBackoffPolicyOptions, Q as CustomCollectionCursor, R as Message, S as FederationStartQueueOptions, T as InboxChallengePolicy, U as ActorAliasMapper, V as respondWithObject, W as ActorDispatcher, X as CollectionDispatcher, Y as CollectionCursor, Z as CustomCollectionCounter, _ as Federatable, _t as digest, a as GetSignedKeyOptions, at as OutboxErrorHandler, b as FederationFetchOptions, c as ParseUriResult, ct as OutboxPermanentFailureHandler, d as SendActivityOptions, dt as UnverifiedActivityReason, et as InboxErrorHandler, f as SendActivityOptionsForCollection, ft as WebFingerLinksDispatcher, g as CustomCollectionCallbackSetters, gt as buildCollectionSynchronizationHeader, h as ConstructorWithTypeId, ht as PageItems, i as GetActorOptions, it as ObjectDispatcher, j as FederationOrigin, k as Rfc6570Expression, l as RequestContext, lt as SharedInboxKeyDispatcher, m as CollectionCallbackSetters, mt as SenderKeyPair, n as Context, nt as NodeInfoDispatcher, o as InboxContext, ot as OutboxListener, p as ActorCallbackSetters, pt as SendActivityError, q as AuthorizePredicate, r as ForwardActivityOptions, rt as ObjectAuthorizePredicate, s as OutboxContext, st as OutboxListenerErrorHandler, t as ActorKeyPair, tt as InboxListener, u as RouteActivityOptions, ut as UnverifiedActivityHandler, v as Federation, w as IdempotencyStrategy, x as FederationOptions, y as FederationBuilder, z as createFederationBuilder } from "../context-DI2gRbyN.cjs";
 import { a as MemoryKvStore, i as KvStoreSetOptions, n as KvStore, r as KvStoreListEntry, t as KvKey } from "../kv-gJ8LYbxX.cjs";
 import { a as MessageQueueEnqueueOptions, i as MessageQueueDepth, n as InProcessMessageQueueOptions, o as MessageQueueListenOptions, r as MessageQueue, s as ParallelMessageQueue, t as InProcessMessageQueue } from "../mq-D8uSFzxe.cjs";
-import { n as handleWebFinger, t as WebFingerHandlerParameters } from "../mod-DnzgcPcy.cjs";
+import { a as RouterOptions, i as RouterError, n as handleWebFinger, o as RouterRouteResult, r as Router, t as WebFingerHandlerParameters } from "../mod-CI9fduEi.cjs";
 export { ActorAliasMapper, ActorCallbackSetters, ActorDispatcher, ActorHandleMapper, ActorKeyPair, ActorKeyPairsDispatcher, AuthorizePredicate, CollectionCallbackSetters, CollectionCounter, CollectionCursor, CollectionDispatcher, ConstructorWithTypeId, Context, CreateExponentialBackoffPolicyOptions, CustomCollectionCallbackSetters, CustomCollectionCounter, CustomCollectionCursor, CustomCollectionDispatcher, Federatable, Federation, FederationBuilder, FederationFetchOptions, FederationKvPrefixes, FederationOptions, FederationOrigin, FederationQueueOptions, FederationStartQueueOptions, ForwardActivityOptions, GetActorOptions, GetSignedKeyOptions, IdempotencyKeyCallback, IdempotencyStrategy, InProcessMessageQueue, InProcessMessageQueueOptions, InboxChallengePolicy, InboxContext, InboxErrorHandler, InboxListener, InboxListenerSetters, KvKey, KvStore, KvStoreListEntry, KvStoreSetOptions, MemoryKvStore, Message, MessageQueue, MessageQueueDepth, MessageQueueEnqueueOptions, MessageQueueListenOptions, NodeInfoDispatcher, ObjectAuthorizePredicate, ObjectCallbackSetters, ObjectDispatcher, OutboxContext, OutboxErrorHandler, OutboxListener, OutboxListenerErrorHandler, OutboxListenerSetters, OutboxPermanentFailureHandler, PageItems, ParallelMessageQueue, ParseUriResult, RequestContext, RespondWithObjectOptions, RetryContext, RetryPolicy, Rfc6570Expression, RouteActivityOptions, Router, RouterError, RouterOptions, RouterRouteResult, SendActivityError, SendActivityOptions, SendActivityOptionsForCollection, SenderKeyPair, SharedInboxKeyDispatcher, UnverifiedActivityHandler, UnverifiedActivityReason, WebFingerHandlerParameters, WebFingerLinksDispatcher, buildCollectionSynchronizationHeader, createExponentialBackoffPolicy, createFederation, createFederationBuilder, digest, handleWebFinger, respondWithObject, respondWithObjectIfAcceptable };