@appwarden/middleware 3.13.1 → 3.13.3

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

package/{chunk-QM56445N.js → chunk-2ZF7A6Z3.js}

@@ -1,6 +1,6 @@
 import {
   useContentSecurityPolicy
-} from "./chunk-Q5LVKCWK.js";
+} from "./chunk-HZRLFCGV.js";
 
 // src/utils/apply-content-security-policy-to-response.ts
 var applyContentSecurityPolicyToResponse = async ({

package/{chunk-Q5LVKCWK.js → chunk-HZRLFCGV.js}

@@ -1,7 +1,7 @@
 import {
   isHTMLResponse,
   makeCSPHeader
-} from "./chunk-U7E4KM2B.js";
+} from "./chunk-PSOS33UD.js";
 import {
   UseCSPInputSchema
 } from "./chunk-OIEAURS7.js";

package/{chunk-U7E4KM2B.js → chunk-PSOS33UD.js}

@@ -122,7 +122,7 @@ var MemoryCache = class {
 };
 
 // src/version.ts
-var MIDDLEWARE_VERSION = "3.13.0";
+var MIDDLEWARE_VERSION = "3.13.2";
 
 // src/utils/heartbeat.ts
 var DEFAULT_HEARTBEAT_CONFIG_ERROR_CODE = "custom";
@@ -130,23 +130,66 @@ var DEFAULT_HEARTBEAT_CONFIG_ERROR_MESSAGE = "Appwarden configuration validation
 var HEARTBEAT_CONSTRUCTION_FAILURE_BODY = JSON.stringify({
   error: "appwarden_heartbeat_construction_failed"
 });
-function createSanitizedMessage(code, path) {
+function getExpectedType(issue) {
+  if ("expected" in issue && typeof issue.expected === "string") {
+    return issue.expected;
+  }
+  if (issue.code === "invalid_union" && "unionErrors" in issue && Array.isArray(issue.unionErrors) && issue.unionErrors.length > 0) {
+    const literalValues = [];
+    let allAreLiterals = true;
+    for (const unionError of issue.unionErrors) {
+      if (unionError && "issues" in unionError && Array.isArray(unionError.issues) && unionError.issues.length > 0) {
+        const firstIssue = unionError.issues[0];
+        if (firstIssue.code === "invalid_literal" && "expected" in firstIssue) {
+          literalValues.push(String(firstIssue.expected));
+        } else {
+          allAreLiterals = false;
+          break;
+        }
+      }
+    }
+    if (allAreLiterals && literalValues.length > 0) {
+      return literalValues.join(" | ");
+    }
+    const expectedTypes = /* @__PURE__ */ new Set();
+    for (const unionError of issue.unionErrors) {
+      if (unionError && "issues" in unionError && Array.isArray(unionError.issues) && unionError.issues.length > 0) {
+        const firstIssue = unionError.issues[0];
+        if (typeof firstIssue.expected === "string") {
+          expectedTypes.add(firstIssue.expected);
+        }
+      }
+    }
+    if (expectedTypes.size > 0) {
+      return Array.from(expectedTypes).join(" | ");
+    }
+  }
+  return void 0;
+}
+function createSanitizedMessage(issue, path) {
   const fieldName = path.length > 0 ? path[path.length - 1] : "field";
+  const code = issue.code;
   switch (code) {
-    case "invalid_type":
-      return `Invalid type for ${fieldName}`;
+    case "invalid_type": {
+      const expectedType = getExpectedType(issue);
+      return expectedType ? `Invalid type for ${fieldName}. Expected ${expectedType}` : `Invalid type for ${fieldName}`;
+    }
     case "invalid_literal":
       return `Invalid value for ${fieldName}`;
     case "unrecognized_keys":
       return `Unrecognized keys in ${fieldName}`;
-    case "invalid_union":
-      return `Invalid union value for ${fieldName}`;
+    case "invalid_union": {
+      const expectedType = getExpectedType(issue);
+      return expectedType ? `Invalid type for ${fieldName}. Expected ${expectedType}` : `Invalid union value for ${fieldName}`;
+    }
     case "invalid_enum_value":
       return `Invalid enum value for ${fieldName}`;
     case "invalid_arguments":
       return `Invalid arguments for ${fieldName}`;
-    case "invalid_return_type":
-      return `Invalid return type for ${fieldName}`;
+    case "invalid_return_type": {
+      const expectedType = getExpectedType(issue);
+      return expectedType ? `Invalid return type for ${fieldName}. Expected ${expectedType}` : `Invalid return type for ${fieldName}`;
+    }
     case "invalid_date":
       return `Invalid date for ${fieldName}`;
     case "invalid_string":
@@ -251,7 +294,7 @@ function sanitizeConfigErrors(error) {
   for (const issue of issues) {
     const sanitizedPath = sanitizePath(issue.path);
     const message = truncateMessage(
-      createSanitizedMessage(issue.code, sanitizedPath)
+      createSanitizedMessage(issue, sanitizedPath)
     );
     errors.push({
       path: sanitizedPath,

package/{chunk-CVOSFBOE.js → chunk-X2TEREDD.js}

@@ -2,7 +2,7 @@ import {
   MemoryCache,
   debug,
   printMessage
-} from "./chunk-U7E4KM2B.js";
+} from "./chunk-PSOS33UD.js";
 import {
   APPWARDEN_CACHE_KEY,
   APPWARDEN_TEST_ROUTE,
@@ -21,7 +21,8 @@ var store = {
   }
 };
 var getCacheValue = async (context, cacheKey) => {
-  const match = await context.cache.match(cacheKey);
+  const request = new Request(cacheKey.href);
+  const match = await context.cache.match(request);
   return match ?? void 0;
 };
 var updateCacheValue = async (context, cacheKey, value, ttl) => {
@@ -31,19 +32,21 @@ var updateCacheValue = async (context, cacheKey, value, ttl) => {
     value,
     ttl ? `expires in ${ttl}s` : ""
   );
-  await context.cache.put(
-    cacheKey,
-    new Response(JSON.stringify(value), {
-      headers: {
-        "content-type": "application/json",
-        ...ttl && {
-          "cache-control": `max-age=${ttl}`
-        }
+  const response = new Response(JSON.stringify(value), {
+    headers: {
+      "content-type": "application/json",
+      ...ttl && {
+        "cache-control": `max-age=${ttl}`
       }
-    })
-  );
+    }
+  });
+  const request = new Request(cacheKey.href, { method: "GET" });
+  await context.cache.put(request, response);
+};
+var clearCache = (context, cacheKey) => {
+  const request = new Request(cacheKey.href);
+  return context.cache.delete(request);
 };
-var clearCache = (context, cacheKey) => context.cache.delete(cacheKey);
 
 // src/utils/cloudflare/delete-edge-value.ts
 var deleteEdgeValue = async (context) => {
@@ -132,6 +135,13 @@ var syncEdgeValue = async (context) => {
         appwardenApiToken: context.appwardenApiToken
       })
     });
+    if (response.status === 403) {
+      console.log(
+        printMessage(
+          "Verifying domain ownership...this will only take a few minutes."
+        )
+      );
+    }
     if (response.status !== 200) {
       throw new Error(`${response.status} ${response.statusText}`);
     }
@@ -176,7 +186,8 @@ var createContext = async (config) => {
     {
       serviceOrigin: requestUrl.origin,
       cache: await caches.open("appwarden:lock"),
-      debug: debugFn
+      debug: debugFn,
+      waitUntil: config.waitUntil
     },
     keyName
   );

package/cloudflare/astro.js

@@ -1,15 +1,15 @@
 import {
   applyContentSecurityPolicyToResponse,
   isResponseLike
-} from "../chunk-QM56445N.js";
-import "../chunk-Q5LVKCWK.js";
+} from "../chunk-2ZF7A6Z3.js";
+import "../chunk-HZRLFCGV.js";
 import {
   getNowMs,
   logElapsed
 } from "../chunk-G6BMPIYD.js";
 import {
   checkLockStatus
-} from "../chunk-CVOSFBOE.js";
+} from "../chunk-X2TEREDD.js";
 import {
   TEMPORARY_REDIRECT_STATUS,
   buildLockPageUrl,
@@ -22,7 +22,7 @@ import {
   isOnLockPage,
   printMessage,
   sanitizeConfigErrors
-} from "../chunk-U7E4KM2B.js";
+} from "../chunk-PSOS33UD.js";
 import {
   AppwardenApiHostnameSchema,
   AppwardenApiTokenSchema,

package/cloudflare/nextjs.js

@@ -7,7 +7,7 @@ import {
 } from "../chunk-G6BMPIYD.js";
 import {
   checkLockStatus
-} from "../chunk-CVOSFBOE.js";
+} from "../chunk-X2TEREDD.js";
 import {
   TEMPORARY_REDIRECT_STATUS,
   buildLockPageUrl,
@@ -20,7 +20,7 @@ import {
   makeCSPHeader,
   printMessage,
   sanitizeConfigErrors
-} from "../chunk-U7E4KM2B.js";
+} from "../chunk-PSOS33UD.js";
 import {
   AppwardenApiHostnameSchema,
   AppwardenApiTokenSchema,

package/cloudflare/react-router.js

@@ -1,15 +1,15 @@
 import {
   applyContentSecurityPolicyToResponse,
   isResponseLike
-} from "../chunk-QM56445N.js";
-import "../chunk-Q5LVKCWK.js";
+} from "../chunk-2ZF7A6Z3.js";
+import "../chunk-HZRLFCGV.js";
 import {
   getNowMs,
   logElapsed
 } from "../chunk-G6BMPIYD.js";
 import {
   checkLockStatus
-} from "../chunk-CVOSFBOE.js";
+} from "../chunk-X2TEREDD.js";
 import {
   buildLockPageUrl,
   createHeartbeatConfigError,
@@ -21,7 +21,7 @@ import {
   isOnLockPage,
   printMessage,
   sanitizeConfigErrors
-} from "../chunk-U7E4KM2B.js";
+} from "../chunk-PSOS33UD.js";
 import {
   AppwardenApiHostnameSchema,
   AppwardenApiTokenSchema,

package/cloudflare/tanstack-start.js

@@ -1,15 +1,15 @@
 import {
   applyContentSecurityPolicyToResponse,
   isResponseLike
-} from "../chunk-QM56445N.js";
-import "../chunk-Q5LVKCWK.js";
+} from "../chunk-2ZF7A6Z3.js";
+import "../chunk-HZRLFCGV.js";
 import {
   getNowMs,
   logElapsed
 } from "../chunk-G6BMPIYD.js";
 import {
   checkLockStatus
-} from "../chunk-CVOSFBOE.js";
+} from "../chunk-X2TEREDD.js";
 import {
   buildLockPageUrl,
   createHeartbeatConfigError,
@@ -21,7 +21,7 @@ import {
   isOnLockPage,
   printMessage,
   sanitizeConfigErrors
-} from "../chunk-U7E4KM2B.js";
+} from "../chunk-PSOS33UD.js";
 import {
   AppwardenApiHostnameSchema,
   AppwardenApiTokenSchema,

package/cloudflare.d.ts

@@ -1,5 +1,5 @@
-import { R as RequestContext, U as UseCSPInput, M as Middleware, B as Bindings } from './use-content-security-policy-Dwdcwp33.js';
 import { z } from 'zod';
+import { R as RequestContext, U as UseCSPInput, M as Middleware, B as Bindings } from './use-content-security-policy-Dwdcwp33.js';
 
 declare const ConfigFnInputSchema: z.ZodFunction<z.ZodTuple<[z.ZodType<RequestContext, z.ZodTypeDef, RequestContext>], z.ZodUnknown>, z.ZodLazy<z.ZodEffects<z.ZodObject<{
     debug: z.ZodDefault<z.ZodEffects<z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodBoolean]>>, boolean, string | boolean | undefined>>;

package/cloudflare.js

@@ -7,10 +7,10 @@ import {
 } from "./chunk-NV7K5PRA.js";
 import {
   useContentSecurityPolicy
-} from "./chunk-Q5LVKCWK.js";
+} from "./chunk-HZRLFCGV.js";
 import {
   checkLockStatus
-} from "./chunk-CVOSFBOE.js";
+} from "./chunk-X2TEREDD.js";
 import {
   buildLockPageUrl,
   createHeartbeatConfigError,
@@ -22,7 +22,7 @@ import {
   isOnLockPage,
   printMessage,
   sanitizeConfigErrors
-} from "./chunk-U7E4KM2B.js";
+} from "./chunk-PSOS33UD.js";
 import {
   HEARTBEAT_SERVICES
 } from "./chunk-OIEAURS7.js";

package/index.d.ts

@@ -61,13 +61,13 @@ declare const HeartbeatConfigErrorSchema: z.ZodObject<{
     code: z.ZodString;
     message: z.ZodString;
 }, "strict", z.ZodTypeAny, {
-    message: string;
     code: string;
     path: (string | number)[];
-}, {
     message: string;
+}, {
     code: string;
     path: (string | number)[];
+    message: string;
 }>;
 type HeartbeatConfigError = z.infer<typeof HeartbeatConfigErrorSchema>;
 /**
@@ -85,21 +85,21 @@ declare const HeartbeatResponseBodySchema: z.ZodEffects<z.ZodObject<{
         code: z.ZodString;
         message: z.ZodString;
     }, "strict", z.ZodTypeAny, {
-        message: string;
         code: string;
         path: (string | number)[];
-    }, {
         message: string;
+    }, {
         code: string;
         path: (string | number)[];
-    }>, "many">, {
         message: string;
+    }>, "many">, {
         code: string;
         path: (string | number)[];
-    }[], {
         message: string;
+    }[], {
         code: string;
         path: (string | number)[];
+        message: string;
     }[]>;
 }, "strict", z.ZodTypeAny, {
     status: "ok";
@@ -109,9 +109,9 @@ declare const HeartbeatResponseBodySchema: z.ZodEffects<z.ZodObject<{
     service: "cloudflare" | "cloudflare-astro" | "cloudflare-react-router" | "cloudflare-tanstack-start" | "cloudflare-nextjs" | "vercel";
     version: string;
     configErrors: {
-        message: string;
         code: string;
         path: (string | number)[];
+        message: string;
     }[];
 }, {
     status: "ok";
@@ -121,9 +121,9 @@ declare const HeartbeatResponseBodySchema: z.ZodEffects<z.ZodObject<{
     service: "cloudflare" | "cloudflare-astro" | "cloudflare-react-router" | "cloudflare-tanstack-start" | "cloudflare-nextjs" | "vercel";
     version: string;
     configErrors: {
-        message: string;
         code: string;
         path: (string | number)[];
+        message: string;
     }[];
 }>, {
     status: "ok";
@@ -133,9 +133,9 @@ declare const HeartbeatResponseBodySchema: z.ZodEffects<z.ZodObject<{
     service: "cloudflare" | "cloudflare-astro" | "cloudflare-react-router" | "cloudflare-tanstack-start" | "cloudflare-nextjs" | "vercel";
     version: string;
     configErrors: {
-        message: string;
         code: string;
         path: (string | number)[];
+        message: string;
     }[];
 }, {
     status: "ok";
@@ -145,9 +145,9 @@ declare const HeartbeatResponseBodySchema: z.ZodEffects<z.ZodObject<{
     service: "cloudflare" | "cloudflare-astro" | "cloudflare-react-router" | "cloudflare-tanstack-start" | "cloudflare-nextjs" | "vercel";
     version: string;
     configErrors: {
-        message: string;
         code: string;
         path: (string | number)[];
+        message: string;
     }[];
 }>;
 type HeartbeatResponseBody = z.infer<typeof HeartbeatResponseBodySchema>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appwarden/middleware",
-  "version": "3.13.1",
+  "version": "3.13.3",
   "description": "Instantly disable all user interaction with your app deployed on Cloudflare or Vercel",
   "type": "module",
   "license": "MIT",
@@ -58,7 +58,7 @@
     "node": ">=24"
   },
   "dependencies": {
-    "@upstash/redis": "^1.36.4",
+    "@upstash/redis": "^1.37.0",
     "@vercel/edge-config": "^1.4.3",
     "zod": "^3.25.76"
   },
@@ -97,28 +97,32 @@
   },
   "pnpm": {
     "overrides": {
+      "@isaacs/brace-expansion@<=5.0.0": ">=5.0.1",
+      "@opennextjs/cloudflare@<1.17.1": ">=1.17.1",
+      "@smithy/config-resolver@<4.4.0": ">=4.4.0",
+      "ajv@>=7.0.0-alpha.0 <8.18.0": ">=8.18.0",
+      "body-parser@>=2.2.0 <2.2.1": ">=2.2.1",
       "cookie@<0.7.0": ">=0.7.0",
+      "devalue@<5.6.4": ">=5.6.4",
       "esbuild@<=0.24.2": ">=0.25.0",
-      "path-to-regexp@>=4.0.0 <6.3.0": ">=6.3.0",
-      "undici@<6.23.0": ">=6.23.0",
-      "body-parser@>=2.2.0 <2.2.1": ">=2.2.1",
+      "fast-xml-parser@>=4.0.0-beta.3 <=5.5.5": ">=5.5.6",
+      "h3@<1.15.6": ">=1.15.6",
+      "h3@>=2.0.0 <=2.0.1-rc.14": ">=2.0.1-rc.15",
+      "js-yaml@<3.14.2": ">=3.14.2",
       "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",
+      "minimatch@<10.2.1": ">=10.2.3",
+      "next@>=10.0.0 <16.1.7": ">=16.1.7",
       "npm@<=11.8.0": ">=11.9.0",
-      "wrangler@>=4.0.0 <4.59.1": ">=4.59.1",
+      "path-to-regexp@>=4.0.0 <6.3.0": ">=6.3.0",
+      "picomatch@<4.0.4": ">=4.0.4",
       "qs@>=6.7.0 <=6.14.1": ">=6.14.2",
-      "devalue@<=5.6.2": ">=5.6.3",
-      "minimatch@<10.2.1": ">=10.2.3",
-      "ajv@>=7.0.0-alpha.0 <8.18.0": ">=8.18.0",
       "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",
       "serialize-javascript@<=7.0.2": ">=7.0.3",
       "svgo@=4.0.0": ">=4.0.1",
-      "@opennextjs/cloudflare@<1.17.1": ">=1.17.1",
-      "tar@<=7.5.10": ">=7.5.11"
+      "tar@<=7.5.10": ">=7.5.11",
+      "undici@<7.24.0": ">=7.24.0",
+      "wrangler@>=4.0.0 <4.59.1": ">=4.59.1",
+      "@tanstack/start-server-core@1.163.2>h3-v2": "npm:h3@2.0.1-rc.16"
     }
   }
 }

package/vercel.js

@@ -20,7 +20,7 @@ import {
   makeCSPHeader,
   printMessage,
   sanitizeConfigErrors
-} from "./chunk-U7E4KM2B.js";
+} from "./chunk-PSOS33UD.js";
 import {
   APPWARDEN_CACHE_KEY,
   AppwardenApiHostnameSchema,
@@ -125,6 +125,13 @@ var syncEdgeValue = async (context) => {
         appwardenApiToken: context.appwardenApiToken
       })
     });
+    if (response.status === 403) {
+      console.log(
+        printMessage(
+          "Verifying domain ownership...this will only take a few minutes."
+        )
+      );
+    }
     if (response.status !== 200) {
       throw new Error(`${response.status} ${response.statusText}`);
     }