diff --git a/client/src/pages/BroadcastPage/BroadcastPage.tsx b/client/src/pages/BroadcastPage/BroadcastPage.tsx index 1b85805..0fd3aa7 100644 --- a/client/src/pages/BroadcastPage/BroadcastPage.tsx +++ b/client/src/pages/BroadcastPage/BroadcastPage.tsx @@ -112,7 +112,7 @@ const BroadcastPage = () => { } useEffect(() => { - socket.current = io('http://localhost:3000', { withCredentials: true }) + socket.current = io('https://api.gbs-live.site', { withCredentials: true }) socket.current.emit('join', { room: id }) diff --git a/server/api-server/src/auth/strategy/naver.strategy.ts b/server/api-server/src/auth/strategy/naver.strategy.ts index a4b1953..0c11861 100644 --- a/server/api-server/src/auth/strategy/naver.strategy.ts +++ b/server/api-server/src/auth/strategy/naver.strategy.ts @@ -1,6 +1,6 @@ import { Strategy } from 'passport-naver-v2'; import { PassportStrategy } from '@nestjs/passport'; -import { HttpException, Injectable } from '@nestjs/common'; +import { Injectable } from '@nestjs/common'; import { AuthService } from '../auth.service'; @Injectable() diff --git a/server/api-server/src/chat/chat.gateway.ts b/server/api-server/src/chat/chat.gateway.ts index da7b9ab..2f16c50 100644 --- a/server/api-server/src/chat/chat.gateway.ts +++ b/server/api-server/src/chat/chat.gateway.ts @@ -11,10 +11,7 @@ import { Server, Socket } from 'socket.io'; import { JoinPayload } from './dto/join-payload.dto'; import { ChatPayload } from './dto/chat-payload'; import { Logger } from '@nestjs/common'; - -import * as dotenv from 'dotenv'; import { UsersService } from 'src/users/users.service'; -dotenv.config(); @WebSocketGateway({ cors: { diff --git a/server/api-server/src/main.ts b/server/api-server/src/main.ts index 9646045..bda32a1 100644 --- a/server/api-server/src/main.ts +++ b/server/api-server/src/main.ts @@ -4,19 +4,22 @@ import { getSession } from './common/redis.session'; import { RedisIoAdapter } from './common/redis.adapter'; import * as passport from 'passport'; import * as fs from 'fs'; -import * as http from 'http'; -import * as https from 'https'; -import * as express from 'express'; -import { ExpressAdapter } from '@nestjs/platform-express'; import * as process from 'process'; +import { INestApplication } from '@nestjs/common'; async function bootstrap() { - const httpsOptions = { - key: fs.readFileSync(process.env.KEY_PATH), - cert: fs.readFileSync(process.env.CERT_PATH), - }; - const server = express(); - const app = await NestFactory.create(AppModule, new ExpressAdapter(server)); + let app: INestApplication; + + if (process.env.NODE_ENV === 'production') { + app = await NestFactory.create(AppModule, { + httpsOptions: { + key: fs.readFileSync(process.env.KEY_PATH), + cert: fs.readFileSync(process.env.CERT_PATH), + }, + }); + } else { + app = await NestFactory.create(AppModule); + } const session = getSession(); app.use(session); @@ -27,10 +30,7 @@ async function bootstrap() { await redisIoAdapter.connectToRedis(); app.useWebSocketAdapter(redisIoAdapter); - await app.init(); - - const httpServer = http.createServer(server).listen(3000); - const httpsServer = https.createServer(httpsOptions, server).listen(443); + await app.listen(process.env.PORT); } bootstrap();