@appwarden/middleware 1.1.2 → 1.1.4

package/{chunk-SDYUAIDZ.js → chunk-6DI6L6AE.js}

@@ -1,6 +1,7 @@
 import {
   APPWARDEN_CACHE_KEY,
   APPWARDEN_TEST_ROUTE,
+  APPWARDEN_USER_AGENT,
   LockValue,
   MemoryCache,
   UseCSPInputSchema,
@@ -9,7 +10,7 @@ import {
   printMessage,
   removedHeaders,
   renderLockPage
-} from "./chunk-RKUPO5Z3.js";
+} from "./chunk-GC5FS43G.js";
 
 // src/utils/cloudflare/cloudflare-cache.ts
 var store = {
@@ -39,7 +40,7 @@ var getCacheValue = async (context, cacheKey) => {
 var updateCacheValue = async (context, cacheKey, value, cacheExpirationSeconds) => {
   debug(
     "updating cache...",
-    cacheKey.pathname,
+    cacheKey.href,
     value,
     cacheExpirationSeconds ? `expires in ${cacheExpirationSeconds}s` : ""
   );
@@ -127,7 +128,7 @@ var getLockValue = async (context) => {
 var insertErrorLogs = async (context, error) => {
   const errors = getErrors(error);
   for (const err of errors) {
-    console.error(printMessage(err));
+    console.log(printMessage(err));
   }
   return new HTMLRewriter().on("body", {
     element: (elem) => {
@@ -196,21 +197,20 @@ var syncEdgeValue = async (context) => {
       if (result.error) {
         throw new APIError(result.error.message);
       }
-      if (result.content) {
-        try {
-          const parsedValue = LockValue.omit({ lastCheck: true }).parse(
-            result.content
-          );
-          debug(
-            `syncing with api...DONE ${JSON.stringify(parsedValue, null, 2)}`
-          );
-          await context.edgeCache.updateValue({
-            ...parsedValue,
-            lastCheck: Date.now()
-          });
-        } catch (error) {
-          throw new APIError(`Failed to parse check endpoint result - ${error}`);
-        }
+      if (!result.content) {
+        throw new APIError("no content from api");
+      }
+      try {
+        const parsedValue = LockValue.omit({ lastCheck: true }).parse(
+          result.content
+        );
+        debug(`syncing with api...DONE ${JSON.stringify(parsedValue, null, 2)}`);
+        await context.edgeCache.updateValue({
+          ...parsedValue,
+          lastCheck: Date.now()
+        });
+      } catch (error) {
+        throw new APIError(`Failed to parse check endpoint result - ${error}`);
       }
     }
   } catch (e) {
@@ -329,7 +329,8 @@ var useAppwarden = (input) => async (context, next) => {
       return;
     }
     const isHTMLRequest = response.headers.get("Content-Type")?.includes("text/html");
-    if (isHTMLRequest) {
+    const isMonitoringRequest = request.headers.get("User-Agent") === APPWARDEN_USER_AGENT;
+    if (isHTMLRequest && !isMonitoringRequest) {
       const innerContext = {
         keyName,
         request,

package/{chunk-RKUPO5Z3.js → chunk-GC5FS43G.js}

@@ -4,6 +4,7 @@ var removedHeaders = ["X-Powered-By", "Server"];
 var errors = { badCacheConnection: "BAD_CACHE_CONNECTION" };
 var globalErrors = [errors.badCacheConnection];
 var APPWARDEN_TEST_ROUTE = "/_appwarden/test";
+var APPWARDEN_USER_AGENT = "Appwarden-Monitor";
 var APPWARDEN_CACHE_KEY = "appwarden-lock";
 
 // src/utils/is-cache-url.ts
@@ -88,7 +89,7 @@ var errorsMap = {
     ["DirectivesRequired" /* DirectivesRequired */]: '`CSP_DIRECTIVES` must be provided when `CSP_MODE` is "report-only" or "enforced"',
     ["DirectivesBadParse" /* DirectivesBadParse */]: "Failed to parse `CSP_DIRECTIVES`. Is it a valid JSON string?"
   },
-  appwardenApiToken: "Please provide a valid `appwardenApiToken`. Learn more at https://appwarden.com/docs/api-tokens."
+  appwardenApiToken: "Please provide a valid `appwardenApiToken`. Learn more at https://appwarden.com/docs/guides/api-token-management."
 };
 var getErrors = (error) => {
   const matches = [];
@@ -307,7 +308,7 @@ var AppwardenConfigSchema = BaseNextJsConfigSchema.refine(
   }
 ).refine((data) => !!data.appwardenApiToken, {
   message: printMessage(
-    "Please provide a valid `appwardenApiToken`. Learn more at https://appwarden.com/docs/api-tokens."
+    "Please provide a valid `appwardenApiToken`. Learn more at https://appwarden.com/docs/guides/api-token-management."
   ),
   path: ["appwardenApiToken"]
 });
@@ -472,7 +473,11 @@ var CSPDirectivesSchema = z8.union([
   z8.string(),
   ContentSecurityPolicySchema
 ]);
-var CSPModeSchema = z8.literal("disabled").or(z8.literal("report-only")).or(z8.literal("enforced")).optional().default("disabled");
+var CSPModeSchema = z8.union([
+  z8.literal("disabled"),
+  z8.literal("report-only"),
+  z8.literal("enforced")
+]).optional().default("disabled");
 var UseCSPInputSchema = z8.object({
   mode: CSPModeSchema,
   directives: CSPDirectivesSchema.optional().refine(
@@ -503,6 +508,7 @@ export {
   removedHeaders,
   globalErrors,
   APPWARDEN_TEST_ROUTE,
+  APPWARDEN_USER_AGENT,
   APPWARDEN_CACHE_KEY,
   debug,
   getErrors,

package/cloudflare.d.ts

@@ -1,5 +1,5 @@
-import { M as Middleware, B as Bindings } from './use-content-security-policy-DBWKjDEH.js';
-export { u as useContentSecurityPolicy } from './use-content-security-policy-DBWKjDEH.js';
+import { M as Middleware, B as Bindings } from './use-content-security-policy-UyG9yvVs.js';
+export { u as useContentSecurityPolicy } from './use-content-security-policy-UyG9yvVs.js';
 import { z } from 'zod';
 
 declare const ConfigFnInputSchema: z.ZodFunction<z.ZodTuple<[z.ZodType<{

package/cloudflare.js

@@ -2,11 +2,11 @@ import {
   insertErrorLogs,
   useAppwarden,
   useContentSecurityPolicy
-} from "./chunk-SDYUAIDZ.js";
+} from "./chunk-6DI6L6AE.js";
 import {
   ConfigFnInputSchema,
   usePipeline
-} from "./chunk-RKUPO5Z3.js";
+} from "./chunk-GC5FS43G.js";
 
 // src/runners/appwarden-on-cloudflare.ts
 import { ZodError } from "zod";

package/index.d.ts

@@ -1,7 +1,8 @@
-export { B as Bindings, C as CSPDirectivesSchema, a as CSPModeSchema, M as Middleware, u as useContentSecurityPolicy } from './use-content-security-policy-DBWKjDEH.js';
+export { B as Bindings, C as CSPDirectivesSchema, a as CSPModeSchema, M as Middleware, u as useContentSecurityPolicy } from './use-content-security-policy-UyG9yvVs.js';
 import { z } from 'zod';
 
 declare const LOCKDOWN_TEST_EXPIRY_MS: number;
+declare const APPWARDEN_USER_AGENT: "Appwarden-Monitor";
 declare const APPWARDEN_CACHE_KEY: "appwarden-lock";
 
 declare const getEdgeConfigId: (value?: string) => string | undefined;
@@ -32,4 +33,4 @@ declare const LockValue: z.ZodObject<{
 }>;
 type LockValueType = z.infer<typeof LockValue>;
 
-export { APPWARDEN_CACHE_KEY, LOCKDOWN_TEST_EXPIRY_MS, type LockValueType, getEdgeConfigId, isCacheUrl, isValidCacheUrl };
+export { APPWARDEN_CACHE_KEY, APPWARDEN_USER_AGENT, LOCKDOWN_TEST_EXPIRY_MS, type LockValueType, getEdgeConfigId, isCacheUrl, isValidCacheUrl };

package/index.js

@@ -1,17 +1,19 @@
 import {
   useContentSecurityPolicy
-} from "./chunk-SDYUAIDZ.js";
+} from "./chunk-6DI6L6AE.js";
 import {
   APPWARDEN_CACHE_KEY,
+  APPWARDEN_USER_AGENT,
   CSPDirectivesSchema,
   CSPModeSchema,
   LOCKDOWN_TEST_EXPIRY_MS,
   getEdgeConfigId,
   isCacheUrl,
   isValidCacheUrl
-} from "./chunk-RKUPO5Z3.js";
+} from "./chunk-GC5FS43G.js";
 export {
   APPWARDEN_CACHE_KEY,
+  APPWARDEN_USER_AGENT,
   CSPDirectivesSchema,
   CSPModeSchema,
   LOCKDOWN_TEST_EXPIRY_MS,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appwarden/middleware",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Instantly shut off access your app deployed on Cloudflare or Vercel",
   "type": "module",
   "license": "MIT",
@@ -16,7 +16,7 @@
     "monitoring"
   ],
   "dependencies": {
-    "@cloudflare/next-on-pages": "1.13.2",
+    "@cloudflare/next-on-pages": "1.13.5",
     "@upstash/redis": "^1.30.0",
     "@vercel/edge-config": "^1.1.0",
     "zod": "^3"

package/{use-content-security-policy-DBWKjDEH.d.ts → use-content-security-policy-UyG9yvVs.d.ts}

@@ -188,9 +188,9 @@ declare const CSPDirectivesSchema: z.ZodUnion<[z.ZodString, z.ZodObject<{
     "trusted-types"?: string | boolean | string[] | undefined;
     "require-trusted-types-for"?: string | boolean | string[] | undefined;
 }>]>;
-declare const CSPModeSchema: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodUnion<[z.ZodLiteral<"disabled">, z.ZodLiteral<"report-only">]>, z.ZodLiteral<"enforced">]>>>;
+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<{
-    mode: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodUnion<[z.ZodLiteral<"disabled">, z.ZodLiteral<"report-only">]>, z.ZodLiteral<"enforced">]>>>;
+    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]>>;
         "script-src": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;

package/vercel.js

@@ -1,5 +1,6 @@
 import {
   APPWARDEN_CACHE_KEY,
+  APPWARDEN_USER_AGENT,
   AppwardenConfigSchema,
   BaseNextJsConfigSchema,
   MemoryCache,
@@ -10,7 +11,7 @@ import {
   isCacheUrl,
   printMessage,
   syncEdgeValue
-} from "./chunk-RKUPO5Z3.js";
+} from "./chunk-GC5FS43G.js";
 
 // src/runners/appwarden-on-vercel.ts
 import { NextResponse } from "next/server";
@@ -36,14 +37,13 @@ var appwardenOnVercel = (input) => async (req, event) => {
   }
   try {
     const requestUrl = new URL(req.url);
-    const acceptHeader = req.headers.get("accept");
-    const isHTMLRequest = acceptHeader?.includes("text/html");
+    const isHTMLRequest = req.headers.get("accept")?.includes("text/html");
+    const isMonitoringRequest = req.headers.get("User-Agent") === APPWARDEN_USER_AGENT;
     debug({
-      acceptHeader,
       isHTMLRequest,
       url: requestUrl.pathname
     });
-    if (isHTMLRequest) {
+    if (isHTMLRequest && !isMonitoringRequest) {
       let appwardenResponse = void 0;
       const context = {
         req,