fix: raw body upload (no base64), remove form parsing, bump 1.0.20

site/app.py

@@ -1,13 +1,12 @@
 import time
 import json
-import base64
 from flask import Flask, render_template, request
 from flask_sock import Sock
 
 app = Flask(__name__)
 sock = Sock(app)
 
-VERSION = '1.0.19'
+VERSION = '1.0.20'
 
 
 @app.route('/')
@@ -39,32 +38,9 @@ def ws_upload(ws):
 @app.route('/upload', methods=['POST'])
 def upload():
     t0 = time.time()
-    total = 0
+    # raw-режим: тело как есть (клиент шлёт файл напрямую через xhr.send(file))
-    # base64-режим: клиент отправляет поле "data"
+    raw = request.get_data()
-    data = request.form.get('data', '')
+    total = len(raw)
-    if data:
-        # убрать префикс data:...;base64,
-        if ',' in data:
-            data = data.split(',', 1)[1]
-        # form-encode превращает + в пробелы — восстановить
-        data = data.replace(' ', '+')
-        # добавить padding если потерялся
-        missing = len(data) % 4
-        if missing:
-            data += '=' * (4 - missing)
-        raw = base64.b64decode(data)
-        total = len(raw)
-    # файловый режим
-    elif request.files:
-        for f in request.files.values():
-            while True:
-                chunk = f.read(8192)
-                if not chunk:
-                    break
-                total += len(chunk)
-    # raw-режим: тело как есть
-    else:
-        total = len(request.get_data())
     elapsed = round((time.time() - t0) * 1000)
     return {'ok': True, 'bytes': total, 'elapsed_ms': elapsed}
 

site/static/app.js

@@ -193,58 +193,50 @@ async function uploadAll() {
   fileSummary.textContent = summary;
 }
 
-/** uploadFileHTTP(f, idx) — загрузить файл через HTTP POST (base64, с retry) */
+/** uploadFileHTTP(f, idx) — загрузить файл как raw body (без base64) */
 function uploadFileHTTP(f, idx) {
   return new Promise(function (resolve, reject) {
-    var reader = new FileReader();
+    var startTime = Date.now();
-    reader.onload = function () {
+    var RETRY = 3;
-      var dataUrl = reader.result;
-      var startTime = Date.now();
-      var RETRY = 3;
 
-      function doUpload(attempt) {
+    function doUpload(attempt) {
-        var xhr = new XMLHttpRequest();
+      var xhr = new XMLHttpRequest();
-        xhr.open('POST', '/upload');
+      xhr.open('POST', '/upload');
-        xhr.timeout = 300000;
+      xhr.timeout = 300000;
+      xhr.setRequestHeader('X-File-Name', encodeURIComponent(f.name));
+      xhr.setRequestHeader('X-File-Size', f.size);
 
-        xhr.upload.onprogress = function (e) {
+      xhr.upload.onprogress = function (e) {
-          if (e.lengthComputable) {
+        if (e.lengthComputable) {
-            f.progress = Math.round(e.loaded / e.total * 100);
+          f.progress = Math.round(e.loaded / e.total * 100);
-            renderTable();
+          renderTable();
-          }
+        }
-        };
+      };
 
-        xhr.onload = function () {
+      xhr.onload = function () {
-          try {
+        try {
-            var r = JSON.parse(xhr.responseText);
+          var r = JSON.parse(xhr.responseText);
-            resolve({ bytes: r.bytes, elapsed_ms: Date.now() - startTime });
+          resolve({ bytes: r.bytes, elapsed_ms: Date.now() - startTime });
-          } catch (e) {
+        } catch (e) {
-            if (attempt < RETRY) { doUpload(attempt + 1); return; }
-            reject(new Error('Bad response'));
-          }
-        };
-
-        xhr.onerror = function () {
           if (attempt < RETRY) { doUpload(attempt + 1); return; }
-          reject(new Error('Network error'));
+          reject(new Error('Bad response'));
-        };
+        }
+      };
 
-        xhr.ontimeout = function () {
+      xhr.onerror = function () {
-          if (attempt < RETRY) { doUpload(attempt + 1); return; }
+        if (attempt < RETRY) { doUpload(attempt + 1); return; }
-          reject(new Error('Timeout'));
+        reject(new Error('Network error'));
-        };
+      };
 
-        var form = new FormData();
+      xhr.ontimeout = function () {
-        form.append('data', dataUrl);
+        if (attempt < RETRY) { doUpload(attempt + 1); return; }
-        form.append('name', f.name);
+        reject(new Error('Timeout'));
-        form.append('orig_size', f.size);
+      };
-        xhr.send(form);
-      }
 
-      doUpload(1);
+      xhr.send(f.file);
-    };
+    }
-    reader.onerror = function () { reject(new Error('Read error')); };
+
-    reader.readAsDataURL(f.file);
+    doUpload(1);
   });
 }