revert: back to baseline (no flow control), bump 1.0.18
Deploy loadtest / validate (push) Waiting to run
Deploy loadtest / validate (push) Waiting to run
This commit is contained in:
+1
-2
@@ -22,7 +22,7 @@ def health():
|
|||||||
|
|
||||||
@sock.route('/ws-upload')
|
@sock.route('/ws-upload')
|
||||||
def ws_upload(ws):
|
def ws_upload(ws):
|
||||||
"""WebSocket: получает чанки, ACK после каждого, считает байты и время"""
|
"""WebSocket: получает чанки, считает байты и время"""
|
||||||
t0 = time.time()
|
t0 = time.time()
|
||||||
total = 0
|
total = 0
|
||||||
while True:
|
while True:
|
||||||
@@ -32,7 +32,6 @@ def ws_upload(ws):
|
|||||||
if isinstance(chunk, str) and chunk == 'DONE':
|
if isinstance(chunk, str) and chunk == 'DONE':
|
||||||
break
|
break
|
||||||
total += len(chunk)
|
total += len(chunk)
|
||||||
ws.send(json.dumps({'ack': total}))
|
|
||||||
elapsed = round((time.time() - t0) * 1000)
|
elapsed = round((time.time() - t0) * 1000)
|
||||||
ws.send(json.dumps({'ok': True, 'bytes': total, 'elapsed_ms': elapsed}))
|
ws.send(json.dumps({'ok': True, 'bytes': total, 'elapsed_ms': elapsed}))
|
||||||
|
|
||||||
|
|||||||
+12
-18
@@ -210,9 +210,20 @@ function uploadFileWS(url, f, idx) {
|
|||||||
|
|
||||||
ws.onopen = function () {
|
ws.onopen = function () {
|
||||||
var reader = new FileReader();
|
var reader = new FileReader();
|
||||||
|
|
||||||
reader.onload = function (e) {
|
reader.onload = function (e) {
|
||||||
ws.send(e.target.result);
|
ws.send(e.target.result);
|
||||||
|
offset += CHUNK;
|
||||||
|
if (offset < f.size) {
|
||||||
|
var pct = Math.round(offset / f.size * 100);
|
||||||
|
if (pct - lastProgress >= 10) {
|
||||||
|
lastProgress = pct;
|
||||||
|
f.progress = pct;
|
||||||
|
renderTable();
|
||||||
|
}
|
||||||
|
readNext();
|
||||||
|
} else {
|
||||||
|
ws.send('DONE');
|
||||||
|
}
|
||||||
};
|
};
|
||||||
function readNext() {
|
function readNext() {
|
||||||
var end = Math.min(offset + CHUNK, f.size);
|
var end = Math.min(offset + CHUNK, f.size);
|
||||||
@@ -224,28 +235,11 @@ function uploadFileWS(url, f, idx) {
|
|||||||
ws.onmessage = function (e) {
|
ws.onmessage = function (e) {
|
||||||
try {
|
try {
|
||||||
var r = JSON.parse(e.data);
|
var r = JSON.parse(e.data);
|
||||||
if (r.ack) {
|
|
||||||
// Сервер подтвердил получение N байт
|
|
||||||
offset = r.ack;
|
|
||||||
var pct = Math.round(offset / f.size * 100);
|
|
||||||
if (pct - lastProgress >= 10) {
|
|
||||||
lastProgress = pct;
|
|
||||||
f.progress = pct;
|
|
||||||
renderTable();
|
|
||||||
}
|
|
||||||
if (offset < f.size) {
|
|
||||||
readNext();
|
|
||||||
} else {
|
|
||||||
ws.send('DONE');
|
|
||||||
}
|
|
||||||
} else if (r.ok) {
|
|
||||||
// Финальный ответ
|
|
||||||
clearTimeout(timer);
|
clearTimeout(timer);
|
||||||
f.progress = 100;
|
f.progress = 100;
|
||||||
renderTable();
|
renderTable();
|
||||||
ws.close();
|
ws.close();
|
||||||
resolve({ bytes: r.bytes, elapsed_ms: Date.now() - startTime });
|
resolve({ bytes: r.bytes, elapsed_ms: Date.now() - startTime });
|
||||||
}
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
reject(new Error('Bad response'));
|
reject(new Error('Bad response'));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user