fix: remove vercel/kv

Signed-off-by: Innei <[email protected]>

Author: Innei

.env

@@ -19,8 +19,5 @@ NEXT_PUBLIC_CLERK_SIGN_UP_URL=/sign-up
 NEXT_PUBLIC_CLERK_AFTER_SIGN_IN_URL=/
 NEXT_PUBLIC_CLERK_AFTER_SIGN_UP_URL=/
 
-# vercel kv
-KV_URL="redis://default:876b3dd5d7404a7b86e94129d710787b@choice-lark-39044.kv.vercel-storage.com:39044"
-KV_REST_API_URL="https://choice-lark-39044.kv.vercel-storage.com"
-KV_REST_API_TOKEN="AZiEASQgOWM3YjZmMjgtN2IxNy00OGQwLWFjMGUtZDdmNzA0MDdiNzllODc2YjNkZDVkNzQwNGE3Yjg2ZTk0MTI5ZDcxMDc4N2I="
-KV_REST_API_READ_ONLY_TOKEN="ApiEASQgOWM3YjZmMjgtN2IxNy00OGQwLWFjMGUtZDdmNzA0MDdiNzllIIQjhLMp8gB0yAMfPxP_S2Mgg9lrlahMtOg3XzQA5ys="
+UPSTASH_URL=https://uncommon-bat-34546.upstash.io
+UPSTASH_TOKEN=AYbyASQgZDg4Yjg1YzctMzljMS00MWUxLTgzYmQtYmRjYTcwMWU0Y2NiMjM4NTBiN2VkOTdkNDVhY2I1Mzc1NTIwYmI4NzBjZDA=

.env.template

@@ -15,8 +15,5 @@ NEXT_PUBLIC_CLERK_SIGN_UP_URL=/sign-up
 NEXT_PUBLIC_CLERK_AFTER_SIGN_IN_URL=/
 NEXT_PUBLIC_CLERK_AFTER_SIGN_UP_URL=/
 
-# vercel kv
-KV_URL="redis://********@choice-lark-39044.kv.vercel-storage.com:39044"
-KV_REST_API_URL="********"
-KV_REST_API_TOKEN="********"
-KV_REST_API_READ_ONLY_TOKEN="********"
+UPSTASH_URL=
+UPSTASH_TOKEN=

package.json

@@ -48,8 +48,8 @@
     "@tanstack/react-query-devtools": "4.29.15",
     "@tanstack/react-query-persist-client": "4.29.15",
     "@uidotdev/usehooks": "2.0.1",
+    "@upstash/redis": "1.21.0",
     "@vercel/analytics": "1.0.1",
-    "@vercel/kv": "0.2.1",
     "axios": "1.4.0",
     "clsx": "1.2.1",
     "daisyui": "3.1.5",
@@ -110,12 +110,12 @@
     "postcss-prune-var": "1.1.1",
     "prettier": "2.8.8",
     "rimraf": "5.0.1",
+    "simple-git-hooks": "2.8.1",
     "tailwind-scrollbar": "3.0.4",
     "tailwind-variants": "0.1.8",
     "tailwindcss": "^3.3.2",
     "tailwindcss-variable-colors": "0.0.1",
     "tilg": "0.1.1",
-    "simple-git-hooks": "2.8.1",
     "typescript": "5.1.3",
     "typewind": "^0.1.3",
     "zx": "7.2.2"

pnpm-lock.yaml

@@ -0,0 +1,6 @@
+import { Redis } from '@upstash/redis'
+
+export const redis = new Redis({
+  url: process.env.UPSTASH_URL!,
+  token: process.env.UPSTASH_TOKEN!,
+})

src/lib/redis.server.ts

@@ -2,9 +2,8 @@ import dayjs from 'dayjs'
 import { NextResponse } from 'next/server'
 import type { NextRequest } from 'next/server'
 
-import { kv } from '@vercel/kv'
-
 import countries from '~/data/countries.json'
+import { redis } from '~/lib/redis.server'
 
 import {
   REQUEST_GEO,
@@ -42,10 +41,10 @@ export default async function middleware(req: NextRequest) {
     if (countryInfo) {
       const flag = countryInfo.flag
       requestHeaders.set(REQUEST_GEO, `${country}-${city}-${flag}`)
-      await kv.hset('visitor_geo', {
+      await redis.hset('visitor_geo', {
         [new Date().toISOString()]: `${country}-${city}-${flag}`,
       })
-      await kv.sadd(`visitor_ip_${dayjs().format('MM-DD')}`, ip)
+      await redis.sadd(`visitor_ip_${dayjs().format('MM-DD')}`, ip)
     }
   }