@nocobase/plugin-file-manager 1.8.0-beta.9 → 1.8.1

package/dist/node_modules/mime-types/mimeScore.js

@@ -0,0 +1,52 @@
+// 'mime-score' back-ported to CommonJS
+
+// Score RFC facets (see https://tools.ietf.org/html/rfc6838#section-3)
+var FACET_SCORES = {
+  'prs.': 100,
+  'x-': 200,
+  'x.': 300,
+  'vnd.': 400,
+  default: 900
+}
+
+// Score mime source (Logic originally from `jshttp/mime-types` module)
+var SOURCE_SCORES = {
+  nginx: 10,
+  apache: 20,
+  iana: 40,
+  default: 30 // definitions added by `jshttp/mime-db` project?
+}
+
+var TYPE_SCORES = {
+  // prefer application/xml over text/xml
+  // prefer application/rtf over text/rtf
+  application: 1,
+
+  // prefer font/woff over application/font-woff
+  font: 2,
+
+  default: 0
+}
+
+/**
+ * Get each component of the score for a mime type.  The sum of these is the
+ * total score.  The higher the score, the more "official" the type.
+ */
+module.exports = function mimeScore (mimeType, source = 'default') {
+  if (mimeType === 'application/octet-stream') {
+    return 0
+  }
+
+  const [type, subtype] = mimeType.split('/')
+
+  const facet = subtype.replace(/(\.|x-).*/, '$1')
+
+  const facetScore = FACET_SCORES[facet] || FACET_SCORES.default
+  const sourceScore = SOURCE_SCORES[source] || SOURCE_SCORES.default
+  const typeScore = TYPE_SCORES[type] || TYPE_SCORES.default
+
+  // All else being equal prefer shorter types
+  const lengthScore = 1 - mimeType.length / 100
+
+  return facetScore + sourceScore + typeScore + lengthScore
+}

package/dist/node_modules/mime-types/package.json

@@ -0,0 +1 @@
+{"name":"mime-types","description":"The ultimate javascript content-type utility.","version":"3.0.1","contributors":["Douglas Christopher Wilson <doug@somethingdoug.com>","Jeremiah Senkpiel <fishrock123@rocketmail.com> (https://searchbeam.jit.su)","Jonathan Ong <me@jongleberry.com> (http://jongleberry.com)"],"license":"MIT","keywords":["mime","types"],"repository":"jshttp/mime-types","dependencies":{"mime-db":"^1.54.0"},"devDependencies":{"eslint":"8.33.0","eslint-config-standard":"14.1.1","eslint-plugin-import":"2.27.5","eslint-plugin-markdown":"3.0.0","eslint-plugin-node":"11.1.0","eslint-plugin-promise":"6.1.1","eslint-plugin-standard":"4.1.0","mocha":"10.2.0","nyc":"15.1.0"},"files":["HISTORY.md","LICENSE","index.js","mimeScore.js"],"engines":{"node":">= 0.6"},"scripts":{"lint":"eslint .","test":"mocha --reporter spec test/test.js","test-ci":"nyc --reporter=lcov --reporter=text npm test","test-cov":"nyc --reporter=html --reporter=text npm test"},"_lastModified":"2025-07-09T08:38:42.224Z"}

package/dist/node_modules/mkdirp/package.json

@@ -1 +1 @@
-{"name":"mkdirp","description":"Recursively mkdir, like `mkdir -p`","version":"0.5.6","publishConfig":{"tag":"legacy"},"author":"James Halliday <mail@substack.net> (http://substack.net)","main":"index.js","keywords":["mkdir","directory"],"repository":{"type":"git","url":"https://github.com/substack/node-mkdirp.git"},"scripts":{"test":"tap test/*.js"},"dependencies":{"minimist":"^1.2.6"},"devDependencies":{"tap":"^16.0.1"},"bin":"bin/cmd.js","license":"MIT","files":["bin","index.js"],"_lastModified":"2025-06-17T23:39:56.309Z"}
+{"name":"mkdirp","description":"Recursively mkdir, like `mkdir -p`","version":"0.5.6","publishConfig":{"tag":"legacy"},"author":"James Halliday <mail@substack.net> (http://substack.net)","main":"index.js","keywords":["mkdir","directory"],"repository":{"type":"git","url":"https://github.com/substack/node-mkdirp.git"},"scripts":{"test":"tap test/*.js"},"dependencies":{"minimist":"^1.2.6"},"devDependencies":{"tap":"^16.0.1"},"bin":"bin/cmd.js","license":"MIT","files":["bin","index.js"],"_lastModified":"2025-07-09T08:38:46.490Z"}

