From 95e2675287b54988e9dbf5fb79793d973e2c0ded Mon Sep 17 00:00:00 2001
From: HKLeeeee <dlapdlf1739@gmail.com>
Date: Thu, 14 Dec 2023 16:18:46 +0900
Subject: [PATCH 1/7] =?UTF-8?q?chore:=20README.md=20=EB=8D=B0=EB=AA=A8?=
 =?UTF-8?q?=EC=98=81=EC=83=81=20=EB=A7=81=ED=81=AC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 326c488..5821e84 100644
--- a/README.md
+++ b/README.md
@@ -28,9 +28,11 @@
     <img src="https://img.shields.io/badge/AWS CloudFront-5930B4?logo=amazon-aws&logoColor=white"> 
 </div>
 <br>
+<a href="https://www.youtube.com/watch?v=0P9qkA3zlHk">🎥 데모영상</a>
 </div>
 
 
+
 ---
 
 # 🔎서버 아키텍처

From 2529c99fc818013d7941fb4819bcf82362a74456 Mon Sep 17 00:00:00 2001
From: HKLeeeee <dlapdlf1739@gmail.com>
Date: Thu, 14 Dec 2023 19:39:34 +0900
Subject: [PATCH 2/7] =?UTF-8?q?fix:=20[BE]=20java,=20kotlin=20=ED=95=9C?=
 =?UTF-8?q?=EA=B8=80=20=EC=B6=9C=EB=A0=A5=20=EC=9D=B8=EC=BD=94=EB=94=A9=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

컴파일 시 인코딩 옵션 추가하여 해결
---
 backEnd/running/src/common/supportLang.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backEnd/running/src/common/supportLang.ts b/backEnd/running/src/common/supportLang.ts
index c079498..533ae1f 100644
--- a/backEnd/running/src/common/supportLang.ts
+++ b/backEnd/running/src/common/supportLang.ts
@@ -27,7 +27,7 @@ export function languageCommand(language, filePaths): string[] {
     case 'javascript':
       return [`node ${filepath}`];
     case 'java':
-      return [`java ${filepath}`];
+      return [`java -Dfile.encoding=UTF-8 ${filepath}`];
     case 'c':
       return [`gcc -o ${compile_dist} ${filepath}`, compile_dist];
     case 'swift':
@@ -35,7 +35,7 @@ export function languageCommand(language, filePaths): string[] {
     case 'kotlin':
       return [
         `kotlinc ${filepath} -include-runtime -d ${compile_dist}`,
-        `java -jar ${compile_dist}`,
+        `java -jar -Dfile.encoding=UTF-8 ${compile_dist}`,
       ];
   }
 }

From 05fa34df865b552498c678240acb82154ba3d656 Mon Sep 17 00:00:00 2001
From: HKLeeeee <dlapdlf1739@gmail.com>
Date: Thu, 14 Dec 2023 19:43:22 +0900
Subject: [PATCH 3/7] =?UTF-8?q?refactor:=20[BE]=20=EB=A1=9C=EA=B7=B8?=
 =?UTF-8?q?=EC=84=9C=EB=B9=84=EC=8A=A4=20=EB=A6=AC=ED=8C=A9=ED=86=A0?=
 =?UTF-8?q?=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

생성자에 몰려있던 기능들 분리
---
 .../common/logger/winstonLogger.service.ts    | 24 ++++++++++-------
 .../common/logger/winstonLogger.service.ts    | 27 ++++++++++++-------
 2 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/backEnd/api/src/common/logger/winstonLogger.service.ts b/backEnd/api/src/common/logger/winstonLogger.service.ts
