From c89a75a23eac655215cdf64950c2079367b6a308 Mon Sep 17 00:00:00 2001 From: Mitchell McCaffrey Date: Mon, 4 Jan 2021 13:34:09 +1100 Subject: [PATCH] Disabled multiplexing --- src/network/NetworkedMapAndTokens.js | 4 ++-- src/network/Session.js | 8 ++++---- yarn.lock | 13 +++++++------ 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/network/NetworkedMapAndTokens.js b/src/network/NetworkedMapAndTokens.js index 3ed1356..d5e5075 100644 --- a/src/network/NetworkedMapAndTokens.js +++ b/src/network/NetworkedMapAndTokens.js @@ -134,7 +134,7 @@ function NetworkedMapAndTokens({ session }) { await updateMap(cachedMap.id, { lastUsed }); setCurrentMap({ ...cachedMap, lastUsed }); } else { - session.sendTo(owner.sessionId, "mapRequest", asset.id, "map"); + session.sendTo(owner.sessionId, "mapRequest", asset.id); } } else if (asset.type === "token") { const cachedToken = getToken(asset.id); @@ -143,7 +143,7 @@ function NetworkedMapAndTokens({ session }) { const lastUsed = Date.now(); await updateToken(cachedToken.id, { lastUsed }); } else { - session.sendTo(owner.sessionId, "tokenRequest", asset.id, "token"); + session.sendTo(owner.sessionId, "tokenRequest", asset.id); } } } diff --git a/src/network/Session.js b/src/network/Session.js index 7c87662..c95537f 100644 --- a/src/network/Session.js +++ b/src/network/Session.js @@ -193,10 +193,10 @@ class Session extends EventEmitter { trickle: true, config: { iceServers: this._iceServers }, }); - if (initiator) { - connection.createDataChannel("map", { iceServers: this._iceServers }); - connection.createDataChannel("token", { iceServers: this._iceServers }); - } + // if (initiator) { + // connection.createDataChannel("map", { iceServers: this._iceServers }); + // connection.createDataChannel("token", { iceServers: this._iceServers }); + // } const peer = { id, connection, initiator, ready: false }; function sendPeer(id, data, channel) { diff --git a/yarn.lock b/yarn.lock index b34bfbd..6d44fe1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5817,9 +5817,9 @@ gensync@^1.0.0-beta.1: integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== get-browser-rtc@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/get-browser-rtc/-/get-browser-rtc-1.0.2.tgz#bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9" - integrity sha1-u81AyEUaftTvXDc7gWmkCd0dEdk= + version "1.1.0" + resolved "https://registry.yarnpkg.com/get-browser-rtc/-/get-browser-rtc-1.1.0.tgz#d1494e299b00f33fc8e9d6d3343ba4ba99711a2c" + integrity sha512-MghbMJ61EJrRsDe7w1Bvqt3ZsBuqhce5nrn/XAwgwOXhcsz53/ltdxOse1h/8eKXj5slzxdsz56g5rzOFSGwfQ== get-caller-file@^2.0.1, get-caller-file@^2.0.5: version "2.0.5" @@ -9798,9 +9798,9 @@ querystringify@^2.1.1: integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== queue-microtask@^1.1.0: - version "1.1.4" - resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.1.4.tgz#40841ace4356b48b35b5ea61a2e1fe0a23c59ce1" - integrity sha512-eY/4Obve9cE5FK8YvC1cJsm5cr7XvAurul8UtBDJ2PR1p5NmAwHtvAt5ftcLtwYRCUKNhxCneZZlxmUDFoSeKA== + version "1.2.2" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.2.tgz#abf64491e6ecf0f38a6502403d4cda04f372dfd3" + integrity sha512-dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg== raf-schd@^4.0.2: version "4.0.2" @@ -10959,6 +10959,7 @@ simple-peer@feross/simple-peer#694/head: resolved "https://codeload.github.com/feross/simple-peer/tar.gz/0d08d07b83ff3b8c60401688d80642d24dfeffe2" dependencies: debug "^4.0.1" + err-code "^2.0.3" get-browser-rtc "^1.0.0" queue-microtask "^1.1.0" randombytes "^2.0.3"