@appwarden/middleware 3.6.0 → 3.8.0

package/cloudflare/tanstack-start.js

@@ -3,13 +3,13 @@ import {
 } from "../chunk-XFG6SUSV.js";
 import {
   useContentSecurityPolicy
-} from "../chunk-AXWJZE7U.js";
-import {
-  getNowMs
-} from "../chunk-X7WZVYQS.js";
+} from "../chunk-52NBQDQT.js";
 import {
   validateConfig
 } from "../chunk-MNGMTDH3.js";
+import {
+  getNowMs
+} from "../chunk-X7WZVYQS.js";
 import {
   checkLockStatus
 } from "../chunk-G5FWKV2Q.js";
@@ -50,16 +50,21 @@ function createAppwardenMiddleware(configFn) {
     const startTime = getNowMs();
     const { request, next, context } = args;
     try {
-      const cloudflare = context.cloudflare;
-      if (!cloudflare) {
+      if (!context.env || !context.waitUntil) {
         console.error(
           printMessage(
-            "Cloudflare context not found in TanStack Start context. Ensure your Register type includes the cloudflare context, or pass it manually in the middleware wrapper."
+            "Runtime context missing required properties (env, waitUntil). Ensure you pass { env, waitUntil } from cloudflare:workers to the middleware context."
           )
         );
         return next();
       }
-      const config = configFn(cloudflare);
+      const rawConfig = configFn(context);
+      const parseResult = TanStackStartCloudflareConfigSchema.safeParse(rawConfig);
+      if (!parseResult.success) {
+        validateConfig(rawConfig, TanStackStartCloudflareConfigSchema);
+        return next();
+      }
+      const config = parseResult.data;
       const debugFn = debug(config.debug ?? false);
       const requestUrl = new URL(request.url);
       const isHTML = isHTMLRequest(request);
@@ -70,13 +75,6 @@ function createAppwardenMiddleware(configFn) {
       if (!isHTML) {
         return next();
       }
-      const hasError = validateConfig(
-        config,
-        TanStackStartCloudflareConfigSchema
-      );
-      if (hasError) {
-        return next();
-      }
       if (isOnLockPage(config.lockPageSlug, request.url)) {
         debugFn("Already on lock page - skipping");
         return next();
@@ -87,7 +85,7 @@ function createAppwardenMiddleware(configFn) {
         appwardenApiHostname: config.appwardenApiHostname,
         debug: config.debug,
         lockPageSlug: config.lockPageSlug,
-        waitUntil: (fn) => cloudflare.ctx.waitUntil(fn)
+        waitUntil: context.waitUntil
       });
       if (lockStatus.isLocked) {
         const lockPageUrl = buildLockPageUrl(config.lockPageSlug, request.url);
@@ -98,12 +96,11 @@ function createAppwardenMiddleware(configFn) {
       const result = await next();
       const { response } = result;
       if (config.contentSecurityPolicy && isResponseLike(response)) {
-        debugFn("Applying CSP middleware");
         const cspContext = {
           request,
           response,
           hostname: requestUrl.hostname,
-          waitUntil: (fn) => cloudflare.ctx.waitUntil(fn),
+          waitUntil: context.waitUntil,
           debug: debugFn
         };
         await useContentSecurityPolicy(config.contentSecurityPolicy)(

package/cloudflare.js

@@ -1,6 +1,6 @@
 import {
   useContentSecurityPolicy
-} from "./chunk-AXWJZE7U.js";
+} from "./chunk-52NBQDQT.js";
 import {
   checkLockStatus
 } from "./chunk-G5FWKV2Q.js";

package/index.js

@@ -5,7 +5,7 @@ import {
 } from "./chunk-QEFORWCW.js";
 import {
   useContentSecurityPolicy
-} from "./chunk-AXWJZE7U.js";
+} from "./chunk-52NBQDQT.js";
 import {
   APPWARDEN_CACHE_KEY,
   CSPDirectivesSchema,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appwarden/middleware",
-  "version": "3.6.0",
+  "version": "3.8.0",
   "description": "Instantly shut off access your app deployed on Cloudflare or Vercel",
   "type": "module",
   "license": "MIT",
@@ -116,7 +116,8 @@
       "rollup@>=4.0.0 <4.59.0": ">=4.59.0",
       "h3@<=1.15.4": ">=1.15.5",
       "js-yaml@<3.14.2": ">=3.14.2",
-      "fast-xml-parser@<5.3.8": ">=5.3.8"
+      "fast-xml-parser@<5.3.8": ">=5.3.8",
+      "serialize-javascript@<=7.0.2": ">=7.0.3"
     }
   }
 }