@appwarden/middleware 3.11.2 → 3.11.4

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

package/chunk-5HCAAVK5.js

@@ -0,0 +1,38 @@
+import {
+  UseCSPInputSchema
+} from "./chunk-ZTVJBORU.js";
+import {
+  AppwardenApiHostnameSchema,
+  AppwardenApiTokenSchema,
+  BooleanSchema
+} from "./chunk-WEM7GS4M.js";
+
+// src/schemas/use-appwarden.ts
+import { z } from "zod";
+var AppwardenMultidomainConfigSchema = z.record(
+  z.string(),
+  z.object({
+    lockPageSlug: z.string(),
+    contentSecurityPolicy: z.lazy(() => UseCSPInputSchema).optional(),
+    debug: BooleanSchema.optional()
+  })
+);
+var UseAppwardenInputSchema = z.object({
+  debug: BooleanSchema.default(false),
+  lockPageSlug: z.string().optional(),
+  contentSecurityPolicy: z.lazy(() => UseCSPInputSchema).optional(),
+  multidomainConfig: AppwardenMultidomainConfigSchema.optional(),
+  appwardenApiToken: AppwardenApiTokenSchema,
+  appwardenApiHostname: AppwardenApiHostnameSchema.optional()
+});
+var lockPageSlugRefinement = (schema) => schema.refine(
+  (data) => data.lockPageSlug || data.multidomainConfig,
+  {
+    message: "lockPageSlug must be provided"
+  }
+);
+
+export {
+  UseAppwardenInputSchema,
+  lockPageSlugRefinement
+};

package/{chunk-6JYUNSUJ.js → chunk-AY4ZKZTF.js}

@@ -1,9 +1,9 @@
 import {
   LOCKDOWN_TEST_EXPIRY_MS
-} from "./chunk-2WPLLVUI.js";
+} from "./chunk-ZTVJBORU.js";
 import {
   printMessage
-} from "./chunk-ASH6UZ27.js";
+} from "./chunk-R7TXTHSG.js";
 
 // src/utils/build-lock-page-url.ts
 function normalizeLockPageSlug(lockPageSlug) {
@@ -110,11 +110,53 @@ var MemoryCache = class {
   };
 };
 
+// src/utils/request-checks.ts
+function isHTMLResponse(response) {
+  return response.headers.get("Content-Type")?.includes("text/html") ?? false;
+}
+function isHTMLRequest(request) {
+  const accept = request.headers.get("accept");
+  if (!accept) {
+    return false;
+  }
+  const normalizedAccept = accept.toLowerCase();
+  const isWildcardOnlyAccept = (value) => {
+    const mediaRanges2 = value.split(",");
+    let hasNonEmptyRange = false;
+    for (const range of mediaRanges2) {
+      const [typeSubtype] = range.split(";");
+      const trimmed = typeSubtype.trim();
+      if (!trimmed) {
+        continue;
+      }
+      hasNonEmptyRange = true;
+      if (trimmed !== "*/*" && trimmed !== "*") {
+        return false;
+      }
+    }
+    return hasNonEmptyRange;
+  };
+  if (isWildcardOnlyAccept(normalizedAccept)) {
+    return false;
+  }
+  const mediaRanges = normalizedAccept.split(",");
+  for (const range of mediaRanges) {
+    const [typeSubtype] = range.split(";");
+    const token = typeSubtype.trim();
+    if (token === "text/html") {
+      return true;
+    }
+  }
+  return false;
+}
+
 export {
   buildLockPageUrl,
   isOnLockPage,
   TEMPORARY_REDIRECT_STATUS,
   createRedirect,
   debug,
-  MemoryCache
+  MemoryCache,
+  isHTMLResponse,
+  isHTMLRequest
 };

package/{chunk-VQIRZMED.js → chunk-QC2ZUZWY.js}

