@fedify/fedify 1.4.0-dev.629 → 1.4.0-dev.632

package/CHANGES.md

@@ -8,6 +8,20 @@ Version 1.4.0
 
 To be released.
 
+ -  Document loader and context loader are now configurable with a factory
+    function for more flexibility.
+
+     -  Deprecated `CreateFederationOptions.documentLoader` option.
+        Use `CreateFederationOptions.documentLoaderFactory` option instead.
+     -  Deprecated `CreateFederationOptions.contextLoader` option.
+        Use `CreateFederationOptions.contextLoaderFactory` option instead.
+     -  Added `DocumentLoaderFactory` type.
+     -  Added `DocumentLoaderFactoryOptions` interface.
+     -  Added the second parameter with `DocumentLoaderFactoryOptions` type
+        to `AuthenticatedDocumentLoaderFactory` type.
+     -  `GetAuthenticatedDocumentLoaderOptions` interface became to extend
+        `DocumentLoaderFactoryOptions` interface.
+
  -  The `suppressError` option of Activity Vocabulary APIs,
     `traverseCollection()` function, and `Context.traverseCollection()` method
     now suppresses errors occurred JSON-LD processing.

package/README.md

@@ -98,7 +98,7 @@ financial contributors:[^2]
 
 ### Backers
 
-yamanoku, okin, Andy Piper, box464, Evan Prodromou
+yamanoku, okin, Andy Piper, box464, Evan Prodromou, Rafael Goulart
 
 ### One-time donations
 

package/esm/deno.js

