Add charset parsing

MercuryWorkshop · Dec 2, 2024 · 0f3b3cc · 0f3b3cc
1 parent e5dff7f
commit 0f3b3cc
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/src/worker/fetch.ts b/src/worker/fetch.ts
@@ -314,12 +314,25 @@ async function rewriteBody(
 	destination: RequestDestination,
 	workertype: string,
 	cookieStore: CookieStore
-): Promise<BodyType> {
+): Promise<BodyType> {;
+
 	switch (destination) {
 		case "iframe":
 		case "document":
+
 			if (response.headers.get("content-type")?.startsWith("text/html")) {
-				return rewriteHtml(await response.text(), cookieStore, meta, true);
+				const buf = await response.arrayBuffer();
+				const decode = new TextDecoder("utf-8").decode(buf);
+				const charsetHeader = response.headers.get("content-type") ;
+				const charset = charsetHeader?.split("charset=")[1] || decode.match(/charset=([^"]+)/)?.[1] || "utf-8";
+				const htmlContent = charset ? new TextDecoder(charset).decode(buf) : decode;
+
+				return rewriteHtml(
+					htmlContent,
+					cookieStore,
+					meta,
+					true
+				);
 			} else {
 				return response.body;
 			}