@cloudflare/pages-shared 0.3.0 → 0.3.2

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,15 +192,28 @@ export async function generateHandler<
 			staticRedirectsMatcher() || generateRedirectsMatcher()({ request })[0];
 
 		if (match) {
-			if (match.status === 200) {
-				// A 200 redirect means that we are proxying to a different asset, for example,
-				// a request with url /users/12345 could be pointed to /users/id.html. In order to
-				// do this, we overwrite the pathname, and instead match for assets with that url,
-				// and importantly, do not use the regular redirect handler - as the url visible to
-				// the user does not change
-				pathname = new URL(match.to, request.url).pathname;
-			} else {
-				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);
+				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);
 			}
 		}
 
@@ -581,49 +582,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/metadata-generator/constants.ts

@@ -3,7 +3,7 @@ export const HEADERS_VERSION = 2;
 export const ANALYTICS_VERSION = 1;
 export const ROUTES_JSON_VERSION = 1;
 
-export const PERMITTED_STATUS_CODES = new Set([200, 301, 302, 303, 307, 308]);
+export const PERMITTED_STATUS_CODES = new Set([301, 302, 303, 307, 308]);
 export const HEADER_SEPARATOR = ":";
 export const MAX_LINE_LENGTH = 2000;
 export const MAX_HEADER_RULES = 100;

package/metadata-generator/createMetadataObject.ts

@@ -5,7 +5,6 @@ import {
 	SPLAT_REGEX,
 	PLACEHOLDER_REGEX,
 } from "./constants";
-import type { MetadataStaticRedirects } from "../asset-server/metadata";
 import type {
 	Metadata,
 	MetadataRedirects,
@@ -68,17 +67,13 @@ function constructRedirects({
 		return {};
 	}
 
-	const staticRedirects: MetadataStaticRedirects = {};
+	const staticRedirects: MetadataRedirects = {};
 	const dynamicRedirects: MetadataRedirects = {};
 	let canCreateStaticRule = true;
 	for (const rule of redirects.rules) {
 		if (!rule.from.match(SPLAT_REGEX) && !rule.from.match(PLACEHOLDER_REGEX)) {
 			if (canCreateStaticRule) {
-				staticRedirects[rule.from] = {
-					status: rule.status,
-					to: rule.to,
-					lineNumber: rule.lineNumber,
-				};
+				staticRedirects[rule.from] = { status: rule.status, to: rule.to };
 				continue;
 			} else {
 				logger(

package/metadata-generator/parseRedirects.ts

@@ -104,7 +104,7 @@ export function parseRedirects(input: string): ParsedRedirects {
 			invalid.push({
 				line,
 				lineNumber: i + 1,
-				message: `Valid status codes are 200, 301, 302 (default), 303, 307, or 308. Got ${str_status}.`,
+				message: `Valid status codes are 301, 302 (default), 303, 307, or 308. Got ${str_status}.`,
 			});
 			continue;
 		}
@@ -119,22 +119,6 @@ export function parseRedirects(input: string): ParsedRedirects {
 		}
 		seen_paths.add(from);
 
-		if (status === 200) {
-			// Error can only be that it's not relative - given validateUrl is called above without onlyRelative:true,
-			// so if it's present, we can error to the user that proxying only expects relative urls
-			const [proxyTo, error] = validateUrl(to, true, true, true);
-			if (error) {
-				invalid.push({
-					line,
-					lineNumber: i + 1,
-					message: `Proxy (200) redirects can only point to relative paths. Got ${to}`,
-				});
-				continue;
-			}
-			rules.push({ from, to: proxyTo as string, status, lineNumber: i + 1 });
-			continue;
-		}
-
 		rules.push({ from, to, status, lineNumber: i + 1 });
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cloudflare/pages-shared",
-	"version": "0.3.0",
+	"version": "0.3.2",
 	"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}`;
-}