[scramjet/core] fix same regex mistake in unrewriteLinkHeader, add more tests to linkheader.ts

Author: velzie

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

@@ -158,6 +158,6 @@ export default function (client: ScramjetClient, self: Self) {
 export function unrewriteLinkHeader(header: string, context: ScramjetContext) {
 	return header.replace(
 		/<([^>]+)>/gi,
-		(match) => `${unrewriteUrl(match, context)}`
+		(_match, p1) => `<${unrewriteUrl(p1, context)}>`
 	);
 }

packages/scramjet/packages/runway/src/tests/linkheader.ts

@@ -23,4 +23,71 @@ export default [
 			});
 		},
 	}),
+	serverTest({
+		name: "linkheader-multiple-preloads",
+		start: async (server, port, { pass, fail }) => {
+			const loaded = new Set<string>();
+			server.on("request", (req, res) => {
+				if (req.url === "/") {
+					res.writeHead(200, {
+						"Content-Type": "text/html",
+						Link: `<http://localhost:${port}/script1.js>; rel="preload"; as="script", <http://localhost:${port}/script2.js>; rel="preload"; as="script"`,
+					});
+					res.end();
+				} else if (req.url === "/script1.js") {
+					loaded.add("script1");
+					res.writeHead(200, { "Content-Type": "application/javascript" });
+					res.end("console.log('script1');");
+					if (loaded.size === 2) {
+						pass("both scripts preloaded");
+					}
+				} else if (req.url === "/script2.js") {
+					loaded.add("script2");
+					res.writeHead(200, { "Content-Type": "application/javascript" });
+					res.end("console.log('script2');");
+					if (loaded.size === 2) {
+						pass("both scripts preloaded");
+					}
+				} else {
+					res.writeHead(404);
+					res.end("Not found");
+					fail(`unexpected url request: ${req.url}`);
+				}
+			});
+		},
+	}),
+	serverTest({
+		name: "linkheader-next-prev",
+		start: async (server, port) => {
+			const link = `<http://localhost:${port}/page2>; rel="next", <http://localhost:${port}/page0>; rel="prev"`;
+			server.on("request", (req, res) => {
+				if (req.url === "/") {
+					res.writeHead(200, {
+						"Content-Type": "text/html",
+					});
+					res.end(`
+                    <script>
+                        fetch("/page1").then(res => {
+                            let next = res.headers.get("Link");
+                            const expected = '${link}';
+                            if (next === expected) {
+                                __testPass("next link header is correct");
+                            } else {
+                                __testFail("next link header is incorrect", { actual: next, expected: expected });
+                            }
+                        });
+                    </script>
+                    `);
+				} else if (req.url === "/page1") {
+					res.writeHead(200, {
+						Link: link,
+					});
+					res.end("Page 1");
+				} else {
+					res.writeHead(404);
+					res.end("Not found");
+				}
+			});
+		},
+	}),
 ];