@appwarden/middleware 3.8.0 → 3.9.0

package/cloudflare/react-router.d.ts

@@ -14,9 +14,9 @@ declare const ReactRouterCloudflareConfigSchema: z.ZodObject<{
     /** Enable debug logging */
     debug: z.ZodDefault<z.ZodEffects<z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodBoolean]>>, boolean, string | boolean | undefined>>;
     /** Optional Content Security Policy configuration */
-    contentSecurityPolicy: z.ZodOptional<z.ZodLazy<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.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodObject<{
+    contentSecurityPolicy: z.ZodOptional<z.ZodLazy<z.ZodObject<{
+        mode: z.ZodUnion<[z.ZodLiteral<"disabled">, z.ZodLiteral<"report-only">, z.ZodLiteral<"enforced">]>;
+        directives: z.ZodEffects<z.ZodEffects<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]>>;
@@ -97,7 +97,7 @@ declare const ReactRouterCloudflareConfigSchema: z.ZodObject<{
             "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;
@@ -124,7 +124,7 @@ declare const ReactRouterCloudflareConfigSchema: z.ZodObject<{
             "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;
@@ -151,7 +151,7 @@ declare const ReactRouterCloudflareConfigSchema: z.ZodObject<{
             "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;
@@ -205,7 +205,7 @@ declare const ReactRouterCloudflareConfigSchema: z.ZodObject<{
             "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?: {
@@ -237,38 +237,8 @@ declare const ReactRouterCloudflareConfigSchema: z.ZodObject<{
             "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;
@@ -295,37 +265,7 @@ declare const ReactRouterCloudflareConfigSchema: z.ZodObject<{
             "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, {
     debug: boolean;
@@ -368,8 +308,8 @@ declare const ReactRouterCloudflareConfigSchema: z.ZodObject<{
     appwardenApiToken: string;
     debug?: string | boolean | 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;
@@ -396,10 +336,11 @@ declare const ReactRouterCloudflareConfigSchema: z.ZodObject<{
             "upgrade-insecure-requests"?: string | boolean | string[] | undefined;
             "trusted-types"?: string | boolean | string[] | undefined;
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
-        } | undefined;
+        };
     } | undefined;
     appwardenApiHostname?: string | undefined;
 }>;
+type ReactRouterCloudflareConfig = z.infer<typeof ReactRouterCloudflareConfigSchema>;
 /**
  * Input type for React Router Cloudflare adapter configuration.
  * This is the pre-transformation type that accepts string | boolean for debug
@@ -409,34 +350,23 @@ declare const ReactRouterCloudflareConfigSchema: z.ZodObject<{
 type ReactRouterAppwardenConfigInput = z.input<typeof ReactRouterCloudflareConfigSchema>;
 
 /**
- * Minimal runtime context required by the React Router adapter.
- * Contains only the essential properties needed by the middleware.
- */
-interface ReactRouterRuntimeContext {
-    /** Cloudflare environment bindings */
-    env: CloudflareEnv;
-    /** Function to extend the lifetime of the request for background tasks */
-    waitUntil(promise: Promise<unknown>): void;
-}
-/**
- * Configuration function that receives the runtime context and returns the config.
- * This allows dynamic configuration based on environment variables.
+ * Configuration function that returns the config.
+ * This allows dynamic configuration based on environment variables from cloudflare:workers.
  * The config can use the relaxed input types (string | boolean for debug,
  * string | object for CSP directives) which will be transformed by Zod.
+ *
+ * @param runtime - Optional runtime context (for backward compatibility)
  */
-type ReactRouterConfigFn = (runtime: ReactRouterRuntimeContext) => ReactRouterAppwardenConfigInput;
+type ReactRouterConfigFn = (runtime?: unknown) => ReactRouterAppwardenConfigInput;
 /**
  * React Router middleware function signature.
  * This matches the unstable_middleware export type in React Router v7.
- *
- * The context should contain the runtime context with env and waitUntil.
  */
 interface ReactRouterMiddlewareArgs {
     request: Request;
     params: Record<string, string | undefined>;
-    context: ReactRouterRuntimeContext;
 }
-type ReactRouterMiddlewareFunction = (args: ReactRouterMiddlewareArgs, next: () => Promise<unknown>) => Promise<unknown>;
+type ReactRouterMiddlewareFunction = (args: ReactRouterMiddlewareArgs, next: () => Promise<void | Response>) => Promise<void | Response>;
 /**
  * Creates an Appwarden middleware function for React Router.
  *
@@ -446,19 +376,20 @@ type ReactRouterMiddlewareFunction = (args: ReactRouterMiddlewareArgs, next: ()
  * @example
  * ```typescript
  * // app/root.tsx
+ * import { env } from "cloudflare:workers"
  * import { createAppwardenMiddleware } from "@appwarden/middleware/react-router"
  *
  * export const unstable_middleware = [
- *   createAppwardenMiddleware(({ env }) => ({
+ *   createAppwardenMiddleware(() => ({
  *     lockPageSlug: env.APPWARDEN_LOCK_PAGE_SLUG,
  *     appwardenApiToken: env.APPWARDEN_API_TOKEN,
  *   })),
  * ]
  * ```
  *
- * @param configFn - A function that receives the runtime context and returns the config
+ * @param configFn - A function that returns the config using env from cloudflare:workers
  * @returns A React Router middleware function
  */
 declare function createAppwardenMiddleware(configFn: ReactRouterConfigFn): ReactRouterMiddlewareFunction;
 
-export { type ReactRouterRuntimeContext, createAppwardenMiddleware };
+export { type ReactRouterAppwardenConfigInput, type ReactRouterCloudflareConfig, type ReactRouterConfigFn, type ReactRouterMiddlewareArgs, type ReactRouterMiddlewareFunction, createAppwardenMiddleware };

package/cloudflare/react-router.js

@@ -3,28 +3,31 @@ import {
 } from "../chunk-XFG6SUSV.js";
 import {
   useContentSecurityPolicy
-} from "../chunk-52NBQDQT.js";
+} from "../chunk-VSCXTBP6.js";
 import {
   getNowMs
 } from "../chunk-X7WZVYQS.js";
 import {
   checkLockStatus
-} from "../chunk-G5FWKV2Q.js";
+} from "../chunk-MYIKUPTR.js";
 import {
   buildLockPageUrl,
   createRedirect,
   debug,
   isOnLockPage
-} from "../chunk-EPJ4ZVO6.js";
+} from "../chunk-Z7FIMIZS.js";
 import {
   UseCSPInputSchema,
   isHTMLRequest
-} from "../chunk-HCGLR3Z3.js";
+} from "../chunk-UIIYORBW.js";
 import {
   AppwardenApiTokenSchema,
   BooleanSchema,
   printMessage
-} from "../chunk-GK6JL5NZ.js";
+} from "../chunk-QGXPAVOA.js";
+
+// src/adapters/react-router-cloudflare.ts
+import { waitUntil } from "cloudflare:workers";
 
 // src/schemas/react-router-cloudflare.ts
 import { z } from "zod";
