@appwarden/middleware 3.11.4 → 3.11.6

package/README.md

@@ -4,7 +4,7 @@
 [![GitHub](https://img.shields.io/badge/GitHub-appwarden%2Fmiddleware-181717?logo=github&logoColor=white)](https://github.com/appwarden/middleware)
 [![npm version](https://img.shields.io/npm/v/@appwarden/middleware.svg)](https://www.npmjs.com/package/@appwarden/middleware)
 [![npm provenance](https://img.shields.io/badge/npm-provenance-green)](https://docs.npmjs.com/generating-provenance-statements)
-![Test Coverage](https://img.shields.io/badge/coverage-93.07%25-brightgreen)
+![Test Coverage](https://img.shields.io/badge/coverage-93.08%25-brightgreen)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 
 ## Core Features

package/chunk-G6BMPIYD.js

@@ -0,0 +1,11 @@
+// src/utils/get-now.ts
+var getNowMs = () => typeof performance !== "undefined" && typeof performance.now === "function" ? performance.now() : Date.now();
+var getElapsedMs = (startTime) => Math.round(getNowMs() - startTime);
+var logElapsed = (debug, startTime) => {
+  debug(`Middleware executed in ${getElapsedMs(startTime)}ms`);
+};
+
+export {
+  getNowMs,
+  logElapsed
+};

package/{chunk-XFG6SUSV.js → chunk-UFWJYCX6.js}

@@ -1,3 +1,17 @@
+import {
+  useContentSecurityPolicy
+} from "./chunk-WBWF3PPX.js";
+
+// src/utils/apply-content-security-policy-to-response.ts
+var applyContentSecurityPolicyToResponse = async ({
+  contentSecurityPolicy,
+  ...context
+}) => {
+  await useContentSecurityPolicy(contentSecurityPolicy)(context, async () => {
+  });
+  return context.response;
+};
+
 // src/utils/is-response-like.ts
 var isResponseLike = (value) => {
   if (!value || typeof value !== "object") return false;
@@ -7,5 +21,6 @@ var isResponseLike = (value) => {
 };
 
 export {
+  applyContentSecurityPolicyToResponse,
   isResponseLike
 };

package/cloudflare/astro.d.ts

@@ -270,8 +270,8 @@ declare const AstroCloudflareConfigSchema: z.ZodObject<{
         };
     }>>>;
 }, "strip", z.ZodTypeAny, {
-    lockPageSlug: string;
     debug: boolean;
+    lockPageSlug: string;
     appwardenApiToken: string;
     contentSecurityPolicy?: {
         mode: "disabled" | "report-only" | "enforced";
@@ -308,6 +308,7 @@ declare const AstroCloudflareConfigSchema: z.ZodObject<{
 }, {
     lockPageSlug: string;
     appwardenApiToken: string;
+    debug?: string | boolean | undefined;
     contentSecurityPolicy?: {
         mode: "disabled" | "report-only" | "enforced";
         directives: string | {
@@ -339,7 +340,6 @@ declare const AstroCloudflareConfigSchema: z.ZodObject<{
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
         };
     } | undefined;
-    debug?: string | boolean | undefined;
     appwardenApiHostname?: string | undefined;
 }>;
 type AstroCloudflareConfig = z.infer<typeof AstroCloudflareConfigSchema>;
@@ -383,7 +383,7 @@ type AstroConfigFn = (runtime: AstroCloudflareRuntime) => AstroCloudflareConfigI
  * ```typescript
  * // src/middleware.ts
  * import { sequence } from "astro:middleware"
- * import { createAppwardenMiddleware } from "@appwarden/middleware/astro"
+ * import { createAppwardenMiddleware } from "@appwarden/middleware/cloudflare/astro"
  *
  * const appwarden = createAppwardenMiddleware(({ env }) => ({
  *   lockPageSlug: env.APPWARDEN_LOCK_PAGE_SLUG,

package/cloudflare/astro.js

@@ -1,12 +1,12 @@
 import {
+  applyContentSecurityPolicyToResponse,
   isResponseLike
-} from "../chunk-XFG6SUSV.js";
+} from "../chunk-UFWJYCX6.js";
+import "../chunk-WBWF3PPX.js";
 import {
-  useContentSecurityPolicy
-} from "../chunk-WBWF3PPX.js";
-import {
-  getNowMs
-} from "../chunk-X7WZVYQS.js";
+  getNowMs,
+  logElapsed
+} from "../chunk-G6BMPIYD.js";
 import {
   checkLockStatus
 } from "../chunk-QC2ZUZWY.js";
@@ -53,6 +53,31 @@ function createAppwardenMiddleware(configFn) {
   return async (context, next) => {
     const startTime = getNowMs();
     const { request } = context;
+    let config;
+    let debugFn;
+    let requestUrl;
+    const applyCspToResponse = async (response2) => {
+      if (!config.contentSecurityPolicy || !isResponseLike(response2)) {
+        return response2;
+      }
+      try {
+        return await applyContentSecurityPolicyToResponse({
+          request,
+          response: response2,
+          hostname: requestUrl.hostname,
+          waitUntil,
+          debug: debugFn,
+          contentSecurityPolicy: config.contentSecurityPolicy
+        });
+      } catch (error) {
+        console.error(
+          printMessage(
+            `Failed to apply content security policy: ${error instanceof Error ? error.message : String(error)}`
+          )
+        );
+        return response2;
+      }
+    };
     const locals = context.locals;
     try {
       const runtime = locals.runtime;
@@ -74,9 +99,9 @@ function createAppwardenMiddleware(configFn) {
         );
         return next();
       }
-      const config = validationResult.data;
-      const debugFn = debug(config.debug);
-      const requestUrl = new URL(request.url);
+      config = validationResult.data;
+      debugFn = debug(config.debug);
+      requestUrl = new URL(request.url);
       const isHTML = isHTMLRequest(request);
       debugFn(
         `Appwarden middleware invoked for ${requestUrl.pathname}`,
@@ -86,51 +111,29 @@ function createAppwardenMiddleware(configFn) {
         return next();
       }
       if (isOnLockPage(config.lockPageSlug, request.url)) {
-        debugFn("Already on lock page - skipping");
-        return next();
-      }
-      const result = await checkLockStatus({
-        request,
-        appwardenApiToken: config.appwardenApiToken,
-        appwardenApiHostname: config.appwardenApiHostname,
-        debug: config.debug,
-        lockPageSlug: config.lockPageSlug,
-        waitUntil
-      });
-      if (result.isLocked) {
-        const lockPageUrl = buildLockPageUrl(config.lockPageSlug, request.url);
-        debugFn(`Website is locked - redirecting to ${lockPageUrl.pathname}`);
-        if (context.redirect) {
-          return context.redirect(
-            lockPageUrl.toString(),
-            TEMPORARY_REDIRECT_STATUS
-          );
-        }
-        return createRedirect(lockPageUrl);
-      }
-      debugFn("Website is unlocked");
-      const response = await next();
-      if (config.contentSecurityPolicy && isResponseLike(response)) {
-        const cspContext = {
+        debugFn("Already on lock page - skipping lock status check");
+      } else {
+        const result = await checkLockStatus({
           request,
-          response,
-          hostname: requestUrl.hostname,
-          waitUntil,
-          debug: debugFn
-        };
-        await useContentSecurityPolicy(config.contentSecurityPolicy)(
-          cspContext,
-          async () => {
+          appwardenApiToken: config.appwardenApiToken,
+          appwardenApiHostname: config.appwardenApiHostname,
+          debug: config.debug,
+          lockPageSlug: config.lockPageSlug,
+          waitUntil
+        });
+        if (result.isLocked) {
+          const lockPageUrl = buildLockPageUrl(config.lockPageSlug, request.url);
+          debugFn(`Website is locked - redirecting to ${lockPageUrl.pathname}`);
+          if (context.redirect) {
+            return context.redirect(
+              lockPageUrl.toString(),
+              TEMPORARY_REDIRECT_STATUS
+            );
           }
-          // no-op next
-        );
-        const elapsed2 = Math.round(getNowMs() - startTime);
-        debugFn(`Middleware executed in ${elapsed2}ms`);
-        return cspContext.response;
+          return createRedirect(lockPageUrl);
+        }
+        debugFn("Website is unlocked");
       }
-      const elapsed = Math.round(getNowMs() - startTime);
-      debugFn(`Middleware executed in ${elapsed}ms`);
-      return response;
     } catch (error) {
       if (isResponseLike(error)) {
         throw error;
@@ -142,6 +145,10 @@ function createAppwardenMiddleware(configFn) {
       );
       return next();
     }
+    const response = await next();
+    const finalResponse = await applyCspToResponse(response);
+    logElapsed(debugFn, startTime);
+    return finalResponse;
   };
 }
 export {

package/cloudflare/nextjs.d.ts

@@ -329,8 +329,8 @@ declare const NextJsCloudflareConfigSchema: z.ZodObject<{
         };
     }>>>;
 }, "strip", z.ZodTypeAny, {
-    lockPageSlug: string;
     debug: boolean;
+    lockPageSlug: string;
     appwardenApiToken: string;
     contentSecurityPolicy?: {
         mode: "disabled" | "report-only" | "enforced";
@@ -367,6 +367,7 @@ declare const NextJsCloudflareConfigSchema: z.ZodObject<{
 }, {
     lockPageSlug: string;
     appwardenApiToken: string;
+    debug?: string | boolean | undefined;
     contentSecurityPolicy?: {
         mode: "disabled" | "report-only" | "enforced";
         directives: string | {
@@ -398,7 +399,6 @@ declare const NextJsCloudflareConfigSchema: z.ZodObject<{
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
         };
     } | undefined;
-    debug?: string | boolean | undefined;
     appwardenApiHostname?: string | undefined;
 }>;
 type NextJsCloudflareConfig = z.infer<typeof NextJsCloudflareConfigSchema>;

package/cloudflare/nextjs.js

@@ -1,6 +1,7 @@
 import {
-  getNowMs
-} from "../chunk-X7WZVYQS.js";
+  getNowMs,
+  logElapsed
+} from "../chunk-G6BMPIYD.js";
 import {
   checkLockStatus
 } from "../chunk-QC2ZUZWY.js";
@@ -112,12 +113,10 @@ function createAppwardenMiddleware(configFn) {
         );
         const response = NextResponse.next();
         response.headers.set(headerName, headerValue);
-        const elapsed2 = Math.round(getNowMs() - startTime);
-        debugFn(`Middleware executed in ${elapsed2}ms`);
+        logElapsed(debugFn, startTime);
         return response;
       }
-      const elapsed = Math.round(getNowMs() - startTime);
-      debugFn(`Middleware executed in ${elapsed}ms`);
+      logElapsed(debugFn, startTime);
       return NextResponse.next();
     } catch (error) {
       console.error(

package/cloudflare/react-router.d.ts

@@ -268,8 +268,8 @@ declare const ReactRouterCloudflareConfigSchema: z.ZodObject<{
         };
     }>>>;
 }, "strip", z.ZodTypeAny, {
-    lockPageSlug: string;
     debug: boolean;
+    lockPageSlug: string;
     appwardenApiToken: string;
     contentSecurityPolicy?: {
         mode: "disabled" | "report-only" | "enforced";
@@ -306,6 +306,7 @@ declare const ReactRouterCloudflareConfigSchema: z.ZodObject<{
 }, {
     lockPageSlug: string;
     appwardenApiToken: string;
+    debug?: string | boolean | undefined;
     contentSecurityPolicy?: {
         mode: "disabled" | "report-only" | "enforced";
         directives: string | {
@@ -337,7 +338,6 @@ declare const ReactRouterCloudflareConfigSchema: z.ZodObject<{
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
         };
     } | undefined;
-    debug?: string | boolean | undefined;
     appwardenApiHostname?: string | undefined;
 }>;
 type ReactRouterCloudflareConfig = z.infer<typeof ReactRouterCloudflareConfigSchema>;
@@ -377,7 +377,7 @@ type ReactRouterMiddlewareFunction = (args: ReactRouterMiddlewareArgs, next: ()
  * ```typescript
  * // app/root.tsx
  * import { env } from "cloudflare:workers"
- * import { createAppwardenMiddleware } from "@appwarden/middleware/react-router"
+ * import { createAppwardenMiddleware } from "@appwarden/middleware/cloudflare/react-router"
  *
  * export const unstable_middleware = [
  *   createAppwardenMiddleware(() => ({

package/cloudflare/react-router.js

@@ -1,12 +1,12 @@
 import {
+  applyContentSecurityPolicyToResponse,
   isResponseLike
-} from "../chunk-XFG6SUSV.js";
+} from "../chunk-UFWJYCX6.js";
+import "../chunk-WBWF3PPX.js";
 import {
-  useContentSecurityPolicy
-} from "../chunk-WBWF3PPX.js";
-import {
-  getNowMs
-} from "../chunk-X7WZVYQS.js";
+  getNowMs,
+  logElapsed
+} from "../chunk-G6BMPIYD.js";
 import {
   checkLockStatus
 } from "../chunk-QC2ZUZWY.js";
@@ -52,6 +52,31 @@ function createAppwardenMiddleware(configFn) {
   return async (args, next) => {
     const startTime = getNowMs();
     const { request } = args;
+    let config;
+    let debugFn;
+    let requestUrl;
+    const applyCspToResponse = async (response2) => {
+      if (!config.contentSecurityPolicy || !isResponseLike(response2)) {
+        return response2;
+      }
+      try {
+        return await applyContentSecurityPolicyToResponse({
+          request,
+          response: response2,
+          hostname: requestUrl.hostname,
+          waitUntil,
+          debug: debugFn,
+          contentSecurityPolicy: config.contentSecurityPolicy
+        });
+      } catch (error) {
+        console.error(
+          printMessage(
+            `Failed to apply content security policy: ${error instanceof Error ? error.message : String(error)}`
+          )
+        );
+        return response2;
+      }
+    };
     try {
       const configInput = configFn();
       const validationResult = ReactRouterCloudflareConfigSchema.safeParse(configInput);
@@ -63,9 +88,9 @@ function createAppwardenMiddleware(configFn) {
         );
         return next();
       }
-      const config = validationResult.data;
-      const debugFn = debug(config.debug);
-      const requestUrl = new URL(request.url);
+      config = validationResult.data;
+      debugFn = debug(config.debug);
+      requestUrl = new URL(request.url);
       const isHTML = isHTMLRequest(request);
       debugFn(
         `Appwarden middleware invoked for ${requestUrl.pathname}`,
@@ -75,45 +100,23 @@ function createAppwardenMiddleware(configFn) {
         return next();
       }
       if (isOnLockPage(config.lockPageSlug, request.url)) {
-        debugFn("Already on lock page - skipping");
-        return next();
-      }
-      const result = await checkLockStatus({
-        request,
-        appwardenApiToken: config.appwardenApiToken,
-        appwardenApiHostname: config.appwardenApiHostname,
-        debug: config.debug,
-        lockPageSlug: config.lockPageSlug,
-        waitUntil
-      });
-      if (result.isLocked) {
-        const lockPageUrl = buildLockPageUrl(config.lockPageSlug, request.url);
-        debugFn(`Website is locked - redirecting to ${lockPageUrl.pathname}`);
-        throw createRedirect(lockPageUrl);
-      }
-      debugFn("Website is unlocked");
-      const response = await next();
-      if (config.contentSecurityPolicy && isResponseLike(response)) {
-        const cspContext = {
+        debugFn("Already on lock page - skipping lock status check");
+      } else {
+        const result = await checkLockStatus({
           request,
-          response,
-          hostname: requestUrl.hostname,
-          waitUntil,
-          debug: debugFn
-        };
-        await useContentSecurityPolicy(config.contentSecurityPolicy)(
-          cspContext,
-          async () => {
-          }
-          // no-op next
-        );
-        const elapsed2 = Math.round(getNowMs() - startTime);
-        debugFn(`Middleware executed in ${elapsed2}ms`);
-        return cspContext.response;
+          appwardenApiToken: config.appwardenApiToken,
+          appwardenApiHostname: config.appwardenApiHostname,
+          debug: config.debug,
+          lockPageSlug: config.lockPageSlug,
+          waitUntil
+        });
+        if (result.isLocked) {
+          const lockPageUrl = buildLockPageUrl(config.lockPageSlug, request.url);
+          debugFn(`Website is locked - redirecting to ${lockPageUrl.pathname}`);
+          throw createRedirect(lockPageUrl);
+        }
+        debugFn("Website is unlocked");
       }
-      const elapsed = Math.round(getNowMs() - startTime);
-      debugFn(`Middleware executed in ${elapsed}ms`);
-      return response;
     } catch (error) {
       if (isResponseLike(error)) {
         throw error;
@@ -125,6 +128,10 @@ function createAppwardenMiddleware(configFn) {
       );
       return next();
     }
+    const response = await next();
+    const finalResponse = isResponseLike(response) ? await applyCspToResponse(response) : response;
+    logElapsed(debugFn, startTime);
+    return finalResponse;
   };
 }
 export {

package/cloudflare/tanstack-start.d.ts

@@ -268,8 +268,8 @@ declare const TanStackStartCloudflareConfigSchema: z.ZodObject<{
         };
     }>>>;
 }, "strip", z.ZodTypeAny, {
-    lockPageSlug: string;
     debug: boolean;
+    lockPageSlug: string;
     appwardenApiToken: string;
     contentSecurityPolicy?: {
         mode: "disabled" | "report-only" | "enforced";
@@ -306,6 +306,7 @@ declare const TanStackStartCloudflareConfigSchema: z.ZodObject<{
 }, {
     lockPageSlug: string;
     appwardenApiToken: string;
+    debug?: string | boolean | undefined;
     contentSecurityPolicy?: {
         mode: "disabled" | "report-only" | "enforced";
         directives: string | {
@@ -337,7 +338,6 @@ declare const TanStackStartCloudflareConfigSchema: z.ZodObject<{
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
         };
     } | undefined;
-    debug?: string | boolean | undefined;
     appwardenApiHostname?: string | undefined;
 }>;
 type TanStackStartCloudflareConfig = z.infer<typeof TanStackStartCloudflareConfigSchema>;

package/cloudflare/tanstack-start.js

@@ -1,12 +1,12 @@
 import {
+  applyContentSecurityPolicyToResponse,
   isResponseLike
-} from "../chunk-XFG6SUSV.js";
+} from "../chunk-UFWJYCX6.js";
+import "../chunk-WBWF3PPX.js";
 import {
-  useContentSecurityPolicy
-} from "../chunk-WBWF3PPX.js";
-import {
-  getNowMs
-} from "../chunk-X7WZVYQS.js";
+  getNowMs,
+  logElapsed
+} from "../chunk-G6BMPIYD.js";
 import {
   checkLockStatus
 } from "../chunk-QC2ZUZWY.js";
@@ -52,6 +52,31 @@ function createAppwardenMiddleware(configFn) {
   const middleware = async (args) => {
     const startTime = getNowMs();
     const { request, next } = args;
+    let config;
+    let debugFn;
+    let requestUrl;
+    const applyCspToResponse = async (response2) => {
+      if (!config.contentSecurityPolicy || !isResponseLike(response2)) {
+        return response2;
+      }
+      try {
+        return await applyContentSecurityPolicyToResponse({
+          request,
+          response: response2,
+          hostname: requestUrl.hostname,
+          waitUntil,
+          debug: debugFn,
+          contentSecurityPolicy: config.contentSecurityPolicy
+        });
+      } catch (error) {
+        console.error(
+          printMessage(
+            `Failed to apply content security policy: ${error instanceof Error ? error.message : String(error)}`
+          )
+        );
+        return response2;
+      }
+    };
     try {
       const rawConfig = configFn();
       const validationResult = TanStackStartCloudflareConfigSchema.safeParse(rawConfig);
@@ -63,9 +88,9 @@ function createAppwardenMiddleware(configFn) {
         );
         return next();
       }
-      const config = validationResult.data;
-      const debugFn = debug(config.debug ?? false);
-      const requestUrl = new URL(request.url);
+      config = validationResult.data;
+      debugFn = debug(config.debug ?? false);
+      requestUrl = new URL(request.url);
       const isHTML = isHTMLRequest(request);
       debugFn(
         `Appwarden middleware invoked for ${requestUrl.pathname}`,
@@ -75,69 +100,27 @@ function createAppwardenMiddleware(configFn) {
         return next();
       }
       if (isOnLockPage(config.lockPageSlug, request.url)) {
-        debugFn("Already on lock page - skipping");
-        return next();
-      }
-      const lockStatus = await checkLockStatus({
-        request,
-        appwardenApiToken: config.appwardenApiToken,
-        appwardenApiHostname: config.appwardenApiHostname,
-        debug: config.debug,
-        lockPageSlug: config.lockPageSlug,
-        waitUntil
-      });
-      if (lockStatus.isLocked) {
-        const lockPageUrl = buildLockPageUrl(config.lockPageSlug, request.url);
-        debugFn(`Website is locked - redirecting to ${lockPageUrl.pathname}`);
-        const redirectResponse = createRedirect(lockPageUrl);
-        if (config.contentSecurityPolicy && isResponseLike(redirectResponse)) {
-          const cspContext = {
-            request,
-            response: redirectResponse,
-            hostname: requestUrl.hostname,
-            waitUntil,
-            debug: debugFn
-          };
-          await useContentSecurityPolicy(config.contentSecurityPolicy)(
-            cspContext,
-            async () => {
-            }
+        debugFn("Already on lock page - skipping lock status check");
+      } else {
+        const lockStatus = await checkLockStatus({
+          request,
+          appwardenApiToken: config.appwardenApiToken,
+          appwardenApiHostname: config.appwardenApiHostname,
+          debug: config.debug,
+          lockPageSlug: config.lockPageSlug,
+          waitUntil
+        });
+        if (lockStatus.isLocked) {
+          const lockPageUrl = buildLockPageUrl(config.lockPageSlug, request.url);
+          debugFn(`Website is locked - redirecting to ${lockPageUrl.pathname}`);
+          const redirectResponse = await applyCspToResponse(
+            createRedirect(lockPageUrl)
           );
-          const elapsed3 = Math.round(getNowMs() - startTime);
-          debugFn(`Middleware executed in ${elapsed3}ms`);
-          throw cspContext.response;
+          logElapsed(debugFn, startTime);
+          throw redirectResponse;
         }
-        const elapsed2 = Math.round(getNowMs() - startTime);
-        debugFn(`Middleware executed in ${elapsed2}ms`);
-        throw redirectResponse;
-      }
-      debugFn("Website is unlocked");
-      const result = await next();
-      const { response } = result;
-      if (config.contentSecurityPolicy && isResponseLike(response)) {
-        const cspContext = {
-          request,
-          response,
-          hostname: requestUrl.hostname,
-          waitUntil,
-          debug: debugFn
-        };
-        await useContentSecurityPolicy(config.contentSecurityPolicy)(
-          cspContext,
-          async () => {
-          }
-          // no-op next
-        );
-        const elapsed2 = Math.round(getNowMs() - startTime);
-        debugFn(`Middleware executed in ${elapsed2}ms`);
-        return {
-          ...result,
-          response: cspContext.response
-        };
+        debugFn("Website is unlocked");
       }
-      const elapsed = Math.round(getNowMs() - startTime);
-      debugFn(`Middleware executed in ${elapsed}ms`);
-      return result;
     } catch (error) {
       if (isResponseLike(error)) {
         throw error;
@@ -149,6 +132,10 @@ function createAppwardenMiddleware(configFn) {
       );
       return next();
     }
+    const result = await next();
+    const response = isResponseLike(result.response) ? await applyCspToResponse(result.response) : result.response;
+    logElapsed(debugFn, startTime);
+    return response === result.response ? result : { ...result, response };
   };
   return middleware;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appwarden/middleware",
-  "version": "3.11.4",
+  "version": "3.11.6",
   "description": "Instantly disable all user interaction with your app deployed on Cloudflare or Vercel",
   "type": "module",
   "license": "MIT",

package/chunk-X7WZVYQS.js

@@ -1,6 +0,0 @@
-// src/utils/get-now.ts
-var getNowMs = () => typeof performance !== "undefined" && typeof performance.now === "function" ? performance.now() : Date.now();
-
-export {
-  getNowMs
-};