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

Fix out of order WS issues on firefox

Browse source
This commit is contained in:
MathMan05 2024-08-14 12:35:59 -05:00
parent a605f1672a
commit 3cdb1bb8e1
2 changed files with 82 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

58
.dist/localuser.js
View file

@ -143,15 +143,39 @@ class Localuser {
let w;
let r;
let arr;
let build = "";
if (DecompressionStream) {
ds = new DecompressionStream("deflate");
w = ds.writable.getWriter();
r = ds.readable.getReader();
arr = new Uint8Array();
}
let build = "";
this.ws.addEventListener('message', async (event) => {
(async () => {
let temp;
while (true) {
const read = (await r.read());
const data = new TextDecoder().decode(read.value);
build += data;
try {
temp = JSON.parse(build);
build = "";
if (temp.op === 0 && temp.t === "READY") {
returny();
}
this.handleEvent(temp);
}
catch {
}
}
})();
}
let order = new Promise((res) => (res()));
this.ws.addEventListener('message', async (event) => {
const temp2 = order;
let res;
order = new Promise((r) => (res = r));
await temp2;
let temp;
try {
if (event.data instanceof Blob) {
const buff = await event.data.arrayBuffer();
const array = new Uint8Array(buff);
@ -165,26 +189,7 @@ class Localuser {
}
w.write(arr.buffer);
arr = new Uint8Array();
//console.log(data,test);
while (true) {
const read = (await r.read());
const data = new TextDecoder().decode(read.value);
if (data === "") {
break;
}
build += data;
console.log("temp");
try {
temp = JSON.parse(build);
build = "";
if (temp.op === 0 && temp.t === "READY") {
returny();
}
this.handleEvent(temp);
}
catch {
}
}
return; //had to move the while loop due to me being dumb
}
else {
temp = JSON.parse(event.data);
@ -193,6 +198,13 @@ class Localuser {
returny();
}
this.handleEvent(temp);
}
catch (e) {
console.error(e);
}
finally {
res();
}
});
this.ws.addEventListener("close", event => {
this.ws = undefined;

52
webpage/localuser.ts
View file

@ -149,17 +149,41 @@ class Localuser{
let w:WritableStreamDefaultWriter;
let r:ReadableStreamDefaultReader;
let arr:Uint8Array;
let build="";
if(DecompressionStream){
ds = new DecompressionStream("deflate");
w= ds.writable.getWriter();
r=ds.readable.getReader();
arr=new Uint8Array();
(async ()=>{
let temp:any;
while(true){
const read=(await r.read());
const data=new TextDecoder().decode(read.value);
build+=data;
try{
temp=JSON.parse(build);
build="";
if(temp.op===0&&temp.t==="READY"){
returny();
}
this.handleEvent(temp);
}catch{
}
}
})();
}
let build="";
let order=new Promise<void>((res)=>(res()));
this.ws.addEventListener('message', async (event) => {
const temp2=order;
let res:Function;
order=new Promise<void>((r)=>(res=r))
await temp2;
let temp:{op:number,t:string};
try{
if(event.data instanceof Blob){
const buff=await event.data.arrayBuffer()
const array=new Uint8Array(buff);
@ -175,25 +199,7 @@ class Localuser{
}
w.write(arr.buffer);
arr=new Uint8Array();
//console.log(data,test);
while(true){
const read=(await r.read());
const data=new TextDecoder().decode(read.value);
if(data===""){
break;
}
build+=data;
console.log("temp");
try{
temp=JSON.parse(build);
build="";
if(temp.op===0&&temp.t==="READY"){
returny();
}
this.handleEvent(temp);
}catch{
}
}
return;//had to move the while loop due to me being dumb
}else{
temp=JSON.parse(event.data);
}
@ -201,7 +207,11 @@ class Localuser{
returny();
}
this.handleEvent(temp);
}catch(e){
console.error(e);
}finally{
res();
}
});
this.ws.addEventListener("close", event => {