@fedify/fedify 0.15.0-dev.372 → 0.15.0-dev.375

package/CHANGES.md

@@ -8,6 +8,15 @@ Version 0.15.0
 
 To be released.
 
+ -  Removed `expand` option of `Object.toJsonLd()` method, which was deprecated
+    in version 0.14.0.  Use `format: "expand"` option instead.
+ -  Added `Context.lookupObject()` method.
+ -  Added `allowPrivateAddress` option to `CreateFederationOptions` interface.
+ -  Renamed the short option `-c` for `--compact` of `fedify lookup` command to
+    `-C` to avoid conflict with the short option `-c` for `--cache-dir`.
+ -  Added `-r`/`--raw` option to `fedify lookup` command to output the raw JSON
+    object.
+
 
 Version 0.14.3
 --------------

package/esm/federation/middleware.js

@@ -5,6 +5,7 @@ import { fetchDocumentLoader, getAuthenticatedDocumentLoader, kvCache, } from ".
 import { verifyRequest } from "../sig/http.js";
 import { exportJwk, importJwk, validateCryptoKey } from "../sig/key.js";
 import { getKeyOwner } from "../sig/owner.js";
+import { lookupObject } from "../vocab/lookup.js";
 import { Activity, CryptographicKey, Multikey, } from "../vocab/vocab.js";
 import { handleWebFinger } from "../webfinger/handler.js";
 import { buildCollectionSynchronizationHeader } from "./collection.js";
@@ -72,15 +73,31 @@ class FederationImpl {
         this.router.add("/.well-known/nodeinfo", "nodeInfoJrd");
         this.objectCallbacks = {};
         this.objectTypeIds = {};
+        if (options.allowPrivateAddress) {
+            if (options.documentLoader != null) {
+                throw new TypeError("Cannot set documentLoader with allowPrivateAddress turned on.");
+            }
+            else if (options.contextLoader != null) {
+                throw new TypeError("Cannot set contextLoader with allowPrivateAddress turned on.");
+            }
+            else if (options.authenticatedDocumentLoaderFactory != null) {
+                throw new TypeError("Cannot set authenticatedDocumentLoaderFactory with " +
+                    "allowPrivateAddress turned on.");
+            }
+        }
         this.documentLoader = options.documentLoader ?? kvCache({
-            loader: fetchDocumentLoader,
+            loader: options.allowPrivateAddress
+                ? (url) => fetchDocumentLoader(url, true)
+                : fetchDocumentLoader,
             kv: options.kv,
             prefix: this.kvPrefixes.remoteDocument,
         });
         this.contextLoader = options.contextLoader ?? this.documentLoader;
         this.authenticatedDocumentLoaderFactory =
             options.authenticatedDocumentLoaderFactory ??
-                getAuthenticatedDocumentLoader;
+                (options.allowPrivateAddress
+                    ? (identity) => getAuthenticatedDocumentLoader(identity, true)
+                    : getAuthenticatedDocumentLoader);
         this.onOutboxError = options.onOutboxError;
         this.signatureTimeWindow = options.signatureTimeWindow ?? { minutes: 1 };
         this.skipSignatureVerification = options.skipSignatureVerification ?? false;
@@ -323,6 +340,15 @@ class FederationImpl {
                 if (actor == null)
                     return null;
                 const logger = getLogger(["fedify", "federation", "actor"]);
+                if (actor.id == null) {
+                    logger.warn("Actor dispatcher returned an actor without an id property.  " +
+                        "Set the property with Context.getActorUri(handle).");
+                }
+                else if (actor.id.href != context.getActorUri(handle).href) {
+                    logger.warn("Actor dispatcher returned an actor with an id property that " +
+                        "does not match the actor URI.  Set the property with " +
+                        "Context.getActorUri(handle).");
+                }
                 if (this.followingCallbacks != null &&
                     this.followingCallbacks.dispatcher != null) {
                     if (actor.followingId == null) {
@@ -1269,6 +1295,12 @@ class ContextImpl {
         }
         return this.federation.authenticatedDocumentLoaderFactory(identity);
     }
+    lookupObject(identifier, options = {}) {
+        return lookupObject(identifier, {
+            documentLoader: options.documentLoader ?? this.documentLoader,
+            contextLoader: options.contextLoader ?? this.contextLoader,
+        });
+    }
     async sendActivity(sender, recipients, activity, options = {}) {
         let keys;
         if ("handle" in sender) {