perf(core, lambda-at-edge): cold start improvements (#1044)

Author: jvarho

packages/libs/core/src/index.ts

@@ -47,12 +47,12 @@ export const handleDomainRedirects = (
   }
 };
 
-export const handleLanguageRedirect = (
+export const handleLanguageRedirect = async (
   req: Request,
   manifest: Manifest,
   routesManifest: RoutesManifest
-): RedirectRoute | undefined => {
-  const languageRedirectUri = getLanguageRedirectPath(
+): Promise<RedirectRoute | undefined> => {
+  const languageRedirectUri = await getLanguageRedirectPath(
     req,
     manifest,
     routesManifest
@@ -118,11 +118,11 @@ const normalise = (uri: string, routesManifest: RoutesManifest): string => {
  * - redirects
  * - public files
  */
-export const routeDefault = (
+export const routeDefault = async (
   req: Request,
   manifest: Manifest,
   routesManifest: RoutesManifest
-): Route | undefined => {
+): Promise<Route | undefined> => {
   const auth = handleAuth(req, manifest);
   if (auth) {
     return auth;
@@ -148,7 +148,7 @@ export const routeDefault = (
   return (
     publicFile ||
     handleCustomRedirects(req, routesManifest) ||
-    handleLanguageRedirect(req, manifest, routesManifest)
+    (await handleLanguageRedirect(req, manifest, routesManifest))
   );
 };
 

packages/libs/core/src/locale.ts

@@ -1,4 +1,3 @@
-import Accept from "@hapi/accept";
 import { Manifest, RoutesManifest } from "./types";
 
 export function addDefaultLocaleToPath(
@@ -31,7 +30,7 @@ export function addDefaultLocaleToPath(
   return path;
 }
 
-export const getAcceptLanguageLocale = (
+export const getAcceptLanguageLocale = async (
   acceptLanguage: string,
   manifest: Manifest,
   routesManifest: RoutesManifest
@@ -44,6 +43,7 @@ export const getAcceptLanguageLocale = (
 
     // Accept.language(header, locales) prefers the locales order,
     // so we ask for all to find the order preferred by user.
+    const Accept = await import("@hapi/accept");
     for (const language of Accept.languages(acceptLanguage)) {
       const locale = language.toLowerCase();
       if (locale === defaultLocale) {

packages/libs/core/src/redirect.ts

@@ -1,4 +1,4 @@
-import * as http from "http";
+import { STATUS_CODES } from "http";
 import { addDefaultLocaleToPath, getAcceptLanguageLocale } from "./locale";
 import { compileDestination, matchPath } from "./match";
 import { Manifest, Request, RedirectRoute, RoutesManifest } from "./types";
@@ -25,7 +25,7 @@ export function createRedirectResponse(
   }
 
   const status = statusCode;
-  const statusDescription = http.STATUS_CODES[status];
+  const statusDescription = STATUS_CODES[status];
 
   const refresh =
     statusCode === 308
@@ -80,19 +80,23 @@ export function getDomainRedirectPath(
  * @param routesManifest
  * @param manifest
  */
-export function getLanguageRedirectPath(
+export async function getLanguageRedirectPath(
   req: Request,
   manifest: Manifest,
   routesManifest: RoutesManifest
-): string | undefined {
+): Promise<string | undefined> {
   const languageHeader = req.headers["accept-language"];
   const acceptLanguage = languageHeader && languageHeader[0]?.value;
   const basePath = routesManifest.basePath;
   const trailingSlash = manifest.trailingSlash;
   const rootUri = basePath ? `${basePath}${trailingSlash ? "/" : ""}` : "/";
 
   if (req.uri === rootUri || acceptLanguage) {
-    return getAcceptLanguageLocale(acceptLanguage, manifest, routesManifest);
+    return await getAcceptLanguageLocale(
+      acceptLanguage,
+      manifest,
+      routesManifest
+    );
   }
 }
 

packages/libs/core/tests/locale.test.ts

@@ -54,8 +54,8 @@ describe("Locale Utils Tests", () => {
       ${"fr;q=0.7, nl;q=0.9"} | ${"/nl/"}
     `(
       "returns $expectedPath for $acceptLang",
-      ({ acceptLang, expectedPath }) => {
-        const newPath = getAcceptLanguageLocale(
+      async ({ acceptLang, expectedPath }) => {
+        const newPath = await getAcceptLanguageLocale(
           acceptLang,
           manifest,
           routesManifest
@@ -69,8 +69,8 @@ describe("Locale Utils Tests", () => {
       acceptLang
       ${"en"}
       ${"nl;q=0.7, en;q=0.9"}
-    `("returns nothing for $acceptLang", ({ acceptLang }) => {
-      const newPath = getAcceptLanguageLocale(
+    `("returns nothing for $acceptLang", async ({ acceptLang }) => {
+      const newPath = await getAcceptLanguageLocale(
         acceptLang,
         manifest,
         routesManifest

packages/libs/core/tsconfig.json

@@ -3,8 +3,8 @@
     "resolveJsonModule": true,
     "esModuleInterop": true,
     "declaration": true,
-    "target": "ES2015",
-    "module": "CommonJS",
+    "target": "ES2019",
+    "module": "ES2020",
     "moduleResolution": "node",
     "noImplicitAny": true,
     "outDir": "dist",

packages/libs/lambda-at-edge/src/default-handler.ts

@@ -303,7 +303,7 @@ const handleOriginRequest = async ({
 }) => {
   const request = event.Records[0].cf.request;
 
-  const route = routeDefault(request, manifest, routesManifest);
+  const route = await routeDefault(request, manifest, routesManifest);
   if (route) {
     if (route.isPublicFile) {
       const { file } = route as PublicFileRoute;
@@ -406,7 +406,7 @@ const handleOriginRequest = async ({
   const normalisedS3DomainName = normaliseS3OriginDomain(s3Origin);
   const hasFallback = hasFallbackForUri(uri, manifest, routesManifest);
   const { now, log } = perfLogger(manifest.logLambdaExecutionTimes);
-  const isPreviewRequest = isValidPreviewRequest(
+  const isPreviewRequest = await isValidPreviewRequest(
     request.headers.cookie,
     prerenderManifest.preview.previewModeSigningKey
   );

packages/libs/lambda-at-edge/src/lib/isValidPreviewRequest.ts

@@ -1,5 +1,4 @@
-import cookie from "cookie";
-import jsonwebtoken from "jsonwebtoken";
+import { parse } from "cookie";
 
 const NEXT_PREVIEW_DATA_COOKIE = "__next_preview_data";
 const NEXT_PRERENDER_BYPASS_COOKIE = "__prerender_bypass";
@@ -20,14 +19,15 @@ export type Cookies = {
  * @param cookies - Cookies header with cookies in RFC 6265 compliant format
  * @param previewModeSigningKey - Next build key generated in the preRenderManifest
  */
-export const isValidPreviewRequest = (
+export const isValidPreviewRequest = async (
   cookies: Cookies,
   previewModeSigningKey: string
-): boolean => {
+): Promise<boolean> => {
   const previewCookies = getPreviewCookies(cookies);
 
   if (hasPreviewCookies(previewCookies)) {
     try {
+      const jsonwebtoken = await import("jsonwebtoken");
       jsonwebtoken.verify(
         previewCookies[NEXT_PREVIEW_DATA_COOKIE],
         previewModeSigningKey
@@ -48,7 +48,7 @@ const getPreviewCookies = (cookies: Cookies): DefaultPreviewCookies => {
   const targetCookie = cookies || [];
 
   return targetCookie.reduce((previewCookies, cookieObj) => {
-    const parsedCookie = cookie.parse(cookieObj.value);
+    const parsedCookie = parse(cookieObj.value);
 
     if (hasPreviewCookies(parsedCookie)) {
       return parsedCookie as DefaultPreviewCookies;

packages/libs/lambda-at-edge/tests/lib/isValidPreviewRequest.test.ts

@@ -17,9 +17,9 @@ describe("isValidPreviewRequest", () => {
         }
       ];
 
-      expect(isValidPreviewRequest(cookies, previewModeSigningKey)).toEqual(
-        false
-      );
+      expect(
+        isValidPreviewRequest(cookies, previewModeSigningKey)
+      ).resolves.toEqual(false);
     });
 
     it("is falsey for invalid preview cookies", () => {
@@ -31,9 +31,9 @@ describe("isValidPreviewRequest", () => {
         }
       ];
 
-      expect(isValidPreviewRequest(cookies, previewModeSigningKey)).toEqual(
-        false
-      );
+      expect(
+        isValidPreviewRequest(cookies, previewModeSigningKey)
+      ).resolves.toEqual(false);
     });
   });
 
@@ -48,9 +48,9 @@ describe("isValidPreviewRequest", () => {
         }
       ];
 
-      expect(isValidPreviewRequest(cookies, previewModeSigningKey)).toEqual(
-        true
-      );
+      expect(
+        isValidPreviewRequest(cookies, previewModeSigningKey)
+      ).resolves.toEqual(true);
     });
   });
 });