package/dist/node_modules/multer-aliyun-oss/package.json

@@ -1 +1 @@
-{"name":"multer-aliyun-oss","version":"2.1.3","description":"Multer Storage for AliYun OSS","main":"index.js","scripts":{},"author":"AngusYoung","license":"ISC","repository":{"type":"git","url":"git+https://github.com/ay86/multer-aliyun-oss.git"},"keywords":["multer","storage","aliyun","oss"],"dependencies":{"ali-oss":"^6.1.0"},"_lastModified":"2025-06-17T23:39:56.229Z"}
+{"name":"multer-aliyun-oss","version":"2.1.3","description":"Multer Storage for AliYun OSS","main":"index.js","scripts":{},"author":"AngusYoung","license":"ISC","repository":{"type":"git","url":"git+https://github.com/ay86/multer-aliyun-oss.git"},"keywords":["multer","storage","aliyun","oss"],"dependencies":{"ali-oss":"^6.1.0"},"_lastModified":"2025-07-09T08:38:46.415Z"}

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

@@ -1 +1 @@
-{"_from":"multer-cos","_id":"multer-cos@1.0.2","_inBundle":false,"_integrity":"sha512-4F8P1VTCSNhiem+BFJFLe3Ixco6cIuAQ6j7U+PBRvdbBJRZgq5Q+vaDMMBWJ1HmPGOOP3AyKS5yk2f0nbFoqqA==","_location":"/multer-cos","_phantomChildren":{},"_requested":{"type":"tag","registry":true,"raw":"multer-cos","name":"multer-cos","escapedName":"multer-cos","rawSpec":"","saveSpec":null,"fetchSpec":"latest"},"_requiredBy":["#USER","/"],"_resolved":"https://registry.npmjs.org/multer-cos/-/multer-cos-1.0.2.tgz","_shasum":"95c7c06cdee1b9311675a895481f9d946de6dcf3","_spec":"multer-cos","_where":"/Users/lanbo/workplace/websocket","author":{"name":"lanbosm"},"bugs":{"url":"https://github.com/lanbosm/multer-COS/issues"},"bundleDependencies":false,"deprecated":false,"description":"Streaming multer storage engine for QCloud COS","devDependencies":{"cos-nodejs-sdk-v5":"^2.2.6","dotenv":"^5.0.1","multer":"^1.3.0"},"engines":{"node":">= 6.10.0"},"homepage":"https://github.com/lanbosm/multer-COS#readme","keywords":["express","multer","COS"],"license":"MIT","main":"index.js","name":"multer-cos","repository":{"type":"git","url":"git+ssh://git@github.com/lanbosm/multer-COS.git"},"scripts":{"test":"echo \"Error: no test specified\" && exit 1"},"version":"1.0.3","_lastModified":"2025-06-17T23:40:02.901Z"}
+{"_from":"multer-cos","_id":"multer-cos@1.0.2","_inBundle":false,"_integrity":"sha512-4F8P1VTCSNhiem+BFJFLe3Ixco6cIuAQ6j7U+PBRvdbBJRZgq5Q+vaDMMBWJ1HmPGOOP3AyKS5yk2f0nbFoqqA==","_location":"/multer-cos","_phantomChildren":{},"_requested":{"type":"tag","registry":true,"raw":"multer-cos","name":"multer-cos","escapedName":"multer-cos","rawSpec":"","saveSpec":null,"fetchSpec":"latest"},"_requiredBy":["#USER","/"],"_resolved":"https://registry.npmjs.org/multer-cos/-/multer-cos-1.0.2.tgz","_shasum":"95c7c06cdee1b9311675a895481f9d946de6dcf3","_spec":"multer-cos","_where":"/Users/lanbo/workplace/websocket","author":{"name":"lanbosm"},"bugs":{"url":"https://github.com/lanbosm/multer-COS/issues"},"bundleDependencies":false,"deprecated":false,"description":"Streaming multer storage engine for QCloud COS","devDependencies":{"cos-nodejs-sdk-v5":"^2.2.6","dotenv":"^5.0.1","multer":"^1.3.0"},"engines":{"node":">= 6.10.0"},"homepage":"https://github.com/lanbosm/multer-COS#readme","keywords":["express","multer","COS"],"license":"MIT","main":"index.js","name":"multer-cos","repository":{"type":"git","url":"git+ssh://git@github.com/lanbosm/multer-COS.git"},"scripts":{"test":"echo \"Error: no test specified\" && exit 1"},"version":"1.0.3","_lastModified":"2025-07-09T08:38:53.031Z"}

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-06-17T23:39:59.381Z"}
+{"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-07-09T08:38:49.290Z"}

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-06-17T23:39:51.723Z"}
+{"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-07-09T08:38:42.035Z"}

