From c82aa4392f33213c78f78da754df9b863feb4068 Mon Sep 17 00:00:00 2001 From: LAX1DUDE Date: Sun, 17 Jul 2022 20:59:50 -0700 Subject: [PATCH] removed .bak file --- .gitignore | 1 + javascript/eagswebrtc.js.bak | 276 ----------------------------------- 2 files changed, 1 insertion(+), 276 deletions(-) delete mode 100644 javascript/eagswebrtc.js.bak diff --git a/.gitignore b/.gitignore index 95d7984..17de4a0 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ stable-download/java/spigot_command/server.log stable-download/java/bungee_command/proxy* stable-download/web_ lwjgl-rundir/_eagstorage* +*.bak \ No newline at end of file diff --git a/javascript/eagswebrtc.js.bak b/javascript/eagswebrtc.js.bak deleted file mode 100644 index c38eb37..0000000 --- a/javascript/eagswebrtc.js.bak +++ /dev/null @@ -1,276 +0,0 @@ -"use strict"; - -/* - -This is the backend for voice channels in eaglercraft, it links with TeaVM EaglerAdapter at runtime - -Copyright 2022 Calder Young & ayunami2000. All rights reserved. - -Based on code written by ayunami2000 - -*/ - -window.initializeVoiceClient = (() => { - - const READYSTATE_NONE = 0; - const READYSTATE_ABORTED = -1; - const READYSTATE_DEVICE_INITIALIZED = 1; - - const TASKSTATE_NONE = -1; - const TASKSTATE_LOADING = 0; - const TASKSTATE_COMPLETE = 1; - const TASKSTATE_FAILED = 2; - - class EaglercraftVoicePeer { - - constructor(client, peerId, peerConnection, offer) { - this.client = client; - this.peerId = peerId; - this.peerConnection = peerConnection; - this.stream = null; - - const self = this; - this.peerConnection.addEventListener("icecandidate", (evt) => { - if(evt.candidate) { - self.client.iceCandidateHandler(self.peerId, JSON.stringify({ sdpMLineIndex: evt.candidate.sdpMLineIndex, candidate: evt.candidate.candidate })); - } - }); - - this.peerConnection.addEventListener("track", (evt) => { - self.rawStream = evt.streams[0]; - const aud = new Audio(); - aud.autoplay = true; - aud.muted = true; - aud.onended = function() { - aud.remove(); - }; - aud.srcObject = self.rawStream; - self.client.peerTrackHandler(self.peerId, self.rawStream); - }); - - this.peerConnection.addStream(this.client.localMediaStream.stream); - if (offer) { - this.peerConnection.createOffer((desc) => { - const selfDesc = desc; - self.peerConnection.setLocalDescription(selfDesc, () => { - self.client.descriptionHandler(self.peerId, JSON.stringify(selfDesc)); - }, (err) => { - console.error("Failed to set local description for \"" + self.peerId + "\"! " + err); - self.client.signalDisconnect(self.peerId); - }); - }, (err) => { - console.error("Failed to set create offer for \"" + self.peerId + "\"! " + err); - self.client.signalDisconnect(self.peerId); - }); - } - - this.peerConnection.addEventListener("connectionstatechange", (evt) => { - if(evt.connectionState === 'disconnected') { - self.client.signalDisconnect(self.peerId); - } - }); - - } - - disconnect() { - this.peerConnection.close(); - } - - mute(muted) { - this.rawStream.getAudioTracks()[0].enabled = !muted; - } - - setRemoteDescription(descJSON) { - const self = this; - try { - const remoteDesc = JSON.parse(descJSON); - this.peerConnection.setRemoteDescription(remoteDesc, () => { - if(remoteDesc.type == 'offer') { - self.peerConnection.createAnswer((desc) => { - const selfDesc = desc; - self.peerConnection.setLocalDescription(selfDesc, () => { - self.client.descriptionHandler(self.peerId, JSON.stringify(selfDesc)); - }, (err) => { - console.error("Failed to set local description for \"" + self.peerId + "\"! " + err); - self.client.signalDisconnect(self.peerId); - }); - }, (err) => { - console.error("Failed to create answer for \"" + self.peerId + "\"! " + err); - self.client.signalDisconnect(self.peerId); - }); - } - }, (err) => { - console.error("Failed to set remote description for \"" + self.peerId + "\"! " + err); - self.client.signalDisconnect(self.peerId); - }); - } catch (err) { - console.error("Failed to parse remote description for \"" + self.peerId + "\"! " + err); - self.client.signalDisconnect(self.peerId); - } - } - - addICECandidate(candidate) { - try { - this.peerConnection.addIceCandidate(new RTCIceCandidate(JSON.parse(candidate))); - } catch (err) { - console.error("Failed to parse ice candidate for \"" + self.peerId + "\"! " + err); - self.client.signalDisconnect(self.peerId); - } - } - - } - - class EaglercraftVoiceClient { - - constructor() { - this.ICEServers = []; - this.hasInit = false; - this.peerList = new Map(); - this.readyState = READYSTATE_NONE; - this.taskState = TASKSTATE_NONE; - this.iceCandidateHandler = null; - this.descriptionHandler = null; - this.peerTrackHandler = null; - this.peerDisconnectHandler = null; - this.peerDisconnectHandlerQuiet = null; - this.microphoneVolumeAudioContext = new AudioContext(); - } - - voiceClientSupported() { - return typeof window.RTCPeerConnection !== "undefined" && typeof navigator.mediaDevices !== "undefined" && - typeof navigator.mediaDevices.getUserMedia !== "undefined"; - } - - setICEServers(urls) { - this.ICEServers.length = 0; - if (urls.length == 0) { - this.ICEServers = [ { urls: "stun:openrelay.metered.ca:80" }, { urls: "turn:openrelay.metered.ca:80", username: "openrelayproject", credential: "openrelayproject" }, { urls: "turn:openrelay.metered.ca:443", username: "openrelayproject", credential: "openrelayproject", }, { urls: "turn:openrelay.metered.ca:443?transport=tcp", username: "openrelayproject", credential: "openrelayproject" } ]; - } else { - for(var i = 0; i < urls.length; ++i) { - this.ICEServers.push({ urls: urls[i] }); - } - } - } - - setICECandidateHandler(cb) { - this.iceCandidateHandler = cb; - } - - setDescriptionHandler(cb) { - this.descriptionHandler = cb; - } - - setPeerTrackHandler(cb) { - this.peerTrackHandler = cb; - } - - setPeerDisconnectHandler(cb) { - this.peerDisconnectHandler = cb; - } - - setPeerDisconnectHandlerQuiet(cb) { - this.peerDisconnectHandlerQuiet = cb; - } - - activateVoice(tk) { - if(this.hasInit) this.localRawMediaStream.getAudioTracks()[0].enabled = tk; - } - - initializeDevices() { - if(!this.hasInit) { - this.taskState = TASKSTATE_LOADING; - const self = this; - navigator.mediaDevices.getUserMedia({ audio: true, video: false }).then((stream) => { - self.localRawMediaStream = stream; - self.localRawMediaStream.getAudioTracks()[0].enabled = false; - self.localMediaStream = self.microphoneVolumeAudioContext.createMediaStreamDestination(); - self.localMediaStreamGain = self.microphoneVolumeAudioContext.createGain(); - var localStreamIn = self.microphoneVolumeAudioContext.createMediaStreamSource(stream); - localStreamIn.connect(self.localMediaStreamGain); - self.localMediaStreamGain.connect(self.localMediaStream); - self.localMediaStreamGain.gain.value = 1.0; - self.readyState = READYSTATE_DEVICE_INITIALIZED; - self.taskState = TASKSTATE_COMPLETE; - this.hasInit = true; - }).catch((err) => { - console.error(err); - self.readyState = READYSTATE_ABORTED; - self.taskState = TASKSTATE_FAILED; - }); - }else { - self.readyState = READYSTATE_DEVICE_INITIALIZED; - self.taskState = TASKSTATE_COMPLETE; - } - } - - setMicVolume(val) { - if(this.hasInit) { - if(val > 0.5) val = 0.5 + (val - 0.5) * 2.0; - if(val > 1.5) val = 1.5; - if(val < 0.0) val = 0.0; - this.localMediaStreamGain.gain.value = val * 2.0; - } - } - - getTaskState() { - return this.taskState; - } - - getReadyState() { - return this.readyState; - } - - signalConnect(peerId, offer) { - if (!this.hasInit) initializeDevices(); - const peerConnection = new RTCPeerConnection({ iceServers: this.ICEServers, optional: [ { DtlsSrtpKeyAgreement: true } ] }); - const peerInstance = new EaglercraftVoicePeer(this, peerId, peerConnection, offer); - this.peerList.set(peerId, peerInstance); - } - - signalDescription(peerId, descJSON) { - var thePeer = this.peerList.get(peerId); - if((typeof thePeer !== "undefined") && thePeer !== null) { - thePeer.setRemoteDescription(descJSON); - } - } - - signalDisconnect(peerId, quiet) { - var thePeer = this.peerList.get(peerId); - if((typeof thePeer !== "undefined") && thePeer !== null) { - this.peerList.delete(thePeer); - try { - thePeer.disconnect(); - }catch(e) {} - if (quoet) { - this.peerDisconnectHandlerQuiet(peerId); - } else { - this.peerDisconnectHandler(peerId); - } - } - } - - mutePeer(peerId, muted) { - var thePeer = this.peerList.get(peerId); - if((typeof thePeer !== "undefined") && thePeer !== null) { - thePeer.mute(muted); - } - } - - signalICECandidate(peerId, candidate) { - var thePeer = this.peerList.get(peerId); - if((typeof thePeer !== "undefined") && thePeer !== null) { - thePeer.addICECandidate(candidate); - } - } - - } - - window.constructVoiceClient = () => new EaglercraftVoiceClient(); -}); - -window.startVoiceClient = () => { - if(typeof window.constructVoiceClient !== "function") { - window.initializeVoiceClient(); - } - return window.constructVoiceClient(); -}; \ No newline at end of file