@nocobase/plugin-file-manager 1.0.0-alpha.9 → 1.0.1-alpha.1

package/dist/server/server.js

@@ -36,33 +36,37 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var server_exports = {};
 __export(server_exports, {
-  default: () => PluginFileManagerServer,
-  storageTypes: () => import_storages2.default
+  default: () => PluginFileManagerServer
 });
 module.exports = __toCommonJS(server_exports);
-var import_server = require("@nocobase/server");
 var import_path = require("path");
+var import_server = require("@nocobase/server");
+var import_utils = require("@nocobase/utils");
 var import_FileModel = require("./FileModel");
 var import_actions = __toESM(require("./actions"));
-var import_storages = require("./storages");
-var import_storages2 = __toESM(require("./storages"));
+var import_constants = require("../constants");
+var import_local = __toESM(require("./storages/local"));
+var import_ali_oss = __toESM(require("./storages/ali-oss"));
+var import_s3 = __toESM(require("./storages/s3"));
+var import_tx_cos = __toESM(require("./storages/tx-cos"));
+var import_attachment_interface = require("./interfaces/attachment-interface");
+const DEFAULT_STORAGE_TYPE = import_constants.STORAGE_TYPE_LOCAL;
 class PluginFileManagerServer extends import_server.Plugin {
-  storageType() {
-    return "local";
-  }
+  storageTypes = new import_utils.Registry();
+  storagesCache = /* @__PURE__ */ new Map();
   async loadStorages(options) {
     const repository = this.db.getRepository("storages");
     const storages = await repository.find({
       transaction: options == null ? void 0 : options.transaction
     });
-    const map = /* @__PURE__ */ new Map();
+    this.storagesCache = /* @__PURE__ */ new Map();
     for (const storage of storages) {
-      map.set(storage.get("id"), storage.toJSON());
+      this.storagesCache.set(storage.get("id"), storage.toJSON());
     }
-    this.db["_fileStorages"] = map;
+    this.db["_fileStorages"] = this.storagesCache;
   }
   async install() {
-    const defaultStorageConfig = (0, import_storages.getStorageConfig)(this.storageType());
+    const defaultStorageConfig = this.storageTypes.get(DEFAULT_STORAGE_TYPE);
     if (defaultStorageConfig) {
       const Storage = this.db.getCollection("storages");
       if (await Storage.repository.findOne({
@@ -75,7 +79,7 @@ class PluginFileManagerServer extends import_server.Plugin {
       await Storage.repository.create({
         values: {
           ...defaultStorageConfig.defaults(),
-          type: this.storageType(),
+          type: DEFAULT_STORAGE_TYPE,
           default: true
         }
       });
@@ -93,13 +97,19 @@ class PluginFileManagerServer extends import_server.Plugin {
     });
   }
   async load() {
-    await this.importCollections((0, import_path.resolve)(__dirname, "./collections"));
+    this.storageTypes.register(import_constants.STORAGE_TYPE_LOCAL, new import_local.default());
+    this.storageTypes.register(import_constants.STORAGE_TYPE_ALI_OSS, new import_ali_oss.default());
+    this.storageTypes.register(import_constants.STORAGE_TYPE_S3, new import_s3.default());
+    this.storageTypes.register(import_constants.STORAGE_TYPE_TX_COS, new import_tx_cos.default());
+    await this.db.import({
+      directory: (0, import_path.resolve)(__dirname, "./collections")
+    });
     const Storage = this.db.getModel("storages");
-    Storage.afterSave(async (m, { transaction }) => {
-      await this.loadStorages({ transaction });
+    Storage.afterSave((m) => {
+      this.storagesCache.set(m.id, m.toJSON());
     });
-    Storage.afterDestroy(async (m, { transaction }) => {
-      await this.loadStorages({ transaction });
+    Storage.afterDestroy((m) => {
+      this.storagesCache.delete(m.id);
     });
     this.app.acl.registerSnippet({
       name: `pm.${this.name}.storages`,
@@ -115,7 +125,8 @@ class PluginFileManagerServer extends import_server.Plugin {
     (0, import_actions.default)(this);
     this.app.acl.allow("attachments", "upload", "loggedIn");
     this.app.acl.allow("attachments", "create", "loggedIn");
-    const defaultStorageName = (0, import_storages.getStorageConfig)(this.storageType()).defaults().name;
+    this.app.acl.allow("storages", "getRules", "loggedIn");
+    const defaultStorageName = this.storageTypes.get(DEFAULT_STORAGE_TYPE).defaults().name;
     this.app.acl.addFixedParams("storages", "destroy", () => {
       return {
         filter: { "name.$ne": defaultStorageName }
@@ -131,9 +142,6 @@ class PluginFileManagerServer extends import_server.Plugin {
     this.app.acl.addFixedParams("attachments", "update", ownMerger);
     this.app.acl.addFixedParams("attachments", "create", ownMerger);
     this.app.acl.addFixedParams("attachments", "destroy", ownMerger);
+    this.app.db.interfaceManager.registerInterfaceType("attachment", import_attachment_interface.AttachmentInterface);
   }
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  storageTypes
-});

package/dist/server/storages/ali-oss.d.ts

@@ -6,8 +6,8 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import { AttachmentModel } from '.';
-declare const _default: {
+import { AttachmentModel, StorageType } from '.';
+export default class extends StorageType {
     make(storage: any): any;
     defaults(): {
         title: string;
@@ -22,5 +22,4 @@ declare const _default: {
         };
     };
     delete(storage: any, records: AttachmentModel[]): Promise<[number, AttachmentModel[]]>;
-};
-export default _default;
+}

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

@@ -29,16 +29,17 @@ __export(ali_oss_exports, {
   default: () => ali_oss_default
 });
 module.exports = __toCommonJS(ali_oss_exports);
-var import_constants = require("../constants");
+var import__ = require(".");
+var import_constants = require("../../constants");
 var import_utils = require("../utils");
-var ali_oss_default = {
+class ali_oss_default extends import__.StorageType {
   make(storage) {
     const createAliOssStorage = require("multer-aliyun-oss");
     return new createAliOssStorage({
       config: storage.options,
       filename: (0, import_utils.cloudFilenameGetter)(storage)
     });
-  },
+  }
   defaults() {
     return {
       title: "\u963F\u91CC\u4E91\u5BF9\u8C61\u5B58\u50A8",
@@ -52,13 +53,10 @@ var ali_oss_default = {
         bucket: process.env.ALI_OSS_BUCKET
       }
     };
-  },
+  }
   async delete(storage, records) {
     const { client } = this.make(storage);
-    const { deleted } = await client.deleteMulti(records.map((record) => `${record.path}/${record.filename}`));
-    return [
-      deleted.length,
-      records.filter((record) => !deleted.find((item) => item.Key === `${record.path}/${record.filename}`))
-    ];
+    const { deleted } = await client.deleteMulti(records.map(import_utils.getFileKey));
+    return [deleted.length, records.filter((record) => !deleted.find((item) => item.Key === (0, import_utils.getFileKey)(record)))];
   }
-};
+}

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

@@ -8,16 +8,17 @@
  */
 import { StorageEngine } from 'multer';
 import Application from '@nocobase/server';
-import { Registry } from '@nocobase/utils';
 export interface StorageModel {
+    id?: number;
     title: string;
     type: string;
     name: string;
     baseUrl: string;
-    options: {
-        [key: string]: string;
-    };
-    deleteFileOnDestroy?: boolean;
+    options: Record<string, any>;
+    rules?: Record<string, any>;
+    path?: string;
+    default?: boolean;
+    paranoid?: boolean;
 }
 export interface AttachmentModel {
     title: string;
@@ -36,6 +37,8 @@ export interface IStorage {
     defaults(): StorageModel;
     delete(storage: StorageModel, records: AttachmentModel[]): Promise<[number, AttachmentModel[]]>;
 }
-declare const storageTypes: Registry<IStorage>;
-export declare function getStorageConfig(key: string): IStorage;
-export default storageTypes;
+export declare abstract class StorageType implements IStorage {
+    abstract make(storage: StorageModel): StorageEngine;
+    abstract defaults(): StorageModel;
+    abstract delete(storage: StorageModel, records: AttachmentModel[]): Promise<[number, AttachmentModel[]]>;
+}

package/dist/server/storages/index.js

@@ -7,11 +7,9 @@
  * 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)
@@ -25,37 +23,15 @@ 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,
-  getStorageConfig: () => getStorageConfig
+  StorageType: () => StorageType
 });
 module.exports = __toCommonJS(storages_exports);
-var import_utils = require("@nocobase/utils");
-var import_local = __toESM(require("./local"));
-var import_ali_oss = __toESM(require("./ali-oss"));
-var import_s3 = __toESM(require("./s3"));
-var import_tx_cos = __toESM(require("./tx-cos"));
-var import_constants = require("../constants");
-const storageTypes = new import_utils.Registry();
-storageTypes.register(import_constants.STORAGE_TYPE_LOCAL, import_local.default);
-storageTypes.register(import_constants.STORAGE_TYPE_ALI_OSS, import_ali_oss.default);
-storageTypes.register(import_constants.STORAGE_TYPE_S3, import_s3.default);
-storageTypes.register(import_constants.STORAGE_TYPE_TX_COS, import_tx_cos.default);
-function getStorageConfig(key) {
-  return storageTypes.get(key);
+class StorageType {
 }
-var storages_default = storageTypes;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getStorageConfig
+  StorageType
 });

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

@@ -7,8 +7,8 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import multer from 'multer';
-import { AttachmentModel } from '.';
-declare const _default: {
+import { AttachmentModel, StorageType } from '.';
+export default class extends StorageType {
     make(storage: any): multer.StorageEngine;
     defaults(): {
         title: string;
@@ -18,7 +18,9 @@ declare const _default: {
         options: {
             documentRoot: string;
         };
+        rules: {
+            size: number;
+        };
     };
     delete(storage: any, records: AttachmentModel[]): Promise<[number, AttachmentModel[]]>;
-};
-export default _default;
+}

package/dist/server/storages/local.js

@@ -43,13 +43,14 @@ 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_constants = require("../constants");
+var import__ = require(".");
+var import_constants = require("../../constants");
 var import_utils = require("../utils");
 function getDocumentRoot(storage) {
   const { documentRoot = process.env.LOCAL_STORAGE_DEST || "storage/uploads" } = storage.options || {};
   return import_path.default.resolve(import_path.default.isAbsolute(documentRoot) ? documentRoot : import_path.default.join(process.cwd(), documentRoot));
 }
-var local_default = {
+class local_default extends import__.StorageType {
   make(storage) {
     return import_multer.default.diskStorage({
       destination: function(req, file, cb) {
@@ -58,7 +59,7 @@ var local_default = {
       },
       filename: import_utils.getFilename
     });
-  },
+  }
   defaults() {
     return {
       title: "Local storage",
@@ -67,9 +68,12 @@ var local_default = {
       baseUrl: "/storage/uploads",
       options: {
         documentRoot: "storage/uploads"
+      },
+      rules: {
+        size: import_constants.FILE_SIZE_LIMIT_DEFAULT
       }
     };
-  },
+  }
   async delete(storage, records) {
     const documentRoot = getDocumentRoot(storage);
     let count = 0;
@@ -93,4 +97,4 @@ var local_default = {
     );
     return [count, undeleted];
   }
-};
+}

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

@@ -6,8 +6,8 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import { AttachmentModel } from '.';
-declare const _default: {
+import { AttachmentModel, StorageType } from '.';
+export default class extends StorageType {
     filenameKey: string;
     make(storage: any): any;
     defaults(): {
@@ -23,5 +23,4 @@ declare const _default: {
         };
     };
     delete(storage: any, records: AttachmentModel[]): Promise<[number, AttachmentModel[]]>;
-};
-export default _default;
+}

package/dist/server/storages/s3.js

@@ -29,10 +29,11 @@ __export(s3_exports, {
   default: () => s3_default
 });
 module.exports = __toCommonJS(s3_exports);
-var import_constants = require("../constants");
+var import__ = require(".");
+var import_constants = require("../../constants");
 var import_utils = require("../utils");
-var s3_default = {
-  filenameKey: "key",
+class s3_default extends import__.StorageType {
+  filenameKey = "key";
   make(storage) {
     const { S3Client } = require("@aws-sdk/client-s3");
     const multerS3 = require("multer-s3");
@@ -57,7 +58,7 @@ var s3_default = {
       },
       key: (0, import_utils.cloudFilenameGetter)(storage)
     });
-  },
+  }
   defaults() {
     return {
       title: "AWS S3",
@@ -71,7 +72,7 @@ var s3_default = {
         bucket: process.env.AWS_S3_BUCKET
       }
     };
-  },
+  }
   async delete(storage, records) {
     const { DeleteObjectsCommand } = require("@aws-sdk/client-s3");
     const { s3 } = this.make(storage);
@@ -79,13 +80,10 @@ var s3_default = {
       new DeleteObjectsCommand({
         Bucket: storage.options.bucket,
         Delete: {
-          Objects: records.map((record) => ({ Key: `${record.path}/${record.filename}` }))
+          Objects: records.map((record) => ({ Key: (0, import_utils.getFileKey)(record) }))
         }
       })
     );
-    return [
-      Deleted.length,
-      records.filter((record) => !Deleted.find((item) => item.Key === `${record.path}/${record.filename}`))
-    ];
+    return [Deleted.length, records.filter((record) => !Deleted.find((item) => item.Key === (0, import_utils.getFileKey)(record)))];
   }
-};
+}

package/dist/server/storages/tx-cos.d.ts

@@ -6,8 +6,8 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import { AttachmentModel } from '.';
-declare const _default: {
+import { AttachmentModel, StorageType } from '.';
+export default class extends StorageType {
     filenameKey: string;
     make(storage: any): any;
     defaults(): {
@@ -23,5 +23,4 @@ declare const _default: {
         };
     };
     delete(storage: any, records: AttachmentModel[]): Promise<[number, AttachmentModel[]]>;
-};
-export default _default;
+}

package/dist/server/storages/tx-cos.js

@@ -30,17 +30,21 @@ __export(tx_cos_exports, {
 });
 module.exports = __toCommonJS(tx_cos_exports);
 var import_util = require("util");
-var import_constants = require("../constants");
+var import__ = require(".");
+var import_constants = require("../../constants");
 var import_utils = require("../utils");
-var tx_cos_default = {
-  filenameKey: "url",
+class tx_cos_default extends import__.StorageType {
+  filenameKey = "url";
   make(storage) {
     const createTxCosStorage = require("multer-cos");
     return new createTxCosStorage({
-      cos: storage.options,
-      filename: (0, import_utils.cloudFilenameGetter)(storage)
+      cos: {
+        ...storage.options,
+        dir: (storage.path ?? "").replace(/\/+$/, "")
+      },
+      filename: import_utils.getFilename
     });
-  },
+  }
   defaults() {
     return {
       title: "\u817E\u8BAF\u4E91\u5BF9\u8C61\u5B58\u50A8",
@@ -54,17 +58,14 @@ var tx_cos_default = {
         Bucket: process.env.TX_COS_BUCKET
       }
     };
-  },
+  }
   async delete(storage, records) {
     const { cos } = this.make(storage);
-    const { Deleted } = await (0, import_util.promisify)(cos.deleteMultipleObject)({
+    const { Deleted } = await (0, import_util.promisify)(cos.deleteMultipleObject).call(cos, {
       Region: storage.options.Region,
       Bucket: storage.options.Bucket,
-      Objects: records.map((record) => ({ Key: `${record.path}/${record.filename}` }))
+      Objects: records.map((record) => ({ Key: (0, import_utils.getFileKey)(record) }))
     });
-    return [
-      Deleted.length,
-      records.filter((record) => !Deleted.find((item) => item.Key === `${record.path}/${record.filename}`))
-    ];
+    return [Deleted.length, records.filter((record) => !Deleted.find((item) => item.Key === (0, import_utils.getFileKey)(record)))];
   }
-};
+}

package/dist/server/utils.d.ts

@@ -8,3 +8,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): string;

package/dist/server/utils.js

@@ -37,6 +37,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   cloudFilenameGetter: () => cloudFilenameGetter,
+  getFileKey: () => getFileKey,
   getFilename: () => getFilename
 });
 module.exports = __toCommonJS(utils_exports);
@@ -52,11 +53,15 @@ const cloudFilenameGetter = (storage) => (req, file, cb) => {
     if (err) {
       return cb(err);
     }
-    cb(null, `${storage.path ? `${storage.path}/` : ""}${filename}`);
+    cb(null, `${storage.path ? `${storage.path.replace(/\/+$/, "")}/` : ""}${filename}`);
   });
 };
+function getFileKey(record) {
+  return [record.path.replace(/^\/|\/$/g, ""), record.filename].filter(Boolean).join("/");
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   cloudFilenameGetter,
+  getFileKey,
   getFilename
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-file-manager",
-  "version": "1.0.0-alpha.9",
+  "version": "1.0.1-alpha.1",
   "displayName": "File manager",
   "displayName.zh-CN": "文件管理器",
   "description": "Provides files storage services with files collection template and attachment field.",
@@ -43,5 +43,5 @@
     "Collections",
     "Collection fields"
   ],
-  "gitHead": "562d6ae965317098df05db756d160e03363dcec5"
+  "gitHead": "d24aa16987a4068f857ae073fcce18f3cb490660"
 }