From f25261d70bdf2c44e941fbd003c7eea2712cd3a5 Mon Sep 17 00:00:00 2001
From: Mitchell McCaffrey <mitchemmc@gmail.com>
Date: Fri, 17 Jul 2020 15:39:45 +1000
Subject: [PATCH] Fix data channel support for data request replys and added
 token channel support

---
 src/helpers/Session.js               |  4 ++--
 src/network/NetworkedMapAndTokens.js | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/helpers/Session.js b/src/helpers/Session.js
index c8630b6..da95774 100644
--- a/src/helpers/Session.js
+++ b/src/helpers/Session.js
@@ -119,8 +119,8 @@ class Session extends EventEmitter {
       }
       const peer = { id, connection, initiator, sync };
 
-      function sendPeer(id, data) {
-        peer.connection.send({ id, data });
+      function sendPeer(id, data, channel) {
+        peer.connection.send({ id, data }, channel);
       }
 
       function handleSignal(signal) {
diff --git a/src/network/NetworkedMapAndTokens.js b/src/network/NetworkedMapAndTokens.js
index 2085964..6069c1a 100644
--- a/src/network/NetworkedMapAndTokens.js
+++ b/src/network/NetworkedMapAndTokens.js
@@ -61,11 +61,11 @@ function NetworkedMapAndTokens({ session }) {
     setCurrentMapState(newMapState);
     setCurrentMap(newMap);
     session.send("map", null, "map");
-    session.send("mapState", newMapState, "map");
+    session.send("mapState", newMapState);
     session.send("map", getMapDataToSend(newMap), "map");
     const tokensToSend = getMapTokensToSend(newMapState);
     for (let token of tokensToSend) {
-      session.send("token", token);
+      session.send("token", token, "token");
     }
   }
 
@@ -225,11 +225,11 @@ function NetworkedMapAndTokens({ session }) {
           reply("mapState", currentMapState);
           const tokensToSend = getMapTokensToSend(currentMapState);
           for (let token of tokensToSend) {
-            reply("token", token);
+            reply("token", token, "token");
           }
         }
         if (currentMap) {
-          reply("map", getMapDataToSend(currentMap));
+          reply("map", getMapDataToSend(currentMap), "map");
         }
       }
       if (id === "map") {
@@ -298,13 +298,13 @@ function NetworkedMapAndTokens({ session }) {
             !cachedToken ||
             cachedToken.lastModified !== newToken.lastModified
           ) {
-            reply("tokenRequest", newToken.id);
+            reply("tokenRequest", newToken.id, "token");
           }
         }
       }
       if (id === "tokenRequest") {
         const token = getToken(data);
-        reply("tokenResponse", token);
+        reply("tokenResponse", token, "token");
       }
       if (id === "tokenResponse") {
         const newToken = data;