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

try to recover from bad domains

Browse source
This commit is contained in:
MathMan05 2024-08-18 15:36:48 -05:00
parent 0710685e50
commit 50aa594e44
2 changed files with 75 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

39
.dist/localuser.js
View file

@ -3,7 +3,7 @@ import { Direct } from "./direct.js";
import { Voice } from "./audio.js"; import { Voice } from "./audio.js";
import { User } from "./user.js"; import { User } from "./user.js";
import { Dialog } from "./dialog.js"; import { Dialog } from "./dialog.js";
import { getBulkInfo, setTheme } from "./login.js"; import { getapiurls, getBulkInfo, setTheme } from "./login.js";
import { SnowFlake } from "./snowflake.js"; import { SnowFlake } from "./snowflake.js";
import { Message } from "./message.js"; import { Message } from "./message.js";
import { Member } from "./member.js"; import { Member } from "./member.js";
@ -206,7 +206,7 @@ class Localuser {
res(); res();
} }
}); });
this.ws.addEventListener("close", event => { this.ws.addEventListener("close", async (event) => {
this.ws = undefined; this.ws = undefined;
console.log("WebSocket closed with code " + event.code); console.log("WebSocket closed with code " + event.code);
this.unload(); this.unload();
@ -222,6 +222,41 @@ class Localuser {
this.errorBackoff++; this.errorBackoff++;
this.connectionSucceed = 0; this.connectionSucceed = 0;
document.getElementById("load-desc").innerHTML = "Unable to connect to the Spacebar server, retrying in <b>" + Math.round(0.2 + (this.errorBackoff * 2.8)) + "</b> seconds..."; document.getElementById("load-desc").innerHTML = "Unable to connect to the Spacebar server, retrying in <b>" + Math.round(0.2 + (this.errorBackoff * 2.8)) + "</b> seconds...";
switch (this.errorBackoff) { //try to recover from bad domain
case 3:
const newurls = await getapiurls(this.info.wellknown);
if (newurls) {
this.info = newurls;
this.serverurls = newurls;
this.userinfo.json.serverurls = this.info;
this.userinfo.updateLocal();
break;
}
case 4:
{
const newurls = await getapiurls(new URL(this.info.wellknown).origin);
if (newurls) {
this.info = newurls;
this.serverurls = newurls;
this.userinfo.json.serverurls = this.info;
this.userinfo.updateLocal();
break;
}
}
case 5:
{
const breakappart = new URL(this.info.wellknown).origin.split(".");
const url = "https://" + breakappart[breakappart.length - 2] + "." + breakappart[breakappart.length - 1];
const newurls = await getapiurls(url);
if (newurls) {
this.info = newurls;
this.serverurls = newurls;
this.userinfo.json.serverurls = this.info;
this.userinfo.updateLocal();
}
break;
}
}
setTimeout(() => { setTimeout(() => {
if (this.swapped) if (this.swapped)
return; return;

40
webpage/localuser.ts
View file

@ -4,7 +4,7 @@ import {Direct} from "./direct.js";
import {Voice} from "./audio.js"; import {Voice} from "./audio.js";
import {User} from "./user.js"; import {User} from "./user.js";
import {Dialog} from "./dialog.js"; import {Dialog} from "./dialog.js";
import {getBulkInfo, setTheme, Specialuser} from "./login.js"; import {getapiurls, getBulkInfo, setTheme, Specialuser} from "./login.js";
import { SnowFlake } from "./snowflake.js"; import { SnowFlake } from "./snowflake.js";
import { Message } from "./message.js"; import { Message } from "./message.js";
import { channeljson, guildjson, memberjson, presencejson, readyjson } from "./jsontypes.js"; import { channeljson, guildjson, memberjson, presencejson, readyjson } from "./jsontypes.js";
@ -215,7 +215,7 @@ class Localuser{
} }
}); });
this.ws.addEventListener("close", event => { this.ws.addEventListener("close",async event => {
this.ws=undefined; this.ws=undefined;
console.log("WebSocket closed with code " + event.code); console.log("WebSocket closed with code " + event.code);
@ -231,7 +231,43 @@ class Localuser{
this.connectionSucceed=0; this.connectionSucceed=0;
document.getElementById("load-desc").innerHTML="Unable to connect to the Spacebar server, retrying in <b>" + Math.round(0.2 + (this.errorBackoff*2.8)) + "</b> seconds..."; document.getElementById("load-desc").innerHTML="Unable to connect to the Spacebar server, retrying in <b>" + Math.round(0.2 + (this.errorBackoff*2.8)) + "</b> seconds...";
switch(this.errorBackoff){//try to recover from bad domain
case 3:
const newurls=await getapiurls(this.info.wellknown);
if(newurls){
this.info=newurls;
this.serverurls=newurls;
this.userinfo.json.serverurls=this.info;
this.userinfo.updateLocal();
break
}
case 4:
{
const newurls=await getapiurls(new URL(this.info.wellknown).origin);
if(newurls){
this.info=newurls;
this.serverurls=newurls;
this.userinfo.json.serverurls=this.info;
this.userinfo.updateLocal();
break
}
}
case 5:
{
const breakappart=new URL(this.info.wellknown).origin.split(".");
const url="https://"+breakappart[breakappart.length-2]+"."+breakappart[breakappart.length-1]
const newurls=await getapiurls(url);
if(newurls){
this.info=newurls;
this.serverurls=newurls;
this.userinfo.json.serverurls=this.info;
this.userinfo.updateLocal();
}
break
}
}
setTimeout(() => { setTimeout(() => {
if(this.swapped) return; if(this.swapped) return;
document.getElementById("load-desc").textContent="Retrying..."; document.getElementById("load-desc").textContent="Retrying...";