@appwarden/middleware 3.14.1 → 3.15.0

package/vercel.d.ts

@@ -3,10 +3,10 @@ import { z } from 'zod';
 declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodObject<{
     cacheUrl: z.ZodString;
     appwardenApiToken: z.ZodString;
-    appwardenApiHostname: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
+    appwardenApiHostname: z.ZodOptional<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>>;
     vercelApiToken: z.ZodOptional<z.ZodString>;
     debug: z.ZodOptional<z.ZodBoolean>;
-    lockPageSlug: z.ZodEffects<z.ZodDefault<z.ZodString>, string, string | undefined>;
+    lockPageSlug: z.ZodEffects<z.ZodDefault<z.ZodEffects<z.ZodString, string, string>>, string, string | undefined>;
     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<{
@@ -318,7 +318,6 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
     lockPageSlug: string;
     appwardenApiToken: string;
     cacheUrl: string;
-    debug?: boolean | undefined;
     contentSecurityPolicy?: {
         mode: "disabled" | "report-only" | "enforced";
         directives?: {
@@ -350,12 +349,12 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
         } | undefined;
     } | undefined;
+    debug?: boolean | undefined;
     appwardenApiHostname?: string | undefined;
     vercelApiToken?: string | undefined;
 }, {
     appwardenApiToken: string;
     cacheUrl: string;
-    debug?: boolean | undefined;
     lockPageSlug?: string | undefined;
     contentSecurityPolicy?: {
         mode: "disabled" | "report-only" | "enforced";
@@ -388,13 +387,13 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
         };
     } | undefined;
+    debug?: boolean | undefined;
     appwardenApiHostname?: string | undefined;
     vercelApiToken?: string | undefined;
 }>, {
     lockPageSlug: string;
     appwardenApiToken: string;
     cacheUrl: string;
-    debug?: boolean | undefined;
     contentSecurityPolicy?: {
         mode: "disabled" | "report-only" | "enforced";
         directives?: {
@@ -426,12 +425,12 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
         } | undefined;
     } | undefined;
+    debug?: boolean | undefined;
     appwardenApiHostname?: string | undefined;
     vercelApiToken?: string | undefined;
 }, {
     appwardenApiToken: string;
     cacheUrl: string;
-    debug?: boolean | undefined;
     lockPageSlug?: string | undefined;
     contentSecurityPolicy?: {
         mode: "disabled" | "report-only" | "enforced";
@@ -464,13 +463,13 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
         };
     } | undefined;
+    debug?: boolean | undefined;
     appwardenApiHostname?: string | undefined;
     vercelApiToken?: string | undefined;
 }>, {
     lockPageSlug: string;
     appwardenApiToken: string;
     cacheUrl: string;
-    debug?: boolean | undefined;
     contentSecurityPolicy?: {
         mode: "disabled" | "report-only" | "enforced";
         directives?: {
@@ -502,12 +501,12 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
         } | undefined;
     } | undefined;
+    debug?: boolean | undefined;
     appwardenApiHostname?: string | undefined;
     vercelApiToken?: string | undefined;
 }, {
     appwardenApiToken: string;
     cacheUrl: string;
-    debug?: boolean | undefined;
     lockPageSlug?: string | undefined;
     contentSecurityPolicy?: {
         mode: "disabled" | "report-only" | "enforced";
@@ -540,13 +539,13 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
         };
     } | undefined;
+    debug?: boolean | undefined;
     appwardenApiHostname?: string | undefined;
     vercelApiToken?: string | undefined;
 }>, {
     lockPageSlug: string;
     appwardenApiToken: string;
     cacheUrl: string;
-    debug?: boolean | undefined;
     contentSecurityPolicy?: {
         mode: "disabled" | "report-only" | "enforced";
         directives?: {
@@ -578,12 +577,12 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
         } | undefined;
     } | undefined;
+    debug?: boolean | undefined;
     appwardenApiHostname?: string | undefined;
     vercelApiToken?: string | undefined;
 }, {
     appwardenApiToken: string;
     cacheUrl: string;
-    debug?: boolean | undefined;
     lockPageSlug?: string | undefined;
     contentSecurityPolicy?: {
         mode: "disabled" | "report-only" | "enforced";
@@ -616,13 +615,13 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
         };
     } | undefined;
+    debug?: boolean | undefined;
     appwardenApiHostname?: string | undefined;
     vercelApiToken?: string | undefined;
 }>, {
     lockPageSlug: string;
     appwardenApiToken: string;
     cacheUrl: string;
-    debug?: boolean | undefined;
     contentSecurityPolicy?: {
         mode: "disabled" | "report-only" | "enforced";
         directives?: {
@@ -654,12 +653,12 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
         } | undefined;
     } | undefined;
+    debug?: boolean | undefined;
     appwardenApiHostname?: string | undefined;
     vercelApiToken?: string | undefined;
 }, {
     appwardenApiToken: string;
     cacheUrl: string;
-    debug?: boolean | undefined;
     lockPageSlug?: string | undefined;
     contentSecurityPolicy?: {
         mode: "disabled" | "report-only" | "enforced";
@@ -692,12 +691,14 @@ declare const AppwardenConfigSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.Zo
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
         };
     } | undefined;
