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

package/CHANGES.md

@@ -10,10 +10,21 @@ 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.
+
+ -  Default document loaders now recognize ActivityStream objects in more ways:
+
+     -  Loaders now recognize `alternate` ActivityStreams objects in the `Link`
+        header.
+     -  Loaders now recognize `alternate` ActivityStreams objects in
+        the `<link>`/`<a>` HTML elements.
+
  -  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.
 

package/esm/runtime/docloader.js

@@ -41,7 +41,7 @@ function logRequest(request) {
         headers: Object.fromEntries(request.headers.entries()),
     });
 }
-async function getRemoteDocument(url, response) {
+async function getRemoteDocument(url, response, fetch) {
     const documentUrl = response.url === "" ? url : response.url;
     if (!response.ok) {
         logger.error("Failed to fetch document: {status} {url} {headers}", {
@@ -51,15 +51,61 @@ async function getRemoteDocument(url, response) {
         });
         throw new FetchError(documentUrl, `HTTP ${response.status}: ${documentUrl}`);
     }
+    const contentType = response.headers.get("Content-Type");
+    const jsonLd = contentType == null ||
+        contentType === "application/activity+json" ||
+        contentType === "application/ld+json" ||
+        contentType.startsWith("application/ld+json;");
     const linkHeader = response.headers.get("Link");
     let contextUrl = null;
     if (linkHeader != null) {
         const link = new HTTPHeaderLink(linkHeader);
-        const entries = link.getByRel("http://www.w3.org/ns/json-ld#context");
-        for (const [uri, params] of entries) {
-            if ("type" in params && params.type === "application/ld+json") {
-                contextUrl = uri;
-                break;
+        if (jsonLd) {
+            const entries = link.getByRel("http://www.w3.org/ns/json-ld#context");
+            for (const [uri, params] of entries) {
+                if ("type" in params && params.type === "application/ld+json") {
+                    contextUrl = uri;
+                    break;
+                }
+            }
+        }
+        else {
+            const entries = link.getByRel("alternate");
+            for (const [uri, params] of entries) {
+                if ("type" in params &&
+                    (params.type === "application/activity+json" ||
+                        params.type === "application/ld+json" ||
+                        params.type.startsWith("application/ld+json;"))) {
+                    logger.debug("Found alternate document: {alternateUrl} from {url}", { alternateUrl: uri, url: documentUrl });
+                    return await fetch(uri);
+                }
+            }
+        }
+    }
+    if (!jsonLd &&
+        (contentType === "text/html" || contentType?.startsWith("text/html;") ||
+            contentType === "application/xhtml+xml" ||
+            contentType?.startsWith("application/xhtml+xml;"))) {
+        const p = /<(a|link)((\s+[a-z][a-z:_-]*=("[^"]*"|'[^']*'|[^\s>]+))+)\/?>/ig;
+        const p2 = /\s+([a-z][a-z:_-]*)=("([^"]*)"|'([^']*)'|([^\s>]+))/ig;
+        const html = await response.text();
+        let m;
+        const rawAttribs = [];
+        while ((m = p.exec(html)) !== null)
+            rawAttribs.push(m[2]);
+        for (const rawAttrs of rawAttribs) {
+            let m2;
+            const attribs = {};
+            while ((m2 = p2.exec(rawAttrs)) !== null) {
+                const key = m2[1].toLowerCase();
+                const value = m2[3] ?? m2[4] ?? m2[5] ?? "";
+                attribs[key] = value;
+            }
+            if (attribs.rel === "alternate" && "type" in attribs && (attribs.type === "application/activity+json" ||
+                attribs.type === "application/ld+json" ||
+                attribs.type.startsWith("application/ld+json;")) && "href" in attribs) {
+                logger.debug("Found alternate document: {alternateUrl} from {url}", { alternateUrl: attribs.href, url: documentUrl });
+                return await fetch(attribs.href);
             }
         }
     }
@@ -122,7 +168,7 @@ export async function fetchDocumentLoader(url, allowPrivateAddress = false) {
         response.headers.has("Location")) {
         return fetchDocumentLoader(response.headers.get("Location"));
     }
-    return getRemoteDocument(url, response);
+    return getRemoteDocument(url, response, (url) => fetchDocumentLoader(url, allowPrivateAddress));
 }
 /**
  * Gets an authenticated {@link DocumentLoader} for the given identity.
@@ -164,7 +210,7 @@ export function getAuthenticatedDocumentLoader(identity, allowPrivateAddress = f
             response.headers.has("Location")) {
             return load(response.headers.get("Location"));
         }
-        return getRemoteDocument(url, response);
+        return getRemoteDocument(url, response, load);
     }
     return load;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/fedify",
-  "version": "0.15.0-dev.375+e48f97c8",
+  "version": "0.15.0-dev.376+14a349ff",
   "description": "An ActivityPub server framework",
   "keywords": [
     "ActivityPub",

package/types/runtime/docloader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"docloader.d.ts","sourceRoot":"","sources":["../../src/runtime/docloader.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAG5C,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAQ1D;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAE1B;;OAEG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;AAEtE;;;;;;;;GAQG;AACH,MAAM,MAAM,kCAAkC,GAAG,CAC/C,QAAQ,EAAE;IAAE,KAAK,EAAE,GAAG,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC,SAAS,CAAA;CAAE,KACpD,cAAc,CAAC;AAEpB;;GAEG;AACH,qBAAa,UAAW,SAAQ,KAAK;IACnC;;OAEG;IACH,GAAG,EAAE,GAAG,CAAC;IAET;;;;;OAKG;gBACS,GAAG,EAAE,GAAG,GAAG,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;CAKhD;AAoED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,MAAM,EACX,mBAAmB,GAAE,OAAe,GACnC,OAAO,CAAC,cAAc,CAAC,CAmCzB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,8BAA8B,CAC5C,QAAQ,EAAE;IAAE,KAAK,EAAE,GAAG,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC,SAAS,CAAA;CAAE,EACvD,mBAAmB,GAAE,OAAe,GACnC,cAAc,CAgChB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,MAAM,EAAE,cAAc,CAAC;IAEvB;;OAEG;IACH,EAAE,EAAE,OAAO,CAAC;IAEZ;;;OAGG;IACH,MAAM,CAAC,EAAE,KAAK,CAAC;IAEf;;;;;;;OAOG;IACH,KAAK,CAAC,EAAE,CAAC,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;CAC1E;AAED;;;;GAIG;AACH,wBAAgB,OAAO,CACrB,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,iBAAiB,GAC/C,cAAc,CA2ChB"}
+{"version":3,"file":"docloader.d.ts","sourceRoot":"","sources":["../../src/runtime/docloader.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAG5C,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAQ1D;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAE1B;;OAEG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;AAEtE;;;;;;;;GAQG;AACH,MAAM,MAAM,kCAAkC,GAAG,CAC/C,QAAQ,EAAE;IAAE,KAAK,EAAE,GAAG,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC,SAAS,CAAA;CAAE,KACpD,cAAc,CAAC;AAEpB;;GAEG;AACH,qBAAa,UAAW,SAAQ,KAAK;IACnC;;OAEG;IACH,GAAG,EAAE,GAAG,CAAC;IAET;;;;;OAKG;gBACS,GAAG,EAAE,GAAG,GAAG,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;CAKhD;AA+HD;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,MAAM,EACX,mBAAmB,GAAE,OAAe,GACnC,OAAO,CAAC,cAAc,CAAC,CAuCzB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,8BAA8B,CAC5C,QAAQ,EAAE;IAAE,KAAK,EAAE,GAAG,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC,SAAS,CAAA;CAAE,EACvD,mBAAmB,GAAE,OAAe,GACnC,cAAc,CAgChB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,MAAM,EAAE,cAAc,CAAC;IAEvB;;OAEG;IACH,EAAE,EAAE,OAAO,CAAC;IAEZ;;;OAGG;IACH,MAAM,CAAC,EAAE,KAAK,CAAC;IAEf;;;;;;;OAOG;IACH,KAAK,CAAC,EAAE,CAAC,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;CAC1E;AAED;;;;GAIG;AACH,wBAAgB,OAAO,CACrB,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,iBAAiB,GAC/C,cAAc,CA2ChB"}