cynx-lib 1.3.80 → 1.3.82

package/utils/utils/storage_manager.cjs

@@ -224,6 +224,24 @@ class StorageManager {
   invalidateStorageCache() {
     this.activeStorageCache = { data: null, ts: 0 };
   }
+  async _hasInspectionColumn() {
+    if (this._hasInspectionCol !== void 0) return this._hasInspectionCol;
+    if (!this.query) {
+      this._hasInspectionCol = false;
+      return false;
+    }
+    try {
+      const res = await this.query(
+        `SELECT 1 FROM information_schema.columns WHERE table_name = $1 AND column_name = 'inspection_id' LIMIT 1`,
+        [this.filesTable]
+      );
+      this._hasInspectionCol = res.rows && res.rows.length > 0;
+      return this._hasInspectionCol;
+    } catch {
+      this._hasInspectionCol = false;
+      return false;
+    }
+  }
   async getCachedFileRecord(fileId) {
     if (!fileId) return null;
     const now = Date.now();
@@ -256,7 +274,7 @@ class StorageManager {
       fileType,
       mimeType,
       fileSize: Number(f.file_size || 0),
-      // cloudUrl: f.cloud_url,
+      cloudUrl: f.cloud_url || f.cloudUrl || null,
       viewUrl: `${base}/cdn/${fileId}/view`,
       downloadUrl: `${base}/cdn/${fileId}/download`,
       url: `${base}/cdn/${fileId}`,
@@ -918,13 +936,19 @@ class StorageManager {
     this._streamHttp(file, req, res, isInline, redirectCount);
   }
   _streamHttp(file, req, res, isInline, redirectCount = 0, knownProvider = null) {
-    let targetUrl = file.cloud_url;
+    let targetUrl = file.cloud_url || file.url || file.view_url;
     if (!targetUrl) {
       if (file.storage_id && file.cloud_public_id) {
         return this._streamFromS3(file, req, res, isInline);
       }
       return res.status(404).send("File URL not found");
     }
+    if (targetUrl.startsWith("/")) {
+      const serverBase = (this.storageServerUrl || process.env?.STORAGE_SERVER_URL || "").replace(/\/+$/, "");
+      if (serverBase) {
+        targetUrl = `${serverBase}${targetUrl}`;
+      }
+    }
     if (!/^https?:\/\//i.test(targetUrl)) {
       targetUrl = `https://${targetUrl}`;
     }
@@ -935,6 +959,7 @@ class StorageManager {
     if (req?.headers && req.headers["range"]) {
       requestHeaders["Range"] = req.headers["range"];
     }
+    requestHeaders["Accept-Encoding"] = "identity";
     client.get(targetUrl, { agent, headers: requestHeaders }, (cloudRes) => {
       if (cloudRes.statusCode >= 300 && cloudRes.statusCode < 400 && cloudRes.headers.location) {
         const redirectUrl = new URL(cloudRes.headers.location, targetUrl).toString();
@@ -948,7 +973,36 @@ class StorageManager {
       if (cloudRes.statusCode >= 400) {
         return res.status(cloudRes.statusCode).send("Error loading file from storage");
       }
-      const mimeType = cloudRes.headers["content-type"] || file.mime_type || "application/octet-stream";
+      const rawHeaderType = cloudRes.headers["content-type"];
+      const ext = (file.original_name || "").split(".").pop()?.toLowerCase();
+      const EXT_MIMES = {
+        svg: "image/svg+xml",
+        png: "image/png",
+        jpg: "image/jpeg",
+        jpeg: "image/jpeg",
+        webp: "image/webp",
+        gif: "image/gif",
+        ico: "image/x-icon",
+        bmp: "image/bmp",
+        avif: "image/avif",
+        pdf: "application/pdf",
+        json: "application/json",
+        txt: "text/plain",
+        csv: "text/csv",
+        xml: "application/xml",
+        zip: "application/zip",
+        tar: "application/x-tar",
+        gz: "application/gzip",
+        mp4: "video/mp4",
+        webm: "video/webm",
+        mp3: "audio/mpeg",
+        wav: "audio/wav"
+      };
+      const inferredMime = ext ? EXT_MIMES[ext] : null;
+      let mimeType = rawHeaderType;
+      if (!mimeType || mimeType === "application/octet-stream") {
+        mimeType = file.mime_type && file.mime_type !== "application/octet-stream" ? file.mime_type : inferredMime || rawHeaderType || "application/octet-stream";
+      }
       const filename = file.original_name || "file";
       const safeFilename = filename.replace(/["\r\n]/g, "_");
       const encodedFilename = encodeURIComponent(filename);
@@ -961,6 +1015,9 @@ class StorageManager {
         `${disposition}; filename="${safeFilename}"; filename*=UTF-8''${encodedFilename}`
       );
       res.setHeader("Cache-Control", "public, max-age=31536000, immutable");
+      if (cloudRes.headers["content-encoding"]) {
+        res.setHeader("Content-Encoding", cloudRes.headers["content-encoding"]);
+      }
       if (cloudRes.headers["content-range"]) {
         res.setHeader("Content-Range", cloudRes.headers["content-range"]);
         res.status(206);
@@ -1016,11 +1073,31 @@ class StorageManager {
           const fileType = rf.fileType || rf.file_type || (0, import_storage.getFileTypeCategory)(mimeType, rf.originalName || rf.original_name);
           const originalName = rf.originalName || rf.original_name || "file";
           const fileSize = Number(rf.fileSize || rf.file_size || 0);
-          const cloudUrl = rf.cloudUrl || rf.cloud_url || rf.url || (this.storageServerUrl ? `${this.storageServerUrl}/cdn/${fileId}` : "");
+          const rawUrl = rf.cloudUrl || rf.cloud_url || rf.url || "";
+          let cloudUrl = rawUrl;
+          if (this.storageServerUrl) {
+            if (rawUrl.startsWith("http")) {
+              cloudUrl = this.storageServerUrl.startsWith("https://") ? rawUrl.replace(/^http:\/\//, "https://") : rawUrl;
+            } else if (rawUrl.startsWith("/")) {
+              cloudUrl = `${this.storageServerUrl}${rawUrl}`;
+            } else {
+              cloudUrl = `${this.storageServerUrl}/cdn/${fileId}`;
+            }
+          }
           const cloudPublicId = rf.cloudPublicId || rf.cloud_public_id || fileId;
           const storageId = rf.storageId || rf.storage_id || null;
           if (this.query) {
-            const hasInspectionCol = this.filesTable === "storage_files";
+            let validStorageId = null;
+            if (storageId) {
+              try {
+                const sCheck = await this.query(`SELECT 1 FROM ${this.storagesTable} WHERE id = $1 LIMIT 1`, [storageId]);
+                if (sCheck && sCheck.rows && sCheck.rows.length > 0) {
+                  validStorageId = storageId;
+                }
+              } catch {
+              }
+            }
+            const hasInspectionCol = await this._hasInspectionColumn();
             const insertSql = hasInspectionCol ? `INSERT INTO ${this.filesTable} (
                   id, entity_type, entity_id, inspection_id, storage_id,
                   original_name, file_type, mime_type, file_size, cloud_url, cloud_public_id, created_at, updated_at
@@ -1043,7 +1120,7 @@ class StorageManager {
                   cloud_public_id = EXCLUDED.cloud_public_id,
                   updated_at = NOW()
                 RETURNING *`;
-            const params = hasInspectionCol ? [fileId, entityType, entityId, inspectionId, storageId, originalName, fileType, mimeType, fileSize, cloudUrl, cloudPublicId] : [fileId, entityType, entityId, storageId, originalName, fileType, mimeType, fileSize, cloudUrl, cloudPublicId];
+            const params = hasInspectionCol ? [fileId, entityType, entityId, inspectionId, validStorageId, originalName, fileType, mimeType, fileSize, cloudUrl, cloudPublicId] : [fileId, entityType, entityId, validStorageId, originalName, fileType, mimeType, fileSize, cloudUrl, cloudPublicId];
             const r = await this.query(insertSql, params);
             this.fileMetadataCache.set(fileId, { data: r.rows[0], ts: Date.now() });
             return this.formatFileRecord(r.rows[0]);
@@ -1077,7 +1154,7 @@ class StorageManager {
       const fileId = (0, import_uid.genUid)();
       const isInspection = entityType === "dot_inspection" || entityType === "inspection";
       const inspectionId = isInspection ? entityId : null;
-      const hasInspectionCol = this.filesTable === "storage_files";
+      const hasInspectionCol = await this._hasInspectionColumn();
       const insertSql = hasInspectionCol ? `INSERT INTO ${this.filesTable} (
             id, entity_type, entity_id, inspection_id, storage_id,
             original_name, file_type, mime_type, file_size, cloud_url, cloud_public_id

package/utils/utils/storage_manager.js

@@ -229,6 +229,25 @@ export class StorageManager {
     this.activeStorageCache = { data: null, ts: 0 };
   }
 
+  async _hasInspectionColumn() {
+    if (this._hasInspectionCol !== undefined) return this._hasInspectionCol;
+    if (!this.query) {
+      this._hasInspectionCol = false;
+      return false;
+    }
+    try {
+      const res = await this.query(
+        `SELECT 1 FROM information_schema.columns WHERE table_name = $1 AND column_name = 'inspection_id' LIMIT 1`,
+        [this.filesTable]
+      );
+      this._hasInspectionCol = res.rows && res.rows.length > 0;
+      return this._hasInspectionCol;
+    } catch {
+      this._hasInspectionCol = false;
+      return false;
+    }
+  }
+
   async getCachedFileRecord(fileId) {
     if (!fileId) return null;
     const now = Date.now();
@@ -265,7 +284,7 @@ export class StorageManager {
       fileType,
       mimeType,
       fileSize: Number(f.file_size || 0),
-      // cloudUrl: f.cloud_url,
+      cloudUrl: f.cloud_url || f.cloudUrl || null,
       viewUrl: `${base}/cdn/${fileId}/view`,
       downloadUrl: `${base}/cdn/${fileId}/download`,
       url: `${base}/cdn/${fileId}`,
@@ -1017,7 +1036,7 @@ export class StorageManager {
   }
 
   _streamHttp(file, req, res, isInline, redirectCount = 0, knownProvider = null) {
-    let targetUrl = file.cloud_url;
+    let targetUrl = file.cloud_url || file.url || file.view_url;
     if (!targetUrl) {
       if (file.storage_id && file.cloud_public_id) {
         return this._streamFromS3(file, req, res, isInline);
@@ -1025,6 +1044,13 @@ export class StorageManager {
       return res.status(404).send('File URL not found');
     }
 
+    if (targetUrl.startsWith('/')) {
+      const serverBase = (this.storageServerUrl || process.env?.STORAGE_SERVER_URL || '').replace(/\/+$/, '');
+      if (serverBase) {
+        targetUrl = `${serverBase}${targetUrl}`;
+      }
+    }
+
     if (!/^https?:\/\//i.test(targetUrl)) {
       targetUrl = `https://${targetUrl}`;
     }
@@ -1037,6 +1063,9 @@ export class StorageManager {
     if (req?.headers && req.headers['range']) {
       requestHeaders['Range'] = req.headers['range'];
     }
+    // Prevent upstream providers (Cloudinary, Vercel, S3) from sending compressed gzip/br streams
+    // which would otherwise be piped raw to clients without correct decompression.
+    requestHeaders['Accept-Encoding'] = 'identity';
 
     client.get(targetUrl, { agent, headers: requestHeaders }, (cloudRes) => {
       if (cloudRes.statusCode >= 300 && cloudRes.statusCode < 400 && cloudRes.headers.location) {
@@ -1054,7 +1083,41 @@ export class StorageManager {
         return res.status(cloudRes.statusCode).send('Error loading file from storage');
       }
 
-      const mimeType = cloudRes.headers['content-type'] || file.mime_type || 'application/octet-stream';
+      const rawHeaderType = cloudRes.headers['content-type'];
+      const ext = (file.original_name || '').split('.').pop()?.toLowerCase();
+      const EXT_MIMES = {
+        svg: 'image/svg+xml',
+        png: 'image/png',
+        jpg: 'image/jpeg',
+        jpeg: 'image/jpeg',
+        webp: 'image/webp',
+        gif: 'image/gif',
+        ico: 'image/x-icon',
+        bmp: 'image/bmp',
+        avif: 'image/avif',
+        pdf: 'application/pdf',
+        json: 'application/json',
+        txt: 'text/plain',
+        csv: 'text/csv',
+        xml: 'application/xml',
+        zip: 'application/zip',
+        tar: 'application/x-tar',
+        gz: 'application/gzip',
+        mp4: 'video/mp4',
+        webm: 'video/webm',
+        mp3: 'audio/mpeg',
+        wav: 'audio/wav',
+      };
+      const inferredMime = ext ? EXT_MIMES[ext] : null;
+
+      let mimeType = rawHeaderType;
+      // If remote returned generic octet-stream, prioritize known DB mime_type or file extension
+      if (!mimeType || mimeType === 'application/octet-stream') {
+        mimeType = (file.mime_type && file.mime_type !== 'application/octet-stream')
+          ? file.mime_type
+          : inferredMime || rawHeaderType || 'application/octet-stream';
+      }
+
       const filename = file.original_name || 'file';
       const safeFilename = filename.replace(/["\r\n]/g, '_');
       const encodedFilename = encodeURIComponent(filename);
@@ -1069,6 +1132,10 @@ export class StorageManager {
       );
       res.setHeader('Cache-Control', 'public, max-age=31536000, immutable');
 
+      if (cloudRes.headers['content-encoding']) {
+        res.setHeader('Content-Encoding', cloudRes.headers['content-encoding']);
+      }
+
       if (cloudRes.headers['content-range']) {
         res.setHeader('Content-Range', cloudRes.headers['content-range']);
         res.status(206);
@@ -1135,12 +1202,32 @@ export class StorageManager {
           const fileType = rf.fileType || rf.file_type || getFileTypeCategory(mimeType, rf.originalName || rf.original_name);
           const originalName = rf.originalName || rf.original_name || 'file';
           const fileSize = Number(rf.fileSize || rf.file_size || 0);
-          const cloudUrl = rf.cloudUrl || rf.cloud_url || rf.url || (this.storageServerUrl ? `${this.storageServerUrl}/cdn/${fileId}` : '');
+          const rawUrl = rf.cloudUrl || rf.cloud_url || rf.url || '';
+          let cloudUrl = rawUrl;
+          if (this.storageServerUrl) {
+            if (rawUrl.startsWith('http')) {
+              cloudUrl = this.storageServerUrl.startsWith('https://') ? rawUrl.replace(/^http:\/\//, 'https://') : rawUrl;
+            } else if (rawUrl.startsWith('/')) {
+              cloudUrl = `${this.storageServerUrl}${rawUrl}`;
+            } else {
+              cloudUrl = `${this.storageServerUrl}/cdn/${fileId}`;
+            }
+          }
           const cloudPublicId = rf.cloudPublicId || rf.cloud_public_id || fileId;
           const storageId = rf.storageId || rf.storage_id || null;
 
           if (this.query) {
-            const hasInspectionCol = this.filesTable === 'storage_files';
+            let validStorageId = null;
+            if (storageId) {
+              try {
+                const sCheck = await this.query(`SELECT 1 FROM ${this.storagesTable} WHERE id = $1 LIMIT 1`, [storageId]);
+                if (sCheck && sCheck.rows && sCheck.rows.length > 0) {
+                  validStorageId = storageId;
+                }
+              } catch {}
+            }
+
+            const hasInspectionCol = await this._hasInspectionColumn();
             const insertSql = hasInspectionCol
               ? `INSERT INTO ${this.filesTable} (
                   id, entity_type, entity_id, inspection_id, storage_id,
@@ -1167,8 +1254,8 @@ export class StorageManager {
                 RETURNING *`;
 
             const params = hasInspectionCol
-              ? [fileId, entityType, entityId, inspectionId, storageId, originalName, fileType, mimeType, fileSize, cloudUrl, cloudPublicId]
-              : [fileId, entityType, entityId, storageId, originalName, fileType, mimeType, fileSize, cloudUrl, cloudPublicId];
+              ? [fileId, entityType, entityId, inspectionId, validStorageId, originalName, fileType, mimeType, fileSize, cloudUrl, cloudPublicId]
+              : [fileId, entityType, entityId, validStorageId, originalName, fileType, mimeType, fileSize, cloudUrl, cloudPublicId];
 
             const r = await this.query(insertSql, params);
             this.fileMetadataCache.set(fileId, { data: r.rows[0], ts: Date.now() });
@@ -1209,7 +1296,7 @@ export class StorageManager {
       const fileId = genUid();
       const isInspection = entityType === 'dot_inspection' || entityType === 'inspection';
       const inspectionId = isInspection ? entityId : null;
-      const hasInspectionCol = this.filesTable === 'storage_files';
+      const hasInspectionCol = await this._hasInspectionColumn();
 
       const insertSql = hasInspectionCol
         ? `INSERT INTO ${this.filesTable} (

package/utils/utils/ui.js

@@ -1,111 +1,111 @@
-/**
- * cynx/utils — UI and Formatting Helpers (ui.js)
- *
- * Universal classname merger (cn), clipboard helper, and friendly date/byte formatters.
- */
-
-/**
- * Universal class names combiner / merger (zero-dependency clsx replacement).
- * Handles strings, arrays, objects, booleans, and null/undefined values.
- *
- * @param {...any} inputs
- * @returns {string} Combined class string
- */
-export function cn(...inputs) {
-  const classes = [];
-
-  for (let i = 0; i < inputs.length; i++) {
-    const arg = inputs[i];
-    if (!arg) continue;
-
-    const argType = typeof arg;
-    if (argType === 'string' || argType === 'number') {
-      classes.push(arg);
-    } else if (Array.isArray(arg)) {
-      if (arg.length) {
-        const inner = cn(...arg);
-        if (inner) classes.push(inner);
-      }
-    } else if (argType === 'object') {
-      for (const key in arg) {
-        if (Object.prototype.hasOwnProperty.call(arg, key) && arg[key]) {
-          classes.push(key);
-        }
-      }
-    }
-  }
-
-  return classes.join(' ');
-}
-
-/**
- * Safely copy text to clipboard with modern Clipboard API and legacy fallback.
- *
- * @param {string} text
- * @returns {Promise<boolean>}
- */
-export async function copyToClipboard(text) {
-  if (typeof navigator !== 'undefined' && navigator.clipboard?.writeText) {
-    try {
-      await navigator.clipboard.writeText(text);
-      return true;
-    } catch {}
-  }
-
-  if (typeof document !== 'undefined') {
-    try {
-      const el = document.createElement('textarea');
-      el.value = text;
-      el.setAttribute('readonly', '');
-      el.style.position = 'absolute';
-      el.style.left = '-9999px';
-      document.body.appendChild(el);
-      el.select();
-      const successful = document.execCommand('copy');
-      document.body.removeChild(el);
-      return successful;
-    } catch {}
-  }
-
-  return false;
-}
-
-/**
- * Format relative time (e.g. "5s ago", "12m ago", "3h ago", "2d ago").
- *
- * @param {Date|string|number} d
- * @returns {string}
- */
-export function fmtAgo(d) {
-  if (!d) return '—';
-  const s = Math.floor((Date.now() - new Date(d).getTime()) / 1000);
-  if (isNaN(s)) return '—';
-  if (s < 60) return `${Math.max(0, s)}s ago`;
-  if (s < 3600) return `${Math.floor(s / 60)}m ago`;
-  if (s < 86400) return `${Math.floor(s / 3600)}h ago`;
-  return `${Math.floor(s / 86400)}d ago`;
-}
-
-/**
- * Format localized date or return fallback dash.
- *
- * @param {Date|string|number} d
- * @param {string} [locale='ru-RU']
- * @returns {string}
- */
-export function fmtDate(d, locale = 'ru-RU') {
-  if (!d) return '—';
-  try {
-    const date = new Date(d);
-    return isNaN(date.getTime()) ? '—' : date.toLocaleString(locale);
-  } catch {
-    return '—';
-  }
-}
-
-export default {
-  cn,
-  copyToClipboard,
-  fmtAgo,
-  fmtDate,
-};
+/**
+ * cynx/utils — UI and Formatting Helpers (ui.js)
+ *
+ * Universal classname merger (cn), clipboard helper, and friendly date/byte formatters.
+ */
+
+/**
+ * Universal class names combiner / merger (zero-dependency clsx replacement).
+ * Handles strings, arrays, objects, booleans, and null/undefined values.
+ *
+ * @param {...any} inputs
+ * @returns {string} Combined class string
+ */
+export function cn(...inputs) {
+  const classes = [];
+
+  for (let i = 0; i < inputs.length; i++) {
+    const arg = inputs[i];
+    if (!arg) continue;
+
+    const argType = typeof arg;
+    if (argType === 'string' || argType === 'number') {
+      classes.push(arg);
+    } else if (Array.isArray(arg)) {
+      if (arg.length) {
+        const inner = cn(...arg);
+        if (inner) classes.push(inner);
+      }
+    } else if (argType === 'object') {
+      for (const key in arg) {
+        if (Object.prototype.hasOwnProperty.call(arg, key) && arg[key]) {
+          classes.push(key);
+        }
+      }
+    }
+  }
+
+  return classes.join(' ');
+}
+
+/**
+ * Safely copy text to clipboard with modern Clipboard API and legacy fallback.
+ *
+ * @param {string} text
+ * @returns {Promise<boolean>}
+ */
+export async function copyToClipboard(text) {
+  if (typeof navigator !== 'undefined' && navigator.clipboard?.writeText) {
+    try {
+      await navigator.clipboard.writeText(text);
+      return true;
+    } catch {}
+  }
+
+  if (typeof document !== 'undefined') {
+    try {
+      const el = document.createElement('textarea');
+      el.value = text;
+      el.setAttribute('readonly', '');
+      el.style.position = 'absolute';
+      el.style.left = '-9999px';
+      document.body.appendChild(el);
+      el.select();
+      const successful = document.execCommand('copy');
+      document.body.removeChild(el);
+      return successful;
+    } catch {}
+  }
+
+  return false;
+}
+
+/**
+ * Format relative time (e.g. "5s ago", "12m ago", "3h ago", "2d ago").
+ *
+ * @param {Date|string|number} d
+ * @returns {string}
+ */
+export function fmtAgo(d) {
+  if (!d) return '—';
+  const s = Math.floor((Date.now() - new Date(d).getTime()) / 1000);
+  if (isNaN(s)) return '—';
+  if (s < 60) return `${Math.max(0, s)}s ago`;
+  if (s < 3600) return `${Math.floor(s / 60)}m ago`;
+  if (s < 86400) return `${Math.floor(s / 3600)}h ago`;
+  return `${Math.floor(s / 86400)}d ago`;
+}
+
+/**
+ * Format localized date or return fallback dash.
+ *
+ * @param {Date|string|number} d
+ * @param {string} [locale='ru-RU']
+ * @returns {string}
+ */
+export function fmtDate(d, locale = 'ru-RU') {
+  if (!d) return '—';
+  try {
+    const date = new Date(d);
+    return isNaN(date.getTime()) ? '—' : date.toLocaleString(locale);
+  } catch {
+    return '—';
+  }
+}
+
+export default {
+  cn,
+  copyToClipboard,
+  fmtAgo,
+  fmtDate,
+};