@nocobase/plugin-file-manager 2.1.0-beta.37 → 2.1.0-beta.40

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

@@ -24,6 +24,7 @@ export interface StorageModel {
     settings?: Record<string, any>;
 }
 export interface AttachmentModel {
+    id?: number;
     title: string;
     filename: string;
     mimetype?: string;
@@ -38,6 +39,8 @@ export declare abstract class StorageType {
     constructor(storage: StorageModel);
     abstract make(): StorageEngine;
     abstract delete(records: AttachmentModel[]): [number, AttachmentModel[]] | Promise<[number, AttachmentModel[]]>;
+    exists(record: AttachmentModel): Promise<boolean>;
+    copy(source: AttachmentModel, target: AttachmentModel): Promise<void>;
     getFileKey(record: AttachmentModel): any;
     getFileData(file: any, meta?: {}): {
         title: string;

package/dist/server/storages/index.js

@@ -52,6 +52,12 @@ class StorageType {
     return {};
   }
   static filenameKey;
+  async exists(record) {
+    throw new Error(`Storage type "${this.storage.type}" does not support object existence checks`);
+  }
+  async copy(source, target) {
+    throw new Error(`Storage type "${this.storage.type}" does not support object copy`);
+  }
   getFileKey(record) {
     return (0, import_utils2.getFileKey)(record);
   }

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

@@ -27,6 +27,8 @@ export default class extends StorageType {
         };
     };
     make(): multer.StorageEngine;
+    exists(record: AttachmentModel): Promise<boolean>;
+    copy(source: AttachmentModel, target: AttachmentModel): Promise<void>;
     delete(records: AttachmentModel[]): Promise<[number, AttachmentModel[]]>;
     getFileURL(file: AttachmentModel, preview?: boolean): Promise<any>;
     getFileStream(file: AttachmentModel): Promise<{

package/dist/server/storages/local.js

@@ -96,6 +96,24 @@ class local_default extends import__.StorageType {
       filename: (0, import_utils2.diskFilenameGetter)(this.storage)
     });
   }
+  async exists(record) {
+    try {
+      await import_promises.default.stat(resolveSafePath(getDocumentRoot(this.storage), record.path, record.filename));
+      return true;
+    } catch (error) {
+      if (error.code === "ENOENT") {
+        return false;
+      }
+      throw error;
+    }
+  }
+  async copy(source, target) {
+    const documentRoot = getDocumentRoot(this.storage);
+    const sourcePath = resolveSafePath(documentRoot, source.path, source.filename);
+    const targetPath = resolveSafePath(documentRoot, target.path, target.filename);
+    await import_promises.default.mkdir(import_path.default.dirname(targetPath), { recursive: true });
+    await import_promises.default.copyFile(sourcePath, targetPath);
+  }
   async delete(records) {
     const documentRoot = getDocumentRoot(this.storage);
     let count = 0;

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

@@ -32,5 +32,7 @@ export default class extends StorageType {
     deleteS3Objects(bucketName: string, objects: string[]): Promise<{
         Deleted: any[];
     }>;
+    exists(record: AttachmentModel): Promise<boolean>;
+    copy(source: AttachmentModel, target: AttachmentModel): Promise<void>;
     delete(records: AttachmentModel[]): Promise<[number, AttachmentModel[]]>;
 }

package/dist/server/storages/s3.js

@@ -173,6 +173,32 @@ class s3_default extends import__.StorageType {
       Deleted
     };
   }
+  async exists(record) {
+    try {
+      await this.client.send(
+        new import_client_s3.HeadObjectCommand({
+          Bucket: this.storage.options.bucket,
+          Key: this.getFileKey(record)
+        })
+      );
+      return true;
+    } catch (error) {
+      if (["NotFound", "NoSuchKey", "NoSuchBucket"].includes(error.name)) {
+        return false;
+      }
+      throw error;
+    }
+  }
+  async copy(source, target) {
+    const sourceKey = this.getFileKey(source);
+    await this.client.send(
+      new import_client_s3.CopyObjectCommand({
+        Bucket: this.storage.options.bucket,
+        Key: this.getFileKey(target),
+        CopySource: `${this.storage.options.bucket}/${sourceKey.split("/").map((segment) => encodeURIComponent(segment)).join("/")}`
+      })
+    );
+  }
   async delete(records) {
     const { Deleted } = await this.deleteS3Objects(
       this.storage.options.bucket,

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

@@ -36,6 +36,8 @@ export default class extends StorageType {
     };
     static filenameKey: string;
     make(): TxCosStorage;
+    exists(record: AttachmentModel): Promise<boolean>;
+    copy(source: AttachmentModel, target: AttachmentModel): Promise<void>;
     delete(records: AttachmentModel[]): Promise<[number, AttachmentModel[]]>;
 }
 export {};

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

@@ -160,6 +160,33 @@ class tx_cos_default extends import__.StorageType {
       filename: (0, import_utils.cloudFilenameGetter)(this.storage)
     });
   }
