@fedify/fedify 0.15.0-dev.377 → 0.15.0-dev.381

package/CHANGES.md

@@ -29,6 +29,16 @@ To be released.
     object.
 
 
+Version 0.14.4
+--------------
+
+Released on September 6, 2024.
+
+ -  Fixed a bug of `Object.fromJsonLd()` method where it had thrown
+    a `TypeError` when the given JSON-LD object had an `@id` property
+    with an empty string.
+
+
 Version 0.14.3
 --------------
 
@@ -154,6 +164,16 @@ Released on August 27, 2024.
 [#115]: https://github.com/dahlia/fedify/issues/115
 
 
+Version 0.13.5
+--------------
+
+Released on September 6, 2024.
+
+ -  Fixed a bug of `Object.fromJsonLd()` method where it had thrown
+    a `TypeError` when the given JSON-LD object had an `@id` property
+    with an empty string.
+
+
 Version 0.13.4
 --------------
 

package/esm/runtime/docloader.js

@@ -43,6 +43,7 @@ function logRequest(request) {
 }
 async function getRemoteDocument(url, response, fetch) {
     const documentUrl = response.url === "" ? url : response.url;
+    const docUrl = new URL(documentUrl);
     if (!response.ok) {
         logger.error("Failed to fetch document: {status} {url} {headers}", {
             status: response.status,
@@ -54,6 +55,7 @@ async function getRemoteDocument(url, response, fetch) {
     const contentType = response.headers.get("Content-Type");
     const jsonLd = contentType == null ||
         contentType === "application/activity+json" ||
+        contentType.startsWith("application/activity+json;") ||
         contentType === "application/ld+json" ||
         contentType.startsWith("application/ld+json;");
     const linkHeader = response.headers.get("Link");
@@ -75,7 +77,8 @@ async function getRemoteDocument(url, response, fetch) {
                 if ("type" in params &&
                     (params.type === "application/activity+json" ||
                         params.type === "application/ld+json" ||
-                        params.type.startsWith("application/ld+json;"))) {
+                        params.type.startsWith("application/ld+json;")) &&
+                    new URL(uri).href !== docUrl.href) {
                     logger.debug("Found alternate document: {alternateUrl} from {url}", { alternateUrl: uri, url: documentUrl });
                     return await fetch(uri);
                 }
@@ -103,9 +106,10 @@ async function getRemoteDocument(url, response, fetch) {
             }
             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) {
+                attribs.type.startsWith("application/ld+json;")) && "href" in attribs &&
+                new URL(attribs.href, docUrl).href !== docUrl.href) {
                 logger.debug("Found alternate document: {alternateUrl} from {url}", { alternateUrl: attribs.href, url: documentUrl });
-                return await fetch(attribs.href);
+                return await fetch(new URL(attribs.href, docUrl).href);
             }
         }
     }

package/esm/vocab/vocab.js

@@ -4695,7 +4695,8 @@ export class Object {
             if (v == null)
                 continue;
             const decoded = typeof v === "object" && "@id" in v &&
-                typeof v["@id"] === "string"
+                typeof v["@id"] === "string" &&
+                v["@id"] !== "" && v["@id"] !== "/"
                 ? new URL(v["@id"])
                 : typeof v === "object" && "@type" in v &&
                     Array.isArray(v["@type"]) &&
@@ -28989,7 +28990,8 @@ export class Place extends Object {
                     v["@value"] == "m" || v["@value"] == "miles")
                 ? v["@value"]
                 : typeof v === "object" && "@id" in v &&
-                    typeof v["@id"] === "string"
+                    typeof v["@id"] === "string" &&
+                    v["@id"] !== "" && v["@id"] !== "/"
                     ? new URL(v["@id"])
                     : undefined;
             if (typeof decoded === "undefined")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/fedify",
-  "version": "0.15.0-dev.377+2711ed19",
+  "version": "0.15.0-dev.381+af99094c",
   "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;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"}
+{"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;AAmID;;;;;;;;;;;;;;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"}