@@ -1,17 +1,17 @@
 import {
   MemoryCache,
   debug
-} from "./chunk-6JYUNSUJ.js";
+} from "./chunk-AY4ZKZTF.js";
 import {
   APPWARDEN_CACHE_KEY,
   APPWARDEN_TEST_ROUTE
-} from "./chunk-2WPLLVUI.js";
+} from "./chunk-ZTVJBORU.js";
 import {
   deleteEdgeValue,
   getLockValue,
   store,
   syncEdgeValue
-} from "./chunk-ASH6UZ27.js";
+} from "./chunk-R7TXTHSG.js";
 
 // src/core/check-lock-status.ts
 var createContext = async (config) => {

package/{chunk-ASH6UZ27.js → chunk-R7TXTHSG.js}

@@ -1,3 +1,7 @@
+import {
+  LockValue
+} from "./chunk-WEM7GS4M.js";
+
 // src/utils/cloudflare/cloudflare-cache.ts
 var store = {
   json: (context, cacheKey, options) => {
@@ -101,29 +105,6 @@ var deleteEdgeValue = async (context) => {
   }
 };
 
-// src/schemas/helpers.ts
-import { z } from "zod";
-var BoolOrStringSchema = z.union([z.string(), z.boolean()]).optional();
-var BooleanSchema = BoolOrStringSchema.transform((val) => {
-  if (val === "true" || val === true) {
-    return true;
-  } else if (val === "false" || val === false) {
-    return false;
-  }
-  throw new Error("Invalid value");
-});
-var AppwardenApiTokenSchema = z.string().refine((val) => !!val, { message: "appwardenApiToken is required" });
-var AppwardenApiHostnameSchema = z.string().url({
-  message: "Invalid `appwardenApiHostname`. Please provide an absolute URL (e.g. https://api.appwarden.io)."
-}).refine((value) => value.startsWith("https://"), {
-  message: "`appwardenApiHostname` must use the https:// scheme (e.g. https://api.appwarden.io)."
-});
-var LockValue = z.object({
-  isLocked: z.number(),
-  isLockedTest: z.number(),
-  lastCheck: z.number()
-});
-
 // src/utils/errors.ts
 var errorsMap = {
   mode: '`CSP_MODE` must be one of "disabled", "report-only", or "enforced"',
@@ -309,10 +290,6 @@ var syncEdgeValue = async (context) => {
 export {
   printMessage,
   getErrors,
-  BooleanSchema,
-  AppwardenApiTokenSchema,
-  AppwardenApiHostnameSchema,
-  LockValue,
   store,
   CSP_KEYWORDS,
   isCSPKeyword,

package/{chunk-RQLMO5FA.js → chunk-WBWF3PPX.js}

@@ -1,10 +1,12 @@
 import {
-  UseCSPInputSchema,
   isHTMLResponse
-} from "./chunk-2WPLLVUI.js";
+} from "./chunk-AY4ZKZTF.js";
+import {
+  UseCSPInputSchema
+} from "./chunk-ZTVJBORU.js";
 import {
   makeCSPHeader
-} from "./chunk-ASH6UZ27.js";
+} from "./chunk-R7TXTHSG.js";
 
 // src/middlewares/use-content-security-policy.ts
 var AppendAttribute = (attribute, nonce) => ({

package/chunk-WEM7GS4M.js

@@ -0,0 +1,29 @@
+// src/schemas/helpers.ts
+import { z } from "zod";
+var BoolOrStringSchema = z.union([z.string(), z.boolean()]).optional();
+var BooleanSchema = BoolOrStringSchema.transform((val) => {
+  if (val === "true" || val === true) {
+    return true;
+  } else if (val === "false" || val === false) {
+    return false;
+  }
+  throw new Error("Invalid value");
+});
+var AppwardenApiTokenSchema = z.string().refine((val) => !!val, { message: "appwardenApiToken is required" });
+var AppwardenApiHostnameSchema = z.string().url({
+  message: "Invalid `appwardenApiHostname`. Please provide an absolute URL (e.g. https://api.appwarden.io)."
+}).refine((value) => value.startsWith("https://"), {
+  message: "`appwardenApiHostname` must use the https:// scheme (e.g. https://api.appwarden.io)."
+});
+var LockValue = z.object({
+  isLocked: z.number(),
+  isLockedTest: z.number(),
+  lastCheck: z.number()
+});
+
+export {
+  BooleanSchema,
+  AppwardenApiTokenSchema,
+  AppwardenApiHostnameSchema,
+  LockValue
+};

package/{chunk-2WPLLVUI.js → chunk-ZTVJBORU.js}

@@ -40,46 +40,6 @@ var ContentSecurityPolicySchema = z.object({
   "require-trusted-types-for": stringySchema.optional()
 });
 
-// src/utils/request-checks.ts
-function isHTMLResponse(response) {
-  return response.headers.get("Content-Type")?.includes("text/html") ?? false;
-}
-function isHTMLRequest(request) {
-  const accept = request.headers.get("accept");
-  if (!accept) {
-    return false;
-  }
-  const normalizedAccept = accept.toLowerCase();
-  const isWildcardOnlyAccept = (value) => {
-    const mediaRanges2 = value.split(",");
-    let hasNonEmptyRange = false;
-    for (const range of mediaRanges2) {
-      const [typeSubtype] = range.split(";");
-      const trimmed = typeSubtype.trim();
-      if (!trimmed) {
-        continue;
-      }
-      hasNonEmptyRange = true;
-      if (trimmed !== "*/*" && trimmed !== "*") {
-        return false;
-      }
-    }
-    return hasNonEmptyRange;
-  };
-  if (isWildcardOnlyAccept(normalizedAccept)) {
-    return false;
-  }
-  const mediaRanges = normalizedAccept.split(",");
-  for (const range of mediaRanges) {
-    const [typeSubtype] = range.split(";");
-    const token = typeSubtype.trim();
-    if (token === "text/html") {
-      return true;
-    }
-  }
-  return false;
-}
-
 // src/schemas/use-content-security-policy.ts
 var CSPDirectivesSchema = z2.union([
   z2.string(),
@@ -117,7 +77,5 @@ export {
   APPWARDEN_CACHE_KEY,
   CSPDirectivesSchema,
   CSPModeSchema,
-  UseCSPInputSchema,
-  isHTMLResponse,
-  isHTMLRequest
+  UseCSPInputSchema
 };

package/cloudflare/astro.d.ts

@@ -270,8 +270,8 @@ declare const AstroCloudflareConfigSchema: z.ZodObject<{
         };
     }>>>;
 }, "strip", z.ZodTypeAny, {
-    debug: boolean;
     lockPageSlug: string;
+    debug: boolean;
     appwardenApiToken: string;
     contentSecurityPolicy?: {
         mode: "disabled" | "report-only" | "enforced";
@@ -308,7 +308,6 @@ declare const AstroCloudflareConfigSchema: z.ZodObject<{
 }, {
     lockPageSlug: string;
     appwardenApiToken: string;
-    debug?: string | boolean | undefined;
     contentSecurityPolicy?: {
         mode: "disabled" | "report-only" | "enforced";
         directives: string | {
@@ -340,6 +339,7 @@ declare const AstroCloudflareConfigSchema: z.ZodObject<{
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
         };
     } | undefined;
+    debug?: string | boolean | undefined;
     appwardenApiHostname?: string | undefined;
 }>;
 type AstroCloudflareConfig = z.infer<typeof AstroCloudflareConfigSchema>;

package/cloudflare/astro.js

@@ -3,30 +3,32 @@ import {
 } from "../chunk-XFG6SUSV.js";
 import {
   useContentSecurityPolicy
-} from "../chunk-RQLMO5FA.js";
+} from "../chunk-WBWF3PPX.js";
 import {
   getNowMs
 } from "../chunk-X7WZVYQS.js";
 import {
   checkLockStatus
-} from "../chunk-VQIRZMED.js";
+} from "../chunk-QC2ZUZWY.js";
 import {
   TEMPORARY_REDIRECT_STATUS,
   buildLockPageUrl,
   createRedirect,
   debug,
+  isHTMLRequest,
   isOnLockPage
-} from "../chunk-6JYUNSUJ.js";
+} from "../chunk-AY4ZKZTF.js";
 import {
-  UseCSPInputSchema,
-  isHTMLRequest
-} from "../chunk-2WPLLVUI.js";
+  UseCSPInputSchema
+} from "../chunk-ZTVJBORU.js";
+import {
+  printMessage
+} from "../chunk-R7TXTHSG.js";
 import {
   AppwardenApiHostnameSchema,
   AppwardenApiTokenSchema,
-  BooleanSchema,
-  printMessage
-} from "../chunk-ASH6UZ27.js";
+  BooleanSchema
+} from "../chunk-WEM7GS4M.js";
 
 // src/adapters/astro-cloudflare.ts
 import { waitUntil } from "cloudflare:workers";

package/cloudflare/nextjs.d.ts

@@ -329,8 +329,8 @@ declare const NextJsCloudflareConfigSchema: z.ZodObject<{
         };
     }>>>;
 }, "strip", z.ZodTypeAny, {
-    debug: boolean;
     lockPageSlug: string;
+    debug: boolean;
     appwardenApiToken: string;
     contentSecurityPolicy?: {
         mode: "disabled" | "report-only" | "enforced";
@@ -367,7 +367,6 @@ declare const NextJsCloudflareConfigSchema: z.ZodObject<{
 }, {
     lockPageSlug: string;
     appwardenApiToken: string;
-    debug?: string | boolean | undefined;
     contentSecurityPolicy?: {
         mode: "disabled" | "report-only" | "enforced";
         directives: string | {
@@ -399,6 +398,7 @@ declare const NextJsCloudflareConfigSchema: z.ZodObject<{
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
         };
     } | undefined;
+    debug?: string | boolean | undefined;
     appwardenApiHostname?: string | undefined;
 }>;
 type NextJsCloudflareConfig = z.infer<typeof NextJsCloudflareConfigSchema>;

package/cloudflare/nextjs.js

@@ -3,23 +3,25 @@ import {
 } from "../chunk-X7WZVYQS.js";
 import {
   checkLockStatus
-} from "../chunk-VQIRZMED.js";
+} from "../chunk-QC2ZUZWY.js";
 import {
   TEMPORARY_REDIRECT_STATUS,
   buildLockPageUrl,
   debug,
+  isHTMLRequest,
   isOnLockPage
-} from "../chunk-6JYUNSUJ.js";
+} from "../chunk-AY4ZKZTF.js";
 import {
-  UseCSPInputSchema,
-  isHTMLRequest
-} from "../chunk-2WPLLVUI.js";
+  UseCSPInputSchema
+} from "../chunk-ZTVJBORU.js";
+import {
+  printMessage
+} from "../chunk-R7TXTHSG.js";
 import {
   AppwardenApiHostnameSchema,
   AppwardenApiTokenSchema,
-  BooleanSchema,
-  printMessage
-} from "../chunk-ASH6UZ27.js";
+  BooleanSchema
+} from "../chunk-WEM7GS4M.js";
 
 // src/adapters/nextjs-cloudflare.ts
 import {
@@ -102,7 +104,7 @@ function createAppwardenMiddleware(configFn) {
         debugFn(
           `Applying CSP headers in ${config.contentSecurityPolicy.mode} mode`
         );
-        const { makeCSPHeader } = await import("../cloudflare-TJXWELMX.js");
+        const { makeCSPHeader } = await import("../cloudflare-MAHYENA6.js");
         const [headerName, headerValue] = makeCSPHeader(
           "",
           config.contentSecurityPolicy.directives,

package/cloudflare/react-router.d.ts

@@ -268,8 +268,8 @@ declare const ReactRouterCloudflareConfigSchema: z.ZodObject<{
         };
     }>>>;
 }, "strip", z.ZodTypeAny, {
-    debug: boolean;
     lockPageSlug: string;
+    debug: boolean;
     appwardenApiToken: string;
     contentSecurityPolicy?: {
         mode: "disabled" | "report-only" | "enforced";
@@ -306,7 +306,6 @@ declare const ReactRouterCloudflareConfigSchema: z.ZodObject<{
 }, {
     lockPageSlug: string;
     appwardenApiToken: string;
-    debug?: string | boolean | undefined;
     contentSecurityPolicy?: {
         mode: "disabled" | "report-only" | "enforced";
         directives: string | {
@@ -338,6 +337,7 @@ declare const ReactRouterCloudflareConfigSchema: z.ZodObject<{
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
         };
     } | undefined;
+    debug?: string | boolean | undefined;
     appwardenApiHostname?: string | undefined;
 }>;
 type ReactRouterCloudflareConfig = z.infer<typeof ReactRouterCloudflareConfigSchema>;

package/cloudflare/react-router.js

@@ -3,29 +3,31 @@ import {
 } from "../chunk-XFG6SUSV.js";
 import {
   useContentSecurityPolicy
-} from "../chunk-RQLMO5FA.js";
+} from "../chunk-WBWF3PPX.js";
 import {
   getNowMs
 } from "../chunk-X7WZVYQS.js";
 import {
   checkLockStatus
-} from "../chunk-VQIRZMED.js";
+} from "../chunk-QC2ZUZWY.js";
 import {
   buildLockPageUrl,
   createRedirect,
   debug,
+  isHTMLRequest,
   isOnLockPage
-} from "../chunk-6JYUNSUJ.js";
+} from "../chunk-AY4ZKZTF.js";
 import {
-  UseCSPInputSchema,
-  isHTMLRequest
-} from "../chunk-2WPLLVUI.js";
+  UseCSPInputSchema
+} from "../chunk-ZTVJBORU.js";
+import {
+  printMessage
+} from "../chunk-R7TXTHSG.js";
 import {
   AppwardenApiHostnameSchema,
   AppwardenApiTokenSchema,
-  BooleanSchema,
-  printMessage
-} from "../chunk-ASH6UZ27.js";
+  BooleanSchema
+} from "../chunk-WEM7GS4M.js";
 
 // src/adapters/react-router-cloudflare.ts
 import { waitUntil } from "cloudflare:workers";

