UnitPrint/web-app
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test

Browse Source
This commit is contained in:
TraceLumen
2026-09-18 20:24:45 +03:00
parent 623478bff0
commit 51d86d49e3
5 changed files with 552 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib/common/services/pdf.service.js
View File

@ -1,5 +1,10 @@
import * as pdfjsLib from 'pdfjs-dist'; import * as pdfjsLib from 'pdfjs-dist';
import PdfWorkerCtor from 'pdfjs-dist/build/pdf.worker.min.mjs?worker';
// Явно указываем путь к worker'у, чтобы избежать проблем с ?worker в PWA/Chromium
pdfjsLib.GlobalWorkerOptions.workerSrc = new URL(
'pdfjs-dist/build/pdf.worker.min.mjs',
import.meta.url
).toString();
/** /**
* Загрузка PDF документа * Загрузка PDF документа
@ -8,8 +13,7 @@ import PdfWorkerCtor from 'pdfjs-dist/build/pdf.worker.min.mjs?worker';
export async function loadPdfDocument(file) { export async function loadPdfDocument(file) {
try { try {
const arrayBuffer = await file.arrayBuffer(); const arrayBuffer = await file.arrayBuffer();
const worker = new pdfjsLib.PDFWorker({ port: new PdfWorkerCtor() }); const loadingTask = pdfjsLib.getDocument({ data: arrayBuffer });
const loadingTask = pdfjsLib.getDocument({ data: arrayBuffer, worker });
return await loadingTask.promise; return await loadingTask.promise;
} catch (err) { } catch (err) {
console.error('PDF load error:', err); console.error('PDF load error:', err);
@ -36,7 +40,6 @@ export async function renderPageToImage(pdfDoc, pageNum, scale = 1.0) {
canvas.style.height = `${Math.floor(viewport.height)}px`; canvas.style.height = `${Math.floor(viewport.height)}px`;
const transform = outputScale !== 1 ? [outputScale, 0, 0, outputScale, 0, 0] : undefined; const transform = outputScale !== 1 ? [outputScale, 0, 0, outputScale, 0, 0] : undefined;
await page.render({ canvasContext: context, viewport, transform }).promise; await page.render({ canvasContext: context, viewport, transform }).promise;
return canvas.toDataURL('image/jpeg', 0.85); return canvas.toDataURL('image/jpeg', 0.85);
} }

2
src/lib/pages/main/MainMenu.svelte
View File

@ -205,5 +205,5 @@
<div class="version"> <div class="version">
<span>v{backendVersion}</span> <span>v{backendVersion}</span>
<span>v1.0.4</span> <span>v1.0.5</span>
</div> </div>

141
src/lib/pages/print/PrintProgress.svelte
View File

@ -1,45 +1,49 @@
<!-- lib/pages/print/PrintProgress.svelte --> <!-- lib/pages/print/PrintProgress.svelte -->
<script> <script>
const currentStatus = $derived.by(() => { const currentStatus = $derived.by(() => {
if (!store.job) return 'idle'; if (!store.job) return 'idle';
const f = store.job.files.find(f => f.status === 'printing'); const f = store.job.files.find(f => f.status === 'printing');
if (f) return 'printing'; if (f) return 'printing';
const q = store.job.files.find(f => f.status === 'queued'); const q = store.job.files.find(f => f.status === 'queued');
return q ? 'queued' : store.job.phase; return q ? 'queued' : store.job.phase;
}); });
let { store, onBack = () => {} } = $props(); let { store, onBack = () => {} } = $props();
const OFFICE_EXT = ['DOC', 'DOCX', 'ODT', 'XLS', 'XLSX', 'ODS', 'PPT', 'PPTX', 'ODP'];
const OFFICE_EXT = ['DOC', 'DOCX', 'ODT', 'XLS', 'XLSX', 'ODS', 'PPT', 'PPTX', 'ODP']; const STATUS_LABEL = {
const STATUS_LABEL = { queued: 'В очереди',
queued: 'Ожидает', printing: 'Отправка...',
printing: 'Печатается…', sent: 'Отправлен',
awaiting_clear_output: 'Уберите распечатанные листы',
awaiting_flip: 'Переложите бумагу', awaiting_flip: 'Переложите бумагу',
done: 'Готово', awaiting_pickup: 'Заберите документ',
done: 'Готов',
error: 'Ошибка', error: 'Ошибка',
cancelled: 'Отменено' cancelled: 'Отменено'
}; };
function badge(name) { function badge(name) {
const e = (name.split('.').pop() || '').toUpperCase(); const e = (name.split('.').pop() || '').toUpperCase();
return OFFICE_EXT.includes(e) ? e : null; return OFFICE_EXT.includes(e) ? e : null;
} }
// Опрос статуса задания, пока оно активно $effect(() => {
$effect(() => {
if (!store.jobActive) return; if (!store.jobActive) return;
const int = setInterval(() => store.refreshJob(), 1000); const int = setInterval(() => store.refreshJob(), 1000);
return () => clearInterval(int); return () => clearInterval(int);
}); });
// ── Отмена удержанием (защита от миссклика) ── // Проверка, можно ли отменить (есть ли файлы в очереди или печатающиеся)
const HOLD_MS = 1500; const canCancel = $derived(store.job?.files.some(f => f.status === 'queued' || f.status === 'printing'));
let hold = $state(0);
let raf = 0;
let t0 = 0;
function startHold(e) { const HOLD_MS = 1500;
if (!store.jobActive) return; let hold = $state(0);
let raf = 0;
let t0 = 0;
function startHold(e) {
if (!store.jobActive || !canCancel) return;
e.preventDefault(); e.preventDefault();
e.currentTarget.setPointerCapture?.(e.pointerId); e.currentTarget.setPointerCapture?.(e.pointerId);
t0 = performance.now(); t0 = performance.now();
@ -54,17 +58,18 @@
raf = requestAnimationFrame(step); raf = requestAnimationFrame(step);
}; };
raf = requestAnimationFrame(step); raf = requestAnimationFrame(step);
} }
function endHold() {
function endHold() {
if (raf) cancelAnimationFrame(raf); if (raf) cancelAnimationFrame(raf);
raf = 0; raf = 0;
hold = 0; hold = 0;
} }
function finish() { function finish() {
store.resetJob(); store.resetJob();
onBack(); onBack();
} }
</script> </script>
<div class="page-container"> <div class="page-container">
@ -72,29 +77,29 @@
<button class="back-btn" disabled={store.jobActive} onclick={finish}>←</button> <button class="back-btn" disabled={store.jobActive} onclick={finish}>←</button>
<h1>Печать</h1> <h1>Печать</h1>
</header> </header>
<main class="list"> <main class="list">
{#if store.job} {#if store.job}
{#each store.job.files as f, i (i + '-' + f.name)} {#each store.job.files as f, i (i + '-' + f.name)}
{@const b = badge(f.name)} {@const b = badge(f.name)}
{@const isLastDone = f.status === 'done' && !store.job.files.slice(i + 1).some(f => f.status === 'printing' || f.status === 'queued')} {@const isLastDone = f.status === 'done' && !store.job.files.slice(i + 1).some(f => f.status === 'printing' || f.status === 'queued')}
{@const hasNextQueued = store.job.files.slice(i + 1).some(f => f.status === 'queued')} {@const hasNextQueued = store.job.files.slice(i + 1).some(f => f.status === 'queued')}
<section class="file-card" class:current={f.status === 'awaiting_flip' || f.status === 'printing' || isLastDone}> <section class="file-card" class:current={f.status === 'awaiting_flip' || f.status === 'awaiting_clear_output' || f.status === 'printing' || isLastDone}>
<div class="file-row"> <div class="file-row">
{#if b}<span class="type-badge">{b}</span>{/if} {#if b}<span class="type-badge">{b}</span>{/if}
<span class="file-name" title={f.name}>{f.name}</span> <span class="file-name" title={f.name}>{f.name}</span>
<span class="file-status st-{f.status}">{STATUS_LABEL[f.status] ?? f.status}</span> <span class="file-status st-{f.status}">{STATUS_LABEL[f.status] ?? f.status}</span>
</div> </div>
<!-- ── Инструкция для РУЧНОГО ДУПЛЕКСА (после 1-го прохода) ── --> {#if f.status === 'awaiting_clear_output'}
{#if f.status === 'awaiting_flip'} <ol class="pickup-hint clear-hint">
<li>Уберите распечатанные листы из выходного лотка</li>
<li>Нажмите кнопку ниже для запуска двусторонней печати</li>
</ol>
{:else if f.status === 'awaiting_flip'}
<ol class="pickup-hint flip-hint"> <ol class="pickup-hint flip-hint">
<li>Не переворачивая, положите остальные листы в слот ручной подачи</li> <li>Не переворачивая, положите остальные листы в слот ручной подачи</li>
</ol> </ol>
{/if} {:else if isLastDone && hasNextQueued && !store.autoContinue}
<!-- ── Инструкция для обычного «забери документ» ── -->
{#if isLastDone && hasNextQueued}
<ol class="pickup-hint"> <ol class="pickup-hint">
<li>Возьмите готовый документ</li> <li>Возьмите готовый документ</li>
<li>Нажмите далее</li> <li>Нажмите далее</li>
@ -108,7 +113,6 @@
{/each} {/each}
{/if} {/if}
</main> </main>
<footer class="actions"> <footer class="actions">
<label class="auto-row"> <label class="auto-row">
<input <input
@ -119,35 +123,42 @@
<span>Автоматически продолжать печать</span> <span>Автоматически продолжать печать</span>
</label> </label>
{#if store.autoContinue}
<p class="auto-warning">⚠️ Отправленные файлы нельзя будет отменить</p>
{/if}
{#if store.jobActive} {#if store.jobActive}
{#if store.job?.phase === 'awaiting_flip'} {#if store.job?.phase === 'awaiting_clear_output'}
<!-- Ручной дуплекс: пользователь переложил бумагу --> <button class="next-btn next-btn-clear" onclick={store.advanceJob}>
<button class="next-btn next-btn-flip" onclick={store.advanceJob}> Убрал листы — печатать
Готово — печатать обратную сторону
</button> </button>
{:else if store.job?.phase === 'awaiting_pickup' && store.job.files.some(f => f.status === 'queued')} {:else if store.job?.phase === 'awaiting_flip'}
<!-- Обычное: забрал документ → следующий (только если есть следующий) --> <button class="next-btn next-btn-flip" onclick={store.advanceJob}>
<button class="next-btn" onclick={store.advanceJob}>Далее</button> Переложил — печатать обратную сторону
</button>
{:else if store.job?.phase === 'awaiting_pickup'}
<button class="next-btn" onclick={store.advanceJob}>Забрал — далее</button>
{:else} {:else}
<!-- Кнопка видна, но серая и disabled пока сервер не допечатал -->
<button class="next-btn next-btn-disabled" disabled> <button class="next-btn next-btn-disabled" disabled>
{currentStatus === 'printing' ? 'Печатается…' : 'Ожидание печати…'} {currentStatus === 'printing' ? 'Отправка...' : 'Ожидание...'}
</button> </button>
{/if} {/if}
<!-- Кнопка отмены (оригинальный код) -->
<button <button
class="cancel-btn" class="cancel-btn"
onpointerdown={startHold} disabled={!canCancel}
onpointerdown={canCancel ? startHold : null}
onpointerup={endHold} onpointerup={endHold}
onpointercancel={endHold} onpointercancel={endHold}
onpointerleave={endHold} onpointerleave={endHold}
oncontextmenu={(e) => e.preventDefault()} oncontextmenu={(e) => e.preventDefault()}
> >
<span class="cancel-fill" style:width="{hold * 100}%"></span> <span class="cancel-fill" style:width="{hold * 100}%"></span>
<span class="cancel-label">Отмена</span> <span class="cancel-label">{canCancel ? 'Отмена' : 'Отмена недоступна'}</span>
</button> </button>
{#if canCancel}
<p class="hold-hint">Удерживайте для отмены печати</p> <p class="hold-hint">Удерживайте для отмены печати</p>
{/if}
{:else} {:else}
<button class="home-btn" onclick={finish}>На главную</button> <button class="home-btn" onclick={finish}>На главную</button>
{/if} {/if}
@ -155,24 +166,33 @@
</div> </div>
<style> <style>
.st-awaiting_clear_output { color: #f59e0b; }
.st-awaiting_flip { color: #f59e0b; } .st-awaiting_flip { color: #f59e0b; }
.st-sent { color: #8b93a1; }
.st-awaiting_pickup { color: #a5b4fc; }
.flip-hint { .clear-hint { color: #f59e0b; }
color: #f59e0b; .flip-hint { color: #f59e0b; }
}
.next-btn-flip { .next-btn-clear {
background: linear-gradient(135deg, #f59e0b 0%, #d97706 100%); background: linear-gradient(135deg, #f59e0b 0%, #d97706 100%);
box-shadow: 0 8px 24px -6px rgba(245, 158, 11, 0.4); box-shadow: 0 8px 24px -6px rgba(245, 158, 11, 0.4);
} }
.auto-warning {
margin: -4px 0 8px;
text-align: center;
color: #f59e0b;
font-size: 13px;
font-weight: 600;
}
.page-container { width: 100%; min-height: 100dvh; display: flex; flex-direction: column; background: radial-gradient(120% 60% at 50% -10%, rgba(99,102,241,0.18) 0%, transparent 60%); font-family: system-ui, -apple-system, sans-serif; color: #f5f7fa; } .page-container { width: 100%; min-height: 100dvh; display: flex; flex-direction: column; background: radial-gradient(120% 60% at 50% -10%, rgba(99,102,241,0.18) 0%, transparent 60%); font-family: system-ui, -apple-system, sans-serif; color: #f5f7fa; }
.header { padding: 24px 20px 8px; display: flex; align-items: center; position: relative; } .header { padding: 24px 20px 8px; display: flex; align-items: center; position: relative; }
.back-btn { background: none; border: none; color: #6366f1; font-size: 15px; font-weight: 600; cursor: pointer; padding: 8px 4px; margin-right: auto; min-height: 44px; } .back-btn { background: none; border: none; color: #6366f1; font-size: 15px; font-weight: 600; cursor: pointer; padding: 8px 4px; margin-right: auto; min-height: 44px; }
.back-btn:disabled { opacity: 0.3; cursor: not-allowed; } .back-btn:disabled { opacity: 0.3; cursor: not-allowed; }
.header h1 { margin: 0; font-size: 28px; font-weight: 700; position: absolute; left: 50%; transform: translateX(-50%); white-space: nowrap; } .header h1 { margin: 0; font-size: 28px; font-weight: 700; position: absolute; left: 50%; transform: translateX(-50%); white-space: nowrap; }
.list { flex: 1; padding: 24px 20px 16px; display: flex; flex-direction: column; gap: 14px; overflow-y: auto; } .list { flex: 1; padding: 24px 20px 16px; display: flex; flex-direction: column; gap: 14px; overflow-y: auto; }
.file-card { border-radius: 16px; background: rgba(255,255,255,0.04); border: 1px solid rgba(255,255,255,0.08); padding: 14px; display: flex; flex-direction: column; gap: 8px; transition: border-color 0.2s ease, background 0.2s ease; } .file-card { border-radius: 16px; background: rgba(255,255,255,0.04); border: 1px solid rgba(255,255,255,0.08); padding: 14px; display: flex; flex-direction: column; gap: 8px; transition: border-color 0.2s ease, background 0.2s ease; }
.file-card.current { border-color: rgba(99,102,241,0.45); background: rgba(99,102,241,0.07); } .file-card.current { border-color: rgba(99,102,241,0.45); background: rgba(99,102,241,0.07); }
.file-row { display: flex; align-items: center; gap: 12px; min-width: 0; } .file-row { display: flex; align-items: center; gap: 12px; min-width: 0; }
@ -183,17 +203,17 @@
.st-printing { color: #a5b4fc; } .st-printing { color: #a5b4fc; }
.st-error { color: #ef4444; } .st-error { color: #ef4444; }
.st-cancelled { color: #6b7280; } .st-cancelled { color: #6b7280; }
.type-badge { flex-shrink: 0; padding: 3px 7px; border-radius: 6px; background: rgba(99,102,241,0.2); border: 1px solid rgba(99,102,241,0.35); color: #a5b4fc; font-size: 10px; font-weight: 700; letter-spacing: 0.04em; line-height: 1.2; user-select: none; } .type-badge { flex-shrink: 0; padding: 3px 7px; border-radius: 6px; background: rgba(99,102,241,0.2); border: 1px solid rgba(99,102,241,0.35); color: #a5b4fc; font-size: 10px; font-weight: 700; letter-spacing: 0.04em; line-height: 1.2; user-select: none; }
.pickup-hint { margin: 0; padding-left: 22px; color: #eab308; font-size: 14px; line-height: 1.6; font-weight: 600; } .pickup-hint { margin: 0; padding-left: 22px; color: #eab308; font-size: 14px; line-height: 1.6; font-weight: 600; }
.file-error { margin: 0; color: #fca5a5; font-size: 12px; line-height: 1.4; } .file-error { margin: 0; color: #fca5a5; font-size: 12px; line-height: 1.4; }
.actions { padding: 16px 20px 32px; display: flex; flex-direction: column; gap: 12px; } .actions { padding: 16px 20px 32px; display: flex; flex-direction: column; gap: 12px; }
.auto-row { display: flex; align-items: center; justify-content: center; gap: 10px; color: #a9b0c0; font-size: 14px; font-weight: 600; user-select: none; cursor: pointer; } .auto-row { display: flex; align-items: center; justify-content: center; gap: 10px; color: #a9b0c0; font-size: 14px; font-weight: 600; user-select: none; cursor: pointer; }
.auto-row input { width: 18px; height: 18px; accent-color: #6366f1; cursor: pointer; } .auto-row input { width: 18px; height: 18px; accent-color: #6366f1; cursor: pointer; }
.next-btn { width: 100%; padding: 16px 24px; border-radius: 16px; font-size: 16px; font-weight: 700; cursor: pointer; border: none; color: #fff; background: linear-gradient(135deg, #5b8cff 0%, #38c6ff 100%); box-shadow: 0 8px 24px -6px rgba(72,150,255,0.4); } .next-btn { width: 100%; padding: 16px 24px; border-radius: 16px; font-size: 16px; font-weight: 700; cursor: pointer; border: none; color: #fff; background: linear-gradient(135deg, #5b8cff 0%, #38c6ff 100%); box-shadow: 0 8px 24px -6px rgba(72,150,255,0.4); }
.next-btn-flip {
background: linear-gradient(135deg, #f59e0b 0%, #d97706 100%);
box-shadow: 0 8px 24px -6px rgba(245, 158, 11, 0.4);
}
.next-btn-disabled { .next-btn-disabled {
opacity: 0.5; opacity: 0.5;
cursor: wait; cursor: wait;
@ -201,11 +221,14 @@
background: linear-gradient(135deg, #475569 0%, #64748b 100%); background: linear-gradient(135deg, #475569 0%, #64748b 100%);
box-shadow: none; box-shadow: none;
} }
.cancel-btn { position: relative; overflow: hidden; width: 100%; padding: 16px 24px; border-radius: 16px; border: 1px solid rgba(239,68,68,0.35); background: rgba(239,68,68,0.08); color: #fca5a5; font-size: 16px; font-weight: 700; cursor: pointer; touch-action: none; user-select: none; -webkit-user-select: none; -webkit-touch-callout: none; -webkit-tap-highlight-color: transparent; } .cancel-btn { position: relative; overflow: hidden; width: 100%; padding: 16px 24px; border-radius: 16px; border: 1px solid rgba(239,68,68,0.35); background: rgba(239,68,68,0.08); color: #fca5a5; font-size: 16px; font-weight: 700; cursor: pointer; touch-action: none; user-select: none; -webkit-user-select: none; -webkit-touch-callout: none; -webkit-tap-highlight-color: transparent; }
.cancel-btn:disabled {
opacity: 0.4;
cursor: not-allowed;
pointer-events: none;
}
.cancel-fill { position: absolute; left: 0; top: 0; bottom: 0; width: 0%; background: rgba(239,68,68,0.35); pointer-events: none; } .cancel-fill { position: absolute; left: 0; top: 0; bottom: 0; width: 0%; background: rgba(239,68,68,0.35); pointer-events: none; }
.cancel-label { position: relative; } .cancel-label { position: relative; }
.hold-hint { margin: -4px 0 0; text-align: center; color: rgba(139,147,161,0.6); font-size: 11px; } .hold-hint { margin: -4px 0 0; text-align: center; color: rgba(139,147,161,0.6); font-size: 11px; }
.home-btn { width: 100%; padding: 16px 24px; border-radius: 16px; font-size: 16px; font-weight: 700; cursor: pointer; border: none; color: #fff; background: linear-gradient(135deg, #22c55e 0%, #16a34a 100%); box-shadow: 0 8px 24px -6px rgba(34,197,94,0.4); } .home-btn { width: 100%; padding: 16px 24px; border-radius: 16px; font-size: 16px; font-weight: 700; cursor: pointer; border: none; color: #fff; background: linear-gradient(135deg, #22c55e 0%, #16a34a 100%); box-shadow: 0 8px 24px -6px rgba(34,197,94,0.4); }
</style> </style>

23
src/lib/pages/print/store.svelte.js
View File

@ -13,8 +13,8 @@ import { loadPdfDocument, renderPageToImage } from '$lib/common/services/pdf.ser
* dpi: string, totalPages: number, * dpi: string, totalPages: number,
* selectedPages: Set<number>, pdfDoc: any * selectedPages: Set<number>, pdfDoc: any
* }} FileEntry * }} FileEntry
* @typedef {{ name: string, status: 'queued'|'printing'|'awaiting'|'done'|'error'|'cancelled', error: (string|null) }} JobFileView * @typedef {{ name: string, status: 'queued'|'printing'|'sent'|'awaiting_clear_output'|'awaiting_flip'|'awaiting_pickup'|'done'|'error'|'cancelled', error: (string|null) }} JobFileView
* @typedef {{ job_id: string, phase: 'waiting_start'|'printing'|'awaiting_pickup'|'finished'|'cancelled', files: JobFileView[] }} JobView * @typedef {{ job_id: string, phase: 'waiting_start'|'printing'|'awaiting_clear_output'|'awaiting_flip'|'awaiting_pickup'|'finished'|'cancelled', files: JobFileView[] }} JobView
*/ */
export function createPrintStore() { export function createPrintStore() {
let files = $state(/** @type {FileEntry[]} */ ([])); let files = $state(/** @type {FileEntry[]} */ ([]));
@ -27,13 +27,11 @@ export function createPrintStore() {
let previewPagesCache = $state({}); let previewPagesCache = $state({});
let isPreviewRendering = $state(false); let isPreviewRendering = $state(false);
// ── Задание печати (страница прогресса) ──
let job = $state(/** @type {JobView | null} */ (null)); let job = $state(/** @type {JobView | null} */ (null));
let autoContinue = $state(false); let autoContinue = $state(false);
let advancing = false; let advancing = false;
const jobActive = $derived(!!job && job.phase !== 'finished' && job.phase !== 'cancelled'); const jobActive = $derived(!!job && job.phase !== 'finished' && job.phase !== 'cancelled');
let uid = 0; let uid = 0;
const totalPrice = $derived( const totalPrice = $derived(
@ -102,6 +100,7 @@ export function createPrintStore() {
if (f?.previewUrl) URL.revokeObjectURL(f.previewUrl); if (f?.previewUrl) URL.revokeObjectURL(f.previewUrl);
files = files.filter((x) => x.id !== id); files = files.filter((x) => x.id !== id);
} }
function toggleExpand(id) { function toggleExpand(id) {
updateFile(id, { expanded: !files.find((f) => f.id === id)?.expanded }); updateFile(id, { expanded: !files.find((f) => f.id === id)?.expanded });
} }
@ -125,8 +124,8 @@ export function createPrintStore() {
} catch { } catch {
thumbs.push(''); thumbs.push('');
} }
galleryThumbnails = [...thumbs];
} }
galleryThumbnails = [...thumbs];
galleryLoading = false; galleryLoading = false;
} }
@ -175,19 +174,19 @@ export function createPrintStore() {
} }
updateFile(activeFile.id, { selectedPages: newSet }); updateFile(activeFile.id, { selectedPages: newSet });
} }
function selectAllPages() { function selectAllPages() {
if (!activeFile?.totalPages) return; if (!activeFile?.totalPages) return;
updateFile(activeFile.id, { updateFile(activeFile.id, {
selectedPages: new Set(Array.from({ length: activeFile.totalPages }, (_, i) => i + 1)) selectedPages: new Set(Array.from({ length: activeFile.totalPages }, (_, i) => i + 1))
}); });
} }
function deselectAllPages() { function deselectAllPages() {
if (!activeFile) return; if (!activeFile) return;
updateFile(activeFile.id, { selectedPages: new Set([1]) }); updateFile(activeFile.id, { selectedPages: new Set([1]) });
} }
// ─────────────── Отправка на печать + job-протокол ───────────────
async function submitPrint() { async function submitPrint() {
if (files.length === 0 || isPrinting) return; if (files.length === 0 || isPrinting) return;
isPrinting = true; isPrinting = true;
@ -230,7 +229,7 @@ export function createPrintStore() {
} }
job = data; job = data;
showPayment = false; showPayment = false;
await advanceJob(); // старт первого файла await advanceJob();
} catch { } catch {
alert('⚠️ Не удалось связаться с сервером печати.'); alert('⚠️ Не удалось связаться с сервером печати.');
} finally { } finally {
@ -238,7 +237,6 @@ export function createPrintStore() {
} }
} }
/** Подтверждение: старт первого файла / «забрал документ → печатай следующий» */
async function advanceJob() { async function advanceJob() {
if (!job || advancing) return; if (!job || advancing) return;
advancing = true; advancing = true;
@ -252,16 +250,15 @@ export function createPrintStore() {
} }
} }
/** Поллинг статуса; при autoContinue сами шлём подтверждение */
async function refreshJob() { async function refreshJob() {
if (!job) return; if (!job) return;
try { try {
const res = await fetch(`/api/print/${job.job_id}`); const res = await fetch(`/api/print/${job.job_id}`);
if (!res.ok) return; if (!res.ok) return;
job = await res.json(); job = await res.json();
if (job.phase === 'waiting_start') {
advanceJob(); // Автопродолжение срабатывает ТОЛЬКО для awaiting_pickup
} else if (job.phase === 'awaiting_pickup' && autoContinue) { if (job.phase === 'awaiting_pickup' && autoContinue) {
advanceJob(); advanceJob();
} }
} catch (e) { } catch (e) {

17
vite.config.js
View File

@ -22,9 +22,9 @@ export default defineConfig({
registerType: 'prompt', registerType: 'prompt',
injectRegister: 'auto', injectRegister: 'auto',
workbox: { workbox: {
clientsClaim: true, // Необходимо для PDF SW clientsClaim: true,
globPatterns: ['**/*.{js,css,html,ico,png,svg,wasm}'], // Добавили mjs, чтобы pdf.worker.min.mjs попадал в precache Нужно для PDFJS
// Важно: не кэшируем API endpoint версии globPatterns: ['**/*.{js,mjs,css,html,ico,png,svg,wasm}'],
navigateFallbackDenylist: [/^\/api\/version/], navigateFallbackDenylist: [/^\/api\/version/],
runtimeCaching: [ runtimeCaching: [
{ {
@ -34,12 +34,21 @@ export default defineConfig({
cacheName: 'google-fonts-cache', cacheName: 'google-fonts-cache',
expiration: { expiration: {
maxEntries: 10, maxEntries: 10,
maxAgeSeconds: 60 * 60 * 24 * 365 // 1 год maxAgeSeconds: 60 * 60 * 24 * 365
}, },
cacheableResponse: { cacheableResponse: {
statuses: [0, 200] statuses: [0, 200]
} }
} }
},
// Fallback кэширование для worker-файлов, если они не попали в precache
{
urlPattern: /\/assets\/.*\.(mjs|js)$/,
handler: 'CacheFirst',
options: {
cacheName: 'worker-cache',
expiration: { maxEntries: 20, maxAgeSeconds: 60 * 60 * 24 * 30 }
}
} }
] ]
}, },