Merge remote-tracking branch 'origin/master' into jiweon827

app.js

 // express 설정 파일
 import express from "express";
-import fs from "fs";
+import cors from "cors";
+import socketio from "socket.io";
+import http from "http";
+import wrtc from "wrtc";
 import cookieParser from "cookie-parser";
 import mainRouter from "./routes/index.js";
 
-// fs.readdir('uploads', (error) => {
-//     if (error) {
-//         fs.mkdirSync('uploads');
-//     }
-// })
-
 const app = express();
-
+app.use(cors());
+const server = http.createServer(app);
 app.use(express.json());
-// app.use('/uploads', express.static('uploads'))
 app.use(express.urlencoded({ extended: true }));
 app.use(cookieParser());
 
 app.use("/api", mainRouter);
 
-export default app;
+let receiverPCs = {};
+let senderPCs = {};
+let users = {};
+let socketToRoom = {};
+
+const pc_config = {
+  iceServers: [
+    // {
+    //   urls: 'stun:[STUN_IP]:[PORT]',
+    //   'credentials': '[YOR CREDENTIALS]',
+    //   'username': '[USERNAME]'
+    // },
+    {
+      urls: "stun:stun.l.google.com:19302",
+    },
+  ],
+};
+
+const isIncluded = (array, id) => {
+  let len = array.length;
+  for (let i = 0; i < len; i++) {
+    if (array[i].id === id) return true;
+  }
+  return false;
+};
+
+const createReceiverPeerConnection = (socketID, socket, roomID) => {
+  let pc = new wrtc.RTCPeerConnection(pc_config);
+
+  if (receiverPCs[socketID]) receiverPCs[socketID] = pc;
+  else receiverPCs = { ...receiverPCs, [socketID]: pc };
+
+  pc.onicecandidate = (e) => {
+    //console.log(`socketID: ${socketID}'s receiverPeerConnection icecandidate`);
+    socket.to(socketID).emit("getSenderCandidate", {
+      candidate: e.candidate,
+    });
+  };
+
+  pc.oniceconnectionstatechange = (e) => {
+    //console.log(e);
+  };
+
+  pc.ontrack = (e) => {
+    if (users[roomID]) {
+      if (!isIncluded(users[roomID], socketID)) {
+        users[roomID].push({
+          id: socketID,
+          stream: e.streams[0],
+        });
+      } else return;
+    } else {
+      users[roomID] = [
+        {
+          id: socketID,
+          stream: e.streams[0],
+        },
+      ];
+    }
+    socket.broadcast.to(roomID).emit("userEnter", { id: socketID });
+  };
+
+  return pc;
+};
+
+const createSenderPeerConnection = (
+  receiverSocketID,
+  senderSocketID,
+  socket,
+  roomID
+) => {
+  let pc = new wrtc.RTCPeerConnection(pc_config);
+
+  if (senderPCs[senderSocketID]) {
+    senderPCs[senderSocketID].filter((user) => user.id !== receiverSocketID);
+    senderPCs[senderSocketID].push({ id: receiverSocketID, pc: pc });
+  } else
+    senderPCs = {
+      ...senderPCs,
+      [senderSocketID]: [{ id: receiverSocketID, pc: pc }],
+    };
+
+  pc.onicecandidate = (e) => {
+    //console.log(`socketID: ${receiverSocketID}'s senderPeerConnection icecandidate`);
+    socket.to(receiverSocketID).emit("getReceiverCandidate", {
+      id: senderSocketID,
+      candidate: e.candidate,
+    });
+  };
+
+  pc.oniceconnectionstatechange = (e) => {
+    //console.log(e);
+  };
+
+  const sendUser = users[roomID].filter((user) => user.id === senderSocketID);
+  sendUser[0].stream.getTracks().forEach((track) => {
+    pc.addTrack(track, sendUser[0].stream);
+  });
+
+  return pc;
+};
+
+const getOtherUsersInRoom = (socketID, roomID) => {
+  let allUsers = [];
+
+  if (!users[roomID]) return allUsers;
+
+  let len = users[roomID].length;
+  for (let i = 0; i < len; i++) {
+    if (users[roomID][i].id === socketID) continue;
+    allUsers.push({ id: users[roomID][i].id });
+  }
+
+  return allUsers;
+};
+
+const deleteUser = (socketID, roomID) => {
+  let roomUsers = users[roomID];
+  if (!roomUsers) return;
+  roomUsers = roomUsers.filter((user) => user.id !== socketID);
+  users[roomID] = roomUsers;
+  if (roomUsers.length === 0) {
+    delete users[roomID];
+  }
+  delete socketToRoom[socketID];
+};
+
+const closeRecevierPC = (socketID) => {
+  if (!receiverPCs[socketID]) return;
+
+  receiverPCs[socketID].close();
+  delete receiverPCs[socketID];
+};
+
+const closeSenderPCs = (socketID) => {
+  if (!senderPCs[socketID]) return;
+
+  let len = senderPCs[socketID].length;
+  for (let i = 0; i < len; i++) {
+    senderPCs[socketID][i].pc.close();
+    let _senderPCs = senderPCs[senderPCs[socketID][i].id];
+    let senderPC = _senderPCs.filter((sPC) => sPC.id === socketID);
+    if (senderPC[0]) {
+      senderPC[0].pc.close();
+      senderPCs[senderPCs[socketID][i].id] = _senderPCs.filter(
+        (sPC) => sPC.id !== socketID
+      );
+    }
+  }
+
+  delete senderPCs[socketID];
+};
+
+const io = socketio.listen(server);
+
+io.sockets.on("connection", (socket) => {
+  console.log("socket connection complete")
+  socket.on("joinRoom", (data) => {
+    try {
+      let allUsers = getOtherUsersInRoom(data.id, data.roomID);
+      io.to(data.id).emit("allUsers", { users: allUsers });
+    } catch (error) {
+      console.log(error);
+    }
+  });
+
+  socket.on("senderOffer", async (data) => {
+    try {
+      socketToRoom[data.senderSocketID] = data.roomID;
+      let pc = createReceiverPeerConnection(
+        data.senderSocketID,
+        socket,
+        data.roomID
+      );
+      await pc.setRemoteDescription(data.sdp);
+      let sdp = await pc.createAnswer({
+        offerToReceiveAudio: true,
+        offerToReceiveVideo: true,
+      });
+      await pc.setLocalDescription(sdp);
+      socket.join(data.roomID);
+      io.to(data.senderSocketID).emit("getSenderAnswer", { sdp });
+    } catch (error) {
+      console.log(error);
+    }
+  });
+
+  socket.on("senderCandidate", async (data) => {
+    try {
+      let pc = receiverPCs[data.senderSocketID];
+      await pc.addIceCandidate(new wrtc.RTCIceCandidate(data.candidate));
+    } catch (error) {
+      console.log(error);
+    }
+  });
+
+  socket.on("receiverOffer", async (data) => {
+    try {
+      let pc = createSenderPeerConnection(
+        data.receiverSocketID,
+        data.senderSocketID,
+        socket,
+        data.roomID
+      );
+      await pc.setRemoteDescription(data.sdp);
+      let sdp = await pc.createAnswer({
+        offerToReceiveAudio: false,
+        offerToReceiveVideo: false,
+      });
+      await pc.setLocalDescription(sdp);
+      io.to(data.receiverSocketID).emit("getReceiverAnswer", {
+        id: data.senderSocketID,
+        sdp,
+      });
+    } catch (error) {
+      console.log(error);
+    }
+  });
+
+  socket.on("receiverCandidate", async (data) => {
+    try {
+      const senderPC = senderPCs[data.senderSocketID].filter(
+        (sPC) => sPC.id === data.receiverSocketID
+      );
+      await senderPC[0].pc.addIceCandidate(
+        new wrtc.RTCIceCandidate(data.candidate)
+      );
+    } catch (error) {
+      console.log(error);
+    }
+  });
+
+  socket.on("disconnect", () => {
+    try {
+      let roomID = socketToRoom[socket.id];
+
+      deleteUser(socket.id, roomID);
+      closeRecevierPC(socket.id);
+      closeSenderPCs(socket.id);
+
+      socket.broadcast.to(roomID).emit("userExit", { id: socket.id });
+    } catch (error) {
+      console.log(error);
+    }
+  });
+});
+
+export default server;

client/src/components/Login.js

@@ -41,6 +41,10 @@ const Login = () => {
     return <Redirect to="/user" />;
   }
 
+  if (success) {
+    alert('로그인 되었습니다')
+  }
+
   const { email, password } = user;
 
   return (
@@ -84,7 +88,7 @@ const Login = () => {
           </div>
         </div>
         <div className="modal-footer">
-          <button type="submit" className="btn btn-primary" disabled={disabled}>
+          <button type="submit" className="btn btn-primary" disabled={disabled} data-bs-dismiss="modal">
             로그인
           </button>
         </div>

client/src/components/Profile/InfoUpdate.js

@@ -120,7 +120,7 @@ const InfoUpdate = () => {
                 현재 비밀번호
               </label>
               <input
-                type="text"
+                type="password"
                 class="form-control"
                 style={{ height: "38px", width: "200px" }}
               />

client/src/components/Room/Screen.js

+import React, { useState } from "react";
+import io from "socket.io-client";
+import { useRef } from "react";
+import { useEffect } from "react";
+import Video from "./Video";
+import { useParams } from "react-router-dom";
+
 const Screen = () => {
-  const user = '00'
+  const [socket, setSocket] = useState(null);
+  const [users, setUsers] = useState([]);
+  const { roomId, channelId } = useParams();
+
+  const user = "00";
+  let localVideoRef = useRef(null);
+
+  let sendPC;
+  let receivePCs;
+
+  // 방화벽 등의 보호장치를 거쳐 ip로 연결하기 위한 설정
+  const pc_config = {
+    iceServers: [
+      // {
+      //   urls: 'stun:[STUN_IP]:[PORT]',
+      //   'credentials': '[YOR CREDENTIALS]',
+      //   'username': '[USERNAME]'
+      // },
+      {
+        urls: "stun:stun.l.google.com:19302",
+      },
+    ],
+  };
+
+  useEffect(() => {
+    let newSocket = io.connect("http://localhost:8080");
+    let localStream;
+    // console.log("newSocket", newSocket.id);
+    //
+    newSocket.on("userEnter", (data) => {
+      console.log(data);
+      createReceivePC(data.id, newSocket);
+    });
+
+    newSocket.on("allUsers", (data) => {
+      let len = data.users.length;
+      for (let i = 0; i < len; i++) {
+        createReceivePC(data.users[i].id, newSocket);
+      }
+    });
+
+    newSocket.on("userExit", (data) => {
+      receivePCs[data.id].close();
+      delete receivePCs[data.id];
+      setUsers((users) => users.filter((user) => user.id !== data.id));
+    });
+
+    newSocket.on("getSenderAnswer", async (data) => {
+      try {
+        console.log("get sender answer");
+        console.log(data.sdp);
+        await sendPC.setRemoteDescription(new RTCSessionDescription(data.sdp));
+      } catch (error) {
+        console.log(error);
+      }
+    });
+
+    newSocket.on("getSenderCandidate", async (data) => {
+      try {
+        console.log("get sender candidate");
+        if (!data.candidate) return;
+        sendPC.addIceCandidate(new RTCIceCandidate(data.candidate));
+        console.log("candidate add success");
+      } catch (error) {
+        console.log(error);
+      }
+    });
+
+    newSocket.on("getReceiverAnswer", async (data) => {
+      try {
+        console.log(`get socketID(${data.id})'s answer`);
+        let pc = receivePCs[data.id];
+        await pc.setRemoteDescription(data.sdp);
+        console.log(`socketID(${data.id})'s set remote sdp success`);
+      } catch (error) {
+        console.log(error);
+      }
+    });
+
+    newSocket.on("getReceiverCandidate", async (data) => {
+      try {
+        console.log(data);
+        console.log(`get socketID(${data.id})'s candidate`);
+        let pc = receivePCs[data.id];
+        if (!data.candidate) return;
+        pc.addIceCandidate(new RTCIceCandidate(data.candidate));
+        console.log(`socketID(${data.id})'s candidate add success`);
+      } catch (error) {
+        console.log(error);
+      }
+    });
+
+    setSocket(newSocket);
+
+    navigator.mediaDevices
+      .getUserMedia({
+        audio: true,
+        video: {
+          width: 375,
+          height: 260,
+        },
+      })
+      .then((stream) => {
+        if (localVideoRef.current) localVideoRef.current.srcObject = stream;
+
+        localStream = stream;
+
+        sendPC = createSenderPeerConnection(newSocket, localStream);
+        createSenderOffer(newSocket);
+
+        newSocket.emit("joinRoom", {
+          id: newSocket.id,
+          roomID: roomId,
+        });
+      })
+      .catch((error) => {
+        console.log(`getUserMedia error: ${error}`);
+      });
+  }, []);
+
+  const createReceivePC = (id, newSocket) => {
+    try {
+      console.log(`socketID(${id}) user entered`);
+      let pc = createReceiverPeerConnection(id, newSocket);
+      createReceiverOffer(pc, newSocket, id);
+    } catch (error) {
+      console.log(error);
+    }
+  };
+
+  const createSenderOffer = async (newSocket) => {
+    try {
+      let sdp = await sendPC.createOffer({
+        offerToReceiveAudio: false,
+        offerToReceiveVideo: false,
+      });
+      console.log("create sender offer success");
+      await sendPC.setLocalDescription(new RTCSessionDescription(sdp));
+      console.log(sdp, "안", newSocket.id, "녕", roomId);
+
+      newSocket.emit("senderOffer", {
+        sdp,
+        senderSocketID: newSocket.id,
+        roomID: roomId,
+      });
+    } catch (error) {
+      console.log(error);
+    }
+  };
+
+  const createReceiverOffer = async (pc, newSocket, senderSocketID) => {
+    try {
+      let sdp = await pc.createOffer({
+        offerToReceiveAudio: true,
+        offerToReceiveVideo: true,
+      });
+      console.log("create receiver offer success");
+      await pc.setLocalDescription(new RTCSessionDescription(sdp));
+      console.log(sdp, newSocket.id, senderSocketID, roomId);
+      newSocket.emit("receiverOffer", {
+        sdp,
+        receiverSocketID: newSocket.id,
+        senderSocketID,
+        roomID: roomId,
+      });
+    } catch (error) {
+      console.log(error);
+    }
+  };
+
+  const createSenderPeerConnection = (newSocket, localStream) => {
+    let pc = new RTCPeerConnection(pc_config);
+
+    pc.onicecandidate = (e) => {
+      if (e.candidate) {
+        console.log("sender PC onicecandidate");
+        newSocket.emit("senderCandidate", {
+          candidate: e.candidate,
+          senderSocketID: newSocket.id,
+        });
+      }
+    };
+
+    pc.oniceconnectionstatechange = (e) => {
+      console.log(e);
+    };
+
+    if (localStream) {
+      console.log("localstream add");
+      localStream.getTracks().forEach((track) => {
+        pc.addTrack(track, localStream);
+      });
+    } else {
+      console.log("no local stream");
+    }
+
+    // return pc
+    return pc;
+  };
+
+  const createReceiverPeerConnection = (socketID, newSocket) => {
+    let pc = new RTCPeerConnection(pc_config);
+
+    // add pc to peerConnections object
+    receivePCs = { ...receivePCs, [socketID]: pc };
+
+    pc.onicecandidate = (e) => {
+      if (e.candidate) {
+        console.log("receiver PC onicecandidate");
+        newSocket.emit("receiverCandidate", {
+          candidate: e.candidate,
+          receiverSocketID: newSocket.id,
+          senderSocketID: socketID,
+        });
+      }
+    };
+
+    pc.oniceconnectionstatechange = (e) => {
+      console.log(e);
+    };
+
+    pc.ontrack = (e) => {
+      console.log("ontrack success");
+      setUsers((oldUsers) => oldUsers.filter((user) => user.id !== socketID));
+      setUsers((oldUsers) => [
+        ...oldUsers,
+        {
+          id: socketID,
+          stream: e.streams[0],
+        },
+      ]);
+    };
+
+    // return pc
+    return pc;
+  };
 
   return (
     <div className="container">
-      <div className="row">
-        <div className="col mt-3 d-flex justify-content-space-between" style={{ backgroundColor: '#FCF4FF' }}>
+      {/* {console.log(users)} */}
+      <div className="mt-3" style={{ backgroundColor: "#FCF4FF" }}>
+        <div
+          className="m-2 d-flex fw-bold text-center"
+          style={{ color: "#4A4251", fontSize: "20px" }}
+        >
           <img
-            className="rounded-circle"
+            className="rounded-circle me-2"
             src="/cherry.jpg"
             width="40px"
             height="40px"
           />
-          <p
-            className="m-2"
-            style={{ fontWeight: 'bold', color: '#4A4251', fontSize: '20px' }}
-          >
-            {user}님이 화면공유중...
-            <br />
-          </p>
-          <div className="col m-5"></div>
+          {user}님이 화면공유중...
         </div>
+        <video
+          style={{
+            display: "flex",
+            justifyContent: "center",
+            width: 375,
+            height: 260,
+            backgroundColor: "black",
+          }}
+          muted
+          ref={localVideoRef}
+          autoPlay
+        />
+        {/* {users.map((user, index) => {
+            return <Video key={index} stream={user.stream} />;
+          })} */}
       </div>
     </div>
-  )
-}
+  );
+};
 
-export default Screen
+export default Screen;

client/src/components/SignUp.js

@@ -5,7 +5,7 @@ const INIT_USER = {
   name: "",
   idNumber1: "",
   idNumber2: "",
-  id: "",
+  email: "",
   password: "",
   checkpw: "",
   phone: "",
@@ -23,7 +23,7 @@ const Signup = () => {
         user.name &&
         user.idNumber1 &&
         user.idNumber2 &&
-        user.id &&
+        user.email &&
         user.password &&
         user.checkpw
       )
@@ -51,6 +51,11 @@ const Signup = () => {
     }
   }
 
+  if (success) {
+    alert('회원가입 되었습니다.')
+  }
+
+
   const { name, idNumber1, idNumber2, id, password, checkpw, phone } = user;
   return (
     <div className="modal-content">
@@ -115,9 +120,9 @@ const Signup = () => {
             <label className="p-1">아이디</label>
             <input
               className="form-control"
-              id="id"
+              id="text"
               type="text"
-              name="id"
+              name="email"
               placeholder="아이디를 입력하세요"
               value={id}
               onChange={handleChange}

controllers/user.controller.js

 import { User } from "../models/index.js";
 import jwt from "jsonwebtoken";
 import config from "../config/app.config.js";
+import isLength from 'validator/lib/isLength.js'
+import bcrypt from "bcryptjs";
 
 const test = async (req, res) => {
   try {
@@ -42,13 +44,32 @@ const login = async (req, res) => {
 
 const signup = async (req, res) => {
   try {
-    console.log("sign up= ", req.body);
+    console.log('signup= ', req.body);
+    const { name, password, id } = req.body; 
+    if (!isLength(name, {min: 3, max: 10})) {
+      return res.status(422).send('이름은 3-10자 사이입니다')
+    } else if (!isLength(password, {min: 6})) {
+      return res.status(422).send('비밀번호는 6자 이상입니다')
+    } else if (!isLength(id, {min:3, max10})) {
+      return res.status(422).send('아이디는 3-10자 사이입니다')
+    }
+    const user = await User.scope("password").findOne({ where: email });
+    if (user)
+      return res.status(422).send(`${email} 이미 존재하는 사용자입니다/+ `);
+
+    const hash = await bcrypt.hash(password, 10)
+    const newUser = await new User ({
+      name,
+      password: hash,
+      id
+    }).save()
+    console.log(newUser)
+    res.json(newUser)
   } catch (error) {
     console.log(error);
-    return res.status(500).send("회원가입 중 에러");
+    return res.status(500).send("회원가입 중 에러")
   }
-};
-
+}
 export default {
   test,
   login,

index.js

@@ -38,40 +38,4 @@ sequelize
   .catch((err) => {
     console.log("연결 실패");
     console.log(err);
-  });
-
-// production
-// sequelize.sync().then(() => {
-//   app.listen(appConfig.port, () => {
-//     console.log(`Server is running on port ${appConfig.port}`)
-//   })
-// })
-
-// development
-// 주의!!!: {force: true}는 서버가 다시 시작되면 기존 디비 모두 삭제되고 새로운 디비 생성
-// sequelize
-//   .sync({ force: true })
-//   .then(async () => {
-//     // await Promise.all(
-//     //   Object.keys(ROLE_NAME).map((name) => {
-//     //     return Role.create({ name });
-//     //   })
-//     // );
-
-//     // const adminRole = await Role.findOne({ where: { name: "admin" } });
-
-//     await User.create({
-//       id: "0000",
-//       name: "admin",
-//       email: "admin",
-//       password: "admin!",
-//       gender: 0,
-//     });
-
-//     app.listen(appConfig.port, () => {
-//       console.log(`Server is running on port ${appConfig.port}`);
-//     });
-//   })
-//   .catch((err) => {
-//     console.log(err);
-//   });
+  });
\ No newline at end of file

models/index.js

@@ -16,4 +16,6 @@ const sequelize = new Sequelize(
 const User = UserModel(sequelize);
 const Room = RoomModel(sequelize);
 
+User.hasMany(Room);
+
 export { sequelize, User, Room };

models/user.model.js

@@ -8,7 +8,6 @@ const UserModel = (sequelize) => {
       id: {
         type: DataTypes.INTEGER,
         primaryKey: true,
-        autoIncrement: true,
       },
       name: {
         type: DataTypes.STRING,

routes/room.route.js

@@ -3,10 +3,8 @@ import roomCrtl from "../controllers/room.controller.js";
 
 const router = express.Router();
 
-router.route("/create")
-    .post(roomCrtl.createRoom)
+router.route("/create").post(roomCrtl.createRoom);
 
-router.route("/join")
-    .put(roomCrtl.joinRoom)
+router.route("/join").put(roomCrtl.joinRoom);
 
-export default router;
\ No newline at end of file
+export default router;

routes/user.route.js

@@ -4,6 +4,6 @@ import userCtrl from "../controllers/user.controller.js";
 const router = express.Router();
 
 router.route("/login").post(userCtrl.login);
-router.route("/signup").post(userCtrl.test);
+router.route("/signup").post(userCtrl.signup);
 
 export default router;