Remove upstash redis

README.md

@@ -27,6 +27,7 @@ If you want to learn more about this project or have any questions, send us an e
 - [Supabase](https://supabase.com)
 - [inngest](https://www.inngest.com)
 - [Postmark](https://postmarkapp.com)
+- [Arcjet](https://arcjet.com)
 
 ## Getting Started 🚀
 

apps/page/README.md

@@ -16,4 +16,7 @@ SUPABASE_SERVICE_ROLE_KEY=
 # Inngest
 INNGEST_EVENT_KEY=
 INNGEST_SIGNING_KEY=
+
+# Arcjet
+ARCJET_KEY=
 ```

apps/web/README.md

@@ -40,10 +40,6 @@ POSTMARK_WEBHOOK_KEY=
 INNGEST_EVENT_KEY=
 INNGEST_SIGNING_KEY=
 
-# Redis
-UPSTASH_REDIS_REST_URL=
-UPSTASH_REDIS_REST_TOKEN=
-
 # CMS
 NEXT_PUBLIC_SANITY_PROJECT_ID=
 

apps/web/middleware.ts

@@ -3,7 +3,6 @@ import type { NextRequest } from "next/server";
 import { NextResponse } from "next/server";
 
 export async function middleware(req: NextRequest) {
-  console.log("middleware check", req.nextUrl.pathname);
   // We need to create a response and hand it to the supabase client to be able to modify the response headers.
   const res = NextResponse.next();
   const supabase = createMiddlewareClient({ req, res });

apps/web/next.config.js

@@ -66,6 +66,9 @@ const moduleExports = {
       "cdn.sanity.io",
     ],
   },
+  typescript: {
+    ignoreBuildErrors: true,
+  },
 };
 
 // ensure that your source maps include changes from all other Webpack plugins

apps/web/package.json

@@ -10,6 +10,7 @@
     "lint": "next lint"
   },
   "dependencies": {
+    "@arcjet/next": "1.0.0-alpha.20",
     "@changes-page/supabase": "workspace:*",
     "@changes-page/ui": "workspace:*",
     "@changes-page/utils": "workspace:*",
@@ -27,7 +28,6 @@
     "@supabase/supabase-js": "^2.39.3",
     "@tailwindcss/typography": "^0.5.1",
     "@types/canvas-confetti": "^1.6.4",
-    "@upstash/redis": "^1.20.6",
     "@vercel/analytics": "^1.0.1",
     "@vercel/og": "^0.0.20",
     "canvas-confetti": "^1.9.3",
@@ -76,6 +76,6 @@
     "postcss": "^8.4.5",
     "prettier": "^2.3.2",
     "tailwindcss": "^3.0.15",
-    "typescript": "^4.9.4"
+    "typescript": "^4"
   }
 }

apps/web/pages/api/billing/create-billing-portal.ts

@@ -1,5 +1,6 @@
-import type { NextApiRequest, NextApiResponse } from "next";
 import { IErrorResponse } from "@changes-page/supabase/types/api";
+import type { NextApiRequest, NextApiResponse } from "next";
+import { apiRateLimiter } from "../../../utils/rate-limit";
 import { getSupabaseServerClient } from "../../../utils/supabase/supabase-admin";
 import { createOrRetrieveCustomer } from "../../../utils/useDatabase";
 import { getAppBaseURL } from "./../../../utils/helpers";
@@ -10,6 +11,7 @@ const createBillingSession = async (
   res: NextApiResponse<{ url: string } | IErrorResponse>
 ) => {
   if (req.method === "POST") {
+    await apiRateLimiter(req, res);
     const { return_url } = req.body;
 
     try {

apps/web/pages/api/billing/redirect-to-checkout.ts

@@ -1,5 +1,6 @@
 import type { NextApiRequest, NextApiResponse } from "next";
 import { getAppBaseURL } from "../../../utils/helpers";
+import { apiRateLimiter } from "../../../utils/rate-limit";
 import { getSupabaseServerClient } from "../../../utils/supabase/supabase-admin";
 import {
   createOrRetrieveCustomer,
@@ -13,6 +14,7 @@ const redirectToCheckout = async (
   res: NextApiResponse
 ) => {
   if (req.method === "GET") {
+    await apiRateLimiter(req, res);
     const { return_url } = req.query;
 
     try {

apps/web/pages/api/emails/subscribers/export-csv.ts

@@ -1,6 +1,7 @@
 import { supabaseAdmin } from "@changes-page/supabase/admin";
 import { Parser } from "@json2csv/plainjs";
 import { NextApiRequest, NextApiResponse } from "next";
+import { apiRateLimiter } from "../../../../utils/rate-limit";
 import { getSupabaseServerClient } from "../../../../utils/supabase/supabase-admin";
 
 const getSubscribersExportCsv = async (
@@ -9,6 +10,7 @@ const getSubscribersExportCsv = async (
 ) => {
   if (req.method === "GET") {
     try {
+      await apiRateLimiter(req, res);
       const { user } = await getSupabaseServerClient({ req, res });
 
       const { page_id } = req.query;

apps/web/pages/api/pages/settings/add-domain.ts

@@ -1,7 +1,9 @@
 import { NextApiRequest, NextApiResponse } from "next";
+import { apiRateLimiter } from "../../../../utils/rate-limit";
 import { getSupabaseServerClient } from "../../../../utils/supabase/supabase-admin";
 
 async function addDomain(req: NextApiRequest, res: NextApiResponse) {
+  await apiRateLimiter(req, res);
   const { user } = await getSupabaseServerClient({ req, res });
 
   const { domain } = req.body;

apps/web/pages/api/pages/settings/check-domain.ts

@@ -1,7 +1,9 @@
 import { NextApiRequest, NextApiResponse } from "next";
+import { apiRateLimiter } from "../../../../utils/rate-limit";
 import { getSupabaseServerClient } from "../../../../utils/supabase/supabase-admin";
 
 async function checkDomain(req: NextApiRequest, res: NextApiResponse) {
+  await apiRateLimiter(req, res);
   const { user } = await getSupabaseServerClient({ req, res });
 
   const { domain } = req.query;

apps/web/pages/api/pages/validate-url.ts

@@ -1,6 +1,7 @@
-import type { NextApiRequest, NextApiResponse } from "next";
 import { IErrorResponse } from "@changes-page/supabase/types/api";
 import { URL_SLUG_REGEX } from "@changes-page/supabase/types/page";
+import type { NextApiRequest, NextApiResponse } from "next";
+import { apiRateLimiter } from "../../../utils/rate-limit";
 import { validatePageByUrl } from "../../../utils/useDatabase";
 
 const BLACKLIST = [
@@ -74,6 +75,8 @@ const validatePageUrl = async (
   res: NextApiResponse<{ status: boolean } | IErrorResponse>
 ) => {
   if (req.method === "POST") {
+    await apiRateLimiter(req, res);
+
     const { url_slug, page_id } = req.body;
 
     console.log("validatePageUrl", { url_slug, page_id });

apps/web/utils/rate-limit.ts

@@ -1,45 +1,25 @@
+import arcjet, { slidingWindow } from "@arcjet/next";
 import { NextApiRequest, NextApiResponse } from "next";
-import { redis } from "./redis";
 
-const updateRateLimit = async (
-  ip: string = "local",
-  limit: number = 5,
-  duration: number = 60
-): Promise<{ limit: number; remaining: number; success: boolean }> => {
-  const key = `rate_limit:${ip}`;
-
-  let currentCount = await redis.get(key);
-
-  let count = parseInt(currentCount as string, 10) || 0;
-
-  if (count >= limit) {
-    return { limit, remaining: limit - count, success: false };
-  }
-
-  await redis.incr(key);
-  await redis.expire(key, duration);
-
-  return { limit, remaining: limit - (count + 1), success: true };
-};
-
-export async function rateLimiter(req: Request) {
-  const identifier = req.headers.get("x-forwarded-for") ?? "local";
-  const result = await updateRateLimit(identifier);
-
-  return result.success;
-}
+const aj = arcjet({
+  key: process.env.ARCJET_KEY,
+  characteristics: ["ip.src"], // track requests by IP address
+  rules: [
+    slidingWindow({
+      mode: "LIVE",
+      interval: 60,
+      max: 20,
+    }),
+  ],
+});
 
 export async function apiRateLimiter(
   req: NextApiRequest,
   res: NextApiResponse
 ) {
-  const identifier = (req.headers["x-forwarded-for"] as string) ?? "local";
-  const result = await updateRateLimit(identifier);
-
-  res.setHeader("X-RateLimit-Limit", result.limit);
-  res.setHeader("X-RateLimit-Remaining", result.remaining);
+  const decision = await aj.protect(req);
 
-  if (!result.success) {
+  if (decision.isDenied()) {
     return res.status(429).json({
       error: {
         statusCode: 429,