Merge pull request #323 from boostcampwm-2024/dev

[Deploy] 6주차 3차 배포

Author: blu3fishez

backend/src/app.module.ts

@@ -10,10 +10,11 @@ import { TypeOrmModule } from "@nestjs/typeorm";
 
 import "dotenv/config";
 
-import { createDataSource, typeOrmConfig } from "./config/typeorm.config";
+import { createDataSource, typeOrmConfig } from "./infra/typeorm/typeorm.config";
 import { QuestionListModule } from "./question-list/question-list.module";
 import { RedisOmModule } from "@moozeh/nestjs-redis-om";
 import { SigServerModule } from "@/signaling-server/sig-server.module";
+import { redisConfig } from "@/infra/infra.config";
 
 @Module({
     imports: [
@@ -22,7 +23,7 @@ import { SigServerModule } from "@/signaling-server/sig-server.module";
             dataSourceFactory: async () => await createDataSource(), // 분리된 데이터소스 생성 함수 사용
         }),
         RedisOmModule.forRoot({
-            url: `redis://${process.env.REDIS_HOST}:${process.env.REDIS_PORT}`,
+            url: `redis://${redisConfig.host}:${redisConfig.port}`,
         }),
         RoomModule,
         AuthModule,

backend/src/auth/auth.controller.ts

@@ -9,7 +9,7 @@ import {
 } from "@nestjs/common";
 import { AuthGuard } from "@nestjs/passport";
 import { Response } from "express";
-import { setCookieConfig } from "@/config/cookie.config";
+import { setCookieConfig } from "@/infra/cookie/cookie.config";
 import { JwtPayload, JwtTokenPair } from "./jwt/jwt.decorator";
 import { IJwtPayload, IJwtToken, IJwtTokenPair } from "./jwt/jwt.model";
 
@@ -40,7 +40,7 @@ export class AuthController {
         @Res({ passthrough: true }) res: Response,
         @JwtTokenPair() pair: IJwtTokenPair
     ) {
-        if (!pair) throw new UnauthorizedException();
+        if (!pair) throw new InternalServerErrorException();
         return this.setCookie(res, pair.accessToken);
     }
 

backend/src/auth/jwt/jwt.service.ts

@@ -60,7 +60,9 @@ export class JwtService {
 
     private async createRefreshToken(id: number): Promise<IJwtToken> {
         const refreshToken = this.parent.sign(
-            {},
+            {
+                exp: Date.now() + JwtService.REFRESH_TOKEN_TIME,
+            },
             {
                 secret: process.env.JWT_REFRESH_TOKEN_SECRET_KEY,
                 audience: String(id),

backend/src/auth/jwt/strategy/refresh-token.strategy.ts

@@ -1,4 +1,4 @@
-import { Injectable } from "@nestjs/common";
+import { Injectable, UnauthorizedException } from "@nestjs/common";
 import { PassportStrategy } from "@nestjs/passport";
 import { Strategy } from "passport-jwt";
 import { Request } from "express";
@@ -21,6 +21,9 @@ export class RefreshTokenStrategy extends PassportStrategy(Strategy, "jwt-refres
 
     async validate(req: Request, payload: any) {
         const { aud, exp } = payload;
+
+        if (!exp || exp < Date.now()) throw new UnauthorizedException();
+
         const refreshToken = req.cookies["refreshToken"];
 
         const accessToken = await this.jwtService.getNewAccessToken(parseInt(aud), refreshToken);

backend/src/config/cookie.config.ts renamed to backend/src/infra/cookie/cookie.config.ts

@@ -1,5 +1,11 @@
 import "dotenv/config";
 
+export const gatewayConfig = {
+    cors: {
+        origin: process.env.DOMAIN || "*",
+    },
+};
+
 export const redisConfig = {
     host: process.env.REDIS_HOST,
     port: parseInt(process.env.REDIS_PORT),

backend/src/config/redis.config.ts renamed to backend/src/infra/infra.config.ts

@@ -0,0 +1,14 @@
+import { Global, Module } from "@nestjs/common";
+import { InfraService } from "@/infra/infra.service";
+import { WebsocketRepository } from "@/infra/websocket/websocket.repository";
+import { RedisOmModule } from "@moozeh/nestjs-redis-om";
+import { RoomEntity } from "@/room/room.entity";
+import { WebsocketEntity } from "@/infra/websocket/websocket.entity";
+
+@Global()
+@Module({
+    imports: [RedisOmModule.forFeature([RoomEntity, WebsocketEntity])],
+    providers: [InfraService, WebsocketRepository],
+    exports: [InfraService, WebsocketRepository],
+})
+export class InfraModule {}

backend/src/infra/infra.module.ts

@@ -0,0 +1,52 @@
+import { Injectable } from "@nestjs/common";
+import { Server, Socket } from "socket.io";
+import Redis from "ioredis";
+import { redisClient } from "@/infra/redis/redis-client";
+import { WebsocketRepository } from "@/infra/websocket/websocket.repository";
+
+@Injectable()
+export class InfraService {
+    private server: Server;
+    private readonly redisClient: Redis = redisClient;
+
+    constructor(private readonly websocketRepository: WebsocketRepository) {}
+
+    public setServer(server: Server) {
+        this.server = server;
+    }
+
+    public async createSocketMetadata(socket: Socket) {
+        return this.websocketRepository.createWebsocketMetadata(socket);
+    }
+
+    public async getSocketMetadata(socket: Socket) {
+        return this.websocketRepository.getWebsocketMetadataById(socket.id);
+    }
+
+    public async removeSocketMetadata(socket: Socket) {
+        await this.websocketRepository.removeWebsocketMetadata(socket);
+    }
+
+    public async joinRoom(socket: Socket, roomId: string) {
+        const entity = await this.websocketRepository.getWebsocketMetadataById(socket.id);
+        entity.joinedRooms.push(roomId);
+        await this.websocketRepository.updateWebsocketMetadata(socket.id, entity);
+        socket.join(roomId);
+    }
+
+    public getRedisClient() {
+        return this.redisClient;
+    }
+
+    public getServer() {
+        return this.server;
+    }
+
+    public getSocket(socketId: string) {
+        return this.server.sockets.sockets.get(socketId);
+    }
+
+    public emitToRoom(roomId: string, event: string, data?: any) {
+        this.server.to(roomId).emit(event, data);
+    }
+}

backend/src/infra/infra.service.ts

@@ -0,0 +1,3 @@
+import Redis from "ioredis";
+
+export const redisClient = new Redis();