@fedify/fedify 0.15.0-dev.377 → 0.15.0-dev.378
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/esm/runtime/docloader.js
CHANGED
|
@@ -43,6 +43,7 @@ function logRequest(request) {
|
|
|
43
43
|
}
|
|
44
44
|
async function getRemoteDocument(url, response, fetch) {
|
|
45
45
|
const documentUrl = response.url === "" ? url : response.url;
|
|
46
|
+
const docUrl = new URL(documentUrl);
|
|
46
47
|
if (!response.ok) {
|
|
47
48
|
logger.error("Failed to fetch document: {status} {url} {headers}", {
|
|
48
49
|
status: response.status,
|
|
@@ -54,6 +55,7 @@ async function getRemoteDocument(url, response, fetch) {
|
|
|
54
55
|
const contentType = response.headers.get("Content-Type");
|
|
55
56
|
const jsonLd = contentType == null ||
|
|
56
57
|
contentType === "application/activity+json" ||
|
|
58
|
+
contentType.startsWith("application/activity+json;") ||
|
|
57
59
|
contentType === "application/ld+json" ||
|
|
58
60
|
contentType.startsWith("application/ld+json;");
|
|
59
61
|
const linkHeader = response.headers.get("Link");
|
|
@@ -75,7 +77,8 @@ async function getRemoteDocument(url, response, fetch) {
|
|
|
75
77
|
if ("type" in params &&
|
|
76
78
|
(params.type === "application/activity+json" ||
|
|
77
79
|
params.type === "application/ld+json" ||
|
|
78
|
-
params.type.startsWith("application/ld+json;"))
|
|
80
|
+
params.type.startsWith("application/ld+json;")) &&
|
|
81
|
+
new URL(uri).href !== docUrl.href) {
|
|
79
82
|
logger.debug("Found alternate document: {alternateUrl} from {url}", { alternateUrl: uri, url: documentUrl });
|
|
80
83
|
return await fetch(uri);
|
|
81
84
|
}
|
|
@@ -103,9 +106,10 @@ async function getRemoteDocument(url, response, fetch) {
|
|
|
103
106
|
}
|
|
104
107
|
if (attribs.rel === "alternate" && "type" in attribs && (attribs.type === "application/activity+json" ||
|
|
105
108
|
attribs.type === "application/ld+json" ||
|
|
106
|
-
attribs.type.startsWith("application/ld+json;")) && "href" in attribs
|
|
109
|
+
attribs.type.startsWith("application/ld+json;")) && "href" in attribs &&
|
|
110
|
+
new URL(attribs.href, docUrl).href !== docUrl.href) {
|
|
107
111
|
logger.debug("Found alternate document: {alternateUrl} from {url}", { alternateUrl: attribs.href, url: documentUrl });
|
|
108
|
-
return await fetch(attribs.href);
|
|
112
|
+
return await fetch(new URL(attribs.href, docUrl).href);
|
|
109
113
|
}
|
|
110
114
|
}
|
|
111
115
|
}
|
package/package.json
CHANGED
|
@@ -1 +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;
|
|
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;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"}
|