+  async exists(record) {
+    const { cos } = this.make();
+    try {
+      await (0, import_util.promisify)(cos.headObject).call(cos, {
+        Region: this.storage.options.Region,
+        Bucket: this.storage.options.Bucket,
+        Key: (0, import_utils.getFileKey)(record)
+      });
+      return true;
+    } catch (error) {
+      if (["NoSuchKey", "NotFound"].includes(error.name)) {
+        return false;
+      }
+      throw error;
+    }
+  }
+  async copy(source, target) {
+    const { cos } = this.make();
+    const sourceKey = (0, import_utils.getFileKey)(source);
+    const copySource = `${this.storage.options.Bucket}.cos.${this.storage.options.Region}.myqcloud.com/${sourceKey.split("/").map((segment) => encodeURIComponent(segment)).join("/")}`;
+    await (0, import_util.promisify)(cos.putObjectCopy).call(cos, {
+      Region: this.storage.options.Region,
+      Bucket: this.storage.options.Bucket,
+      Key: (0, import_utils.getFileKey)(target),
+      CopySource: copySource
+    });
+  }
   async delete(records) {
     const { cos } = this.make();
     const { Deleted } = await (0, import_util.promisify)(cos.deleteMultipleObject).call(cos, {

package/dist/server/utils.js

@@ -49,6 +49,13 @@ var import_utils = require("@nocobase/utils");
 var import_crypto = __toESM(require("crypto"));
 var import_path = __toESM(require("path"));
 var import_url_join = __toESM(require("url-join"));
+const INVALID_FILENAME_CHARS = /* @__PURE__ */ new Set(["<", ">", "?", "*", "|", ":", '"', "\\", "/"]);
+function sanitizeFilename(value) {
+  return Array.from(value).map((char) => {
+    const code = char.charCodeAt(0);
+    return code < 32 || code === 127 || INVALID_FILENAME_CHARS.has(char) ? "-" : char;
+  }).join("");
+}
 function normalizeOriginalname(file) {
   const originalname = file == null ? void 0 : file.originalname;
   if (!originalname) {
@@ -57,6 +64,9 @@ function normalizeOriginalname(file) {
   if (Buffer.isBuffer(originalname)) {
     return originalname.toString("utf8");
   }
+  if (Array.from(originalname).some((char) => char.charCodeAt(0) > 255)) {
+    return originalname;
+  }
   const decoded = Buffer.from(originalname, "binary").toString("utf8");
   if (decoded.includes("\uFFFD")) {
     return originalname;
@@ -65,13 +75,13 @@ function normalizeOriginalname(file) {
 }
 function getFilename(req, file, cb) {
   const originalname = normalizeOriginalname(file);
-  const baseName = import_path.default.basename(originalname.replace(/[<>?*|:"\\/]/g, "-"), import_path.default.extname(originalname));
+  const baseName = import_path.default.basename(sanitizeFilename(originalname), import_path.default.extname(originalname));
   cb(null, `${baseName}-${(0, import_utils.uid)(6)}${import_path.default.extname(originalname)}`);
 }
 function getOriginalFilename(file) {
   const originalname = normalizeOriginalname(file);
   const extname = import_path.default.extname(originalname);
-  const baseName = import_path.default.basename(originalname.replace(/[<>?*|:"\\/]/g, "-"), extname);
+  const baseName = import_path.default.basename(sanitizeFilename(originalname), extname);
   return `${baseName}${extname}`;
 }
 const cloudFilenameGetter = (storage) => (req, file, cb) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-file-manager",
-  "version": "2.1.0-beta.37",
+  "version": "2.1.0-beta.40",
   "displayName": "File manager",
   "displayName.ru-RU": "Менеджер файлов",
   "displayName.zh-CN": "文件管理器",
@@ -27,7 +27,6 @@
     "antd": "5.x",
     "axios": "^1.7.0",
     "cos-nodejs-sdk-v5": "^2.11.14",
-    "file-type": "^21.0.0",
     "koa-static": "^5.0.0",
     "mime-match": "^1.0.2",
     "mime-types": "^3.0.1",
@@ -41,6 +40,9 @@
     "supertest": "^6.1.6",
     "url-join": "4.0.1"
   },
+  "dependencies": {
+    "file-type": "^21.0.0"
+  },
   "peerDependencies": {
     "@nocobase/actions": "2.x",
     "@nocobase/client": "2.x",
@@ -48,6 +50,7 @@
     "@nocobase/database": "2.x",
     "@nocobase/flow-engine": "2.x",
     "@nocobase/plugin-data-source-main": "2.x",
+    "@nocobase/plugin-data-source-manager": "2.x",
     "@nocobase/plugin-environment-variables": "2.x",
     "@nocobase/server": "2.x",
     "@nocobase/test": "2.x",
@@ -57,5 +60,5 @@
     "Collections",
     "Collection fields"
   ],
-  "gitHead": "7132e5b83ecc0e42b54715eaf1429c72bcef34ae"
+  "gitHead": "36e906138f6305723abbef676a61006058feb5ea"
 }