Nail/loadtest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: bulletproof WS promise + cache bust, bump 1.0.24
Deploy loadtest / validate (push) Waiting to run
Details

Browse Source
This commit is contained in:
naeel
2026-07-11 10:27:06 +04:00
parent b1e54fa325
commit b0bc3629be
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
site/app.py
+1 -1
View File
@@ -6,7 +6,7 @@ from flask_sock import Sock
app = Flask(__name__) app = Flask(__name__)
sock = Sock(app) sock = Sock(app)
VERSION = '1.0.23' VERSION = '1.0.24'
@app.route('/') @app.route('/')
site/static/app.js
+18 -11
View File
@@ -167,6 +167,7 @@ async function uploadAll() {
renderTable(); renderTable();
try { try {
var result = await uploadFileWS(wsUrl, f); var result = await uploadFileWS(wsUrl, f);
if (!result) throw new Error('Empty result');
f.status = 'ok'; f.status = 'ok';
f.elapsed = result.elapsed_ms; f.elapsed = result.elapsed_ms;
f.speed = result.elapsed_ms > 0 ? Math.round(result.bytes / (result.elapsed_ms / 1000)) : null; f.speed = result.elapsed_ms > 0 ? Math.round(result.bytes / (result.elapsed_ms / 1000)) : null;
@@ -175,7 +176,7 @@ async function uploadAll() {
okCount++; okCount++;
} catch (e) { } catch (e) {
f.status = 'err'; f.status = 'err';
f.error = e.message || 'Unknown error'; f.error = (e && e.message) || String(e) || 'Unknown error';
errCount++; errCount++;
} }
renderTable(); renderTable();
@@ -201,10 +202,20 @@ function uploadFileWS(url, f) {
var offset = 0; var offset = 0;
var startTime = Date.now(); var startTime = Date.now();
var lastProgress = 0; var lastProgress = 0;
var timer = setTimeout(function () { ws.close(); reject(new Error('Timeout')); }, 300000); var done = false;
ws.binaryType = 'arraybuffer'; ws.binaryType = 'arraybuffer';
function finish(err, data) {
if (done) return;
done = true;
try { ws.close(); } catch (e) {}
if (err) reject(err);
else resolve(data);
}
setTimeout(function () { finish(new Error('Timeout')); }, 300000);
ws.onopen = function () { ws.onopen = function () {
var reader = new FileReader(); var reader = new FileReader();
reader.onload = function (e) { reader.onload = function (e) {
@@ -228,20 +239,16 @@ function uploadFileWS(url, f) {
ws.onmessage = function (e) { ws.onmessage = function (e) {
try { try {
var r = JSON.parse(e.data); var r = JSON.parse(e.data);
if (r.ok) { if (r && r.ok) {
clearTimeout(timer);
f.progress = 100; f.progress = 100;
renderTable(); renderTable();
ws.close(); finish(null, { bytes: r.bytes, elapsed_ms: Date.now() - startTime });
resolve({ bytes: r.bytes, elapsed_ms: Date.now() - startTime });
}
} catch (err) {
reject(new Error('Bad response'));
} }
} catch (err) {}
}; };
ws.onerror = function () { reject(new Error('WebSocket error')); }; ws.onerror = function () { finish(new Error('Connection failed')); };
ws.onclose = function () { if (offset < f.size) reject(new Error('WS closed early')); }; ws.onclose = function () { if (offset < f.size) finish(new Error('Closed early')); };
}); });
} }