@appwarden/middleware 1.6.0 → 3.0.0

package/README.md

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

@@ -34,7 +34,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) {

package/cloudflare.d.ts

@@ -1,5 +1,5 @@
-import { M as Middleware, B as Bindings } from './use-content-security-policy-Bh2qDCKv.js';
-export { u as useContentSecurityPolicy } from './use-content-security-policy-Bh2qDCKv.js';
+import { M as Middleware, B as Bindings } from './use-content-security-policy-DjRTjIpm.js';
+export { u as useContentSecurityPolicy } from './use-content-security-policy-DjRTjIpm.js';
 import { z } from 'zod';
 
 declare const UseAppwardenInputSchema: z.ZodObject<{

package/index.d.ts

@@ -1,4 +1,4 @@
-export { B as Bindings, C as CSPDirectivesSchema, a as CSPModeSchema, M as Middleware, u as useContentSecurityPolicy } from './use-content-security-policy-Bh2qDCKv.js';
+export { B as Bindings, C as CSPDirectivesSchema, a as CSPModeSchema, M as Middleware, u as useContentSecurityPolicy } from './use-content-security-policy-DjRTjIpm.js';
 import { z } from 'zod';
 
 declare const LOCKDOWN_TEST_EXPIRY_MS: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appwarden/middleware",
-  "version": "1.6.0",
+  "version": "3.0.0",
   "description": "Instantly shut off access your app deployed on Cloudflare or Vercel",
   "type": "module",
   "license": "MIT",
@@ -58,17 +58,24 @@
     "node": ">=24"
   },
   "dependencies": {
-    "@cloudflare/next-on-pages": "^1.13.16",
     "@upstash/redis": "^1.36.2",
     "@vercel/edge-config": "^1.4.3",
     "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
     },
@@ -95,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/{use-content-security-policy-Bh2qDCKv.d.ts → use-content-security-policy-DjRTjIpm.d.ts}

@@ -84,10 +84,6 @@ declare const ContentSecurityPolicySchema: z.ZodObject<{
 }>;
 type ContentSecurityPolicyType = z.infer<typeof ContentSecurityPolicySchema>;
 
-declare global {
-    interface CloudflareEnv extends Bindings {
-    }
-}
 type Bindings = {
     DEBUG: string | boolean;
     LOCK_PAGE_SLUG: string;
@@ -96,6 +92,10 @@ type Bindings = {
     APPWARDEN_API_TOKEN: string;
     APPWARDEN_API_HOSTNAME?: string;
 };
+declare global {
+    interface CloudflareEnv extends Bindings {
+    }
+}
 
 interface MiddlewareContext {
     hostname: string;