fix: use ioredis on socket.io connections

rubiin · Aug 30, 2024 · d86fb06 · d86fb06
1 parent d4efa25
commit d86fb06
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 86 deletions.
diff --git a/env/.env.sample b/env/.env.sample
@@ -54,7 +54,6 @@ REDIS_HOST=
 REDIS_PORT=
 REDIS_USERNAME=
 REDIS_PASSWORD=
-REDIS_URI=redis://${REDIS_USERNAME}:${REDIS_PASSWORD}@${REDIS_HOST}:${REDIS_PORT}
 
 
   # rabbitmq

diff --git a/package.json b/package.json
@@ -126,7 +126,6 @@
     "preview-email": "^3.1.0",
     "prom-client": "^14.2.0",
     "qrcode": "^1.5.4",
-    "redis": "^4.7.0",
     "reflect-metadata": "0.2.2",
     "rxjs": "^7.8.1",
     "sharp": "^0.33.5",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/lib/config/configs/redis.config.ts b/src/lib/config/configs/redis.config.ts
@@ -1,10 +1,8 @@
 import process from "node:process";
 import { registerAs } from "@nestjs/config";
 import Joi from "joi";
-import { REDIS_URI_REGEX } from "@common/constant";
 
 export const redisConfigValidationSchema = {
-  REDIS_URI: Joi.string().pattern(REDIS_URI_REGEX).required(),
   REDIS_TTL: Joi.number().integer().min(1).required(),
   REDIS_HOST: Joi.string().required(),
   REDIS_PORT: Joi.number().port().required(),
@@ -14,7 +12,6 @@ export const redisConfigValidationSchema = {
 };
 
 export const redis = registerAs("redis", () => ({
-  url: process.env.REDIS_URI,
   host: process.env.REDIS_HOST,
   username: process.env.REDIS_USERNAME,
   password: process.env.REDIS_PASSWORD,

diff --git a/src/modules/user/user.service.ts b/src/modules/user/user.service.ts
@@ -76,7 +76,7 @@ export class UserService {
    * @returns The function `referUser` returns an Observable of type `Referral`.
    */
   referUser(dto: ReferUserDto, user: User): Observable<Referral> {
-    const userExists$ = from(this.userRepository.count({ mobileNumber: dto.mobileNumber, isActive: true }));
+    const userExists$ = from(this.userRepository.count({ mobileNumber: dto.mobileNumber, isActive: true, isDeleted: false }));
 
     return userExists$.pipe(
       switchMap((count: number, _index: number) => {
@@ -132,6 +132,7 @@ export class UserService {
     return from(
       this.userRepository.findOne({
         idx: index,
+        isDeleted: false
       }),
     ).pipe(
       mergeMap((user) => {

diff --git a/src/socket-io.adapter.ts b/src/socket-io.adapter.ts
@@ -2,7 +2,7 @@ import type { INestApplicationContext } from "@nestjs/common";
 import type { ConfigService } from "@nestjs/config";
 import { IoAdapter } from "@nestjs/platform-socket.io";
 import { createAdapter } from "@socket.io/redis-adapter";
-import { createClient } from "redis";
+import { Redis } from "ioredis";
 import type { Adapter } from "socket.io-adapter";
 import type { Namespace, Server, ServerOptions } from "socket.io";
 
@@ -21,9 +21,14 @@ export class SocketIOAdapter extends IoAdapter {
    * @returns a promise that resolves to void.
    */
   async connectToRedis(): Promise<void> {
-    const pubClient = createClient({
-      url: this.configService.get("redis.url", { infer: true }),
-    });
+    const pubClient = new Redis(
+      {
+        host: this.configService.get("redis.host", { infer: true }),
+        port: this.configService.get("redis.port", { infer: true }),
+        username: this.configService.get("redis.username", { infer: true }),
+        password: this.configService.get("redis.password", { infer: true }),
+      }
+    );
     const subClient = pubClient.duplicate();
 
     await Promise.allSettled([pubClient.connect(), subClient.connect()]);