@fedify/fedify 2.3.0-dev.1005 → 2.3.0-dev.1021

package/dist/federation/mod.js

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
-import { a as createExponentialBackoffPolicy, c as buildCollectionSynchronizationHeader, d as Router, f as RouterError, i as SendActivityError, l as digest, o as respondWithObject, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as createFederationBuilder } from "../middleware-BiLI6cmz.js";
+import { a as createExponentialBackoffPolicy, c as buildCollectionSynchronizationHeader, d as Router, f as RouterError, i as SendActivityError, l as digest, o as respondWithObject, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as createFederationBuilder } from "../middleware-CysDkaXo.js";
 import { isEqual } from "es-toolkit";
 //#region src/federation/kv.ts
 /**
@@ -101,6 +101,7 @@ var InProcessMessageQueue = class {
 	#messages;
 	#monitors;
 	#pollIntervalMs;
+	#delayedMessages;
 	/**
 	* Tracks which ordering keys are currently being processed to ensure
 	* sequential processing for messages with the same key.
@@ -119,42 +120,56 @@ var InProcessMessageQueue = class {
 		this.#messages = [];
 		this.#monitors = {};
 		this.#pollIntervalMs = Temporal.Duration.from(options.pollInterval ?? { seconds: 5 }).total("millisecond");
+		this.#delayedMessages = 0;
 		this.#processingKeys = /* @__PURE__ */ new Set();
 	}
 	enqueue(message, options) {
 		const delay = options?.delay == null ? 0 : Math.max(options.delay.total("millisecond"), 0);
 		if (delay > 0) {
-			setTimeout(() => this.enqueue(message, {
-				...options,
-				delay: void 0
-			}), delay);
+			this.#delayedMessages++;
+			setTimeout(() => {
+				this.#delayedMessages--;
+				this.#enqueueReady(message, options);
+			}, delay);
 			return Promise.resolve();
 		}
+		this.#enqueueReady(message, options);
+		return Promise.resolve();
+	}
+	#enqueueReady(message, options) {
 		const orderingKey = options?.orderingKey ?? null;
 		this.#messages.push({
 			message,
 			orderingKey
 		});
+		this.#notifyMonitors();
+	}
+	#notifyMonitors() {
 		for (const monitorId in this.#monitors) this.#monitors[monitorId]();
-		return Promise.resolve();
 	}
 	enqueueMany(messages, options) {
 		if (messages.length === 0) return Promise.resolve();
 		const delay = options?.delay == null ? 0 : Math.max(options.delay.total("millisecond"), 0);
 		if (delay > 0) {
-			setTimeout(() => this.enqueueMany(messages, {
-				...options,
-				delay: void 0
-			}), delay);
+			const delayedCount = messages.length;
+			const deferredMessages = [...messages];
+			this.#delayedMessages += delayedCount;
+			setTimeout(() => {
+				this.#delayedMessages -= delayedCount;
+				this.#enqueueManyReady(deferredMessages, options);
+			}, delay);
 			return Promise.resolve();
 		}
+		this.#enqueueManyReady(messages, options);
+		return Promise.resolve();
+	}
+	#enqueueManyReady(messages, options) {
 		const orderingKey = options?.orderingKey ?? null;
 		for (const message of messages) this.#messages.push({
 			message,
 			orderingKey
 		});
-		for (const monitorId in this.#monitors) this.#monitors[monitorId]();
-		return Promise.resolve();
+		this.#notifyMonitors();
 	}
 	async listen(handler, options = {}) {
 		const signal = options.signal;
@@ -172,6 +187,15 @@ var InProcessMessageQueue = class {
 			else await this.#wait(10, signal);
 		}
 	}
