@appwarden/middleware 3.11.5 → 3.12.0

package/vercel.js

@@ -2,30 +2,35 @@ import {
   isCacheUrl,
   isValidCacheUrl
 } from "./chunk-QEFORWCW.js";
+import {
+  getErrors
+} from "./chunk-NV7K5PRA.js";
+import {
+  toNextResponse
+} from "./chunk-HUWGPM4M.js";
 import {
   MemoryCache,
   TEMPORARY_REDIRECT_STATUS,
   buildLockPageUrl,
   debug,
+  handleHeartbeatRequest,
   isHTMLRequest,
-  isOnLockPage
-} from "./chunk-AY4ZKZTF.js";
+  isHeartbeatRequest,
+  isOnLockPage,
+  makeCSPHeader,
+  printMessage,
+  sanitizeConfigErrors
+} from "./chunk-HTSD4WPC.js";
 import {
   APPWARDEN_CACHE_KEY,
+  AppwardenApiHostnameSchema,
   CSPDirectivesSchema,
   CSPModeSchema,
+  HEARTBEAT_SERVICES,
+  LockValue,
   errors,
   globalErrors
-} from "./chunk-ZTVJBORU.js";
-import {
-  getErrors,
-  makeCSPHeader,
-  printMessage
-} from "./chunk-R7TXTHSG.js";
-import {
-  AppwardenApiHostnameSchema,
-  LockValue
-} from "./chunk-WEM7GS4M.js";
+} from "./chunk-Z7P4QVEY.js";
 
 // src/runners/appwarden-on-vercel.ts
 import { waitUntil } from "@vercel/functions";
