@cloudflare/pages-shared 0.3.1 → 0.3.3

package/asset-server/handler.ts

@@ -12,15 +12,12 @@ import {
 	TemporaryRedirectResponse,
 } from "./responses";
 import { generateRulesMatcher, replacer } from "./rulesEngine";
-import { stringifyURLToRootRelativePathname } from "./url";
 import type {
 	Metadata,
 	MetadataHeadersEntries,
 	MetadataHeadersRulesV2,
 	MetadataHeadersV1,
 	MetadataHeadersV2,
-	MetadataStaticRedirectEntry,
-	MetadataRedirectEntry,
 } from "./metadata";
 
 type BodyEncoding = "manual" | "automatic";
@@ -100,16 +97,7 @@ type FullHandlerContext<AssetEntry, ContentNegotiation, Asset> = {
 	waitUntil: (promise: Promise<unknown>) => void;
 };
 
-export type HandlerContext<
-	AssetEntry,
-	ContentNegotiation extends { encoding: string | null } = {
-		encoding: string | null;
-	},
-	Asset extends { body: ReadableStream | null; contentType: string } = {
-		body: ReadableStream | null;
-		contentType: string;
-	}
-> =
+export type HandlerContext<AssetEntry, ContentNegotiation, Asset> =
 	| FullHandlerContext<AssetEntry, ContentNegotiation, Asset>
 	| (Omit<
 			FullHandlerContext<AssetEntry, ContentNegotiation, Asset>,
@@ -204,7 +192,39 @@ export async function generateHandler<
 			staticRedirectsMatcher() || generateRedirectsMatcher()({ request })[0];
 
 		if (match) {
-			return getResponseFromMatch(match, url);
+			const { status, to } = match;
+			const destination = new URL(to, request.url);
+			const location =
+				destination.origin === new URL(request.url).origin
+					? `${destination.pathname}${destination.search || search}${
+							destination.hash
+					  }`
+					: `${destination.href}${destination.search ? "" : search}${
+							destination.hash
+					  }`;
+			switch (status) {
+				case 301:
+					return new MovedPermanentlyResponse(location, undefined, {
+						preventLeadingDoubleSlash: false,
+					});
+				case 303:
+					return new SeeOtherResponse(location, undefined, {
+						preventLeadingDoubleSlash: false,
+					});
+				case 307:
+					return new TemporaryRedirectResponse(location, undefined, {
+						preventLeadingDoubleSlash: false,
+					});
+				case 308:
+					return new PermanentRedirectResponse(location, undefined, {
+						preventLeadingDoubleSlash: false,
+					});
+				case 302:
+				default:
+					return new FoundResponse(location, undefined, {
+						preventLeadingDoubleSlash: false,
+					});
+			}
 		}
 
 		if (!request.method.match(/^(get|head)$/i)) {
@@ -572,49 +592,6 @@ export async function generateHandler<
 	}
 }
 
-/**
- * Given a redirect match and the request URL, returns the response
- * for the redirect. This function will convert the Location header
- * to be a root-relative path URL if the request origin and destination
- * origins are the same. This is so that if the project is served
- * on multiple domains, the redirects won't take the client off of their current domain.
- */
-export function getResponseFromMatch(
-	{
-		status,
-		to,
-	}: Pick<MetadataStaticRedirectEntry | MetadataRedirectEntry, "status" | "to">,
-	requestUrl: URL
-) {
-	// Inherit origin from the request URL if not specified in _redirects
-	const destination = new URL(to, requestUrl);
-	// If _redirects doesn't specify a search, inherit from the request
-	destination.search = destination.search || requestUrl.search;
-
-	// If the redirect destination origin matches the incoming request origin
-	// we stringify destination to be a root-relative path, e.g.:
-	//   https://example.com/foo/bar?baz=1 -> /foo/bar/?baz=1
-	// This way, the project can more easily be hosted on multiple domains
-	const location =
-		destination.origin === requestUrl.origin
-			? stringifyURLToRootRelativePathname(destination)
-			: destination.toString();
-
-	switch (status) {
-		case 301:
-			return new MovedPermanentlyResponse(location);
-		case 303:
-			return new SeeOtherResponse(location);
-		case 307:
-			return new TemporaryRedirectResponse(location);
-		case 308:
-			return new PermanentRedirectResponse(location);
-		case 302:
-		default:
-			return new FoundResponse(location);
-	}
-}
-
 // Parses a list such as "deflate, gzip;q=1.0, *;q=0.5" into
 //   {deflate: 1, gzip: 1, *: 0.5}
 export function parseQualityWeightedList(list = "") {

package/asset-server/responses.ts

@@ -10,6 +10,10 @@ function mergeHeaders(base: HeadersInit, extra: HeadersInit) {
 	});
 }
 
