revert: back to baseline (no flow control), bump 1.0.18

2026-07-11 06:49:20 +04:00
parent 2ccef934b4
commit fba3b0ad47
2 changed files with 18 additions and 25 deletions
@@ -210,9 +210,20 @@ function uploadFileWS(url, f, idx) {

    ws.onopen = function () {
      var reader = new FileReader();
-
      reader.onload = function (e) {
        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() {
        var end = Math.min(offset + CHUNK, f.size);
@@ -224,28 +235,11 @@ function uploadFileWS(url, f, idx) {
    ws.onmessage = function (e) {
      try {
        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);
-          f.progress = 100;
-          renderTable();
-          ws.close();
-          resolve({ bytes: r.bytes, elapsed_ms: Date.now() - startTime });
-        }
+        clearTimeout(timer);
+        f.progress = 100;
+        renderTable();
+        ws.close();
+        resolve({ bytes: r.bytes, elapsed_ms: Date.now() - startTime });
      } catch (err) {
        reject(new Error('Bad response'));
      }