package/cloudflare/tanstack-start.d.ts

@@ -268,8 +268,8 @@ declare const TanStackStartCloudflareConfigSchema: z.ZodObject<{
         };
     }>>>;
 }, "strip", z.ZodTypeAny, {
-    debug: boolean;
     lockPageSlug: string;
+    debug: boolean;
     appwardenApiToken: string;
     contentSecurityPolicy?: {
         mode: "disabled" | "report-only" | "enforced";
@@ -306,7 +306,6 @@ declare const TanStackStartCloudflareConfigSchema: z.ZodObject<{
 }, {
     lockPageSlug: string;
     appwardenApiToken: string;
-    debug?: string | boolean | undefined;
     contentSecurityPolicy?: {
         mode: "disabled" | "report-only" | "enforced";
         directives: string | {
@@ -338,6 +337,7 @@ declare const TanStackStartCloudflareConfigSchema: z.ZodObject<{
             "require-trusted-types-for"?: string | boolean | string[] | undefined;
         };
     } | undefined;
+    debug?: string | boolean | undefined;
     appwardenApiHostname?: string | undefined;
 }>;
 type TanStackStartCloudflareConfig = z.infer<typeof TanStackStartCloudflareConfigSchema>;

package/cloudflare/tanstack-start.js

@@ -3,29 +3,31 @@ import {
 } from "../chunk-XFG6SUSV.js";
 import {
   useContentSecurityPolicy
-} from "../chunk-RQLMO5FA.js";
+} from "../chunk-WBWF3PPX.js";
 import {
   getNowMs
 } from "../chunk-X7WZVYQS.js";
 import {
   checkLockStatus
-} from "../chunk-VQIRZMED.js";
+} from "../chunk-QC2ZUZWY.js";
 import {
   buildLockPageUrl,
   createRedirect,
   debug,
+  isHTMLRequest,
   isOnLockPage
-} from "../chunk-6JYUNSUJ.js";
+} from "../chunk-AY4ZKZTF.js";
 import {
-  UseCSPInputSchema,
-  isHTMLRequest
-} from "../chunk-2WPLLVUI.js";
+  UseCSPInputSchema
+} from "../chunk-ZTVJBORU.js";
+import {
+  printMessage
+} from "../chunk-R7TXTHSG.js";
 import {
   AppwardenApiHostnameSchema,
   AppwardenApiTokenSchema,
-  BooleanSchema,
-  printMessage
-} from "../chunk-ASH6UZ27.js";
+  BooleanSchema
+} from "../chunk-WEM7GS4M.js";
 
 // src/adapters/tanstack-start-cloudflare.ts
 import { waitUntil } from "cloudflare:workers";

package/{cloudflare-TJXWELMX.js → cloudflare-MAHYENA6.js}

@@ -11,7 +11,8 @@ import {
   makeCSPHeader,
   store,
   syncEdgeValue
-} from "./chunk-ASH6UZ27.js";
+} from "./chunk-R7TXTHSG.js";
+import "./chunk-WEM7GS4M.js";
 export {
   CSP_KEYWORDS,
   autoQuoteCSPDirectiveArray,