@fedify/fedify 2.3.0-dev.994 → 2.3.0-pr.809.37

package/dist/{context-Dk_tacqz.mjs → context-DVoTs_wM.mjs}

@@ -1,14 +1,72 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as RouterError } from "./router-CrMLXoOr.mjs";
-import { mockDocumentLoader } from "@fedify/fixture";
+import { getLogger } from "@logtape/logtape";
+import "@opentelemetry/sdk-trace-base";
+import "@opentelemetry/core";
+import { RouterError } from "@fedify/uri-template";
 import { lookupObject, traverseCollection } from "@fedify/vocab";
 import { lookupWebFinger } from "@fedify/webfinger";
-import { trace } from "@opentelemetry/api";
+import { metrics, trace } from "@opentelemetry/api";
+//#region ../fixture/dist/mod.js
+const logger = getLogger(["fixture", "docloader"]);
+/**
+* A mock of the document loader.  This does not make any actual HTTP requests
+* towards the remote server, but looks up the local fixture files instead.
+*
+* For instance, `mockDocumentLoader("http://example.com/foo/bar")` will look up
+* the file `testing/fixtures/http/example.com/foo/bar` (no suffix) and return
+* its content as the response.
+*/
+async function mockDocumentLoader(resource, _options) {
+	const url = new URL(resource);
+	if ("navigator" in globalThis && navigator.userAgent === "Cloudflare-Workers") {
+		const testUrl = new URL(url);
+		testUrl.hostname += ".test";
+		const resp = await fetch(testUrl);
+		if (resp.ok) {
+			const document = await resp.json();
+			logger.debug("Successfully fetched fixture {resource}: {status} {statusText}\n{body}", {
+				resource,
+				status: resp.status,
+				statusText: resp.statusText,
+				body: document
+			});
+			return {
+				contextUrl: null,
+				document,
+				documentUrl: resource
+			};
+		}
+		const error = await resp.text();
+		logger.error("Failed to fetch fixture {resource}: {error}", {
+			resource,
+			error
+		});
+		throw new Error(error);
+	}
+	const fixturePath = `${"Deno" in globalThis ? "." : "@fedify/fixture"}/fixtures/${url.host}${url.pathname}.json`;
+	let document;
+	try {
+		document = (await import(fixturePath, { with: { type: "json" } })).default;
+	} catch (error) {
+		logger.error("Failed to read fixture file {path}: {error}", {
+			path: fixturePath,
+			error
+		});
+		throw error;
+	}
+	return {
+		contextUrl: null,
+		document,
+		documentUrl: resource
+	};
+}
+const testDefinitions = [];
+//#endregion
 //#region src/testing/context.ts
 function createContext(values) {
-	const { federation, url = new URL("http://example.com/"), canonicalOrigin, data, documentLoader, contextLoader, tracerProvider, clone, getNodeInfoUri, getActorUri, getObjectUri, getCollectionUri, getOutboxUri, getInboxUri, getFollowingUri, getFollowersUri, getLikedUri, getFeaturedUri, getFeaturedTagsUri, parseUri, getActorKeyPairs, getDocumentLoader, lookupObject: lookupObject$1, traverseCollection: traverseCollection$1, lookupNodeInfo, lookupWebFinger: lookupWebFinger$1, sendActivity, routeActivity } = values;
+	const { federation, url = new URL("http://example.com/"), canonicalOrigin, data, documentLoader, contextLoader, meterProvider, tracerProvider, clone, getNodeInfoUri, getActorUri, getObjectUri, getCollectionUri, getOutboxUri, getInboxUri, getFollowingUri, getFollowersUri, getLikedUri, getFeaturedUri, getFeaturedTagsUri, parseUri, getActorKeyPairs, getDocumentLoader, lookupObject: lookupObject$1, traverseCollection: traverseCollection$1, lookupNodeInfo, lookupWebFinger: lookupWebFinger$1, sendActivity, routeActivity } = values;
 	function throwRouterError() {
 		throw new RouterError("Not implemented");
 	}
@@ -21,6 +79,7 @@ function createContext(values) {
 		hostname: url.hostname,
 		documentLoader: documentLoader ?? mockDocumentLoader,
 		contextLoader: contextLoader ?? mockDocumentLoader,
+		meterProvider: meterProvider ?? metrics.getMeterProvider(),
 		tracerProvider: tracerProvider ?? trace.getTracerProvider(),
 		clone: clone ?? ((data) => createContext({
 			...values,
@@ -117,4 +176,4 @@ function createOutboxContext(args) {
 	};
 }
 //#endregion
-export { createOutboxContext as n, createRequestContext as r, createInboxContext as t };
+export { testDefinitions as i, createOutboxContext as n, createRequestContext as r, createInboxContext as t };

package/dist/{deno-XBVlKnOX.mjs → deno-BID9qTPk.mjs}

@@ -3,6 +3,6 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.3.0-dev.994+9071ca0a";
+var version = "2.3.0-pr.809.37+0574ba5c";
 //#endregion
 export { version as n, name as t };

package/dist/{docloader-DPp-X6gk.mjs → docloader-BYFuVwwi.mjs}

@@ -1,11 +1,11 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { o as validateCryptoKey } from "./key-Bzx--sHD.mjs";
-import { n as doubleKnock } from "./http-CSlLA54v.mjs";
-import { curry } from "es-toolkit";
-import { UrlError, createActivityPubRequest, getRemoteDocument, logRequest, validatePublicUrl } from "@fedify/vocab-runtime";
+import { o as validateCryptoKey } from "./key-Dqdlo3mG.mjs";
+import { n as doubleKnock } from "./http-CO59u1Yk.mjs";
 import { getLogger } from "@logtape/logtape";
+import { UrlError, createActivityPubRequest, getRemoteDocument, logRequest, validatePublicUrl } from "@fedify/vocab-runtime";
+import { curry } from "es-toolkit";
 //#region src/utils/docloader.ts
 const logger = getLogger([
 	"fedify",

package/dist/{esm-DVILvP5e.mjs → esm-vrlUxr60.mjs}

@@ -9,7 +9,7 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJSMin = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+var __commonJSMin = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports);
 var __copyProps = (to, from, except, desc) => {
 	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
 		key = keys[i];
@@ -25,8 +25,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	enumerable: true
 }) : target, mod));
 //#endregion
-//#region ../../node_modules/.pnpm/glob-to-regexp@0.4.1/node_modules/glob-to-regexp/index.js
-var require_glob_to_regexp = /* @__PURE__ */ __commonJSMin(((exports, module) => {
+//#region ../../node_modules/.pnpm/regexparam@3.0.0/node_modules/regexparam/dist/index.mjs
+var import_glob_to_regexp = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = function(glob, opts) {
 		if (typeof glob !== "string") throw new TypeError("Expected a string");
 		var str = String(glob);
@@ -97,9 +97,7 @@ var require_glob_to_regexp = /* @__PURE__ */ __commonJSMin(((exports, module) =>
 		if (!flags || !~flags.indexOf("g")) reStr = "^" + reStr + "$";
 		return new RegExp(reStr, flags);
 	};
-}));
-//#endregion
-//#region ../../node_modules/.pnpm/regexparam@3.0.0/node_modules/regexparam/dist/index.mjs
+})))(), 1);
 /**
 * @param {string|RegExp} input The route pattern
 * @param {boolean} [loose] Allow open-ended matching. Ignored with `RegExp` input.
@@ -454,7 +452,6 @@ function normalizeHeaders(headers) {
 }
 //#endregion
 //#region ../../node_modules/.pnpm/fetch-mock@12.6.0/node_modules/fetch-mock/dist/esm/Matchers.js
-var import_glob_to_regexp = /* @__PURE__ */ __toESM(require_glob_to_regexp(), 1);
 const isUrlMatcher = (matcher) => matcher instanceof RegExp || typeof matcher === "string" || typeof matcher === "object" && "href" in matcher;
 const isFunctionMatcher = (matcher) => typeof matcher === "function";
 const stringMatchers = {

package/dist/federation/builder.test.mjs

@@ -1,14 +1,14 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as RouterError } from "../router-CrMLXoOr.mjs";
-import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import { i as assertExists } from "../std__assert-CRDpx_HF.mjs";
-import { t as assertThrows } from "../assert_throws-4NwKEy2q.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-rV3vodCc.mjs";
-import { n as createFederationBuilder } from "../builder-yAlpiIqP.mjs";
-import { test } from "@fedify/fixture";
+import { r as createFederationBuilder } from "../builder-Dl5Sdmc9.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
 test("FederationBuilder", async (t) => {
 	await t.step("should build a Federation object with registered components", async () => {
@@ -17,7 +17,11 @@ test("FederationBuilder", async (t) => {
 		const actorDispatcher = (_ctx, _identifier) => {
 			return null;
 		};
-		builder.setActorDispatcher("/users/{identifier}", actorDispatcher);
+		assertThrows(() => createFederationBuilder().setActorDispatcher("/users/{identifier}", actorDispatcher).mapActorAlias("/actor/{id}", "instance"), RouterError, "Path for actor alias must have no variables.");
+		assertThrows(() => createFederationBuilder().setActorDispatcher("/users/{identifier}", actorDispatcher).mapActorAlias("/actor", "instance").mapActorAlias("/bot", "instance"), RouterError, "Actor alias for \"instance\" already set.");
+		assertThrows(() => createFederationBuilder().setActorDispatcher("/users/{identifier}", actorDispatcher).mapActorAlias("/actor", "instance").mapActorAlias("/actor", "bot"), RouterError, "Actor alias path \"/actor\" conflicts with existing route \"actorAlias:instance\".");
+		assertThrows(() => createFederationBuilder().setActorDispatcher("/users/{identifier}", actorDispatcher).mapActorAlias("/actor", ""), RouterError, "Identifier cannot be empty.");
+		builder.setActorDispatcher("/users/{identifier}", actorDispatcher).mapActorAlias("/actor", "instance");
 		const inboxListener = (_ctx, _activity) => {};
 		builder.setInboxListeners("/users/{identifier}/inbox").on(Activity, inboxListener);
 		const outboxListener = (_ctx, _activity) => {};
@@ -52,6 +56,7 @@ test("FederationBuilder", async (t) => {
 		const impl = federation;
 		assertEquals(impl.router.route("/.well-known/webfinger")?.name, "webfinger");
 		assertEquals(impl.router.route("/users/test123")?.name, "actor");
+		assertEquals(impl.router.route("/actor")?.name, "actorAlias:instance");
 		assertEquals(impl.router.route("/users/test123/inbox")?.name, "inbox");
 		assertEquals(impl.router.route("/users/test123/outbox")?.name, "outbox");
 		assertEquals(impl.router.route("/notes/456")?.name, `object:${Note.typeId.href}`);
@@ -69,6 +74,40 @@ test("FederationBuilder", async (t) => {
 		assertEquals(impl.router.build("inbox", { identifier: "user1" }), "/users/user1/inbox");
 		await builder.build({ kv });
 	});
+	await t.step("passes benchmarkMode to the built federation", async () => {
+		const builder = createFederationBuilder();
+		const impl = await builder.build({
+			kv: new MemoryKvStore(),
+			benchmarkMode: true
+		});
+		assertEquals(impl.benchmarkMode, true);
+		assertEquals(impl.allowPrivateAddress, true);
+		assertEquals(impl.signatureTimeWindow, false);
+		const overriddenImpl = await builder.build({
+			kv: new MemoryKvStore(),
+			benchmarkMode: true,
+			allowPrivateAddress: false,
+			signatureTimeWindow: { minutes: 10 }
+		});
+		assertEquals(overriddenImpl.benchmarkMode, true);
+		assertEquals(overriddenImpl.allowPrivateAddress, false);
+		assertEquals(overriddenImpl.signatureTimeWindow, { minutes: 10 });
+	});
+	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();
@@ -84,15 +123,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/circuit-breaker.test.d.mts

@@ -0,0 +1,2 @@
+import { Temporal } from "@js-temporal/polyfill";
+import { URLPattern } from "urlpattern-polyfill";