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

package/dist/node_modules/multer-s3/package.json

@@ -1 +1 @@
-{"name":"multer-s3","version":"3.0.1","description":"Streaming multer storage engine for AWS S3","main":"index.js","scripts":{"test":"standard && mocha test/basic.js"},"engines":{"node":">= 12.0.0"},"repository":{"type":"git","url":"git+https://github.com/badunk/multer-s3.git"},"keywords":["multer","s3","amazon","aws"],"author":"badunk","license":"MIT","bugs":{"url":"https://github.com/badunk/multer-s3/issues"},"homepage":"https://github.com/badunk/multer-s3#readme","dependencies":{"@aws-sdk/lib-storage":"^3.46.0","file-type":"^3.3.0","html-comment-regex":"^1.1.2","run-parallel":"^1.1.6"},"peerDependencies":{"@aws-sdk/client-s3":"^3.0.0"},"devDependencies":{"express":"^4.13.1","form-data":"^1.0.0-rc3","mocha":"^2.2.5","multer":"^1.1.0","on-finished":"^2.3.0","standard":"^5.4.1","xtend":"^4.0.1"},"_lastModified":"2025-03-25T05:44:35.610Z"}
+{"name":"multer-s3","version":"3.0.1","description":"Streaming multer storage engine for AWS S3","main":"index.js","scripts":{"test":"standard && mocha test/basic.js"},"engines":{"node":">= 12.0.0"},"repository":{"type":"git","url":"git+https://github.com/badunk/multer-s3.git"},"keywords":["multer","s3","amazon","aws"],"author":"badunk","license":"MIT","bugs":{"url":"https://github.com/badunk/multer-s3/issues"},"homepage":"https://github.com/badunk/multer-s3#readme","dependencies":{"@aws-sdk/lib-storage":"^3.46.0","file-type":"^3.3.0","html-comment-regex":"^1.1.2","run-parallel":"^1.1.6"},"peerDependencies":{"@aws-sdk/client-s3":"^3.0.0"},"devDependencies":{"express":"^4.13.1","form-data":"^1.0.0-rc3","mocha":"^2.2.5","multer":"^1.1.0","on-finished":"^2.3.0","standard":"^5.4.1","xtend":"^4.0.1"},"_lastModified":"2025-06-03T16:31:36.572Z"}

package/dist/node_modules/url-join/package.json

@@ -1 +1 @@
-{"name":"url-join","version":"4.0.1","description":"Join urls and normalize as in path.join.","main":"lib/url-join.js","scripts":{"test":"mocha --require should"},"repository":{"type":"git","url":"git://github.com/jfromaniello/url-join.git"},"keywords":["url","join"],"author":"José F. Romaniello <jfromaniello@gmail.com> (http://joseoncode.com)","license":"MIT","devDependencies":{"conventional-changelog":"^1.1.10","mocha":"^3.2.0","should":"~1.2.1"},"_lastModified":"2025-03-25T05:44:27.111Z"}
+{"name":"url-join","version":"4.0.1","description":"Join urls and normalize as in path.join.","main":"lib/url-join.js","scripts":{"test":"mocha --require should"},"repository":{"type":"git","url":"git://github.com/jfromaniello/url-join.git"},"keywords":["url","join"],"author":"José F. Romaniello <jfromaniello@gmail.com> (http://joseoncode.com)","license":"MIT","devDependencies":{"conventional-changelog":"^1.1.10","mocha":"^3.2.0","should":"~1.2.1"},"_lastModified":"2025-06-03T16:31:29.289Z"}

package/dist/server/actions/attachments.d.ts

@@ -7,5 +7,4 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Context, Next } from '@nocobase/actions';
-export declare function getFileData(ctx: Context): Promise<any>;
 export declare function createMiddleware(ctx: Context, next: Next): Promise<any>;

package/dist/server/actions/attachments.js

@@ -36,12 +36,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var attachments_exports = {};
 __export(attachments_exports, {
-  createMiddleware: () => createMiddleware,
-  getFileData: () => getFileData
+  createMiddleware: () => createMiddleware
 });
 module.exports = __toCommonJS(attachments_exports);
 var import_utils = require("@nocobase/utils");
-var import_path = __toESM(require("path"));
 var import__ = __toESM(require(".."));
 var import_constants = require("../../constants");
 var Rules = __toESM(require("../rules"));