+	getDepth() {
+		const ready = this.#messages.length;
+		const delayed = this.#delayedMessages;
+		return Promise.resolve({
+			queued: ready + delayed,
+			ready,
+			delayed
+		});
+	}
 	#wait(ms, signal) {
 		let timer = null;
 		return Promise.any([new Promise((resolve) => {
@@ -226,6 +250,7 @@ var ParallelMessageQueue = class ParallelMessageQueue {
 	* @since 1.7.0
 	*/
 	nativeRetrial;
+	getDepth;
 	/**
 	* Tracks which ordering keys are currently being processed to ensure
 	* sequential processing for messages with the same key.
@@ -249,6 +274,7 @@ var ParallelMessageQueue = class ParallelMessageQueue {
 		this.queue = queue;
 		this.workers = workers;
 		this.nativeRetrial = queue.nativeRetrial;
+		if (queue.getDepth != null) this.getDepth = () => queue.getDepth();
 	}
 	enqueue(message, options) {
 		return this.queue.enqueue(message, options);

package/dist/federation/mq.test.mjs

@@ -19,6 +19,7 @@ var InProcessMessageQueue = class {
 	#messages;
 	#monitors;
 	#pollIntervalMs;
+	#delayedMessages;
 	/**
 	* Tracks which ordering keys are currently being processed to ensure
 	* sequential processing for messages with the same key.
@@ -37,42 +38,56 @@ var InProcessMessageQueue = class {
 		this.#messages = [];
 		this.#monitors = {};
 		this.#pollIntervalMs = Temporal.Duration.from(options.pollInterval ?? { seconds: 5 }).total("millisecond");
+		this.#delayedMessages = 0;
 		this.#processingKeys = /* @__PURE__ */ new Set();
 	}
 	enqueue(message, options) {
 		const delay = options?.delay == null ? 0 : Math.max(options.delay.total("millisecond"), 0);
 		if (delay > 0) {
-			setTimeout(() => this.enqueue(message, {
-				...options,
-				delay: void 0
-			}), delay);
+			this.#delayedMessages++;
+			setTimeout(() => {
+				this.#delayedMessages--;
+				this.#enqueueReady(message, options);
+			}, delay);
 			return Promise.resolve();
 		}
+		this.#enqueueReady(message, options);
+		return Promise.resolve();
+	}
+	#enqueueReady(message, options) {
 		const orderingKey = options?.orderingKey ?? null;
 		this.#messages.push({
 			message,
 			orderingKey
 		});
+		this.#notifyMonitors();
+	}
+	#notifyMonitors() {
 		for (const monitorId in this.#monitors) this.#monitors[monitorId]();
-		return Promise.resolve();
 	}
 	enqueueMany(messages, options) {
 		if (messages.length === 0) return Promise.resolve();
 		const delay = options?.delay == null ? 0 : Math.max(options.delay.total("millisecond"), 0);
 		if (delay > 0) {
-			setTimeout(() => this.enqueueMany(messages, {
-				...options,
-				delay: void 0
-			}), delay);
+			const delayedCount = messages.length;
+			const deferredMessages = [...messages];
+			this.#delayedMessages += delayedCount;
+			setTimeout(() => {
+				this.#delayedMessages -= delayedCount;
+				this.#enqueueManyReady(deferredMessages, options);
+			}, delay);
 			return Promise.resolve();
 		}
+		this.#enqueueManyReady(messages, options);
+		return Promise.resolve();
+	}
+	#enqueueManyReady(messages, options) {
 		const orderingKey = options?.orderingKey ?? null;
 		for (const message of messages) this.#messages.push({
 			message,
 			orderingKey
 		});
-		for (const monitorId in this.#monitors) this.#monitors[monitorId]();
-		return Promise.resolve();
+		this.#notifyMonitors();
 	}
 	async listen(handler, options = {}) {
 		const signal = options.signal;
@@ -90,6 +105,15 @@ var InProcessMessageQueue = class {
 			else await this.#wait(10, signal);
 		}
 	}
