From 1bd8a41c63e995e5c09a6465c49eb65fb76b1bf8 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 10:07:50 +0400
Subject: [PATCH] fix: baseline WS client + gunicorn gevent, bump 1.0.23

---
 site/app.py        |  5 ++--
 site/static/app.js | 62 ++++++++++++++++------------------------------
 2 files changed, 24 insertions(+), 43 deletions(-)

diff --git a/site/app.py b/site/app.py
index 9a9cc47..7e01d9c 100644
--- a/site/app.py
+++ b/site/app.py
@@ -6,7 +6,7 @@ from flask_sock import Sock
 app = Flask(__name__)
 sock = Sock(app)
 
-VERSION = '1.0.22'
+VERSION = '1.0.23'
 
 
 @app.route('/')
@@ -21,7 +21,7 @@ def health():
 
 @sock.route('/ws-upload')
 def ws_upload(ws):
-    """WebSocket: получает чанки, ACK после каждого"""
+    """WebSocket: получает чанки, считает байты и время"""
     t0 = time.time()
     total = 0
     while True:
@@ -31,7 +31,6 @@ 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 12fd1d3..7dad31c 100644
--- a/site/static/app.js
+++ b/site/static/app.js
@@ -155,20 +155,18 @@ async function uploadAll() {
   var okCount = 0;
   var errCount = 0;
 
-  // WebSocket с 8KB чанками и server ACK
+  // WebSocket загрузка
   var proto = location.protocol === 'https:' ? 'wss:' : 'ws:';
   var wsUrl = proto + '//' + location.host + '/ws-upload';
 
   for (var i = 0; i < files.length; i++) {
     var f = files[i];
     if (f.status === 'ok') continue;
-
     f.status = 'uploading';
     f.progress = 0;
     renderTable();
-
     try {
-      var result = await uploadFileWS(wsUrl, f, i);
+      var result = await uploadFileWS(wsUrl, f);
       f.status = 'ok';
       f.elapsed = result.elapsed_ms;
       f.speed = result.elapsed_ms > 0 ? Math.round(result.bytes / (result.elapsed_ms / 1000)) : null;
@@ -177,7 +175,7 @@ async function uploadAll() {
       okCount++;
     } catch (e) {
       f.status = 'err';
-      f.error = e.message;
+      f.error = e.message || 'Unknown error';
       errCount++;
     }
     renderTable();
@@ -196,48 +194,41 @@ async function uploadAll() {
   fileSummary.textContent = summary;
 }
 
-/** uploadFileWS(url, f, idx) — WebSocket с 8KB чанками и server ACK */
-function uploadFileWS(url, f, idx) {
+function uploadFileWS(url, f) {
   return new Promise(function (resolve, reject) {
     var ws = new WebSocket(url);
-    var CHUNK = 8 * 1024;
+    var CHUNK = 64 * 1024;
     var offset = 0;
     var startTime = Date.now();
     var lastProgress = 0;
-    var timer;
+    var timer = setTimeout(function () { ws.close(); reject(new Error('Timeout')); }, 300000);
 
     ws.binaryType = 'arraybuffer';
 
     ws.onopen = function () {
-      readNext();
-    };
-
-    function readNext() {
-      var end = Math.min(offset + CHUNK, f.size);
       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');
+        }
       };
-      reader.readAsArrayBuffer(f.file.slice(offset, end));
-    }
+      function readNext() {
+        var end = Math.min(offset + CHUNK, f.size);
+        reader.readAsArrayBuffer(f.file.slice(offset, end));
+      }
+      readNext();
+    };
 
     ws.onmessage = function (e) {
       try {
         var r = JSON.parse(e.data);
-        if (r.ack) {
-          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) {
+        if (r.ok) {
           clearTimeout(timer);
           f.progress = 100;
           renderTable();
@@ -250,19 +241,10 @@ function uploadFileWS(url, f, idx) {
     };
 
     ws.onerror = function () { reject(new Error('WebSocket error')); };
-
-    ws.onclose = function () {
-      if (offset < f.size) reject(new Error('WS closed early'));
-    };
-
-    timer = setTimeout(function () {
-      ws.close();
-      reject(new Error('Timeout'));
-    }, 300000);
+    ws.onclose = function () { if (offset < f.size) reject(new Error('WS closed early')); };
   });
 }
 
-// HTTP upload больше не используется
 function uploadFileHTTP() {}
 
 // WebSocket upload больше не используется; оставлен для справки