package/dist/server/actions/attachments.js

@@ -39,37 +39,129 @@ __export(attachments_exports, {
   createMiddleware: () => createMiddleware
 });
 module.exports = __toCommonJS(attachments_exports);
+var import_stream = require("stream");
+var import_mime_match = __toESM(require("mime-match"));
+var import_mime_types = __toESM(require("mime-types"));
 var import_utils = require("@nocobase/utils");
 var import__ = __toESM(require(".."));
 var import_constants = require("../../constants");
-var Rules = __toESM(require("../rules"));
-function getFileFilter(storage) {
-  return (req, file, cb) => {
-    const { size, ...rules } = storage.rules;
-    const ruleKeys = Object.keys(rules);
-    const result = !ruleKeys.length || !ruleKeys.some((key) => typeof Rules[key] !== "function" || !Rules[key](file, rules[key]));
-    cb(null, result);
+function makeMulterStorage(storage) {
+  const innerStorage = storage.make();
+  return {
+    _handleFile(req, file, cb) {
+      const pattern = storage.storage.rules.mimetype;
+      const peekSize = 4100;
+      const originalStream = file.stream;
+      const passThrough = new import_stream.PassThrough();
+      const proxyFile = { ...file, stream: passThrough };
+      let detectedMime = null;
+      const finalCallback = (err, result) => {
+        if (err) {
+          return cb(err);
+        }
+        if (detectedMime && result) {
+          result.mimetype = detectedMime;
+        }
+        cb(null, result);
+      };
+      innerStorage._handleFile(req, proxyFile, finalCallback);
+      const chunks = [];
+      let bytesRead = 0;
+      let validationTriggered = false;
+      const cleanup = () => {
+        originalStream.removeListener("data", onData);
+        originalStream.removeListener("end", onEnd);
+        originalStream.removeListener("error", onError);
+      };
+      const onData = (chunk) => {
+        if (validationTriggered) return;
+        chunks.push(chunk);
+        bytesRead += chunk.length;
+        if (bytesRead >= peekSize) {
+          validationTriggered = true;
+          cleanup();
+          originalStream.pause();
+          validate(Buffer.concat(chunks));
+        }
+      };
+      const onEnd = () => {
+        if (!validationTriggered) {
+          validationTriggered = true;
+          cleanup();
+          validate(Buffer.concat(chunks));
+        }
+      };
+      const onError = (err) => {
+        cleanup();
+        passThrough.destroy(err);
+      };
+      const validate = async (header) => {
+        try {
+          const { fileTypeFromBuffer } = await import("file-type");
+          const type = await fileTypeFromBuffer(new Uint8Array(header));
+          if (type) {
+            detectedMime = type.mime;
+          } else {
+            const fromFilename = import_mime_types.default.lookup(file.originalname);
+            if (fromFilename) {
+              detectedMime = fromFilename;
+            }
+          }
+          if (!detectedMime || pattern !== "*" && !pattern.toString().split(",").some((0, import_mime_match.default)(detectedMime))) {
+            const err = new Error("Mime type not allowed by storage rule");
+            err.name = "MulterError";
+            originalStream.destroy();
+            passThrough.destroy();
+            return cb(err);
+          }
+          passThrough.write(header, (writeErr) => {
+            if (writeErr) {
+              originalStream.destroy();
+              passThrough.destroy();
+              return cb(writeErr);
+            }
+            if (originalStream.readableEnded) {
+              passThrough.end();
+            } else {
+              originalStream.pipe(passThrough);
+              originalStream.resume();
+            }
+          });
+        } catch (err) {
+          originalStream.destroy();
+          passThrough.destroy();
+          return cb(err);
+        }
+      };
+      originalStream.on("data", onData);
+      originalStream.on("end", onEnd);
+      originalStream.on("error", onError);
+    },
+    _removeFile(req, file, cb) {
+      innerStorage._removeFile(req, file, cb);
+    }
   };
 }
 async function multipart(ctx, next) {
+  var _a;
   const { storage } = ctx;
   if (!storage) {
     ctx.logger.error("[file-manager] no linked or default storage provided");
     return ctx.throw(500);
   }
-  const StorageType = ctx.app.pm.get(import__.default).storageTypes.get(storage.type);
-  if (!StorageType) {
+  const StorageClass = ctx.app.pm.get(import__.default).storageTypes.get(storage.type);
+  if (!StorageClass) {
     ctx.logger.error(`[file-manager] storage type "${storage.type}" is not defined`);
     return ctx.throw(500);
   }
-  const storageInstance = new StorageType(storage);
+  const storageInstance = new StorageClass(storage);
   const multerOptions = {
-    fileFilter: getFileFilter(storage),
+    // fileFilter: getFileFilter(storageInstance),
     limits: {
       // 每次只允许提交一个文件
       files: import_constants.LIMIT_FILES
     },
-    storage: storageInstance.make()
+    storage: ((_a = storage.rules) == null ? void 0 : _a.mimetype) ? makeMulterStorage(storageInstance) : storageInstance.make()
   };
   multerOptions.limits["fileSize"] = Math.max(import_constants.FILE_SIZE_LIMIT_MIN, storage.rules.size ?? import_constants.FILE_SIZE_LIMIT_DEFAULT);
   const upload = (0, import_utils.koaMulter)(multerOptions).single(import_constants.FILE_FIELD_NAME);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-file-manager",
-  "version": "1.8.0-beta.9",
+  "version": "1.8.1",
   "displayName": "File manager",
   "displayName.zh-CN": "文件管理器",
   "description": "Provides files storage services with files collection template and attachment field.",
@@ -17,22 +17,28 @@
     "@formily/shared": "2.x",
     "@koa/multer": "^3.1.0",
     "@types/koa-multer": "^1.0.4",
+    "@types/mime-types": "^3.0.1",
     "@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",
+    "mime-types": "^3.0.1",
     "mkdirp": "~0.5.4",
     "multer": "^1.4.5-lts.2",
     "multer-aliyun-oss": "2.1.3",
     "multer-cos": "^1.0.3",
     "multer-s3": "^3.0.1",
+    "multistream": "^4.1.0",
     "react": "^18.2.0",
     "react-i18next": "^11.15.1",
     "supertest": "^6.1.6",
     "url-join": "4.0.1"
   },
+  "dependencies": {
+    "file-type": "^21.0.0"
+  },
   "peerDependencies": {
     "@nocobase/actions": "1.x",
     "@nocobase/client": "1.x",
@@ -45,5 +51,5 @@
     "Collections",
     "Collection fields"
   ],
-  "gitHead": "a3449d646c72965845f8c52e52fff9dba759c564"
+  "gitHead": "85bbe64895160a66603856c6ff0c05e4ebb5fbc2"
 }