@fedify/fedify 1.9.0-dev.1613 → 1.9.0-dev.1689

package/dist/{inbox-CirfyLns.js → inbox-DZNE3Jtq.js}

@@ -3,7 +3,7 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { Activity, deno_default, getTypeId } from "./type-Bm9mdHQS.js";
+import { Activity, deno_default, getTypeId } from "./type-BCazg_Pu.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
 
@@ -41,17 +41,39 @@ var InboxListenerSet = class InboxListenerSet {
 		return this.dispatchWithClass(activity)?.listener ?? null;
 	}
 };
-async function routeActivity({ context: ctx, json, activity, recipient, inboxListeners, inboxContextFactory, inboxErrorHandler, kv, kvPrefixes, queue, span, tracerProvider }) {
+let warnedAboutDefaultIdempotency = false;
+async function routeActivity({ context: ctx, json, activity, recipient, inboxListeners, inboxContextFactory, inboxErrorHandler, kv, kvPrefixes, queue, span, tracerProvider, idempotencyStrategy }) {
 	const logger = getLogger([
 		"fedify",
 		"federation",
 		"inbox"
 	]);
-	const cacheKey = activity.id == null ? null : [
-		...kvPrefixes.activityIdempotence,
-		ctx.origin,
-		activity.id.href
-	];
+	let cacheKey = null;
+	if (activity.id != null) {
+		const inboxContext = inboxContextFactory(recipient, json, activity.id?.href, getTypeId(activity).href);
+		const strategy = idempotencyStrategy ?? "per-origin";
+		if (idempotencyStrategy === void 0 && !warnedAboutDefaultIdempotency) {
+			logger.warn("Using default idempotency strategy 'per-origin'. This default will change to 'per-inbox' in Fedify 2.0. Please explicitly set the idempotency strategy using .withIdempotency().");
+			warnedAboutDefaultIdempotency = true;
+		}
+		let keyString;
+		if (typeof strategy === "function") {
+			const result = await strategy(inboxContext, activity);
+			keyString = result;
+		} else switch (strategy) {
+			case "global":
+				keyString = activity.id.href;
+				break;
+			case "per-origin":
+				keyString = `${ctx.origin}\n${activity.id.href}`;
+				break;
+			case "per-inbox":
+				keyString = `${ctx.origin}\n${activity.id.href}\n${recipient == null ? "sharedInbox" : `inbox\n${recipient}`}`;
+				break;
+			default: keyString = `${ctx.origin}\n${activity.id.href}`;
+		}
+		if (keyString != null) cacheKey = [...kvPrefixes.activityIdempotence, keyString];
+	}
 	if (cacheKey != null) {
 		const cached = await kv.get(cacheKey);
 		if (cached === true) {

package/dist/{key-CN1jS3_Y.js → key-C25gGlmV.js}

@@ -3,8 +3,8 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { CryptographicKey, Object as Object$1, deno_default, getDocumentLoader } from "./type-Bm9mdHQS.js";
-import { isActor } from "./actor-Do9KG1O2.js";
+import { CryptographicKey, Object as Object$1, deno_default, getDocumentLoader } from "./type-BCazg_Pu.js";
+import { isActor } from "./actor-DzdLVqkJ.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 

package/dist/key-CHU24Npw.cjs

@@ -0,0 +1,10 @@
+
+          const { Temporal } = require("@js-temporal/polyfill");
+          const { URLPattern } = require("urlpattern-polyfill");
+        
+require('./docloader-Bui9z8Lb.cjs');
+require('./actor-CK94m0Yv.cjs');
+require('./lookup-D_w567L8.cjs');
+const require_key = require('./key-DqqCoLbc.cjs');
+
+exports.validateCryptoKey = require_key.validateCryptoKey;

package/dist/{key-Dq2ZV4ZW.js → key-CbnQpdZy.js}

@@ -2,8 +2,8 @@
           import { Temporal } from "@js-temporal/polyfill";
           import { URLPattern } from "urlpattern-polyfill";
         
-import { deno_default, getDocumentLoader } from "./docloader-CB-b64F8.js";
-import { CryptographicKey, Object as Object$1, isActor } from "./actor-BrhPUG_N.js";
+import { deno_default, getDocumentLoader } from "./docloader-DyvW1gbN.js";
+import { CryptographicKey, Object as Object$1, isActor } from "./actor-Dpkqj5Dv.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 

package/dist/{key-BytDOwJJ.js → key-DOPWTj2e.js}

@@ -2,9 +2,9 @@
           import { Temporal } from "@js-temporal/polyfill";
           import { URLPattern } from "urlpattern-polyfill";
         
-import "./docloader-CB-b64F8.js";
-import "./actor-BrhPUG_N.js";
-import "./lookup-DADsKd8V.js";
-import { exportJwk, fetchKey, generateCryptoKeyPair, importJwk, validateCryptoKey } from "./key-Dq2ZV4ZW.js";
+import "./docloader-DyvW1gbN.js";
+import "./actor-Dpkqj5Dv.js";
+import "./lookup-WoJkw8wY.js";
+import { exportJwk, fetchKey, generateCryptoKeyPair, importJwk, validateCryptoKey } from "./key-CbnQpdZy.js";
 
 export { validateCryptoKey };

package/dist/{key-DgFXwwZv.js → key-DgZIZVqA.js}

@@ -3,8 +3,8 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import "./type-Bm9mdHQS.js";
-import "./actor-Do9KG1O2.js";
-import { exportJwk, fetchKey, generateCryptoKeyPair, importJwk, validateCryptoKey } from "./key-CN1jS3_Y.js";
+import "./type-BCazg_Pu.js";
+import "./actor-DzdLVqkJ.js";
+import { exportJwk, fetchKey, generateCryptoKeyPair, importJwk, validateCryptoKey } from "./key-C25gGlmV.js";
 
 export { validateCryptoKey };

package/dist/{key-4EZXrjJw.cjs → key-DqqCoLbc.cjs}

@@ -3,8 +3,8 @@
           const { URLPattern } = require("urlpattern-polyfill");
         
 const require_chunk = require('./chunk-DqRYRqnO.cjs');
-const require_docloader = require('./docloader-CCo7N8E2.cjs');
-const require_actor = require('./actor-BkOvltE1.cjs');
+const require_docloader = require('./docloader-Bui9z8Lb.cjs');
+const require_actor = require('./actor-CK94m0Yv.cjs');
 const __logtape_logtape = require_chunk.__toESM(require("@logtape/logtape"));
 const __opentelemetry_api = require_chunk.__toESM(require("@opentelemetry/api"));
 

package/dist/{keycache-COrk8-eB.js → keycache-CoMI1L_W.js}

@@ -3,7 +3,7 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { CryptographicKey, Multikey } from "./type-Bm9mdHQS.js";
+import { CryptographicKey, Multikey } from "./type-BCazg_Pu.js";
 
 //#region src/federation/keycache.ts
 var KvKeyCache = class {

package/dist/{keys-BieqxHLC.js → keys-CMahfArj.js}

@@ -3,7 +3,7 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { CryptographicKey, Multikey, importSpki } from "./type-Bm9mdHQS.js";
+import { CryptographicKey, Multikey, importSpki } from "./type-BCazg_Pu.js";
 
 //#region src/testing/keys.ts
 const rsaPublicKey1 = new CryptographicKey({

package/dist/{ld-o8aGatC0.js → ld-WZpO-MzE.js}

@@ -3,8 +3,8 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { Activity, CryptographicKey, Object as Object$1, deno_default, getDocumentLoader, getTypeId } from "./type-Bm9mdHQS.js";
-import { fetchKey, validateCryptoKey } from "./key-CN1jS3_Y.js";
+import { Activity, CryptographicKey, Object as Object$1, deno_default, getDocumentLoader, getTypeId } from "./type-BCazg_Pu.js";
+import { fetchKey, validateCryptoKey } from "./key-C25gGlmV.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";

package/dist/{lookup-CwHCSBI8.cjs → lookup-D_w567L8.cjs}

@@ -3,7 +3,7 @@
           const { URLPattern } = require("urlpattern-polyfill");
         
 const require_chunk = require('./chunk-DqRYRqnO.cjs');
-const require_docloader = require('./docloader-CCo7N8E2.cjs');
+const require_docloader = require('./docloader-Bui9z8Lb.cjs');
 const __logtape_logtape = require_chunk.__toESM(require("@logtape/logtape"));
 const __opentelemetry_api = require_chunk.__toESM(require("@opentelemetry/api"));
 

package/dist/{lookup-DADsKd8V.js → lookup-WoJkw8wY.js}

@@ -2,7 +2,7 @@
           import { Temporal } from "@js-temporal/polyfill";
           import { URLPattern } from "urlpattern-polyfill";
         
-import { UrlError, deno_default, getUserAgent, validatePublicUrl } from "./docloader-CB-b64F8.js";
+import { UrlError, deno_default, getUserAgent, validatePublicUrl } from "./docloader-DyvW1gbN.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 

package/dist/{lookup-BkaLctZw.js → lookup-y6-PEpxS.js}

@@ -3,7 +3,7 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { Object as Object$1, deno_default, getDocumentLoader, getTypeId, lookupWebFinger } from "./type-Bm9mdHQS.js";
+import { Object as Object$1, deno_default, getDocumentLoader, getTypeId, lookupWebFinger } from "./type-BCazg_Pu.js";
 import { cloneDeep, delay } from "es-toolkit";
 import { getLogger } from "@logtape/logtape";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
@@ -240,14 +240,13 @@ async function lookupObject(identifier, options = {}) {
 async function lookupObjectInternal(identifier, options = {}) {
 	const documentLoader = options.documentLoader ?? getDocumentLoader({ userAgent: options.userAgent });
 	if (typeof identifier === "string") identifier = toAcctUrl(identifier) ?? new URL(identifier);
-	let document = null;
+	let remoteDoc = null;
 	if (identifier.protocol === "http:" || identifier.protocol === "https:") try {
-		const remoteDoc = await documentLoader(identifier.href, { signal: options.signal });
-		document = remoteDoc.document;
+		remoteDoc = await documentLoader(identifier.href, { signal: options.signal });
 	} catch (error) {
 		logger.debug("Failed to fetch remote document:\n{error}", { error });
 	}
-	if (document == null) {
+	if (remoteDoc == null) {
 		const jrd = await lookupWebFinger(identifier, {
 			userAgent: options.userAgent,
 			tracerProvider: options.tracerProvider,
@@ -258,8 +257,7 @@ async function lookupObjectInternal(identifier, options = {}) {
 		for (const l of jrd.links) {
 			if (l.type !== "application/activity+json" && !l.type?.match(/application\/ld\+json;\s*profile="https:\/\/www.w3.org\/ns\/activitystreams"/) || l.rel !== "self" || l.href == null) continue;
 			try {
-				const remoteDoc = await documentLoader(l.href, { signal: options.signal });
-				document = remoteDoc.document;
+				remoteDoc = await documentLoader(l.href, { signal: options.signal });
 				break;
 			} catch (error) {
 				logger.debug("Failed to fetch remote document:\n{error}", { error });
@@ -267,23 +265,34 @@ async function lookupObjectInternal(identifier, options = {}) {
 			}
 		}
 	}
-	if (document == null) return null;
+	if (remoteDoc == null) return null;
+	let object;
 	try {
-		return await Object$1.fromJsonLd(document, {
+		object = await Object$1.fromJsonLd(remoteDoc.document, {
 			documentLoader,
 			contextLoader: options.contextLoader,
-			tracerProvider: options.tracerProvider
+			tracerProvider: options.tracerProvider,
+			baseUrl: new URL(remoteDoc.documentUrl)
 		});
 	} catch (error) {
 		if (error instanceof TypeError) {
 			logger.debug("Failed to parse JSON-LD document: {error}\n{document}", {
-				error,
-				document
+				...remoteDoc,
+				error
 			});
 			return null;
 		}
 		throw error;
 	}
+	if (options.crossOrigin !== "trust" && object.id != null && object.id.origin !== new URL(remoteDoc.documentUrl).origin) {
+		if (options.crossOrigin === "throw") throw new Error(`The object's @id (${object.id.href}) has a different origin than the document URL (${remoteDoc.documentUrl}); refusing to return the object.  If you want to bypass this check and are aware of the security implications, set the crossOrigin option to "trust".`);
+		logger.warn("The object's @id ({objectId}) has a different origin than the document URL ({documentUrl}); refusing to return the object.  If you want to bypass this check and are aware of the security implications, set the crossOrigin option to \"trust\".", {
+			...remoteDoc,
+			objectId: object.id.href
+		});
+		return null;
+	}
+	return object;
 }
 /**
 * Traverses a collection, yielding each item in the collection.

package/dist/middleware-BYEKw_OJ.js

@@ -0,0 +1,17 @@
+
+          import { Temporal } from "@js-temporal/polyfill";
+          import { URLPattern } from "urlpattern-polyfill";
+        
+import "./transformers-BFT6d7J5.js";
+import "./docloader-DyvW1gbN.js";
+import "./actor-Dpkqj5Dv.js";
+import { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, createFederation } from "./middleware-Cj9WC_iX.js";
+import "./lookup-WoJkw8wY.js";
+import "./key-CbnQpdZy.js";
+import "./http-xsj5Fzwl.js";
+import "./proof-CpmDDzvf.js";
+import "./types-BsM0mf3R.js";
+import "./authdocloader-BVvTFQbi.js";
+import "./vocab-DdTdRfBW.js";
+
+export { FederationImpl };

package/dist/{middleware-BcqldfgB.cjs → middleware-CWlrInU2.cjs}

@@ -4,15 +4,15 @@
         
 const require_chunk = require('./chunk-DqRYRqnO.cjs');
 const require_transformers = require('./transformers-CoBS-oFG.cjs');
-const require_docloader = require('./docloader-CCo7N8E2.cjs');
-const require_actor = require('./actor-BkOvltE1.cjs');
-const require_lookup = require('./lookup-CwHCSBI8.cjs');
-const require_key = require('./key-4EZXrjJw.cjs');
-const require_http = require('./http-DpcYXIiB.cjs');
-const require_proof = require('./proof-DasSZLsd.cjs');
-const require_types = require('./types-DF88bXyE.cjs');
-const require_authdocloader = require('./authdocloader-lcfCE1vG.cjs');
-const require_vocab = require('./vocab-DFyEBhSA.cjs');
+const require_docloader = require('./docloader-Bui9z8Lb.cjs');
+const require_actor = require('./actor-CK94m0Yv.cjs');
+const require_lookup = require('./lookup-D_w567L8.cjs');
+const require_key = require('./key-DqqCoLbc.cjs');
+const require_http = require('./http-BAaVL480.cjs');
+const require_proof = require('./proof-BLoRsaYR.cjs');
+const require_types = require('./types-F8JMlP-f.cjs');
+const require_authdocloader = require('./authdocloader-4iBGWlQw.cjs');
+const require_vocab = require('./vocab-C-qxDq1m.cjs');
 const __logtape_logtape = require_chunk.__toESM(require("@logtape/logtape"));
 const __opentelemetry_api = require_chunk.__toESM(require("@opentelemetry/api"));
 const byte_encodings_hex = require_chunk.__toESM(require("byte-encodings/hex"));
@@ -56,17 +56,39 @@ var InboxListenerSet = class InboxListenerSet {
 		return this.dispatchWithClass(activity)?.listener ?? null;
 	}
 };
-async function routeActivity({ context: ctx, json, activity, recipient, inboxListeners, inboxContextFactory, inboxErrorHandler, kv, kvPrefixes, queue, span, tracerProvider }) {
+let warnedAboutDefaultIdempotency = false;
+async function routeActivity({ context: ctx, json, activity, recipient, inboxListeners, inboxContextFactory, inboxErrorHandler, kv, kvPrefixes, queue, span, tracerProvider, idempotencyStrategy }) {
 	const logger$1 = (0, __logtape_logtape.getLogger)([
 		"fedify",
 		"federation",
 		"inbox"
 	]);
-	const cacheKey = activity.id == null ? null : [
-		...kvPrefixes.activityIdempotence,
-		ctx.origin,
-		activity.id.href
-	];
+	let cacheKey = null;
+	if (activity.id != null) {
+		const inboxContext = inboxContextFactory(recipient, json, activity.id?.href, require_actor.getTypeId(activity).href);
+		const strategy = idempotencyStrategy ?? "per-origin";
+		if (idempotencyStrategy === void 0 && !warnedAboutDefaultIdempotency) {
+			logger$1.warn("Using default idempotency strategy 'per-origin'. This default will change to 'per-inbox' in Fedify 2.0. Please explicitly set the idempotency strategy using .withIdempotency().");
+			warnedAboutDefaultIdempotency = true;
+		}
+		let keyString;
+		if (typeof strategy === "function") {
+			const result = await strategy(inboxContext, activity);
+			keyString = result;
+		} else switch (strategy) {
+			case "global":
+				keyString = activity.id.href;
+				break;
+			case "per-origin":
+				keyString = `${ctx.origin}\n${activity.id.href}`;
+				break;
+			case "per-inbox":
+				keyString = `${ctx.origin}\n${activity.id.href}\n${recipient == null ? "sharedInbox" : `inbox\n${recipient}`}`;
+				break;
+			default: keyString = `${ctx.origin}\n${activity.id.href}`;
+		}
+		if (keyString != null) cacheKey = [...kvPrefixes.activityIdempotence, keyString];
+	}
 	if (cacheKey != null) {
 		const cached = await kv.get(cacheKey);
 		if (cached === true) {
@@ -308,6 +330,7 @@ var FederationBuilderImpl = class {
 	inboxListeners;
 	inboxErrorHandler;
 	sharedInboxKeyDispatcher;
+	idempotencyStrategy;
 	collectionTypeIds;
 	collectionCallbacks;
 	/**
@@ -322,7 +345,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl: FederationImpl$1 } = await Promise.resolve().then(() => require("./middleware-T8MY-txY.cjs"));
+		const { FederationImpl: FederationImpl$1 } = await Promise.resolve().then(() => require("./middleware-hTlyJu9R.cjs"));
 		const f = new FederationImpl$1(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -344,6 +367,7 @@ var FederationBuilderImpl = class {
 		f.inboxListeners = this.inboxListeners?.clone();
 		f.inboxErrorHandler = this.inboxErrorHandler;
 		f.sharedInboxKeyDispatcher = this.sharedInboxKeyDispatcher;
+		f.idempotencyStrategy = this.idempotencyStrategy;
 		return f;
 	}
 	_getTracer() {
@@ -766,6 +790,10 @@ var FederationBuilderImpl = class {
 			setSharedKeyDispatcher: (dispatcher) => {
 				this.sharedInboxKeyDispatcher = dispatcher;
 				return setters;
+			},
+			withIdempotency: (strategy) => {
+				this.idempotencyStrategy = strategy;
+				return setters;
 			}
 		};
 		return setters;
@@ -1297,7 +1325,8 @@ async function handleInbox(request, options) {
 * @param span The OpenTelemetry span for tracing.
 * @returns A promise that resolves to an HTTP response.
 */
-async function handleInboxInternal(request, { recipient, context: ctx, inboxContextFactory, kv, kvPrefixes, queue, actorDispatcher, inboxListeners, inboxErrorHandler, onNotFound, signatureTimeWindow, skipSignatureVerification, tracerProvider }, span) {
+async function handleInboxInternal(request, parameters, span) {
+	const { recipient, context: ctx, inboxContextFactory, kv, kvPrefixes, queue, actorDispatcher, inboxListeners, inboxErrorHandler, onNotFound, signatureTimeWindow, skipSignatureVerification, tracerProvider } = parameters;
 	const logger$1 = (0, __logtape_logtape.getLogger)([
 		"fedify",
 		"federation",
@@ -1499,7 +1528,8 @@ async function handleInboxInternal(request, { recipient, context: ctx, inboxCont
 		kvPrefixes,
 		queue,
 		span,
-		tracerProvider
+		tracerProvider,
+		idempotencyStrategy: parameters.idempotencyStrategy
 	});
 	if (routeResult === "alreadyProcessed") return new Response(`Activity <${activity.id}> has already been processed.`, {
 		status: 202,
@@ -3096,7 +3126,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 					onNotFound,
 					signatureTimeWindow: this.signatureTimeWindow,
 					skipSignatureVerification: this.skipSignatureVerification,
-					tracerProvider: this.tracerProvider
+					tracerProvider: this.tracerProvider,
+					idempotencyStrategy: this.idempotencyStrategy
 				});
 			case "following": return await handleCollection(request, {
 				name: "following",
@@ -3487,15 +3518,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 }
@@ -3656,12 +3688,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);
@@ -3846,7 +3877,8 @@ var ContextImpl = class ContextImpl {
 			kvPrefixes: this.federation.kvPrefixes,
 			queue: this.federation.inboxQueue,
 			span,
-			tracerProvider: options.tracerProvider ?? this.tracerProvider
+			tracerProvider: options.tracerProvider ?? this.tracerProvider,
+			idempotencyStrategy: this.federation.idempotencyStrategy
 		});
 		return routeResult === "alreadyProcessed" || routeResult === "enqueued" || routeResult === "unsupportedActivity" || routeResult === "success";
 	}