@appwarden/middleware 3.8.0 → 3.9.0

package/vercel.d.ts

@@ -6,9 +6,9 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
     vercelApiToken: z.ZodOptional<z.ZodString>;
     debug: z.ZodOptional<z.ZodBoolean>;
     lockPageSlug: z.ZodEffects<z.ZodDefault<z.ZodString>, string, string | undefined>;
-    contentSecurityPolicy: z.ZodOptional<z.ZodEffects<z.ZodObject<{
-        mode: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"disabled">, z.ZodLiteral<"report-only">, z.ZodLiteral<"enforced">]>>>;
-        directives: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodOptional<z.ZodLazy<z.ZodUnion<[z.ZodString, z.ZodObject<{
+    contentSecurityPolicy: z.ZodOptional<z.ZodObject<{
+        mode: z.ZodUnion<[z.ZodLiteral<"disabled">, z.ZodLiteral<"report-only">, z.ZodLiteral<"enforced">]>;
+        directives: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodLazy<z.ZodUnion<[z.ZodString, z.ZodObject<{
             "default-src": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
             "script-src": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
             "style-src": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
@@ -89,7 +89,7 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
             "upgrade-insecure-requests"?: string | boolean | string[] | undefined;
             "trusted-types"?: string | boolean | string[] | undefined;
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
-        }>]>>>, string | {
+        }>]>>, string | {
             "default-src"?: string | boolean | string[] | undefined;
             "script-src"?: string | boolean | string[] | undefined;
             "style-src"?: string | boolean | string[] | undefined;
@@ -116,7 +116,7 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
             "upgrade-insecure-requests"?: string | boolean | string[] | undefined;
             "trusted-types"?: string | boolean | string[] | undefined;
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
-        } | undefined, string | {
+        }, string | {
             "default-src"?: string | boolean | string[] | undefined;
             "script-src"?: string | boolean | string[] | undefined;
             "style-src"?: string | boolean | string[] | undefined;
@@ -143,7 +143,7 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
             "upgrade-insecure-requests"?: string | boolean | string[] | undefined;
             "trusted-types"?: string | boolean | string[] | undefined;
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
-        } | undefined>, string | {
+        }>, string | {
             "default-src"?: string | boolean | string[] | undefined;
             "script-src"?: string | boolean | string[] | undefined;
             "style-src"?: string | boolean | string[] | undefined;
@@ -170,7 +170,7 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
             "upgrade-insecure-requests"?: string | boolean | string[] | undefined;
             "trusted-types"?: string | boolean | string[] | undefined;
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
-        } | undefined, string | {
+        }, string | {
             "default-src"?: string | boolean | string[] | undefined;
             "script-src"?: string | boolean | string[] | undefined;
             "style-src"?: string | boolean | string[] | undefined;
@@ -197,7 +197,7 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
             "upgrade-insecure-requests"?: string | boolean | string[] | undefined;
             "trusted-types"?: string | boolean | string[] | undefined;
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
-        } | undefined>, {
+        }>, {
             "default-src"?: string | boolean | string[] | undefined;
             "script-src"?: string | boolean | string[] | undefined;
             "style-src"?: string | boolean | string[] | undefined;
@@ -251,7 +251,7 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
             "upgrade-insecure-requests"?: string | boolean | string[] | undefined;
             "trusted-types"?: string | boolean | string[] | undefined;
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
-        } | undefined>;
+        }>;
     }, "strip", z.ZodTypeAny, {
         mode: "disabled" | "report-only" | "enforced";
         directives?: {
@@ -283,38 +283,8 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
         } | undefined;
     }, {
-        mode?: "disabled" | "report-only" | "enforced" | undefined;
-        directives?: string | {
-            "default-src"?: string | boolean | string[] | undefined;
-            "script-src"?: string | boolean | string[] | undefined;
-            "style-src"?: string | boolean | string[] | undefined;
-            "img-src"?: string | boolean | string[] | undefined;
-            "connect-src"?: string | boolean | string[] | undefined;
-            "font-src"?: string | boolean | string[] | undefined;
-            "object-src"?: string | boolean | string[] | undefined;
-            "media-src"?: string | boolean | string[] | undefined;
-            "frame-src"?: string | boolean | string[] | undefined;
-            sandbox?: string | boolean | string[] | undefined;
-            "report-uri"?: string | boolean | string[] | undefined;
-            "child-src"?: string | boolean | string[] | undefined;
-            "form-action"?: string | boolean | string[] | undefined;
-            "frame-ancestors"?: string | boolean | string[] | undefined;
-            "plugin-types"?: string | boolean | string[] | undefined;
-            "base-uri"?: string | boolean | string[] | undefined;
-            "report-to"?: string | boolean | string[] | undefined;
-            "worker-src"?: string | boolean | string[] | undefined;
-            "manifest-src"?: string | boolean | string[] | undefined;
-            "prefetch-src"?: string | boolean | string[] | undefined;
-            "navigate-to"?: string | boolean | string[] | undefined;
-            "require-sri-for"?: string | boolean | string[] | undefined;
-            "block-all-mixed-content"?: string | boolean | string[] | undefined;
-            "upgrade-insecure-requests"?: string | boolean | string[] | undefined;
-            "trusted-types"?: string | boolean | string[] | undefined;
-            "require-trusted-types-for"?: string | boolean | string[] | undefined;
-        } | undefined;
-    }>, {
         mode: "disabled" | "report-only" | "enforced";
-        directives?: {
+        directives: string | {
             "default-src"?: string | boolean | string[] | undefined;
             "script-src"?: string | boolean | string[] | undefined;
             "style-src"?: string | boolean | string[] | undefined;
@@ -341,37 +311,7 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
             "upgrade-insecure-requests"?: string | boolean | string[] | undefined;
             "trusted-types"?: string | boolean | string[] | undefined;
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
-        } | undefined;
-    }, {
-        mode?: "disabled" | "report-only" | "enforced" | undefined;
-        directives?: string | {
-            "default-src"?: string | boolean | string[] | undefined;
-            "script-src"?: string | boolean | string[] | undefined;
-            "style-src"?: string | boolean | string[] | undefined;
-            "img-src"?: string | boolean | string[] | undefined;
-            "connect-src"?: string | boolean | string[] | undefined;
-            "font-src"?: string | boolean | string[] | undefined;
-            "object-src"?: string | boolean | string[] | undefined;
-            "media-src"?: string | boolean | string[] | undefined;
-            "frame-src"?: string | boolean | string[] | undefined;
-            sandbox?: string | boolean | string[] | undefined;
-            "report-uri"?: string | boolean | string[] | undefined;
-            "child-src"?: string | boolean | string[] | undefined;
-            "form-action"?: string | boolean | string[] | undefined;
-            "frame-ancestors"?: string | boolean | string[] | undefined;
-            "plugin-types"?: string | boolean | string[] | undefined;
-            "base-uri"?: string | boolean | string[] | undefined;
-            "report-to"?: string | boolean | string[] | undefined;
-            "worker-src"?: string | boolean | string[] | undefined;
-            "manifest-src"?: string | boolean | string[] | undefined;
-            "prefetch-src"?: string | boolean | string[] | undefined;
-            "navigate-to"?: string | boolean | string[] | undefined;
-            "require-sri-for"?: string | boolean | string[] | undefined;
-            "block-all-mixed-content"?: string | boolean | string[] | undefined;
-            "upgrade-insecure-requests"?: string | boolean | string[] | undefined;
-            "trusted-types"?: string | boolean | string[] | undefined;
-            "require-trusted-types-for"?: string | boolean | string[] | undefined;
-        } | undefined;
+        };
     }>>;
 }, "strip", z.ZodTypeAny, {
     lockPageSlug: string;
@@ -416,8 +356,8 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
     debug?: boolean | undefined;
     lockPageSlug?: string | undefined;
     contentSecurityPolicy?: {
-        mode?: "disabled" | "report-only" | "enforced" | undefined;
-        directives?: string | {
+        mode: "disabled" | "report-only" | "enforced";
+        directives: string | {
             "default-src"?: string | boolean | string[] | undefined;
             "script-src"?: string | boolean | string[] | undefined;
             "style-src"?: string | boolean | string[] | undefined;
@@ -444,7 +384,7 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
             "upgrade-insecure-requests"?: string | boolean | string[] | undefined;
             "trusted-types"?: string | boolean | string[] | undefined;
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
-        } | undefined;
+        };
     } | undefined;
     vercelApiToken?: string | undefined;
 }>, {
@@ -490,8 +430,8 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
     debug?: boolean | undefined;
     lockPageSlug?: string | undefined;
     contentSecurityPolicy?: {
-        mode?: "disabled" | "report-only" | "enforced" | undefined;
-        directives?: string | {
+        mode: "disabled" | "report-only" | "enforced";
+        directives: string | {
             "default-src"?: string | boolean | string[] | undefined;
             "script-src"?: string | boolean | string[] | undefined;
             "style-src"?: string | boolean | string[] | undefined;
@@ -518,7 +458,7 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
             "upgrade-insecure-requests"?: string | boolean | string[] | undefined;
             "trusted-types"?: string | boolean | string[] | undefined;
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
-        } | undefined;
+        };
     } | undefined;
     vercelApiToken?: string | undefined;
 }>, {
@@ -564,8 +504,8 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
     debug?: boolean | undefined;
     lockPageSlug?: string | undefined;
     contentSecurityPolicy?: {
-        mode?: "disabled" | "report-only" | "enforced" | undefined;
-        directives?: string | {
+        mode: "disabled" | "report-only" | "enforced";
+        directives: string | {
             "default-src"?: string | boolean | string[] | undefined;
             "script-src"?: string | boolean | string[] | undefined;
             "style-src"?: string | boolean | string[] | undefined;
@@ -592,7 +532,7 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
             "upgrade-insecure-requests"?: string | boolean | string[] | undefined;
             "trusted-types"?: string | boolean | string[] | undefined;
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
-        } | undefined;
+        };
     } | undefined;
     vercelApiToken?: string | undefined;
 }>, {
@@ -638,8 +578,8 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
     debug?: boolean | undefined;
     lockPageSlug?: string | undefined;
     contentSecurityPolicy?: {
-        mode?: "disabled" | "report-only" | "enforced" | undefined;
-        directives?: string | {
+        mode: "disabled" | "report-only" | "enforced";
+        directives: string | {
             "default-src"?: string | boolean | string[] | undefined;
             "script-src"?: string | boolean | string[] | undefined;
             "style-src"?: string | boolean | string[] | undefined;
@@ -666,7 +606,7 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
             "upgrade-insecure-requests"?: string | boolean | string[] | undefined;
             "trusted-types"?: string | boolean | string[] | undefined;
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
-        } | undefined;
+        };
     } | undefined;
     vercelApiToken?: string | undefined;
 }>, {
@@ -712,8 +652,8 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
     debug?: boolean | undefined;
     lockPageSlug?: string | undefined;
     contentSecurityPolicy?: {
-        mode?: "disabled" | "report-only" | "enforced" | undefined;
-        directives?: string | {
+        mode: "disabled" | "report-only" | "enforced";
+        directives: string | {
             "default-src"?: string | boolean | string[] | undefined;
             "script-src"?: string | boolean | string[] | undefined;
             "style-src"?: string | boolean | string[] | undefined;
@@ -740,7 +680,7 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
             "upgrade-insecure-requests"?: string | boolean | string[] | undefined;
             "trusted-types"?: string | boolean | string[] | undefined;
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
-        } | undefined;
+        };
     } | undefined;
     vercelApiToken?: string | undefined;
 }>;

