From 2ccef934b4081292f56e78d131890f0a1c059382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CNaeel=E2=80=9D?= <tazet@narod.ru>
Date: Sat, 11 Jul 2026 06:44:23 +0400
Subject: [PATCH] =?UTF-8?q?feat:=20server-side=20ACK=20flow=20control=20(c?=
 =?UTF-8?q?hunk=E2=86=92ack=E2=86=92next),=20bump=201.0.17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 site/app.py        |  5 +++--
 site/static/app.js | 49 ++++++++++++++++++++++------------------------
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/site/app.py b/site/app.py
index 025659b..61025c4 100644
--- a/site/app.py
+++ b/site/app.py
@@ -7,7 +7,7 @@ from flask_sock import Sock
 app = Flask(__name__)
 sock = Sock(app)
 
-VERSION = '1.0.16'
+VERSION = '1.0.17'
 
 
 @app.route('/')
@@ -22,7 +22,7 @@ def health():
 
 @sock.route('/ws-upload')
 def ws_upload(ws):
-    """WebSocket: получает чанки, считает байты и время"""
+    """WebSocket: получает чанки, ACK после каждого, считает байты и время"""
     t0 = time.time()
     total = 0
     while True:
@@ -32,6 +32,7 @@ def ws_upload(ws):
         if isinstance(chunk, str) and chunk == 'DONE':
             break
         total += len(chunk)
+        ws.send(json.dumps({'ack': total}))
     elapsed = round((time.time() - t0) * 1000)
     ws.send(json.dumps({'ok': True, 'bytes': total, 'elapsed_ms': elapsed}))
 
diff --git a/site/static/app.js b/site/static/app.js
index a0948f1..3120ea3 100644
--- a/site/static/app.js
+++ b/site/static/app.js
@@ -211,28 +211,8 @@ function uploadFileWS(url, f, idx) {
     ws.onopen = function () {
       var reader = new FileReader();
 
-      function sendOrWait(data) {
-        if (ws.bufferedAmount > 256 * 1024) {
-          setTimeout(function () { sendOrWait(data); }, 10);
-          return;
-        }
-        ws.send(data);
-        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');
-        }
-      }
-
       reader.onload = function (e) {
-        sendOrWait(e.target.result);
+        ws.send(e.target.result);
       };
       function readNext() {
         var end = Math.min(offset + CHUNK, f.size);
@@ -244,11 +224,28 @@ function uploadFileWS(url, f, idx) {
     ws.onmessage = function (e) {
       try {
         var r = JSON.parse(e.data);
-        clearTimeout(timer);
-        f.progress = 100;
-        renderTable();
-        ws.close();
-        resolve({ bytes: r.bytes, elapsed_ms: Date.now() - startTime });
+        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 });
+        }
       } catch (err) {
         reject(new Error('Bad response'));
       }