@@ -1,6 +1,6 @@
 export default {
     "name": "@fedify/fedify",
-    "version": "1.4.0-dev.629+302b1dbb",
+    "version": "1.4.0-dev.632+c8474d94",
     "license": "MIT",
     "exports": {
         ".": "./mod.ts",

package/esm/federation/middleware.js

@@ -56,8 +56,8 @@ export class FederationImpl {
     inboxListeners;
     inboxErrorHandler;
     sharedInboxKeyDispatcher;
-    documentLoader;
-    contextLoader;
+    documentLoaderFactory;
+    contextLoaderFactory;
     authenticatedDocumentLoaderFactory;
     allowPrivateAddress;
     userAgent;
@@ -68,6 +68,7 @@ export class FederationImpl {
     inboxRetryPolicy;
     tracerProvider;
     constructor(options) {
+        const logger = getLogger(["fedify", "federation"]);
         this.kv = options.kv;
         this.kvPrefixes = {
             ...({
@@ -115,12 +116,42 @@ export class FederationImpl {
         }
         const { allowPrivateAddress, userAgent } = options;
         this.allowPrivateAddress = allowPrivateAddress ?? false;
-        this.documentLoader = options.documentLoader ?? kvCache({
-            loader: getDocumentLoader({ allowPrivateAddress, userAgent }),
-            kv: options.kv,
-            prefix: this.kvPrefixes.remoteDocument,
-        });
-        this.contextLoader = options.contextLoader ?? this.documentLoader;
+        if (options.documentLoader != null) {
+            if (options.documentLoaderFactory != null) {
+                throw new TypeError("Cannot set both documentLoader and documentLoaderFactory options " +
+                    "at a time; use documentLoaderFactory only.");
+            }
+            this.documentLoaderFactory = () => options.documentLoader;
+            logger.warn("The documentLoader option is deprecated; use documentLoaderFactory " +
+                "option instead.");
+        }
+        else {
+            this.documentLoaderFactory = options.documentLoaderFactory ??
+                ((opts) => {
+                    return kvCache({
+                        loader: getDocumentLoader({
+                            allowPrivateAddress: opts?.allowPrivateAddress ??
+                                allowPrivateAddress,
+                            userAgent: opts?.userAgent ?? userAgent,
+                        }),
+                        kv: options.kv,
+                        prefix: this.kvPrefixes.remoteDocument,
+                    });
+                });
+        }
+        if (options.contextLoader != null) {
+            if (options.contextLoaderFactory != null) {
+                throw new TypeError("Cannot set both contextLoader and contextLoaderFactory options " +
+                    "at a time; use contextLoaderFactory only.");
+            }
+            this.contextLoaderFactory = () => options.contextLoader;
+            logger.warn("The contextLoader option is deprecated; use contextLoaderFactory " +
+                "option instead.");
+        }
+        else {
+            this.contextLoaderFactory = options.contextLoaderFactory ??
+                this.documentLoaderFactory;
+        }
         this.authenticatedDocumentLoaderFactory =
             options.authenticatedDocumentLoaderFactory ??
                 ((identity) => getAuthenticatedDocumentLoader(identity, {
@@ -252,11 +283,12 @@ export class FederationImpl {
         }
         catch (error) {
             span.setStatus({ code: SpanStatusCode.ERROR, message: String(error) });
+            const loaderOptions = this.#getLoaderOptions(message.baseUrl);
             const activity = await Activity.fromJsonLd(message.activity, {
-                contextLoader: this.contextLoader,
+                contextLoader: this.contextLoaderFactory(loaderOptions),
                 documentLoader: rsaKeyPair == null
-                    ? this.documentLoader
-                    : this.authenticatedDocumentLoaderFactory(rsaKeyPair),
+                    ? this.documentLoaderFactory(loaderOptions)
+                    : this.authenticatedDocumentLoaderFactory(rsaKeyPair, loaderOptions),
                 tracerProvider: this.tracerProvider,
             });
             try {
@@ -435,11 +467,14 @@ export class FederationImpl {
             url.hash = "";
             url.search = "";
         }
+        const loaderOptions = this.#getLoaderOptions(url.origin);
         const ctxOptions = {
             url,
             federation: this,
             data: contextData,
-            documentLoader: opts.documentLoader ?? this.documentLoader,
+            documentLoader: opts.documentLoader ??
+                this.documentLoaderFactory(loaderOptions),
+            contextLoader: this.contextLoaderFactory(loaderOptions),
         };
         if (request == null)
             return new ContextImpl(ctxOptions);
@@ -450,6 +485,18 @@ export class FederationImpl {
             invokedFromObjectDispatcher: opts.invokedFromObjectDispatcher,
         });
     }
+    #getLoaderOptions(origin) {
+        origin = typeof origin === "string"
+            ? new URL(origin).origin
+            : origin.origin;
+        return {
+            allowPrivateAddress: this.allowPrivateAddress,
+            userAgent: typeof this.userAgent === "string" ? this.userAgent : {
+                url: origin,
+                ...this.userAgent,
+            },
+        };
+    }
     setNodeInfoDispatcher(path, dispatcher) {
         if (this.router.has("nodeInfo")) {
             throw new RouterError("NodeInfo dispatcher already set.");
@@ -1038,7 +1085,7 @@ export class FederationImpl {
     }
     async sendActivity(keys, recipients, activity, options, span) {
         const logger = getLogger(["fedify", "federation", "outbox"]);
-        const { preferSharedInbox, immediate, excludeBaseUris, collectionSync, contextData, } = options;
+        const { preferSharedInbox, immediate, excludeBaseUris, collectionSync, contextData, origin, } = options;
         if (keys.length < 1) {
             throw new TypeError("The sender's keys must not be empty.");
         }
@@ -1076,6 +1123,7 @@ export class FederationImpl {
         else if (keys.length < 1) {
             throw new TypeError("The keys must not be empty.");
         }
+        const contextLoader = this.contextLoaderFactory(this.#getLoaderOptions(origin));
         const activityId = activity.id.href;
         let proofCreated = false;
         let rsaKey = null;
@@ -1087,7 +1135,7 @@ export class FederationImpl {
             }
             if (privateKey.algorithm.name === "Ed25519") {
                 activity = await signObject(activity, privateKey, keyId, {
-                    contextLoader: this.contextLoader,
+                    contextLoader,
                     tracerProvider: this.tracerProvider,
                 });
                 proofCreated = true;
@@ -1095,7 +1143,7 @@ export class FederationImpl {
         }
         let jsonLd = await activity.toJsonLd({
             format: "compact",
-            contextLoader: this.contextLoader,
+            contextLoader,
         });
         if (rsaKey == null) {
             logger.warn("No supported key found to create a Linked Data signature for " +
@@ -1111,7 +1159,7 @@ export class FederationImpl {
         }
         else {
             jsonLd = await signJsonLd(jsonLd, rsaKey.privateKey, rsaKey.keyId, {
-                contextLoader: this.contextLoader,
+                contextLoader,
                 tracerProvider: this.tracerProvider,
             });
         }
@@ -1167,6 +1215,7 @@ export class FederationImpl {
             const message = {
                 type: "outbox",
                 id: dntShim.crypto.randomUUID(),
+                baseUrl: origin,
                 keys: keyJwkPairs,
                 activity: jsonLd,
                 activityId: activity.id?.href,
@@ -1458,12 +1507,14 @@ export class ContextImpl {
     federation;
     data;
     documentLoader;
+    contextLoader;
     invokedFromActorKeyPairsDispatcher;
-    constructor({ url, federation, data, documentLoader, invokedFromActorKeyPairsDispatcher, }) {
+    constructor({ url, federation, data, documentLoader, contextLoader, invokedFromActorKeyPairsDispatcher, }) {
         this.url = url;
         this.federation = federation;
         this.data = data;
         this.documentLoader = documentLoader;
+        this.contextLoader = contextLoader;
         this.invokedFromActorKeyPairsDispatcher =
             invokedFromActorKeyPairsDispatcher;
     }
@@ -1473,6 +1524,7 @@ export class ContextImpl {
             federation: this.federation,
             data: this.data,
             documentLoader: this.documentLoader,
+            contextLoader: this.contextLoader,
             invokedFromActorKeyPairsDispatcher: this.invokedFromActorKeyPairsDispatcher,
         });
     }
@@ -1485,9 +1537,6 @@ export class ContextImpl {
     get origin() {
         return this.url.origin;
     }
-    get contextLoader() {
-        return this.federation.contextLoader;
-    }
     get tracerProvider() {
         return this.federation.tracerProvider;
     }
@@ -1928,6 +1977,7 @@ export class ContextImpl {
         }
         const opts = {
             contextData: this.data,
+            origin: this.origin,
             ...options,
         };
         let expandedRecipients;
@@ -2322,6 +2372,7 @@ export class InboxContextImpl extends ContextImpl {
             const message = {
                 type: "outbox",
                 id: dntShim.crypto.randomUUID(),
+                baseUrl: this.origin,
                 keys: keyJwkPairs,
                 activity: this.activity,
                 activityId: this.activityId,