feat: use nestjs-redis and ioredis instead of redis-om

Author: AprilNEA

package.json

@@ -31,5 +31,15 @@
   "prisma": {
     "schema": "prisma/schema.prisma"
   },
+  "engines": {
+    "node": ">=18"
+  },
+  "pnpm": {
+    "overrides": {
+      "@liaoliaots/nestjs-redis>@nestjs/common": "^10.0.0",
+      "@liaoliaots/nestjs-redis>@nestjs/core": "^10.0.0",
+      "@liaoliaots/nestjs-redis>@nestjs/terminus": "^10.0.0"
+    }
+  },
   "packageManager": "[email protected]"
 }

packages/backend/package.json

@@ -18,6 +18,7 @@
     "test:e2e": "jest --config test/jest-e2e.json"
   },
   "dependencies": {
+    "@liaoliaots/nestjs-redis": "^9.0.5",
     "@nestjs/common": "^10.0.0",
     "@nestjs/config": "^3.0.0",
     "@nestjs/core": "^10.0.0",
@@ -35,8 +36,6 @@
     "mint-filter": "^4.0.3",
     "nest-router": "^1.0.9",
     "openai": "^4.14.0",
-    "redis": "^4.6.7",
-    "redis-om": "^0.4.2",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.8.1",
     "spark-md5": "^3.0.2"

packages/backend/src/app.module.ts

@@ -1,3 +1,4 @@
+import { RedisModule } from '@liaoliaots/nestjs-redis';
 import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { APP_GUARD } from '@nestjs/core';
@@ -22,6 +23,11 @@ import configuration from './configuration';
       load: [configuration],
       isGlobal: true,
     }),
+    RedisModule.forRoot({
+      config: {
+        url: configuration().redis.url,
+      },
+    }),
     AuthModule,
     UserModule,
     ChatModule,

packages/backend/src/modules/auth/auth.module.ts

@@ -5,13 +5,12 @@ import { JwtModule } from '@/libs/jwt/jwt.module';
 import { SmsModule } from '@/libs/sms/sms.module';
 import { WechatService } from '@/modules/auth/wechat.service';
 import { DatabaseService } from '@/processors/database/database.service';
-import { RedisModule } from '@/processors/redis/redis.module';
 
 import { AuthController } from './auth.controller';
 import { AuthService } from './auth.service';
 
 @Module({
-  imports: [JwtModule, RedisModule, EmailModule, SmsModule],
+  imports: [JwtModule, EmailModule, SmsModule],
   controllers: [AuthController],
   providers: [AuthService, DatabaseService, WechatService],
 })

packages/backend/src/modules/auth/auth.service.ts

@@ -1,6 +1,8 @@
 import { compare, hashSync } from 'bcrypt';
+import { Redis } from 'ioredis';
 import * as Joi from 'joi';
 
+import { InjectRedis, RedisService } from '@liaoliaots/nestjs-redis';
 import { Injectable } from '@nestjs/common';
 import { Role } from '@prisma/client';
 
@@ -9,7 +11,6 @@ import { EmailService } from '@/libs/email/email.service';
 import { JwtService } from '@/libs/jwt/jwt.service';
 import { SmsService } from '@/libs/sms/sms.service';
 import { DatabaseService } from '@/processors/database/database.service';
-import { RedisService } from '@/processors/redis/redis.service';
 
 import { IAccountStatus } from 'shared';
 import { ErrorCodeEnum } from 'shared/dist/error-code';
@@ -39,9 +40,16 @@ const getPhoneOrEmail = (identity: string) => {
   }
 };
 
+function generateRandomSixDigitNumber() {
+  const min = 100000;
+  const max = 999999;
+  return Math.floor(Math.random() * (max - min + 1)) + min;
+}
+
 @Injectable()
 export class AuthService {
   constructor(
+    @InjectRedis() private readonly redis: Redis,
     private jwt: JwtService,
     private prisma: DatabaseService,
     private redisService: RedisService,
@@ -53,7 +61,7 @@ export class AuthService {
    * 1. 检查是否绑定账户
    * 2. 检查是否设置密码
    */
-  async _signWithCheck(user: any): Promise<{
+  async #signWithCheck(user: any): Promise<{
     token: string;
     status: IAccountStatus;
   }> {
@@ -69,6 +77,16 @@ export class AuthService {
     };
   }
 
+  async #verifyCode(identity: string, code: string) {
+    const isValid = (await this.redis.get(identity)) === code;
+
+    if (!isValid) {
+      throw new BizException(ErrorCodeEnum.CodeValidationError);
+    } else {
+      await this.redis.del(identity);
+    }
+  }
+
   /* 添加验证码 */
   async newValidateCode(identity: string) {
     const { email, phone } = getPhoneOrEmail(identity);
@@ -77,24 +95,26 @@ export class AuthService {
         success: false,
       };
     }
+    const ttl = await this.redis.ttl(identity);
+    /* if key not exist, ttl will be -2 */
+    if (600 - ttl < 60) {
+      return {
+        success: false,
+        ttl,
+      };
+    } else {
+      const newTtl = 10 * 60;
+      const code = generateRandomSixDigitNumber();
+      await this.redis.setex(identity, newTtl, code);
 
-    /* 10分钟内仅可发送一次 */
-    const code = await this.redisService.authCode.new(identity);
-
-    if (code.success) {
       if (email) {
-        await this.emailService.sendCode(identity, code.code);
+        await this.emailService.sendCode(identity, code);
       } else if (phone) {
-        await this.smsService.sendCode(identity, code.code);
+        await this.smsService.sendCode(identity, code);
       }
       return {
         success: true,
-        ttl: code.ttl,
-      };
-    } else {
-      return {
-        success: false,
-        ttl: code.ttl,
+        ttl: newTtl,
       };
     }
   }
@@ -103,11 +123,7 @@ export class AuthService {
   async WithValidateCode(identity: string, code: string) {
     const { email, phone } = getPhoneOrEmail(identity);
 
-    const isValid = await this.redisService.authCode.valid(identity, code);
-
-    if (!isValid) {
-      throw new BizException(ErrorCodeEnum.CodeValidationError);
-    }
+    await this.#verifyCode(identity, code);
 
     const existUser = await this.prisma.user.findMany({
       where: {
@@ -128,7 +144,7 @@ export class AuthService {
     } else {
       user = existUser[0];
     }
-    return this._signWithCheck(user);
+    return this.#signWithCheck(user);
   }
 
   /* 通过密码登录 */
@@ -147,7 +163,7 @@ export class AuthService {
     if (!isPasswordCorrect) {
       throw Error('Password is incorrect');
     }
-    return this._signWithCheck(user[0]);
+    return this.#signWithCheck(user[0]);
   }
 
   /* 添加密码 */
@@ -186,11 +202,7 @@ export class AuthService {
   async forgetPassword(identity: string, code: string, password: string) {
     const { email, phone } = getPhoneOrEmail(identity);
 
-    const isValid = await this.redisService.authCode.valid(identity, code);
-
-    if (!isValid) {
-      throw new BizException(ErrorCodeEnum.CodeValidationError);
-    }
+    await this.#verifyCode(identity, code);
 
     const existUser = await this.prisma.user.findMany({
       where: {
@@ -206,7 +218,7 @@ export class AuthService {
     }
     await this.changePassword(user.id, password);
 
-    return this._signWithCheck(user);
+    return this.#signWithCheck(user);
   }
 
   /* 绑定用户身份 */