@@ -250,6 +255,17 @@ function safeWaitUntil(promise) {
 }
 function createAppwardenMiddleware(config) {
   return async (request) => {
+    const requestUrl = new URL(request.url);
+    if (isHeartbeatRequest(request, requestUrl)) {
+      const validationResult = AppwardenConfigSchema.safeParse(config);
+      const configErrors = validationResult.success ? [] : sanitizeConfigErrors(validationResult.error);
+      const response = handleHeartbeatRequest(
+        request,
+        HEARTBEAT_SERVICES.VERCEL,
+        configErrors
+      );
+      return toNextResponse(response);
+    }
     if (validateConfig(config, AppwardenConfigSchema)) {
       return NextResponse.next();
     }
@@ -267,8 +283,15 @@ function createAppwardenMiddleware(config) {
       }
       return response;
     };
+    const createMutableRedirectResponse = (location) => {
+      return new Response(null, {
+        status: TEMPORARY_REDIRECT_STATUS,
+        headers: {
+          Location: location
+        }
+      });
+    };
     try {
-      const requestUrl = new URL(request.url);
       const isHTML = isHTMLRequest(request);
       debugFn(
         `Appwarden middleware invoked for ${requestUrl.pathname}`,
@@ -319,9 +342,8 @@ function createAppwardenMiddleware(config) {
           parsedConfig.lockPageSlug,
           request.url
         );
-        const redirectResponse = Response.redirect(
-          lockPageUrl.toString(),
-          TEMPORARY_REDIRECT_STATUS
+        const redirectResponse = createMutableRedirectResponse(
+          lockPageUrl.toString()
         );
         return applyCspHeaders(redirectResponse);
       }

package/chunk-AY4ZKZTF.js

@@ -1,162 +0,0 @@
-import {
-  LOCKDOWN_TEST_EXPIRY_MS
-} from "./chunk-ZTVJBORU.js";
-import {
-  printMessage
-} from "./chunk-R7TXTHSG.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/create-redirect.ts
-var TEMPORARY_REDIRECT_STATUS = 302;
-var createRedirect = (url) => {
-  return new Response(null, {
-    status: TEMPORARY_REDIRECT_STATUS,
-    headers: {
-      Location: url.toString()
-    }
-  });
-};
-
-// src/utils/debug.ts
-var debug = (isDebug) => (...msg) => {
-  if (!isDebug) return;
-  const parts = msg.map((m) => {
-    let content;
-    if (m instanceof Error) {
-      content = m.stack ?? m.message;
-    } else if (typeof m === "object" && m !== null) {
-      try {
-        content = JSON.stringify(m);
-      } catch {
-        try {
-          content = String(m);
-        } catch {
-          content = "[Unserializable value]";
-        }
-      }
-    } else {
-      content = String(m);
-    }
-    return content;
-  });
-  const message = parts.join(" ");
-  console.log(printMessage(message));
-};
-
-// src/utils/memory-cache.ts
-var MemoryCache = class {
-  cache = /* @__PURE__ */ new Map();
-  maxSize;
-  constructor(options) {
-    this.maxSize = options.maxSize;
-  }
-  get(key) {
-    let item;
-    if (this.cache.has(key)) {
-      item = this.cache.get(key);
-      this.cache.delete(key);
-      if (item !== void 0) {
-        this.cache.set(key, item);
-      }
-    }
-    return item;
-  }
-  put(key, value) {
-    if (this.cache.has(key)) {
-      this.cache.delete(key);
-    } else if (this.cache.size >= this.maxSize) {
-      const firstKey = this.cache.keys().next().value;
-      if (firstKey !== void 0) {
-        this.cache.delete(firstKey);
-      }
-    }
-    this.cache.set(key, value);
-  }
-  getValues() {
-    return this.cache;
-  }
-  // the default value will be expired here
-  static isExpired = (lockValue) => {
-    if (!lockValue) {
-      return true;
-    }
-    return Date.now() > lockValue.lastCheck + 3e4;
-  };
-  static isTestExpired = (lockValue) => {
-    if (!lockValue) {
-      return true;
-    }
-    return Date.now() > lockValue.isLockedTest + LOCKDOWN_TEST_EXPIRY_MS;
-  };
-};
-
-// src/utils/request-checks.ts
-function isHTMLResponse(response) {
-  return response.headers.get("Content-Type")?.includes("text/html") ?? false;
-}
-function isHTMLRequest(request) {
-  const accept = request.headers.get("accept");
-  if (!accept) {
-    return false;
-  }
-  const normalizedAccept = accept.toLowerCase();
-  const isWildcardOnlyAccept = (value) => {
-    const mediaRanges2 = value.split(",");
-    let hasNonEmptyRange = false;
-    for (const range of mediaRanges2) {
-      const [typeSubtype] = range.split(";");
-      const trimmed = typeSubtype.trim();
-      if (!trimmed) {
-        continue;
-      }
-      hasNonEmptyRange = true;
-      if (trimmed !== "*/*" && trimmed !== "*") {
-        return false;
-      }
-    }
-    return hasNonEmptyRange;
-  };
-  if (isWildcardOnlyAccept(normalizedAccept)) {
-    return false;
-  }
-  const mediaRanges = normalizedAccept.split(",");
-  for (const range of mediaRanges) {
-    const [typeSubtype] = range.split(";");
-    const token = typeSubtype.trim();
-    if (token === "text/html") {
-      return true;
-    }
-  }
-  return false;
-}
-
-export {
-  buildLockPageUrl,
-  isOnLockPage,
-  TEMPORARY_REDIRECT_STATUS,
-  createRedirect,
-  debug,
-  MemoryCache,
-  isHTMLResponse,
-  isHTMLRequest
-};

package/chunk-QC2ZUZWY.js

@@ -1,84 +0,0 @@
-import {
-  MemoryCache,
-  debug
-} from "./chunk-AY4ZKZTF.js";
-import {
-  APPWARDEN_CACHE_KEY,
-  APPWARDEN_TEST_ROUTE
-} from "./chunk-ZTVJBORU.js";
-import {
-  deleteEdgeValue,
-  getLockValue,
-  store,
-  syncEdgeValue
-} from "./chunk-R7TXTHSG.js";
-
-// src/core/check-lock-status.ts
-var createContext = async (config) => {
-  const requestUrl = new URL(config.request.url);
-  const keyName = APPWARDEN_CACHE_KEY;
-  const provider = "cloudflare-cache";
-  const debugFn = debug(config.debug ?? false);
-  const edgeCache = store.json(
-    {
-      serviceOrigin: requestUrl.origin,
-      cache: await caches.open("appwarden:lock"),
-      debug: debugFn
-    },
-    keyName
-  );
-  return {
-    keyName,
-    request: config.request,
-    edgeCache,
-    requestUrl,
-    provider,
-    debug: debugFn,
-    lockPageSlug: config.lockPageSlug,
-    appwardenApiToken: config.appwardenApiToken,
-    appwardenApiHostname: config.appwardenApiHostname,
-    waitUntil: config.waitUntil
-  };
-};
-var resolveLockStatus = async (context) => {
-  const { lockValue, shouldDeleteEdgeValue } = await getLockValue(context);
-  if (shouldDeleteEdgeValue) {
-    context.debug("Deleting corrupted cache value");
-    await deleteEdgeValue(context);
-  }
-  const isTestRoute = context.requestUrl.pathname === APPWARDEN_TEST_ROUTE;
-  const isTestLock = isTestRoute && !MemoryCache.isTestExpired(lockValue) && !!lockValue;
-  return {
-    isLocked: !!lockValue?.isLocked || isTestLock,
-    isTestLock,
-    lockValue,
-    wasDeleted: shouldDeleteEdgeValue ?? false
-  };
-};
-var checkLockStatus = async (config) => {
-  const context = await createContext(config);
-  let { isLocked, isTestLock, lockValue, wasDeleted } = await resolveLockStatus(context);
-  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(
-        "No fresh cached lock status available - syncing with API synchronously"
-      );
-      await syncEdgeValue(context);
-      ({ isLocked, isTestLock } = await resolveLockStatus(context));
-    } else {
-      context.debug(
-        "Cached lock status expired but last known state unlocked - syncing with API in background"
-      );
-      config.waitUntil(syncEdgeValue(context));
-    }
-  }
-  return { isLocked, isTestLock };
-};
-
-export {
-  checkLockStatus
-};

package/chunk-WEM7GS4M.js

@@ -1,29 +0,0 @@
-// src/schemas/helpers.ts
-import { z } from "zod";
-var BoolOrStringSchema = z.union([z.string(), z.boolean()]).optional();
-var BooleanSchema = BoolOrStringSchema.transform((val) => {
-  if (val === "true" || val === true) {
-    return true;
-  } else if (val === "false" || val === false) {
-    return false;
-  }
-  throw new Error("Invalid value");
-});
-var AppwardenApiTokenSchema = z.string().refine((val) => !!val, { message: "appwardenApiToken is required" });
-var AppwardenApiHostnameSchema = z.string().url({
-  message: "Invalid `appwardenApiHostname`. Please provide an absolute URL (e.g. https://api.appwarden.io)."
-}).refine((value) => value.startsWith("https://"), {
-  message: "`appwardenApiHostname` must use the https:// scheme (e.g. https://api.appwarden.io)."
-});
-var LockValue = z.object({
-  isLocked: z.number(),
-  isLockedTest: z.number(),
-  lastCheck: z.number()
-});
-
-export {
-  BooleanSchema,
-  AppwardenApiTokenSchema,
-  AppwardenApiHostnameSchema,
-  LockValue
-};

package/chunk-X7WZVYQS.js

@@ -1,6 +0,0 @@
-// src/utils/get-now.ts
-var getNowMs = () => typeof performance !== "undefined" && typeof performance.now === "function" ? performance.now() : Date.now();
-
-export {
-  getNowMs
-};

package/cloudflare-MAHYENA6.js

@@ -1,29 +0,0 @@
-import {
-  CSP_KEYWORDS,
-  autoQuoteCSPDirectiveArray,
-  autoQuoteCSPDirectiveValue,
-  autoQuoteCSPKeyword,
-  deleteEdgeValue,
-  getLockValue,
-  insertErrorLogs,
-  isCSPKeyword,
-  isQuoted,
-  makeCSPHeader,
-  store,
-  syncEdgeValue
-} from "./chunk-R7TXTHSG.js";
-import "./chunk-WEM7GS4M.js";
-export {
-  CSP_KEYWORDS,
-  autoQuoteCSPDirectiveArray,
-  autoQuoteCSPDirectiveValue,
-  autoQuoteCSPKeyword,
-  deleteEdgeValue,
-  getLockValue,
-  insertErrorLogs,
-  isCSPKeyword,
-  isQuoted,
-  makeCSPHeader,
-  store,
-  syncEdgeValue
-};