+    debug?: boolean | undefined;
     appwardenApiHostname?: string | undefined;
     vercelApiToken?: string | undefined;
 }>;
 type VercelAppwardenConfig = z.input<typeof AppwardenConfigSchema>;
 
+declare function getAppwardenConfiguration(generatedConfig: Record<string, unknown>, config: Partial<VercelAppwardenConfig>): ReturnType<typeof AppwardenConfigSchema.parse>;
 type VercelMiddlewareFunction = (request: Request) => Promise<Response>;
 declare function createAppwardenMiddleware(config: VercelAppwardenConfig): VercelMiddlewareFunction;
 
-export { type VercelMiddlewareFunction, createAppwardenMiddleware };
+export { type VercelMiddlewareFunction, createAppwardenMiddleware, getAppwardenConfiguration };

package/vercel.js

@@ -18,9 +18,10 @@ import {
   isHeartbeatRequest,
   isOnLockPage,
   makeCSPHeader,
+  parseMergedConfig,
   printMessage,
   sanitizeConfigErrors
-} from "./chunk-2FSRHIPY.js";
+} from "./chunk-2R3NOSYY.js";
 import {
   APPWARDEN_CACHE_KEY,
   APPWARDEN_MIDDLEWARE_USER_AGENT,
@@ -29,9 +30,10 @@ import {
   CSPModeSchema,
   HEARTBEAT_SERVICES,
   LockValue,
+  ValidLockPageSlugSchema,
   errors,
   globalErrors
-} from "./chunk-LDKC5DRW.js";
+} from "./chunk-4U4OJ6SP.js";
 
 // src/runners/appwarden-on-vercel.ts
 import { waitUntil } from "@vercel/functions";
@@ -111,10 +113,23 @@ var APIError = class extends Error {
     this.name = "APIError";
   }
 };
+var API_TIMEOUT_MS = 1e4;
+function resolveApiHostname(hostname) {
+  if (!hostname) {
+    return "https://api.appwarden.io";
+  }
+  const parsed = AppwardenApiHostnameSchema.safeParse(hostname);
+  if (!parsed.success) {
+    return "https://api.appwarden.io";
+  }
+  return parsed.data;
+}
 var syncEdgeValue = async (context) => {
   context.debug("syncing with api");
+  const apiHostname = resolveApiHostname(context.appwardenApiHostname);
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), API_TIMEOUT_MS);
   try {
-    const apiHostname = context.appwardenApiHostname ?? "https://api.appwarden.io";
     const response = await fetch(new URL("/v1/appwarden/status", apiHostname), {
       method: "POST",
       headers: {
@@ -127,7 +142,8 @@ var syncEdgeValue = async (context) => {
         fqdn: context.requestUrl.hostname,
         vercelApiToken: context.vercelApiToken ?? "",
         appwardenApiToken: context.appwardenApiToken
-      })
+      }),
+      signal: controller.signal
     });
     if (response.status === 403) {
       console.log(
@@ -152,6 +168,8 @@ var syncEdgeValue = async (context) => {
         e instanceof APIError ? e.message : e instanceof Error ? `${message} - ${e.message}` : message
       )
     );
+  } finally {
+    clearTimeout(timeout);
   }
 };
 
@@ -205,7 +223,9 @@ var BaseNextJsConfigSchema = z.object({
   appwardenApiHostname: AppwardenApiHostnameSchema.optional(),
   vercelApiToken: z.string().optional(),
   debug: z.boolean().optional(),
-  lockPageSlug: z.string().default("").transform((val) => val.replace(/^\/?/, "/")),
+  lockPageSlug: ValidLockPageSlugSchema.default("").transform(
+    (val) => val.replace(/^\/?/, "/")
+  ),
   contentSecurityPolicy: VercelCSPSchema.optional()
 });
 var AppwardenConfigSchema = BaseNextJsConfigSchema.refine(
@@ -256,6 +276,13 @@ var AppwardenConfigSchema = BaseNextJsConfigSchema.refine(
 });
 
 // src/runners/appwarden-on-vercel.ts
+function getAppwardenConfiguration(generatedConfig, config) {
+  return parseMergedConfig(
+    generatedConfig,
+    config,
+    AppwardenConfigSchema.parse
+  );
+}
 var memoryCache = new MemoryCache({ maxSize: 1 });
 function safeWaitUntil(promise) {
   try {
@@ -379,5 +406,6 @@ function createAppwardenMiddleware(config) {
   };
 }
 export {
-  createAppwardenMiddleware
+  createAppwardenMiddleware,
+  getAppwardenConfiguration
 };