@appwarden/middleware 2.0.0 → 3.0.1

package/README.md

@@ -1,6 +1,6 @@
 # @appwarden/middleware
 
-![Test Coverage](https://img.shields.io/badge/coverage-95.82%25-brightgreen)
+![Test Coverage](https://img.shields.io/badge/coverage-95.95%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)

package/chunk-4JGYMZTR.js

@@ -0,0 +1,50 @@
+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
+};

package/{chunk-N6AUTMZO.js → chunk-6M7BE3AW.js}

@@ -1,9 +1,3 @@
-// src/utils/build-lock-page-url.ts
-function buildLockPageUrl(lockPageSlug, requestUrl) {
-  const normalizedSlug = lockPageSlug.startsWith("/") ? lockPageSlug : `/${lockPageSlug}`;
-  return new URL(normalizedSlug, requestUrl);
-}
-
 // src/utils/create-redirect.ts
 var TEMPORARY_REDIRECT_STATUS = 302;
 var createRedirect = (url) => {
@@ -16,7 +10,6 @@ var createRedirect = (url) => {
 };
 
 export {
-  buildLockPageUrl,
   TEMPORARY_REDIRECT_STATUS,
   createRedirect
 };

package/cloudflare/astro.d.ts

@@ -1,11 +1,13 @@
+import { Runtime } from '@astrojs/cloudflare';
+import { APIContext, MiddlewareHandler } from 'astro';
+
 /**
  * Cloudflare runtime context provided by Astro on Cloudflare Workers.
- * This is the shape of `context.locals.runtime` when using @astrojs/cloudflare adapter.
+ * This is extracted from the locals object when using @astrojs/cloudflare adapter.
+ *
+ * Note: Uses generic CloudflareEnv which should be defined in the user's project.
  */
-interface AstroCloudflareRuntime {
-    env: CloudflareEnv;
-    ctx: ExecutionContext;
-}
+type AstroCloudflareRuntime = Runtime<CloudflareEnv>["runtime"];
 /**
  * Configuration for the Appwarden middleware.
  */
@@ -26,24 +28,18 @@ interface AstroAppwardenConfig {
 type AstroConfigFn = (runtime: AstroCloudflareRuntime) => AstroAppwardenConfig;
 /**
  * Astro middleware context type.
- * This matches Astro's APIContext shape for middleware.
+ * Re-exported from Astro's official APIContext type for type compatibility.
+ *
+ * @deprecated Use `APIContext` from 'astro' directly. This alias is kept for backward compatibility.
  */
-interface AstroMiddlewareContext {
-    /** The incoming request */
-    request: Request;
-    /** Object for storing request-specific data */
-    locals: {
-        runtime?: AstroCloudflareRuntime;
-        [key: string]: unknown;
-    };
-    /** Helper to create redirect responses */
-    redirect: (path: string, status?: number) => Response;
-}
+type AstroMiddlewareContext = APIContext;
 /**
  * Astro middleware function signature.
- * This matches the onRequest export type in Astro's middleware system.
+ * This is an alias for Astro's official MiddlewareHandler type for type compatibility.
+ *
+ * @deprecated Use `MiddlewareHandler` from 'astro' directly. This alias is kept for backward compatibility.
  */
-type AstroMiddlewareFunction = (context: AstroMiddlewareContext, next: () => Promise<Response>) => Promise<Response>;
+type AstroMiddlewareFunction = MiddlewareHandler;
 /**
  * Creates an Appwarden middleware function for Astro.
  *
@@ -67,6 +63,6 @@ type AstroMiddlewareFunction = (context: AstroMiddlewareContext, next: () => Pro
  * @param configFn - A function that receives the Cloudflare runtime and returns the config
  * @returns An Astro middleware function
  */
-declare function createAppwardenMiddleware(configFn: AstroConfigFn): AstroMiddlewareFunction;
+declare function createAppwardenMiddleware(configFn: AstroConfigFn): MiddlewareHandler;
 
 export { type AstroAppwardenConfig, type AstroCloudflareRuntime, type AstroConfigFn, type AstroMiddlewareContext, type AstroMiddlewareFunction, createAppwardenMiddleware };

package/cloudflare/astro.js

@@ -1,11 +1,12 @@
 import {
   TEMPORARY_REDIRECT_STATUS,
-  buildLockPageUrl,
   createRedirect
-} from "../chunk-N6AUTMZO.js";
+} from "../chunk-6M7BE3AW.js";
 import {
+  buildLockPageUrl,
+  isOnLockPage,
   validateConfig
-} from "../chunk-6PUA5YXP.js";
+} from "../chunk-4JGYMZTR.js";
 import {
   checkLockStatus
 } from "../chunk-5DEXVBY6.js";
@@ -34,7 +35,8 @@ var AstroCloudflareConfigSchema = z.object({
 // src/adapters/astro-cloudflare.ts
 function createAppwardenMiddleware(configFn) {
   return async (context, next) => {
-    const { request, locals } = context;
+    const { request } = context;
+    const locals = context.locals;
     try {
       const runtime = locals.runtime;
       if (!runtime) {
@@ -53,6 +55,9 @@ function createAppwardenMiddleware(configFn) {
       if (hasError) {
         return next();
       }
+      if (isOnLockPage(config.lockPageSlug, request.url)) {
+        return next();
+      }
       const result = await checkLockStatus({
         request,
         appwardenApiToken: config.appwardenApiToken,

package/cloudflare/nextjs.js

@@ -1,10 +1,11 @@
 import {
-  TEMPORARY_REDIRECT_STATUS,
-  buildLockPageUrl
-} from "../chunk-N6AUTMZO.js";
+  TEMPORARY_REDIRECT_STATUS
+} from "../chunk-6M7BE3AW.js";
 import {
+  buildLockPageUrl,
+  isOnLockPage,
   validateConfig
-} from "../chunk-6PUA5YXP.js";
+} from "../chunk-4JGYMZTR.js";
 import {
   checkLockStatus
 } from "../chunk-5DEXVBY6.js";
@@ -49,6 +50,9 @@ function createAppwardenMiddleware(configFn) {
       if (hasError) {
         return NextResponse.next();
       }
+      if (isOnLockPage(config.lockPageSlug, request.url)) {
+        return NextResponse.next();
+      }
       const result = await checkLockStatus({
         request,
         appwardenApiToken: config.appwardenApiToken,

package/cloudflare/react-router.js

@@ -1,10 +1,11 @@
 import {
-  buildLockPageUrl,
   createRedirect
-} from "../chunk-N6AUTMZO.js";
+} from "../chunk-6M7BE3AW.js";
 import {
+  buildLockPageUrl,
+  isOnLockPage,
   validateConfig
-} from "../chunk-6PUA5YXP.js";
+} from "../chunk-4JGYMZTR.js";
 import {
   checkLockStatus
 } from "../chunk-5DEXVBY6.js";
@@ -52,6 +53,9 @@ function createAppwardenMiddleware(configFn) {
       if (hasError) {
         return next();
       }
+      if (isOnLockPage(config.lockPageSlug, request.url)) {
+        return next();
+      }
       const result = await checkLockStatus({
         request,
         appwardenApiToken: config.appwardenApiToken,

package/cloudflare/tanstack-start.js

@@ -1,10 +1,11 @@
 import {
-  buildLockPageUrl,
   createRedirect
-} from "../chunk-N6AUTMZO.js";
+} from "../chunk-6M7BE3AW.js";
 import {
+  buildLockPageUrl,
+  isOnLockPage,
   validateConfig
-} from "../chunk-6PUA5YXP.js";
+} from "../chunk-4JGYMZTR.js";
 import {
   checkLockStatus
 } from "../chunk-5DEXVBY6.js";
@@ -55,6 +56,9 @@ function createAppwardenMiddleware(configFn) {
       if (hasError) {
         return next();
       }
+      if (isOnLockPage(config.lockPageSlug, request.url)) {
+        return next();
+      }
       const result = await checkLockStatus({
         request,
         appwardenApiToken: config.appwardenApiToken,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appwarden/middleware",
-  "version": "2.0.0",
+  "version": "3.0.1",
   "description": "Instantly shut off access your app deployed on Cloudflare or Vercel",
   "type": "module",
   "license": "MIT",
@@ -63,11 +63,19 @@
     "zod": "^3.25.76"
   },
   "peerDependencies": {
+    "@astrojs/cloudflare": ">=11.0.0",
     "@opennextjs/cloudflare": ">=1.0.0",
     "@vercel/functions": ">=1.0.0",
+    "astro": ">=4.0.0",
     "next": ">=14"
   },
   "peerDependenciesMeta": {
+    "astro": {
+      "optional": true
+    },
+    "@astrojs/cloudflare": {
+      "optional": true
+    },
     "next": {
       "optional": true
     },
@@ -94,7 +102,8 @@
       "jws@=4.0.0": ">=4.0.1",
       "@smithy/config-resolver@<4.4.0": ">=4.4.0",
       "@isaacs/brace-expansion@<=5.0.0": ">=5.0.1",
-      "npm@<=11.8.0": ">=11.9.0"
+      "npm@<=11.8.0": ">=11.9.0",
+      "wrangler@>=4.0.0 <4.59.1": ">=4.59.1"
     }
   }
 }

package/vercel.js

@@ -3,8 +3,9 @@ import {
   isValidCacheUrl
 } from "./chunk-QEFORWCW.js";
 import {
+  isOnLockPage,
   validateConfig
-} from "./chunk-6PUA5YXP.js";
+} from "./chunk-4JGYMZTR.js";
 import {
   LockValue,
   MemoryCache
@@ -210,6 +211,9 @@ function createAppwardenMiddleware(config) {
       if (!parsedConfig.lockPageSlug) {
         return NextResponse.next();
       }
+      if (isOnLockPage(parsedConfig.lockPageSlug, request.url)) {
+        return NextResponse.next();
+      }
       const provider = isCacheUrl.edgeConfig(parsedConfig.cacheUrl) ? "edge-config" : "upstash";
       const cacheValue = memoryCache.get(APPWARDEN_CACHE_KEY);
       const shouldRecheck = MemoryCache.isExpired(cacheValue);

package/chunk-6PUA5YXP.js

@@ -1,27 +0,0 @@
-import {
-  getErrors
-} from "./chunk-B5IE7V77.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
-};