Nail/contractor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.0.34: iframe-загрузка — обход HTTP/2 multiplexing

Browse Source
This commit is contained in:
naeel
2026-06-18 21:22:03 +04:00
parent ddc3404556
commit 0a3ccdb973
1 changed files with 66 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.cfm
+66 -62
View File
@@ -64,7 +64,7 @@
<body> <body>
<div class="topbar"> <div class="topbar">
<img src="/nubes-logo.svg" alt="Nubes"> <img src="/nubes-logo.svg" alt="Nubes">
<span class="title">Сверка договоров <span style="font-weight:400;color:var(--muted);font-size:12px;">v1.0.33 — Lucee</span></span> <span class="title">Сверка договоров <span style="font-weight:400;color:var(--muted);font-size:12px;">v1.0.34 — Lucee</span></span>
</div> </div>
<div class="content"> <div class="content">
@@ -221,7 +221,7 @@ fileInput.addEventListener('change', function() {
renderTable(); renderTable();
}); });
// ── Загрузка (читаем все → шлём одним JSON) ──────────── // ── Загрузка через iframe (отдельный контекст на каждый файл) ─
uploadBtn.addEventListener('click', function() { uploadBtn.addEventListener('click', function() {
if (fileQueue.length === 0) return; if (fileQueue.length === 0) return;
uploadBtn.disabled = true; uploadBtn.disabled = true;
@@ -229,77 +229,81 @@ uploadBtn.addEventListener('click', function() {
uploadTimer.style.display = 'block'; uploadTimer.style.display = 'block';
var pending = fileQueue.filter(function(f) { return !f.doc_id; }); var pending = fileQueue.filter(function(f) { return !f.doc_id; });
var payloads = []; var done = 0;
var readIdx = 0;
function readAll() { function uploadNext(i) {
if (readIdx >= pending.length) { sendAll(); return; } if (i >= pending.length) {
var f = pending[readIdx];
f.status = 'читаю...';
renderTable();
var reader = new FileReader();
reader.onload = function(e) {
payloads.push({filename: f.name, data: e.target.result.split(',')[1]});
readIdx++;
uploadTimer.textContent = 'Чтение ' + readIdx + '/' + pending.length;
readAll();
};
reader.onerror = function() {
f.status = 'error: чтение';
renderTable();
readIdx++;
readAll();
};
reader.readAsDataURL(f.file);
}
function sendAll() {
if (payloads.length === 0) {
uploadTimer.style.display = 'none'; uploadTimer.style.display = 'none';
uploadBtn.disabled = false; uploadBtn.disabled = false;
if (contractId && done === pending.length) {
document.getElementById('actionsCard').style.display = 'block';
document.getElementById('chatCard').style.display = 'block';
}
return; return;
} }
uploadTimer.textContent = 'Отправка...'; var f = pending[i];
var body = {files: payloads}; f.status = '0%';
if (contractId) body.contract_id = contractId; renderTable();
uploadTimer.textContent = 'Загрузка ' + (i+1) + '/' + pending.length;
fetch('/upload.cfm', { // Создаём уникальный iframe
method: 'POST', var iframeId = 'up_iframe_' + Date.now() + '_' + i;
headers: {'Content-Type': 'application/json'}, var iframe = document.createElement('iframe');
body: JSON.stringify(body) iframe.name = iframeId;
}).then(function(r) { return r.json(); }) iframe.style.display = 'none';
.then(function(data) { iframe.onload = function() {
uploadTimer.style.display = 'none'; try {
uploadBtn.disabled = false; var resp = iframe.contentDocument.body.textContent;
if (data.OK) { var r = JSON.parse(resp);
contractId = data.CONTRACT_ID || contractId; if (r.OK) {
for (var i = 0; i < pending.length; i++) { contractId = r.CONTRACT_ID;
pending[i].status = 'uploaded'; f.doc_id = r.DOC_ID;
} f.status = 'uploaded';
done++;
var elapsed = ((Date.now() - uploadStartTime) / 1000).toFixed(1); var elapsed = ((Date.now() - uploadStartTime) / 1000).toFixed(1);
log('✅ ' + pending.length + ' файлов — ' + elapsed + 'с'); log('✅ ' + f.name + ' (' + formatSize(f.size) + ') — ' + elapsed + 'с');
} else { } else {
for (var i = 0; i < pending.length; i++) { f.status = 'error: ' + (r.ERROR || '');
pending[i].status = 'error: ' + (data.ERROR || 'неизв.'); log('❌ ' + f.name + ': ' + (r.ERROR || ''));
}
log('❌ ' + (data.ERROR || 'неизв.'));
} }
renderTable(); } catch(e) {
if (contractId) { f.status = 'error: ' + e.message;
document.getElementById('actionsCard').style.display = 'block'; log('❌ ' + f.name + ': ' + e.message);
document.getElementById('chatCard').style.display = 'block'; }
} renderTable();
}).catch(function(e) { document.body.removeChild(iframe);
uploadTimer.style.display = 'none'; uploadNext(i + 1);
uploadBtn.disabled = false; };
for (var i = 0; i < pending.length; i++) { document.body.appendChild(iframe);
pending[i].status = 'error: ' + e.message;
} // Форма внутри iframe
renderTable(); var form = iframe.contentDocument.createElement('form');
}); form.method = 'POST';
form.action = '/upload.cfm';
form.enctype = 'multipart/form-data';
var input = iframe.contentDocument.createElement('input');
input.type = 'file';
input.name = 'files';
// Копируем файл в форму через DataTransfer
var dt = new DataTransfer();
dt.items.add(f.file);
input.files = dt.files;
form.appendChild(input);
if (contractId) {
var cidInput = iframe.contentDocument.createElement('input');
cidInput.type = 'hidden';
cidInput.name = 'contract_id';
cidInput.value = contractId;
form.appendChild(cidInput);
}
iframe.contentDocument.body.appendChild(form);
form.submit();
} }
readAll(); uploadNext(0);
}); });
// ── Инфо ────────────────────────────────────────────────── // ── Инфо ──────────────────────────────────────────────────