@appwarden/middleware 3.4.0 → 3.4.2

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-92.46%25-brightgreen)
+![Test Coverage](https://img.shields.io/badge/coverage-91.49%25-brightgreen)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 
 ## Core Features

package/chunk-24CQJ54X.js

@@ -0,0 +1,11 @@
+// src/utils/is-response-like.ts
+var isResponseLike = (value) => {
+  if (!value || typeof value !== "object") return false;
+  const candidate = value;
+  const headers = candidate.headers;
+  return !!(headers && typeof headers === "object" && typeof headers.has === "function" && typeof headers.set === "function" && typeof headers.get === "function" && "body" in candidate);
+};
+
+export {
+  isResponseLike
+};

package/{chunk-YBWFEBZC.js → chunk-AXWJZE7U.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-HCGLR3Z3.js";
 import {
   makeCSPHeader
-} from "./chunk-G4RRFNHY.js";
+} from "./chunk-GK6JL5NZ.js";
 
 // src/middlewares/use-content-security-policy.ts
 var AppendAttribute = (attribute, nonce) => ({

package/{chunk-QVRWMYGL.js → chunk-EPJ4ZVO6.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-HCGLR3Z3.js";
 import {
   printMessage
-} from "./chunk-G4RRFNHY.js";
+} from "./chunk-GK6JL5NZ.js";
 
 // src/utils/build-lock-page-url.ts
 function normalizeLockPageSlug(lockPageSlug) {
@@ -40,7 +40,7 @@ var createRedirect = (url) => {
 // src/utils/debug.ts
 var debug = (isDebug) => (...msg) => {
   if (!isDebug) return;
-  const formatted = msg.map((m) => {
+  const parts = msg.map((m) => {
     let content;
     if (m instanceof Error) {
       content = m.stack ?? m.message;
@@ -57,9 +57,10 @@ var debug = (isDebug) => (...msg) => {
     } else {
       content = String(m);
     }
-    return printMessage(content);
+    return content;
   });
-  console.log(...formatted);
+  const message = parts.join(" ");
+  console.log(printMessage(message));
 };
 
 // src/utils/memory-cache.ts

package/{chunk-3MKVGKH7.js → chunk-G5FWKV2Q.js}

@@ -1,7 +1,7 @@
 import {
   MemoryCache,
   debug
-} from "./chunk-QVRWMYGL.js";
+} from "./chunk-EPJ4ZVO6.js";
 import {
   APPWARDEN_CACHE_KEY,
   APPWARDEN_TEST_ROUTE
@@ -11,7 +11,7 @@ import {
   getLockValue,
   store,
   syncEdgeValue
-} from "./chunk-G4RRFNHY.js";
+} from "./chunk-GK6JL5NZ.js";
 
 // src/core/check-lock-status.ts
 var createContext = async (config) => {
@@ -42,9 +42,6 @@ var createContext = async (config) => {
 };
 var resolveLockStatus = async (context) => {
   const { lockValue, shouldDeleteEdgeValue } = await getLockValue(context);
-  if (lockValue) {
-    context.debug("Lock value resolved from cache");
-  }
   if (shouldDeleteEdgeValue) {
     context.debug("Deleting corrupted cache value");
     await deleteEdgeValue(context);
@@ -61,15 +58,21 @@ var resolveLockStatus = async (context) => {
 var checkLockStatus = async (config) => {
   const context = await createContext(config);
   let { isLocked, isTestLock, lockValue, wasDeleted } = await resolveLockStatus(context);
-  if (MemoryCache.isExpired(lockValue) || wasDeleted) {
+  const isExpired = MemoryCache.isExpired(lockValue);
+  if (!isExpired && !wasDeleted && lockValue) {
+    context.debug("Lock value resolved from cache");
+  }
+  if (isExpired || wasDeleted) {
     if (!lockValue || wasDeleted || lockValue.isLocked) {
       context.debug(
-        "Cache expired/missing/corrupted or site is locked - syncing with API synchronously"
+        "No fresh cached lock status available - syncing with API synchronously"
       );
       await syncEdgeValue(context);
       ({ isLocked, isTestLock } = await resolveLockStatus(context));
     } else {
-      context.debug("Cache expired but site unlocked - syncing in background");
+      context.debug(
+        "Cached lock status expired but last known state unlocked - syncing with API in background"
+      );
       config.waitUntil(syncEdgeValue(context));
     }
   }

package/{chunk-G4RRFNHY.js → chunk-GK6JL5NZ.js}

@@ -11,12 +11,7 @@ var store = {
 };
 var getCacheValue = async (context, cacheKey) => {
   const match = await context.cache.match(cacheKey);
-  if (!match) {
-    context.debug(`[${cacheKey.pathname}] Cache MISS!`);
-    return void 0;
-  }
-  context.debug(`[${cacheKey.pathname}] Cache MATCH!`);
-  return match;
+  return match ?? void 0;
 };
 var updateCacheValue = async (context, cacheKey, value, ttl) => {
   context.debug(
@@ -262,7 +257,7 @@ var APIError = class extends Error {
 var DEFAULT_API_HOSTNAME = "https://api.appwarden.io";
 var syncEdgeValue = async (context) => {
   const apiHostname = context.appwardenApiHostname ?? DEFAULT_API_HOSTNAME;
-  context.debug(`Fetching lock value from API: ${apiHostname}`);
+  context.debug(`GET ${apiHostname}`);
   try {
     const response = await fetch(new URL("/v1/status/check", apiHostname), {
       method: "POST",
@@ -289,10 +284,7 @@ var syncEdgeValue = async (context) => {
         const parsedValue = LockValue.omit({ lastCheck: true }).parse(
           result.content
         );
-        context.debug(
-          `API call to ${apiHostname} succeeded`,
-          `Lock status: ${parsedValue.isLocked ? "LOCKED" : "UNLOCKED"}`
-        );
+        context.debug(`GET ${apiHostname} succeeded`);
         await context.edgeCache.updateValue({
           ...parsedValue,
           lastCheck: Date.now()
@@ -302,7 +294,7 @@ var syncEdgeValue = async (context) => {
       }
     }
   } catch (e) {
-    const message = `API call to ${apiHostname} failed`;
+    const message = `GET ${apiHostname} failed`;
     console.error(
       printMessage(
         e instanceof APIError ? e.message : e instanceof Error ? `${message}: ${e.message}` : message

package/{chunk-U3T4R5KZ.js → chunk-MNGMTDH3.js}

@@ -1,7 +1,7 @@
 import {
   getErrors,
   printMessage
-} from "./chunk-G4RRFNHY.js";
+} from "./chunk-GK6JL5NZ.js";
 
 // src/utils/validate-config.ts
 function validateConfig(config, schema) {

package/cloudflare/astro.js

@@ -1,19 +1,22 @@
+import {
+  isResponseLike
+} from "../chunk-24CQJ54X.js";
 import {
   useContentSecurityPolicy
-} from "../chunk-YBWFEBZC.js";
+} from "../chunk-AXWJZE7U.js";
 import {
   validateConfig
-} from "../chunk-U3T4R5KZ.js";
+} from "../chunk-MNGMTDH3.js";
 import {
   checkLockStatus
-} from "../chunk-3MKVGKH7.js";
+} from "../chunk-G5FWKV2Q.js";
 import {
   TEMPORARY_REDIRECT_STATUS,
   buildLockPageUrl,
   createRedirect,
   debug,
   isOnLockPage
-} from "../chunk-QVRWMYGL.js";
+} from "../chunk-EPJ4ZVO6.js";
 import {
   UseCSPInputSchema,
   isHTMLRequest
@@ -22,7 +25,7 @@ import {
   AppwardenApiTokenSchema,
   BooleanSchema,
   printMessage
-} from "../chunk-G4RRFNHY.js";
+} from "../chunk-GK6JL5NZ.js";
 
 // src/schemas/astro-cloudflare.ts
 import { z } from "zod";
@@ -85,7 +88,7 @@ function createAppwardenMiddleware(configFn) {
       });
       if (result.isLocked) {
         const lockPageUrl = buildLockPageUrl(config.lockPageSlug, request.url);
-        debugFn(`Site is locked - redirecting to ${lockPageUrl.pathname}`);
+        debugFn(`Website is locked - redirecting to ${lockPageUrl.pathname}`);
         if (context.redirect) {
           return context.redirect(
             lockPageUrl.toString(),
@@ -94,9 +97,9 @@ function createAppwardenMiddleware(configFn) {
         }
         return createRedirect(lockPageUrl);
       }
-      debugFn("Site is unlocked to origin");
+      debugFn("Website is unlocked");
       const response = await next();
-      if (config.contentSecurityPolicy) {
+      if (config.contentSecurityPolicy && isResponseLike(response)) {
         debugFn("Applying CSP middleware");
         const cspContext = {
           request,
@@ -119,7 +122,7 @@ function createAppwardenMiddleware(configFn) {
       debugFn(`Middleware executed in ${elapsed}ms`);
       return response;
     } catch (error) {
-      if (error instanceof Response) {
+      if (isResponseLike(error)) {
         throw error;
       }
       console.error(

package/cloudflare/nextjs.js

@@ -1,15 +1,15 @@
 import {
   validateConfig
-} from "../chunk-U3T4R5KZ.js";
+} from "../chunk-MNGMTDH3.js";
 import {
   checkLockStatus
-} from "../chunk-3MKVGKH7.js";
+} from "../chunk-G5FWKV2Q.js";
 import {
   TEMPORARY_REDIRECT_STATUS,
   buildLockPageUrl,
   debug,
   isOnLockPage
-} from "../chunk-QVRWMYGL.js";
+} from "../chunk-EPJ4ZVO6.js";
 import {
   UseCSPInputSchema,
   isHTMLRequest
@@ -18,7 +18,7 @@ import {
   AppwardenApiTokenSchema,
   BooleanSchema,
   printMessage
-} from "../chunk-G4RRFNHY.js";
+} from "../chunk-GK6JL5NZ.js";
 
 // src/adapters/nextjs-cloudflare.ts
 import {
@@ -88,7 +88,7 @@ function createAppwardenMiddleware(configFn) {
       });
       if (result.isLocked) {
         const lockPageUrl = buildLockPageUrl(config.lockPageSlug, request.url);
-        debugFn(`Site is locked - redirecting to ${lockPageUrl.pathname}`);
+        debugFn(`Website is locked - redirecting to ${lockPageUrl.pathname}`);
         return NextResponse.redirect(lockPageUrl, TEMPORARY_REDIRECT_STATUS);
       }
       debugFn("Site is unlocked");
@@ -96,7 +96,7 @@ function createAppwardenMiddleware(configFn) {
         debugFn(
           `Applying CSP headers in ${config.contentSecurityPolicy.mode} mode`
         );
-        const { makeCSPHeader } = await import("../cloudflare-36BOGAYU.js");
+        const { makeCSPHeader } = await import("../cloudflare-K5EFFMNI.js");
         const [headerName, headerValue] = makeCSPHeader(
           "",
           config.contentSecurityPolicy.directives,

package/cloudflare/react-router.js

@@ -1,18 +1,21 @@
+import {
+  isResponseLike
+} from "../chunk-24CQJ54X.js";
 import {
   useContentSecurityPolicy
-} from "../chunk-YBWFEBZC.js";
+} from "../chunk-AXWJZE7U.js";
 import {
   validateConfig
-} from "../chunk-U3T4R5KZ.js";
+} from "../chunk-MNGMTDH3.js";
 import {
   checkLockStatus
-} from "../chunk-3MKVGKH7.js";
+} from "../chunk-G5FWKV2Q.js";
 import {
   buildLockPageUrl,
   createRedirect,
   debug,
   isOnLockPage
-} from "../chunk-QVRWMYGL.js";
+} from "../chunk-EPJ4ZVO6.js";
 import {
   UseCSPInputSchema,
   isHTMLRequest
@@ -21,7 +24,7 @@ import {
   AppwardenApiTokenSchema,
   BooleanSchema,
   printMessage
-} from "../chunk-G4RRFNHY.js";
+} from "../chunk-GK6JL5NZ.js";
 
 // src/schemas/react-router-cloudflare.ts
 import { z } from "zod";
@@ -101,12 +104,12 @@ function createAppwardenMiddleware(configFn) {
       });
       if (result.isLocked) {
         const lockPageUrl = buildLockPageUrl(config.lockPageSlug, request.url);
-        debugFn(`Site is locked - redirecting to ${lockPageUrl.pathname}`);
+        debugFn(`Website is locked - redirecting to ${lockPageUrl.pathname}`);
         throw createRedirect(lockPageUrl);
       }
-      debugFn("Site is unlocked to origin");
+      debugFn("Website is unlocked");
       const response = await next();
-      if (config.contentSecurityPolicy && response instanceof Response) {
+      if (config.contentSecurityPolicy && isResponseLike(response)) {
         debugFn("Applying CSP middleware");
         const cspContext = {
           request,
@@ -129,7 +132,7 @@ function createAppwardenMiddleware(configFn) {
       debugFn(`Middleware executed in ${elapsed}ms`);
       return response;
     } catch (error) {
-      if (error instanceof Response) {
+      if (isResponseLike(error)) {
         throw error;
       }
       console.error(

package/cloudflare/tanstack-start.js

@@ -1,18 +1,21 @@
+import {
+  isResponseLike
+} from "../chunk-24CQJ54X.js";
 import {
   useContentSecurityPolicy
-} from "../chunk-YBWFEBZC.js";
+} from "../chunk-AXWJZE7U.js";
 import {
   validateConfig
-} from "../chunk-U3T4R5KZ.js";
+} from "../chunk-MNGMTDH3.js";
 import {
   checkLockStatus
-} from "../chunk-3MKVGKH7.js";
+} from "../chunk-G5FWKV2Q.js";
 import {
   buildLockPageUrl,
   createRedirect,
   debug,
   isOnLockPage
-} from "../chunk-QVRWMYGL.js";
+} from "../chunk-EPJ4ZVO6.js";
 import {
   UseCSPInputSchema,
   isHTMLRequest
@@ -21,7 +24,7 @@ import {
   AppwardenApiTokenSchema,
   BooleanSchema,
   printMessage
-} from "../chunk-G4RRFNHY.js";
+} from "../chunk-GK6JL5NZ.js";
 
 // src/schemas/tanstack-start-cloudflare.ts
 import { z } from "zod";
@@ -86,12 +89,12 @@ function createAppwardenMiddleware(configFn) {
       });
       if (result.isLocked) {
         const lockPageUrl = buildLockPageUrl(config.lockPageSlug, request.url);
-        debugFn(`Site is locked - redirecting to ${lockPageUrl.pathname}`);
+        debugFn(`Website is locked - redirecting to ${lockPageUrl.pathname}`);
         throw createRedirect(lockPageUrl);
       }
-      debugFn("Site is unlocked to origin");
+      debugFn("Website is unlocked");
       const response = await next();
-      if (config.contentSecurityPolicy && response instanceof Response) {
+      if (config.contentSecurityPolicy && isResponseLike(response)) {
         debugFn("Applying CSP middleware");
         const cspContext = {
           request,
@@ -114,7 +117,7 @@ function createAppwardenMiddleware(configFn) {
       debugFn(`Middleware executed in ${elapsed}ms`);
       return response;
     } catch (error) {
-      if (error instanceof Response) {
+      if (isResponseLike(error)) {
         throw error;
       }
       console.error(

package/{cloudflare-36BOGAYU.js → cloudflare-K5EFFMNI.js}

@@ -11,7 +11,7 @@ import {
   makeCSPHeader,
   store,
   syncEdgeValue
-} from "./chunk-G4RRFNHY.js";
+} from "./chunk-GK6JL5NZ.js";
 export {
   CSP_KEYWORDS,
   autoQuoteCSPDirectiveArray,

package/cloudflare.js

@@ -1,15 +1,15 @@
 import {
   useContentSecurityPolicy
-} from "./chunk-YBWFEBZC.js";
+} from "./chunk-AXWJZE7U.js";
 import {
   checkLockStatus
-} from "./chunk-3MKVGKH7.js";
+} from "./chunk-G5FWKV2Q.js";
 import {
   buildLockPageUrl,
   createRedirect,
   debug,
   isOnLockPage
-} from "./chunk-QVRWMYGL.js";
+} from "./chunk-EPJ4ZVO6.js";
 import {
   APPWARDEN_CACHE_KEY,
   UseCSPInputSchema,
@@ -22,7 +22,7 @@ import {
   insertErrorLogs,
   printMessage,
   store
-} from "./chunk-G4RRFNHY.js";
+} from "./chunk-GK6JL5NZ.js";
 
 // src/runners/appwarden-on-cloudflare.ts
 import { ZodError } from "zod";

package/index.js

@@ -5,14 +5,14 @@ import {
 } from "./chunk-QEFORWCW.js";
 import {
   useContentSecurityPolicy
-} from "./chunk-YBWFEBZC.js";
+} from "./chunk-AXWJZE7U.js";
 import {
   APPWARDEN_CACHE_KEY,
   CSPDirectivesSchema,
   CSPModeSchema,
   LOCKDOWN_TEST_EXPIRY_MS
 } from "./chunk-HCGLR3Z3.js";
-import "./chunk-G4RRFNHY.js";
+import "./chunk-GK6JL5NZ.js";
 export {
   APPWARDEN_CACHE_KEY,
   CSPDirectivesSchema,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appwarden/middleware",
-  "version": "3.4.0",
+  "version": "3.4.2",
   "description": "Instantly shut off access your app deployed on Cloudflare or Vercel",
   "type": "module",
   "license": "MIT",
@@ -108,7 +108,8 @@
       "devalue@<=5.6.2": ">=5.6.3",
       "minimatch@<10.2.1": ">=10.2.1",
       "tar@<7.5.8": ">=7.5.8",
-      "ajv@>=7.0.0-alpha.0 <8.18.0": ">=8.18.0"
+      "ajv@>=7.0.0-alpha.0 <8.18.0": ">=8.18.0",
+      "rollup@>=4.0.0 <4.59.0": ">=4.59.0"
     }
   }
 }

package/vercel.js

@@ -4,14 +4,14 @@ import {
 } from "./chunk-QEFORWCW.js";
 import {
   validateConfig
-} from "./chunk-U3T4R5KZ.js";
+} from "./chunk-MNGMTDH3.js";
 import {
   MemoryCache,
   TEMPORARY_REDIRECT_STATUS,
   buildLockPageUrl,
   debug,
   isOnLockPage
-} from "./chunk-QVRWMYGL.js";
+} from "./chunk-EPJ4ZVO6.js";
 import {
   APPWARDEN_CACHE_KEY,
   CSPDirectivesSchema,
@@ -24,7 +24,7 @@ import {
   LockValue,
   makeCSPHeader,
   printMessage
-} from "./chunk-G4RRFNHY.js";
+} from "./chunk-GK6JL5NZ.js";
 
 // src/runners/appwarden-on-vercel.ts
 import { waitUntil } from "@vercel/functions";
@@ -296,7 +296,9 @@ function createAppwardenMiddleware(config) {
         provider
       })).lockValue;
       if (lockValue?.isLocked) {
-        debugFn("Site is locked - redirecting to lock page");
+        debugFn(
+          `Website is locked - redirecting to ${parsedConfig.lockPageSlug}`
+        );
         const lockPageUrl = buildLockPageUrl(
           parsedConfig.lockPageSlug,
           request.url