@@ -45,17 +48,9 @@ var ReactRouterCloudflareConfigSchema = z.object({
 function createAppwardenMiddleware(configFn) {
   return async (args, next) => {
     const startTime = getNowMs();
-    const { request, context } = args;
+    const { request } = args;
     try {
-      if (!context?.env || !context?.waitUntil) {
-        console.error(
-          printMessage(
-            "Runtime context missing required properties (env, waitUntil). Make sure you're passing the correct context to the middleware."
-          )
-        );
-        return next();
-      }
-      const configInput = configFn(context);
+      const configInput = configFn();
       const validationResult = ReactRouterCloudflareConfigSchema.safeParse(configInput);
       if (!validationResult.success) {
         console.error(
@@ -86,7 +81,7 @@ function createAppwardenMiddleware(configFn) {
         appwardenApiHostname: config.appwardenApiHostname,
         debug: config.debug,
         lockPageSlug: config.lockPageSlug,
-        waitUntil: context.waitUntil
+        waitUntil
       });
       if (result.isLocked) {
         const lockPageUrl = buildLockPageUrl(config.lockPageSlug, request.url);
@@ -100,7 +95,7 @@ function createAppwardenMiddleware(configFn) {
           request,
           response,
           hostname: requestUrl.hostname,
-          waitUntil: context.waitUntil,
+          waitUntil,
           debug: debugFn
         };
         await useContentSecurityPolicy(config.contentSecurityPolicy)(

package/cloudflare/tanstack-start.d.ts

@@ -14,9 +14,9 @@ declare const TanStackStartCloudflareConfigSchema: z.ZodObject<{
     /** Enable debug logging */
     debug: z.ZodDefault<z.ZodEffects<z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodBoolean]>>, boolean, string | boolean | undefined>>;
     /** Optional Content Security Policy configuration */
-    contentSecurityPolicy: z.ZodOptional<z.ZodLazy<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.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodObject<{
+    contentSecurityPolicy: z.ZodOptional<z.ZodLazy<z.ZodObject<{
+        mode: z.ZodUnion<[z.ZodLiteral<"disabled">, z.ZodLiteral<"report-only">, z.ZodLiteral<"enforced">]>;
+        directives: z.ZodEffects<z.ZodEffects<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]>>;
@@ -97,7 +97,7 @@ declare const TanStackStartCloudflareConfigSchema: z.ZodObject<{
             "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;
@@ -124,7 +124,7 @@ declare const TanStackStartCloudflareConfigSchema: z.ZodObject<{
             "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;
@@ -151,7 +151,7 @@ declare const TanStackStartCloudflareConfigSchema: z.ZodObject<{
             "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;
@@ -205,7 +205,7 @@ declare const TanStackStartCloudflareConfigSchema: z.ZodObject<{
             "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?: {
@@ -237,38 +237,8 @@ declare const TanStackStartCloudflareConfigSchema: z.ZodObject<{
             "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;
@@ -295,37 +265,7 @@ declare const TanStackStartCloudflareConfigSchema: z.ZodObject<{
             "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, {
     debug: boolean;
@@ -368,8 +308,8 @@ declare const TanStackStartCloudflareConfigSchema: z.ZodObject<{
     appwardenApiToken: string;
     debug?: string | boolean | 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;
@@ -396,57 +336,68 @@ declare const TanStackStartCloudflareConfigSchema: z.ZodObject<{
             "upgrade-insecure-requests"?: string | boolean | string[] | undefined;
             "trusted-types"?: string | boolean | string[] | undefined;
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
-        } | undefined;
+        };
     } | undefined;
     appwardenApiHostname?: string | undefined;
 }>;
+type TanStackStartCloudflareConfig = z.infer<typeof TanStackStartCloudflareConfigSchema>;
 type TanStackStartCloudflareConfigInput = z.input<typeof TanStackStartCloudflareConfigSchema>;
 
 /**
- * Minimal runtime context type for TanStack Start adapter.
- * Contains only what the adapter and config function need.
- * Users provide this context by importing env and waitUntil from "cloudflare:workers".
- */
-interface TanStackStartRuntimeContext {
-    env: CloudflareEnv;
-    waitUntil(promise: Promise<unknown>): void;
-}
-/**
- * Configuration function that receives the runtime context and returns the config.
- * This allows dynamic configuration based on environment variables.
+ * Configuration function that returns the config.
+ * This allows dynamic configuration based on environment variables from cloudflare:workers.
  * Accepts pre-transformation input types (e.g., string | boolean for debug, string | object for CSP directives).
  */
-type TanStackStartConfigFn = (runtime: TanStackStartRuntimeContext) => TanStackStartCloudflareConfigInput;
+type TanStackStartConfigFn = () => TanStackStartCloudflareConfigInput;
 /**
  * The result returned by the `next()` function in TanStack Start request middleware.
  *
  * Mirrors the internal `RequestServerResult` interface from `@tanstack/start-client-core`
  * without importing from an unstable internal package path.
+ *
+ * Note: `pathname` remains required here to stay structurally compatible with
+ * TanStack's `RequestServerResult` type, which expects a non-optional string.
+ * The adapter itself does not use this property, but other parts of TanStack's
+ * type system do, so we keep it required on the result while allowing it to be
+ * optional on the middleware *args* type.
  */
 interface TanStackStartNextResult {
     request: Request;
     pathname: string;
-    context: Record<string, unknown>;
+    context: unknown;
     response: Response;
 }
 /**
  * The `next()` function passed to TanStack Start request middleware.
  *
- * Mirrors the internal `RequestServerNextFn` signature.
+ * This mirrors the shape of TanStack's `RequestServerNextFn` from
+ * `@tanstack/start-client-core` without importing the type directly.
+ *
+ * - It accepts an optional options object with an optional `context`.
+ * - It may return either a `TanStackStartNextResult` or a Promise of one,
+ *   matching TanStack's own union return type
+ *   (`Promise<RequestServerResult> | RequestServerResult`).
+ * - The adapter itself always calls `next()` with no arguments and awaits it,
+ *   so callers are free to pass TanStack's native `next` implementation
+ *   directly (`next: next`).
  */
-type TanStackStartNextFn = (options?: {
-    context?: Record<string, unknown>;
-}) => Promise<TanStackStartNextResult>;
+interface TanStackStartNextOptions<TServerContext = Record<string, unknown>> {
+    context?: TServerContext;
+}
+type TanStackStartNextFnResult = Promise<TanStackStartNextResult> | TanStackStartNextResult;
+type TanStackStartNextFn = <TServerContext = Record<string, unknown>>(options?: TanStackStartNextOptions<TServerContext>) => TanStackStartNextFnResult;
 /**
  * TanStack Start middleware server callback arguments.
  *
  * Mirrors the official TanStack Start `RequestServerOptions` interface.
- * The context should include env and waitUntil from the Cloudflare Workers runtime.
  */
 interface TanStackStartMiddlewareArgs {
     request: Request;
-    pathname: string;
-    context: TanStackStartRuntimeContext & Record<string, unknown>;
+    /**
+     * Optional pathname supplied by TanStack Start. The adapter does not require it,
+     * so callers do not need to provide it when constructing harness args manually.
+     */
+    pathname?: string;
     next: TanStackStartNextFn;
     serverFnMeta?: unknown;
 }
@@ -462,9 +413,9 @@ interface TanStackStartMiddlewareArgs {
 type TanStackStartMiddlewareFunction = (args: TanStackStartMiddlewareArgs) => Promise<TanStackStartNextResult>;
 /**
  *
- * @param configFn - A function that receives the Cloudflare context and returns the config
+ * @param configFn - A function that returns the config using env from cloudflare:workers
  * @returns A TanStack Start middleware function
  */
 declare function createAppwardenMiddleware(configFn: TanStackStartConfigFn): TanStackStartMiddlewareFunction;
 
-export { createAppwardenMiddleware };
+export { type TanStackStartCloudflareConfig, type TanStackStartCloudflareConfigInput, type TanStackStartConfigFn, type TanStackStartMiddlewareArgs, type TanStackStartMiddlewareFunction, type TanStackStartNextFn, type TanStackStartNextResult, createAppwardenMiddleware };

package/cloudflare/tanstack-start.js

@@ -3,31 +3,31 @@ import {
 } from "../chunk-XFG6SUSV.js";
 import {
   useContentSecurityPolicy
-} from "../chunk-52NBQDQT.js";
-import {
-  validateConfig
-} from "../chunk-MNGMTDH3.js";
+} from "../chunk-VSCXTBP6.js";
 import {
   getNowMs
 } from "../chunk-X7WZVYQS.js";
 import {
   checkLockStatus
-} from "../chunk-G5FWKV2Q.js";
+} from "../chunk-MYIKUPTR.js";
 import {
   buildLockPageUrl,
   createRedirect,
   debug,
   isOnLockPage
-} from "../chunk-EPJ4ZVO6.js";
+} from "../chunk-Z7FIMIZS.js";
 import {
   UseCSPInputSchema,
   isHTMLRequest
-} from "../chunk-HCGLR3Z3.js";
+} from "../chunk-UIIYORBW.js";
 import {
   AppwardenApiTokenSchema,
   BooleanSchema,
   printMessage
-} from "../chunk-GK6JL5NZ.js";
+} from "../chunk-QGXPAVOA.js";
+
+// src/adapters/tanstack-start-cloudflare.ts
+import { waitUntil } from "cloudflare:workers";
 
 // src/schemas/tanstack-start-cloudflare.ts
 import { z } from "zod";
@@ -48,23 +48,19 @@ var TanStackStartCloudflareConfigSchema = z.object({
 function createAppwardenMiddleware(configFn) {
   const middleware = async (args) => {
     const startTime = getNowMs();
-    const { request, next, context } = args;
+    const { request, next } = args;
     try {
-      if (!context.env || !context.waitUntil) {
+      const rawConfig = configFn();
+      const validationResult = TanStackStartCloudflareConfigSchema.safeParse(rawConfig);
+      if (!validationResult.success) {
         console.error(
           printMessage(
-            "Runtime context missing required properties (env, waitUntil). Ensure you pass { env, waitUntil } from cloudflare:workers to the middleware context."
+            `Config validation failed: ${validationResult.error.message}`
           )
         );
         return next();
       }
-      const rawConfig = configFn(context);
-      const parseResult = TanStackStartCloudflareConfigSchema.safeParse(rawConfig);
-      if (!parseResult.success) {
-        validateConfig(rawConfig, TanStackStartCloudflareConfigSchema);
-        return next();
-      }
-      const config = parseResult.data;
+      const config = validationResult.data;
       const debugFn = debug(config.debug ?? false);
       const requestUrl = new URL(request.url);
       const isHTML = isHTMLRequest(request);
@@ -85,12 +81,32 @@ function createAppwardenMiddleware(configFn) {
         appwardenApiHostname: config.appwardenApiHostname,
         debug: config.debug,
         lockPageSlug: config.lockPageSlug,
-        waitUntil: context.waitUntil
+        waitUntil
       });
       if (lockStatus.isLocked) {
         const lockPageUrl = buildLockPageUrl(config.lockPageSlug, request.url);
         debugFn(`Website is locked - redirecting to ${lockPageUrl.pathname}`);
-        throw createRedirect(lockPageUrl);
+        const redirectResponse = createRedirect(lockPageUrl);
+        if (config.contentSecurityPolicy && isResponseLike(redirectResponse)) {
+          const cspContext = {
+            request,
+            response: redirectResponse,
+            hostname: requestUrl.hostname,
+            waitUntil,
+            debug: debugFn
+          };
+          await useContentSecurityPolicy(config.contentSecurityPolicy)(
+            cspContext,
+            async () => {
+            }
+          );
+          const elapsed3 = Math.round(getNowMs() - startTime);
+          debugFn(`Middleware executed in ${elapsed3}ms`);
+          throw cspContext.response;
+        }
+        const elapsed2 = Math.round(getNowMs() - startTime);
+        debugFn(`Middleware executed in ${elapsed2}ms`);
+        throw redirectResponse;
       }
       debugFn("Website is unlocked");
       const result = await next();
@@ -100,7 +116,7 @@ function createAppwardenMiddleware(configFn) {
           request,
           response,
           hostname: requestUrl.hostname,
-          waitUntil: context.waitUntil,
+          waitUntil,
           debug: debugFn
         };
         await useContentSecurityPolicy(config.contentSecurityPolicy)(

package/{cloudflare-K5EFFMNI.js → cloudflare-PE3JKP3X.js}

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