@fedify/fedify 2.0.0-dev.379 → 2.0.0-dev.380

package/dist/{middleware-1jFftSD2.js → middleware-C8EKZVUa.js}

@@ -3,24 +3,24 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { deno_default } from "./deno-DqzG_RZH.js";
+import { deno_default } from "./deno-CtGMjqVA.js";
 import { getNodeInfo } from "./client-Dg7OfUDA.js";
 import { RouterError } from "./router-D9eI0s4b.js";
 import { nodeInfoToJson } from "./types-CPz01LGH.js";
-import { exportJwk, importJwk, validateCryptoKey } from "./key-DT5WUsoA.js";
-import { verifyRequest } from "./http-wC3zLKG0.js";
-import { detachSignature, hasSignature, signJsonLd, verifyJsonLd } from "./ld-DkkOCVAX.js";
-import { doesActorOwnKey, getKeyOwner } from "./owner-DkyFfykp.js";
-import { signObject, verifyObject } from "./proof-YGxK2bz_.js";
-import { getAuthenticatedDocumentLoader } from "./docloader-DzdrkeHk.js";
+import { exportJwk, importJwk, validateCryptoKey } from "./key-BaU3dCbr.js";
+import { verifyRequest } from "./http-MKkRvGCD.js";
+import { detachSignature, hasSignature, signJsonLd, verifyJsonLd } from "./ld-Cl1Q2ID2.js";
+import { doesActorOwnKey, getKeyOwner } from "./owner-CLtVml91.js";
+import { signObject, verifyObject } from "./proof-0NbL8saz.js";
+import { getAuthenticatedDocumentLoader } from "./docloader-DFtiZSjQ.js";
 import { kvCache } from "./kv-cache-B__dHl7g.js";
-import { routeActivity } from "./inbox-DD3ldbso.js";
-import { FederationBuilderImpl } from "./builder-CTaPayj3.js";
+import { routeActivity } from "./inbox-t2HfUOpK.js";
+import { FederationBuilderImpl } from "./builder-yo-Bb1YI.js";
 import { buildCollectionSynchronizationHeader } from "./collection-CcnIw1qY.js";
 import { KvKeyCache } from "./keycache-DRxpZ5r9.js";
 import { acceptsJsonLd } from "./negotiation-5NPJL6zp.js";
 import { createExponentialBackoffPolicy } from "./retry-D4GJ670a.js";
-import { SendActivityError, extractInboxes, sendActivity } from "./send-Bh3NMyL9.js";
+import { SendActivityError, extractInboxes, sendActivity } from "./send-yCNNrsU2.js";
 import { getLogger, withContext } from "@logtape/logtape";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
 import { getDocumentLoader } from "@fedify/vocab-runtime";
@@ -1670,7 +1670,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		if (message.identifier != null) context$1 = this.#createContext(baseUrl, ctxData, { documentLoader: await context$1.getDocumentLoader({ identifier: message.identifier }) });
 		else if (this.sharedInboxKeyDispatcher != null) {
 			const identity = await this.sharedInboxKeyDispatcher(context$1);
-			if (identity != null) context$1 = this.#createContext(baseUrl, ctxData, { documentLoader: "identifier" in identity || "username" in identity || "handle" in identity ? await context$1.getDocumentLoader(identity) : context$1.getDocumentLoader(identity) });
+			if (identity != null) context$1 = this.#createContext(baseUrl, ctxData, { documentLoader: "identifier" in identity || "username" in identity ? await context$1.getDocumentLoader(identity) : context$1.getDocumentLoader(identity) });
 		}
 		const activity = await Activity.fromJsonLd(message.activity, context$1);
 		span.setAttribute("activitypub.activity.type", getTypeId(activity).href);