index 82a99bf..1b07166 100644
--- a/backEnd/api/src/common/logger/winstonLogger.service.ts
+++ b/backEnd/api/src/common/logger/winstonLogger.service.ts
@@ -10,17 +10,21 @@ import { ConfigService } from '@nestjs/config';
 @Injectable()
 export class WinstonLogger implements LoggerService {
   private logger: LoggerService;
+  private readonly logDir = (() => {
+    const __dirname = path.resolve();
+    return path.join(__dirname, 'logs');
+  })();
   constructor(private configService: ConfigService) {
-    const logDir = (() => {
-      const __dirname = path.resolve();
-      return path.join(__dirname, 'logs');
-    })();
+    const transport = this.getTransport();
+    this.logger = this.createLogger(transport);
+  }
 
+  getTransport(): winston.transport[] {
     const transport: winston.transport[] = [
       new winstonDaily({
         filename: '%DATE%.log',
         datePattern: 'YYYY-MM-DD-HH',
-        dirname: logDir,
+        dirname: this.logDir,
         zippedArchive: true,
         maxSize: '20m',
         maxFiles: '7d',
@@ -28,7 +32,7 @@ export class WinstonLogger implements LoggerService {
       new winstonDaily({
         filename: '%DATE%.error.log',
         datePattern: 'YYYY-MM-DD-HH',
-        dirname: logDir + '/error',
+        dirname: this.logDir + '/error',
         zippedArchive: true,
         maxSize: '20m',
         maxFiles: '7d',
@@ -48,19 +52,21 @@ export class WinstonLogger implements LoggerService {
 
       transport.push(devConsole);
     }
+    return transport;
+  }
 
+  createLogger(transport: winston.transport[]) {
     const logFormat = printf(
       ({ level, message, timestamp }) => `${timestamp} ${level}: ${message}`,
     );
-
-    this.logger = WinstonModule.createLogger({
+    return WinstonModule.createLogger({
       format: combine(
         timestamp({ format: 'YYYY-MM-DD HH:mm:ss.SSS' }),
         logFormat,
       ),
       level:
         this.configService.get<string>('NODE_ENV') !== 'production'
-          ? 'silly'
+          ? 'debug'
           : 'info',
       transports: transport,
     });
diff --git a/backEnd/running/src/common/logger/winstonLogger.service.ts b/backEnd/running/src/common/logger/winstonLogger.service.ts
index 1000c72..18a5db9 100644
--- a/backEnd/running/src/common/logger/winstonLogger.service.ts
+++ b/backEnd/running/src/common/logger/winstonLogger.service.ts
@@ -10,17 +10,21 @@ import { ConfigService } from '@nestjs/config';
 @Injectable()
 export class WinstonLogger implements LoggerService {
   private logger: LoggerService;
+  private readonly logDir = (() => {
+    const __dirname = path.resolve();
+    return path.join(__dirname, 'logs');
+  })();
   constructor(private configService: ConfigService) {
-    const logDir = (() => {
-      const __dirname = path.resolve();
-      return path.join(__dirname, 'logs');
-    })();
+    const transport = this.getTransport();
+    this.logger = this.createLogger(transport);
+  }
 
+  getTransport(): winston.transport[] {
     const transport: winston.transport[] = [
       new winstonDaily({
         filename: '%DATE%.log',
         datePattern: 'YYYY-MM-DD-HH',
-        dirname: logDir,
+        dirname: this.logDir,
         zippedArchive: true,
         maxSize: '20m',
         maxFiles: '7d',
@@ -28,7 +32,7 @@ export class WinstonLogger implements LoggerService {
       new winstonDaily({
         filename: '%DATE%.error.log',
         datePattern: 'YYYY-MM-DD-HH',
-        dirname: logDir + '/error',
+        dirname: this.logDir + '/error',
         zippedArchive: true,
         maxSize: '20m',
         maxFiles: '7d',
@@ -48,17 +52,22 @@ export class WinstonLogger implements LoggerService {
 
       transport.push(devConsole);
     }
+    return transport;
+  }
 
+  createLogger(transport: winston.transport[]) {
     const logFormat = printf(
       ({ level, message, timestamp }) => `${timestamp} ${level}: ${message}`,
     );
-
-    this.logger = WinstonModule.createLogger({
+    return WinstonModule.createLogger({
       format: combine(
         timestamp({ format: 'YYYY-MM-DD HH:mm:ss.SSS' }),
         logFormat,
       ),
-      level: 'silly',
+      level:
+        this.configService.get<string>('NODE_ENV') !== 'production'
+          ? 'debug'
+          : 'info',
       transports: transport,
     });
   }

From ae118c33017d540493c6861332a386e1a6b46d41 Mon Sep 17 00:00:00 2001
From: HKLeeeee <dlapdlf1739@gmail.com>
Date: Sat, 16 Dec 2023 02:56:47 +0900
Subject: [PATCH 4/7] =?UTF-8?q?chore:=20=EC=95=84=ED=82=A4=ED=85=8D?=
 =?UTF-8?q?=EC=B2=98=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=9C=84=EC=B9=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20&=20gif=20=ED=91=9C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 5821e84..e7d3398 100644
--- a/README.md
+++ b/README.md
@@ -35,47 +35,57 @@
 
 ---
 
-# 🔎서버 아키텍처
-![Untitled](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/019fa58f-c8c0-47f3-87a9-ea7cf36722d0)
-
 
 # 🔎 주요 기능
 
 ### 🐱 화상회의
 방 생성 버튼으로 새롭게 방을 만들거나 공유받은 방 코드로 이미 있는 방에 참여할 수 있습니다.
-![EnterRoom](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/fea34177-cffe-4700-914c-a304d0302f51)
 
+| ![EnterRoom](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/fea34177-cffe-4700-914c-a304d0302f51) |
+|---|
+| 방에 입장하는 모습 |
  동료들과 화상회의를 하며 소통할 수 있습니다. <br>
 WebRTC P2P로 통신합시다. <br>
- ![4명입장](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/323fc7d1-5b4e-455f-923d-5db5855a0146)
-
+ 
+|![4명입장](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/323fc7d1-5b4e-455f-923d-5db5855a0146)|
+|---|
+|4명이 모두 입장한 모습|
 
 ### 😎 코드 공동 편집
  코드 편집기를 통해 코드를 작성할 수 있습니다. <br>
 CRDT로 공동편집을 구현해 참여한 사람들과 함께 편집할 수 있습니다.<br>
 집단 지성을 발휘해보세요!
 
- ![crdt](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/42d71ab8-da12-4288-9a5d-47f9524cce96)
+ |![crdt](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/42d71ab8-da12-4288-9a5d-47f9524cce96)|
+|---|
+|코드를 공동편집하는 모습|
 
 ###  📥 문제 보기 
 문제의 링크를 입력해 문제를 보면서 풀이할 수 있습니다. <br>
 크롤링을 통해서 입력한 링크를 가져옵니다.  <br>
 백준 사이트를 가장 잘 보여줍니다.<br>
-![showProm2](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/c2174696-2465-47dd-b8ab-aa47c7e7abbc)
+
+|![showProm2](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/c2174696-2465-47dd-b8ab-aa47c7e7abbc)|
+|---|
+|백준 문제를 불러오는 모습|
 
 ### 🐍 코드 실행
 작성한 코드를 실행하고 실행 결과를 확인할 수 있습니다.<br>
 소켓과 메세지 큐를 통해 코드 실행이 요청됩니다. <br>
 지원 언어 : `Python` `Javascript` `Java` `C` `Swift` `Kotlin`
 
-![running](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/282bcc84-4045-49f6-a5f7-2e5995483e73)
+|![running](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/282bcc84-4045-49f6-a5f7-2e5995483e73)|
+|---|
+|작성한 코드를 실행하는 모습|
 
 ### 💬 채팅
 채팅을 통해서도 소통할 수 있습니다. 음성 채팅이 어려운 상황에서나 참고할 자료를 보낼 때 활용할 수 있습니다.  <br>
 Pub/Sub을 활용해 다중 서버 환경에서도 채팅을 할 수 있습니다. <br>
 채팅 중 **클로바X**에게 질문하고 답변 받을 수 있습니다.
 
-![chat](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/a8f14d69-863e-4c6f-8779-ee6422d2dcce)
+|![chat](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/a8f14d69-863e-4c6f-8779-ee6422d2dcce)|
+|---|
+| 사용자, AI 와 채팅하는 모습|
 
 # 🔎 기술적 도전
 ### 프론트엔드의 기술적 도전
@@ -118,6 +128,9 @@ Pub/Sub을 활용해 다중 서버 환경에서도 채팅을 할 수 있습니
 [👉 더 많은 기술정리 보러가기](https://www.notion.so/f4562ec49e0245d2b6ef203588c031ea?v=fbfeb754b1a4471e8ffc174a45c64346&pvs=4)
 
 
+# 🔎서버 아키텍처
+![Untitled](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/019fa58f-c8c0-47f3-87a9-ea7cf36722d0)
+
 # 🔎 팀 소개
 
 |                                    J065 서위영                                    |                                  J094 이동길                                   |                                 J126 이희경                                  |                                 J151 지승민                                  |

From c25b1b6ff008bc8654a25abe54ce7fc7d79c8cf0 Mon Sep 17 00:00:00 2001
From: HKLeeeee <dlapdlf1739@gmail.com>
Date: Sat, 16 Dec 2023 02:59:07 +0900
Subject: [PATCH 5/7] chore: markdown table error

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index e7d3398..11d2439 100644
--- a/README.md
+++ b/README.md
@@ -44,9 +44,12 @@
 | ![EnterRoom](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/fea34177-cffe-4700-914c-a304d0302f51) |
 |---|
 | 방에 입장하는 모습 |
+
+
  동료들과 화상회의를 하며 소통할 수 있습니다. <br>
 WebRTC P2P로 통신합시다. <br>
  
+
 |![4명입장](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/323fc7d1-5b4e-455f-923d-5db5855a0146)|
 |---|
 |4명이 모두 입장한 모습|

From 1d61a2dfdcd48ba7852c6235f9ff7e1802235129 Mon Sep 17 00:00:00 2001
From: HKLeeeee <dlapdlf1739@gmail.com>
Date: Sun, 17 Dec 2023 15:10:04 +0900
Subject: [PATCH 6/7] chore: gif downsizing

down : frame rate, size
---
 README.md | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 11d2439..58c6555 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@
 ### 🐱 화상회의
 방 생성 버튼으로 새롭게 방을 만들거나 공유받은 방 코드로 이미 있는 방에 참여할 수 있습니다.
 
-| ![EnterRoom](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/fea34177-cffe-4700-914c-a304d0302f51) |
+|![EnterRoom](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/10569b04-b729-46d4-8414-9c83c4772330)|
 |---|
 | 방에 입장하는 모습 |
 
@@ -49,8 +49,7 @@
  동료들과 화상회의를 하며 소통할 수 있습니다. <br>
 WebRTC P2P로 통신합시다. <br>
  
-
-|![4명입장](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/323fc7d1-5b4e-455f-923d-5db5855a0146)|
+|![4inroom-720](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/f17be568-0de8-4a86-a0fe-6c683095ccd5)|
 |---|
 |4명이 모두 입장한 모습|
 
@@ -59,7 +58,7 @@ WebRTC P2P로 통신합시다. <br>
 CRDT로 공동편집을 구현해 참여한 사람들과 함께 편집할 수 있습니다.<br>
 집단 지성을 발휘해보세요!
 
- |![crdt](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/42d71ab8-da12-4288-9a5d-47f9524cce96)|
+ |![crdt](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/d41dd3d9-5b3c-4093-9a71-d0a336ff2e47)|
 |---|
 |코드를 공동편집하는 모습|
 
@@ -68,7 +67,7 @@ CRDT로 공동편집을 구현해 참여한 사람들과 함께 편집할 수 
 크롤링을 통해서 입력한 링크를 가져옵니다.  <br>
 백준 사이트를 가장 잘 보여줍니다.<br>
 
-|![showProm2](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/c2174696-2465-47dd-b8ab-aa47c7e7abbc)|
+|![showProm](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/d5ca027e-4a29-4b32-b8f5-7e56a62bfdfa)|
 |---|
 |백준 문제를 불러오는 모습|
 
@@ -77,7 +76,7 @@ CRDT로 공동편집을 구현해 참여한 사람들과 함께 편집할 수 
 소켓과 메세지 큐를 통해 코드 실행이 요청됩니다. <br>
 지원 언어 : `Python` `Javascript` `Java` `C` `Swift` `Kotlin`
 
-|![running](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/282bcc84-4045-49f6-a5f7-2e5995483e73)|
+|![running](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/0d64245b-4700-46af-8d51-06c8331548ee)|
 |---|
 |작성한 코드를 실행하는 모습|
 
@@ -86,7 +85,7 @@ CRDT로 공동편집을 구현해 참여한 사람들과 함께 편집할 수 
 Pub/Sub을 활용해 다중 서버 환경에서도 채팅을 할 수 있습니다. <br>
 채팅 중 **클로바X**에게 질문하고 답변 받을 수 있습니다.
 
-|![chat](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/a8f14d69-863e-4c6f-8779-ee6422d2dcce)|
+|![chat](https://github.com/boostcampwm2023/web05-AlgoITNi/assets/84272873/a1401167-5edc-4395-a87b-b62176aebfc3)|
 |---|
 | 사용자, AI 와 채팅하는 모습|
 

From 87b8771654114d295ea86f33490f20977ece2239 Mon Sep 17 00:00:00 2001
From: HKLeeeee <dlapdlf1739@gmail.com>
Date: Sun, 17 Dec 2023 15:33:07 +0900
Subject: [PATCH 7/7] =?UTF-8?q?refactor:=20[BE]=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=ED=83=80=EC=9E=84=EC=95=84=EC=9B=83=20=EB=A6=AC=ED=8C=A9?=
 =?UTF-8?q?=ED=84=B0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

timeout : promise에서 옵션 방식으로 수정
---
 backEnd/running/src/codes/codes.service.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/backEnd/running/src/codes/codes.service.ts b/backEnd/running/src/codes/codes.service.ts
index 5afa818..095cdd7 100644
--- a/backEnd/running/src/codes/codes.service.ts
+++ b/backEnd/running/src/codes/codes.service.ts
@@ -80,11 +80,9 @@ export class CodesService {
       try {
         const childProcess = spawn(commandParts[0], commandParts.slice(1), {
           env: { STOP: "DON'T TRY TO ATTACK!!! PLZ..." },
+          timeout: this.timeOut,
+          killSignal: this.killSignal,
         });
-        const timer = setTimeout(() => {
-          this.logger.log('timeout!');
-          childProcess.kill(this.killSignal);
-        }, this.timeOut);
 
         childProcess.stdout.on('data', (data) => {
           stdout.push(data);
@@ -96,10 +94,10 @@ export class CodesService {
 
         childProcess.on('close', (code, signal) => {
           this.logger.log(`child process exited with code ${code}, ${signal}`);
-          clearTimeout(timer);
           const out = Buffer.concat(stdout).toString();
           let err = Buffer.concat(stderr).toString();
           if (this.isTimeout(code, signal)) {
+            this.logger.log('timeout!');
             err = Messages.TIMEOUT;
           }
           resolve({ stdout: out, stderr: err });