From c4d660440d75d3b03f1fd2835744f0421c3789a6 Mon Sep 17 00:00:00 2001 From: dosse91 Date: Thu, 29 Aug 2019 07:52:59 +0200 Subject: [PATCH 1/3] MPOT examples updated to point to new Helsinki server --- example-multipleServers-full.html | 8 ++++---- example-multipleServers-pretty.html | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/example-multipleServers-full.html b/example-multipleServers-full.html index 9be9d0e..5d25031 100644 --- a/example-multipleServers-full.html +++ b/example-multipleServers-full.html @@ -11,16 +11,16 @@ function I(i){return document.getElementById(i);} //LIST OF TEST SERVERS. See documentation for details if needed var SPEEDTEST_SERVERS=[ { //this is my demo server, remove it - name:"Speedtest Demo Server 1", //user friendly name for the server - server:"//mpotdemo.fdossena.com/", //URL to the server. // at the beginning will be replaced with http:// or https:// automatically + name:"Speedtest Demo Server (Helsinki)", //user friendly name for the server + server:"//fi.openspeed.org/", //URL to the server. // at the beginning will be replaced with http:// or https:// automatically dlURL:"garbage.php", //path to download test on this server (garbage.php or replacement) ulURL:"empty.php", //path to upload test on this server (empty.php or replacement) pingURL:"empty.php", //path to ping/jitter test on this server (empty.php or replacement) getIpURL:"getIP.php" //path to getIP on this server (getIP.php or replacement) }, { //this is my demo server, remove it - name:"Speedtest Demo Server 2", - server:"//mpotdemo2.fdossena.com/", + name:"Old Speedtest Demo Server", + server:"//mpotdemo.fdossena.com/", dlURL:"garbage.php", ulURL:"empty.php", pingURL:"empty.php", diff --git a/example-multipleServers-pretty.html b/example-multipleServers-pretty.html index 1fa4e71..41a58eb 100644 --- a/example-multipleServers-pretty.html +++ b/example-multipleServers-pretty.html @@ -11,16 +11,16 @@ //LIST OF TEST SERVERS. See documentation for details if needed var SPEEDTEST_SERVERS=[ { //this is my demo server, remove it - name:"Speedtest Demo Server 1", //user friendly name for the server - server:"//mpotdemo.fdossena.com/", //URL to the server. // at the beginning will be replaced with http:// or https:// automatically + name:"Speedtest Demo Server (Helsinki)", //user friendly name for the server + server:"//fi.openspeed.org/", //URL to the server. // at the beginning will be replaced with http:// or https:// automatically dlURL:"garbage.php", //path to download test on this server (garbage.php or replacement) ulURL:"empty.php", //path to upload test on this server (empty.php or replacement) pingURL:"empty.php", //path to ping/jitter test on this server (empty.php or replacement) getIpURL:"getIP.php" //path to getIP on this server (getIP.php or replacement) }, { //this is my demo server, remove it - name:"Speedtest Demo Server 2", - server:"//mpotdemo2.fdossena.com/", + name:"Old Speedtest Demo Server", + server:"//mpotdemo.fdossena.com/", dlURL:"garbage.php", ulURL:"empty.php", pingURL:"empty.php", @@ -29,6 +29,7 @@ var SPEEDTEST_SERVERS=[ //add other servers here, comma separated ]; + //INITIALIZE SPEEDTEST var s=new Speedtest(); //create speedtest object s.addTestPoints(SPEEDTEST_SERVERS); //add list of servers From 1f117a4c5cb3a6c88880f7a93211b076fd7e15a9 Mon Sep 17 00:00:00 2001 From: dosse91 Date: Thu, 29 Aug 2019 21:22:26 +0200 Subject: [PATCH 2/3] Fixed minor telemetry bugs --- speedtest.js | 4 ++++ speedtest_worker.js | 1 + 2 files changed, 5 insertions(+) diff --git a/speedtest.js b/speedtest.js index 2c4dcaf..bf5d975 100644 --- a/speedtest.js +++ b/speedtest.js @@ -299,6 +299,9 @@ Speedtest.prototype = { console.error("Speedtest onend event threw exception: " + e); } clearInterval(this.updater); + if(this._settings.mpot){ + this._settings.telemetry_extra=this._originalExtra; + } this._state = 4; } }.bind(this); @@ -319,6 +322,7 @@ Speedtest.prototype = { this._selectedServer.server + this._selectedServer.pingURL; this._settings.url_getIp = this._selectedServer.server + this._selectedServer.getIpURL; + this._originalExtra=this._settings.telemetry_extra; if (typeof this._settings.telemetry_extra !== "undefined") { this._settings.telemetry_extra = JSON.stringify({ server: this._selectedServer.name, diff --git a/speedtest_worker.js b/speedtest_worker.js index ad49571..4451c8f 100644 --- a/speedtest_worker.js +++ b/speedtest_worker.js @@ -249,6 +249,7 @@ this.addEventListener("message", function(e) { } if (params[0] === "abort") { // abort command + if (testState >= 4) return; tlog("manually aborted"); clearRequests(); // stop all xhr activity runNextTest = null; From 93a4410efa8358148025d698bcac76f9fa3d68c7 Mon Sep 17 00:00:00 2001 From: dosse91 Date: Sat, 31 Aug 2019 19:22:42 +0200 Subject: [PATCH 3/3] Fixed telemetry bug (yes, again) --- speedtest.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/speedtest.js b/speedtest.js index bf5d975..8831bdb 100644 --- a/speedtest.js +++ b/speedtest.js @@ -72,6 +72,9 @@ Speedtest.prototype = { if (this._state != 0) throw "You cannot change the test settings after adding server or starting the test"; this._settings[parameter] = value; + if(parameter === "temeletry_extra"){ + this._originalExtra=this._settings.telemetry_extra; + } }, /** * Used internally to check if a server object contains all the required elements. @@ -299,9 +302,6 @@ Speedtest.prototype = { console.error("Speedtest onend event threw exception: " + e); } clearInterval(this.updater); - if(this._settings.mpot){ - this._settings.telemetry_extra=this._originalExtra; - } this._state = 4; } }.bind(this); @@ -322,11 +322,10 @@ Speedtest.prototype = { this._selectedServer.server + this._selectedServer.pingURL; this._settings.url_getIp = this._selectedServer.server + this._selectedServer.getIpURL; - this._originalExtra=this._settings.telemetry_extra; - if (typeof this._settings.telemetry_extra !== "undefined") { + if (typeof this._originalExtra !== "undefined") { this._settings.telemetry_extra = JSON.stringify({ server: this._selectedServer.name, - extra: this._settings.telemetry_extra + extra: this._originalExtra }); } else this._settings.telemetry_extra = JSON.stringify({