Merge pull request #3 from mserve/master
Merged with mserve/master: Improved garbage.php; Added example4.html; Changed handling of settings
This commit is contained in:
Federico Dossena
GitHub
commit
7051405fdc
5 changed files with 458 additions and 258 deletions
|
|
@ -64,7 +64,10 @@ div.meter{
|
||||||
ul.innerHTML=data[2];
|
ul.innerHTML=data[2];
|
||||||
ping.innerHTML=data[3];
|
ping.innerHTML=data[3];
|
||||||
}.bind(this);
|
}.bind(this);
|
||||||
w.postMessage("start garbage.php empty.dat empty.dat");
|
w.postMessage("set url_dl garbage.php");
|
||||||
|
w.postMessage("set url_ul empty.dat");
|
||||||
|
w.postMessage("set url_ping empty.dat");
|
||||||
|
w.postMessage("start");
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
@ -50,7 +50,8 @@ function runTest(){
|
||||||
var data=event.data.split(";");
|
var data=event.data.split(";");
|
||||||
var status=Number(data[0]);
|
var status=Number(data[0]);
|
||||||
var dl=document.getElementById("download"),ul=document.getElementById("upload"),ping=document.getElementById("ping");
|
var dl=document.getElementById("download"),ul=document.getElementById("upload"),ping=document.getElementById("ping");
|
||||||
dl.className=status==1?"flash":"";ul.className=status==2?"flash":"";ping.className=status==3?"flash":"";
|
// dl.className=status==1?"flash":"";ul.className=status==2?"flash":"";ping.className=status==3?"flash":"";
|
||||||
|
|
||||||
if(status>=4){
|
if(status>=4){
|
||||||
clearInterval(interval);
|
clearInterval(interval);
|
||||||
document.getElementById("abortBtn").style.display="none";
|
document.getElementById("abortBtn").style.display="none";
|
||||||
|
|
@ -64,7 +65,10 @@ function runTest(){
|
||||||
ul.innerHTML=data[2];
|
ul.innerHTML=data[2];
|
||||||
ping.innerHTML=data[3];
|
ping.innerHTML=data[3];
|
||||||
}.bind(this);
|
}.bind(this);
|
||||||
w.postMessage("start garbage.php empty.dat empty.dat");
|
w.postMessage("set time_dl 10"); // Timeout download
|
||||||
|
w.postMessage("set time_ul 20"); // Timeout upload
|
||||||
|
w.postMessage("set count_ping 30"); // Count of pings
|
||||||
|
w.postMessage("start");
|
||||||
}
|
}
|
||||||
function abortTest(){
|
function abortTest(){
|
||||||
if(w)w.postMessage("abort");
|
if(w)w.postMessage("abort");
|
||||||
|
|
|
||||||
170
example4.html
Normal file
170
example4.html
Normal file
|
|
@ -0,0 +1,170 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title>Speedtest</title>
|
||||||
|
<style type="text/css">
|
||||||
|
|
||||||
|
html,body{
|
||||||
|
margin:0;
|
||||||
|
padding:0;
|
||||||
|
border:none;
|
||||||
|
text-align:center;
|
||||||
|
font-family: 'Open Sans';
|
||||||
|
}
|
||||||
|
|
||||||
|
h1,h2,h3,h4,h5,h6
|
||||||
|
{
|
||||||
|
font-family: 'Roboto', sans-serif;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.meter{
|
||||||
|
display:inline-block;
|
||||||
|
height:300px;
|
||||||
|
width:400px;
|
||||||
|
text-align: center;
|
||||||
|
font-size:6vw;
|
||||||
|
}
|
||||||
|
|
||||||
|
div#testArea
|
||||||
|
{
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
flex-flow: row wrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
a {
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.button {
|
||||||
|
display: inline-block;
|
||||||
|
margin: 10px 5px 0 2px;
|
||||||
|
padding: 16px 40px;
|
||||||
|
border-radius: 5px;
|
||||||
|
font-size: 18px;
|
||||||
|
border: none;
|
||||||
|
background: #34aadc;
|
||||||
|
color: white;
|
||||||
|
cursor: pointer;
|
||||||
|
text-transform: uppercase;
|
||||||
|
font-weight: 700;
|
||||||
|
font-family: 'Roboto';
|
||||||
|
}
|
||||||
|
|
||||||
|
</style>
|
||||||
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/raphael/2.1.4/raphael-min.js"></script>
|
||||||
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/justgage/1.2.2/justgage.min.js"></script>
|
||||||
|
<script type="text/javascript">
|
||||||
|
var w=null;
|
||||||
|
var ggdl,ggul,ggping;
|
||||||
|
function runTest(){
|
||||||
|
w=new Worker("speedtest_worker.js");
|
||||||
|
var interval=setInterval(function(){w.postMessage("status");}.bind(this),100);
|
||||||
|
document.getElementById("abortBtn").style.display="";
|
||||||
|
document.getElementById("startBtn").style.display="none";
|
||||||
|
w.onmessage=function(event){
|
||||||
|
var data=event.data.split(";");
|
||||||
|
var status=Number(data[0]);
|
||||||
|
if(status>=4){
|
||||||
|
clearInterval(interval);
|
||||||
|
document.getElementById("abortBtn").style.display="none";
|
||||||
|
document.getElementById("startBtn").style.display="";
|
||||||
|
w=null;
|
||||||
|
}
|
||||||
|
updateGauge(ggdl, data[1]);
|
||||||
|
updateGauge(ggul, data[2]);
|
||||||
|
updateGauge(ggping, data[3]);
|
||||||
|
}.bind(this);
|
||||||
|
w.postMessage("start");
|
||||||
|
}
|
||||||
|
function abortTest(){
|
||||||
|
if(w)w.postMessage("abort");
|
||||||
|
}
|
||||||
|
|
||||||
|
document.addEventListener("DOMContentLoaded", function(event) {
|
||||||
|
ggdl = new JustGage({
|
||||||
|
id: 'ggdl',
|
||||||
|
title: "Download",
|
||||||
|
label: "Mbit/s",
|
||||||
|
titleFontFamily : "Open Sans",
|
||||||
|
valueFontFamily : "Open Sans",
|
||||||
|
refreshAnimationTime: 300,
|
||||||
|
value: 0,
|
||||||
|
min: 0,
|
||||||
|
max: 10,
|
||||||
|
decimals : 2,
|
||||||
|
formatNumber: true,
|
||||||
|
humanFriendly : false,
|
||||||
|
levelColors: [
|
||||||
|
"#999999",
|
||||||
|
"#339933"
|
||||||
|
]
|
||||||
|
});
|
||||||
|
|
||||||
|
ggul = new JustGage({
|
||||||
|
id: 'ggul',
|
||||||
|
title: "Upload",
|
||||||
|
label: "Mbit/s",
|
||||||
|
titleFontFamily : "Open Sans",
|
||||||
|
valueFontFamily : "Open Sans",
|
||||||
|
refreshAnimationTime: 300,
|
||||||
|
value: 0,
|
||||||
|
min: 0,
|
||||||
|
max: 10,
|
||||||
|
decimals : 2,
|
||||||
|
formatNumber: true,
|
||||||
|
humanFriendly : false,
|
||||||
|
levelColors: [
|
||||||
|
"#999999",
|
||||||
|
"#333399"
|
||||||
|
]
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
ggping = new JustGage({
|
||||||
|
id: 'ggping',
|
||||||
|
title: "Ping",
|
||||||
|
label: "ms",
|
||||||
|
titleFontFamily : "Open Sans",
|
||||||
|
valueFontFamily : "Open Sans",
|
||||||
|
refreshAnimationTime: 300,
|
||||||
|
value: 0,
|
||||||
|
min: 0,
|
||||||
|
max: 10,
|
||||||
|
decimals : 2,
|
||||||
|
formatNumber: true,
|
||||||
|
humanFriendly : false,
|
||||||
|
levelColors: [
|
||||||
|
"#999999",
|
||||||
|
"#993333"
|
||||||
|
]
|
||||||
|
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
function updateGauge(gauge, value)
|
||||||
|
{
|
||||||
|
// Alway use next power of 2 as maximum
|
||||||
|
var max = Math.max(Math.pow(2, Math.ceil(Math.log2(value))), gauge.config.max);
|
||||||
|
// Refresh the gauge
|
||||||
|
gauge.refresh(value, max);
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700|Roboto:400,500,700" rel="stylesheet">
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<h1>Speed Test</h1>
|
||||||
|
<div id="testArea">
|
||||||
|
<div class="meter" id="ggdl"></div>
|
||||||
|
<div class="meter" id="ggul"></div>
|
||||||
|
<div class="meter" id="ggping"></div>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<a href="javascript:runTest()" id="startBtn" class="button">Start</a>
|
||||||
|
<a href="javascript:abortTest()" id="abortBtn" class="button" style="display:none;">Abort</a>
|
||||||
|
</div>
|
||||||
|
<p>Fonts: <a href="https://fonts.google.com/">Google Gonts</a> | Gauges: <a href="http://justgage.com/">justgage.com</a></p>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
19
garbage.php
19
garbage.php
|
|
@ -1,9 +1,24 @@
|
||||||
<?php
|
<?php
|
||||||
|
// Disable Compression (would be too easy for 000...)
|
||||||
|
@ini_set('zlib.output_compression', 'Off');
|
||||||
|
@ini_set('output_buffering', 'Off');
|
||||||
|
@ini_set('output_handler', '');
|
||||||
|
// Headers
|
||||||
header( "HTTP/1.1 200 OK" );
|
header( "HTTP/1.1 200 OK" );
|
||||||
$data=str_repeat("0",1048576);
|
// Download follows...
|
||||||
|
header('Content-Description: File Transfer');
|
||||||
|
header('Content-Type: application/octet-stream');
|
||||||
|
header('Content-Disposition: attachment; filename=random.dat');
|
||||||
|
header('Content-Transfer-Encoding: binary');
|
||||||
|
// Never cache me
|
||||||
|
header("Cache-Control: no-store, no-cache, must-revalidate, max-age=0");
|
||||||
|
header("Cache-Control: post-check=0, pre-check=0", false);
|
||||||
|
header("Pragma: no-cache");
|
||||||
|
// Generate data
|
||||||
|
$data=str_repeat("0",1048575)."\n";
|
||||||
|
// Deliver chunks of 1048576 bytes (or more - depending on encoding!)
|
||||||
while(1){
|
while(1){
|
||||||
echo $data;
|
echo $data;
|
||||||
flush();
|
flush();
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
@ -1,24 +1,32 @@
|
||||||
var testStatus=0,dlStatus="",ulStatus="",pingStatus="";
|
var testStatus=0,dlStatus="",ulStatus="",pingStatus="";
|
||||||
|
var settings={time_ul : 15, time_dl:15, count_ping: 15, url_dl:"garbage.php",url_ul:"empty.dat",url_ping:"empty.dat"};
|
||||||
var xhr=null;
|
var xhr=null;
|
||||||
this.addEventListener('message', function(e){
|
this.addEventListener('message', function(e){
|
||||||
var params=e.data.split(" ");
|
var params=e.data.split(" ");
|
||||||
|
if(params[0]=="set")
|
||||||
|
{
|
||||||
|
if(params[1] && settings.hasOwnProperty(params[1]) && params[2])
|
||||||
|
{
|
||||||
|
settings[params[1]]=params[2];
|
||||||
|
}
|
||||||
|
}
|
||||||
if(params[0]=="status"){
|
if(params[0]=="status"){
|
||||||
postMessage(testStatus+";"+dlStatus+";"+ulStatus+";"+pingStatus);
|
postMessage(testStatus+";"+dlStatus+";"+ulStatus+";"+pingStatus);
|
||||||
}
|
}
|
||||||
if(params[0]=="start"){
|
if(params[0]=="start"){
|
||||||
if(testStatus==0){
|
if(testStatus==0){
|
||||||
testStatus=1;
|
testStatus=1;
|
||||||
var dlUrl=params[1]?params[1]:"garbage.php", ulUrl=params[2]?params[2]:"empty.dat", pingUrl=params[3]?params[3]:"empty.dat";
|
dlTest(function(){testStatus=2;ulTest(function(){testStatus=3;pingTest(function(){testStatus=4;});});});
|
||||||
dlTest(dlUrl,function(){testStatus=2;ulTest(ulUrl,function(){testStatus=3;pingTest(pingUrl,function(){testStatus=4;});});});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(params[0]=="abort"){
|
if(params[0]=="abort"){
|
||||||
|
console.warn("Aborting test...")
|
||||||
try{if(xhr)xhr.abort();}catch(e){}
|
try{if(xhr)xhr.abort();}catch(e){}
|
||||||
testStatus=5;dlStatus="";ulStatus="";pingStatus="";
|
testStatus=5;dlStatus="";ulStatus="";pingStatus="";
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
function dlTest(serverURL,done){
|
function dlTest(done){
|
||||||
var firstTick=true,startT=new Date().getTime(), prevT=new Date().getTime(),prevLoaded=0,speed=0.0;
|
var firstTick=true,startT=new Date().getTime(), prevT=new Date().getTime(),prevLoaded=0,speed=0.0;
|
||||||
xhr=new XMLHttpRequest();
|
xhr=new XMLHttpRequest();
|
||||||
xhr.onprogress=function(event){
|
xhr.onprogress=function(event){
|
||||||
|
|
@ -33,7 +41,7 @@ function dlTest(serverURL,done){
|
||||||
prevLoaded=event.loaded;
|
prevLoaded=event.loaded;
|
||||||
prevT=new Date().getTime();
|
prevT=new Date().getTime();
|
||||||
dlStatus=((speed*8)/1048576.0).toFixed(2);
|
dlStatus=((speed*8)/1048576.0).toFixed(2);
|
||||||
if(((prevT-startT)/1000.0)>15){try{xhr.abort();}catch(e){} xhr=null; done();}
|
if(((prevT-startT)/1000.0)>settings.time_dl){;try{xhr.abort();}catch(e){} xhr=null; done();}
|
||||||
}.bind(this);
|
}.bind(this);
|
||||||
xhr.onload=function(){
|
xhr.onload=function(){
|
||||||
dlStatus=((speed*8)/1048576.0).toFixed(2);
|
dlStatus=((speed*8)/1048576.0).toFixed(2);
|
||||||
|
|
@ -45,11 +53,11 @@ function dlTest(serverURL,done){
|
||||||
xhr=null;
|
xhr=null;
|
||||||
done();
|
done();
|
||||||
}.bind(this);
|
}.bind(this);
|
||||||
xhr.open("GET", serverURL+"?random="+Math.random(),true);
|
xhr.open("GET", settings.url_dl+"?r="+Math.random(),true);
|
||||||
xhr.send();
|
xhr.send();
|
||||||
}
|
}
|
||||||
|
|
||||||
function ulTest(serverURL,done){
|
function ulTest(done){
|
||||||
var firstTick=true,startT=new Date().getTime(), prevT=new Date().getTime(),prevLoaded=0,speed=0.0;
|
var firstTick=true,startT=new Date().getTime(), prevT=new Date().getTime(),prevLoaded=0,speed=0.0;
|
||||||
xhr=new XMLHttpRequest();
|
xhr=new XMLHttpRequest();
|
||||||
xhr.upload.onprogress=function(event){
|
xhr.upload.onprogress=function(event){
|
||||||
|
|
@ -63,7 +71,7 @@ function ulTest(serverURL,done){
|
||||||
prevLoaded=event.loaded;
|
prevLoaded=event.loaded;
|
||||||
prevT=new Date().getTime();
|
prevT=new Date().getTime();
|
||||||
ulStatus=((speed*8)/1048576.0).toFixed(2);
|
ulStatus=((speed*8)/1048576.0).toFixed(2);
|
||||||
if(((prevT-startT)/1000.0)>15){try{xhr.abort();}catch(e){} xhr=null; done();}
|
if(((prevT-startT)/1000.0)>settings.time_ul){try{xhr.abort();}catch(e){} xhr=null; done();}
|
||||||
}.bind(this);
|
}.bind(this);
|
||||||
xhr.onload=function(){
|
xhr.onload=function(){
|
||||||
ulStatus=((speed*8)/1048576.0).toFixed(2);
|
ulStatus=((speed*8)/1048576.0).toFixed(2);
|
||||||
|
|
@ -73,11 +81,11 @@ function ulTest(serverURL,done){
|
||||||
ulStatus="Fail";
|
ulStatus="Fail";
|
||||||
done();
|
done();
|
||||||
}.bind(this);
|
}.bind(this);
|
||||||
xhr.open("POST", serverURL+"?random="+Math.random(),true);
|
xhr.open("POST", settings.url_ul+"?r="+Math.random(),true);
|
||||||
xhr.send(new ArrayBuffer(10485760));
|
xhr.send(new ArrayBuffer(10485760));
|
||||||
}
|
}
|
||||||
|
|
||||||
function pingTest(pingUrl,done){
|
function pingTest(done){
|
||||||
var prevT=null,ping=0.0,i=0;
|
var prevT=null,ping=0.0,i=0;
|
||||||
var doPing=function(){
|
var doPing=function(){
|
||||||
prevT=new Date().getTime();
|
prevT=new Date().getTime();
|
||||||
|
|
@ -91,13 +99,13 @@ function pingTest(pingUrl,done){
|
||||||
}
|
}
|
||||||
pingStatus=ping.toFixed(2);
|
pingStatus=ping.toFixed(2);
|
||||||
i++;
|
i++;
|
||||||
if(i<50) doPing(); else done();
|
if(i<settings.count_ping) doPing(); else done();
|
||||||
}.bind(this);
|
}.bind(this);
|
||||||
xhr.onerror=function(){
|
xhr.onerror=function(){
|
||||||
pingStatus="Fail";
|
pingStatus="Fail";
|
||||||
done();
|
done();
|
||||||
}.bind(this);
|
}.bind(this);
|
||||||
xhr.open("GET", pingUrl+"?random="+Math.random(),true);
|
xhr.open("GET", settings.url_ping+"?r="+Math.random(),true);
|
||||||
xhr.send();
|
xhr.send();
|
||||||
}.bind(this);
|
}.bind(this);
|
||||||
doPing();
|
doPing();
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue