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

try to fix upload

Browse Source
This commit is contained in:
YehudaEi
2020-12-10 00:53:59 +02:00
parent ac92e10822
commit fbaf10ee30
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
service.js
View File

@@ -50,9 +50,9 @@ async function ping() {
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();
resolve(endTime - startTime); resolve((endTime - startTime) + " ms");
} }
}; };
try { try {
@@ -70,12 +70,12 @@ async function download(){
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.open("GET", serverGUrl, true); request.open("GET", serverGUrl, true);
request.onreadystatechange = function() { request.onreadystatechange = function() {
if (request.readyState == 4 && request.status === 200) { if (request.readyState === 4 && request.status === 200) {
var endTime = new Date().getTime(); var endTime = new Date().getTime();
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);
resolve(speed + " Mbps"); resolve(speed + " Mbps (" + sumTime + " s)");
} }
}; };
try { try {
@@ -88,7 +88,7 @@ async function download(){
} }
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;
} }
@@ -98,16 +98,15 @@ async function upload(){
var startTime = 0; var startTime = 0;
var junkLength = 2500000; //=2.5 Mb var junkLength = 2500000; //=2.5 Mb
var junk = junkData(junkLength); 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");
request.onreadystatechange = function() { request.onreadystatechange = function() {
if (request.readyState == 4 && request.status === 200) { if (request.readyState === 4 && request.status === 200) {
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 * 8 /* byte (not bit) */) / sumTime) / 1024 /* Kbps */) / 1024 /* Mbps */).toFixed(2);
resolve(speed + " Mbps"); resolve(speed + " Mbps (" + sumTime + " s)");
} }
}; };
try { try {