plugin-file-preview-auth 1.2.4 → 1.2.6

package/dist/server/plugin.js

@@ -188,45 +188,44 @@ class PluginFilePreviewAuthServer extends import_server.Plugin {
             await this.assertCanAccessAttachment(ctx, attachment);
           }
           try {
+            let matchedKey = null;
             const rawStorageId = attachment.storageId || getAttachmentValue(attachment, "storageId");
             if (rawStorageId) {
               const strId = String(rawStorageId);
-              let matchedKey = null;
               for (const key of fileManager.storagesCache.keys()) {
                 if (String(key) === strId) {
                   matchedKey = key;
                   break;
                 }
               }
-              if (matchedKey !== null) {
-                if (typeof attachment.set === "function") {
-                  attachment.set("storageId", matchedKey);
-                }
-                attachment.storageId = matchedKey;
-              }
             }
-            const storageModel = getStorageFromCache(fileManager.storagesCache, attachment.storageId);
-            if (storageModel && (storageModel.type === "s3" || storageModel.type === "aws-s3")) {
+            const attachmentObj = typeof attachment.toJSON === "function" ? attachment.toJSON() : { ...attachment };
+            if (matchedKey !== null) {
+              attachmentObj.storageId = matchedKey;
+            }
+            const storageModel = getStorageFromCache(fileManager.storagesCache, attachmentObj.storageId);
+            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);
-              if (storageInstance.client) {
+              const s3Client = storageInstance.client || (typeof storageInstance.getS3Client === "function" ? storageInstance.getS3Client() : null);
+              if (s3Client) {
                 const { GetObjectCommand } = require("@aws-sdk/client-s3");
-                const key = storageInstance.getFileKey(attachment);
+                const key = storageInstance.getFileKey(attachmentObj);
                 const getCommand = new GetObjectCommand({
                   Bucket: storageModel.options.bucket,
                   Key: key
                 });
-                const response = await storageInstance.client.send(getCommand);
-                ctx.type = response.ContentType || attachment.mimetype || "application/octet-stream";
-                ctx.attachment(attachment.filename);
+                const response = await s3Client.send(getCommand);
+                ctx.type = response.ContentType || attachmentObj.mimetype || "application/octet-stream";
+                ctx.attachment(attachmentObj.filename);
                 ctx.body = response.Body;
                 await next();
                 return;
               }
             }
-            const { stream, contentType } = await fileManager.getFileStream(attachment);
-            ctx.type = contentType || attachment.mimetype || "application/octet-stream";
-            ctx.attachment(attachment.filename);
+            const { stream, contentType } = await fileManager.getFileStream(attachmentObj);
+            ctx.type = contentType || attachmentObj.mimetype || "application/octet-stream";
+            ctx.attachment(attachmentObj.filename);
             ctx.body = stream;
           } catch (err) {
             this.log.error(`[FilePreviewAuth] Error fetching stream for URL ${url}: ${err.message}`);
@@ -450,24 +449,22 @@ 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);
-      let matchedKey = null;
       for (const key of fileManager.storagesCache.keys()) {
         if (String(key) === strId) {
           matchedKey = key;
           break;
         }
       }
-      if (matchedKey !== null) {
-        if (typeof attachment.set === "function") {
-          attachment.set("storageId", matchedKey);
-        }
-        attachment.storageId = matchedKey;
-      }
     }
-    const { stream } = await fileManager.getFileStream(attachment);
+    const attachmentObj = typeof attachment.toJSON === "function" ? attachment.toJSON() : { ...attachment };
+    if (matchedKey !== null) {
+      attachmentObj.storageId = matchedKey;
+    }
+    const { stream } = await fileManager.getFileStream(attachmentObj);
     const chunks = [];
     for await (const chunk of stream) {
       chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));

package/package.json

@@ -6,7 +6,7 @@
   "description": "Preview PDF, image, and text files with Bearer token authentication via blob URLs.",
   "description.vi-VN": "Xem trước file PDF, hình ảnh và văn bản với xác thực Bearer token qua blob URL.",
   "description.zh-CN": "通过 Bearer 令牌认证和 Blob URL 预览 PDF、图片和文本文件。",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "main": "dist/server/index.js",
   "files": [
     "dist",