+	getDepth() {
+		const ready = this.#messages.length;
+		const delayed = this.#delayedMessages;
+		return Promise.resolve({
+			queued: ready + delayed,
+			ready,
+			delayed
+		});
+	}
 	#wait(ms, signal) {
 		let timer = null;
 		return Promise.any([new Promise((resolve) => {
@@ -144,6 +168,7 @@ var ParallelMessageQueue = class ParallelMessageQueue {
 	* @since 1.7.0
 	*/
 	nativeRetrial;
+	getDepth;
 	/**
 	* Tracks which ordering keys are currently being processed to ensure
 	* sequential processing for messages with the same key.
@@ -167,6 +192,7 @@ var ParallelMessageQueue = class ParallelMessageQueue {
 		this.queue = queue;
 		this.workers = workers;
 		this.nativeRetrial = queue.nativeRetrial;
+		if (queue.getDepth != null) this.getDepth = () => queue.getDepth();
 	}
 	enqueue(message, options) {
 		return this.queue.enqueue(message, options);
@@ -256,6 +282,13 @@ test("InProcessMessageQueue", async (t) => {
 	await t.step("nativeRetrial property", () => {
 		assertFalse(mq.nativeRetrial);
 	});
+	await t.step("getDepth() [empty]", async () => {
+		assertEquals(await mq.getDepth(), {
+			queued: 0,
+			ready: 0,
+			delayed: 0
+		});
+	});
 	const messages = [];
 	const controller = new AbortController();
 	const listening = mq.listen((message) => {
@@ -306,6 +339,130 @@ test("InProcessMessageQueue", async (t) => {
 	controller.abort();
 	await listening;
 });
+test("InProcessMessageQueue.getDepth()", async () => {
+	const mq = new InProcessMessageQueue();
+	assertEquals(await mq.getDepth(), {
+		queued: 0,
+		ready: 0,
+		delayed: 0
+	});
+	await mq.enqueue("Ready message");
+	await mq.enqueue("Delayed message", { delay: Temporal.Duration.from({ seconds: 1 }) });
+	assertEquals(await mq.getDepth(), {
+		queued: 2,
+		ready: 1,
+		delayed: 1
+	});
+	const messages = [];
+	const controller = new AbortController();
+	const listening = mq.listen((message) => {
+		messages.push(message);
+		if (messages.length >= 2) controller.abort();
+	}, { signal: controller.signal });
+	await waitFor(() => messages.length >= 2, 15e3);
+	await listening;
+	assertEquals(await mq.getDepth(), {
+		queued: 0,
+		ready: 0,
+		delayed: 0
+	});
+});
+test("InProcessMessageQueue.getDepth() snapshots delayed batches", async () => {
+	const mq = new InProcessMessageQueue();
+	const messages = ["first", "second"];
+	await mq.enqueueMany(messages, { delay: Temporal.Duration.from({ milliseconds: 250 }) });
+	messages.length = 0;
+	assertEquals(await mq.getDepth(), {
+		queued: 2,
+		ready: 0,
+		delayed: 2
+	});
+	const handled = [];
+	const controller = new AbortController();
+	const listening = mq.listen((message) => {
+		handled.push(message);
+		if (handled.length >= 2) controller.abort();
+	}, { signal: controller.signal });
+	await waitFor(() => handled.length >= 2, 15e3);
+	await listening;
+	assertEquals(handled, ["first", "second"]);
+});
+test("InProcessMessageQueue.getDepth() excludes in-flight messages", async () => {
+	const mq = new InProcessMessageQueue();
+	let resolveHandler;
+	const controller = new AbortController();
+	const handled = new Promise((resolve) => {
+		resolveHandler = resolve;
+	});
+	let notifyStarted = () => {};
+	const handlerStarted = new Promise((resolve) => {
+		notifyStarted = resolve;
+	});
+	const listening = mq.listen(async () => {
+		notifyStarted();
+		await handled;
+		controller.abort();
+	}, { signal: controller.signal });
+	try {
+		await mq.enqueue("in-flight");
+		await handlerStarted;
+		assertEquals(await mq.getDepth(), {
+			queued: 0,
+			ready: 0,
+			delayed: 0
+		});
+	} finally {
+		resolveHandler?.();
+		controller.abort();
+		await listening;
+	}
+});
+test("InProcessMessageQueue delayed enqueue uses the internal ready path", async () => {
+	class RejectingReadyQueue extends InProcessMessageQueue {
+		enqueue(message, options) {
+			if (options?.delay == null) return Promise.reject(/* @__PURE__ */ new Error("ready enqueue should not be called"));
+			return super.enqueue(message, options);
+		}
+	}
+	const mq = new RejectingReadyQueue({ pollInterval: { milliseconds: 10 } });
+	const messages = [];
+	const controller = new AbortController();
+	const listening = mq.listen((message) => {
+		messages.push(message);
+		controller.abort();
+	}, { signal: controller.signal });
+	try {
+		await mq.enqueue("delayed", { delay: Temporal.Duration.from({ milliseconds: 10 }) });
+		await waitFor(() => messages.length > 0, 2e3);
+		assertEquals(messages, ["delayed"]);
+	} finally {
+		controller.abort();
+		await listening;
+	}
+});
+test("InProcessMessageQueue delayed enqueueMany uses the internal ready path", async () => {
+	class RejectingReadyQueue extends InProcessMessageQueue {
+		enqueueMany(messages, options) {
+			if (options?.delay == null) return Promise.reject(/* @__PURE__ */ new Error("ready enqueueMany should not be called"));
+			return super.enqueueMany(messages, options);
+		}
+	}
+	const mq = new RejectingReadyQueue({ pollInterval: { milliseconds: 10 } });
+	const messages = [];
+	const controller = new AbortController();
+	const listening = mq.listen((message) => {
+		messages.push(message);
+		if (messages.length >= 2) controller.abort();
+	}, { signal: controller.signal });
+	try {
+		await mq.enqueueMany(["first", "second"], { delay: Temporal.Duration.from({ milliseconds: 10 }) });
+		await waitFor(() => messages.length >= 2, 2e3);
+		assertEquals(messages, ["first", "second"]);
+	} finally {
+		controller.abort();
+		await listening;
+	}
+});
 test("InProcessMessageQueue orderingKey", async (t) => {
 	const mq = new InProcessMessageQueue();
 	const orderTracker = {
@@ -425,6 +582,10 @@ for (const mqName in queues) test({
 		await t.step("nativeRetrial property inheritance", () => {
 			assertEquals(workers.nativeRetrial, mq.nativeRetrial);
 		});
+		await t.step("getDepth() delegation", async () => {
+			if (mq.getDepth == null) assertEquals(workers.getDepth, void 0);
+			else assertEquals(await workers.getDepth?.(), await mq.getDepth());
+		});
 		const messages = [];
 		const controller = new AbortController();
 		const listening = workers.listen(async (message) => {

package/dist/federation/send.test.mjs

@@ -8,10 +8,10 @@ import { n as assertFalse, t as assertRejects } from "../assert_rejects-B-qJtC9Z
 import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assertNotEquals } from "../assert_not_equals--wG9hV7u.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
-import { l as verifyRequest } from "../http-Cy2mQS66.mjs";
+import { l as verifyRequest } from "../http-CfToB_iu.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DGu1NFwu.mjs";
-import { t as doesActorOwnKey } from "../owner-B6CaBwbr.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-BjwIELCy.mjs";
+import { t as doesActorOwnKey } from "../owner-CuW0S2XY.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-dhl-s8G0.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { Activity, Application, Endpoints, Group, Person, Service } from "@fedify/vocab";
 //#region src/federation/send.test.ts

package/dist/federation/webfinger.test.mjs

@@ -5,7 +5,7 @@ import { r as createRequestContext } from "../context-Dk_tacqz.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-CRDpx_HF.mjs";
 import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { o as createFederation, s as handleWebFinger } from "../middleware-BjvwtKjp.mjs";
+import { o as createFederation, s as handleWebFinger } from "../middleware-BPZEcrMG.mjs";
 import { test } from "@fedify/fixture";
 import { Image, Link, Person, Tombstone } from "@fedify/vocab";
 //#region src/federation/webfinger.test.ts

package/dist/{http-CcfcE8N4.js → http-BJ-t29n_.js}

@@ -10,7 +10,7 @@ import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } fro
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.3.0-dev.1005+16f9539d";
+var version = "2.3.0-dev.1021+ab2fa4a9";
 //#endregion
 //#region src/sig/accept.ts
 /**

package/dist/{http-Cy2mQS66.mjs → http-CfToB_iu.mjs}

@@ -1,9 +1,9 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-4f2FzBe9.mjs";
+import { n as version, t as name } from "./deno-BnQyJ03o.mjs";
 import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature } from "./accept-CPkZzmGN.mjs";
-import { o as validateCryptoKey, r as fetchKeyDetailed } from "./key-eKxvr-C4.mjs";
+import { o as validateCryptoKey, r as fetchKeyDetailed } from "./key-CeANlo1H.mjs";
 import { CryptographicKey } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { FetchError } from "@fedify/vocab-runtime";

package/dist/{http-JLLWZX_d.cjs → http-D4xMqSqO.cjs}

@@ -11,7 +11,7 @@ let _opentelemetry_semantic_conventions = require("@opentelemetry/semantic-conve
 let byte_encodings_base64 = require("byte-encodings/base64");
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.3.0-dev.1005+16f9539d";
+var version = "2.3.0-dev.1021+ab2fa4a9";
 //#endregion
 //#region src/sig/accept.ts
 /**

package/dist/{key-eKxvr-C4.mjs → key-CeANlo1H.mjs}

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-4f2FzBe9.mjs";
+import { n as version, t as name } from "./deno-BnQyJ03o.mjs";
 import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { FetchError, getDocumentLoader } from "@fedify/vocab-runtime";

package/dist/{kv-cache-YWK2pfn_.js → kv-cache-B142kDZL.js}

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { d as validateCryptoKey, t as doubleKnock } from "./http-CcfcE8N4.js";
+import { d as validateCryptoKey, t as doubleKnock } from "./http-BJ-t29n_.js";
 import { getLogger } from "@logtape/logtape";
 import { curry } from "es-toolkit";
 import { UrlError, createActivityPubRequest, getRemoteDocument, logRequest, preloadedContexts, validatePublicUrl } from "@fedify/vocab-runtime";

package/dist/{kv-cache-BbFjDt5I.cjs → kv-cache-DRwOjOkl.cjs}

@@ -1,7 +1,7 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 require("./chunk-DDcVe30Y.cjs");
-const require_http = require("./http-JLLWZX_d.cjs");
+const require_http = require("./http-D4xMqSqO.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let es_toolkit = require("es-toolkit");
 let _fedify_vocab_runtime = require("@fedify/vocab-runtime");

package/dist/{ld-D2sVtqAV.mjs → ld-CUlVC-TS.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-4f2FzBe9.mjs";
-import { n as fetchKey, o as validateCryptoKey } from "./key-eKxvr-C4.mjs";
+import { n as version, t as name } from "./deno-BnQyJ03o.mjs";
+import { n as fetchKey, o as validateCryptoKey } from "./key-CeANlo1H.mjs";
 import { Activity, CryptographicKey, Object as Object$1, getTypeId } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { getDocumentLoader } from "@fedify/vocab-runtime";

package/dist/{middleware-cbXddGIi.cjs → middleware-ASvK22Do.cjs}

@@ -1,4 +1,4 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
-const require_middleware = require("./middleware-y5r1KhBz.cjs");
+const require_middleware = require("./middleware-I5XEZ_pZ.cjs");
 exports.FederationImpl = require_middleware.FederationImpl;

package/dist/{middleware-BjvwtKjp.mjs → middleware-BPZEcrMG.mjs}

@@ -2,24 +2,24 @@ import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { n as RouterError } from "./router-CrMLXoOr.mjs";
-import { n as version, t as name } from "./deno-4f2FzBe9.mjs";
+import { n as version, t as name } from "./deno-BnQyJ03o.mjs";
 import { t as formatAcceptSignature } from "./accept-CPkZzmGN.mjs";
-import { a as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-eKxvr-C4.mjs";
-import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-Cy2mQS66.mjs";
-import { t as getAuthenticatedDocumentLoader } from "./docloader-B3ZVRe6e.mjs";
+import { a as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-CeANlo1H.mjs";
+import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-CfToB_iu.mjs";
+import { t as getAuthenticatedDocumentLoader } from "./docloader-mEJ3hsMB.mjs";
 import { n as kvCache } from "./kv-cache-U__xU4qR.mjs";
-import { a as signJsonLd, i as hasSignatureLike, o as verifyJsonLd, r as detachSignature } from "./ld-D2sVtqAV.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-B6CaBwbr.mjs";
+import { a as signJsonLd, i as hasSignatureLike, o as verifyJsonLd, r as detachSignature } from "./ld-CUlVC-TS.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-CuW0S2XY.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-CNmZLixq.mjs";
-import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-DV85kS2-.mjs";
+import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-CFPGr1xC.mjs";
 import { t as getNodeInfo } from "./client-D_1QpnWt.mjs";
 import { t as nodeInfoToJson } from "./types-J53Kw7so.mjs";
-import { t as FederationBuilderImpl } from "./builder-gAB0htof.mjs";
+import { n as FederationBuilderImpl, t as ACTOR_ALIAS_PREFIX } from "./builder-Nn2r1dKd.mjs";
 import { t as buildCollectionSynchronizationHeader } from "./collection-D-HqUuA2.mjs";
 import { t as KvKeyCache } from "./keycache-EGATflN-.mjs";
 import { t as acceptsJsonLd } from "./negotiation-SQvQgUqe.mjs";
 import { t as createExponentialBackoffPolicy } from "./retry-bMXBL97A.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-BjwIELCy.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-dhl-s8G0.mjs";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, Tombstone, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
 import { lookupWebFinger } from "@fedify/webfinger";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
@@ -2479,15 +2479,18 @@ var FederationImpl = class extends FederationBuilderImpl {
 		if (request.method !== "POST" && !acceptsJsonLd(request)) return await onNotAcceptable(request);
 		switch (routeName) {
 			case "actor":
-				context = this.#createContext(request, contextData, { invokedFromActorDispatcher: { identifier: route.values.identifier } });
+			case "actorAlias": {
+				const identifier = route.name.startsWith("actorAlias:") ? route.name.substring(ACTOR_ALIAS_PREFIX.length) : route.values.identifier;
+				context = this.#createContext(request, contextData, { invokedFromActorDispatcher: { identifier } });
 				return await handleActor(request, {
-					identifier: route.values.identifier,
+					identifier,
 					context,
 					actorDispatcher: this.actorCallbacks?.dispatcher,
 					authorizePredicate: this.actorCallbacks?.authorizePredicate,
 					onUnauthorized,
 					onNotFound
 				});
+			}
 			case "object": {
 				const typeId = route.name.replace(/^object:/, "");
 				const callbacks = this.objectCallbacks[typeId];
@@ -2736,7 +2739,7 @@ var ContextImpl = class ContextImpl {
 		return new URL(path, this.canonicalOrigin);
 	}
 	getActorUri(identifier) {
-		const path = this.federation.router.build("actor", { identifier });
+		const path = this.federation.router.build(`actorAlias:${identifier}`, {}) ?? this.federation.router.build("actor", { identifier });
 		if (path == null) throw new RouterError("No actor dispatcher registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
@@ -2802,8 +2805,8 @@ var ContextImpl = class ContextImpl {
 			type: "inbox",
 			identifier: void 0
 		};
-		const identifier = route.values.identifier;
-		if (route.name === "actor") return {
+		const identifier = route.name.startsWith("actorAlias:") ? route.name.substring(ACTOR_ALIAS_PREFIX.length) : route.values.identifier;
+		if (route.name === "actor" || route.name.startsWith("actorAlias:")) return {
 			type: "actor",
 			identifier
 		};

package/dist/{middleware-DZHQpJaI.mjs → middleware-Cgy7UwfR.mjs}

@@ -1,5 +1,5 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as FederationImpl } from "./middleware-BjvwtKjp.mjs";
+import { n as FederationImpl } from "./middleware-BPZEcrMG.mjs";
 export { FederationImpl };

package/dist/{middleware-BiLI6cmz.js → middleware-CysDkaXo.js}

@@ -2,10 +2,10 @@ import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 import { t as __exportAll } from "./chunk-nlSIicah.js";
 import { r as getDefaultActivityTransformers } from "./transformers-ve6e2xcg.js";
-import { _ as version, a as verifyRequestDetailed, d as validateCryptoKey, f as formatAcceptSignature, g as name, i as verifyRequest, n as parseRfc9421SignatureInput, o as exportJwk, t as doubleKnock, u as importJwk } from "./http-CcfcE8N4.js";
-import { c as getKeyOwner, d as detachSignature, f as hasSignatureLike, i as verifyObject, m as verifyJsonLd, n as hasProofLike, o as normalizeOutgoingActivityJsonLd, p as signJsonLd, r as signObject, s as doesActorOwnKey } from "./proof-DhE_ibsB.js";
+import { _ as version, a as verifyRequestDetailed, d as validateCryptoKey, f as formatAcceptSignature, g as name, i as verifyRequest, n as parseRfc9421SignatureInput, o as exportJwk, t as doubleKnock, u as importJwk } from "./http-BJ-t29n_.js";
+import { c as getKeyOwner, d as detachSignature, f as hasSignatureLike, i as verifyObject, m as verifyJsonLd, n as hasProofLike, o as normalizeOutgoingActivityJsonLd, p as signJsonLd, r as signObject, s as doesActorOwnKey } from "./proof-CtMmqa09.js";
 import { n as getNodeInfo, t as nodeInfoToJson } from "./types-hvL8ElAs.js";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-YWK2pfn_.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-B142kDZL.js";
 import { getLogger, withContext } from "@logtape/logtape";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, Tombstone, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
@@ -160,6 +160,7 @@ var RouterError = class extends Error {
 };
 //#endregion
 //#region src/federation/builder.ts
+const ACTOR_ALIAS_PREFIX = "actorAlias:";
 function validateSingleIdentifierVariablePath(path, errorMessage) {
 	const operatorMatches = globalThis.Array.from(path.matchAll(/{([+#./;?&]?)([A-Za-z_][A-Za-z0-9_]*)}/g));
 	if (operatorMatches.length !== 1 || operatorMatches[0]?.[2] !== "identifier") throw new RouterError(errorMessage);
@@ -346,6 +347,15 @@ var FederationBuilderImpl = class {
 				callbacks.aliasMapper = mapper;
 				return setters;
 			},
+			mapActorAlias: (path, identifier) => {
+				if (identifier === "") throw new RouterError("Identifier cannot be empty.");
+				if (this.router.has(`actorAlias:${identifier}`)) throw new RouterError(`Actor alias for "${identifier}" already set.`);
+				if (new Router$1().add(path, "temp").size > 0) throw new RouterError("Path for actor alias must have no variables.");
+				const existingRoute = this.router.route(path);
+				if (existingRoute != null) throw new RouterError(`Actor alias path "${path}" conflicts with existing route "${existingRoute.name}".`);
+				this.router.add(path, `${ACTOR_ALIAS_PREFIX}${identifier}`);
+				return setters;
+			},
 			authorize(predicate) {
 				callbacks.authorizePredicate = predicate;
 				return setters;
@@ -3508,15 +3518,18 @@ var FederationImpl = class extends FederationBuilderImpl {
 		if (request.method !== "POST" && !acceptsJsonLd(request)) return await onNotAcceptable(request);
 		switch (routeName) {
 			case "actor":
-				context = this.#createContext(request, contextData, { invokedFromActorDispatcher: { identifier: route.values.identifier } });
+			case "actorAlias": {
+				const identifier = route.name.startsWith("actorAlias:") ? route.name.substring(11) : route.values.identifier;
+				context = this.#createContext(request, contextData, { invokedFromActorDispatcher: { identifier } });
 				return await handleActor(request, {
-					identifier: route.values.identifier,
+					identifier,
 					context,
 					actorDispatcher: this.actorCallbacks?.dispatcher,
 					authorizePredicate: this.actorCallbacks?.authorizePredicate,
 					onUnauthorized,
 					onNotFound
 				});
+			}
 			case "object": {
 				const typeId = route.name.replace(/^object:/, "");
 				const callbacks = this.objectCallbacks[typeId];
@@ -3765,7 +3778,7 @@ var ContextImpl = class ContextImpl {
 		return new URL(path, this.canonicalOrigin);
 	}
 	getActorUri(identifier) {
-		const path = this.federation.router.build("actor", { identifier });
+		const path = this.federation.router.build(`actorAlias:${identifier}`, {}) ?? this.federation.router.build("actor", { identifier });
 		if (path == null) throw new RouterError("No actor dispatcher registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
@@ -3831,8 +3844,8 @@ var ContextImpl = class ContextImpl {
 			type: "inbox",
 			identifier: void 0
 		};
-		const identifier = route.values.identifier;
-		if (route.name === "actor") return {
+		const identifier = route.name.startsWith("actorAlias:") ? route.name.substring(11) : route.values.identifier;
+		if (route.name === "actor" || route.name.startsWith("actorAlias:")) return {
 			type: "actor",
 			identifier
 		};