Jayden/SpeedTest-php
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix async (add Promise)

Browse Source
This commit is contained in:
YehudaEi
2020-12-10 00:39:10 +02:00
parent e6ce2f7ffe
commit ac92e10822
1 changed files with 76 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
service.js
View File

@@ -14,20 +14,28 @@ async function startTest(){
} }
setText("status", "checking ping..."); setText("status", "checking ping...");
await ping((ms) => {setText("ping", ms)}); var pingMS = await ping();
if(status == "stoped"){stopTest();return;} setText("ping", pingMS);
if(status == "stop"){stopTest();return;}
setText("status", "checking download..."); setText("status", "checking download...");
await download((mb) => {setText("down", mb)}); var downMB = await download();
if(status == "stoped"){stopTest();return;} setText("down", downMB);
if(status == "stop"){stopTest();return;}
setText("status", "checking upload..."); setText("status", "checking upload...");
await upload((mb) => {setText("up", mb)}); var downMB = await upload();
if(status == "stoped"){stopTest();return;} setText("up", downMB);
status = "stop";
status = "";
setText("status", "done."); setText("status", "done.");
setText("button", "Start Test"); setText("button", "Start Test");
} }
function stopTest(){ function stopTest(){
status = "";
setText("button", "Start Test"); setText("button", "Start Test");
setText("status", "stoped."); setText("status", "stoped.");
} }
@@ -36,14 +44,15 @@ function setText(elm, text){
document.getElementById(elm).innerText = text; document.getElementById(elm).innerText = text;
} }
async function ping(callback) { async function ping() {
return new Promise(resolve => {
var startTime = 0; var startTime = 0;
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.open("HEAD", serverEUrl + "?_=" + Math.random(), true); request.open("HEAD", serverEUrl + "?_=" + Math.random(), true);
request.onreadystatechange = function() { request.onreadystatechange = function() {
if (request.readyState == 4) { if (request.readyState == 4) {
var endTime = new Date().getTime(); var endTime = new Date().getTime();
callback(endTime - startTime); resolve(endTime - startTime);
} }
}; };
try { try {
@@ -52,9 +61,11 @@ async function ping(callback) {
} catch(exception) { } catch(exception) {
alert("Your internet connection is unavelible..."); alert("Your internet connection is unavelible...");
} }
});
} }
async function download(callback){ async function download(){
return new Promise(resolve => {
var startTime = 0; var startTime = 0;
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.open("GET", serverGUrl, true); request.open("GET", serverGUrl, true);
@@ -64,7 +75,7 @@ async function download(callback){
var reqLength = request.responseText.length * 8; var reqLength = request.responseText.length * 8;
var sumTime = (endTime - startTime) / 1000; var sumTime = (endTime - startTime) / 1000;
var speed = (((reqLength / sumTime) / 1024 /* Kbps */) / 1024 /* Mbps */).toFixed(2); var speed = (((reqLength / sumTime) / 1024 /* Kbps */) / 1024 /* Mbps */).toFixed(2);
callback(speed + " Mbps"); resolve(speed + " Mbps");
} }
}; };
try { try {
@@ -73,18 +84,21 @@ async function download(callback){
} catch(exception) { } catch(exception) {
alert("Your internet connection is unavelible..."); alert("Your internet connection is unavelible...");
} }
});
} }
async function junkData(length){ function junkData(length){
var chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ~!@#$%^&*()`[]\\{}|:"<>?,./;\'', result = ''; var chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ~!@#$%^&*()`[]\\{}|:"<>?,./;\'', result = '';
for (var i = 0; i < length; i++) result += chars[Math.floor(Math.random() * chars.length)]; for (var i = 0; i < length; i++) result += chars[Math.floor(Math.random() * chars.length)];
return result; return result;
} }
async function upload(callback){ async function upload(){
return new Promise(resolve => {
var startTime = 0; var startTime = 0;
var junkLength = 2500000; var junkLength = 2500000; //=2.5 Mb
var junk = await junkData(junkLength); //=2.5 Mb var junk = junkData(junkLength);
console.log(junk);
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.open("POST", serverEUrl + "?_=" + Math.random(), true); request.open("POST", serverEUrl + "?_=" + Math.random(), true);
request.setRequestHeader("Content-Type", "application/octet-stream"); request.setRequestHeader("Content-Type", "application/octet-stream");
@@ -93,7 +107,7 @@ async function upload(callback){
var endTime = new Date().getTime(); var endTime = new Date().getTime();
var sumTime = (endTime - startTime) / 1000; var sumTime = (endTime - startTime) / 1000;
var speed = (((junkLength / sumTime) / 1024 /* Kbps */) / 1024 /* Mbps */).toFixed(2); var speed = (((junkLength / sumTime) / 1024 /* Kbps */) / 1024 /* Mbps */).toFixed(2);
callback(speed + " Mbps"); resolve(speed + " Mbps");
} }
}; };
try { try {
@@ -102,4 +116,5 @@ async function upload(callback){
} catch(exception) { } catch(exception) {
alert("Your internet connection is unavelible..."); alert("Your internet connection is unavelible...");
} }
});
} }