From 0bd1e86e48ca4794b5a2ab04c3d700b4fa3ee5d0 Mon Sep 17 00:00:00 2001
From: Mitchell McCaffrey <mitchemmc@gmail.com>
Date: Wed, 8 Apr 2020 15:01:17 +1000
Subject: [PATCH] Added simple stream sharing

---
 src/components/Nickname.js | 37 ++++++++++++++++++++++++++++---------
 src/components/Party.js    | 20 +++++++++++++++++++-
 src/components/Stream.js   | 26 ++++++++++++++++++++++++++
 src/helpers/useSession.js  | 14 ++++++++++++--
 src/routes/Game.js         | 29 ++++++++++++++++++++++++++++-
 5 files changed, 113 insertions(+), 13 deletions(-)
 create mode 100644 src/components/Stream.js

diff --git a/src/components/Nickname.js b/src/components/Nickname.js
index 369c253..d96bfeb 100644
--- a/src/components/Nickname.js
+++ b/src/components/Nickname.js
@@ -3,7 +3,7 @@ import { Text, Box, Input, Button, Label, IconButton, Flex } from "theme-ui";
 
 import Modal from "./Modal";
 
-function Nickname({ nickname, allowChanging, onChange }) {
+function Nickname({ nickname, allowChanging, onChange, onStream }) {
   const [isChangeModalOpen, setIsChangeModalOpen] = useState(false);
   function openModal() {
     setIsChangeModalOpen(true);
@@ -32,16 +32,8 @@ function Nickname({ nickname, allowChanging, onChange }) {
         variant="caption"
         sx={{
           fontSize: 10,
-          cursor: allowChanging ? "pointer" : "default",
-          ":hover": allowChanging && {
-            color: "primary",
-          },
-          ":active": allowChanging && {
-            color: "secondary",
-          },
           position: "relative",
         }}
-        onClick={() => allowChanging && openModal()}
       >
         {nickname}
         {allowChanging && (
@@ -54,7 +46,33 @@ function Nickname({ nickname, allowChanging, onChange }) {
               position: "absolute",
               bottom: "-2px",
             }}
+            aria-label="Start Radio Stream"
+            onClick={() => allowChanging && onStream()}
+          >
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              height="10"
+              viewBox="0 0 24 24"
+              width="10"
+              fill="currentcolor"
+            >
+              <path d="M3.24 6.15C2.51 6.43 2 7.17 2 8v12c0 1.1.9 2 2 2h16c1.11 0 2-.9 2-2V8c0-1.1-.9-2-2-2H8.3l7.43-3c.46-.19.68-.71.49-1.17-.19-.46-.71-.68-1.17-.49L3.24 6.15zM7 20c-1.66 0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3zm13-8h-2v-1c0-.55-.45-1-1-1s-1 .45-1 1v1H4V9c0-.55.45-1 1-1h14c.55 0 1 .45 1 1v3z" />
+            </svg>
+          </IconButton>
+        )}
+        {allowChanging && (
+          <IconButton
+            sx={{
+              width: "10px",
+              height: "10px",
+              padding: 0,
+              margin: "2px",
+              position: "absolute",
+              bottom: "-2px",
+              transform: "translateX(12px)",
+            }}
             aria-label="Change Nickname"
+            onClick={() => allowChanging && openModal()}
           >
             <svg
               xmlns="http://www.w3.org/2000/svg"
@@ -93,6 +111,7 @@ function Nickname({ nickname, allowChanging, onChange }) {
 Nickname.defaultProps = {
   allowChanging: false,
   onChange: () => {},
+  onStream: () => {},
 };
 
 export default Nickname;
diff --git a/src/components/Party.js b/src/components/Party.js
index 0416bd1..578be6a 100644
--- a/src/components/Party.js
+++ b/src/components/Party.js
@@ -3,8 +3,17 @@ import { Flex, Box, Text } from "theme-ui";
 
 import AddPartyMemberButton from "./AddPartyMemberButton";
 import Nickname from "./Nickname";
+import Stream from "./Stream";
 
-function Party({ nickname, partyNicknames, gameId, onNicknameChange }) {
+function Party({
+  nickname,
+  partyNicknames,
+  gameId,
+  onNicknameChange,
+  stream,
+  partyStreams,
+  onStreamStart,
+}) {
   return (
     <Flex
       p={3}
@@ -36,10 +45,19 @@ function Party({ nickname, partyNicknames, gameId, onNicknameChange }) {
           nickname={nickname || ""}
           allowChanging
           onChange={onNicknameChange}
+          onStream={onStreamStart}
         />
         {Object.entries(partyNicknames).map(([id, partyNickname]) => (
           <Nickname nickname={partyNickname} key={id} />
         ))}
+        {(stream || Object.keys(partyStreams).length !== 0) && (
+          <Text>Streams</Text>
+        )}
+        {stream && <Stream stream={stream} muted />}
+        {partyStreams &&
+          Object.entries(partyStreams).map(([id, partyStream]) => (
+            <Stream stream={partyStream} key={id} />
+          ))}
       </Box>
       <Box>
         <AddPartyMemberButton gameId={gameId} />
diff --git a/src/components/Stream.js b/src/components/Stream.js
new file mode 100644
index 0000000..be7626e
--- /dev/null
+++ b/src/components/Stream.js
@@ -0,0 +1,26 @@
+import React, { useRef, useEffect } from "react";
+
+function Stream({ stream, muted }) {
+  const videoRef = useRef();
+  useEffect(() => {
+    if (videoRef.current) {
+      videoRef.current.srcObject = stream;
+    }
+  }, [stream]);
+
+  return (
+    <video
+      ref={videoRef}
+      autoPlay
+      playsInline
+      muted={muted}
+      style={{ width: "100%" }}
+    />
+  );
+}
+
+Stream.defaultProps = {
+  muted: false,
+};
+
+export default Stream;
diff --git a/src/helpers/useSession.js b/src/helpers/useSession.js
index 90f0ac9..c431bb7 100644
--- a/src/helpers/useSession.js
+++ b/src/helpers/useSession.js
@@ -6,7 +6,13 @@ import Peer from "../helpers/Peer";
 
 const socket = io("https://broker.owlbear.rodeo");
 
-function useSession(partyId, onPeerConnected, onPeerDisconnected, onPeerData) {
+function useSession(
+  partyId,
+  onPeerConnected,
+  onPeerDisconnected,
+  onPeerData,
+  onPeerStream
+) {
   useEffect(() => {
     socket.emit("join party", partyId);
   }, [partyId]);
@@ -32,6 +38,10 @@ function useSession(partyId, onPeerConnected, onPeerDisconnected, onPeerData) {
         onPeerData && onPeerData({ id, peer, data });
       });
 
+      peer.on("stream", (stream) => {
+        onPeerStream && onPeerStream({ id, peer, stream });
+      });
+
       peer.on("close", () => {
         onPeerDisconnected && onPeerDisconnected(id);
       });
@@ -83,7 +93,7 @@ function useSession(partyId, onPeerConnected, onPeerDisconnected, onPeerData) {
       socket.removeListener("joined party", handleJoinedParty);
       socket.removeListener("signal", handleSignal);
     };
-  }, [peers, onPeerConnected, onPeerDisconnected, onPeerData]);
+  }, [peers, onPeerConnected, onPeerDisconnected, onPeerData, onPeerStream]);
 
   return { peers, socket };
 }
diff --git a/src/routes/Game.js b/src/routes/Game.js
index 3fb858e..84f7602 100644
--- a/src/routes/Game.js
+++ b/src/routes/Game.js
@@ -18,7 +18,8 @@ function Game() {
     gameId,
     handlePeerConnected,
     handlePeerDisconnected,
-    handlePeerData
+    handlePeerData,
+    handlePeerStream
   );
 
   const [mapSource, setMapSource] = useState(null);
@@ -70,8 +71,13 @@ function Game() {
     }
   }
 
+  const [stream, setStream] = useState(null);
+  const [partyStreams, setPartyStreams] = useState({});
   function handlePeerConnected({ peer }) {
     peer.send({ id: "nickname", data: { [socket.id]: nickname } });
+    if (stream) {
+      peer.addStream(stream);
+    }
   }
 
   function handlePeerData({ data, peer }) {
@@ -107,10 +113,28 @@ function Game() {
     }
   }
 
+  function handlePeerStream({ id, stream: partyStream }) {
+    setPartyStreams((prevStreams) => ({
+      ...prevStreams,
+      [id]: partyStream,
+    }));
+  }
+
   function handlePeerDisconnected(disconnectedId) {
     setPartyNicknames((prevNicknames) => omit(prevNicknames, [disconnectedId]));
   }
 
+  function handleStreamStart() {
+    navigator.mediaDevices
+      .getDisplayMedia({ video: true, audio: true })
+      .then((mediaStream) => {
+        setStream(mediaStream);
+        for (let peer of Object.values(peers)) {
+          peer.addStream(mediaStream);
+        }
+      });
+  }
+
   return (
     <Flex sx={{ flexDirection: "column", height: "100%" }}>
       <Flex
@@ -121,6 +145,9 @@ function Game() {
           partyNicknames={partyNicknames}
           gameId={gameId}
           onNicknameChange={handleNicknameChange}
+          stream={stream}
+          partyStreams={partyStreams}
+          onStreamStart={handleStreamStart}
         />
         <Map
           mapSource={mapSource}