From f5a275badc8dc86756cd890c5e25ceca5ad27248 Mon Sep 17 00:00:00 2001 From: adolfintel Date: Sun, 9 Dec 2018 08:10:43 +0100 Subject: [PATCH] My stupidity is beyond comprehension --- speedtest_worker.js | 8 ++++---- speedtest_worker.min.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/speedtest_worker.js b/speedtest_worker.js index 87c7a47..b6d8672 100644 --- a/speedtest_worker.js +++ b/speedtest_worker.js @@ -261,7 +261,7 @@ function dlTest (done) { // every 200ms, update dlStatus interval = setInterval(function () { tverb('DL: '+dlStatus+(graceTimeDone?'':' (in grace time)')) - var t = new Date().getTime() - startT + bonusT + var t = new Date().getTime() - startT if (graceTimeDone) dlProgress = t / (settings.time_dl_max * 1000) if (t < 200) return if (!graceTimeDone){ @@ -282,7 +282,7 @@ function dlTest (done) { } //update status dlStatus = ((speed * 8 * settings.overheadCompensationFactor)/(settings.useMebibits?1048576:1000000)).toFixed(2) // speed is multiplied by 8 to go from bytes to bits, overhead compensation is applied, then everything is divided by 1048576 or 1000000 to go to megabits/mebibits - if (((t / 1000.0) > settings.time_dl_max) || failed) { // test is over, stop streams and timer + if ((((t+ bonusT) / 1000.0) > settings.time_dl_max) || failed) { // test is over, stop streams and timer if (failed || isNaN(dlStatus)) dlStatus = 'Fail' clearRequests() clearInterval(interval) @@ -389,7 +389,7 @@ function ulTest (done) { // every 200ms, update ulStatus interval = setInterval(function () { tverb('UL: '+ulStatus+(graceTimeDone?'':' (in grace time)')) - var t = new Date().getTime() - startT + bonusT + var t = new Date().getTime() - startT if (graceTimeDone) ulProgress = t / (settings.time_ul_max * 1000) if (t < 200) return if (!graceTimeDone){ @@ -410,7 +410,7 @@ function ulTest (done) { } //update status ulStatus = ((speed * 8 * settings.overheadCompensationFactor)/(settings.useMebibits?1048576:1000000)).toFixed(2) // speed is multiplied by 8 to go from bytes to bits, overhead compensation is applied, then everything is divided by 1048576 or 1000000 to go to megabits/mebibits - if (((t / 1000.0) > settings.time_ul_max) || failed) { // test is over, stop streams and timer + if ((((t + bonusT) / 1000.0) > settings.time_ul_max) || failed) { // test is over, stop streams and timer if (failed || isNaN(ulStatus)) ulStatus = 'Fail' clearRequests() clearInterval(interval) diff --git a/speedtest_worker.min.js b/speedtest_worker.min.js index d87e1c6..fe3855b 100644 --- a/speedtest_worker.min.js +++ b/speedtest_worker.min.js @@ -1 +1 @@ -var testStatus=-1,dlStatus="",ulStatus="",pingStatus="",jitterStatus="",clientIp="",dlProgress=0,ulProgress=0,pingProgress=0,testId="noID",log="";function tlog(s){2<=settings.telemetry_level&&(log+=Date.now()+": "+s+"\n")}function tverb(s){3<=settings.telemetry_level&&(log+=Date.now()+": "+s+"\n")}function twarn(s){2<=settings.telemetry_level&&(log+=Date.now()+" WARN: "+s+"\n"),console.warn(s)}var settings={test_order:"IP_D_U",time_ul_max:15,time_dl_max:15,time_auto:!0,time_ulGraceTime:3,time_dlGraceTime:1.5,count_ping:10,url_dl:"garbage.php",url_ul:"empty.php",url_ping:"empty.php",url_getIp:"getIP.php",getIp_ispInfo:!0,getIp_ispInfo_distance:"km",xhr_dlMultistream:10,xhr_ulMultistream:3,xhr_multistreamDelay:300,xhr_ignoreErrors:1,xhr_dlUseBlob:!1,xhr_ul_blob_megabytes:20,garbagePhp_chunkSize:20,enable_quirks:!0,ping_allowPerformanceApi:!0,overheadCompensationFactor:1.06,useMebibits:!1,telemetry_level:0,url_telemetry:"telemetry/telemetry.php",telemetry_extra:""},xhr=null,interval=null,test_pointer=0;function url_sep(url){return url.match(/\?/)?"&":"?"}function clearRequests(){if(tverb("stopping pending XHRs"),xhr){for(var i=0;i=settings.test_order.length)0settings.time_dl_max||failed)&&((failed||isNaN(dlStatus))&&(dlStatus="Fail"),clearRequests(),clearInterval(interval),dlProgress=1,tlog("dlTest: "+dlStatus+", took "+((new Date).getTime()-startT)+"ms"),done())}else t>1e3*settings.time_dlGraceTime&&(0settings.time_ul_max||failed)&&((failed||isNaN(ulStatus))&&(ulStatus="Fail"),clearRequests(),clearInterval(interval),ulProgress=1,tlog("ulTest: "+ulStatus+", took "+((new Date).getTime()-startT)+"ms"),done())}else t>1e3*settings.time_ulGraceTime&&(0=settings.test_order.length)0settings.time_dl_max||failed)&&((failed||isNaN(dlStatus))&&(dlStatus="Fail"),clearRequests(),clearInterval(interval),dlProgress=1,tlog("dlTest: "+dlStatus+", took "+((new Date).getTime()-startT)+"ms"),done())}else t>1e3*settings.time_dlGraceTime&&(0settings.time_ul_max||failed)&&((failed||isNaN(ulStatus))&&(ulStatus="Fail"),clearRequests(),clearInterval(interval),ulProgress=1,tlog("ulTest: "+ulStatus+", took "+((new Date).getTime()-startT)+"ms"),done())}else t>1e3*settings.time_ulGraceTime&&(0