chore: upgrade deps & format code

Author: buqiyuan

.vscode/settings.json

@@ -1,4 +1,5 @@
 {
+  "typescript.tsdk": "./node_modules/typescript/lib",
   // Disable the default formatter, use eslint instead
   "prettier.enable": false,
   "editor.formatOnSave": false,

package.json

@@ -47,31 +47,31 @@
     "@fastify/cookie": "^9.4.0",
     "@fastify/multipart": "^8.3.0",
     "@fastify/static": "^7.0.4",
-    "@liaoliaots/nestjs-redis": "^9.0.5",
+    "@liaoliaots/nestjs-redis": "^10.0.0",
     "@nestjs-modules/mailer": "^2.0.2",
     "@nestjs/axios": "^3.0.3",
     "@nestjs/bull": "^10.2.1",
     "@nestjs/cache-manager": "^2.2.2",
-    "@nestjs/common": "^10.4.1",
+    "@nestjs/common": "^10.4.4",
     "@nestjs/config": "^3.2.3",
-    "@nestjs/core": "^10.4.1",
+    "@nestjs/core": "^10.4.4",
     "@nestjs/event-emitter": "^2.0.4",
     "@nestjs/jwt": "^10.2.0",
     "@nestjs/passport": "^10.0.3",
-    "@nestjs/platform-fastify": "^10.4.1",
-    "@nestjs/platform-socket.io": "^10.4.1",
-    "@nestjs/schedule": "^4.1.0",
-    "@nestjs/swagger": "^7.4.0",
+    "@nestjs/platform-fastify": "^10.4.4",
+    "@nestjs/platform-socket.io": "^10.4.4",
+    "@nestjs/schedule": "^4.1.1",
+    "@nestjs/swagger": "^7.4.2",
     "@nestjs/terminus": "^10.2.3",
     "@nestjs/throttler": "^6.2.1",
     "@nestjs/typeorm": "^10.0.2",
-    "@nestjs/websockets": "^10.4.1",
+    "@nestjs/websockets": "^10.4.4",
     "@socket.io/redis-adapter": "^8.3.0",
     "@socket.io/redis-emitter": "^5.1.0",
     "axios": "^1.7.7",
-    "bull": "^4.16.2",
+    "bull": "^4.16.3",
     "cache-manager": "^5.7.6",
-    "cache-manager-ioredis-yet": "^2.1.1",
+    "cache-manager-ioredis-yet": "^2.1.2",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "cron": "^3.1.7",
@@ -83,45 +83,45 @@
     "helmet": "^7.1.0",
     "ioredis": "^5.4.1",
     "lodash": "^4.17.21",
-    "mysql2": "^3.11.0",
+    "mysql2": "^3.11.3",
     "nanoid": "^3.3.7",
     "nestjs-cls": "^4.4.1",
     "nodemailer": "^6.9.15",
     "passport": "^0.7.0",
     "passport-google-oauth20": "^2.0.0",
     "passport-jwt": "^4.0.1",
     "passport-local": "^1.0.0",
-    "qiniu": "^7.12.0",
+    "qiniu": "^7.13.0",
     "qs": "^6.13.0",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.1",
-    "socket.io": "^4.7.5",
+    "socket.io": "^4.8.0",
     "stacktrace-js": "^2.0.2",
     "svg-captcha": "^1.4.0",
     "systeminformation": "^5.23.5",
     "ts-node": "^10.9.2",
     "typeorm": "0.3.17",
-    "ua-parser-js": "^1.0.38",
+    "ua-parser-js": "^1.0.39",
     "winston": "^3.14.2",
     "winston-daily-rotate-file": "^5.0.0"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^3.3.2",
+    "@antfu/eslint-config": "^3.7.3",
     "@compodoc/compodoc": "^1.1.25",
     "@nestjs/cli": "^10.4.5",
     "@nestjs/schematics": "^10.1.4",
-    "@nestjs/testing": "^10.4.1",
+    "@nestjs/testing": "^10.4.4",
     "@types/cache-manager": "^4.0.6",
     "@types/jest": "29.5.12",
-    "@types/lodash": "^4.17.7",
+    "@types/lodash": "^4.17.10",
     "@types/multer": "^1.4.12",
     "@types/node": "^20.14.11",
     "@types/passport-jwt": "^4.0.1",
-    "@types/qs": "^6.9.15",
+    "@types/qs": "^6.9.16",
     "@types/supertest": "^6.0.2",
     "@types/ua-parser-js": "^0.7.39",
     "cross-env": "^7.0.3",
-    "eslint": "^9.9.1",
+    "eslint": "^9.11.1",
     "jest": "^29.7.0",
     "lint-staged": "^15.2.10",
     "rimraf": "^6.0.1",
@@ -131,15 +131,12 @@
     "ts-jest": "^29.1.2",
     "ts-loader": "^9.5.1",
     "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.5.4"
+    "tsx": "^4.19.1",
+    "typescript": "~5.5.4"
   },
   "pnpm": {
     "peerDependencyRules": {
-      "allowedVersions": {
-        "@liaoliaots/nestjs-redis>@nestjs/common": "^10.0.0",
-        "@liaoliaots/nestjs-redis>@nestjs/core": "^10.0.0",
-        "eslint": "^9.2.0"
-      }
+      "allowedVersions": {}
     }
   },
   "jest": {

pnpm-lock.yaml

@@ -1,11 +1,11 @@
-import { ClassSerializerInterceptor, Module } from '@nestjs/common'
+import type { FastifyRequest } from 'fastify'
 
+import { ClassSerializerInterceptor, Module } from '@nestjs/common'
 import { ConfigModule } from '@nestjs/config'
-import { APP_FILTER, APP_GUARD, APP_INTERCEPTOR } from '@nestjs/core'
 
+import { APP_FILTER, APP_GUARD, APP_INTERCEPTOR } from '@nestjs/core'
 import { ThrottlerGuard } from '@nestjs/throttler'
 import { ClsModule } from 'nestjs-cls'
-import type { FastifyRequest } from 'fastify'
 
 import config from '~/config'
 import { SharedModule } from '~/shared/shared.module'

src/app.module.ts

@@ -1,6 +1,6 @@
 import { SetMetadata } from '@nestjs/common'
 
-export const BYPASS_KEY = '__bypass_key__'
+export const BYPASS_KEY = Symbol('__bypass_key__')
 
 /**
  * 当不需要转换成基础返回格式时添加该装饰器

src/common/decorators/bypass.decorator.ts

@@ -1,6 +1,6 @@
-import { createParamDecorator } from '@nestjs/common'
 import type { ExecutionContext } from '@nestjs/common'
 import type { FastifyRequest } from 'fastify'
+import { createParamDecorator } from '@nestjs/common'
 
 export const Cookies = createParamDecorator((data: string, ctx: ExecutionContext) => {
   const request = ctx.switchToHttp().getRequest<FastifyRequest>()

src/common/decorators/cookie.decorator.ts

@@ -1,7 +1,7 @@
-import { createParamDecorator } from '@nestjs/common'
-
 import type { ExecutionContext } from '@nestjs/common'
+
 import type { FastifyRequest } from 'fastify'
+import { createParamDecorator } from '@nestjs/common'
 
 import { getIp } from '~/utils/ip.util'
 

src/common/decorators/http.decorator.ts

@@ -2,8 +2,8 @@ import { SetMetadata } from '@nestjs/common'
 
 import { IdempotenceOption } from '../interceptors/idempotence.interceptor'
 
-export const HTTP_IDEMPOTENCE_KEY = '__idempotence_key__'
-export const HTTP_IDEMPOTENCE_OPTIONS = '__idempotence_options__'
+export const HTTP_IDEMPOTENCE_KEY = Symbol('__idempotence_key__')
+export const HTTP_IDEMPOTENCE_OPTIONS = Symbol('__idempotence_options__')
 
 /**
  * 幂等

src/common/decorators/idempotence.decorator.ts

@@ -0,0 +1,6 @@
+import { Inject } from '@nestjs/common'
+
+export const REDIS_CLIENT = Symbol('REDIS_CLIENT')
+
+// 自定义 InjectRedis 装饰器
+export const InjectRedis = () => Inject(REDIS_CLIENT)

src/common/decorators/inject-redis.decorator.ts

@@ -1,17 +1,17 @@
+import type {
+  CallHandler,
+  ExecutionContext,
+  NestInterceptor,
+} from '@nestjs/common'
+
+import type { FastifyRequest } from 'fastify'
 import {
   ConflictException,
   Injectable,
   SetMetadata,
 } from '@nestjs/common'
-
 import { Reflector } from '@nestjs/core'
 import { catchError, tap } from 'rxjs'
-import type {
-  CallHandler,
-  ExecutionContext,
-  NestInterceptor,
-} from '@nestjs/common'
-import type { FastifyRequest } from 'fastify'
 
 import { CacheService } from '~/shared/redis/cache.service'
 import { hashString } from '~/utils'

src/common/interceptors/idempotence.interceptor.ts

@@ -1,3 +1,4 @@
+import type { FastifyRequest } from 'fastify'
 import {
   CallHandler,
   ExecutionContext,
@@ -9,7 +10,6 @@ import { Reflector } from '@nestjs/core'
 import qs from 'qs'
 import { Observable } from 'rxjs'
 import { map } from 'rxjs/operators'
-import type { FastifyRequest } from 'fastify'
 
 import { ResOp } from '~/common/model/response.model'
 

src/common/interceptors/transform.interceptor.ts

@@ -1,3 +1,5 @@
+import type { Type } from '@nestjs/common'
+
 import {
   Body,
   Controller,
@@ -8,11 +10,9 @@ import {
   Put,
   Query,
 } from '@nestjs/common'
-
 import { ApiBody, IntersectionType, PartialType } from '@nestjs/swagger'
 import { upperFirst } from 'lodash'
 import pluralize from 'pluralize'
-import type { Type } from '@nestjs/common'
 
 import { ApiResult } from '~/common/decorators/api-result.decorator'
 import { IdParam } from '~/common/decorators/id-param.decorator'

src/helper/crud/crud.factory.ts

@@ -1,6 +1,7 @@
+import type { ConfigKeyPaths } from './config'
 import cluster from 'node:cluster'
-import path from 'node:path'
 
+import path from 'node:path'
 import {
   HttpStatus,
   Logger,
@@ -9,19 +10,18 @@ import {
 } from '@nestjs/common'
 import { ConfigService } from '@nestjs/config'
 import { NestFactory } from '@nestjs/core'
+
 import { NestFastifyApplication } from '@nestjs/platform-fastify'
 
 import { useContainer } from 'class-validator'
 
 import { AppModule } from './app.module'
-
 import { fastifyApp } from './common/adapters/fastify.adapter'
 import { RedisIoAdapter } from './common/adapters/socket.adapter'
 import { LoggingInterceptor } from './common/interceptors/logging.interceptor'
 import { isDev, isMainProcess } from './global/env'
 import { setupSwagger } from './setup-swagger'
 import { LoggerService } from './shared/logger/logger.service'
-import type { ConfigKeyPaths } from './config'
 
 declare const module: any
 

src/main.ts

@@ -1,8 +1,8 @@
-import { InjectRedis } from '@liaoliaots/nestjs-redis'
 import { Inject, Injectable } from '@nestjs/common'
-
 import Redis from 'ioredis'
+
 import { isEmpty } from 'lodash'
+import { InjectRedis } from '~/common/decorators/inject-redis.decorator'
 
 import { BusinessException } from '~/common/exceptions/biz.exception'
 

src/modules/auth/auth.service.ts

@@ -1,12 +1,12 @@
-import { InjectRedis } from '@liaoliaots/nestjs-redis'
 import { Controller, Get, Query } from '@nestjs/common'
 import { ApiOperation, ApiTags } from '@nestjs/swagger'
-
 import Redis from 'ioredis'
+
 import { isEmpty } from 'lodash'
 import * as svgCaptcha from 'svg-captcha'
-
 import { ApiResult } from '~/common/decorators/api-result.decorator'
+
+import { InjectRedis } from '~/common/decorators/inject-redis.decorator'
 import { genCaptchaImgKey } from '~/helper/genRedisKey'
 import { generateUUID } from '~/utils'
 

src/modules/auth/controllers/captcha.controller.ts

@@ -1,4 +1,3 @@
-import { InjectRedis } from '@liaoliaots/nestjs-redis'
 import {
   ExecutionContext,
   Inject,
@@ -10,9 +9,10 @@ import { AuthGuard } from '@nestjs/passport'
 import { FastifyRequest } from 'fastify'
 import Redis from 'ioredis'
 import { isEmpty, isNil } from 'lodash'
-
 import { ExtractJwt } from 'passport-jwt'
 
+import { InjectRedis } from '~/common/decorators/inject-redis.decorator'
+
 import { BusinessException } from '~/common/exceptions/biz.exception'
 import { AppConfig, IAppConfig, RouterWhiteList } from '~/config'
 import { ErrorEnum } from '~/constants/error-code.constant'

src/modules/auth/guards/jwt-auth.guard.ts

@@ -1,8 +1,8 @@
-import { InjectRedis } from '@liaoliaots/nestjs-redis'
 import { Injectable } from '@nestjs/common'
-
 import Redis from 'ioredis'
+
 import { isEmpty } from 'lodash'
+import { InjectRedis } from '~/common/decorators/inject-redis.decorator'
 
 import { BusinessException } from '~/common/exceptions/biz.exception'
 import { ErrorEnum } from '~/constants/error-code.constant'

src/modules/auth/services/captcha.service.ts

@@ -1,10 +1,10 @@
-import { InjectRedis } from '@liaoliaots/nestjs-redis'
 import { Inject, Injectable } from '@nestjs/common'
 import { JwtService } from '@nestjs/jwt'
 import dayjs from 'dayjs'
-
 import Redis from 'ioredis'
 
+import { InjectRedis } from '~/common/decorators/inject-redis.decorator'
+
 import { ISecurityConfig, SecurityConfig } from '~/config'
 import { genOnlineUserKey } from '~/helper/genRedisKey'
 import { RoleService } from '~/modules/system/role/role.service'

src/modules/auth/services/token.service.ts

@@ -1,11 +1,11 @@
-import { InjectRedis } from '@liaoliaots/nestjs-redis'
 import { Injectable } from '@nestjs/common'
 import { InjectRepository } from '@nestjs/typeorm'
 import Redis from 'ioredis'
 import { concat, isEmpty, isNil, uniq } from 'lodash'
-
 import { In, IsNull, Like, Not, Repository } from 'typeorm'
 
+import { InjectRedis } from '~/common/decorators/inject-redis.decorator'
+
 import { BusinessException } from '~/common/exceptions/biz.exception'
 import { RedisKeys } from '~/constants/cache.constant'
 import { ErrorEnum } from '~/constants/error-code.constant'

src/modules/system/menu/menu.service.ts

@@ -1,10 +1,10 @@
-import { InjectRedis } from '@liaoliaots/nestjs-redis'
 import { Injectable } from '@nestjs/common'
-
 import Redis from 'ioredis'
 
 import { throttle } from 'lodash'
+
 import { UAParser } from 'ua-parser-js'
+import { InjectRedis } from '~/common/decorators/inject-redis.decorator'
 
 import { BusinessException } from '~/common/exceptions/biz.exception'
 import { ErrorEnum } from '~/constants/error-code.constant'

src/modules/system/online/online.service.ts

@@ -1,4 +1,3 @@
-import { InjectRedis } from '@liaoliaots/nestjs-redis'
 import { InjectQueue } from '@nestjs/bull'
 import {
   BadRequestException,
@@ -14,6 +13,7 @@ import { Queue } from 'bull'
 import Redis from 'ioredis'
 import { isEmpty, isNil } from 'lodash'
 import { Like, Repository } from 'typeorm'
+import { InjectRedis } from '~/common/decorators/inject-redis.decorator'
 
 import { BusinessException } from '~/common/exceptions/biz.exception'
 import { ErrorEnum } from '~/constants/error-code.constant'

src/modules/system/task/task.service.ts

@@ -1,11 +1,11 @@
-import { InjectRedis } from '@liaoliaots/nestjs-redis'
 import { BadRequestException, Injectable } from '@nestjs/common'
 import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm'
 import Redis from 'ioredis'
 import { isEmpty, isNil } from 'lodash'
-
 import { EntityManager, In, Like, Repository } from 'typeorm'
 
+import { InjectRedis } from '~/common/decorators/inject-redis.decorator'
+
 import { BusinessException } from '~/common/exceptions/biz.exception'
 import { ErrorEnum } from '~/constants/error-code.constant'
 import { ROOT_ROLE_ID, SYS_USER_INITPASSWORD } from '~/constants/system.constant'