Andromeda/jank-client-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more fixes

Browse source
This commit is contained in:
MathMan05 2024-10-09 19:32:38 -05:00
parent 68fb667615
commit 9c7daf8078
3 changed files with 88 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/webpage/localuser.ts
View file

@ -507,6 +507,9 @@ class Localuser{
waitingForVoice?:((arg:voiceupdate|undefined)=>void); waitingForVoice?:((arg:voiceupdate|undefined)=>void);
currentVoice?:Voice; currentVoice?:Voice;
async joinVoice(voice:Voice){ async joinVoice(voice:Voice){
if(this.currentVoice){
this.currentVoice.leave();
}
this.currentVoice=voice; this.currentVoice=voice;
if(this.ws){ if(this.ws){
this.ws.send(JSON.stringify({ this.ws.send(JSON.stringify({

25
src/webpage/voice.ts
View file

@ -62,6 +62,10 @@ class Voice{
setTimeout(this.sendAlive.bind(this), 1000); setTimeout(this.sendAlive.bind(this), 1000);
break; break;
case 12: case 12:
if(!this.users.has(json.d.audio_ssrc)){
console.log("redo 12!");
this.makeOp12();
}
this.users.set(json.d.audio_ssrc,json.d.user_id); this.users.set(json.d.audio_ssrc,json.d.user_id);
break break
@ -176,8 +180,6 @@ a=rtcp-mux\r`;
})).sdp; })).sdp;
await pc.setLocalDescription({sdp:this.offer}); await pc.setLocalDescription({sdp:this.offer});
if(!this.counter) throw new Error("counter isn't defined"); if(!this.counter) throw new Error("counter isn't defined");
const counter=this.counter; const counter=this.counter;
const remote:{sdp:string,type:RTCSdpType}={sdp:this.cleanServerSDP(counter),type:"answer"}; const remote:{sdp:string,type:RTCSdpType}={sdp:this.cleanServerSDP(counter),type:"answer"};
@ -188,7 +190,7 @@ a=rtcp-mux\r`;
for(const thing of (await sender.getStats())){ for(const thing of (await sender.getStats())){
if(thing[1].ssrc){ if(thing[1].ssrc){
this.ssrcMap.set(sender,thing[1].ssrc); this.ssrcMap.set(sender,thing[1].ssrc);
this.makeOp12(sender) this.makeOp12(sender);
} }
} }
} }
@ -196,7 +198,11 @@ a=rtcp-mux\r`;
}); });
} }
} }
async makeOp12(sender:RTCRtpSender){ async makeOp12(sender:RTCRtpSender|undefined|[RTCRtpSender,string]=(this.ssrcMap.entries().next().value)){
if(!sender) throw new Error("sender doesn't exist");
if(sender instanceof Array){
sender=sender[0];
}
if(this.ws){ if(this.ws){
this.ws.send(JSON.stringify({ this.ws.send(JSON.stringify({
op: 12, op: 12,
@ -480,5 +486,16 @@ a=rtcp-mux\r`;
//pc.setRemoteDescription({sdp:json.d.token,type:""}) //pc.setRemoteDescription({sdp:json.d.token,type:""})
*/ */
} }
async leave(){
this.status="Left voice chat";
if(this.ws){
this.ws.close();
this.ws=undefined;
}
if(this.pc){
this.pc.close();
this.pc=undefined;
}
}
} }
export {Voice}; export {Voice};