@appwarden/middleware 1.5.1 → 2.0.0

package/vercel.js

@@ -1,91 +1,30 @@
 import {
-  getEdgeConfigId,
   isCacheUrl,
   isValidCacheUrl
 } from "./chunk-QEFORWCW.js";
+import {
+  validateConfig
+} from "./chunk-6PUA5YXP.js";
 import {
   LockValue,
-  MemoryCache,
-  getErrors
-} from "./chunk-L6RSRHOF.js";
+  MemoryCache
+} from "./chunk-B5IE7V77.js";
 import {
   APPWARDEN_CACHE_KEY,
-  APPWARDEN_TEST_ROUTE,
-  APPWARDEN_USER_AGENT,
   debug,
   errors,
   globalErrors,
+  isHTMLRequest,
   printMessage
-} from "./chunk-FDIKUQ3E.js";
+} from "./chunk-7UTT3M2S.js";
 
 // src/runners/appwarden-on-vercel.ts
+import { waitUntil } from "@vercel/functions";
 import { NextResponse } from "next/server";
 
 // src/schemas/vercel.ts
 import { z } from "zod";
 
-// src/utils/vercel/delete-edge-value.ts
-var deleteEdgeValue = async ({
-  keyName,
-  provider,
-  cacheUrl,
-  vercelApiToken
-}) => {
-  try {
-    switch (provider) {
-      case "edge-config": {
-        const edgeConfigId = getEdgeConfigId(cacheUrl);
-        if (!edgeConfigId) {
-          throw new Error("Failed to parse `edgeConfigId`");
-        }
-        const res = await fetch(
-          `https://api.vercel.com/v1/edge-config/${edgeConfigId}/items`,
-          {
-            method: "PATCH",
-            headers: {
-              Authorization: `Bearer ${vercelApiToken}`,
-              "Content-Type": "application/json"
-            },
-            body: JSON.stringify({
-              items: [
-                {
-                  key: keyName,
-                  operation: "delete"
-                }
-              ]
-            })
-          }
-        );
-        if (res.status !== 200) {
-          let response = void 0;
-          try {
-            response = await res.json();
-          } catch (error) {
-          }
-          throw new Error(
-            `api.vercel.com/v1/edge-config responded with ${res.status} - ${res.statusText}${response?.error?.message ? ` - ${response?.error?.message}` : ""}`
-          );
-        }
-        break;
-      }
-      case "upstash": {
-        const { hostname, password } = new URL(cacheUrl);
-        const { Redis } = await import("@upstash/redis");
-        const redis = new Redis({ url: `https://${hostname}`, token: password });
-        await redis.del(keyName);
-        break;
-      }
-      default:
-        throw new Error(`Unsupported provider: ${provider}`);
-    }
-  } catch (e) {
-    const message = "Failed to delete edge value";
-    console.error(
-      printMessage(e instanceof Error ? `${message} - ${e.message}` : message)
-    );
-  }
-};
-
 // src/utils/vercel/get-lock-value.ts
 var getLockValue = async (context) => {
   try {
@@ -191,26 +130,6 @@ var syncEdgeValue = async (context) => {
   }
 };
 
-// src/utils/handle-vercel-request.ts
-var handleVercelRequest = async (context, options) => {
-  let cachedLockValue = context.memoryCache.get(context.keyName);
-  const shouldRecheck = MemoryCache.isExpired(cachedLockValue);
-  if (shouldRecheck) {
-    const { lockValue, shouldDeleteEdgeValue } = await getLockValue(context);
-    if (lockValue) {
-      context.memoryCache.put(context.keyName, lockValue);
-    }
-    if (shouldDeleteEdgeValue) {
-      await deleteEdgeValue(context);
-    }
-    cachedLockValue = lockValue;
-  }
-  if (cachedLockValue?.isLocked || context.requestUrl.pathname === APPWARDEN_TEST_ROUTE && !MemoryCache.isTestExpired(cachedLockValue)) {
-    options.onLocked();
-  }
-  return cachedLockValue;
-};
-
 // src/schemas/vercel.ts
 var BaseNextJsConfigSchema = z.object({
   cacheUrl: z.string(),
@@ -267,75 +186,67 @@ var AppwardenConfigSchema = BaseNextJsConfigSchema.refine(
 
 // src/runners/appwarden-on-vercel.ts
 debug("Instantiating isolate");
-var renderLockPage = (context) => {
-  context.req.nextUrl.pathname = context.lockPageSlug;
-  return NextResponse.rewrite(context.req.nextUrl, {
-    headers: {
-      // no browser caching, otherwise we need to hard refresh to disable lock screen
-      "Cache-Control": "no-store"
-    }
-  });
-};
 var memoryCache = new MemoryCache({ maxSize: 1 });
-var appwardenOnVercel = (input) => async (req, event) => {
-  event.passThroughOnException();
-  const parsedConfig = AppwardenConfigSchema.safeParse(input);
-  if (!parsedConfig.success) {
-    for (const error of getErrors(parsedConfig.error)) {
-      console.error(printMessage(error));
-    }
-    return NextResponse.next();
-  }
+function safeWaitUntil(promise) {
   try {
-    const requestUrl = new URL(req.url);
-    const isHTMLRequest = req.headers.get("accept")?.includes("text/html");
-    const isMonitoringRequest = req.headers.get("User-Agent") === APPWARDEN_USER_AGENT;
-    debug({
-      isHTMLRequest,
-      url: requestUrl.pathname
-    });
-    if (isHTMLRequest && !isMonitoringRequest) {
-      let appwardenResponse = void 0;
-      const context = {
-        req,
-        event,
-        requestUrl,
-        memoryCache,
-        waitUntil: (fn) => event.waitUntil(fn),
-        keyName: APPWARDEN_CACHE_KEY,
-        provider: isCacheUrl.edgeConfig(parsedConfig.data.cacheUrl) ? "edge-config" : "upstash",
-        ...parsedConfig.data
-      };
-      const cacheValue = await handleVercelRequest(context, {
-        onLocked: () => {
-          appwardenResponse = renderLockPage(context);
-        }
-      });
+    waitUntil(promise);
+  } catch {
+    promise.catch(console.error);
+  }
+}
+function createAppwardenMiddleware(config) {
+  return async (request) => {
+    if (validateConfig(config, AppwardenConfigSchema)) {
+      return NextResponse.next();
+    }
+    const parsedConfig = AppwardenConfigSchema.parse(config);
+    try {
+      const requestUrl = new URL(request.url);
+      const isHTML = isHTMLRequest(request);
+      debug({ isHTMLRequest: isHTML, url: requestUrl.pathname });
+      if (!isHTML) {
+        return NextResponse.next();
+      }
+      if (!parsedConfig.lockPageSlug) {
+        return NextResponse.next();
+      }
+      const provider = isCacheUrl.edgeConfig(parsedConfig.cacheUrl) ? "edge-config" : "upstash";
+      const cacheValue = memoryCache.get(APPWARDEN_CACHE_KEY);
       const shouldRecheck = MemoryCache.isExpired(cacheValue);
       if (!cacheValue || shouldRecheck) {
-        event.waitUntil(syncEdgeValue(context));
+        safeWaitUntil(
+          syncEdgeValue({
+            requestUrl,
+            cacheUrl: parsedConfig.cacheUrl,
+            appwardenApiToken: parsedConfig.appwardenApiToken,
+            vercelApiToken: parsedConfig.vercelApiToken
+          })
+        );
       }
-      if (appwardenResponse) {
-        return appwardenResponse;
+      const lockValue = cacheValue ?? (await getLockValue({
+        cacheUrl: parsedConfig.cacheUrl,
+        keyName: APPWARDEN_CACHE_KEY,
+        provider
+      })).lockValue;
+      if (lockValue?.isLocked) {
+        const lockPageUrl = new URL(parsedConfig.lockPageSlug, request.url);
+        return Response.redirect(lockPageUrl.toString(), 302);
       }
-    }
-  } catch (e) {
-    const message = "Appwarden encountered an unknown error. Please contact Appwarden support at https://appwarden.io/join-community.";
-    if (e instanceof Error) {
-      if (!globalErrors.includes(e.message)) {
-        console.error(printMessage(`${message} - ${e.message}`));
+      return NextResponse.next();
+    } catch (e) {
+      const message = "Appwarden encountered an unknown error. Please contact Appwarden support at https://appwarden.io/join-community.";
+      if (e instanceof Error) {
+        if (!globalErrors.includes(e.message)) {
+          console.error(printMessage(`${message} - ${e.message}`));
+        }
+      } else {
+        console.error(printMessage(message));
       }
-    } else {
-      console.error(printMessage(message));
+      return NextResponse.next();
     }
-    throw e;
-  }
-  return NextResponse.next();
-};
-
-// src/bundles/vercel.ts
-var withAppwarden = appwardenOnVercel;
+  };
+}
 export {
-  BaseNextJsConfigSchema,
-  withAppwarden
+  AppwardenConfigSchema,
+  createAppwardenMiddleware
 };

package/cloudflare-0sboFQGC.d.ts

@@ -1,100 +0,0 @@
-import { z } from 'zod';
-
-declare const ContentSecurityPolicySchema: 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]>>;
-    "style-src": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
-    "img-src": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
-    "connect-src": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
-    "font-src": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
-    "object-src": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
-    "media-src": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
-    "frame-src": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
-    sandbox: z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
-    "report-uri": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
-    "child-src": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
-    "form-action": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
-    "frame-ancestors": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
-    "plugin-types": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
-    "base-uri": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
-    "report-to": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
-    "worker-src": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
-    "manifest-src": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
-    "prefetch-src": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
-    "navigate-to": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
-    "require-sri-for": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
-    "block-all-mixed-content": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
-    "upgrade-insecure-requests": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
-    "trusted-types": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
-    "require-trusted-types-for": z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodString, z.ZodBoolean]>>;
-}, "strip", z.ZodTypeAny, {
-    "default-src"?: string | boolean | string[] | undefined;
-    "script-src"?: string | boolean | string[] | undefined;
-    "style-src"?: string | boolean | string[] | undefined;
-    "img-src"?: string | boolean | string[] | undefined;
-    "connect-src"?: string | boolean | string[] | undefined;
-    "font-src"?: string | boolean | string[] | undefined;
-    "object-src"?: string | boolean | string[] | undefined;
-    "media-src"?: string | boolean | string[] | undefined;
-    "frame-src"?: string | boolean | string[] | undefined;
-    sandbox?: string | boolean | string[] | undefined;
-    "report-uri"?: string | boolean | string[] | undefined;
-    "child-src"?: string | boolean | string[] | undefined;
-    "form-action"?: string | boolean | string[] | undefined;
-    "frame-ancestors"?: string | boolean | string[] | undefined;
-    "plugin-types"?: string | boolean | string[] | undefined;
-    "base-uri"?: string | boolean | string[] | undefined;
-    "report-to"?: string | boolean | string[] | undefined;
-    "worker-src"?: string | boolean | string[] | undefined;
-    "manifest-src"?: string | boolean | string[] | undefined;
-    "prefetch-src"?: string | boolean | string[] | undefined;
-    "navigate-to"?: string | boolean | string[] | undefined;
-    "require-sri-for"?: string | boolean | string[] | undefined;
-    "block-all-mixed-content"?: string | boolean | string[] | undefined;
-    "upgrade-insecure-requests"?: string | boolean | string[] | undefined;
-    "trusted-types"?: string | boolean | string[] | undefined;
-    "require-trusted-types-for"?: string | boolean | string[] | undefined;
-}, {
-    "default-src"?: string | boolean | string[] | undefined;
-    "script-src"?: string | boolean | string[] | undefined;
-    "style-src"?: string | boolean | string[] | undefined;
-    "img-src"?: string | boolean | string[] | undefined;
-    "connect-src"?: string | boolean | string[] | undefined;
-    "font-src"?: string | boolean | string[] | undefined;
-    "object-src"?: string | boolean | string[] | undefined;
-    "media-src"?: string | boolean | string[] | undefined;
-    "frame-src"?: string | boolean | string[] | undefined;
-    sandbox?: string | boolean | string[] | undefined;
-    "report-uri"?: string | boolean | string[] | undefined;
-    "child-src"?: string | boolean | string[] | undefined;
-    "form-action"?: string | boolean | string[] | undefined;
-    "frame-ancestors"?: string | boolean | string[] | undefined;
-    "plugin-types"?: string | boolean | string[] | undefined;
-    "base-uri"?: string | boolean | string[] | undefined;
-    "report-to"?: string | boolean | string[] | undefined;
-    "worker-src"?: string | boolean | string[] | undefined;
-    "manifest-src"?: string | boolean | string[] | undefined;
-    "prefetch-src"?: string | boolean | string[] | undefined;
-    "navigate-to"?: string | boolean | string[] | undefined;
-    "require-sri-for"?: string | boolean | string[] | undefined;
-    "block-all-mixed-content"?: string | boolean | string[] | undefined;
-    "upgrade-insecure-requests"?: string | boolean | string[] | undefined;
-    "trusted-types"?: string | boolean | string[] | undefined;
-    "require-trusted-types-for"?: string | boolean | string[] | undefined;
-}>;
-type ContentSecurityPolicyType = z.infer<typeof ContentSecurityPolicySchema>;
-
-declare global {
-    interface CloudflareEnv extends Bindings {
-    }
-}
-type Bindings = {
-    DEBUG: string | boolean;
-    LOCK_PAGE_SLUG: string;
-    CSP_MODE: "disabled" | "report-only" | "enforced";
-    CSP_DIRECTIVES: string | ContentSecurityPolicyType;
-    APPWARDEN_API_TOKEN: string;
-    APPWARDEN_API_HOSTNAME?: string;
-};
-
-export type { Bindings as B };