@appwarden/middleware 3.4.1 → 3.4.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-91.52%25-brightgreen)
+![Test Coverage](https://img.shields.io/badge/coverage-91.55%25-brightgreen)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 
 ## Core Features

package/chunk-X7WZVYQS.js

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

package/chunk-XFG6SUSV.js

@@ -0,0 +1,11 @@
+// src/utils/is-response-like.ts
+var isResponseLike = (value) => {
+  if (!value || typeof value !== "object") return false;
+  const candidate = value;
+  const headers = candidate.headers;
+  return !!(headers && typeof headers === "object" && typeof headers.has === "function" && typeof headers.set === "function" && typeof headers.get === "function");
+};
+
+export {
+  isResponseLike
+};

package/cloudflare/astro.js

@@ -1,6 +1,12 @@
+import {
+  isResponseLike
+} from "../chunk-XFG6SUSV.js";
 import {
   useContentSecurityPolicy
 } from "../chunk-AXWJZE7U.js";
+import {
+  getNowMs
+} from "../chunk-X7WZVYQS.js";
 import {
   validateConfig
 } from "../chunk-MNGMTDH3.js";
@@ -40,7 +46,6 @@ var AstroCloudflareConfigSchema = z.object({
 });
 
 // src/adapters/astro-cloudflare.ts
-var getNowMs = () => typeof performance !== "undefined" && typeof performance.now === "function" ? performance.now() : Date.now();
 function createAppwardenMiddleware(configFn) {
   return async (context, next) => {
     const startTime = getNowMs();
@@ -96,7 +101,7 @@ function createAppwardenMiddleware(configFn) {
       }
       debugFn("Website is unlocked");
       const response = await next();
-      if (config.contentSecurityPolicy) {
+      if (config.contentSecurityPolicy && isResponseLike(response)) {
         debugFn("Applying CSP middleware");
         const cspContext = {
           request,
@@ -119,7 +124,7 @@ function createAppwardenMiddleware(configFn) {
       debugFn(`Middleware executed in ${elapsed}ms`);
       return response;
     } catch (error) {
-      if (error instanceof Response) {
+      if (isResponseLike(error)) {
         throw error;
       }
       console.error(

package/cloudflare/nextjs.js

@@ -1,3 +1,6 @@
+import {
+  getNowMs
+} from "../chunk-X7WZVYQS.js";
 import {
   validateConfig
 } from "../chunk-MNGMTDH3.js";
@@ -52,7 +55,6 @@ var NextJsCloudflareConfigSchema = z.object({
 });
 
 // src/adapters/nextjs-cloudflare.ts
-var getNowMs = () => typeof performance !== "undefined" && typeof performance.now === "function" ? performance.now() : Date.now();
 function createAppwardenMiddleware(configFn) {
   return async (request, _event) => {
     const startTime = getNowMs();

package/cloudflare/react-router.js

@@ -1,6 +1,12 @@
+import {
+  isResponseLike
+} from "../chunk-XFG6SUSV.js";
 import {
   useContentSecurityPolicy
 } from "../chunk-AXWJZE7U.js";
+import {
+  getNowMs
+} from "../chunk-X7WZVYQS.js";
 import {
   validateConfig
 } from "../chunk-MNGMTDH3.js";
@@ -42,7 +48,6 @@ var ReactRouterCloudflareConfigSchema = z.object({
 var cloudflareContextSymbol = /* @__PURE__ */ Symbol.for(
   "@appwarden/middleware:cloudflare"
 );
-var getNowMs = () => typeof performance !== "undefined" && typeof performance.now === "function" ? performance.now() : Date.now();
 function getCloudflareContext(context) {
   if (context?.cloudflare) {
     return context.cloudflare;
@@ -106,7 +111,7 @@ function createAppwardenMiddleware(configFn) {
       }
       debugFn("Website is unlocked");
       const response = await next();
-      if (config.contentSecurityPolicy && response instanceof Response) {
+      if (config.contentSecurityPolicy && isResponseLike(response)) {
         debugFn("Applying CSP middleware");
         const cspContext = {
           request,
@@ -129,7 +134,7 @@ function createAppwardenMiddleware(configFn) {
       debugFn(`Middleware executed in ${elapsed}ms`);
       return response;
     } catch (error) {
-      if (error instanceof Response) {
+      if (isResponseLike(error)) {
         throw error;
       }
       console.error(

package/cloudflare/tanstack-start.d.ts

@@ -29,48 +29,55 @@ interface TanStackStartAppwardenConfig {
  * This allows dynamic configuration based on environment variables.
  */
 type TanStackStartConfigFn = (cloudflare: TanStackStartCloudflareContext) => TanStackStartAppwardenConfig;
+/**
+ * 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.
+ */
+interface TanStackStartNextResult {
+    request: Request;
+    pathname: string;
+    context: Record<string, unknown>;
+    response: Response;
+}
+/**
+ * The `next()` function passed to TanStack Start request middleware.
+ *
+ * Mirrors the internal `RequestServerNextFn` signature.
+ */
+type TanStackStartNextFn = (options?: {
+    context?: Record<string, unknown>;
+}) => Promise<TanStackStartNextResult>;
 /**
  * TanStack Start middleware server callback arguments.
- * This matches the shape of arguments passed to createMiddleware().server().
+ *
+ * Mirrors the official TanStack Start `RequestServerOptions` interface, with
+ * an additional optional `cloudflare` context property for Cloudflare
+ * Workers deployments.
  */
 interface TanStackStartMiddlewareArgs {
     request: Request;
-    next: () => Promise<unknown>;
+    pathname: string;
     context: {
         cloudflare?: TanStackStartCloudflareContext;
         [key: string]: unknown;
     };
+    next: TanStackStartNextFn;
+    serverFnMeta?: unknown;
 }
 /**
  * TanStack Start middleware function signature.
- * This matches the return type of createMiddleware().server().
+ *
+ * Mirrors the official TanStack Start `RequestServerFn` type used for
+ * request middleware server functions.
  */
-type TanStackStartMiddlewareFunction = (args: TanStackStartMiddlewareArgs) => Promise<unknown>;
+type TanStackStartMiddlewareFunction = (args: TanStackStartMiddlewareArgs) => Promise<TanStackStartNextResult | Response>;
 /**
- * Creates an Appwarden middleware function for TanStack Start.
- *
- * This middleware checks if the site is locked and throws a redirect to the lock page if so.
- * It should be added to the `requestMiddleware` array in your `src/start.ts` file.
- *
- * @example
- * ```typescript
- * // src/start.ts
- * import { createStart } from "@tanstack/react-start"
- * import { createAppwardenMiddleware } from "@appwarden/middleware/tanstack-start"
- *
- * const appwardenMiddleware = createAppwardenMiddleware(({ env }) => ({
- *   lockPageSlug: env.APPWARDEN_LOCK_PAGE_SLUG,
- *   appwardenApiToken: env.APPWARDEN_API_TOKEN,
- * }))
- *
- * export const startInstance = createStart(() => ({
- *   requestMiddleware: [appwardenMiddleware],
- * }))
- * ```
  *
  * @param configFn - A function that receives the Cloudflare context and returns the config
  * @returns A TanStack Start middleware function
  */
 declare function createAppwardenMiddleware(configFn: TanStackStartConfigFn): TanStackStartMiddlewareFunction;
 
-export { type TanStackStartAppwardenConfig, type TanStackStartCloudflareContext, type TanStackStartConfigFn, type TanStackStartMiddlewareArgs, type TanStackStartMiddlewareFunction, createAppwardenMiddleware };
+export { type TanStackStartAppwardenConfig, type TanStackStartCloudflareContext, type TanStackStartConfigFn, type TanStackStartMiddlewareArgs, type TanStackStartMiddlewareFunction, type TanStackStartNextFn, type TanStackStartNextResult, createAppwardenMiddleware };

package/cloudflare/tanstack-start.js

@@ -1,6 +1,12 @@
+import {
+  isResponseLike
+} from "../chunk-XFG6SUSV.js";
 import {
   useContentSecurityPolicy
 } from "../chunk-AXWJZE7U.js";
+import {
+  getNowMs
+} from "../chunk-X7WZVYQS.js";
 import {
   validateConfig
 } from "../chunk-MNGMTDH3.js";
@@ -39,9 +45,8 @@ var TanStackStartCloudflareConfigSchema = z.object({
 });
 
 // src/adapters/tanstack-start-cloudflare.ts
-var getNowMs = () => typeof performance !== "undefined" && typeof performance.now === "function" ? performance.now() : Date.now();
 function createAppwardenMiddleware(configFn) {
-  return async (args) => {
+  const middleware = async (args) => {
     const startTime = getNowMs();
     const { request, next, context } = args;
     try {
@@ -49,7 +54,7 @@ function createAppwardenMiddleware(configFn) {
       if (!cloudflare) {
         console.error(
           printMessage(
-            "Cloudflare context not found. Ensure running on Cloudflare Workers with proper context setup."
+            "Cloudflare context not found in TanStack Start context. Ensure your Register type includes the cloudflare context, or pass it manually in the middleware wrapper."
           )
         );
         return next();
@@ -76,7 +81,7 @@ function createAppwardenMiddleware(configFn) {
         debugFn("Already on lock page - skipping");
         return next();
       }
-      const result = await checkLockStatus({
+      const lockStatus = await checkLockStatus({
         request,
         appwardenApiToken: config.appwardenApiToken,
         appwardenApiHostname: config.appwardenApiHostname,
@@ -84,14 +89,15 @@ function createAppwardenMiddleware(configFn) {
         lockPageSlug: config.lockPageSlug,
         waitUntil: (fn) => cloudflare.ctx.waitUntil(fn)
       });
-      if (result.isLocked) {
+      if (lockStatus.isLocked) {
         const lockPageUrl = buildLockPageUrl(config.lockPageSlug, request.url);
         debugFn(`Website is locked - redirecting to ${lockPageUrl.pathname}`);
         throw createRedirect(lockPageUrl);
       }
       debugFn("Website is unlocked");
-      const response = await next();
-      if (config.contentSecurityPolicy && response instanceof Response) {
+      const result = await next();
+      const { response } = result;
+      if (config.contentSecurityPolicy && isResponseLike(response)) {
         debugFn("Applying CSP middleware");
         const cspContext = {
           request,
@@ -108,13 +114,16 @@ function createAppwardenMiddleware(configFn) {
         );
         const elapsed2 = Math.round(getNowMs() - startTime);
         debugFn(`Middleware executed in ${elapsed2}ms`);
-        return cspContext.response;
+        return {
+          ...result,
+          response: cspContext.response
+        };
       }
       const elapsed = Math.round(getNowMs() - startTime);
       debugFn(`Middleware executed in ${elapsed}ms`);
-      return response;
+      return result;
     } catch (error) {
-      if (error instanceof Response) {
+      if (isResponseLike(error)) {
         throw error;
       }
       console.error(
@@ -125,6 +134,7 @@ function createAppwardenMiddleware(configFn) {
       return next();
     }
   };
+  return middleware;
 }
 export {
   createAppwardenMiddleware

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appwarden/middleware",
-  "version": "3.4.1",
+  "version": "3.4.3",
   "description": "Instantly shut off access your app deployed on Cloudflare or Vercel",
   "type": "module",
   "license": "MIT",
@@ -65,6 +65,7 @@
   "peerDependencies": {
     "@astrojs/cloudflare": ">=11.0.0",
     "@opennextjs/cloudflare": ">=1.16.6",
+    "@tanstack/start": "^1.120.20",
     "@vercel/functions": ">=1.0.0",
     "astro": ">=4.0.0",
     "next": ">=14"
@@ -82,6 +83,9 @@
     "@opennextjs/cloudflare": {
       "optional": true
     },
+    "@tanstack/start": {
+      "optional": true
+    },
     "@vercel/functions": {
       "optional": true
     }
@@ -106,10 +110,13 @@
       "wrangler@>=4.0.0 <4.59.1": ">=4.59.1",
       "qs@>=6.7.0 <=6.14.1": ">=6.14.2",
       "devalue@<=5.6.2": ">=5.6.3",
-      "minimatch@<10.2.1": ">=10.2.1",
+      "minimatch@<10.2.1": ">=10.2.3",
       "tar@<7.5.8": ">=7.5.8",
       "ajv@>=7.0.0-alpha.0 <8.18.0": ">=8.18.0",
-      "rollup@>=4.0.0 <4.59.0": ">=4.59.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"
     }
   }
 }