plugin-file-preview-auth 1.3.2 → 1.3.3

package/dist/server/plugin.js

@@ -46,6 +46,7 @@ var import_excel_parser_handler = require("./excel-parser-handler");
 var import_promises = require("fs/promises");
 var import_os = __toESM(require("os"));
 var import_path = __toESM(require("path"));
+var import_sequelize = require("sequelize");
 var import_tesseract_worker = require("./ocr/tesseract-worker");
 const FILE_PREVIEW_WORK_CONTEXT_TYPE = "file-preview";
 const MAX_AI_CONTEXT_CHARS = 5e4;
@@ -58,6 +59,7 @@ class PluginFilePreviewAuthServer extends import_server.Plugin {
     await this.db.import({ directory: import_path.default.resolve(__dirname, "collections") });
   }
   async load() {
+    await this.syncOcrResultCollection();
     this.cache = await this.app.cacheManager.createCache({ name: "file-preview-auth" });
     this.ocrWorker = new import_tesseract_worker.TesseractWorker(this.app);
     this.registerExcelParser();
@@ -83,6 +85,12 @@ class PluginFilePreviewAuthServer extends import_server.Plugin {
       this.ocrWorker.stop();
     }
   }
+  async syncOcrResultCollection() {
+    const collection = this.db.getCollection("attachmentOcrResults");
+    if (collection) {
+      await collection.sync();
+    }
+  }
   /**
    * Disable NocoBase's built-in Office previewer after plugins have loaded.
    * This keeps this authenticated previewer as the active Office handler without causing a restart loop.
@@ -132,6 +140,7 @@ class PluginFilePreviewAuthServer extends import_server.Plugin {
           await next();
         },
         download: async (ctx, next) => {
+          var _a, _b, _c, _d;
           const params = ctx.action.params || {};
           const values = params.values || {};
           const reqQuery = ctx.request.query || {};
@@ -159,7 +168,7 @@ class PluginFilePreviewAuthServer extends import_server.Plugin {
           const collection = values.collection || values.collectionName || params.collection || params.collectionName || reqQuery.collection || reqQuery.collectionName || reqBody.collection || reqBody.collectionName || fileInput.collectionName;
           const storageIdInput = values.storageId || params.storageId || reqQuery.storageId || reqBody.storageId || fileInput.storageId;
           let storageId = storageIdInput;
-          const fileManager = this.pm.get("@nocobase/plugin-file-manager");
+          const fileManager = this.pm.get("@nocobase/plugin-file-manager") || this.pm.get("file-manager");
           if (!fileManager) {
             ctx.throw(500, "File manager plugin not found");
           }
@@ -173,8 +182,22 @@ class PluginFilePreviewAuthServer extends import_server.Plugin {
           } catch (e) {
           }
           let attachment = null;
+          let attachmentCollection = collection;
           let isVirtual = false;
           const collectionsToTry = Array.from(new Set([collection, "aiFiles", "attachments"].filter(Boolean)));
+          this.log.debug(
+            `[FilePreviewAuth] Download input ${safeDebugJson({
+              requestedId: toDebugValue(requestedId),
+              collection,
+              hasRawUrl: Boolean(rawUrl),
+              urlPath: getDebugUrlPath(url),
+              filterByTk: toDebugValue(filterByTk),
+              storageIdInput: toDebugValue(storageIdInput),
+              parsedStorageId: toDebugValue(storageId),
+              fileInputKeys: getObjectKeys(fileInput),
+              storageCache: summarizeStorageCache(fileManager.storagesCache)
+            })}`
+          );
           if (requestedId || (fileInput == null ? void 0 : fileInput.id) || (fileInput == null ? void 0 : fileInput.uid)) {
             try {
               attachment = await this.resolveAttachment(ctx, {
@@ -189,6 +212,7 @@ class PluginFilePreviewAuthServer extends import_server.Plugin {
                 filename: values.filename || params.filename || reqQuery.filename || reqBody.filename || fileInput.filename,
                 mimetype: values.mimetype || params.mimetype || reqQuery.mimetype || reqBody.mimetype || fileInput.mimetype
               });
+              attachmentCollection = ((_b = (_a = attachment == null ? void 0 : attachment.constructor) == null ? void 0 : _a.collection) == null ? void 0 : _b.name) || collection || fileInput.collectionName || attachmentCollection;
             } catch {
               attachment = null;
             }
@@ -205,6 +229,7 @@ class PluginFilePreviewAuthServer extends import_server.Plugin {
                 filename: values.filename || params.filename || reqQuery.filename || reqBody.filename || fileInput.filename,
                 mimetype: values.mimetype || params.mimetype || reqQuery.mimetype || reqBody.mimetype || fileInput.mimetype
               });
+              attachmentCollection = ((_d = (_c = attachment == null ? void 0 : attachment.constructor) == null ? void 0 : _c.collection) == null ? void 0 : _d.name) || collection || fileInput.collectionName || attachmentCollection;
             } catch {
               attachment = null;
             }
@@ -223,6 +248,7 @@ class PluginFilePreviewAuthServer extends import_server.Plugin {
                   attachment = await repo.findOne({ filter: { url } });
                 }
                 if (attachment) {
+                  attachmentCollection = colName;
                   break;
                 }
               }
@@ -233,6 +259,7 @@ class PluginFilePreviewAuthServer extends import_server.Plugin {
               ...fileInput,
               url,
               storageId,
+              collectionName: collection || fileInput.collectionName,
               filename: values.filename || params.filename || reqQuery.filename || reqBody.filename || fileInput.filename || "file",
               mimetype: values.mimetype || params.mimetype || reqQuery.mimetype || reqBody.mimetype || fileInput.mimetype
             };
@@ -241,26 +268,30 @@ class PluginFilePreviewAuthServer extends import_server.Plugin {
           if (!attachment) {
             ctx.throw(404, "Attachment not found for this URL");
           }
+          this.log.debug(
+            `[FilePreviewAuth] Attachment resolved ${safeDebugJson({
+              ...summarizeAttachmentForLog(attachment, attachmentCollection),
+              isVirtual,
+              requestedCollection: collection
+            })}`
+          );
           if (!isVirtual) {
             await this.assertCanAccessAttachment(ctx, attachment);
           }
           try {
-            let matchedKey = null;
-            const rawStorageId = attachment.storageId || getAttachmentValue(attachment, "storageId");
-            if (rawStorageId) {
-              const strId = String(rawStorageId);
-              for (const key of fileManager.storagesCache.keys()) {
-                if (String(key) === strId) {
-                  matchedKey = key;
-                  break;
-                }
-              }
-            }
-            const attachmentObj = typeof attachment.toJSON === "function" ? attachment.toJSON() : { ...attachment };
-            if (matchedKey !== null) {
-              attachmentObj.storageId = matchedKey;
-            }
+            const attachmentObj = await this.prepareAttachmentForFileManager(
+              attachment,
+              fileManager,
+              attachmentCollection
+            );
             const storageModel = getStorageFromCache(fileManager.storagesCache, attachmentObj.storageId);
+            this.log.debug(
+              `[FilePreviewAuth] Attachment prepared for stream ${safeDebugJson({
+                ...summarizeAttachmentForLog(attachmentObj, attachmentCollection),
+                storageModel: summarizeStorageForLog(storageModel),
+                storageCache: summarizeStorageCache(fileManager.storagesCache)
+              })}`
+            );
             if (storageModel && (storageModel.type === "s3" || storageModel.type === "aws-s3" || storageModel.type === "s3-private")) {
               const StorageTypeClass = fileManager.storageTypes.get(storageModel.type);
               const storageInstance = new StorageTypeClass(storageModel);
@@ -305,19 +336,107 @@ class PluginFilePreviewAuthServer extends import_server.Plugin {
             ctx.throw(404, "Attachment not found");
           }
           await this.assertCanAccessAttachment(ctx, attachment);
-          await repo.update({
-            filterByTk: attachmentId,
-            values: { ocrStatus: "pending-ocr" }
+          const ocrRecord = await this.upsertOcrResult(attachmentId, {
+            status: "pending-ocr",
+            error: null
           });
           await this.ocrWorker.enqueue(attachmentId);
-          ctx.body = { ok: true, ocrStatus: "pending-ocr" };
+          ctx.body = {
+            ok: true,
+            data: this.serializeOcrResult(ocrRecord, attachmentId)
+          };
+          await next();
+        },
+        getOcrStatus: async (ctx, next) => {
+          const params = ctx.action.params || {};
+          const reqQuery = ctx.request.query || {};
+          const reqBody = ctx.request.body || {};
+          const values = params.values || {};
+          const attachmentId = values.attachmentId || params.attachmentId || reqQuery.attachmentId || reqBody.attachmentId;
+          if (!attachmentId) {
+            ctx.throw(400, "attachmentId is required");
+          }
+          this.assertAuthenticated(ctx);
+          const repo = ctx.db.getRepository("attachments");
+          const attachment = await repo.findOne({ filterByTk: attachmentId });
+          if (!attachment) {
+            ctx.throw(404, "Attachment not found");
+          }
+          await this.assertCanAccessAttachment(ctx, attachment);
+          const ocrRecord = await this.getOcrResultByAttachmentId(attachmentId);
+          ctx.body = {
+            data: this.serializeOcrResult(ocrRecord, attachmentId)
+          };
           await next();
         }
       }
     });
-    this.app.acl.allow("filePreviewAuth", ["download", "getContent", "runOcr"], "loggedIn");
+    this.app.acl.allow("filePreviewAuth", ["download", "getContent", "runOcr", "getOcrStatus"], "loggedIn");
+    this.app.acl.allow("attachmentOcrResults", ["get", "list", "create", "update"], "loggedIn");
     this.log.info("[FilePreviewAuth] Registered /api/filePreviewAuth:download & runOcr endpoints");
   }
+  async getOcrResultByAttachmentId(attachmentId) {
+    const repo = this.db.getRepository("attachmentOcrResults");
+    if (!repo) {
+      return null;
+    }
+    return repo.findOne({
+      filter: {
+        attachmentId
+      },
+      appends: ["attachment"]
+    });
+  }
+  async upsertOcrResult(attachmentId, values) {
+    const repo = this.db.getRepository("attachmentOcrResults");
+    if (!repo) {
+      throw new Error("attachmentOcrResults repository not found");
+    }
+    const existing = await repo.findOne({
+      filter: {
+        attachmentId
+      }
+    });
+    const nextValues = {
+      attachmentId,
+      ...values
+    };
+    if (existing) {
+      await repo.update({
+        filterByTk: existing.get("id"),
+        values: nextValues
+      });
+      return repo.findOne({
+        filterByTk: existing.get("id"),
+        appends: ["attachment"]
+      });
+    }
+    const created = await repo.create({
+      values: nextValues
+    });
+    return repo.findOne({
+      filterByTk: created.get("id"),
+      appends: ["attachment"]
+    });
+  }
+  serializeOcrResult(record, attachmentId) {
+    if (!record) {
+      return {
+        attachmentId,
+        status: "no-ocr",
+        data: null,
+        error: null
+      };
+    }
+    const json = typeof record.toJSON === "function" ? record.toJSON() : record;
+    return {
+      id: json.id,
+      attachmentId: json.attachmentId ?? attachmentId,
+      status: json.status || "no-ocr",
+      data: json.data || null,
+      error: json.error || null
+    };
+  }
   registerAIWorkContext() {
     var _a;
     let aiPlugin;
@@ -349,11 +468,7 @@ class PluginFilePreviewAuthServer extends import_server.Plugin {
   async resolveAttachment(ctx, input) {
     var _a;
     const file = (input == null ? void 0 : input.file) || input || {};
-    const collectionNames = [
-      file.collectionName,
-      "attachments",
-      "aiFiles"
-    ].filter(Boolean);
+    const collectionNames = [file.collectionName, "attachments", "aiFiles"].filter(Boolean);
     const ids = [file.id, file.uid].filter((value) => isLikelyRecordId(value));
     for (const collectionName of collectionNames) {
       if (!ctx.db.getCollection(collectionName)) continue;
@@ -372,6 +487,22 @@ class PluginFilePreviewAuthServer extends import_server.Plugin {
         if (record) return record;
       }
     }
+    for (const collectionName of collectionNames) {
+      if (!ctx.db.getCollection(collectionName)) continue;
+      const repo = ctx.db.getRepository(collectionName);
+      for (const urlCandidate of urlCandidates) {
+        const cleanUrl = urlCandidate.split("?")[0];
+        const filename = import_path.default.basename(cleanUrl);
+        if (filename && filename !== "file" && filename.includes(".")) {
+          const filter = { filename };
+          if (file.storageId) {
+            filter.storageId = file.storageId;
+          }
+          const record = await repo.findOne({ filter });
+          if (record) return record;
+        }
+      }
+    }
     if ((file.storageId || ((_a = file.url) == null ? void 0 : _a.includes("extStorage:download"))) && (file.url || file.path || file.key)) {
       return file;
     }
@@ -433,10 +564,7 @@ class PluginFilePreviewAuthServer extends import_server.Plugin {
               const pk = ((_c = parentCollection == null ? void 0 : parentCollection.model) == null ? void 0 : _c.primaryKeyAttribute) || "id";
               const count = await parentCollection.repository.count({
                 filter: {
-                  $and: [
-                    { [pk]: { $in: parentIds } },
-                    dataScopeFilter
-                  ]
+                  $and: [{ [pk]: { $in: parentIds } }, dataScopeFilter]
                 }
               });
               if (count > 0) return true;
@@ -456,7 +584,9 @@ class PluginFilePreviewAuthServer extends import_server.Plugin {
     const currentRoles = ctx.state.currentRoles || [];
     const userRoles = currentUser.roles || [];
     const isOwner = createdById != null && String(createdById) === String(currentUser.id);
-    const isAdmin = currentRoles.includes("root") || currentRoles.includes("admin") || userRoles.some((role) => role === "root" || role === "admin" || (role == null ? void 0 : role.name) === "root" || (role == null ? void 0 : role.name) === "admin");
+    const isAdmin = currentRoles.includes("root") || currentRoles.includes("admin") || userRoles.some(
+      (role) => role === "root" || role === "admin" || (role == null ? void 0 : role.name) === "root" || (role == null ? void 0 : role.name) === "admin"
+    );
     if (isOwner || isAdmin) {
       return;
     }
@@ -544,7 +674,9 @@ class PluginFilePreviewAuthServer extends import_server.Plugin {
         this.log.warn(`[FilePreviewAuth] MarkItDown parser failed: ${err}`);
       }
     } else {
-      this.log.warn("[FilePreviewAuth] plugin-markitdown-parser not found; uploaded raw text parsing fallback will be used");
+      this.log.warn(
+        "[FilePreviewAuth] plugin-markitdown-parser not found; uploaded raw text parsing fallback will be used"
+      );
     }
     if (isPlainTextAttachment(attachment)) {
       return buffer.toString("utf-8");
@@ -588,21 +720,7 @@ class PluginFilePreviewAuthServer extends import_server.Plugin {
     if (!(fileManager == null ? void 0 : fileManager.getFileStream)) {
       return "";
     }
-    let matchedKey = null;
-    const rawStorageId = attachment.storageId || getAttachmentValue(attachment, "storageId");
-    if (rawStorageId) {
-      const strId = String(rawStorageId);
-      for (const key of fileManager.storagesCache.keys()) {
-        if (String(key) === strId) {
-          matchedKey = key;
-          break;
-        }
-      }
-    }
-    const attachmentObj = typeof attachment.toJSON === "function" ? attachment.toJSON() : { ...attachment };
-    if (matchedKey !== null) {
-      attachmentObj.storageId = matchedKey;
-    }
+    const attachmentObj = await this.prepareAttachmentForFileManager(attachment, fileManager);
     const { stream } = await fileManager.getFileStream(attachmentObj);
     const chunks = [];
     for await (const chunk of stream) {
@@ -610,6 +728,225 @@ class PluginFilePreviewAuthServer extends import_server.Plugin {
     }
     return Buffer.concat(chunks).toString("utf-8");
   }
+  async prepareAttachmentForFileManager(attachment, fileManager, recordCollection) {
+    const attachmentObj = typeof attachment.toJSON === "function" ? attachment.toJSON() : { ...attachment };
+    const collection = this.resolveCollection(
+      recordCollection || attachmentObj.collectionName || attachment.collectionName
+    );
+    const storageId = await this.resolveStorageId(attachment, attachmentObj, fileManager, collection);
+    if (!isMissingFileValue(storageId)) {
+      attachmentObj.storageId = storageId;
+    }
+    this.copyFileFieldsFromRecord(attachment, attachmentObj);
+    await this.ensureFileFields(attachment, attachmentObj, collection);
+    this.copyFileFieldsFromRecord(attachment, attachmentObj);
+    if (attachmentObj.storageId && attachmentObj.url) {
+      const storageModel = getStorageFromCache(fileManager.storagesCache, attachmentObj.storageId);
+      if (storageModel) {
+        const baseUrl = storageModel.baseUrl || "";
+        let relativeUrl = attachmentObj.url.split("?")[0];
+        if (baseUrl && relativeUrl.includes(baseUrl)) {
+          relativeUrl = relativeUrl.substring(relativeUrl.indexOf(baseUrl) + baseUrl.length);
+        }
+        relativeUrl = relativeUrl.replace(/^\/|\/$/g, "");
+        if (relativeUrl) {
+          const parts = relativeUrl.split("/");
+          const filename = parts.pop();
+          const filePath = parts.join("/");
+          if (filename && (!attachmentObj.filename || attachmentObj.filename === "file")) {
+            attachmentObj.filename = filename;
+          }
+          if (filePath && !attachmentObj.path) {
+            attachmentObj.path = filePath;
+          }
+        }
+      }
+    }
+    return attachmentObj;
+  }
+  resolveCollection(recordCollection) {
+    if (!recordCollection) {
+      return void 0;
+    }
+    if (typeof recordCollection === "string") {
+      return this.db.getCollection(recordCollection);
+    }
+    return recordCollection;
+  }
+  async resolveStorageId(record, recordObj, fileManager, recordCollection) {
+    var _a, _b, _c, _d, _e;
+    const collectionName = (recordCollection == null ? void 0 : recordCollection.name) || (recordObj == null ? void 0 : recordObj.collectionName) || (record == null ? void 0 : record.collectionName);
+    const rawStorageId = getRecordStorageId(record) ?? (recordObj == null ? void 0 : recordObj.storageId) ?? (recordObj == null ? void 0 : recordObj.storage_id) ?? ((_a = recordObj == null ? void 0 : recordObj.storage) == null ? void 0 : _a.id) ?? ((_b = recordObj == null ? void 0 : recordObj.storage) == null ? void 0 : _b.filterByTk);
+    const matchedCacheKey = findStorageCacheKey(fileManager == null ? void 0 : fileManager.storagesCache, rawStorageId);
+    if (!isMissingFileValue(matchedCacheKey)) {
+      this.log.debug(
+        `[FilePreviewAuth] storageId resolved from cache ${safeDebugJson({
+          collection: collectionName,
+          record: summarizeAttachmentForLog(recordObj, collectionName),
+          rawStorageId: toDebugValue(rawStorageId),
+          matchedCacheKey: toDebugValue(matchedCacheKey)
+        })}`
+      );
+      return matchedCacheKey;
+    }
+    const storageName = ((_c = recordObj == null ? void 0 : recordObj.storage) == null ? void 0 : _c.name) || (recordObj == null ? void 0 : recordObj.storageName);
+    if (storageName && (fileManager == null ? void 0 : fileManager.storagesCache)) {
+      for (const [key, storage2] of fileManager.storagesCache.entries()) {
+        if ((storage2 == null ? void 0 : storage2.name) === storageName) {
+          this.log.debug(
+            `[FilePreviewAuth] storageId resolved by storage name ${safeDebugJson({
+              collection: collectionName,
+              storageName,
+              matchedCacheKey: toDebugValue(key),
+              storage: summarizeStorageForLog(storage2)
+            })}`
+          );
+          return key;
+        }
+      }
+    }
+    const dbStorageId = await this.resolveStorageIdFromRecordTable(record, recordCollection);
+    const matchedDbCacheKey = findStorageCacheKey(fileManager == null ? void 0 : fileManager.storagesCache, dbStorageId);
+    if (!isMissingFileValue(matchedDbCacheKey)) {
+      this.log.debug(
+        `[FilePreviewAuth] storageId resolved from DB column and cache ${safeDebugJson({
+          collection: collectionName,
+          dbStorageId: toDebugValue(dbStorageId),
+          matchedCacheKey: toDebugValue(matchedDbCacheKey)
+        })}`
+      );
+      return matchedDbCacheKey;
+    }
+    const storageId = !isMissingFileValue(dbStorageId) ? dbStorageId : rawStorageId;
+    if (isMissingFileValue(storageId)) {
+      const defaultStorageKey = findDefaultStorageCacheKey(fileManager == null ? void 0 : fileManager.storagesCache);
+      this.log.debug(
+        `[FilePreviewAuth] storageId missing; using default storage fallback ${safeDebugJson({
+          collection: collectionName,
+          defaultStorageKey: toDebugValue(defaultStorageKey),
+          storageCache: summarizeStorageCache(fileManager == null ? void 0 : fileManager.storagesCache)
+        })}`
+      );
+      return defaultStorageKey;
+    }
+    const storageRepo = this.db.getRepository("storages");
+    const storage = await storageRepo.findOne({ filterByTk: storageId });
+    if (!storage) {
+      this.log.debug(
+        `[FilePreviewAuth] storageId not found in storages table; returning raw value ${safeDebugJson({
+          collection: collectionName,
+          storageId: toDebugValue(storageId)
+        })}`
+      );
+      return storageId;
+    }
+    const parsedStorage = typeof (fileManager == null ? void 0 : fileManager.parseStorage) === "function" ? fileManager.parseStorage(storage) : storage.toJSON();
+    (_e = (_d = fileManager == null ? void 0 : fileManager.storagesCache) == null ? void 0 : _d.set) == null ? void 0 : _e.call(_d, storage.get("id"), parsedStorage);
+    this.log.debug(
+      `[FilePreviewAuth] storageId resolved from storages table ${safeDebugJson({
+        collection: collectionName,
+        requestedStorageId: toDebugValue(storageId),
+        resolvedStorageId: toDebugValue(storage.get("id")),
+        storage: summarizeStorageForLog(parsedStorage)
+      })}`
+    );
+    return storage.get("id");
+  }
+  async resolveStorageIdFromRecordTable(record, recordCollection) {
+    var _a, _b, _c, _d, _e;
+    const collection = recordCollection || ((_a = record == null ? void 0 : record.constructor) == null ? void 0 : _a.collection);
+    if (!(collection == null ? void 0 : collection.model)) {
+      return void 0;
+    }
+    const primaryKey = collection.model.primaryKeyAttribute || "id";
+    const recordId = ((_b = record.get) == null ? void 0 : _b.call(record, primaryKey)) ?? ((_c = record.get) == null ? void 0 : _c.call(record, "id")) ?? record[primaryKey] ?? record.id;
+    if (isMissingFileValue(recordId)) {
+      return void 0;
+    }
+    let columns;
+    try {
+      columns = await this.db.sequelize.getQueryInterface().describeTable(collection.getTableNameWithSchema());
+    } catch (error) {
+      this.log.warn(`[FilePreviewAuth] Failed to inspect table "${collection.name}" for storageId:`, error.message);
+      return void 0;
+    }
+    const rawAttributes = collection.model.rawAttributes || {};
+    const storageColumn = findExistingColumn(columns, [
+      (_d = rawAttributes.storageId) == null ? void 0 : _d.field,
+      (_e = rawAttributes.storage_id) == null ? void 0 : _e.field,
+      "storageId",
+      "storage_id",
+      "storageid"
+    ]);
+    if (!storageColumn) {
+      return void 0;
+    }
+    const result = await collection.model.findOne({
+      attributes: [[(0, import_sequelize.col)(storageColumn), "storageId"]],
+      where: { [primaryKey]: recordId },
+      raw: true
+    });
+    this.log.debug(
+      `[FilePreviewAuth] storageId DB lookup ${safeDebugJson({
+        collection: collection.name,
+        table: String(collection.getTableNameWithSchema()),
+        primaryKey,
+        recordId: toDebugValue(recordId),
+        storageColumn,
+        dbStorageId: toDebugValue(result == null ? void 0 : result["storageId"])
+      })}`
+    );
+    return result == null ? void 0 : result["storageId"];
+  }
+  async ensureFileFields(record, recordObj, recordCollection) {
+    const fileFields = ["key", "filename", "path", "mimetype", "title", "extname", "url"];
+    const needsFileKey = !hasText(recordObj.key) && !hasText(recordObj.filename) && !hasText(recordObj.url);
+    const missingFields = fileFields.filter((field) => isMissingFileValue(recordObj[field]));
+    if (!needsFileKey && missingFields.length === 0) {
+      return;
+    }
+    const fileData = await this.resolveFileFieldsFromRecordTable(record, fileFields, recordCollection);
+    for (const field of fileFields) {
+      if (!isMissingFileValue(fileData[field])) {
+        recordObj[field] = fileData[field];
+      }
+    }
+  }
+  copyFileFieldsFromRecord(record, recordObj) {
+    var _a, _b;
+    for (const field of ["key", "filename", "path", "mimetype", "title", "extname", "url"]) {
+      if (!isMissingFileValue(recordObj[field])) {
+        continue;
+      }
+      const value = ((_a = record.get) == null ? void 0 : _a.call(record, field)) ?? ((_b = record.getDataValue) == null ? void 0 : _b.call(record, field)) ?? record[field];
+      if (!isMissingFileValue(value)) {
+        recordObj[field] = value;
+      }
+    }
+  }
+  async resolveFileFieldsFromRecordTable(record, fields, recordCollection) {
+    var _a, _b, _c;
+    const collection = recordCollection || ((_a = record == null ? void 0 : record.constructor) == null ? void 0 : _a.collection);
+    if (!(collection == null ? void 0 : collection.model)) {
+      return {};
+    }
+    const primaryKey = collection.model.primaryKeyAttribute || "id";
+    const recordId = ((_b = record.get) == null ? void 0 : _b.call(record, primaryKey)) ?? ((_c = record.get) == null ? void 0 : _c.call(record, "id")) ?? record[primaryKey] ?? record.id;
+    if (isMissingFileValue(recordId)) {
+      return {};
+    }
+    const rawAttributes = collection.model.rawAttributes || {};
+    const attributes = fields.filter((field) => rawAttributes[field]).map((field) => [(0, import_sequelize.col)(rawAttributes[field].field || field), field]);
+    if (attributes.length === 0) {
+      return {};
+    }
+    const result = await collection.model.findOne({
+      attributes,
+      where: { [primaryKey]: recordId },
+      raw: true
+    });
+    return result || {};
+  }
   formatAttachmentWorkContext(attachment, text) {
     const filename = sanitizeXmlAttr(getAttachmentDisplayName(attachment));
     const mimetype = sanitizeXmlAttr(getAttachmentValue(attachment, "mimetype") || "");
@@ -649,6 +986,84 @@ class PluginFilePreviewAuthServer extends import_server.Plugin {
   }
 }
 var plugin_default = PluginFilePreviewAuthServer;
+function safeDebugJson(value) {
+  try {
+    return JSON.stringify(value, (_key, item) => typeof item === "bigint" ? item.toString() : item);
+  } catch (error) {
+    return JSON.stringify({ error: "failed_to_serialize_debug_payload" });
+  }
+}
+function toDebugValue(value) {
+  if (value === void 0 || value === null || value === "") {
+    return value;
+  }
+  return String(value);
+}
+function getObjectKeys(value) {
+  if (!value || typeof value !== "object") {
+    return [];
+  }
+  return Object.keys(value);
+}
+function getDebugUrlPath(url) {
+  if (!url) {
+    return "";
+  }
+  try {
+    return new URL(url, "http://local").pathname;
+  } catch {
+    return "unparseable";
+  }
+}
+function summarizeAttachmentForLog(attachment, collectionName) {
+  var _a;
+  return {
+    id: toDebugValue(getAttachmentValue(attachment, "id")),
+    uid: toDebugValue(getAttachmentValue(attachment, "uid")),
+    collectionName: String(collectionName || getAttachmentValue(attachment, "collectionName") || ""),
+    storageId: toDebugValue(getAttachmentValue(attachment, "storageId")),
+    storageIdColumn: toDebugValue(getAttachmentValue(attachment, "storage_id")),
+    storageName: ((_a = getAttachmentValue(attachment, "storage")) == null ? void 0 : _a.name) || getAttachmentValue(attachment, "storageName"),
+    fieldsPresent: {
+      key: hasText(getAttachmentValue(attachment, "key")),
+      filename: hasText(getAttachmentValue(attachment, "filename")),
+      path: hasText(getAttachmentValue(attachment, "path")),
+      url: hasText(getAttachmentValue(attachment, "url")),
+      preview: hasText(getAttachmentValue(attachment, "preview")),
+      mimetype: hasText(getAttachmentValue(attachment, "mimetype")),
+      title: hasText(getAttachmentValue(attachment, "title")),
+      extname: hasText(getAttachmentValue(attachment, "extname"))
+    }
+  };
+}
+function summarizeStorageForLog(storage) {
+  var _a, _b, _c;
+  if (!storage) {
+    return null;
+  }
+  return {
+    id: toDebugValue(storage.id),
+    name: storage.name,
+    type: storage.type,
+    default: Boolean(storage.default),
+    public: Boolean((_a = storage.options) == null ? void 0 : _a.public),
+    paranoid: Boolean(storage.paranoid),
+    hasBucket: hasText((_b = storage.options) == null ? void 0 : _b.bucket),
+    hasEndpoint: hasText((_c = storage.options) == null ? void 0 : _c.endpoint)
+  };
+}
+function summarizeStorageCache(cache) {
+  if (!cache) {
+    return { size: 0, storages: [] };
+  }
+  return {
+    size: cache.size,
+    storages: Array.from(cache.entries()).slice(0, 20).map(([key, storage]) => ({
+      cacheKey: toDebugValue(key),
+      ...summarizeStorageForLog(storage)
+    }))
+  };
+}
 function getStorageFromCache(cache, storageId) {
   if (storageId === void 0 || storageId === null) return void 0;
   let res = cache.get(storageId);
@@ -673,6 +1088,67 @@ function getAttachmentValue(attachment, key) {
   if (typeof attachment.get === "function") return attachment.get(key);
   return attachment[key];
 }
+function getRecordStorageId(record) {
+  var _a, _b, _c, _d, _e, _f, _g;
+  if (!record) return void 0;
+  return ((_a = record.get) == null ? void 0 : _a.call(record, "storageId")) ?? ((_b = record.get) == null ? void 0 : _b.call(record, "storage_id")) ?? ((_c = record.getDataValue) == null ? void 0 : _c.call(record, "storageId")) ?? ((_d = record.getDataValue) == null ? void 0 : _d.call(record, "storage_id")) ?? record.storageId ?? record.storage_id ?? ((_f = (_e = record.get) == null ? void 0 : _e.call(record, "storage")) == null ? void 0 : _f.id) ?? ((_g = record.storage) == null ? void 0 : _g.id);
+}
+function findStorageCacheKey(cache, storageId) {
+  if (!cache || isMissingFileValue(storageId)) {
+    return void 0;
+  }
+  if (cache.has(storageId)) {
+    return storageId;
+  }
+  const strId = String(storageId);
+  if (cache.has(strId)) {
+    return strId;
+  }
+  const numericId = Number(storageId);
+  if (Number.isFinite(numericId) && cache.has(numericId)) {
+    return numericId;
+  }
+  for (const key of cache.keys()) {
+    if (String(key) === strId) {
+      return key;
+    }
+  }
+  return void 0;
+}
+function findDefaultStorageCacheKey(cache) {
+  if (!cache) {
+    return void 0;
+  }
+  for (const [key, storage] of cache.entries()) {
+    if (storage == null ? void 0 : storage.default) {
+      return key;
+    }
+  }
+  if (cache.size === 1) {
+    return cache.keys().next().value;
+  }
+  return void 0;
+}
+function findExistingColumn(columns, candidates) {
+  const columnNames = Object.keys(columns || {});
+  for (const candidate of candidates) {
+    if (!candidate) continue;
+    if (Object.prototype.hasOwnProperty.call(columns, candidate)) {
+      return candidate;
+    }
+    const matchedColumn = columnNames.find((columnName) => columnName.toLowerCase() === candidate.toLowerCase());
+    if (matchedColumn) {
+      return matchedColumn;
+    }
+  }
+  return void 0;
+}
+function hasText(value) {
+  return typeof value === "string" && value.trim().length > 0;
+}
+function isMissingFileValue(value) {
+  return value === void 0 || value === null || value === "";
+}
 function getAttachmentDisplayName(attachment) {
   const title = getAttachmentValue(attachment, "title");
   const extname = getAttachmentValue(attachment, "extname");