@fedify/fedify 2.0.1 → 2.0.2-dev.415

package/dist/{middleware-B3GuN6Gj.js → middleware-B9frafBa.js}

@@ -3,10 +3,10 @@
           import { URLPattern } from "urlpattern-polyfill";
         
 import { getDefaultActivityTransformers } from "./transformers-C3FLHUd6.js";
-import { deno_default, doubleKnock, exportJwk, importJwk, validateCryptoKey, verifyRequest } from "./http-CCsNu78I.js";
-import { detachSignature, doesActorOwnKey, getKeyOwner, hasSignature, signJsonLd, signObject, verifyJsonLd, verifyObject } from "./proof-D61EYfPl.js";
+import { deno_default, doubleKnock, exportJwk, importJwk, validateCryptoKey, verifyRequest } from "./http-C3ipH_7H.js";
+import { detachSignature, doesActorOwnKey, getKeyOwner, hasSignature, signJsonLd, signObject, verifyJsonLd, verifyObject } from "./proof-CNhYMIct.js";
 import { getNodeInfo, nodeInfoToJson } from "./types-C93Ob9cU.js";
-import { getAuthenticatedDocumentLoader, kvCache } from "./kv-cache-6b2ldIo-.js";
+import { getAuthenticatedDocumentLoader, kvCache } from "./kv-cache-CFQBoGCe.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 { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
@@ -338,7 +338,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl: FederationImpl$1 } = await import("./middleware-CfL_Pd6a.js");
+		const { FederationImpl: FederationImpl$1 } = await import("./middleware-DhlkbIaH.js");
 		const f = new FederationImpl$1(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -993,25 +993,7 @@ async function handleActor(request, { identifier, context: context$1, actorDispa
 		return await onNotFound(request);
 	}
 	if (authorizePredicate != null) {
-		let key = await context$1.getSignedKey();
-		key = key?.clone({}, { $warning: {
-			category: [
-				"fedify",
-				"federation",
-				"actor"
-			],
-			message: "The third parameter of AuthorizePredicate is deprecated in favor of RequestContext.getSignedKey() method.  The third parameter will be removed in a future release."
-		} }) ?? null;
-		let keyOwner = await context$1.getSignedKeyOwner();
-		keyOwner = keyOwner?.clone({}, { $warning: {
-			category: [
-				"fedify",
-				"federation",
-				"actor"
-			],
-			message: "The fourth parameter of AuthorizePredicate is deprecated in favor of RequestContext.getSignedKeyOwner() method.  The fourth parameter will be removed in a future release."
-		} }) ?? null;
-		if (!await authorizePredicate(context$1, identifier, key, keyOwner)) return await onUnauthorized(request);
+		if (!await authorizePredicate(context$1, identifier)) return await onUnauthorized(request);
 	}
 	const jsonLd = await actor.toJsonLd(context$1);
 	return new Response(JSON.stringify(jsonLd), { headers: {
@@ -1031,25 +1013,7 @@ async function handleObject(request, { values, context: context$1, objectDispatc
 	const object = await objectDispatcher(context$1, values);
 	if (object == null) return await onNotFound(request);
 	if (authorizePredicate != null) {
-		let key = await context$1.getSignedKey();
-		key = key?.clone({}, { $warning: {
-			category: [
-				"fedify",
-				"federation",
-				"object"
-			],
-			message: "The third parameter of ObjectAuthorizePredicate is deprecated in favor of RequestContext.getSignedKey() method.  The third parameter will be removed in a future release."
-		} }) ?? null;
-		let keyOwner = await context$1.getSignedKeyOwner();
-		keyOwner = keyOwner?.clone({}, { $warning: {
-			category: [
-				"fedify",
-				"federation",
-				"object"
-			],
-			message: "The fourth parameter of ObjectAuthorizePredicate is deprecated in favor of RequestContext.getSignedKeyOwner() method.  The fourth parameter will be removed in a future release."
-		} }) ?? null;
-		if (!await authorizePredicate(context$1, values, key, keyOwner)) return await onUnauthorized(request);
+		if (!await authorizePredicate(context$1, values)) return await onUnauthorized(request);
 	}
 	const jsonLd = await object.toJsonLd(context$1);
 	return new Response(JSON.stringify(jsonLd), { headers: {
@@ -1181,25 +1145,7 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 		});
 	}
 	if (collectionCallbacks.authorizePredicate != null) {
-		let key = await context$1.getSignedKey();
-		key = key?.clone({}, { $warning: {
-			category: [
-				"fedify",
-				"federation",
-				"collection"
-			],
-			message: "The third parameter of AuthorizePredicate is deprecated in favor of RequestContext.getSignedKey() method.  The third parameter will be removed in a future release."
-		} }) ?? null;
-		let keyOwner = await context$1.getSignedKeyOwner();
-		keyOwner = keyOwner?.clone({}, { $warning: {
-			category: [
-				"fedify",
-				"federation",
-				"collection"
-			],
-			message: "The fourth parameter of AuthorizePredicate is deprecated in favor of RequestContext.getSignedKeyOwner() method.  The fourth parameter will be removed in a future release."
-		} }) ?? null;
-		if (!await collectionCallbacks.authorizePredicate(context$1, identifier, key, keyOwner)) return await onUnauthorized(request);
+		if (!await collectionCallbacks.authorizePredicate(context$1, identifier)) return await onUnauthorized(request);
 	}
 	const jsonLd = await collection.toJsonLd(context$1);
 	return new Response(JSON.stringify(jsonLd), { headers: {
@@ -1850,28 +1796,7 @@ const verifyDefined = (callbacks) => {
 */
 const authIfNeeded = async (context$1, values, { authorizePredicate: authorize = void 0 }) => {
 	if (authorize === void 0) return;
-	const key = (await context$1.getSignedKey())?.clone({}, warning.key) ?? null;
-	const keyOwner = (await context$1.getSignedKeyOwner())?.clone({}, warning.keyOwner) ?? null;
-	if (!await authorize(context$1, values, key, keyOwner)) throw new UnauthorizedError();
-};
-/** Warning messages for `authIfNeeded`. */
-const warning = {
-	key: { $warning: {
-		category: [
-			"fedify",
-			"federation",
-			"collection"
-		],
-		message: "The third parameter of AuthorizePredicate is deprecated in favor of RequestContext.getSignedKey() method.  The third parameter will be removed in a future release."
-	} },
-	keyOwner: { $warning: {
-		category: [
-			"fedify",
-			"federation",
-			"collection"
-		],
-		message: "The fourth parameter of AuthorizePredicate is deprecated in favor of RequestContext.getSignedKeyOwner() method.  The fourth parameter will be removed in a future release."
-	} }
+	if (!await authorize(context$1, values)) throw new UnauthorizedError();
 };
 /**
 * Appends a cursor parameter to a URL if the cursor exists.

package/dist/middleware-Bt5MUXQg.cjs

@@ -0,0 +1,12 @@
+
+          const { Temporal } = require("@js-temporal/polyfill");
+          const { URLPattern } = require("urlpattern-polyfill");
+        
+require('./transformers-3g8GZwkZ.cjs');
+require('./http-DGYGS8C8.cjs');
+const require_middleware = require('./middleware-B1XHFs0D.cjs');
+require('./proof-DnzISmKI.cjs');
+require('./types-Cd_hszr_.cjs');
+require('./kv-cache-Bd2z9in6.cjs');
+
+exports.FederationImpl = require_middleware.FederationImpl;

package/dist/{middleware-0fnsG0v7.js → middleware-ByIcAfxE.js}

@@ -3,24 +3,24 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import "./deno-CIi8RNND.js";
-import { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, createFederation } from "./middleware-B4Bgz0MJ.js";
+import "./deno-D-Duks4b.js";
+import { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, createFederation } from "./middleware-OPyIzlKI.js";
 import "./client-Dg7OfUDA.js";
 import "./router-D9eI0s4b.js";
 import "./types-CPz01LGH.js";
-import "./key-C7JS89OH.js";
-import "./http-Dvox_xrq.js";
-import "./ld-C8i1kViF.js";
-import "./owner-BOSWh-ha.js";
-import "./proof-BeT_MFIx.js";
-import "./docloader-CmrEfaGw.js";
+import "./key-DChkqRrm.js";
+import "./http-DnP0rGKj.js";
+import "./ld-CR9Xg8mN.js";
+import "./owner-DfXg2o90.js";
+import "./proof-BTvHpR2_.js";
+import "./docloader-Bb4MhBYJ.js";
 import "./kv-cache-B__dHl7g.js";
-import "./inbox-CiTdVhJQ.js";
-import "./builder-CqPrSnE5.js";
+import "./inbox-CbNZlhe6.js";
+import "./builder-B55ClH_D.js";
 import "./collection-CcnIw1qY.js";
 import "./keycache-DRxpZ5r9.js";
 import "./negotiation-5NPJL6zp.js";
 import "./retry-D4GJ670a.js";
-import "./send-D7lC06r9.js";
+import "./send-DaEkUvnr.js";
 
 export { FederationImpl };

package/dist/{middleware-CfL_Pd6a.js → middleware-DhlkbIaH.js}

@@ -3,10 +3,10 @@
           import { URLPattern } from "urlpattern-polyfill";
         
 import "./transformers-C3FLHUd6.js";
-import "./http-CCsNu78I.js";
-import { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, createFederation } from "./middleware-B3GuN6Gj.js";
-import "./proof-D61EYfPl.js";
+import "./http-C3ipH_7H.js";
+import { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, createFederation } from "./middleware-B9frafBa.js";
+import "./proof-CNhYMIct.js";
 import "./types-C93Ob9cU.js";
-import "./kv-cache-6b2ldIo-.js";
+import "./kv-cache-CFQBoGCe.js";
 
 export { FederationImpl };

package/dist/{middleware-B4Bgz0MJ.js → middleware-OPyIzlKI.js}

@@ -3,24 +3,24 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { deno_default } from "./deno-CIi8RNND.js";
+import { deno_default } from "./deno-D-Duks4b.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-C7JS89OH.js";
-import { verifyRequest } from "./http-Dvox_xrq.js";
-import { detachSignature, hasSignature, signJsonLd, verifyJsonLd } from "./ld-C8i1kViF.js";
-import { doesActorOwnKey, getKeyOwner } from "./owner-BOSWh-ha.js";
-import { signObject, verifyObject } from "./proof-BeT_MFIx.js";
-import { getAuthenticatedDocumentLoader } from "./docloader-CmrEfaGw.js";
+import { exportJwk, importJwk, validateCryptoKey } from "./key-DChkqRrm.js";
+import { verifyRequest } from "./http-DnP0rGKj.js";
+import { detachSignature, hasSignature, signJsonLd, verifyJsonLd } from "./ld-CR9Xg8mN.js";
+import { doesActorOwnKey, getKeyOwner } from "./owner-DfXg2o90.js";
+import { signObject, verifyObject } from "./proof-BTvHpR2_.js";
+import { getAuthenticatedDocumentLoader } from "./docloader-Bb4MhBYJ.js";
 import { kvCache } from "./kv-cache-B__dHl7g.js";
-import { routeActivity } from "./inbox-CiTdVhJQ.js";
-import { FederationBuilderImpl } from "./builder-CqPrSnE5.js";
+import { routeActivity } from "./inbox-CbNZlhe6.js";
+import { FederationBuilderImpl } from "./builder-B55ClH_D.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-D7lC06r9.js";
+import { SendActivityError, extractInboxes, sendActivity } from "./send-DaEkUvnr.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";
@@ -182,25 +182,7 @@ async function handleActor(request, { identifier, context: context$1, actorDispa
 		return await onNotFound(request);
 	}
 	if (authorizePredicate != null) {
-		let key = await context$1.getSignedKey();
-		key = key?.clone({}, { $warning: {
-			category: [
-				"fedify",
-				"federation",
-				"actor"
-			],
-			message: "The third parameter of AuthorizePredicate is deprecated in favor of RequestContext.getSignedKey() method.  The third parameter will be removed in a future release."
-		} }) ?? null;
-		let keyOwner = await context$1.getSignedKeyOwner();
-		keyOwner = keyOwner?.clone({}, { $warning: {
-			category: [
-				"fedify",
-				"federation",
-				"actor"
-			],
-			message: "The fourth parameter of AuthorizePredicate is deprecated in favor of RequestContext.getSignedKeyOwner() method.  The fourth parameter will be removed in a future release."
-		} }) ?? null;
-		if (!await authorizePredicate(context$1, identifier, key, keyOwner)) return await onUnauthorized(request);
+		if (!await authorizePredicate(context$1, identifier)) return await onUnauthorized(request);
 	}
 	const jsonLd = await actor.toJsonLd(context$1);
 	return new Response(JSON.stringify(jsonLd), { headers: {
@@ -220,25 +202,7 @@ async function handleObject(request, { values, context: context$1, objectDispatc
 	const object = await objectDispatcher(context$1, values);
 	if (object == null) return await onNotFound(request);
 	if (authorizePredicate != null) {
-		let key = await context$1.getSignedKey();
-		key = key?.clone({}, { $warning: {
-			category: [
-				"fedify",
-				"federation",
-				"object"
-			],
-			message: "The third parameter of ObjectAuthorizePredicate is deprecated in favor of RequestContext.getSignedKey() method.  The third parameter will be removed in a future release."
-		} }) ?? null;
-		let keyOwner = await context$1.getSignedKeyOwner();
-		keyOwner = keyOwner?.clone({}, { $warning: {
-			category: [
-				"fedify",
-				"federation",
-				"object"
-			],
-			message: "The fourth parameter of ObjectAuthorizePredicate is deprecated in favor of RequestContext.getSignedKeyOwner() method.  The fourth parameter will be removed in a future release."
-		} }) ?? null;
-		if (!await authorizePredicate(context$1, values, key, keyOwner)) return await onUnauthorized(request);
+		if (!await authorizePredicate(context$1, values)) return await onUnauthorized(request);
 	}
 	const jsonLd = await object.toJsonLd(context$1);
 	return new Response(JSON.stringify(jsonLd), { headers: {
@@ -370,25 +334,7 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 		});
 	}
 	if (collectionCallbacks.authorizePredicate != null) {
-		let key = await context$1.getSignedKey();
-		key = key?.clone({}, { $warning: {
-			category: [
-				"fedify",
-				"federation",
-				"collection"
-			],
-			message: "The third parameter of AuthorizePredicate is deprecated in favor of RequestContext.getSignedKey() method.  The third parameter will be removed in a future release."
-		} }) ?? null;
-		let keyOwner = await context$1.getSignedKeyOwner();
-		keyOwner = keyOwner?.clone({}, { $warning: {
-			category: [
-				"fedify",
-				"federation",
-				"collection"
-			],
-			message: "The fourth parameter of AuthorizePredicate is deprecated in favor of RequestContext.getSignedKeyOwner() method.  The fourth parameter will be removed in a future release."
-		} }) ?? null;
-		if (!await collectionCallbacks.authorizePredicate(context$1, identifier, key, keyOwner)) return await onUnauthorized(request);
+		if (!await collectionCallbacks.authorizePredicate(context$1, identifier)) return await onUnauthorized(request);
 	}
 	const jsonLd = await collection.toJsonLd(context$1);
 	return new Response(JSON.stringify(jsonLd), { headers: {
@@ -1039,28 +985,7 @@ const verifyDefined = (callbacks) => {
 */
 const authIfNeeded = async (context$1, values, { authorizePredicate: authorize = void 0 }) => {
 	if (authorize === void 0) return;
-	const key = (await context$1.getSignedKey())?.clone({}, warning.key) ?? null;
-	const keyOwner = (await context$1.getSignedKeyOwner())?.clone({}, warning.keyOwner) ?? null;
-	if (!await authorize(context$1, values, key, keyOwner)) throw new UnauthorizedError();
-};
-/** Warning messages for `authIfNeeded`. */
-const warning = {
-	key: { $warning: {
-		category: [
-			"fedify",
-			"federation",
-			"collection"
-		],
-		message: "The third parameter of AuthorizePredicate is deprecated in favor of RequestContext.getSignedKey() method.  The third parameter will be removed in a future release."
-	} },
-	keyOwner: { $warning: {
-		category: [
-			"fedify",
-			"federation",
-			"collection"
-		],
-		message: "The fourth parameter of AuthorizePredicate is deprecated in favor of RequestContext.getSignedKeyOwner() method.  The fourth parameter will be removed in a future release."
-	} }
+	if (!await authorize(context$1, values)) throw new UnauthorizedError();
 };
 /**
 * Appends a cursor parameter to a URL if the cursor exists.

package/dist/mod-CwZXZJ9d.d.ts

@@ -0,0 +1,91 @@
+import { Temporal } from "@js-temporal/polyfill";
+import { URLPattern } from "urlpattern-polyfill";
+import { HttpMessageSignaturesSpecDeterminer } from "./http-DkHdFfrc.js";
+import { KvKey, KvStore } from "./kv-DXEUEP6z.js";
+import { TracerProvider } from "@opentelemetry/api";
+import { DocumentLoader, DocumentLoaderFactoryOptions } from "@fedify/vocab-runtime";
+
+//#region src/utils/docloader.d.ts
+/**
+* Options for {@link getAuthenticatedDocumentLoader}.
+* @see {@link getAuthenticatedDocumentLoader}
+* @since 1.3.0
+*/
+interface GetAuthenticatedDocumentLoaderOptions extends DocumentLoaderFactoryOptions {
+  /**
+  * An optional spec determiner for HTTP Message Signatures.
+  * It determines the spec to use for signing requests.
+  * It is used for double-knocking
+  * (see <https://swicg.github.io/activitypub-http-signature/#how-to-upgrade-supported-versions>).
+  * @since 1.6.0
+  */
+  specDeterminer?: HttpMessageSignaturesSpecDeterminer;
+  /**
+  * The OpenTelemetry tracer provider.  If omitted, the global tracer provider
+  * is used.
+  * @since 1.6.0
+  */
+  tracerProvider?: TracerProvider;
+}
+/**
+* Gets an authenticated {@link DocumentLoader} for the given identity.
+* Note that an authenticated document loader intentionally does not cache
+* the fetched documents.
+* @param identity The identity to get the document loader for.
+*                 The actor's key pair.
+* @param options The options for the document loader.
+* @returns The authenticated document loader.
+* @throws {TypeError} If the key is invalid or unsupported.
+* @since 0.4.0
+*/
+declare function getAuthenticatedDocumentLoader(identity: {
+  keyId: URL;
+  privateKey: CryptoKey;
+}, {
+  allowPrivateAddress,
+  userAgent,
+  specDeterminer,
+  tracerProvider
+}?: GetAuthenticatedDocumentLoaderOptions): DocumentLoader;
+//#endregion
+//#region src/utils/kv-cache.d.ts
+/**
+* The parameters for {@link kvCache} function.
+*/
+interface KvCacheParameters {
+  /**
+  * The document loader to decorate with a cache.
+  */
+  readonly loader: DocumentLoader;
+  /**
+  * The key–value store to use for backing the cache.
+  */
+  readonly kv: KvStore;
+  /**
+  * The key prefix to use for namespacing the cache.
+  * `["_fedify", "remoteDocument"]` by default.
+  */
+  readonly prefix?: KvKey;
+  /**
+  * The per-URL cache rules in the array of `[urlPattern, duration]` pairs
+  * where `urlPattern` is either a string, a {@link URL}, or
+  * a {@link URLPattern} and `duration` is a {@link Temporal.DurationLike}.
+  * The `duration` is allowed to be at most 30 days.
+  *
+  * By default, 5 minutes for all URLs.
+  */
+  readonly rules?: readonly [string | URL | URLPattern, Temporal.Duration | Temporal.DurationLike][];
+}
+/**
+* Decorates a {@link DocumentLoader} with a cache backed by a {@link KvStore}.
+* @param parameters The parameters for the cache.
+* @returns The decorated document loader which is cache-enabled.
+*/
+declare function kvCache({
+  loader,
+  kv,
+  prefix,
+  rules
+}: KvCacheParameters): DocumentLoader;
+//#endregion
+export { getAuthenticatedDocumentLoader, kvCache };