@appwarden/middleware 3.0.3 → 3.1.1

package/README.md

@@ -1,6 +1,6 @@
 # @appwarden/middleware
 
-![Test Coverage](https://img.shields.io/badge/coverage-95.96%25-brightgreen)
+![Test Coverage](https://img.shields.io/badge/coverage-95.44%25-brightgreen)
 [![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)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
@@ -26,13 +26,17 @@ For detailed usage instructions, please refer to our [documentation](https://app
 
 ### On Cloudflare
 
-Cloudflare has two deployment options: [pages.dev](https://pages.dev) and [Workers static assets](https://developers.cloudflare.com/workers/static-assets/). We support both.
+For all websites deployed on Cloudflare—including popular modern frameworks like Astro, Next.js, React Router, TanStack Start, and more—we recommend using the [build-cloudflare-action](https://github.com/appwarden/build-cloudflare-action). This action builds a worker that runs on the root of your domain (e.g., `your.app.io/*` for an `your.app.io` website), providing seamless integration with Appwarden without modifying your application code.
 
-#### On pages.dev
+Please see the [build-cloudflare-action documentation](https://github.com/appwarden/build-cloudflare-action) for more information.
 
-- [All websites on pages.dev](https://appwarden.io/docs/guides/cloudflare-integration)
+#### Recommended: build-cloudflare-action
 
-#### On Workers static assets
+- [build-cloudflare-action](https://github.com/appwarden/build-cloudflare-action) — Seamless integration with Appwarden for Cloudflare-deployed websites.
+
+#### Framework adapters (alternative)
+
+If you cannot use the `build-cloudflare-action`, you can use framework-specific adapters instead:
 
 - [Astro](https://appwarden.io/docs/guides/astro-cloudflare)
 - [React Router](https://appwarden.io/docs/guides/react-router-cloudflare)

package/{chunk-B5IE7V77.js → chunk-OPZQCRC4.js}

@@ -2,6 +2,27 @@ import {
   LOCKDOWN_TEST_EXPIRY_MS
 } from "./chunk-7UTT3M2S.js";
 
+// src/utils/build-lock-page-url.ts
+function normalizeLockPageSlug(lockPageSlug) {
+  return lockPageSlug.startsWith("/") ? lockPageSlug : `/${lockPageSlug}`;
+}
+function buildLockPageUrl(lockPageSlug, requestUrl) {
+  const normalizedSlug = normalizeLockPageSlug(lockPageSlug);
+  return new URL(normalizedSlug, requestUrl);
+}
+function normalizeTrailingSlash(path) {
+  if (path === "/") return path;
+  return path.endsWith("/") ? path.slice(0, -1) : path;
+}
+function isOnLockPage(lockPageSlug, requestUrl) {
+  const normalizedSlug = normalizeTrailingSlash(
+    normalizeLockPageSlug(lockPageSlug)
+  );
+  const url = typeof requestUrl === "string" ? new URL(requestUrl) : requestUrl;
+  const normalizedPathname = normalizeTrailingSlash(url.pathname);
+  return normalizedPathname === normalizedSlug;
+}
+
 // src/utils/memory-cache.ts
 var MemoryCache = class {
   cache = /* @__PURE__ */ new Map();
@@ -102,6 +123,8 @@ var LockValue = z.object({
 });
 
 export {
+  buildLockPageUrl,
+  isOnLockPage,
   getErrors,
   MemoryCache,
   BooleanSchema,

package/{chunk-5DEXVBY6.js → chunk-RB2LXM55.js}

@@ -1,7 +1,7 @@
 import {
   LockValue,
   MemoryCache
-} from "./chunk-B5IE7V77.js";
+} from "./chunk-OPZQCRC4.js";
 import {
   APPWARDEN_CACHE_KEY,
   APPWARDEN_TEST_ROUTE,

package/chunk-RDASXYYU.js

@@ -0,0 +1,27 @@
+import {
+  getErrors
+} from "./chunk-OPZQCRC4.js";
+import {
+  printMessage
+} from "./chunk-7UTT3M2S.js";
+
+// src/utils/validate-config.ts
+function validateConfig(config, schema) {
+  const result = schema.safeParse(config);
+  const hasErrors = !result.success;
+  if (hasErrors) {
+    const mappedErrors = getErrors(result.error);
+    if (mappedErrors.length > 0) {
+      for (const error of mappedErrors) {
+        console.error(printMessage(error));
+      }
+    } else {
+      console.error(printMessage(result.error.message));
+    }
+  }
+  return hasErrors;
+}
+
+export {
+  validateConfig
+};

package/cloudflare/astro.js

@@ -3,17 +3,17 @@ import {
   createRedirect
 } from "../chunk-6M7BE3AW.js";
 import {
-  buildLockPageUrl,
-  isOnLockPage,
   validateConfig
-} from "../chunk-4JGYMZTR.js";
+} from "../chunk-RDASXYYU.js";
 import {
   checkLockStatus
-} from "../chunk-5DEXVBY6.js";
+} from "../chunk-RB2LXM55.js";
 import {
   AppwardenApiTokenSchema,
-  BooleanSchema
-} from "../chunk-B5IE7V77.js";
+  BooleanSchema,
+  buildLockPageUrl,
+  isOnLockPage
+} from "../chunk-OPZQCRC4.js";
 import {
   isHTMLRequest,
   printMessage

package/cloudflare/nextjs.js

@@ -2,17 +2,17 @@ import {
   TEMPORARY_REDIRECT_STATUS
 } from "../chunk-6M7BE3AW.js";
 import {
-  buildLockPageUrl,
-  isOnLockPage,
   validateConfig
-} from "../chunk-4JGYMZTR.js";
+} from "../chunk-RDASXYYU.js";
 import {
   checkLockStatus
-} from "../chunk-5DEXVBY6.js";
+} from "../chunk-RB2LXM55.js";
 import {
   AppwardenApiTokenSchema,
-  BooleanSchema
-} from "../chunk-B5IE7V77.js";
+  BooleanSchema,
+  buildLockPageUrl,
+  isOnLockPage
+} from "../chunk-OPZQCRC4.js";
 import {
   isHTMLRequest,
   printMessage

package/cloudflare/react-router.d.ts

@@ -6,6 +6,11 @@ interface CloudflareContext {
     env: CloudflareEnv;
     ctx: ExecutionContext;
 }
+/**
+ * Symbol used to store Cloudflare context in RouterContextProvider.
+ * This is used when middleware is enabled with the v8_middleware future flag.
+ */
+declare const cloudflareContextSymbol: unique symbol;
 /**
  * Configuration for the Appwarden middleware.
  */
@@ -27,13 +32,15 @@ type ReactRouterConfigFn = (cloudflare: CloudflareContext) => ReactRouterAppward
 /**
  * React Router middleware function signature.
  * This matches the unstable_middleware export type in React Router v7.
+ *
+ * Supports both old and new context APIs:
+ * - Old API: context is a plain object with `cloudflare` property
+ * - New API (v8_middleware): context is a RouterContextProvider instance
  */
 interface ReactRouterMiddlewareArgs {
     request: Request;
     params: Record<string, string | undefined>;
-    context: {
-        cloudflare: CloudflareContext;
-    };
+    context: any;
 }
 type ReactRouterMiddlewareFunction = (args: ReactRouterMiddlewareArgs, next: () => Promise<unknown>) => Promise<unknown>;
 /**
@@ -42,6 +49,10 @@ type ReactRouterMiddlewareFunction = (args: ReactRouterMiddlewareArgs, next: ()
  * This middleware checks if the site is locked and redirects to the lock page if so.
  * It should be exported from your root route (root.tsx) to protect all routes.
  *
+ * Supports both old and new React Router context APIs:
+ * - Old API: Pass context as plain object with `cloudflare` property
+ * - New API (v8_middleware): Use RouterContextProvider with cloudflareContextSymbol
+ *
  * @example
  * ```typescript
  * // app/root.tsx
@@ -60,4 +71,4 @@ type ReactRouterMiddlewareFunction = (args: ReactRouterMiddlewareArgs, next: ()
  */
 declare function createAppwardenMiddleware(configFn: ReactRouterConfigFn): ReactRouterMiddlewareFunction;
 
-export { type CloudflareContext, type ReactRouterAppwardenConfig, type ReactRouterConfigFn, type ReactRouterMiddlewareArgs, type ReactRouterMiddlewareFunction, createAppwardenMiddleware };
+export { type CloudflareContext, type ReactRouterAppwardenConfig, type ReactRouterConfigFn, type ReactRouterMiddlewareArgs, type ReactRouterMiddlewareFunction, cloudflareContextSymbol, createAppwardenMiddleware };

package/cloudflare/react-router.js

@@ -2,17 +2,17 @@ import {
   createRedirect
 } from "../chunk-6M7BE3AW.js";
 import {
-  buildLockPageUrl,
-  isOnLockPage,
   validateConfig
-} from "../chunk-4JGYMZTR.js";
+} from "../chunk-RDASXYYU.js";
 import {
   checkLockStatus
-} from "../chunk-5DEXVBY6.js";
+} from "../chunk-RB2LXM55.js";
 import {
   AppwardenApiTokenSchema,
-  BooleanSchema
-} from "../chunk-B5IE7V77.js";
+  BooleanSchema,
+  buildLockPageUrl,
+  isOnLockPage
+} from "../chunk-OPZQCRC4.js";
 import {
   isHTMLRequest,
   printMessage
@@ -32,15 +32,33 @@ var ReactRouterCloudflareConfigSchema = z.object({
 });
 
 // src/adapters/react-router-cloudflare.ts
+var cloudflareContextSymbol = /* @__PURE__ */ Symbol.for(
+  "@appwarden/middleware:cloudflare"
+);
+function getCloudflareContext(context) {
+  if (context?.cloudflare) {
+    return context.cloudflare;
+  }
+  if (context?.get && typeof context.get === "function") {
+    try {
+      const cloudflare = context.get(cloudflareContextSymbol);
+      if (cloudflare) {
+        return cloudflare;
+      }
+    } catch {
+    }
+  }
+  return null;
+}
 function createAppwardenMiddleware(configFn) {
   return async (args, next) => {
     const { request, context } = args;
     try {
-      const cloudflare = context.cloudflare;
+      const cloudflare = getCloudflareContext(context);
       if (!cloudflare) {
         console.error(
           printMessage(
-            "Cloudflare context not found. Make sure you're running on Cloudflare Workers."
+            "Cloudflare context not found. Make sure you're running on Cloudflare Workers and have set up the context correctly."
           )
         );
         return next();
@@ -83,5 +101,6 @@ function createAppwardenMiddleware(configFn) {
   };
 }
 export {
+  cloudflareContextSymbol,
   createAppwardenMiddleware
 };

package/cloudflare/tanstack-start.js

@@ -2,17 +2,17 @@ import {
   createRedirect
 } from "../chunk-6M7BE3AW.js";
 import {
-  buildLockPageUrl,
-  isOnLockPage,
   validateConfig
-} from "../chunk-4JGYMZTR.js";
+} from "../chunk-RDASXYYU.js";
 import {
   checkLockStatus
-} from "../chunk-5DEXVBY6.js";
+} from "../chunk-RB2LXM55.js";
 import {
   AppwardenApiTokenSchema,
-  BooleanSchema
-} from "../chunk-B5IE7V77.js";
+  BooleanSchema,
+  buildLockPageUrl,
+  isOnLockPage
+} from "../chunk-OPZQCRC4.js";
 import {
   isHTMLRequest,
   printMessage

package/cloudflare.js

@@ -5,15 +5,16 @@ import {
   checkLockStatus,
   getLockValue,
   store
-} from "./chunk-5DEXVBY6.js";
+} from "./chunk-RB2LXM55.js";
 import {
   AppwardenApiTokenSchema,
   BooleanSchema,
-  getErrors
-} from "./chunk-B5IE7V77.js";
+  getErrors,
+  isOnLockPage
+} from "./chunk-OPZQCRC4.js";
 import {
   APPWARDEN_CACHE_KEY,
-  isHTMLResponse,
+  isHTMLRequest,
   printMessage
 } from "./chunk-7UTT3M2S.js";
 
@@ -124,42 +125,48 @@ var handleResetCache = async (keyName, provider, edgeCache, request) => {
 
 // src/middlewares/use-appwarden.ts
 var useAppwarden = (input) => async (context, next) => {
-  await next();
-  const { request, response } = context;
+  const { request } = context;
+  let shouldCallNext = true;
   try {
     const requestUrl = new URL(request.url);
-    const provider = "cloudflare-cache";
-    const keyName = APPWARDEN_CACHE_KEY;
-    const edgeCache = store.json(
-      {
-        serviceOrigin: requestUrl.origin,
-        cache: await caches.open("appwarden:lock")
-      },
-      keyName
-    );
     if (isResetCacheRequest(request)) {
+      const provider = "cloudflare-cache";
+      const keyName = APPWARDEN_CACHE_KEY;
+      const edgeCache = store.json(
+        {
+          serviceOrigin: requestUrl.origin,
+          cache: await caches.open("appwarden:lock")
+        },
+        keyName
+      );
       await handleResetCache(keyName, provider, edgeCache, request);
       return;
     }
-    if (isHTMLResponse(response)) {
-      const lockPageSlug = input.multidomainConfig?.[requestUrl.hostname]?.lockPageSlug ?? input.lockPageSlug;
-      if (!lockPageSlug) {
-        return;
-      }
-      const result = await checkLockStatus({
-        request,
-        appwardenApiToken: input.appwardenApiToken,
-        appwardenApiHostname: input.appwardenApiHostname,
-        debug: input.debug,
+    if (!isHTMLRequest(request)) {
+      return;
+    }
+    const lockPageSlug = input.multidomainConfig?.[requestUrl.hostname]?.lockPageSlug ?? input.lockPageSlug;
+    if (!lockPageSlug) {
+      return;
+    }
+    if (isOnLockPage(lockPageSlug, request.url)) {
+      return;
+    }
+    const result = await checkLockStatus({
+      request,
+      appwardenApiToken: input.appwardenApiToken,
+      appwardenApiHostname: input.appwardenApiHostname,
+      debug: input.debug,
+      lockPageSlug,
+      waitUntil: (fn) => context.waitUntil(fn)
+    });
+    if (result.isLocked) {
+      context.response = await renderLockPage({
         lockPageSlug,
-        waitUntil: (fn) => context.waitUntil(fn)
+        requestUrl
       });
-      if (result.isLocked) {
-        context.response = await renderLockPage({
-          lockPageSlug,
-          requestUrl
-        });
-      }
+      shouldCallNext = false;
+      return;
     }
   } catch (e) {
     const message = "Appwarden encountered an unknown error. Please contact Appwarden support at https://appwarden.io/join-community.";
@@ -168,6 +175,10 @@ var useAppwarden = (input) => async (context, next) => {
         e instanceof Error ? `${message} - ${e.message}` : message
       )
     );
+  } finally {
+    if (shouldCallNext) {
+      await next();
+    }
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appwarden/middleware",
-  "version": "3.0.3",
+  "version": "3.1.1",
   "description": "Instantly shut off access your app deployed on Cloudflare or Vercel",
   "type": "module",
   "license": "MIT",

package/vercel.js

@@ -3,13 +3,13 @@ import {
   isValidCacheUrl
 } from "./chunk-QEFORWCW.js";
 import {
-  isOnLockPage,
   validateConfig
-} from "./chunk-4JGYMZTR.js";
+} from "./chunk-RDASXYYU.js";
 import {
   LockValue,
-  MemoryCache
-} from "./chunk-B5IE7V77.js";
+  MemoryCache,
+  isOnLockPage
+} from "./chunk-OPZQCRC4.js";
 import {
   APPWARDEN_CACHE_KEY,
   debug,

package/chunk-4JGYMZTR.js

@@ -1,50 +0,0 @@
-import {
-  getErrors
-} from "./chunk-B5IE7V77.js";
-import {
-  printMessage
-} from "./chunk-7UTT3M2S.js";
-
-// src/utils/build-lock-page-url.ts
-function normalizeLockPageSlug(lockPageSlug) {
-  return lockPageSlug.startsWith("/") ? lockPageSlug : `/${lockPageSlug}`;
-}
-function buildLockPageUrl(lockPageSlug, requestUrl) {
-  const normalizedSlug = normalizeLockPageSlug(lockPageSlug);
-  return new URL(normalizedSlug, requestUrl);
-}
-function normalizeTrailingSlash(path) {
-  if (path === "/") return path;
-  return path.endsWith("/") ? path.slice(0, -1) : path;
-}
-function isOnLockPage(lockPageSlug, requestUrl) {
-  const normalizedSlug = normalizeTrailingSlash(
-    normalizeLockPageSlug(lockPageSlug)
-  );
-  const url = typeof requestUrl === "string" ? new URL(requestUrl) : requestUrl;
-  const normalizedPathname = normalizeTrailingSlash(url.pathname);
-  return normalizedPathname === normalizedSlug;
-}
-
-// src/utils/validate-config.ts
-function validateConfig(config, schema) {
-  const result = schema.safeParse(config);
-  const hasErrors = !result.success;
-  if (hasErrors) {
-    const mappedErrors = getErrors(result.error);
-    if (mappedErrors.length > 0) {
-      for (const error of mappedErrors) {
-        console.error(printMessage(error));
-      }
-    } else {
-      console.error(printMessage(result.error.message));
-    }
-  }
-  return hasErrors;
-}
-
-export {
-  buildLockPageUrl,
-  isOnLockPage,
-  validateConfig
-};