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

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

@@ -8,9 +8,7 @@
  */
 import { AttachmentModel, StorageType } from '.';
 export default class extends StorageType {
-    filenameKey: string;
-    make(storage: any): any;
-    defaults(): {
+    static defaults(): {
         title: string;
         name: string;
         type: string;
@@ -22,5 +20,7 @@ export default class extends StorageType {
             bucket: string;
         };
     };
-    delete(storage: any, records: AttachmentModel[]): Promise<[number, AttachmentModel[]]>;
+    static filenameKey: string;
+    make(): any;
+    delete(records: AttachmentModel[]): Promise<[number, AttachmentModel[]]>;
 }

package/dist/server/storages/s3.js

@@ -33,11 +33,25 @@ var import__ = require(".");
 var import_constants = require("../../constants");
 var import_utils = require("../utils");
 class s3_default extends import__.StorageType {
-  filenameKey = "key";
-  make(storage) {
+  static defaults() {
+    return {
+      title: "AWS S3",
+      name: "aws-s3",
+      type: import_constants.STORAGE_TYPE_S3,
+      baseUrl: process.env.AWS_S3_STORAGE_BASE_URL,
+      options: {
+        region: process.env.AWS_S3_REGION,
+        accessKeyId: process.env.AWS_ACCESS_KEY_ID,
+        secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
+        bucket: process.env.AWS_S3_BUCKET
+      }
+    };
+  }
+  static filenameKey = "key";
+  make() {
     const { S3Client } = require("@aws-sdk/client-s3");
     const multerS3 = require("multer-s3");
-    const { accessKeyId, secretAccessKey, bucket, acl = "public-read", ...options } = storage.options;
+    const { accessKeyId, secretAccessKey, bucket, acl = "public-read", ...options } = this.storage.options;
     if (options.endpoint) {
       options.forcePathStyle = true;
     } else {
@@ -61,29 +75,15 @@ class s3_default extends import__.StorageType {
         }
         multerS3.AUTO_CONTENT_TYPE(req, file, cb);
       },
-      key: (0, import_utils.cloudFilenameGetter)(storage)
+      key: (0, import_utils.cloudFilenameGetter)(this.storage)
     });
   }
-  defaults() {
-    return {
-      title: "AWS S3",
-      name: "aws-s3",
-      type: import_constants.STORAGE_TYPE_S3,
-      baseUrl: process.env.AWS_S3_STORAGE_BASE_URL,
-      options: {
-        region: process.env.AWS_S3_REGION,
-        accessKeyId: process.env.AWS_ACCESS_KEY_ID,
-        secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
-        bucket: process.env.AWS_S3_BUCKET
-      }
-    };
-  }
-  async delete(storage, records) {
+  async delete(records) {
     const { DeleteObjectsCommand } = require("@aws-sdk/client-s3");
-    const { s3 } = this.make(storage);
+    const { s3 } = this.make();
     const { Deleted } = await s3.send(
       new DeleteObjectsCommand({
-        Bucket: storage.options.bucket,
+        Bucket: this.storage.options.bucket,
         Delete: {
           Objects: records.map((record) => ({ Key: (0, import_utils.getFileKey)(record) }))
         }

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

@@ -8,9 +8,7 @@
  */
 import { AttachmentModel, StorageType } from '.';
 export default class extends StorageType {
-    filenameKey: string;
-    make(storage: any): any;
-    defaults(): {
+    static defaults(): {
         title: string;
         type: string;
         name: string;
@@ -22,5 +20,7 @@ export default class extends StorageType {
             Bucket: string;
         };
     };
-    delete(storage: any, records: AttachmentModel[]): Promise<[number, AttachmentModel[]]>;
+    static filenameKey: string;
+    make(): any;
+    delete(records: AttachmentModel[]): Promise<[number, AttachmentModel[]]>;
 }

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

@@ -34,18 +34,7 @@ var import__ = require(".");
 var import_constants = require("../../constants");
 var import_utils = require("../utils");
 class tx_cos_default extends import__.StorageType {
-  filenameKey = "url";
-  make(storage) {
-    const createTxCosStorage = require("multer-cos");
-    return new createTxCosStorage({
-      cos: {
-        ...storage.options,
-        dir: (storage.path ?? "").replace(/\/+$/, "")
-      },
-      filename: import_utils.getFilename
-    });
-  }
-  defaults() {
+  static defaults() {
     return {
       title: "\u817E\u8BAF\u4E91\u5BF9\u8C61\u5B58\u50A8",
       type: import_constants.STORAGE_TYPE_TX_COS,
@@ -59,11 +48,22 @@ class tx_cos_default extends import__.StorageType {
       }
     };
   }
-  async delete(storage, records) {
-    const { cos } = this.make(storage);
+  static filenameKey = "url";
+  make() {
+    const createTxCosStorage = require("multer-cos");
+    return new createTxCosStorage({
+      cos: {
+        ...this.storage.options,
+        dir: (this.storage.path ?? "").replace(/\/+$/, "")
+      },
+      filename: import_utils.getFilename
+    });
+  }
+  async delete(records) {
+    const { cos } = this.make();
     const { Deleted } = await (0, import_util.promisify)(cos.deleteMultipleObject).call(cos, {
-      Region: storage.options.Region,
-      Bucket: storage.options.Bucket,
+      Region: this.storage.options.Region,
+      Bucket: this.storage.options.Bucket,
       Objects: records.map((record) => ({ Key: (0, import_utils.getFileKey)(record) }))
     });
     return [Deleted.length, records.filter((record) => !Deleted.find((item) => item.Key === (0, import_utils.getFileKey)(record)))];

package/dist/server/utils.js

@@ -41,12 +41,13 @@ __export(utils_exports, {
   getFilename: () => getFilename
 });
 module.exports = __toCommonJS(utils_exports);
-var import_crypto = __toESM(require("crypto"));
+var import_utils = require("@nocobase/utils");
+var import_iconv_lite = __toESM(require("iconv-lite"));
 var import_path = __toESM(require("path"));
 function getFilename(req, file, cb) {
-  import_crypto.default.pseudoRandomBytes(16, function(err, raw) {
-    cb(err, err ? void 0 : `${raw.toString("hex")}${import_path.default.extname(file.originalname)}`);
-  });
+  const originalname = import_iconv_lite.default.decode(Buffer.from(file.originalname, "binary"), "utf8");
+  const baseName = import_path.default.basename(originalname, import_path.default.extname(originalname));
+  cb(null, `${baseName}-${(0, import_utils.uid)(6)}${import_path.default.extname(originalname)}`);
 }
 const cloudFilenameGetter = (storage) => (req, file, cb) => {
   getFilename(req, file, (err, filename) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-file-manager",
-  "version": "1.6.0-beta.9",
+  "version": "1.6.0",
   "displayName": "File manager",
   "displayName.zh-CN": "文件管理器",
   "description": "Provides files storage services with files collection template and attachment field.",
@@ -20,6 +20,7 @@
     "@types/multer": "^1.4.5",
     "antd": "5.x",
     "cos-nodejs-sdk-v5": "^2.11.14",
+    "iconv-lite": "^0.6.3",
     "koa-static": "^5.0.0",
     "mime-match": "^1.0.2",
     "mkdirp": "~0.5.4",
@@ -43,5 +44,5 @@
     "Collections",
     "Collection fields"
   ],
-  "gitHead": "eb1ff948fcf7a51175626a1a56a8b8d9b90be006"
+  "gitHead": "7422d72a4e515a11300860028a26030ed5732135"
 }