@appwarden/middleware 1.4.2 → 1.5.0

package/README.md

@@ -1,6 +1,6 @@
 # @appwarden/middleware
 
-![Test Coverage](https://img.shields.io/badge/coverage-92.74%25-brightgreen)
+![Test Coverage](https://img.shields.io/badge/coverage-97.14%25-brightgreen)
 [![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)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)

package/{chunk-JWUAFJ2E.js → chunk-FDIKUQ3E.js}

@@ -14,7 +14,7 @@ var debug = (...msg) => {
 };
 
 // src/utils/print-message.ts
-var addSlashes = (str) => str.replace(/[\\"'`]/g, "\\$&").replace(/\u0000/g, "\\0");
+var addSlashes = (str) => str.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\$/g, "\\$").replace(/"/g, '\\"').replace(/'/g, "\\'").replace(/\u0000/g, "\\0").replace(/<\/script>/gi, "<\\/script>");
 var printMessage = (message) => `[@appwarden/middleware] ${addSlashes(message)}`;
 
 export {

package/{chunk-47MLTBFC.js → chunk-L6RSRHOF.js}

@@ -1,6 +1,6 @@
 import {
   LOCKDOWN_TEST_EXPIRY_MS
-} from "./chunk-JWUAFJ2E.js";
+} from "./chunk-FDIKUQ3E.js";
 
 // src/utils/errors.ts
 var errorsMap = {

package/{chunk-NZNMFDZ7.js → chunk-TP5CHUTK.js}

@@ -1,7 +1,7 @@
 import {
   debug,
   printMessage
-} from "./chunk-JWUAFJ2E.js";
+} from "./chunk-FDIKUQ3E.js";
 
 // src/schemas/use-content-security-policy.ts
 import { z as z2 } from "zod";
@@ -49,6 +49,7 @@ var CSPModeSchema = z2.union([
   z2.literal("enforced")
 ]).optional().default("disabled");
 var UseCSPInputSchema = z2.object({
+  hostname: z2.string().optional(),
   mode: CSPModeSchema,
   directives: CSPDirectivesSchema.optional().refine(
     (val) => {
@@ -114,6 +115,9 @@ var useContentSecurityPolicy = (input) => {
   const config = parsedInput.data;
   return async (context, next) => {
     await next();
+    if (config.hostname && context.hostname !== config.hostname) {
+      return;
+    }
     const { response } = context;
     if (
       // if the csp is disabled
@@ -125,7 +129,7 @@ var useContentSecurityPolicy = (input) => {
     if (response.headers.has("Content-Type") && !response.headers.get("Content-Type")?.includes("text/html")) {
       return;
     }
-    const cspNonce = btoa(crypto.getRandomValues(new Uint32Array(2)).toString());
+    const cspNonce = crypto.randomUUID();
     const [cspHeaderName, cspHeaderValue] = makeCSPHeader(
       cspNonce,
       config.directives,

package/cloudflare.d.ts

@@ -1,7 +1,7 @@
 import { B as Bindings } from './cloudflare-2PkEr25r.js';
 import { z } from 'zod';
-import { M as Middleware } from './use-content-security-policy-C89AROtC.js';
-export { u as useContentSecurityPolicy } from './use-content-security-policy-C89AROtC.js';
+import { M as Middleware } from './use-content-security-policy-Cgy0nz3J.js';
+export { u as useContentSecurityPolicy } from './use-content-security-policy-Cgy0nz3J.js';
 
 declare const ConfigFnInputSchema: z.ZodFunction<z.ZodTuple<[z.ZodType<{
     env: CloudflareEnv;
@@ -11,9 +11,16 @@ declare const ConfigFnInputSchema: z.ZodFunction<z.ZodTuple<[z.ZodType<{
     env: CloudflareEnv;
     cf: Record<string, unknown>;
     ctx: unknown;
-}>], z.ZodUnknown>, z.ZodObject<{
+}>], z.ZodUnknown>, z.ZodEffects<z.ZodObject<{
     debug: z.ZodDefault<z.ZodEffects<z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodBoolean]>>, boolean, string | boolean | undefined>>;
-    lockPageSlug: z.ZodString;
+    lockPageSlug: z.ZodOptional<z.ZodString>;
+    multidomainConfig: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
+        lockPageSlug: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        lockPageSlug: string;
+    }, {
+        lockPageSlug: string;
+    }>>>;
     appwardenApiToken: z.ZodEffects<z.ZodString, string, string>;
 } & {
     middleware: z.ZodDefault<z.ZodObject<{
@@ -25,19 +32,25 @@ declare const ConfigFnInputSchema: z.ZodFunction<z.ZodTuple<[z.ZodType<{
     }>>;
 }, "strip", z.ZodTypeAny, {
     debug: boolean;
-    lockPageSlug: string;
     appwardenApiToken: string;
     middleware: {
         before: Middleware[];
     };
+    lockPageSlug?: string | undefined;
+    multidomainConfig?: Record<string, {
+        lockPageSlug: string;
+    }> | undefined;
 }, {
-    lockPageSlug: string;
     appwardenApiToken: string;
+    lockPageSlug?: string | undefined;
     debug?: string | boolean | undefined;
+    multidomainConfig?: Record<string, {
+        lockPageSlug: string;
+    }> | undefined;
     middleware?: {
         before?: Middleware[] | undefined;
     } | undefined;
-}>>;
+}>, any, any>>;
 type CloudflareConfigType = ReturnType<z.infer<typeof ConfigFnInputSchema>>;
 
 declare const withAppwarden: (inputFn: CloudflareConfigType) => ExportedHandlerFetchHandler<Bindings>;

package/cloudflare.js

@@ -1,19 +1,19 @@
 import {
   useContentSecurityPolicy
-} from "./chunk-NZNMFDZ7.js";
+} from "./chunk-TP5CHUTK.js";
 import {
   BooleanSchema,
   LockValue,
   MemoryCache,
   getErrors
-} from "./chunk-47MLTBFC.js";
+} from "./chunk-L6RSRHOF.js";
 import {
   APPWARDEN_CACHE_KEY,
   APPWARDEN_TEST_ROUTE,
   APPWARDEN_USER_AGENT,
   debug,
   printMessage
-} from "./chunk-JWUAFJ2E.js";
+} from "./chunk-FDIKUQ3E.js";
 
 // src/runners/appwarden-on-cloudflare.ts
 import { ZodError } from "zod";
@@ -23,17 +23,32 @@ import { z as z2 } from "zod";
 
 // src/schemas/use-appwarden.ts
 import { z } from "zod";
+var AppwardenMultidomainConfigSchema = z.record(
+  z.string(),
+  z.object({
+    lockPageSlug: z.string()
+  })
+);
 var UseAppwardenInputSchema = z.object({
   debug: BooleanSchema.default(false),
-  lockPageSlug: z.string(),
+  lockPageSlug: z.string().optional(),
+  multidomainConfig: AppwardenMultidomainConfigSchema.optional(),
   appwardenApiToken: z.string().refine((val) => !!val, { path: ["appwardenApiToken"] })
 });
+var lockPageSlugRefinement = (schema) => schema.refine(
+  (data) => data.lockPageSlug || data.multidomainConfig,
+  {
+    message: "Either lockPageSlug or multidomainConfig must be provided"
+  }
+);
 
 // src/schemas/cloudflare.ts
 var ConfigFnInputSchema = z2.function().args(z2.custom()).returns(
-  UseAppwardenInputSchema.extend({
-    middleware: z2.object({ before: z2.custom().array().default([]) }).default({})
-  })
+  lockPageSlugRefinement(
+    UseAppwardenInputSchema.extend({
+      middleware: z2.object({ before: z2.custom().array().default([]) }).default({})
+    })
+  )
 );
 
 // src/utils/middleware.ts
@@ -312,6 +327,10 @@ var useAppwarden = (input) => async (context, next) => {
     const isHTMLRequest = response.headers.get("Content-Type")?.includes("text/html");
     const isMonitoringRequest = request.headers.get("User-Agent") === APPWARDEN_USER_AGENT;
     if (isHTMLRequest && !isMonitoringRequest) {
+      const lockPageSlug = input.multidomainConfig?.[requestUrl.hostname]?.lockPageSlug ?? input.lockPageSlug;
+      if (!lockPageSlug) {
+        return;
+      }
       const innerContext = {
         keyName,
         request,
@@ -319,7 +338,7 @@ var useAppwarden = (input) => async (context, next) => {
         requestUrl,
         provider,
         debug: input.debug,
-        lockPageSlug: input.lockPageSlug,
+        lockPageSlug,
         appwardenApiToken: input.appwardenApiToken,
         waitUntil: (fn) => context.waitUntil(fn)
       };

package/index.d.ts

@@ -1,5 +1,5 @@
 export { B as Bindings } from './cloudflare-2PkEr25r.js';
-export { C as CSPDirectivesSchema, a as CSPModeSchema, M as Middleware, u as useContentSecurityPolicy } from './use-content-security-policy-C89AROtC.js';
+export { C as CSPDirectivesSchema, a as CSPModeSchema, M as Middleware, u as useContentSecurityPolicy } from './use-content-security-policy-Cgy0nz3J.js';
 import { z } from 'zod';
 
 declare const LOCKDOWN_TEST_EXPIRY_MS: number;

package/index.js

@@ -7,12 +7,12 @@ import {
   CSPDirectivesSchema,
   CSPModeSchema,
   useContentSecurityPolicy
-} from "./chunk-NZNMFDZ7.js";
+} from "./chunk-TP5CHUTK.js";
 import {
   APPWARDEN_CACHE_KEY,
   APPWARDEN_USER_AGENT,
   LOCKDOWN_TEST_EXPIRY_MS
-} from "./chunk-JWUAFJ2E.js";
+} from "./chunk-FDIKUQ3E.js";
 export {
   APPWARDEN_CACHE_KEY,
   APPWARDEN_USER_AGENT,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appwarden/middleware",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "description": "Instantly shut off access your app deployed on Cloudflare or Vercel",
   "type": "module",
   "license": "MIT",

package/{use-content-security-policy-C89AROtC.d.ts → use-content-security-policy-Cgy0nz3J.d.ts}

@@ -95,6 +95,7 @@ declare const CSPDirectivesSchema: z.ZodUnion<[z.ZodString, z.ZodObject<{
 }>]>;
 declare const CSPModeSchema: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"disabled">, z.ZodLiteral<"report-only">, z.ZodLiteral<"enforced">]>>>;
 declare const UseCSPInputSchema: z.ZodEffects<z.ZodObject<{
+    hostname: z.ZodOptional<z.ZodString>;
     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<{
         "default-src": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
@@ -316,6 +317,7 @@ declare const UseCSPInputSchema: z.ZodEffects<z.ZodObject<{
         "trusted-types"?: string | boolean | string[] | undefined;
         "require-trusted-types-for"?: string | boolean | string[] | undefined;
     } | undefined;
+    hostname?: string | undefined;
 }, {
     mode?: "disabled" | "report-only" | "enforced" | undefined;
     directives?: string | {
@@ -346,6 +348,7 @@ declare const UseCSPInputSchema: z.ZodEffects<z.ZodObject<{
         "trusted-types"?: string | boolean | string[] | undefined;
         "require-trusted-types-for"?: string | boolean | string[] | undefined;
     } | undefined;
+    hostname?: string | undefined;
 }>, {
     mode: "disabled" | "report-only" | "enforced";
     directives?: {
@@ -376,6 +379,7 @@ declare const UseCSPInputSchema: z.ZodEffects<z.ZodObject<{
         "trusted-types"?: string | boolean | string[] | undefined;
         "require-trusted-types-for"?: string | boolean | string[] | undefined;
     } | undefined;
+    hostname?: string | undefined;
 }, {
     mode?: "disabled" | "report-only" | "enforced" | undefined;
     directives?: string | {
@@ -406,6 +410,7 @@ declare const UseCSPInputSchema: z.ZodEffects<z.ZodObject<{
         "trusted-types"?: string | boolean | string[] | undefined;
         "require-trusted-types-for"?: string | boolean | string[] | undefined;
     } | undefined;
+    hostname?: string | undefined;
 }>;
 type UseCSPInput = z.infer<typeof UseCSPInputSchema>;
 

package/vercel.js

@@ -7,7 +7,7 @@ import {
   LockValue,
   MemoryCache,
   getErrors
-} from "./chunk-47MLTBFC.js";
+} from "./chunk-L6RSRHOF.js";
 import {
   APPWARDEN_CACHE_KEY,
   APPWARDEN_TEST_ROUTE,
@@ -16,7 +16,7 @@ import {
   errors,
   globalErrors,
   printMessage
-} from "./chunk-JWUAFJ2E.js";
+} from "./chunk-FDIKUQ3E.js";
 
 // src/runners/appwarden-on-vercel.ts
 import { NextResponse } from "next/server";