fix: keep encoded delimiters

Author: chhoumann

src/utility/encodeUrlForRequest.test.ts

@@ -16,6 +16,12 @@ describe("encodeUrlForRequest", () => {
 		expect(encodeUrlForRequest(alreadyEncoded)).toBe(alreadyEncoded);
 	});
 
+	it("keeps intentionally encoded delimiters intact", () => {
+		const signedUrl =
+			"https://example.com/path%2Fsegment%3Fsignature%3Dabc123%23hash";
+		expect(encodeUrlForRequest(signedUrl)).toBe(signedUrl);
+	});
+
 	it("handles empty strings safely", () => {
 		expect(encodeUrlForRequest("")).toBe("");
 		expect(encodeUrlForRequest("   ")).toBe("");

src/utility/encodeUrlForRequest.ts

@@ -13,16 +13,22 @@ export function encodeUrlForRequest(rawUrl: string): string {
 	const trimmed = rawUrl.trim();
 	if (!trimmed) return trimmed;
 
-	let normalized = trimmed;
+	let normalized: string;
 	try {
-		normalized = decodeURI(trimmed);
+		normalized = new URL(trimmed).toString();
 	} catch {
-		// If decoding fails we fall back to the trimmed value, which we will encode below.
+		normalized = encodeWhitespace(trimmed);
 	}
 
-	const encoded = encodeURI(normalized);
+	const encoded = normalized;
 	return encoded.replace(
 		PARENTHESIS_REGEXP,
 		(char) => PARENTHESIS_LOOKUP[char] ?? char,
 	);
 }
+
+function encodeWhitespace(value: string): string {
+	return value.replace(/\s/g, (char) =>
+		`%${char.charCodeAt(0).toString(16).toUpperCase().padStart(2, "0")}`,
+	);
+}