Nail/contracts-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

возврат к одному POST /upload + 3 повтора при ошибке, v1.35

Browse Source
This commit is contained in:
naeel
2026-06-17 22:04:42 +04:00
parent b0a1a82ec3
commit a150d3f2a8
1 changed files with 33 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
site/templates/upload.html
+29 -35
View File
@@ -59,7 +59,7 @@
<body> <body>
<div class="topbar"> <div class="topbar">
<img src="{{ url_for('static', filename='nubes-logo.svg') }}" alt="Nubes"> <img src="{{ url_for('static', filename='nubes-logo.svg') }}" alt="Nubes">
<span class="title">Сверка договоров <span style="font-weight:400;color:var(--muted);font-size:12px;">v1.34</span></span> <span class="title">Сверка договоров <span style="font-weight:400;color:var(--muted);font-size:12px;">v1.35</span></span>
</div> </div>
<div class="content"> <div class="content">
@@ -155,54 +155,48 @@
window.removeFile = removeFile; window.removeFile = removeFile;
// ── Чанковая загрузка base64 (10KB) ────────────────────── // ── Загрузка base64 (JSON, с повторами) ──────────────────
function uploadFileChunked10k(file, cid, onProgress) { function uploadFileJSON(file, cid, onProgress) {
var b64 = null;
function tryUpload(attempt) {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
var reader = new FileReader(); function doSend() {
reader.onload = function() {
var b64 = reader.result.split(',')[1];
var CHUNK = 10 * 1024;
var totalChunks = Math.ceil(b64.length / CHUNK);
var uploadId = file.name + '_' + Date.now() + '_' + Math.random().toString(36).substr(2, 6);
var done = 0;
function sendChunk(i) {
if (i >= totalChunks) { resolve({contract_id: cid}); return; }
var piece = b64.substring(i * CHUNK, (i + 1) * CHUNK);
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open('POST', '/chunk_json'); xhr.open('POST', '/upload');
xhr.setRequestHeader('Content-Type', 'application/json'); xhr.setRequestHeader('Content-Type', 'application/json');
xhr.timeout = 30000; xhr.timeout = 120000;
xhr.upload.onprogress = function(e) {
if (e.lengthComputable && onProgress) onProgress(Math.round(e.loaded / e.total * 100));
};
xhr.onload = function() { xhr.onload = function() {
if (xhr.status === 200) { if (xhr.status === 200) {
try { try { resolve(JSON.parse(xhr.responseText)); }
var resp = JSON.parse(xhr.responseText); catch(e) { reject(new Error('Bad JSON')); }
if (resp.error) { reject(new Error(resp.error)); return; }
if (resp.contract_id) cid = resp.contract_id;
done++;
if (onProgress) onProgress(Math.round(done / totalChunks * 100));
sendChunk(i + 1);
} catch(e) { reject(new Error('Bad JSON')); }
} else { reject(new Error('HTTP ' + xhr.status)); } } else { reject(new Error('HTTP ' + xhr.status)); }
}; };
xhr.onerror = function() { reject(new Error('Сеть')); }; xhr.onerror = function() { reject(new Error('Сеть')); };
xhr.ontimeout = function() { reject(new Error('Таймаут')); }; xhr.ontimeout = function() { reject(new Error('Таймаут')); };
xhr.send(JSON.stringify({ xhr.send(JSON.stringify({filename: file.name, data: b64, cid: cid || null}));
upload_id: uploadId,
filename: file.name,
chunk_index: i,
total_chunks: totalChunks,
data: piece,
cid: cid || null
}));
} }
sendChunk(0);
}; if (b64) { doSend(); return; }
var reader = new FileReader();
reader.onload = function() { b64 = reader.result.split(',')[1]; doSend(); };
reader.onerror = function() { reject(new Error('Read error')); }; reader.onerror = function() { reject(new Error('Read error')); };
reader.readAsDataURL(file); reader.readAsDataURL(file);
}).catch(function(err) {
if (attempt < 3) {
return new Promise(function(r) { setTimeout(r, 1000); }).then(function() {
return tryUpload(attempt + 1);
}); });
} }
throw err;
});
}
return tryUpload(1);
}
// ── Выбор файла → сразу загрузка ──────────────────────────── // ── Выбор файла → сразу загрузка ────────────────────────────
@@ -225,7 +219,7 @@
var startTime = Date.now(); var startTime = Date.now();
try { try {
var resp = await uploadFileChunked10k(f, contractId, function(pct) { var resp = await uploadFileJSON(f, contractId, function(pct) {
fileQueue[rowIdx].status = '<span style="color:var(--muted);">↑ ' + pct + '%</span>'; fileQueue[rowIdx].status = '<span style="color:var(--muted);">↑ ' + pct + '%</span>';
renderTable(); renderTable();
}); });