revert: exact v1.0.18 baseline app.js, keep gevent, bump 1.0.25

site/app.py

@@ -6,7 +6,7 @@ from flask_sock import Sock
 app = Flask(__name__)
 sock = Sock(app)
 
-VERSION = '1.0.24'
+VERSION = '1.0.25'
 
 
 @app.route('/')

site/static/app.js

@@ -155,19 +155,20 @@ async function uploadAll() {
   var okCount = 0;
   var errCount = 0;
 
-  // WebSocket загрузка
+  // Один 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);
-      if (!result) throw new Error('Empty result');
+      var result = await uploadFileWS(wsUrl, f, i);
       f.status = 'ok';
       f.elapsed = result.elapsed_ms;
       f.speed = result.elapsed_ms > 0 ? Math.round(result.bytes / (result.elapsed_ms / 1000)) : null;
@@ -176,7 +177,7 @@ async function uploadAll() {
       okCount++;
     } catch (e) {
       f.status = 'err';
-      f.error = (e && e.message) || String(e) || 'Unknown error';
+      f.error = e.message;
       errCount++;
     }
     renderTable();
@@ -195,27 +196,18 @@ async function uploadAll() {
   fileSummary.textContent = summary;
 }
 
-function uploadFileWS(url, f) {
+/** uploadFileWS(url, f, idx) — загрузить файл через WebSocket чанками */
+function uploadFileWS(url, f, idx) {
   return new Promise(function (resolve, reject) {
     var ws = new WebSocket(url);
     var CHUNK = 64 * 1024;
     var offset = 0;
     var startTime = Date.now();
     var lastProgress = 0;
-    var done = false;
+    var timer;
 
     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 () {
       var reader = new FileReader();
       reader.onload = function (e) {
@@ -223,7 +215,11 @@ function uploadFileWS(url, f) {
         offset += CHUNK;
         if (offset < f.size) {
           var pct = Math.round(offset / f.size * 100);
-          if (pct - lastProgress >= 10) { lastProgress = pct; f.progress = pct; renderTable(); }
+          if (pct - lastProgress >= 10) {
+            lastProgress = pct;
+            f.progress = pct;
+            renderTable();
+          }
           readNext();
         } else {
           ws.send('DONE');
@@ -239,24 +235,33 @@ function uploadFileWS(url, f) {
     ws.onmessage = function (e) {
       try {
         var r = JSON.parse(e.data);
-        if (r && r.ok) {
-          f.progress = 100;
-          renderTable();
-          finish(null, { bytes: r.bytes, elapsed_ms: Date.now() - startTime });
-        }
-      } catch (err) {}
+        clearTimeout(timer);
+        f.progress = 100;
+        renderTable();
+        ws.close();
+        resolve({ bytes: r.bytes, elapsed_ms: Date.now() - startTime });
+      } catch (err) {
+        reject(new Error('Bad response'));
+      }
     };
 
-    ws.onerror = function () { finish(new Error('Connection failed')); };
-    ws.onclose = function () { if (offset < f.size) finish(new Error('Closed early')); };
+    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);
   });
 }
 
-function uploadFileHTTP() {}
-
-// WebSocket upload больше не используется; оставлен для справки
-function uploadFileWS() {}
-
 /** clearAll() — очистить всё */
 function clearAll() {
   if (uploading) return;