@fedify/fedify 2.0.0-dev.1593 → 2.0.0-dev.1641

package/dist/{middleware-CovCqg8w.js → middleware-ByPnvMMS.js}

@@ -3,22 +3,22 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, deno_default, getDocumentLoader, getTypeId, kvCache, lookupWebFinger } from "./type-qs0mWLTm.js";
-import { getNodeInfo } from "./client-CpxFv8ft.js";
-import { RouterError, lookupObject, traverseCollection } from "./lookup-CnJK1NUl.js";
-import { nodeInfoToJson } from "./types-BIgY6c-l.js";
-import { exportJwk, importJwk, validateCryptoKey } from "./key-D-s3dQbK.js";
-import { verifyRequest } from "./http-CQulyTuw.js";
-import { getAuthenticatedDocumentLoader } from "./authdocloader-DJtdyVPc.js";
-import { detachSignature, hasSignature, signJsonLd, verifyJsonLd } from "./ld-CYUQO1l4.js";
-import { doesActorOwnKey, getKeyOwner } from "./owner-CBeUJR68.js";
-import { signObject, verifyObject } from "./proof-CHQnDg0z.js";
-import { routeActivity } from "./inbox-B97Wrppe.js";
-import { FederationBuilderImpl } from "./builder-BgzJcrpt.js";
-import { buildCollectionSynchronizationHeader } from "./collection-CSzG2j1P.js";
-import { KvKeyCache } from "./keycache-Br0-hsD5.js";
-import { createExponentialBackoffPolicy } from "./retry-D4GJ670a.js";
-import { extractInboxes, sendActivity } from "./send-Bc0QdRlp.js";
+import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, deno_default, getDocumentLoader, getTypeId, kvCache, lookupWebFinger } from "./type-B4NJkfVg.js";
+import { getNodeInfo } from "./client-BW4V0OJx.js";
+import { RouterError, lookupObject, traverseCollection } from "./lookup-CiU3QxQz.js";
+import { nodeInfoToJson } from "./types-BSuWJsOm.js";
+import { exportJwk, importJwk, validateCryptoKey } from "./key-CfiBDu3o.js";
+import { verifyRequest } from "./http-Cox5GsED.js";
+import { getAuthenticatedDocumentLoader } from "./authdocloader-BkIZCKQv.js";
+import { detachSignature, hasSignature, signJsonLd, verifyJsonLd } from "./ld-CxgmnSO3.js";
+import { doesActorOwnKey, getKeyOwner } from "./owner-Cxob5_PK.js";
+import { signObject, verifyObject } from "./proof-BiSQNUmQ.js";
+import { routeActivity } from "./inbox-BDdRbWNI.js";
+import { FederationBuilderImpl } from "./builder-E2Icrl_a.js";
+import { buildCollectionSynchronizationHeader } from "./collection-CcnIw1qY.js";
+import { KvKeyCache } from "./keycache-CVBjz3xi.js";
+import { createExponentialBackoffPolicy } from "./retry-CfF8Gn4d.js";
+import { extractInboxes, sendActivity } from "./send-DSEhWIYD.js";
 import { getLogger, withContext } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
 import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_HTTP_RESPONSE_HEADER, ATTR_HTTP_RESPONSE_STATUS_CODE, ATTR_URL_FULL } from "@opentelemetry/semantic-conventions";
@@ -2537,15 +2537,16 @@ var ContextImpl = class ContextImpl {
 			"actor"
 		]);
 		if (this.federation.actorCallbacks?.keyPairsDispatcher == null) throw new Error("No actor key pairs dispatcher registered.");
