perf: low-hanging fruits (#939)

Co-authored-by: Yagiz Nizipli <[email protected]>

Author: vicb

.changeset/public-trees-call.md

@@ -0,0 +1,5 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+perf: low-hanging fruits

packages/cloudflare/src/cli/build/patches/plugins/require-hook.ts

@@ -5,14 +5,15 @@ import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
 import type { Plugin } from "esbuild";
 
 export function shimRequireHook(options: BuildOptions): Plugin {
+	const emptyShimPath = join(options.outputDir, "cloudflare-templates/shims/empty.js");
 	return {
 		name: "replaceRelative",
 		setup(build) {
 			// Note: we (empty) shim require-hook modules as they generate problematic code that uses requires
 			build.onResolve(
 				{ filter: getCrossPlatformPathRegex(String.raw`^\./require-hook$`, { escape: false }) },
 				() => ({
-					path: join(options.outputDir, "cloudflare-templates/shims/empty.js"),
+					path: emptyShimPath,
 				})
 			);
 		},

packages/cloudflare/src/cli/templates/images.ts

@@ -13,6 +13,8 @@ export type LocalPattern = {
 	search?: string;
 };
 
+let NEXT_IMAGE_REGEXP: RegExp;
+
 /**
  * Fetches an images.
  *
@@ -27,17 +29,18 @@ export async function fetchImage(fetcher: Fetcher | undefined, imageUrl: string,
 
 	// Local
 	if (imageUrl.startsWith("/")) {
-		let pathname: string;
-		let url: URL;
-		try {
-			// We only need pathname and search
-			url = new URL(imageUrl, "http://n");
-			pathname = decodeURIComponent(url.pathname);
-		} catch {
+		// @ts-expect-error TS2339 Missing types for URL.parse
+		const url = URL.parse(imageUrl, "http://n");
+
+		if (url == null) {
 			return getUrlErrorResponse();
 		}
 
-		if (/\/_next\/image($|\/)/.test(pathname)) {
+		// This method will never throw because URL parser will handle invalid input.
+		const pathname = decodeURIComponent(url.pathname);
+
+		NEXT_IMAGE_REGEXP ??= /\/_next\/image($|\/)/;
+		if (NEXT_IMAGE_REGEXP.test(pathname)) {
 			return getUrlErrorResponse();
 		}
 

packages/cloudflare/src/cli/templates/skew-protection.ts

@@ -5,6 +5,8 @@ export const DEPLOYMENT_MAPPING_ENV_NAME = "CF_DEPLOYMENT_MAPPING";
 /** Version used for the latest worker */
 export const CURRENT_VERSION_ID = "current";
 
+let deploymentMapping: Record<string, string>;
+
 /**
  * Routes the request to the requested deployment.
  *
@@ -42,16 +44,16 @@ export function maybeGetSkewProtectionResponse(request: Request): Promise<Respon
 			return undefined;
 		}
 
-		const mapping = process.env[DEPLOYMENT_MAPPING_ENV_NAME]
+		deploymentMapping ??= process.env[DEPLOYMENT_MAPPING_ENV_NAME]
 			? JSON.parse(process.env[DEPLOYMENT_MAPPING_ENV_NAME])
 			: {};
 
-		if (!(requestDeploymentId in mapping)) {
+		if (!(requestDeploymentId in deploymentMapping)) {
 			// Unknown deployment id, serve the current version
 			return undefined;
 		}
 
-		const version = mapping[requestDeploymentId];
+		const version = deploymentMapping[requestDeploymentId];
 
 		if (!version || version === CURRENT_VERSION_ID) {
 			return undefined;