From e4d58d652551c032f9cfc660d376a6c037b022f3 Mon Sep 17 00:00:00 2001
From: dev <dev@local>
Date: Sat, 26 Sep 2026 11:16:36 +0300
Subject: [PATCH] =?UTF-8?q?chore(storage):=20=D1=83=D0=B1=D1=80=D0=B0?=
 =?UTF-8?q?=D1=82=D1=8C=20=D0=BD=D0=B5=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=B7=D1=83=D0=B5=D0=BC=D1=8B=D0=B9=20=D0=BA=D0=BE=D0=B4=20?=
 =?UTF-8?q?=D0=B8=20=D1=81=D1=82=D0=B0=D0=B1=D0=B8=D0=BB=D0=B8=D0=B7=D0=B8?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=B4=D0=B5=D0=BF=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- storage.js: из экспорта убраны неиспользуемые publicPath, localExists и dir
- server.js: убран неиспользуемый импорт mimeFor и параметр originalsDir в воркере
- worker.js: убран неиспользуемый параметр originalsDir
- scripts/deploy.sh: up -d --force-recreate app, чтобы пересобранный образ
  гарантированно применялся (compose не всегда пересоздаёт контейнер при
  неизменном конфиге сервиса)
---
 scripts/deploy.sh | 2 +-
 server.js         | 3 +--
 storage.js        | 8 --------
 worker.js         | 2 +-
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 9f6bd18..20c3a56 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -30,7 +30,7 @@ export GIT_COMMIT GIT_COMMIT_DATE
 echo ">> Сборка: $GIT_COMMIT ($GIT_COMMIT_DATE)"
 
 $DC build --build-arg "GIT_COMMIT=$GIT_COMMIT" --build-arg "GIT_COMMIT_DATE=$GIT_COMMIT_DATE" app
-$DC up -d app
+$DC up -d --force-recreate app
 
 echo ">> Проверка"
 $DC exec -T app cat /app/public/version.json
diff --git a/server.js b/server.js
index a7d9f95..eea548b 100644
--- a/server.js
+++ b/server.js
@@ -8,7 +8,7 @@ const heicConvert = require('heic-convert');
 const { createEntryAutoChecker, createPhotoEnhanceWorker } = require('./worker');
 const { createZipWriter, renderStudentReport } = require('./student-report');
 
-const { createStorage, mimeFor } = require('./storage');
+const { createStorage } = require('./storage');
 
 const https = require('https');
 const path = require('path');
@@ -5296,7 +5296,6 @@ if (fs.existsSync(certPath) && fs.existsSync(keyPath)) {
     sharp,
     photoAiUrl: PHOTO_AI_URL,
     uploadsDir: UPLOADS_DIR,
-    originalsDir: ORIGINALS_DIR,
     storage,
   });
   photoWorker.start();
diff --git a/storage.js b/storage.js
index f6b6609..9e8a5a2 100644
--- a/storage.js
+++ b/storage.js
@@ -111,11 +111,6 @@ function createStorage(options = {}) {
     return path.join(cacheDir, ...k.split('/'));
   }
 
-  function publicPath(key) {
-    const k = normalizeKey(key);
-    return k ? `/uploads/${k}` : null;
-  }
-
   function keyFromPath(p) {
     return normalizeKey(p);
   }
@@ -517,13 +512,10 @@ function createStorage(options = {}) {
 
   return {
     bucket,
-    dir,
     cacheDir,
     isRemote,
     keyFromPath,
-    publicPath,
     localFile,
-    localExists,
     unlinkLocalOnly,
     normalizeKey,
     put,
diff --git a/worker.js b/worker.js
index a409255..3cf4b61 100644
--- a/worker.js
+++ b/worker.js
@@ -9,7 +9,7 @@ const crypto = require('crypto');
 const PHOTO_MAX_ATTEMPTS = 3;
 const PHOTO_AI_TIMEOUT_MS = 300000;
 
-function createPhotoEnhanceWorker({ pool, getSetting, logAudit, invalidateEntries, sharp, photoAiUrl, uploadsDir, originalsDir, storage }) {
+function createPhotoEnhanceWorker({ pool, getSetting, logAudit, invalidateEntries, sharp, photoAiUrl, uploadsDir, storage }) {
   const AI_URL = photoAiUrl || process.env.PHOTO_AI_URL || '';
   const IDLE_MIN = 2000;
   const IDLE_MAX = 30000;