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

algorithm fixes for uptime

Browse Source
This commit is contained in:
MathMan05
2024-08-30 08:22:44 -05:00
parent df9e7d55aa
commit beeee24799
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
stats.js
View File

@@ -16,7 +16,7 @@ if(uptimeObject["undefined"]){
async function observe(instances){ async function observe(instances){
const active=new Set(); const active=new Set();
async function resolveinstance(instance){ async function resolveinstance(instance){
calcStats(instance); try{calcStats(instance)}catch(e){console.error(e)}
let api; let api;
if(instance.urls){ if(instance.urls){
api=instance.urls.api; api=instance.urls.api;
@@ -36,7 +36,7 @@ async function observe(instances){
active.add(instance.name); active.add(instance.name);
api+=api.endsWith("/")?"":"/" api+=api.endsWith("/")?"":"/"
function check(){ function check(){
fetch(api+"ping").then(_=>{ fetch(api+"ping",{method:"HEAD"}).then(_=>{
setStatus(instance,_.ok); setStatus(instance,_.ok);
}) })
} }
@@ -67,17 +67,22 @@ function calcStats(instance){
const week=Date.now()-1000*60*60*24*7; const week=Date.now()-1000*60*60*24*7;
let alltime=-1; let alltime=-1;
let totalTimePassed=0; let totalTimePassed=0;
let laststamp=0;
let daytime=-1; let daytime=-1;
let weektime=-1; let weektime=-1;
let online=false; let online=false;
let i=0;
for(const thing of obj){ for(const thing of obj){
const stamp=thing.time; online=obj[i].online;
const stamp=obj[i].time;
if(alltime===-1){ if(alltime===-1){
laststamp=stamp;
alltime=0; alltime=0;
} }
const timepassed=stamp-laststamp; let timepassed;
if(obj[i+1]){
timepassed=obj[i+1].time-stamp;
}else{
timepassed=Date.now()-stamp;
}
totalTimePassed+=timepassed; totalTimePassed+=timepassed;
alltime+=online*timepassed; alltime+=online*timepassed;
if(stamp>week){ if(stamp>week){
@@ -94,18 +99,14 @@ function calcStats(instance){
} }
} }
} }
online=thing.online;
i++;
} }
instance.online=online; instance.online=online;
const timepassed=Date.now()-laststamp;
totalTimePassed+=timepassed;
daytime+=online*Math.min(timepassed,1000*60*60*24);
weektime+=online*Math.min(timepassed,1000*60*60*24*7);
alltime+=online*timepassed;
alltime/=totalTimePassed; alltime/=totalTimePassed;
if(timepassed>1000*60*60*24){ if(totalTimePassed>1000*60*60*24){
daytime/=1000*60*60*24; daytime/=1000*60*60*24;
if(timepassed>1000*60*60*24*7){ if(totalTimePassed>1000*60*60*24*7){
weektime/=1000*60*60*24*7; weektime/=1000*60*60*24*7;
}else{ }else{
weektime=alltime; weektime=alltime;