-		const path = this.federation.router.build("actor", {
-			identifier,
-			handle: identifier
-		});
-		if (path == null) {
-			logger$2.warn("No actor dispatcher registered.");
-			return [];
+		let actorUri;
+		try {
+			actorUri = this.getActorUri(identifier);
+		} catch (error) {
+			if (error instanceof RouterError) {
+				logger$2.warn(error.message);
+				return [];
+			}
+			throw error;
 		}
-		const actorUri = new URL(path, this.canonicalOrigin);
 		const keyPairs = await this.federation.actorCallbacks?.keyPairsDispatcher(new ContextImpl({
 			...this,
 			invokedFromActorKeyPairsDispatcher: { identifier }
@@ -2706,12 +2707,11 @@ var ContextImpl = class ContextImpl {
 			if (identifier == null) throw new Error("If recipients is \"followers\", sender must be an actor identifier or username.");
 			expandedRecipients = [];
 			for await (const recipient of this.getFollowers(identifier)) expandedRecipients.push(recipient);
-			if (options.syncCollection) {
-				const collectionId = this.federation.router.build("followers", {
-					identifier,
-					handle: identifier
-				});
-				opts.collectionSync = collectionId == null ? void 0 : new URL(collectionId, this.canonicalOrigin).href;
+			if (options.syncCollection) try {
+				opts.collectionSync = this.getFollowersUri(identifier).href;
+			} catch (error) {
+				if (error instanceof RouterError) opts.collectionSync = void 0;
+				else throw error;
 			}
 		} else expandedRecipients = [recipients];
 		span.setAttribute("activitypub.inboxes", expandedRecipients.length);

package/dist/{middleware-tfSiCl9w.js → middleware-DXidHY4N.js}

@@ -1,17 +1,17 @@
 
-      import { Temporal } from "@js-temporal/polyfill";
-      import { URLPattern } from "urlpattern-polyfill";
-    
-import { getDefaultActivityTransformers } from "./transformers-Dna8Fg7k.js";
-import { deno_default, getDocumentLoader, kvCache } from "./docloader-9_osWaaH.js";
-import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, getTypeId } from "./actor-DNwcqwPT.js";
-import { lookupWebFinger } from "./lookup-BNFlahf3.js";
-import { exportJwk, importJwk, validateCryptoKey } from "./key-CNCeen0u.js";
-import { doubleKnock, verifyRequest } from "./http-BqklewFY.js";
-import { detachSignature, doesActorOwnKey, getKeyOwner, hasSignature, signJsonLd, signObject, verifyJsonLd, verifyObject } from "./proof-D436ezTT.js";
-import { getNodeInfo, nodeInfoToJson } from "./types-RbpvCErq.js";
-import { getAuthenticatedDocumentLoader } from "./authdocloader-qkvj_KZY.js";
-import { lookupObject, traverseCollection } from "./vocab-r-I1_ZmK.js";
+          import { Temporal } from "@js-temporal/polyfill";
+          import { URLPattern } from "urlpattern-polyfill";
+        
+import { getDefaultActivityTransformers } from "./transformers-BFT6d7J5.js";
+import { deno_default, getDocumentLoader, kvCache } from "./docloader-BtqIh1OE.js";
+import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, getTypeId } from "./actor-DU511yTk.js";
+import { lookupWebFinger } from "./lookup-NuT9cCSl.js";
+import { exportJwk, importJwk, validateCryptoKey } from "./key-Cc0JlcKe.js";
+import { doubleKnock, verifyRequest } from "./http-C7uYFcBo.js";
+import { detachSignature, doesActorOwnKey, getKeyOwner, hasSignature, signJsonLd, signObject, verifyJsonLd, verifyObject } from "./proof-DkxwMaWE.js";
+import { getNodeInfo, nodeInfoToJson } from "./types-l2uh_ZhP.js";
+import { getAuthenticatedDocumentLoader } from "./authdocloader-DCgMyo82.js";
+import { lookupObject, traverseCollection } from "./vocab-lBFcVxVF.js";
 import { getLogger, withContext } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
 import { encodeHex } from "byte-encodings/hex";
@@ -321,7 +321,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl: FederationImpl$1 } = await import("./middleware-CJbNYdw9.js");
+		const { FederationImpl: FederationImpl$1 } = await import("./middleware-Bp3I9z8r.js");
 		const f = new FederationImpl$1(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -3481,15 +3481,16 @@ var ContextImpl = class ContextImpl {
 			"actor"
 		]);
 		if (this.federation.actorCallbacks?.keyPairsDispatcher == null) throw new Error("No actor key pairs dispatcher registered.");
-		const path = this.federation.router.build("actor", {
-			identifier,
-			handle: identifier
-		});
-		if (path == null) {
-			logger$1.warn("No actor dispatcher registered.");
-			return [];
+		let actorUri;
+		try {
+			actorUri = this.getActorUri(identifier);
+		} catch (error) {
+			if (error instanceof RouterError) {
+				logger$1.warn(error.message);
+				return [];
+			}
+			throw error;
 		}
-		const actorUri = new URL(path, this.canonicalOrigin);
 		const keyPairs = await this.federation.actorCallbacks?.keyPairsDispatcher(new ContextImpl({
 			...this,
 			invokedFromActorKeyPairsDispatcher: { identifier }
@@ -3650,12 +3651,11 @@ var ContextImpl = class ContextImpl {
 			if (identifier == null) throw new Error("If recipients is \"followers\", sender must be an actor identifier or username.");
 			expandedRecipients = [];
 			for await (const recipient of this.getFollowers(identifier)) expandedRecipients.push(recipient);
-			if (options.syncCollection) {
-				const collectionId = this.federation.router.build("followers", {
-					identifier,
-					handle: identifier
-				});
-				opts.collectionSync = collectionId == null ? void 0 : new URL(collectionId, this.canonicalOrigin).href;
+			if (options.syncCollection) try {
+				opts.collectionSync = this.getFollowersUri(identifier).href;
+			} catch (error) {
+				if (error instanceof RouterError) opts.collectionSync = void 0;
+				else throw error;
 			}
 		} else expandedRecipients = [recipients];
 		span.setAttribute("activitypub.inboxes", expandedRecipients.length);