@@ -53,37 +51,6 @@ function getFileFilter(storage) {
     cb(null, result);
   };
 }
-async function getFileData(ctx) {
-  var _a;
-  const { [import_constants.FILE_FIELD_NAME]: file, storage } = ctx;
-  if (!file) {
-    return ctx.throw(400, "file validation failed");
-  }
-  const plugin = ctx.app.pm.get(import__.default);
-  const StorageType = plugin.storageTypes.get(storage.type);
-  const { [StorageType.filenameKey || "filename"]: name } = file;
-  const filename = import_path.default.basename(name);
-  const extname = import_path.default.extname(filename);
-  const path = (storage.path || "").replace(/^\/|\/$/g, "");
-  let storageInstance = plugin.storagesCache.get(storage.id);
-  if (!storageInstance) {
-    await plugin.loadStorages();
-    storageInstance = plugin.storagesCache.get(storage.id);
-  }
-  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: ctx.request.body,
-    storageId: storage.id,
-    ...(_a = StorageType == null ? void 0 : StorageType["getFileData"]) == null ? void 0 : _a.call(StorageType, file)
-  };
-  return data;
-}
 async function multipart(ctx, next) {
   const { storage } = ctx;
   if (!storage) {
@@ -116,7 +83,11 @@ async function multipart(ctx, next) {
     ctx.logger.error(err);
     return ctx.throw(500, err);
   }
-  const values = await getFileData(ctx);
+  const { [import_constants.FILE_FIELD_NAME]: file } = ctx;
+  if (!file) {
+    return ctx.throw(400, "file validation failed");
+  }
+  const values = storageInstance.getFileData(file, ctx.request.body);
   ctx.action.mergeParams({
     values
   });
@@ -130,19 +101,28 @@ async function createMiddleware(ctx, next) {
   if (((_a = collection == null ? void 0 : collection.options) == null ? void 0 : _a.template) !== "file" || !["upload", "create"].includes(actionName)) {
     return next();
   }
-  const storageName = ((_c = (_b = ctx.db.getFieldByPath(attachmentField)) == null ? void 0 : _b.options) == null ? void 0 : _c.storage) || collection.options.storage;
-  const StorageRepo = ctx.db.getRepository("storages");
-  const storage = await StorageRepo.findOne({ filter: storageName ? { name: storageName } : { default: true } });
+  const storageName = resourceName === "attachments" ? (_c = (_b = ctx.db.getFieldByPath(attachmentField)) == null ? void 0 : _b.options) == null ? void 0 : _c.storage : collection.options.storage;
   const plugin = ctx.app.pm.get(import__.default);
-  ctx.storage = plugin.parseStorage(storage);
+  const storage = Array.from(plugin.storagesCache.values()).find(
+    (storage2) => storageName ? storage2.name === storageName : storage2.default
+  );
+  if (!storage) {
+    ctx.logger.error(`[file-manager] no storage found`);
+    return ctx.throw(500);
+  }
+  ctx.storage = storage;
   if (ctx == null ? void 0 : ctx.request.is("multipart/*")) {
     await multipart(ctx, next);
   } else {
+    ctx.action.mergeParams({
+      values: {
+        storage: { id: storage.id }
+      }
+    });
     await next();
   }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createMiddleware,
-  getFileData
+  createMiddleware
 });

package/dist/server/actions/storages.js

@@ -41,6 +41,7 @@ __export(storages_exports, {
 module.exports = __toCommonJS(storages_exports);
 var import__ = __toESM(require(".."));
 async function getBasicInfo(context, next) {
+  var _a, _b;
   const { storagesCache } = context.app.pm.get(import__.default);
   let result;
   const { filterByTk } = context.action.params;
@@ -58,7 +59,9 @@ async function getBasicInfo(context, next) {
     title: result.title,
     name: result.name,
     type: result.type,
-    rules: result.rules
+    rules: result.rules,
+    baseUrl: (_a = result.options) == null ? void 0 : _a.baseUrl,
+    public: (_b = result.options) == null ? void 0 : _b.public
   };
   next();
 }

package/dist/server/collections/attachments.d.ts

@@ -6,5 +6,5 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-declare const _default: import("@nocobase/database").CollectionOptions;
-export default _default;
+import collection from '../../common/collections/attachments';
+export default collection;

package/dist/server/collections/attachments.js

@@ -7,9 +7,11 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -23,76 +25,19 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var attachments_exports = {};
 __export(attachments_exports, {
   default: () => attachments_default
 });
 module.exports = __toCommonJS(attachments_exports);
-var import_database = require("@nocobase/database");
-var attachments_default = (0, import_database.defineCollection)({
-  dumpRules: {
-    group: "user"
-  },
-  migrationRules: ["schema-only", "overwrite"],
-  asStrategyResource: true,
-  shared: true,
-  name: "attachments",
-  createdBy: true,
-  updatedBy: true,
-  template: "file",
-  fields: [
-    {
-      comment: "\u7528\u6237\u6587\u4EF6\u540D\uFF08\u4E0D\u542B\u6269\u5C55\u540D\uFF09",
-      type: "string",
-      name: "title"
-    },
-    {
-      comment: "\u7CFB\u7EDF\u6587\u4EF6\u540D\uFF08\u542B\u6269\u5C55\u540D\uFF09",
-      type: "string",
-      name: "filename"
-    },
-    {
-      comment: "\u6269\u5C55\u540D\uFF08\u542B\u201C.\u201D\uFF09",
-      type: "string",
-      name: "extname"
-    },
-    {
-      comment: "\u6587\u4EF6\u4F53\u79EF\uFF08\u5B57\u8282\uFF09",
-      type: "integer",
-      name: "size"
-    },
-    // TODO: 使用暂不明确，以后再考虑
-    // {
-    //   comment: '文件类型（mimetype 前半段，通常用于预览）',
-    //   type: 'string',
-    //   name: 'type',
-    // },
-    {
-      type: "string",
-      name: "mimetype"
-    },
-    {
-      comment: "\u5B58\u50A8\u5F15\u64CE",
-      type: "belongsTo",
-      name: "storage"
-    },
-    {
-      comment: "\u76F8\u5BF9\u8DEF\u5F84\uFF08\u542B\u201C/\u201D\u524D\u7F00\uFF09",
-      type: "text",
-      name: "path"
-    },
-    {
-      comment: "\u5176\u4ED6\u6587\u4EF6\u4FE1\u606F\uFF08\u5982\u56FE\u7247\u7684\u5BBD\u9AD8\uFF09",
-      type: "jsonb",
-      name: "meta",
-      defaultValue: {}
-    },
-    {
-      comment: "\u7F51\u7EDC\u8BBF\u95EE\u5730\u5740",
-      type: "text",
-      name: "url"
-      // formula: '{{ storage.baseUrl }}{{ path }}/{{ filename }}'
-    }
-  ]
-});
+var import_attachments = __toESM(require("../../common/collections/attachments"));
+var attachments_default = import_attachments.default;

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

@@ -6,5 +6,5 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-declare const _default: import("@nocobase/database").CollectionOptions;
-export default _default;
+import collection from '../../common/collections/storages';
+export default collection;

package/dist/server/collections/storages.js

@@ -7,9 +7,11 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -23,73 +25,19 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var storages_exports = {};
 __export(storages_exports, {
   default: () => storages_default
 });
 module.exports = __toCommonJS(storages_exports);
-var import_database = require("@nocobase/database");
-var storages_default = (0, import_database.defineCollection)({
-  dumpRules: "required",
-  migrationRules: ["overwrite", "schema-only"],
-  name: "storages",
-  shared: true,
-  fields: [
-    {
-      title: "\u5B58\u50A8\u5F15\u64CE\u540D\u79F0",
-      comment: "\u5B58\u50A8\u5F15\u64CE\u540D\u79F0",
-      type: "string",
-      name: "title",
-      translation: true
-    },
-    {
-      title: "\u82F1\u6587\u6807\u8BC6",
-      // comment: '英文标识，用于代码层面配置',
-      type: "uid",
-      name: "name",
-      unique: true
-    },
-    {
-      comment: "\u7C7B\u578B\u6807\u8BC6\uFF0C\u5982 local/ali-oss \u7B49",
-      type: "string",
-      name: "type"
-    },
-    {
-      comment: "\u914D\u7F6E\u9879",
-      type: "jsonb",
-      name: "options",
-      defaultValue: {}
-    },
-    {
-      comment: "\u6587\u4EF6\u89C4\u5219",
-      type: "jsonb",
-      name: "rules",
-      defaultValue: {}
-    },
-    {
-      comment: "\u5B58\u50A8\u76F8\u5BF9\u8DEF\u5F84\u6A21\u677F",
-      type: "text",
-      name: "path",
-      defaultValue: ""
-    },
-    {
-      comment: "\u8BBF\u95EE\u5730\u5740\u524D\u7F00",
-      type: "string",
-      name: "baseUrl",
-      defaultValue: ""
-    },
-    // TODO(feature): 需要使用一个实现了可设置默认值的字段
-    {
-      comment: "\u9ED8\u8BA4\u5F15\u64CE",
-      type: "radio",
-      name: "default",
-      defaultValue: false
-    },
-    {
-      type: "boolean",
-      name: "paranoid",
-      defaultValue: false
-    }
-  ]
-});
+var import_storages = __toESM(require("../../common/collections/storages"));
+var storages_default = import_storages.default;

package/dist/server/index.d.ts

@@ -9,5 +9,6 @@
 import { StorageEngine } from 'multer';
 export * from '../constants';
 export { AttachmentModel, default, PluginFileManagerServer, StorageModel } from './server';
+export { cloudFilenameGetter } from './utils';
 export { StorageType } from './storages';
 export { StorageEngine };

package/dist/server/index.js

@@ -42,12 +42,14 @@ __export(server_exports, {
   StorageEngine: () => import_multer.StorageEngine,
   StorageModel: () => import_server.StorageModel,
   StorageType: () => import_storages.StorageType,
+  cloudFilenameGetter: () => import_utils.cloudFilenameGetter,
   default: () => import_server.default
 });
 module.exports = __toCommonJS(server_exports);
 var import_multer = require("multer");
 __reExport(server_exports, require("../constants"), module.exports);
 var import_server = __toESM(require("./server"));
+var import_utils = require("./utils");
 var import_storages = require("./storages");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -56,5 +58,6 @@ var import_storages = require("./storages");
   StorageEngine,
   StorageModel,
   StorageType,
+  cloudFilenameGetter,
   ...require("../constants")
 });

package/dist/server/server.d.ts

@@ -6,9 +6,11 @@
  * 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 { Model, Transactionable } from '@nocobase/database';
 import { Plugin } from '@nocobase/server';
 import { Registry } from '@nocobase/utils';
-import { Model, Transactionable } from '@nocobase/database';
+import { Readable } from 'stream';
 import { AttachmentModel, StorageClassType, StorageModel } from './storages';
 export type * from './storages';
 export type FileRecordOptions = {
@@ -29,7 +31,16 @@ export declare class PluginFileManagerServer extends Plugin {
     registerStorageType(type: string, Type: StorageClassType): void;
     createFileRecord(options: FileRecordOptions): Promise<any>;
     parseStorage(instance: any): any;
-    uploadFile(options: UploadFileOptions): Promise<any>;
+    uploadFile(options: UploadFileOptions): Promise<{
+        title: string;
+        filename: string;
+        extname: string;
+        path: string;
+        size: any;
+        mimetype: any;
+        meta: {};
+        storageId: number;
+    }>;
     loadStorages(options?: {
         transaction: any;
     }): Promise<void>;
@@ -37,6 +48,11 @@ export declare class PluginFileManagerServer extends Plugin {
     handleSyncMessage(message: any): Promise<void>;
     beforeLoad(): Promise<void>;
     load(): Promise<void>;
-    getFileURL(file: AttachmentModel, preview?: boolean): Promise<string>;
+    getFileURL(file: AttachmentModel, preview?: boolean): Promise<any>;
+    isPublicAccessStorage(storageName: any): Promise<boolean>;
+    getFileStream(file: AttachmentModel): Promise<{
+        stream: Readable;
+        contentType?: string;
+    }>;
 }
 export default PluginFileManagerServer;

package/dist/server/server.js

@@ -40,14 +40,14 @@ __export(server_exports, {
   default: () => server_default
 });
 module.exports = __toCommonJS(server_exports);
-var import_server = require("@nocobase/server");
-var import_utils = require("@nocobase/utils");
+var import_fs = __toESM(require("fs"));
 var import_path = require("path");
+var import_mime_match = __toESM(require("mime-match"));
 var import_database = require("@nocobase/database");
-var import_fs = __toESM(require("fs"));
+var import_server = require("@nocobase/server");
+var import_utils = require("@nocobase/utils");
 var import_constants = require("../constants");
 var import_actions = __toESM(require("./actions"));
-var import_attachments = require("./actions/attachments");
 var import_attachment_interface = require("./interfaces/attachment-interface");
 var import_ali_oss = __toESM(require("./storages/ali-oss"));
 var import_local = __toESM(require("./storages/local"));
@@ -111,29 +111,24 @@ class PluginFileManagerServer extends import_server.Plugin {
   }
   async uploadFile(options) {
     const { storageName, filePath, documentRoot } = options;
-    const storageRepository = this.db.getRepository("storages");
-    let storageInstance;
-    storageInstance = await storageRepository.findOne({
-      filter: storageName ? {
-        name: storageName
-      } : {
-        default: true
-      }
-    });
-    const fileStream = import_fs.default.createReadStream(filePath);
-    if (!storageInstance) {
+    if (!this.storagesCache.size) {
+      await this.loadStorages();
+    }
+    const storages = Array.from(this.storagesCache.values());
+    const storage = storages.find((item) => item.name === storageName) || storages.find((item) => item.default);
+    if (!storage) {
       throw new Error("[file-manager] no linked or default storage provided");
     }
-    storageInstance = this.parseStorage(storageInstance);
+    const fileStream = import_fs.default.createReadStream(filePath);
     if (documentRoot) {
-      storageInstance.options["documentRoot"] = documentRoot;
+      storage.options["documentRoot"] = documentRoot;
     }
-    const storageType = this.storageTypes.get(storageInstance.type);
-    const storage = new storageType(storageInstance);
-    if (!storage) {
-      throw new Error(`[file-manager] storage type "${storageInstance.type}" is not defined`);
+    const StorageType = this.storageTypes.get(storage.type);
+    const storageInstance = new StorageType(storage);
+    if (!storageInstance) {
+      throw new Error(`[file-manager] storage type "${storage.type}" is not defined`);
     }
-    const engine = storage.make();
+    const engine = storageInstance.make();
     const file = {
       originalname: (0, import_path.basename)(filePath),
       path: filePath,
@@ -148,7 +143,7 @@ class PluginFileManagerServer extends import_server.Plugin {
         resolve(info);
       });
     });
-    return (0, import_attachments.getFileData)({ app: this.app, file, storage: storageInstance, request: { body: {} } });
+    return storageInstance.getFileData(file, {});
   }
   async loadStorages(options) {
     const repository = this.db.getRepository("storages");
@@ -181,17 +176,8 @@ class PluginFileManagerServer extends import_server.Plugin {
     }
   }
   async handleSyncMessage(message) {
-    if (message.type === "storageChange") {
-      const storage = await this.db.getRepository("storages").findOne({
-        filterByTk: message.storageId
-      });
-      if (storage) {
-        this.storagesCache.set(storage.id, this.parseStorage(storage));
-      }
-    }
-    if (message.type === "storageRemove") {
-      const id = message.storageId;
-      this.storagesCache.delete(id);
+    if (message.type === "reloadStorages") {
+      await this.loadStorages();
     }
   }
   async beforeLoad() {
@@ -226,17 +212,11 @@ class PluginFileManagerServer extends import_server.Plugin {
     this.storageTypes.register(import_constants.STORAGE_TYPE_S3, import_s3.default);
     this.storageTypes.register(import_constants.STORAGE_TYPE_TX_COS, import_tx_cos.default);
     const Storage = this.db.getModel("storages");
-    Storage.afterSave((m, { transaction }) => {
-      this.storagesCache.set(m.id, m.toJSON());
-      this.sendSyncMessage(
-        {
-          type: "storageChange",
-          storageId: m.id
-        },
-        { transaction }
-      );
+    Storage.afterSave(async (m, { transaction }) => {
+      await this.loadStorages({ transaction });
+      this.sendSyncMessage({ type: "reloadStorages" }, { transaction });
     });
-    Storage.afterDestroy((m, { transaction }) => {
+    Storage.afterDestroy(async (m, { transaction }) => {
       var _a, _b;
       for (const collection of this.db.collections.values()) {
         if (((_a = collection == null ? void 0 : collection.options) == null ? void 0 : _a.template) === "file" && ((_b = collection == null ? void 0 : collection.options) == null ? void 0 : _b.storage) === m.name) {
@@ -247,14 +227,8 @@ class PluginFileManagerServer extends import_server.Plugin {
           );
         }
       }
-      this.storagesCache.delete(m.id);
-      this.sendSyncMessage(
-        {
-          type: "storageRemove",
-          storageId: m.id
-        },
-        { transaction }
-      );
+      await this.loadStorages({ transaction });
+      this.sendSyncMessage({ type: "reloadStorages" }, { transaction });
     });
     this.app.acl.registerSnippet({
       name: `pm.${this.name}.storages`,
@@ -311,7 +285,50 @@ class PluginFileManagerServer extends import_server.Plugin {
       return (0, import_utils2.encodeURL)(file.url);
     }
     const storageType = this.storageTypes.get(storage.type);
-    return new storageType(storage).getFileURL(file, preview ? storage.options.thumbnailRule : "");
+    return new storageType(storage).getFileURL(
+      file,
+      Boolean(file.mimetype && (0, import_mime_match.default)(file.mimetype, "image/*") && preview && storage.options.thumbnailRule)
+    );
+  }
+  async isPublicAccessStorage(storageName) {
+    var _a;
+    const storageRepository = this.db.getRepository("storages");
+    const storages = await storageRepository.findOne({
+      filter: { default: true }
+    });
+    let storage;
+    if (!storageName) {
+      storage = storages;
+    } else {
+      storage = await storageRepository.findOne({
+        filter: {
+          name: storageName
+        }
+      });
+    }
+    storage = this.parseStorage(storage);
+    if (["local", "ali-oss", "s3", "tx-cos"].includes(storage.type)) {
+      return true;
+    }
+    return !!((_a = storage.options) == null ? void 0 : _a.public);
+  }
+  async getFileStream(file) {
+    if (!file.storageId) {
+      throw new Error("File storageId not found");
+    }
+    const storage = this.storagesCache.get(file.storageId);
+    if (!storage) {
+      throw new Error("[file-manager] no linked or default storage provided");
+    }
+    const StorageType = this.storageTypes.get(storage.type);
+    if (!StorageType) {
+      throw new Error(`[file-manager] storage type "${storage.type}" is not defined`);
+    }
+    const storageInstance = new StorageType(storage);
+    if (!storageInstance) {
+      throw new Error(`[file-manager] storage type "${storage.type}" is not defined`);
+    }
+    return storageInstance.getFileStream(file);
   }
 }
 var server_default = PluginFileManagerServer;

package/dist/server/storages/ali-oss.js

@@ -50,7 +50,7 @@ class ali_oss_default extends import__.StorageType {
   make() {
     const createAliOssStorage = require("multer-aliyun-oss");
     return new createAliOssStorage({
-      config: this.storage.options,
+      config: { timeout: 6e5, ...this.storage.options },
       filename: (0, import_utils.cloudFilenameGetter)(this.storage)
     });
   }

package/dist/server/storages/index.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 { StorageEngine } from 'multer';
+import type { Readable } from 'stream';
 export interface StorageModel {
     id?: number;
     title: string;
@@ -22,8 +24,9 @@ export interface StorageModel {
 export interface AttachmentModel {
     title: string;
     filename: string;
+    mimetype?: string;
     path: string;
-    url: string;
+    url?: string;
     storageId: number;
 }
 export declare abstract class StorageType {
@@ -34,12 +37,21 @@ export declare abstract class StorageType {
     abstract make(): StorageEngine;
     abstract delete(records: AttachmentModel[]): [number, AttachmentModel[]] | Promise<[number, AttachmentModel[]]>;
     getFileKey(record: AttachmentModel): any;
-    getFileData?(file: {
-        [key: string]: any;
-    }): {
-        [key: string]: any;
+    getFileData(file: any, meta?: {}): {
+        title: string;
+        filename: string;
+        extname: string;
+        path: string;
+        size: any;
+        mimetype: any;
+        meta: {};
+        storageId: number;
     };
     getFileURL(file: AttachmentModel, preview?: boolean): string | Promise<string>;
+    getFileStream(file: AttachmentModel): Promise<{
+        stream: Readable;
+        contentType?: string;
+    }>;
 }
 export type StorageClassType = {
     new (storage: StorageModel): StorageType;