@appwarden/middleware 1.1.3 → 1.1.5

package/README.md

@@ -1,5 +1,25 @@
 # @appwarden/middleware
 
-Instantly shut off all access to a domain from your Discord server.
+> Read the docs [to learn more](https://appwarden.io/docs)
 
-Read the docs [to get started](https://appwarden.io/docs/getting-started#for-projects-deployed-on-cloudflare-pages)
+## Stop in progress attacks in their tracks
+
+Instantly halt all external access to a domain from your Discord server
+
+```
+/quarantine lock your.app.io
+```
+
+## Installation
+
+Compatible with websites powered by [Cloudflare](https://developers.cloudflare.com/pages/) or [Vercel](https://vercel.com).
+
+### Cloudflare
+
+We recommend using the [`@appwarden/build-cloudflare-action`](https://github.com/appwarden/build-cloudflare-action) Github Action to deploy on Cloudflare.
+
+> Read the docs [to get started](https://appwarden.io/docs/guides/cloudflare-integration)
+
+### Vercel
+
+> Read the docs [to get started](https://appwarden.io/docs/guides/vercel-integration)

package/{chunk-3STKCAEA.js → chunk-CGJ2UT3T.js}

@@ -10,7 +10,7 @@ import {
   printMessage,
   removedHeaders,
   renderLockPage
-} from "./chunk-5UMKWIJW.js";
+} from "./chunk-GC5FS43G.js";
 
 // src/utils/cloudflare/cloudflare-cache.ts
 var store = {
@@ -18,12 +18,7 @@ var store = {
     const cacheKeyUrl = new URL(cacheKey, context.serviceOrigin);
     return {
       getValue: () => getCacheValue(context, cacheKeyUrl),
-      updateValue: (json) => updateCacheValue(
-        context,
-        cacheKeyUrl,
-        json,
-        options?.cacheExpirationSeconds
-      ),
+      updateValue: (json) => updateCacheValue(context, cacheKeyUrl, json, options?.ttl),
       deleteValue: () => clearCache(context, cacheKeyUrl)
     };
   }
@@ -37,20 +32,20 @@ var getCacheValue = async (context, cacheKey) => {
   debug(`[${cacheKey.pathname}] Cache MATCH!`);
   return match;
 };
-var updateCacheValue = async (context, cacheKey, value, cacheExpirationSeconds) => {
+var updateCacheValue = async (context, cacheKey, value, ttl) => {
   debug(
     "updating cache...",
-    cacheKey.pathname,
+    cacheKey.href,
     value,
-    cacheExpirationSeconds ? `expires in ${cacheExpirationSeconds}s` : ""
+    ttl ? `expires in ${ttl}s` : ""
   );
   await context.cache.put(
     cacheKey,
     new Response(JSON.stringify(value), {
       headers: {
         "content-type": "application/json",
-        ...cacheExpirationSeconds && {
-          "cache-control": `max-age=${cacheExpirationSeconds}`
+        ...ttl && {
+          "cache-control": `max-age=${ttl}`
         }
       }
     })
@@ -85,8 +80,8 @@ var getLockValue = async (context) => {
   try {
     let shouldDeleteEdgeValue = false;
     let cacheResponse, lockValue = {
-      isLockedTest: 0,
       isLocked: 0,
+      isLockedTest: 0,
       lastCheck: Date.now(),
       code: ""
     };
@@ -128,7 +123,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) => {
@@ -197,21 +192,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) {

package/{chunk-5UMKWIJW.js → chunk-GC5FS43G.js}

@@ -89,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 = [];
@@ -308,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"]
 });
@@ -473,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(

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-3STKCAEA.js";
+} from "./chunk-CGJ2UT3T.js";
 import {
   ConfigFnInputSchema,
   usePipeline
-} from "./chunk-5UMKWIJW.js";
+} from "./chunk-GC5FS43G.js";
 
 // src/runners/appwarden-on-cloudflare.ts
 import { ZodError } from "zod";

package/index.d.ts

@@ -1,4 +1,4 @@
-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;

package/index.js

@@ -1,6 +1,6 @@
 import {
   useContentSecurityPolicy
-} from "./chunk-3STKCAEA.js";
+} from "./chunk-CGJ2UT3T.js";
 import {
   APPWARDEN_CACHE_KEY,
   APPWARDEN_USER_AGENT,
@@ -10,7 +10,7 @@ import {
   getEdgeConfigId,
   isCacheUrl,
   isValidCacheUrl
-} from "./chunk-5UMKWIJW.js";
+} from "./chunk-GC5FS43G.js";
 export {
   APPWARDEN_CACHE_KEY,
   APPWARDEN_USER_AGENT,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appwarden/middleware",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "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

@@ -11,7 +11,7 @@ import {
   isCacheUrl,
   printMessage,
   syncEdgeValue
-} from "./chunk-5UMKWIJW.js";
+} from "./chunk-GC5FS43G.js";
 
 // src/runners/appwarden-on-vercel.ts
 import { NextResponse } from "next/server";