@nocobase/plugin-file-manager 1.7.0-beta.8 → 1.7.0

package/dist/server/storages/index.js

@@ -39,8 +39,10 @@ __export(storages_exports, {
   StorageType: () => StorageType
 });
 module.exports = __toCommonJS(storages_exports);
-var import_utils = require("@nocobase/utils");
+var import_axios = __toESM(require("axios"));
+var import_path = __toESM(require("path"));
 var import_url_join = __toESM(require("url-join"));
+var import_utils = require("@nocobase/utils");
 var import_utils2 = require("../utils");
 class StorageType {
   constructor(storage) {
@@ -53,10 +55,28 @@ class StorageType {
   getFileKey(record) {
     return (0, import_utils2.getFileKey)(record);
   }
+  getFileData(file, meta = {}) {
+    const { [this.constructor.filenameKey || "filename"]: name } = file;
+    const filename = import_path.default.basename(name);
+    const extname = import_path.default.extname(filename);
+    const path = (this.storage.path || "").replace(/^\/|\/$/g, "");
+    const data = {
+      title: Buffer.from(file.originalname, "latin1").toString("utf8").replace(extname, ""),
+      filename,
+      extname,
+      // TODO(feature): 暂时两者相同，后面 storage.path 模版化以后，这里只是 file 实际的 path
+      path,
+      size: file.size,
+      mimetype: file.mimetype,
+      meta,
+      storageId: this.storage.id
+    };
+    return data;
+  }
   getFileURL(file, preview) {
     if (file.url && (0, import_utils.isURL)(file.url)) {
-      if (preview) {
-        return (0, import_utils2.encodeURL)(file.url) + (this.storage.options.thumbnailRule || "");
+      if (preview && this.storage.options.thumbnailRule) {
+        return (0, import_utils2.encodeURL)(file.url) + this.storage.options.thumbnailRule;
       }
       return (0, import_utils2.encodeURL)(file.url);
     }
@@ -68,6 +88,24 @@ class StorageType {
     ].filter(Boolean);
     return (0, import_url_join.default)(keys);
   }
+  async getFileStream(file) {
+    try {
+      const fileURL = await this.getFileURL(file);
+      const requestOptions = {
+        responseType: "stream",
+        validateStatus: (status) => status === 200,
+        timeout: 3e4
+        // 30 seconds timeout
+      };
+      const response = await import_axios.default.get(fileURL, requestOptions);
+      return {
+        stream: response.data,
+        contentType: response.headers["content-type"]
+      };
+    } catch (err) {
+      throw new Error(`fetch file failed: ${err}`);
+    }
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/server/storages/local.d.ts

@@ -6,7 +6,9 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
+/// <reference types="node" />
 import multer from 'multer';
+import type { Readable } from 'stream';
 import { AttachmentModel, StorageType } from '.';
 export default class extends StorageType {
     static defaults(): {
@@ -25,4 +27,8 @@ export default class extends StorageType {
     make(): multer.StorageEngine;
     delete(records: AttachmentModel[]): Promise<[number, AttachmentModel[]]>;
     getFileURL(file: AttachmentModel, preview?: boolean): Promise<any>;
+    getFileStream(file: AttachmentModel): Promise<{
+        stream: Readable;
+        contentType?: string;
+    }>;
 }

package/dist/server/storages/local.js

@@ -40,8 +40,8 @@ __export(local_exports, {
 });
 module.exports = __toCommonJS(local_exports);
 var import_utils = require("@nocobase/utils");
+var import_fs = __toESM(require("fs"));
 var import_promises = __toESM(require("fs/promises"));
-var import_mkdirp = __toESM(require("mkdirp"));
 var import_multer = __toESM(require("multer"));
 var import_path = __toESM(require("path"));
 var import_url_join = __toESM(require("url-join"));
@@ -73,7 +73,8 @@ class local_default extends import__.StorageType {
     return import_multer.default.diskStorage({
       destination: (req, file, cb) => {
         const destPath = import_path.default.join(getDocumentRoot(this.storage), this.storage.path || "");
-        (0, import_mkdirp.default)(destPath, (err) => cb(err, destPath));
+        const mkdirp = require("mkdirp");
+        mkdirp(destPath, (err) => cb(err, destPath));
       },
       filename: import_utils2.getFilename
     });
@@ -108,4 +109,14 @@ class local_default extends import__.StorageType {
     }
     return (0, import_url_join.default)(process.env.APP_PUBLIC_PATH, url);
   }
+  async getFileStream(file) {
+    const filePath = import_path.default.join(process.cwd(), "storage", "uploads", file.path || "", file.filename);
+    if (await import_promises.default.stat(filePath)) {
+      return {
+        stream: import_fs.default.createReadStream(filePath),
+        contentType: file.mimetype
+      };
+    }
+    throw new Error(`File not found: ${filePath}`);
+  }
 }

package/dist/server/utils.d.ts

@@ -10,4 +10,4 @@ export declare function getFilename(req: any, file: any, cb: any): void;
 export declare const cloudFilenameGetter: (storage: any) => (req: any, file: any, cb: any) => void;
 export declare function getFileKey(record: any): any;
 export declare function ensureUrlEncoded(value: any): any;
-export declare function encodeURL(url: any): string;
+export declare function encodeURL(url: any): any;

package/dist/server/utils.js

@@ -60,7 +60,7 @@ const cloudFilenameGetter = (storage) => (req, file, cb) => {
   });
 };
 function getFileKey(record) {
-  return (0, import_url_join.default)(record.path, record.filename).replace(/^\//, "");
+  return (0, import_url_join.default)(record.path || "", record.filename).replace(/^\//, "");
 }
 function ensureUrlEncoded(value) {
   try {
@@ -76,9 +76,13 @@ function encodePathKeepSlash(path2) {
   return path2.split("/").map((segment) => ensureUrlEncoded(segment)).join("/");
 }
 function encodeURL(url) {
-  const parsedUrl = new URL(url);
-  parsedUrl.pathname = encodePathKeepSlash(parsedUrl.pathname);
-  return parsedUrl.toString();
+  try {
+    const parsedUrl = new URL(url);
+    parsedUrl.pathname = encodePathKeepSlash(parsedUrl.pathname);
+    return parsedUrl.toString();
+  } catch (error) {
+    return url;
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-file-manager",
-  "version": "1.7.0-beta.8",
+  "version": "1.7.0",
   "displayName": "File manager",
   "displayName.zh-CN": "文件管理器",
   "description": "Provides files storage services with files collection template and attachment field.",
@@ -15,15 +15,16 @@
     "@formily/core": "2.x",
     "@formily/react": "2.x",
     "@formily/shared": "2.x",
-    "@koa/multer": "^3.0.0",
-    "@types/koa-multer": "^1.0.1",
+    "@koa/multer": "^3.1.0",
+    "@types/koa-multer": "^1.0.4",
     "@types/multer": "^1.4.5",
     "antd": "5.x",
+    "axios": "^1.7.0",
     "cos-nodejs-sdk-v5": "^2.11.14",
     "koa-static": "^5.0.0",
     "mime-match": "^1.0.2",
     "mkdirp": "~0.5.4",
-    "multer": "^1.4.2",
+    "multer": "^1.4.5-lts.2",
     "multer-aliyun-oss": "2.1.3",
     "multer-cos": "^1.0.3",
     "multer-s3": "^3.0.1",
@@ -44,5 +45,5 @@
     "Collections",
     "Collection fields"
   ],
-  "gitHead": "9ad35ee90db98d95dfa660645d155f4f4e81b47c"
+  "gitHead": "767ae089e404a104d718962272289c0bec01803a"
 }