+export function stripLeadingDoubleSlashes(location: string) {
+	return location.replace(/^(\/|%2F|%2f)+(.*)/, "/$2");
+}
+
 export class OkResponse extends Response {
 	constructor(...[body, init]: ConstructorParameters<typeof Response>) {
 		super(body, {
@@ -23,8 +27,16 @@ export class OkResponse extends Response {
 export class MovedPermanentlyResponse extends Response {
 	constructor(
 		location: string,
-		init?: ConstructorParameters<typeof Response>[1]
+		init?: ConstructorParameters<typeof Response>[1],
+		{
+			preventLeadingDoubleSlash = true,
+		}: { preventLeadingDoubleSlash: boolean } = {
+			preventLeadingDoubleSlash: true,
+		}
 	) {
+		location = preventLeadingDoubleSlash
+			? stripLeadingDoubleSlashes(location)
+			: location;
 		super(`Redirecting to ${location}`, {
 			...init,
 			status: 301,
@@ -39,8 +51,16 @@ export class MovedPermanentlyResponse extends Response {
 export class FoundResponse extends Response {
 	constructor(
 		location: string,
-		init?: ConstructorParameters<typeof Response>[1]
+		init?: ConstructorParameters<typeof Response>[1],
+		{
+			preventLeadingDoubleSlash = true,
+		}: { preventLeadingDoubleSlash: boolean } = {
+			preventLeadingDoubleSlash: true,
+		}
 	) {
+		location = preventLeadingDoubleSlash
+			? stripLeadingDoubleSlashes(location)
+			: location;
 		super(`Redirecting to ${location}`, {
 			...init,
 			status: 302,
@@ -64,8 +84,16 @@ export class NotModifiedResponse extends Response {
 export class PermanentRedirectResponse extends Response {
 	constructor(
 		location: string,
-		init?: ConstructorParameters<typeof Response>[1]
+		init?: ConstructorParameters<typeof Response>[1],
+		{
+			preventLeadingDoubleSlash = true,
+		}: { preventLeadingDoubleSlash: boolean } = {
+			preventLeadingDoubleSlash: true,
+		}
 	) {
+		location = preventLeadingDoubleSlash
+			? stripLeadingDoubleSlashes(location)
+			: location;
 		super(undefined, {
 			...init,
 			status: 308,
@@ -126,8 +154,16 @@ export class InternalServerErrorResponse extends Response {
 export class SeeOtherResponse extends Response {
 	constructor(
 		location: string,
-		init?: ConstructorParameters<typeof Response>[1]
+		init?: ConstructorParameters<typeof Response>[1],
+		{
+			preventLeadingDoubleSlash = true,
+		}: { preventLeadingDoubleSlash: boolean } = {
+			preventLeadingDoubleSlash: true,
+		}
 	) {
+		location = preventLeadingDoubleSlash
+			? stripLeadingDoubleSlashes(location)
+			: location;
 		super(`Redirecting to ${location}`, {
 			...init,
 			status: 303,
@@ -140,8 +176,16 @@ export class SeeOtherResponse extends Response {
 export class TemporaryRedirectResponse extends Response {
 	constructor(
 		location: string,
-		init?: ConstructorParameters<typeof Response>[1]
+		init?: ConstructorParameters<typeof Response>[1],
+		{
+			preventLeadingDoubleSlash = true,
+		}: { preventLeadingDoubleSlash: boolean } = {
+			preventLeadingDoubleSlash: true,
+		}
 	) {
+		location = preventLeadingDoubleSlash
+			? stripLeadingDoubleSlashes(location)
+			: location;
 		super(`Redirecting to ${location}`, {
 			...init,
 			status: 307,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cloudflare/pages-shared",
-	"version": "0.3.1",
+	"version": "0.3.3",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/cloudflare/workers-sdk.git",

package/asset-server/url.ts

@@ -1,8 +0,0 @@
-/**
- * Stringifies a URL instance to a root-relative path string
- * @param url The URL to stringify
- * @returns A root-relative path string
- */
-export function stringifyURLToRootRelativePathname(url: URL): string {
-	return `${url.pathname}${url.search}${url.hash}`;
-}