@fedify/fedify 2.0.0-pr.435.1667 → 2.0.0-pr.445.1694

package/dist/federation/retry.test.js

@@ -3,12 +3,12 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import "../type-FCer_9yh.js";
+import "../type-DaUr3Il7.js";
 import { AssertionError, assertEquals } from "../assert_equals-DSbWqCm3.js";
-import "../lookup-BrhURkmj.js";
-import { createExponentialBackoffPolicy } from "../retry-CfF8Gn4d.js";
-import { test } from "../testing-BMBhkcz9.js";
-import { assertNotEquals } from "../assert_not_equals-C80BG-_5.js";
+import "../lookup-CbtuFbtg.js";
+import { createExponentialBackoffPolicy } from "../retry-D4GJ670a.js";
+import { test } from "../testing-tWr1VQxx.js";
+import { assertNotEquals } from "../assert_not_equals-f3m3epl3.js";
 
 //#region src/federation/retry.test.ts
 test("createExponentialBackoffPolicy()", () => {

package/dist/federation/router.test.js

@@ -3,17 +3,17 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import "../type-FCer_9yh.js";
+import "../type-DaUr3Il7.js";
 import { assertEquals } from "../assert_equals-DSbWqCm3.js";
 import { assert } from "../assert-MZs1qjMx.js";
 import "../assert_instance_of-DHz7EHNU.js";
-import { Router, RouterError } from "../lookup-BrhURkmj.js";
-import { test } from "../testing-BMBhkcz9.js";
-import "../std__assert-DWivtrGR.js";
-import { assertFalse } from "../assert_rejects-7UF4R_Qs.js";
-import "../assert_is_error-B035L3om.js";
-import "../assert_not_equals-C80BG-_5.js";
-import { assertThrows } from "../assert_throws-53_pKeP3.js";
+import { Router, RouterError } from "../lookup-CbtuFbtg.js";
+import { test } from "../testing-tWr1VQxx.js";
+import "../std__assert-X-_kMxKM.js";
+import { assertFalse } from "../assert_rejects-DiIiJbZn.js";
+import "../assert_is_error-BPGph1Jx.js";
+import "../assert_not_equals-f3m3epl3.js";
+import { assertThrows } from "../assert_throws-BOO88avQ.js";
 
 //#region src/federation/router.test.ts
 function setUp(options = {}) {

package/dist/federation/send.test.js

@@ -3,24 +3,24 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { Activity, Application, Endpoints, Group, Person, Service } from "../type-FCer_9yh.js";
+import { Activity, Application, Endpoints, Group, Person, Service } from "../type-DaUr3Il7.js";
 import { assertEquals } from "../assert_equals-DSbWqCm3.js";
 import { assert } from "../assert-MZs1qjMx.js";
 import "../assert_instance_of-DHz7EHNU.js";
-import "../lookup-BrhURkmj.js";
-import "../actor-Cpal85xW.js";
-import "../key-DORX19Bl.js";
-import { verifyRequest } from "../http-y7khnX5Q.js";
-import { doesActorOwnKey } from "../owner-NFlQJyvM.js";
-import { extractInboxes, sendActivity } from "../send-DkwkMFjJ.js";
-import { mockDocumentLoader, test } from "../testing-BMBhkcz9.js";
-import "../std__assert-DWivtrGR.js";
-import { assertFalse, assertRejects } from "../assert_rejects-7UF4R_Qs.js";
-import "../assert_is_error-B035L3om.js";
-import { assertNotEquals } from "../assert_not_equals-C80BG-_5.js";
-import "../assert_throws-53_pKeP3.js";
-import { ed25519Multikey, ed25519PrivateKey, rsaPrivateKey2, rsaPublicKey2 } from "../keys-B3fzLXBG.js";
-import { esm_default } from "../esm-BBznxjVc.js";
+import "../lookup-CbtuFbtg.js";
+import "../actor-D8gCwLzv.js";
+import "../key-DnqhSgAv.js";
+import { verifyRequest } from "../http-CuS-d4U0.js";
+import { doesActorOwnKey } from "../owner-ChSL4aJ7.js";
+import { extractInboxes, sendActivity } from "../send-D5fjmUEj.js";
+import { mockDocumentLoader, test } from "../testing-tWr1VQxx.js";
+import "../std__assert-X-_kMxKM.js";
+import { assertFalse, assertRejects } from "../assert_rejects-DiIiJbZn.js";
+import "../assert_is_error-BPGph1Jx.js";
+import { assertNotEquals } from "../assert_not_equals-f3m3epl3.js";
+import "../assert_throws-BOO88avQ.js";
+import { ed25519Multikey, ed25519PrivateKey, rsaPrivateKey2, rsaPublicKey2 } from "../keys-D3_MDK7n.js";
+import { esm_default } from "../esm-Dl5T1RNE.js";
 
 //#region src/federation/send.test.ts
 test("extractInboxes()", () => {

package/dist/fixtures/media.example.com/avatars/test-avatar.jpg.json

@@ -0,0 +1,6 @@
+{
+  "@context": "https://www.w3.org/ns/activitystreams",
+  "id": "https://media.example.com/avatars/test-avatar.jpg",
+  "type": "Image",
+  "url": "/avatars/test-avatar.jpg"
+}

package/dist/{http-Hw9HJp9i.cjs → http-CAusBl_3.cjs}

@@ -3,9 +3,9 @@
           const { URLPattern } = require("urlpattern-polyfill");
         
 const require_chunk = require('./chunk-DqRYRqnO.cjs');
-const require_docloader = require('./docloader-B1O1Z5OK.cjs');
-const require_actor = require('./actor-C3gJhZJj.cjs');
-const require_key = require('./key-CzF9SAEI.cjs');
+const require_docloader = require('./docloader-CYnQRIXv.cjs');
+const require_actor = require('./actor-CwZ2m5rG.cjs');
+const require_key = require('./key-DuXv64tg.cjs');
 const __logtape_logtape = require_chunk.__toESM(require("@logtape/logtape"));
 const __opentelemetry_api = require_chunk.__toESM(require("@opentelemetry/api"));
 const byte_encodings_base64 = require_chunk.__toESM(require("byte-encodings/base64"));

package/dist/{http-CovAm6we.js → http-C_Qc2neP.js}

@@ -2,9 +2,9 @@
           import { Temporal } from "@js-temporal/polyfill";
           import { URLPattern } from "urlpattern-polyfill";
         
-import { deno_default } from "./docloader-xJVzq9O0.js";
-import { CryptographicKey } from "./actor-CnVfp1Hp.js";
-import { fetchKey, validateCryptoKey } from "./key-BRmlopJL.js";
+import { deno_default } from "./docloader-Czl3xV10.js";
+import { CryptographicKey } from "./actor-DoMcqXsW.js";
+import { fetchKey, validateCryptoKey } from "./key-BNJQQm3h.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";

package/dist/{http-y7khnX5Q.js → http-CuS-d4U0.js}

@@ -3,8 +3,8 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { CryptographicKey, deno_default } from "./type-FCer_9yh.js";
-import { fetchKey, validateCryptoKey } from "./key-DORX19Bl.js";
+import { CryptographicKey, deno_default } from "./type-DaUr3Il7.js";
+import { fetchKey, validateCryptoKey } from "./key-DnqhSgAv.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } from "@opentelemetry/semantic-conventions";

package/dist/{http-BS6766zs.d.cts → http-D-e6AFwR.d.cts}

@@ -1,5 +1,5 @@
 import { DocumentLoader } from "./docloader-D-MrRyHl.cjs";
-import { CryptographicKey, Multikey } from "./vocab-DJTYMqyU.cjs";
+import { CryptographicKey, Multikey } from "./vocab-Dw1-yVGg.cjs";
 import { TracerProvider } from "@opentelemetry/api";
 
 //#region src/sig/key.d.ts

package/dist/{http-DqSNLFNY.d.ts → http-D6Uj2x2y.d.ts}

@@ -1,7 +1,7 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 import { DocumentLoader } from "./docloader-CxWcuWqQ.js";
-import { CryptographicKey, Multikey } from "./vocab-SOE1ifCr.js";
+import { CryptographicKey, Multikey } from "./vocab-BI0Ak5lL.js";
 import { TracerProvider } from "@opentelemetry/api";
 
 //#region src/sig/key.d.ts

package/dist/{inbox-DpcYOzs8.js → inbox-IETv_Qez.js}

@@ -3,7 +3,7 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { Activity, deno_default, getTypeId } from "./type-FCer_9yh.js";
+import { Activity, deno_default, getTypeId } from "./type-DaUr3Il7.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
 
@@ -41,17 +41,34 @@ 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 }) {
+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-inbox";
+		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-BRmlopJL.js → key-BNJQQm3h.js}

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

package/dist/{key-lapZwBwG.js → key-C_ruQbbl.js}

@@ -2,9 +2,9 @@
           import { Temporal } from "@js-temporal/polyfill";
           import { URLPattern } from "urlpattern-polyfill";
         
-import "./docloader-xJVzq9O0.js";
-import "./actor-CnVfp1Hp.js";
-import "./lookup-CfU0DgLr.js";
-import { exportJwk, fetchKey, generateCryptoKeyPair, importJwk, validateCryptoKey } from "./key-BRmlopJL.js";
+import "./docloader-Czl3xV10.js";
+import "./actor-DoMcqXsW.js";
+import "./lookup-Dhm78GlK.js";
+import { exportJwk, fetchKey, generateCryptoKeyPair, importJwk, validateCryptoKey } from "./key-BNJQQm3h.js";
 
 export { validateCryptoKey };

package/dist/key-DIMJMxf4.cjs

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

package/dist/{key-DORX19Bl.js → key-DnqhSgAv.js}

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

package/dist/{key-jf6dIIF-.js → key-DpFjiItf.js}

@@ -3,8 +3,8 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import "./type-FCer_9yh.js";
-import "./actor-Cpal85xW.js";
-import { exportJwk, fetchKey, generateCryptoKeyPair, importJwk, validateCryptoKey } from "./key-DORX19Bl.js";
+import "./type-DaUr3Il7.js";
+import "./actor-D8gCwLzv.js";
+import { exportJwk, fetchKey, generateCryptoKeyPair, importJwk, validateCryptoKey } from "./key-DnqhSgAv.js";
 
 export { validateCryptoKey };

package/dist/{key-CzF9SAEI.cjs → key-DuXv64tg.cjs}

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

package/dist/{keycache-AH1uj1j-.js → keycache-CSBkusP8.js}

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

package/dist/{keys-B3fzLXBG.js → keys-D3_MDK7n.js}

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

package/dist/{ld-D3cq9xO1.js → ld-Isot0tiW.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-FCer_9yh.js";
-import { fetchKey, validateCryptoKey } from "./key-DORX19Bl.js";
+import { Activity, CryptographicKey, Object as Object$1, deno_default, getDocumentLoader, getTypeId } from "./type-DaUr3Il7.js";
+import { fetchKey, validateCryptoKey } from "./key-DnqhSgAv.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";

package/dist/{lookup-BrhURkmj.js → lookup-CbtuFbtg.js}

@@ -3,7 +3,7 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { Object as Object$1, deno_default, getDocumentLoader, getTypeId, lookupWebFinger } from "./type-FCer_9yh.js";
+import { Object as Object$1, deno_default, getDocumentLoader, getTypeId, lookupWebFinger } from "./type-DaUr3Il7.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/{lookup-7u217Q3H.cjs → lookup-D6dro5Au.cjs}

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

package/dist/{lookup-CfU0DgLr.js → lookup-Dhm78GlK.js}

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

package/dist/middleware-BpR6186a.js

@@ -0,0 +1,26 @@
+
+      import { Temporal } from "@js-temporal/polyfill";
+      import { URLPattern } from "urlpattern-polyfill";
+      globalThis.addEventListener = () => {};
+    
+import "./type-DaUr3Il7.js";
+import { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, createFederation } from "./middleware-DQYscW90.js";
+import "./client-D5CBsPrc.js";
+import "./lookup-CbtuFbtg.js";
+import "./types-BSuWJsOm.js";
+import "./actor-D8gCwLzv.js";
+import "./key-DnqhSgAv.js";
+import "./http-CuS-d4U0.js";
+import "./authdocloader-DYTNpaMA.js";
+import "./ld-Isot0tiW.js";
+import "./owner-ChSL4aJ7.js";
+import "./proof-x3IBewan.js";
+import "./inbox-IETv_Qez.js";
+import "./builder-1_skw-d2.js";
+import "./collection-CcnIw1qY.js";
+import "./keycache-CSBkusP8.js";
+import "./negotiation-5NPJL6zp.js";
+import "./retry-D4GJ670a.js";
+import "./send-D5fjmUEj.js";
+
+export { FederationImpl };