local
/
entropy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Working on making server and client uuid in sync but a challenjour has appeared is good

master
Bel LaPointe 2020-05-13 16:42:12 -06:00
parent d6ea697f57
commit fab2ab97d7
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pool.go
View File

@ -30,7 +30,7 @@ func (p *Pool) Push(id string, conn *websocket.Conn) {
p.lock.Lock() p.lock.Lock()
p.conns.Store(id, &Conn{ws: *conn}) p.conns.Store(id, &Conn{ws: *conn})
p.lock.Unlock() p.lock.Unlock()
p.Broadcast(websocket.TextMessage, strings.NewReader(`{"joined":"`+id+`"}`)) p.Broadcast(websocket.TextMessage, strings.NewReader(`{"joined":"`+id+`", "uuid":"`+id+`"}`))
} }
func (p *Pool) Broadcast(mt int, r io.Reader) error { func (p *Pool) Broadcast(mt int, r io.Reader) error {

21
public/webrtc.js
View File

@ -123,7 +123,7 @@ class RTC {
constructor(stream) { constructor(stream) {
this.conn = new RTCPeerConnection(Config.iceConfig); this.conn = new RTCPeerConnection(Config.iceConfig);
this.conn.onicecandidate = (event) => { this.conn.onicecandidate = (event) => {
if(event.candidate != null) { if (event.candidate != null) {
WS.ws.send(JSON.stringify({'ice': event.candidate, 'uuid': Config.getUUID()})); WS.ws.send(JSON.stringify({'ice': event.candidate, 'uuid': Config.getUUID()}));
} }
}; };
@ -153,27 +153,30 @@ class Entropy {
static start(isCaller) { static start(isCaller) {
Entropy.rtc = new RTC(Entropy.local.stream); Entropy.rtc = new RTC(Entropy.local.stream);
if(isCaller) { if (isCaller) {
Entropy.rtc.offer(Entropy.createdDescription); Entropy.rtc.offer(Entropy.createdDescription);
} }
} }
static gotMessageFromServer(message) { static gotMessageFromServer(message) {
if(!Entropy.rtc || !Entropy.rtc.conn) Entropy.start(false); if (!Entropy.rtc || !Entropy.rtc.conn) Entropy.start(false);
var signal = JSON.parse(message.data); var signal = JSON.parse(message.data);
// Ignore messages from ourself // Ignore messages from ourself
if(signal.uuid == Config.getUUID()) return; if (signal.uuid == Config.getUUID()) return;
if(signal.sdp) { if (signal.joined)
Log.info("a challenjour has appeared", JSON.stringify(signal));
if (signal.sdp) {
Entropy.rtc.conn.setRemoteDescription(new RTCSessionDescription(signal.sdp)).then(function() { Entropy.rtc.conn.setRemoteDescription(new RTCSessionDescription(signal.sdp)).then(function() {
// Only create answers in response to offers // Only create answers in response to offers
if(signal.sdp.type == 'offer') { if (signal.sdp.type == 'offer') {
Entropy.rtc.conn.createAnswer().then(Entropy.createdDescription).catch(Log.error); Entropy.rtc.conn.createAnswer().then(Entropy.createdDescription).catch(Log.error);
} }
}).catch(Log.error); }).catch(Log.error);
} else if(signal.ice) { } else if (signal.ice) {
Entropy.rtc.conn.addIceCandidate(new RTCIceCandidate(signal.ice)).catch(Log.error); Entropy.rtc.conn.addIceCandidate(new RTCIceCandidate(signal.ice)).catch(Log.error);
} }
} }
@ -212,7 +215,7 @@ class Local {
video: this.gettype() == "video", video: this.gettype() == "video",
audio: this.gettype() == "audio", audio: this.gettype() == "audio",
}; };
if(!navigator.mediaDevices.getUserMedia) { if (!navigator.mediaDevices.getUserMedia) {
Log.error('Your browser does not support getUserMedia API'); Log.error('Your browser does not support getUserMedia API');
} }
navigator.mediaDevices.getUserMedia(constraints) navigator.mediaDevices.getUserMedia(constraints)
@ -258,7 +261,7 @@ for (var i in ["log", "info", "warn", "error"]) {
window.console = console; window.console = console;
function pageReady() { function pageReady() {
Config.newUUID(); //Config.newUUID();
var host = window.location.hostname; var host = window.location.hostname;
if (window.location.port) { if (window.location.port) {
host += ":" + window.location.port; host += ":" + window.location.port;