package/vercel.js

@@ -2,16 +2,13 @@ import {
   isCacheUrl,
   isValidCacheUrl
 } from "./chunk-QEFORWCW.js";
-import {
-  validateConfig
-} from "./chunk-MNGMTDH3.js";
 import {
   MemoryCache,
   TEMPORARY_REDIRECT_STATUS,
   buildLockPageUrl,
   debug,
   isOnLockPage
-} from "./chunk-EPJ4ZVO6.js";
+} from "./chunk-Z7FIMIZS.js";
 import {
   APPWARDEN_CACHE_KEY,
   CSPDirectivesSchema,
@@ -19,12 +16,13 @@ import {
   errors,
   globalErrors,
   isHTMLRequest
-} from "./chunk-HCGLR3Z3.js";
+} from "./chunk-UIIYORBW.js";
 import {
   LockValue,
+  getErrors,
   makeCSPHeader,
   printMessage
-} from "./chunk-GK6JL5NZ.js";
+} from "./chunk-QGXPAVOA.js";
 
 // src/runners/appwarden-on-vercel.ts
 import { waitUntil } from "@vercel/functions";
@@ -40,8 +38,7 @@ var getLockValue = async (context) => {
     let serializedValue, lockValue = {
       isLocked: 0,
       isLockedTest: 0,
-      lastCheck: 0,
-      code: ""
+      lastCheck: 0
     };
     switch (context.provider) {
       case "edge-config": {
@@ -108,7 +105,7 @@ var APIError = class extends Error {
 var syncEdgeValue = async (context) => {
   context.debug("syncing with api");
   try {
-    const response = await fetch(new URL("/v1/status/check", "https://api.appwarden.io"), {
+    const response = await fetch(new URL("/v1/appwarden/status", "https://api.appwarden.io"), {
       method: "POST",
       headers: { "content-type": "application/json" },
       body: JSON.stringify({
@@ -138,10 +135,27 @@ var syncEdgeValue = async (context) => {
   }
 };
 
+// src/utils/validate-config.ts
+function validateConfig(config, schema) {
+  const result = schema.safeParse(config);
+  const hasErrors = !result.success;
+  if (hasErrors) {
+    const mappedErrors = getErrors(result.error);
+    if (mappedErrors.length > 0) {
+      for (const error of mappedErrors) {
+        console.error(printMessage(error));
+      }
+    } else {
+      console.error(printMessage(result.error.message));
+    }
+  }
+  return hasErrors;
+}
+
 // src/schemas/vercel.ts
 var VercelCSPSchema = z.object({
   mode: CSPModeSchema,
-  directives: z.lazy(() => CSPDirectivesSchema).optional().refine(
+  directives: z.lazy(() => CSPDirectivesSchema).refine(
     (val) => {
       try {
         if (typeof val === "string") {
@@ -155,7 +169,6 @@ var VercelCSPSchema = z.object({
     { message: "DirectivesBadParse" /* DirectivesBadParse */ }
   ).refine(
     (val) => {
-      if (!val) return true;
       const serialized = typeof val === "string" ? val : JSON.stringify(val);
       return !serialized.includes("{{nonce}}");
     },
@@ -165,10 +178,7 @@ var VercelCSPSchema = z.object({
   ).transform(
     (val) => typeof val === "string" ? JSON.parse(val) : val
   )
-}).refine(
-  (values) => ["report-only", "enforced"].includes(values.mode) ? !!values.directives : true,
-  { path: ["directives"], message: "DirectivesRequired" /* DirectivesRequired */ }
-);
+});
 var BaseNextJsConfigSchema = z.object({
   cacheUrl: z.string(),
   appwardenApiToken: z.string(),

package/chunk-MNGMTDH3.js

@@ -1,25 +0,0 @@
-import {
-  getErrors,
-  printMessage
-} from "./chunk-GK6JL5NZ.js";
-
-// src/utils/validate-config.ts
-function validateConfig(config, schema) {
-  const result = schema.safeParse(config);
-  const hasErrors = !result.success;
-  if (hasErrors) {
-    const mappedErrors = getErrors(result.error);
-    if (mappedErrors.length > 0) {
-      for (const error of mappedErrors) {
-        console.error(printMessage(error));
-      }
-    } else {
-      console.error(printMessage(result.error.message));
-    }
-  }
-  return hasErrors;
-}
-
-export {
-  validateConfig
-};

package/use-content-security-policy-Dvc-oObb.d.ts

@@ -1,17 +0,0 @@
-import { U as UseCSPInput } from './use-content-security-policy-DUYpyUPy.js';
-import { z } from 'zod';
-
-interface MiddlewareContext {
-    hostname: string;
-    request: Request;
-    response: Response;
-    waitUntil: ExecutionContext["waitUntil"];
-    debug: (...msg: any[]) => void;
-}
-type Middleware = (context: MiddlewareContext, next: () => MiddlewareNextSchemaType) => MiddlewareNextSchemaType;
-declare const MiddlewareNextSchema: z.ZodUnion<[z.ZodVoid, z.ZodNull, z.ZodPromise<z.ZodUnion<[z.ZodVoid, z.ZodNull]>>]>;
-type MiddlewareNextSchemaType = z.infer<typeof MiddlewareNextSchema>;
-
-declare const useContentSecurityPolicy: (input: UseCSPInput) => Middleware;
-
-export { type Middleware as M, useContentSecurityPolicy as u };