@fedify/fedify 1.2.3 → 1.2.4

package/CHANGES.md

@@ -3,6 +3,22 @@
 Fedify changelog
 ================
 
+Version 1.2.4
+-------------
+
+Released on November 12, 2024.
+
+ -  Fixed a bug where default document loaders had thrown a `TypeError`
+    with a message <q>Body is unusable: Body has already been read</q> or
+    <q>Body already consumed</q> when the content type of the response was
+    an HTML document and there's no link to a JSON-LD document.
+
+ -  Fixed a bug where `verifySignature()` and `verifyJsonLd()` functions
+    sometimes had thrown a `jsonld.ValidationError` error.  Now such errors
+    are caught and logged as warnings, and the signature to verify is considered
+    as invalid.
+
+
 Version 1.2.3
 -------------
 
@@ -92,6 +108,22 @@ Released on October 31, 2024.
 [#118]: https://github.com/dahlia/fedify/issues/118
 
 
+Version 1.1.4
+-------------
+
+Released on November 12, 2024.
+
+ -  Fixed a bug where default document loaders had thrown a `TypeError`
+    with a message <q>Body is unusable: Body has already been read</q> or
+    <q>Body already consumed</q> when the content type of the response was
+    an HTML document and there's no link to a JSON-LD document.
+
+ -  Fixed a bug where `verifySignature()` and `verifyJsonLd()` functions
+    sometimes had thrown a `jsonld.ValidationError` error.  Now such errors
+    are caught and logged as warnings, and the signature to verify is considered
+    as invalid.
+
+
 Version 1.1.3
 -------------
 
@@ -222,6 +254,22 @@ Released on October 20, 2024.
 [#150]: https://github.com/dahlia/fedify/issues/150
 
 
+Version 1.0.8
+-------------
+
+Released on November 12, 2024.
+
+ -  Fixed a bug where default document loaders had thrown a `TypeError`
+    with a message <q>Body is unusable: Body has already been read</q> or
+    <q>Body already consumed</q> when the content type of the response was
+    an HTML document and there's no link to a JSON-LD document.
+
+ -  Fixed a bug where `verifySignature()` and `verifyJsonLd()` functions
+    sometimes had thrown a `jsonld.ValidationError` error.  Now such errors
+    are caught and logged as warnings, and the signature to verify is considered
+    as invalid.
+
+
 Version 1.0.7
 -------------
 
@@ -471,6 +519,17 @@ Released on September 26, 2024.
 [#137]: https://github.com/dahlia/fedify/issues/137
 
 
+Version 0.15.6
+--------------
+
+Released on November 12, 2024.
+
+ -  Fixed a bug where default document loaders had thrown a `TypeError`
+    with a message <q>Body is unusable: Body has already been read</q> or
+    <q>Body already consumed</q> when the content type of the response was
+    an HTML document and there's no link to a JSON-LD document.
+
+
 Version 0.15.5
 --------------
 

package/esm/runtime/docloader.js

@@ -86,6 +86,7 @@ async function getRemoteDocument(url, response, fetch) {
             }
         }
     }
+    let document;
     if (!jsonLd &&
         (contentType === "text/html" || contentType?.startsWith("text/html;") ||
             contentType === "application/xhtml+xml" ||
@@ -113,17 +114,17 @@ async function getRemoteDocument(url, response, fetch) {
                 return await fetch(new URL(attribs.href, docUrl).href);
             }
         }
+        document = JSON.parse(html);
+    }
+    else {
+        document = await response.json();
     }
     logger.debug("Fetched document: {status} {url} {headers}", {
         status: response.status,
         url: documentUrl,
         headers: Object.fromEntries(response.headers.entries()),
     });
-    return {
-        contextUrl,
-        document: await response.json(),
-        documentUrl,
-    };
+    return { contextUrl, document, documentUrl };
 }
 /**
  * A JSON-LD document loader that utilizes the browser's `fetch` API.

package/esm/sig/ld.js

@@ -139,10 +139,24 @@ export async function verifySignature(jsonLd, options = {}) {
     delete sigOpts.type;
     delete sigOpts.id;
     delete sigOpts.signatureValue;
-    const sigOptsHash = await hashJsonLd(sigOpts, options.contextLoader);
+    let sigOptsHash;
+    try {
+        sigOptsHash = await hashJsonLd(sigOpts, options.contextLoader);
+    }
+    catch (error) {
+        logger.warn("Failed to verify; failed to hash the signature options: {signatureOptions}\n{error}", { signatureOptions: sigOpts, error });
+        return null;
+    }
     const document = { ...jsonLd };
     delete document.signature;
-    const docHash = await hashJsonLd(document, options.contextLoader);
+    let docHash;
+    try {
+        docHash = await hashJsonLd(document, options.contextLoader);
+    }
+    catch (error) {
+        logger.warn("Failed to verify; failed to hash the document: {document}\n{error}", { document, error });
+        return null;
+    }
     const encoder = new TextEncoder();
     const message = sigOptsHash + docHash;
     const messageBytes = encoder.encode(message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/fedify",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "An ActivityPub server framework",
   "keywords": [
     "ActivityPub",

package/types/sig/ld.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ld.d.ts","sourceRoot":"","sources":["../../src/sig/ld.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAM5C,OAAO,EACL,KAAK,cAAc,EAEpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAY,gBAAgB,EAAU,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAY,KAAK,QAAQ,EAAqB,MAAM,UAAU,CAAC;AAItE;;;GAGG;AACH,MAAM,WAAW,SAAS;IACxB,UAAU,CAAC,EAAE,8BAA8B,CAAC;IAC5C,IAAI,EAAE,kBAAkB,CAAC;IACzB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,SAAS,GACnB;IAAE,SAAS,EAAE,SAAS,CAAA;CAAE,CAO1B;AAED;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,aAAa,CAAC,EAAE,cAAc,CAAC;IAE/B;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;CACpC;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,OAAO,EACf,UAAU,EAAE,OAAO,CAAC,SAAS,EAC7B,KAAK,EAAE,GAAG,EACV,EAAE,aAAa,EAAE,OAAO,EAAE,GAAE,sBAA2B,GACtD,OAAO,CAAC,SAAS,CAAC,CAyBpB;AAED;;;GAGG;AACH,MAAM,WAAW,iBAAkB,SAAQ,sBAAsB;CAChE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,UAAU,CAC9B,MAAM,EAAE,OAAO,EACf,UAAU,EAAE,OAAO,CAAC,SAAS,EAC7B,KAAK,EAAE,GAAG,EACV,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC;IAAE,SAAS,EAAE,SAAS,CAAA;CAAE,CAAC,CAGnC;AAED,UAAU,YAAY;IACpB,SAAS,EAAE,SAAS,CAAC;CACtB;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,YAAY,CAYpE;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAKxD;AAED;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,cAAc,CAAC,EAAE,cAAc,CAAC;IAEhC;;OAEG;IACH,aAAa,CAAC,EAAE,cAAc,CAAC;IAE/B;;OAEG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED;;;;;;;GAOG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,OAAO,EACf,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CA4ElC;AAED;;GAEG;AACH,MAAM,WAAW,mBAAoB,SAAQ,sBAAsB;CAClE;AAED;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAChC,MAAM,EAAE,OAAO,EACf,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,OAAO,CAAC,CAsBlB"}
+{"version":3,"file":"ld.d.ts","sourceRoot":"","sources":["../../src/sig/ld.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAM5C,OAAO,EACL,KAAK,cAAc,EAEpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAY,gBAAgB,EAAU,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAY,KAAK,QAAQ,EAAqB,MAAM,UAAU,CAAC;AAItE;;;GAGG;AACH,MAAM,WAAW,SAAS;IACxB,UAAU,CAAC,EAAE,8BAA8B,CAAC;IAC5C,IAAI,EAAE,kBAAkB,CAAC;IACzB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,SAAS,GACnB;IAAE,SAAS,EAAE,SAAS,CAAA;CAAE,CAO1B;AAED;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,aAAa,CAAC,EAAE,cAAc,CAAC;IAE/B;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;CACpC;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,OAAO,EACf,UAAU,EAAE,OAAO,CAAC,SAAS,EAC7B,KAAK,EAAE,GAAG,EACV,EAAE,aAAa,EAAE,OAAO,EAAE,GAAE,sBAA2B,GACtD,OAAO,CAAC,SAAS,CAAC,CAyBpB;AAED;;;GAGG;AACH,MAAM,WAAW,iBAAkB,SAAQ,sBAAsB;CAChE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,UAAU,CAC9B,MAAM,EAAE,OAAO,EACf,UAAU,EAAE,OAAO,CAAC,SAAS,EAC7B,KAAK,EAAE,GAAG,EACV,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC;IAAE,SAAS,EAAE,SAAS,CAAA;CAAE,CAAC,CAGnC;AAED,UAAU,YAAY;IACpB,SAAS,EAAE,SAAS,CAAC;CACtB;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,YAAY,CAYpE;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAKxD;AAED;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,cAAc,CAAC,EAAE,cAAc,CAAC;IAEhC;;OAEG;IACH,aAAa,CAAC,EAAE,cAAc,CAAC;IAE/B;;OAEG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED;;;;;;;GAOG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,OAAO,EACf,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CA8FlC;AAED;;GAEG;AACH,MAAM,WAAW,mBAAoB,SAAQ,sBAAsB;CAClE;AAED;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAChC,MAAM,EAAE,OAAO,EACf,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,OAAO,CAAC,CAsBlB"}