@fedify/relay 2.4.0-dev.1528 → 2.4.0-dev.1564

package/dist/litepub.test.js

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-Dx-fpm5w.js";
+import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-ZE06J1U1.js";
 import { MemoryKvStore, signRequest } from "@fedify/fedify";
 import { createRelay } from "@fedify/relay";
 import { Accept, Announce, Create, Delete, Follow, Move, Note, Person, Undo, Update } from "@fedify/vocab";

package/dist/mastodon.test.js

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-Dx-fpm5w.js";
+import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-ZE06J1U1.js";
 import { MemoryKvStore, signRequest } from "@fedify/fedify";
 import { createRelay } from "@fedify/relay";
 import { Create, Delete, Follow, Move, Note, Person, Undo, Update } from "@fedify/vocab";

package/dist/{types-Dx-fpm5w.js → types-ZE06J1U1.js}

@@ -26048,6 +26048,28 @@ const preloadedContexts = {
 			"@type": "@id"
 		}
 	} },
+	"https://w3id.org/fep/7aa9": { "@context": {
+		"FeaturedCollection": "https://w3id.org/fep/7aa9#FeaturedCollection",
+		"FeaturedItem": "https://w3id.org/fep/7aa9#FeaturedItem",
+		"FeatureRequest": "https://w3id.org/fep/7aa9#FeatureRequest",
+		"FeatureAuthorization": "https://w3id.org/fep/7aa9#FeatureAuthorization",
+		"topic": {
+			"@id": "https://w3id.org/fep/7aa9#topic",
+			"@type": "@id"
+		},
+		"featuredObject": {
+			"@id": "https://w3id.org/fep/7aa9#featuredObject",
+			"@type": "@id"
+		},
+		"canFeature": {
+			"@id": "https://w3id.org/fep/7aa9#canFeature",
+			"@type": "@id"
+		},
+		"featureAuthorization": {
+			"@id": "https://w3id.org/fep/7aa9#featureAuthorization",
+			"@type": "@id"
+		}
+	} },
 	"https://join-lemmy.org/context.json": { "@context": ["https://w3id.org/security/v1", {
 		"as": "https://www.w3.org/ns/activitystreams#",
 		"lemmy": "https://join-lemmy.org/ns#",
@@ -26104,7 +26126,7 @@ const preloadedContexts = {
 	} }
 };
 var name = "@fedify/vocab-runtime";
-var version = "2.4.0-dev.1528+fea670ad";
+var version = "2.4.0-dev.1564+5a2c6c2c";
 const parametersNeedLowerCase = ["rel", "type"];
 const regexpLinkWhitespace = /[\n\r\s\t]/;
 function validateURI(uri) {
@@ -26358,6 +26380,66 @@ const logger = getLogger([
 	"docloader"
 ]);
 const DEFAULT_MAX_REDIRECTION = 20;
+const MAX_HTML_SIZE = 1024 * 1024;
+function createResponseMetadata(response) {
+	return new Response(null, {
+		headers: response.headers,
+		status: response.status,
+		statusText: response.statusText
+	});
+}
+async function cancelResponseBody(response) {
+	if (response.body != null) await response.body.cancel();
+}
+async function readBoundedText(response, maxBytes) {
+	const contentLength = response.headers.get("Content-Length");
+	if (contentLength != null) {
+		const size = Number(contentLength);
+		if (size > maxBytes) {
+			await cancelResponseBody(response);
+			return {
+				text: "",
+				size,
+				tooLarge: true
+			};
+		}
+	}
+	if (response.body == null) return {
+		text: "",
+		size: 0,
+		tooLarge: false
+	};
+	const reader = response.body.getReader();
+	const decoder = new TextDecoder();
+	let text = "";
+	let size = 0;
+	try {
+		while (true) {
+			const result = await reader.read();
+			if (result.done) break;
+			const chunkSize = result.value.byteLength;
+			if (size + chunkSize > maxBytes) {
+				size += chunkSize;
+				await reader.cancel();
+				return {
+					text: "",
+					size,
+					tooLarge: true
+				};
+			}
+			size += chunkSize;
+			text += decoder.decode(result.value, { stream: true });
+		}
+		text += decoder.decode();
+		return {
+			text,
+			size,
+			tooLarge: false
+		};
+	} finally {
+		reader.releaseLock();
+	}
+}
 /**
 * Gets a {@link RemoteDocument} from the given response.
 * @param url The URL of the document to load.
@@ -26412,19 +26494,19 @@ async function getRemoteDocument(url, response, fetch) {
 	}
 	let document;
 	if (!jsonLd && (contentType === "text/html" || contentType?.startsWith("text/html;") || contentType === "application/xhtml+xml" || contentType?.startsWith("application/xhtml+xml;"))) {
-		const MAX_HTML_SIZE = 1024 * 1024;
-		const html = await response.text();
-		if (html.length > MAX_HTML_SIZE) {
+		const errorResponse = createResponseMetadata(response);
+		const html = await readBoundedText(response, MAX_HTML_SIZE);
+		if (html.tooLarge) {
 			logger.warn("HTML response too large, skipping alternate link discovery: {url}", {
 				url: documentUrl,
-				size: html.length
+				size: html.size
 			});
-			document = JSON.parse(html);
+			throw new FetchError(documentUrl, `HTML document is too large to scan for an ActivityPub alternate link (Content-Type: ${contentType})`, errorResponse);
 		} else {
 			const tagPattern = /<(a|link)\s+([^>]*?)\s*\/?>/gi;
 			const attrPattern = /([a-z][a-z:_-]*)=(?:"([^"]*)"|'([^']*)'|([^\s>]+))/gi;
 			let tagMatch;
-			while ((tagMatch = tagPattern.exec(html)) !== null) {
+			while ((tagMatch = tagPattern.exec(html.text)) !== null) {
 				const tagContent = tagMatch[2];
 				let attrMatch;
 				const attribs = {};
@@ -26441,7 +26523,12 @@ async function getRemoteDocument(url, response, fetch) {
 					return await fetch(new URL(attribs.href, docUrl).href);
 				}
 			}
-			document = JSON.parse(html);
+			try {
+				document = JSON.parse(html.text);
+			} catch (error) {
+				if (!(error instanceof SyntaxError)) throw error;
+				throw new FetchError(documentUrl, `HTML document has no ActivityPub alternate link (Content-Type: ${contentType})`, errorResponse);
+			}
 		}
 	} else document = await response.json();
 	logger.debug("Fetched document: {status} {url} {headers}", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/relay",
-  "version": "2.4.0-dev.1528+fea670ad",
+  "version": "2.4.0-dev.1564+5a2c6c2c",
   "description": "ActivityPub relay support for Fedify",
   "keywords": [
     "Fedify",
@@ -47,14 +47,14 @@
   "dependencies": {
     "@js-temporal/polyfill": "^0.5.1",
     "@logtape/logtape": "^2.2.0",
-    "@fedify/vocab": "2.4.0-dev.1528+fea670ad",
-    "@fedify/fedify": "^2.4.0-dev.1528+fea670ad"
+    "@fedify/vocab": "2.4.0-dev.1564+5a2c6c2c",
+    "@fedify/fedify": "^2.4.0-dev.1564+5a2c6c2c"
   },
   "devDependencies": {
     "tsdown": "^0.22.0",
     "typescript": "^6.0.0",
     "urlpattern-polyfill": "^10.1.0",
-    "@fedify/vocab-runtime": "^2.4.0-dev.1528+fea670ad"
+    "@fedify/vocab-runtime": "^2.4.0-dev.1564+5a2c6c2c"
   },
   "scripts": {
     "build:self": "tsdown",