[scramjet] fix regex for link headers and properly unrewrite link headers

Author: velzie

packages/scramjet/src/client/shared/requests/fetch.ts

@@ -1,5 +1,6 @@
 import { rewriteUrl, unrewriteUrl } from "@rewriters/url";
 import { ScramjetClient } from "@client/index";
+import { unrewriteLinkHeader } from "./xmlhttprequest";
 
 export default function (client: ScramjetClient) {
 	client.Proxy("fetch", {
@@ -29,4 +30,20 @@ export default function (client: ScramjetClient) {
 			return unrewriteUrl(ctx.get() as string, client.meta);
 		},
 	});
+
+	// TODO: this needs to be only for response objects created from a fetch
+	client.Trap("Response.prototype.headers", {
+		get(ctx) {
+			const headers = ctx.get() as Headers;
+			const newHeaders = new Headers();
+
+			for (const [key, value] of headers.entries()) {
+				if (key.toLowerCase() === "link") {
+					newHeaders.append(key, unrewriteLinkHeader(value, client.meta));
+				} else {
+					newHeaders.append(key, value);
+				}
+			}
+		},
+	});
 }

packages/scramjet/src/client/shared/requests/xmlhttprequest.ts

@@ -1,5 +1,5 @@
 import { config, flagEnabled } from "@/shared";
-import { rewriteUrl, unrewriteUrl } from "@rewriters/url";
+import { rewriteUrl, unrewriteUrl, URLMeta } from "@rewriters/url";
 import { ScramjetClient } from "@client/index";
 
 export default function (client: ScramjetClient, self: Self) {
@@ -116,7 +116,6 @@ export default function (client: ScramjetClient, self: Self) {
 				},
 			});
 
-			// send has no return value right
 			ctx.return(undefined);
 		},
 	});
@@ -126,4 +125,39 @@ export default function (client: ScramjetClient, self: Self) {
 			return unrewriteUrl(ctx.get() as string, client.meta);
 		},
 	});
+
+	client.Proxy("XMLHttpRequest.prototype.getAllResponseHeaders", {
+		apply(ctx) {
+			const headerstring = ctx.fn.call(ctx.this) as string;
+			if (!headerstring) return headerstring;
+			const headers = headerstring.split("\r\n");
+
+			for (const [i, header] of headers.entries()) {
+				if (header.toLowerCase().startsWith("link:")) {
+					headers[i] = `Link: ${unrewriteLinkHeader(
+						header.slice(5).trim(),
+						client.meta
+					)}`;
+				}
+			}
+
+			ctx.return(headers.join("\r\n"));
+		},
+	});
+	client.Proxy("XMLHttpRequest.prototype.getResponseHeader", {
+		apply(ctx) {
+			const header = ctx.fn.call(ctx.this, ctx.args[0]) as string | null;
+			if (!header) return header;
+			if (ctx.args[0].toLowerCase() === "link") {
+				ctx.return(unrewriteLinkHeader(header, client.meta));
+			}
+		},
+	});
+}
+
+export function unrewriteLinkHeader(header: string, meta: URLMeta) {
+	return header.replace(
+		/<([^>]+)>/gi,
+		(match) => `${unrewriteUrl(match, meta)}`
+	);
 }

packages/scramjet/src/worker/fetch.ts

@@ -75,6 +75,7 @@ export class ScramjetFetchHandler extends EventTarget {
 		this.prefix = init.prefix;
 
 		iface.onServerbound("setCookie", ({ cookie, url }) => {
+			console.log("recv'd cookies");
 			this.cookieJar.setCookies([cookie], new URL(url));
 
 			return undefined;
@@ -584,7 +585,7 @@ const SEC_HEADERS = new Set([
 const URL_HEADERS = new Set(["location", "content-location", "referer"]);
 
 function rewriteLinkHeader(link: string, meta: URLMeta) {
-	return link.replace(/<(.*)>/gi, (match) => rewriteUrl(match, meta));
+	return link.replace(/<([^>]+)>/gi, (match) => `<${rewriteUrl(match, meta)}>`);
 }
 
 export async function rewriteHeaders(