@@ -2066,9 +2066,9 @@ var FederationImpl = class extends FederationBuilderImpl {
 		if (request.method !== "POST" && !acceptsJsonLd(request)) return await onNotAcceptable(request);
 		switch (routeName) {
 			case "actor":
-				context$1 = this.#createContext(request, contextData, { invokedFromActorDispatcher: { identifier: route.values.identifier ?? route.values.handle } });
+				context$1 = this.#createContext(request, contextData, { invokedFromActorDispatcher: { identifier: route.values.identifier } });
 				return await handleActor(request, {
-					identifier: route.values.identifier ?? route.values.handle,
+					identifier: route.values.identifier,
 					context: context$1,
 					actorDispatcher: this.actorCallbacks?.dispatcher,
 					authorizePredicate: this.actorCallbacks?.authorizePredicate,
@@ -2094,7 +2094,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			}
 			case "outbox": return await handleCollection(request, {
 				name: "outbox",
-				identifier: route.values.identifier ?? route.values.handle,
+				identifier: route.values.identifier,
 				uriGetter: context$1.getOutboxUri.bind(context$1),
 				context: context$1,
 				collectionCallbacks: this.outboxCallbacks,
@@ -2105,7 +2105,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			case "inbox":
 				if (request.method !== "POST") return await handleCollection(request, {
 					name: "inbox",
-					identifier: route.values.identifier ?? route.values.handle,
+					identifier: route.values.identifier,
 					uriGetter: context$1.getInboxUri.bind(context$1),
 					context: context$1,
 					collectionCallbacks: this.inboxCallbacks,
@@ -2113,15 +2113,15 @@ var FederationImpl = class extends FederationBuilderImpl {
 					onUnauthorized,
 					onNotFound
 				});
-				context$1 = this.#createContext(request, contextData, { documentLoader: await context$1.getDocumentLoader({ identifier: route.values.identifier ?? route.values.handle }) });
+				context$1 = this.#createContext(request, contextData, { documentLoader: await context$1.getDocumentLoader({ identifier: route.values.identifier }) });
 			case "sharedInbox":
 				if (routeName !== "inbox" && this.sharedInboxKeyDispatcher != null) {
 					const identity = await this.sharedInboxKeyDispatcher(context$1);
-					if (identity != null) context$1 = this.#createContext(request, contextData, { documentLoader: "identifier" in identity || "username" in identity || "handle" in identity ? await context$1.getDocumentLoader(identity) : context$1.getDocumentLoader(identity) });
+					if (identity != null) context$1 = this.#createContext(request, contextData, { documentLoader: "identifier" in identity || "username" in identity ? await context$1.getDocumentLoader(identity) : context$1.getDocumentLoader(identity) });
 				}
 				if (!this.manuallyStartQueue) this._startQueueInternal(contextData);
 				return await handleInbox(request, {
-					recipient: route.values.identifier ?? route.values.handle ?? null,
+					recipient: route.values.identifier ?? null,
 					context: context$1,
 					inboxContextFactory: context$1.toInboxContext.bind(context$1),
 					kv: this.kv,
@@ -2138,7 +2138,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				});
 			case "following": return await handleCollection(request, {
 				name: "following",
-				identifier: route.values.identifier ?? route.values.handle,
+				identifier: route.values.identifier,
 				uriGetter: context$1.getFollowingUri.bind(context$1),
 				context: context$1,
 				collectionCallbacks: this.followingCallbacks,
@@ -2155,7 +2155,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				}
 				return await handleCollection(request, {
 					name: "followers",
-					identifier: route.values.identifier ?? route.values.handle,
+					identifier: route.values.identifier,
 					uriGetter: baseUrl == null ? context$1.getFollowersUri.bind(context$1) : (identifier) => {
 						const uri = context$1.getFollowersUri(identifier);
 						uri.searchParams.set("base-url", baseUrl);
@@ -2172,7 +2172,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			}
 			case "liked": return await handleCollection(request, {
 				name: "liked",
-				identifier: route.values.identifier ?? route.values.handle,
+				identifier: route.values.identifier,
 				uriGetter: context$1.getLikedUri.bind(context$1),
 				context: context$1,
 				collectionCallbacks: this.likedCallbacks,
@@ -2182,7 +2182,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			});
 			case "featured": return await handleCollection(request, {
 				name: "featured",
-				identifier: route.values.identifier ?? route.values.handle,
+				identifier: route.values.identifier,
 				uriGetter: context$1.getFeaturedUri.bind(context$1),
 				context: context$1,
 				collectionCallbacks: this.featuredCallbacks,
@@ -2192,7 +2192,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			});
 			case "featuredTags": return await handleCollection(request, {
 				name: "featured tags",
-				identifier: route.values.identifier ?? route.values.handle,
+				identifier: route.values.identifier,
 				uriGetter: context$1.getFeaturedTagsUri.bind(context$1),
 				context: context$1,
 				collectionCallbacks: this.featuredTagsCallbacks,
@@ -2290,10 +2290,7 @@ var ContextImpl = class ContextImpl {
 		return new URL(path, this.canonicalOrigin);
 	}
 	getActorUri(identifier) {
-		const path = this.federation.router.build("actor", {
-			identifier,
-			handle: identifier
-		});
+		const path = this.federation.router.build("actor", { identifier });
 		if (path == null) throw new RouterError("No actor dispatcher registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
@@ -2306,10 +2303,7 @@ var ContextImpl = class ContextImpl {
 		return new URL(path, this.canonicalOrigin);
 	}
 	getOutboxUri(identifier) {
-		const path = this.federation.router.build("outbox", {
-			identifier,
-			handle: identifier
-		});
+		const path = this.federation.router.build("outbox", { identifier });
 		if (path == null) throw new RouterError("No outbox dispatcher registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
@@ -2319,50 +2313,32 @@ var ContextImpl = class ContextImpl {
 			if (path$1 == null) throw new RouterError("No shared inbox path registered.");
 			return new URL(path$1, this.canonicalOrigin);
 		}
-		const path = this.federation.router.build("inbox", {
-			identifier,
-			handle: identifier
-		});
+		const path = this.federation.router.build("inbox", { identifier });
 		if (path == null) throw new RouterError("No inbox path registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
 	getFollowingUri(identifier) {
-		const path = this.federation.router.build("following", {
-			identifier,
-			handle: identifier
-		});
+		const path = this.federation.router.build("following", { identifier });
 		if (path == null) throw new RouterError("No following collection path registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
 	getFollowersUri(identifier) {
-		const path = this.federation.router.build("followers", {
-			identifier,
-			handle: identifier
-		});
+		const path = this.federation.router.build("followers", { identifier });
 		if (path == null) throw new RouterError("No followers collection path registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
 	getLikedUri(identifier) {
-		const path = this.federation.router.build("liked", {
-			identifier,
-			handle: identifier
-		});
+		const path = this.federation.router.build("liked", { identifier });
 		if (path == null) throw new RouterError("No liked collection path registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
 	getFeaturedUri(identifier) {
-		const path = this.federation.router.build("featured", {
-			identifier,
-			handle: identifier
-		});
+		const path = this.federation.router.build("featured", { identifier });
 		if (path == null) throw new RouterError("No featured collection path registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
 	getFeaturedTagsUri(identifier) {
-		const path = this.federation.router.build("featuredTags", {
-			identifier,
-			handle: identifier
-		});
+		const path = this.federation.router.build("featuredTags", { identifier });
 		if (path == null) throw new RouterError("No featured tags collection path registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
@@ -2375,24 +2351,15 @@ var ContextImpl = class ContextImpl {
 		if (uri == null) return null;
 		if (uri.origin !== this.origin && uri.origin !== this.canonicalOrigin) return null;
 		const route = this.federation.router.route(uri.pathname);
-		const logger$2 = getLogger(["fedify", "federation"]);
 		if (route == null) return null;
 		else if (route.name === "sharedInbox") return {
 			type: "inbox",
-			identifier: void 0,
-			get handle() {
-				logger$2.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
-				return void 0;
-			}
+			identifier: void 0
 		};
-		const identifier = "identifier" in route.values ? route.values.identifier : route.values.handle;
+		const identifier = route.values.identifier;
 		if (route.name === "actor") return {
 			type: "actor",
-			identifier,
-			get handle() {
-				logger$2.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
-				return identifier;
-			}
+			identifier
 		};
 		else if (route.name.startsWith("object:")) {
 			const typeId = route.name.replace(/^object:/, "");
@@ -2404,59 +2371,31 @@ var ContextImpl = class ContextImpl {
 			};
 		} else if (route.name === "inbox") return {
 			type: "inbox",
-			identifier,
-			get handle() {
-				logger$2.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
-				return identifier;
-			}
+			identifier
 		};
 		else if (route.name === "outbox") return {
 			type: "outbox",
-			identifier,
-			get handle() {
-				logger$2.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
-				return identifier;
-			}
+			identifier
 		};
 		else if (route.name === "following") return {
 			type: "following",
-			identifier,
-			get handle() {
-				logger$2.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
-				return identifier;
-			}
+			identifier
 		};
 		else if (route.name === "followers") return {
 			type: "followers",
-			identifier,
-			get handle() {
-				logger$2.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
-				return identifier;
-			}
+			identifier
 		};
 		else if (route.name === "liked") return {
 			type: "liked",
-			identifier,
-			get handle() {
-				logger$2.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
-				return identifier;
-			}
+			identifier
 		};
 		else if (route.name === "featured") return {
 			type: "featured",
-			identifier,
-			get handle() {
-				logger$2.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
-				return identifier;
-			}
+			identifier
 		};
 		else if (route.name === "featuredTags") return {
 			type: "featuredTags",
-			identifier,
-			get handle() {
-				logger$2.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
-				return identifier;
-			}
+			identifier
 		};
 		const collectionTypes = ["collection", "orderedCollection"];
 		const collectionRegex = /* @__PURE__ */ new RegExp(`^(${collectionTypes.join("|")}):(.*)$`);
@@ -2558,19 +2497,10 @@ var ContextImpl = class ContextImpl {
 		return null;
 	}
 	getDocumentLoader(identity) {
-		if ("identifier" in identity || "username" in identity || "handle" in identity) {
+		if ("identifier" in identity || "username" in identity) {
 			let identifierPromise;
-			if ("username" in identity || "handle" in identity) {
-				let username;
-				if ("username" in identity) username = identity.username;
-				else {
-					username = identity.handle;
-					getLogger([
-						"fedify",
-						"runtime",
-						"docloader"
-					]).warn("The \"handle\" property is deprecated; use \"identifier\" or \"username\" instead.", { identity });
-				}
+			if ("username" in identity) {
+				const username = identity.username;
 				const mapper = this.federation.actorCallbacks?.handleMapper;
 				if (mapper == null) identifierPromise = Promise.resolve(username);
 				else {
@@ -2656,15 +2586,10 @@ var ContextImpl = class ContextImpl {
 		]);
 		let keys;
 		let identifier = null;
-		if ("identifier" in sender || "username" in sender || "handle" in sender) {
+		if ("identifier" in sender || "username" in sender) {
 			if ("identifier" in sender) identifier = sender.identifier;
 			else {
-				let username;
-				if ("username" in sender) username = sender.username;
-				else {
-					username = sender.handle;
-					logger$2.warn("The \"handle\" property for the sender parameter is deprecated; use \"identifier\" or \"username\" instead.", { sender });
-				}
+				const username = sender.username;
 				if (this.federation.actorCallbacks?.handleMapper == null) identifier = username;
 				else {
 					const mapped = await this.federation.actorCallbacks.handleMapper(this, username);
@@ -3020,15 +2945,10 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 		]);
 		let keys;
 		let identifier = null;
-		if ("identifier" in forwarder || "username" in forwarder || "handle" in forwarder) {
+		if ("identifier" in forwarder || "username" in forwarder) {
 			if ("identifier" in forwarder) identifier = forwarder.identifier;
 			else {
-				let username;
-				if ("username" in forwarder) username = forwarder.username;
-				else {
-					username = forwarder.handle;
-					logger$2.warn("The \"handle\" property for the forwarder parameter is deprecated; use \"identifier\" or \"username\" instead.", { forwarder });
-				}
+				const username = forwarder.username;
 				if (this.federation.actorCallbacks?.handleMapper == null) identifier = username;
 				else {
 					const mapped = await this.federation.actorCallbacks.handleMapper(this, username);

package/dist/{middleware-DTsAIZ_v.js → middleware-CahwrUem.js}

@@ -3,10 +3,10 @@
           import { URLPattern } from "urlpattern-polyfill";
         
 import "./transformers-C3FLHUd6.js";
-import "./http-wpL3tTw3.js";
-import { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, createFederation } from "./middleware-BgA11Zdl.js";
-import "./proof-DiizpGmV.js";
+import "./http-d87H9gTL.js";
+import { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, createFederation } from "./middleware-qCIC-vDz.js";
+import "./proof-B7X2V-RL.js";
 import "./types-C93Ob9cU.js";
-import "./kv-cache-dm5snJVx.js";
+import "./kv-cache-BlAk9XRp.js";
 
 export { FederationImpl };