Merge pull request #67 from boostcamp-2020/develop

GitHub Actions test

Author: ramram1048

.github/workflows/deploy.yml

@@ -0,0 +1,65 @@
+# GitHub Actions 공식 documentation: https://docs.github.com/en/free-pro-team/actions
+# ssh에 shell script 실행하기: https://github.com/fifsky/ssh-action/blob/master/entrypoint.sh
+
+name: Deploy master branch
+
+on:
+  push:
+    branches: [master]
+
+jobs:
+  Deploy:
+    runs-on: ubuntu-16.04
+    env:
+      DEPLOY_SCRIPT: shell.sh
+      DEPLOY_KEY: deploy_key
+    steps:
+      - name: Make deploy script
+        run: |
+          cat << EOF > $DEPLOY_SCRIPT
+          echo "=== pull master branch ==="
+          cd ${{ secrets.SSH_WORKING_DIRECTORY }}/src
+          git checkout master
+          git fetch origin master
+          BE_DIFF=$(git diff HEAD..origin/master --name-only -- src/backend | wc -l)
+          FE_DIFF=$(git diff HEAD..origin/master --name-only -- src/frontend | wc -l)
+          git pull origin master
+
+          if [ $BE_DIFF -ne 0 ] ; then
+            echo "=== build backend ==="
+            cd backend
+            npm ci || exit 1
+            npm run build || exit 1
+            echo "=== restart backend server ==="
+            forever stopall
+            forever start ./dist/app.js
+            cd ..
+          fi
+
+          if [ $FE_DIFF -ne 0 ] ; then
+            echo "=== build frontend ==="
+            cd frontend
+            npm ci || exit 1
+            npm run build || exit 1
+            echo "=== update nginx serve files ==="
+            # rm -rf ${{ secrets.NGINX_DIRECTORY }}
+            sudo cp ./dist/* ${{ secrets.NGINX_DIRECTORY }}
+            cd ..
+          fi
+          
+          echo "=== All done🚀 ==="
+          EOF
+
+      - name: Setting ssh agent and key
+        run: |
+          echo "${{ secrets.PRIVATE_KEY }}" > $DEPLOY_KEY
+          chmod 600 $DEPLOY_KEY
+
+      - name: Run script on ssh
+        run: ssh -i $DEPLOY_KEY -o StrictHostKeyChecking=no ${{ secrets.SSH_ORIGIN }} < $DEPLOY_SCRIPT
+
+      - name: Cleanup
+        if: ${{ always() }}
+        run: |
+          rm -f $DEPLOY_SCRIPT
+          rm -f $DEPLOY_KEY

src/backend/game/Game.js

@@ -1,5 +1,9 @@
+import generateRandom from '@utils/generateRandom';
+import GameList from '@game/GameList';
 import User from './User';
 
+const MAX_PLAYER = 6;
+
 export default class Game {
   constructor(roomID) {
     this.roomID = roomID;
@@ -12,25 +16,34 @@ export default class Game {
     };
   }
 
-  getRoomID() {
-    return this.roomID;
-  }
-
-  isPlaying() {
-    return this.status.isPlaying;
+  isEnterable() {
+    if (this.status.isPlaying || this.users.size >= MAX_PLAYER) return false;
+    return true;
   }
 
-  addUser({ socketID, nickname, color }) {
+  addUser({ socketID }) {
+    const nickname = generateRandom.nickname();
+    const color = generateRandom.color();
     const user = new User({ socketID, nickname, color });
+    GameList.addID(socketID, this);
     this.users.set(socketID, user);
+    return user;
   }
 
-  findUserInfo(socketID) {
-    const user = this.users.get(socketID);
-    return user ? user.getUserProfile() : false;
+  removeUser({ socketID }) {
+    this.users.delete(socketID);
+    GameList.removeID(socketID);
+    if (this.users.size < 1) {
+      GameList.removeID(this.roomID);
+    }
   }
 
-  findUserInfoAll(socketID) {
-    return this.users.get(socketID).getUserInfo() || null;
+  getUser(socketID) {
+    if (!this.users.has(socketID)) {
+      console.log(`getUser: socketID ${socketID} does not exist`);
+      return null;
+    }
+
+    return this.users.get(socketID);
   }
 }

src/backend/game/GameList.js

@@ -0,0 +1,41 @@
+import generateRandom from '@utils/generateRandom';
+import Game from '@game/Game';
+
+class GameList {
+  constructor() {
+    // roomID -> game
+    // socketID -> game
+    this.games = new Map();
+  }
+
+  addID(ID, game) {
+    this.games.set(ID, game);
+  }
+
+  removeID(ID) {
+    this.games.delete(ID);
+  }
+
+  createGame() {
+    const roomID = generateRandom.roomID();
+    const game = new Game(roomID);
+    this.addID(roomID, game);
+    return roomID;
+  }
+
+  getGame(ID) {
+    const game = this.games.get(ID);
+    if (!game) {
+      console.log(`Game.findGame: can not find ${ID}`);
+      return null;
+    }
+
+    return this.games.get(ID);
+  }
+
+  hasGame(roomID) {
+    return this.games.has(roomID);
+  }
+}
+
+export default new GameList();

src/backend/game/Games.js

@@ -49,7 +49,7 @@ class User {
     };
   }
 
-  getUserProfile() {
+  getProfile() {
     const { nickname, color } = this;
     return {
       nickname,

src/backend/game/User.js

@@ -1,11 +1,12 @@
 import express from 'express';
-import Games from '@game/Games';
+import GameList from '@game/GameList';
 
 const router = express.Router();
 
 const getRoomsRouter = (req, res) => {
   const { roomID } = req.params;
-  if (Games.isEnterableRoom(roomID)) {
+  const game = GameList.getGame(roomID);
+  if (game && game.isEnterable(roomID)) {
     return res.status(200).json({});
   }
 
@@ -16,7 +17,7 @@ router.get('/rooms', getRoomsRouter);
 router.get('/rooms/:roomID', getRoomsRouter);
 
 router.post('/rooms', (req, res) => {
-  const roomID = Games.createGame();
+  const roomID = GameList.createGame();
   return res.status(200).json({ roomID });
 });
 

src/backend/routes/index.js

@@ -1,12 +1,9 @@
-import Games from '@game/Games';
-
 function onSendChat({ message }) {
   const socket = this;
-  const roomID = Games.findRoomID(socket.id);
-  if (!roomID) return;
-
-  const { nickname } = Games.findUserInfo(socket.id);
-  socket.in(roomID).emit('send chat', { message, nickname });
+  // game = socket.game
+  const { game } = socket;
+  const { nickname } = game.getUser(socket.id).getProfile();
+  socket.in(game.roomID).emit('send chat', { message, nickname });
 }
 
 export default function onChat(socket) {

src/backend/sockets/chat.js

@@ -0,0 +1,9 @@
+function exitRoom() {
+  const socket = this;
+  socket.game?.removeUser(socket.id);
+  console.log(`user disconnected ${socket.id}`);
+}
+
+export default function onWaitingRoom(socket) {
+  socket.on('disconnect', exitRoom);
+}

src/backend/sockets/exitRoom.js

@@ -1,14 +1,16 @@
 import io from 'socket.io';
 import onWaitingRoom from './waitingRoom';
 import onChat from './chat';
+import exitRoom from './exitRoom';
 
 const socketIO = io();
 
 socketIO.on('connection', (socket) => {
-  console.log('a user connected');
+  console.log(`User connected ${socket.id}`);
 
   onWaitingRoom(socket);
   onChat(socket);
+  exitRoom(socket);
 });
 
 export default socketIO;

src/backend/sockets/index.js

@@ -1,17 +1,23 @@
-import Games from '@game/Games';
+import GameList from '@game/GameList';
 
 function onJoinPlayer({ roomID }) {
   const socket = this;
-  if (!roomID || !Games.isEnterableRoom(roomID)) return;
+  const game = GameList.getGame(roomID);
+  if (!game || !game.isEnterable(roomID)) return;
 
-  Games.enterUser({ socketID: socket.id, roomID });
-  const userInfo = Games.findUserInfo(socket.id);
+  // User enter the room
+  socket.game = game;
+  const user = game.addUser({ socketID: socket.id, roomID });
   socket.join(roomID);
+
+  // only sending to the client
   socket.emit('enter room', {
-    ...userInfo,
+    ...user.getProfile(),
     roomID,
     players: [],
   });
+
+  // TODO send 'update player' to other players in the room
 }
 
 export default function onWaitingRoom(socket) {

src/backend/sockets/waitingRoom.js

@@ -1,24 +1,22 @@
+import GameList from '@game/GameList';
 import nickname from './nickname.json';
 
-const randomStrings = new Set();
-
 const generateRandomString = () =>
   Math.random().toString(36).substr(2, 5).toUpperCase();
 
-export default {
+const randomFunctions = {
   nickname: () => {
     const { adjective: adj, noun } = nickname;
     const randomAdj = adj[Math.floor(Math.random() * adj.length)];
     const randomNoun = noun[Math.floor(Math.random() * noun.length)];
     return `${randomAdj} ${randomNoun}`;
   },
   color: () => '#222222',
-  code: () => {
-    let randomString = generateRandomString();
-    while (randomStrings.has(randomString)) {
-      randomString = generateRandomString();
-    }
-    randomStrings.add(randomString);
+  roomID: () => {
+    const randomString = generateRandomString();
+    if (GameList.hasGame(randomString)) return randomFunctions.roomID();
     return randomString;
   },
 };
+
+export default randomFunctions;