@nocobase/plugin-file-manager 1.6.28 → 1.6.30

package/dist/common/constants.d.ts

@@ -0,0 +1,9 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+export declare const INVALID_FILENAME_CHARS = "<>?*~\\/";

package/dist/common/constants.js

@@ -0,0 +1,36 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var constants_exports = {};
+__export(constants_exports, {
+  INVALID_FILENAME_CHARS: () => INVALID_FILENAME_CHARS
+});
+module.exports = __toCommonJS(constants_exports);
+const INVALID_FILENAME_CHARS = "<>?*~\\/";
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  INVALID_FILENAME_CHARS
+});

package/dist/externalVersion.js

@@ -8,7 +8,7 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.6.28",
+  "@nocobase/client": "1.6.30",
   "react": "18.2.0",
   "antd": "5.12.8",
   "@ant-design/icons": "5.6.1",
@@ -19,11 +19,11 @@ module.exports = {
   "@formily/core": "2.3.0",
   "@formily/react": "2.3.0",
   "multer": "1.4.5-lts.2",
-  "@nocobase/server": "1.6.28",
-  "@nocobase/utils": "1.6.28",
-  "@nocobase/database": "1.6.28",
-  "@nocobase/test": "1.6.28",
-  "@nocobase/actions": "1.6.28",
+  "@nocobase/server": "1.6.30",
+  "@nocobase/utils": "1.6.30",
+  "@nocobase/database": "1.6.30",
+  "@nocobase/test": "1.6.30",
+  "@nocobase/actions": "1.6.30",
   "sequelize": "6.35.2",
-  "@nocobase/plugin-data-source-main": "1.6.28"
+  "@nocobase/plugin-data-source-main": "1.6.30"
 };

package/dist/node_modules/@aws-sdk/client-s3/package.json

@@ -1 +1 @@
-{"name":"@aws-sdk/client-s3","description":"AWS SDK for JavaScript S3 Client for Node.js, Browser and React Native","version":"3.750.0","scripts":{"build":"concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'","build:cjs":"node ../../scripts/compilation/inline client-s3","build:es":"tsc -p tsconfig.es.json","build:include:deps":"lerna run --scope $npm_package_name --include-dependencies build","build:types":"tsc -p tsconfig.types.json","build:types:downlevel":"downlevel-dts dist-types dist-types/ts3.4","clean":"rimraf ./dist-* && rimraf *.tsbuildinfo","extract:docs":"api-extractor run --local","generate:client":"node ../../scripts/generate-clients/single-service --solo s3","test":"yarn g:vitest run","test:browser":"node ./test/browser-build/esbuild && yarn g:vitest run -c vitest.config.browser.ts","test:browser:watch":"node ./test/browser-build/esbuild && yarn g:vitest watch -c vitest.config.browser.ts","test:e2e":"yarn g:vitest run -c vitest.config.e2e.ts && yarn test:browser","test:e2e:watch":"yarn g:vitest watch -c vitest.config.e2e.ts","test:watch":"yarn g:vitest watch"},"main":"./dist-cjs/index.js","types":"./dist-types/index.d.ts","module":"./dist-es/index.js","sideEffects":false,"dependencies":{"@aws-crypto/sha1-browser":"5.2.0","@aws-crypto/sha256-browser":"5.2.0","@aws-crypto/sha256-js":"5.2.0","@aws-sdk/core":"3.750.0","@aws-sdk/credential-provider-node":"3.750.0","@aws-sdk/middleware-bucket-endpoint":"3.734.0","@aws-sdk/middleware-expect-continue":"3.734.0","@aws-sdk/middleware-flexible-checksums":"3.750.0","@aws-sdk/middleware-host-header":"3.734.0","@aws-sdk/middleware-location-constraint":"3.734.0","@aws-sdk/middleware-logger":"3.734.0","@aws-sdk/middleware-recursion-detection":"3.734.0","@aws-sdk/middleware-sdk-s3":"3.750.0","@aws-sdk/middleware-ssec":"3.734.0","@aws-sdk/middleware-user-agent":"3.750.0","@aws-sdk/region-config-resolver":"3.734.0","@aws-sdk/signature-v4-multi-region":"3.750.0","@aws-sdk/types":"3.734.0","@aws-sdk/util-endpoints":"3.743.0","@aws-sdk/util-user-agent-browser":"3.734.0","@aws-sdk/util-user-agent-node":"3.750.0","@aws-sdk/xml-builder":"3.734.0","@smithy/config-resolver":"^4.0.1","@smithy/core":"^3.1.4","@smithy/eventstream-serde-browser":"^4.0.1","@smithy/eventstream-serde-config-resolver":"^4.0.1","@smithy/eventstream-serde-node":"^4.0.1","@smithy/fetch-http-handler":"^5.0.1","@smithy/hash-blob-browser":"^4.0.1","@smithy/hash-node":"^4.0.1","@smithy/hash-stream-node":"^4.0.1","@smithy/invalid-dependency":"^4.0.1","@smithy/md5-js":"^4.0.1","@smithy/middleware-content-length":"^4.0.1","@smithy/middleware-endpoint":"^4.0.5","@smithy/middleware-retry":"^4.0.6","@smithy/middleware-serde":"^4.0.2","@smithy/middleware-stack":"^4.0.1","@smithy/node-config-provider":"^4.0.1","@smithy/node-http-handler":"^4.0.2","@smithy/protocol-http":"^5.0.1","@smithy/smithy-client":"^4.1.5","@smithy/types":"^4.1.0","@smithy/url-parser":"^4.0.1","@smithy/util-base64":"^4.0.0","@smithy/util-body-length-browser":"^4.0.0","@smithy/util-body-length-node":"^4.0.0","@smithy/util-defaults-mode-browser":"^4.0.6","@smithy/util-defaults-mode-node":"^4.0.6","@smithy/util-endpoints":"^3.0.1","@smithy/util-middleware":"^4.0.1","@smithy/util-retry":"^4.0.1","@smithy/util-stream":"^4.1.1","@smithy/util-utf8":"^4.0.0","@smithy/util-waiter":"^4.0.2","tslib":"^2.6.2"},"devDependencies":{"@aws-sdk/signature-v4-crt":"3.750.0","@tsconfig/node18":"18.2.4","@types/node":"^18.19.69","concurrently":"7.0.0","downlevel-dts":"0.10.1","rimraf":"3.0.2","typescript":"~5.2.2"},"engines":{"node":">=18.0.0"},"typesVersions":{"<4.0":{"dist-types/*":["dist-types/ts3.4/*"]}},"files":["dist-*/**"],"author":{"name":"AWS SDK for JavaScript Team","url":"https://aws.amazon.com/javascript/"},"license":"Apache-2.0","browser":{"./dist-es/runtimeConfig":"./dist-es/runtimeConfig.browser"},"react-native":{"./dist-es/runtimeConfig":"./dist-es/runtimeConfig.native"},"homepage":"https://github.com/aws/aws-sdk-js-v3/tree/main/clients/client-s3","repository":{"type":"git","url":"https://github.com/aws/aws-sdk-js-v3.git","directory":"clients/client-s3"},"_lastModified":"2025-05-09T15:32:57.192Z"}
+{"name":"@aws-sdk/client-s3","description":"AWS SDK for JavaScript S3 Client for Node.js, Browser and React Native","version":"3.750.0","scripts":{"build":"concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'","build:cjs":"node ../../scripts/compilation/inline client-s3","build:es":"tsc -p tsconfig.es.json","build:include:deps":"lerna run --scope $npm_package_name --include-dependencies build","build:types":"tsc -p tsconfig.types.json","build:types:downlevel":"downlevel-dts dist-types dist-types/ts3.4","clean":"rimraf ./dist-* && rimraf *.tsbuildinfo","extract:docs":"api-extractor run --local","generate:client":"node ../../scripts/generate-clients/single-service --solo s3","test":"yarn g:vitest run","test:browser":"node ./test/browser-build/esbuild && yarn g:vitest run -c vitest.config.browser.ts","test:browser:watch":"node ./test/browser-build/esbuild && yarn g:vitest watch -c vitest.config.browser.ts","test:e2e":"yarn g:vitest run -c vitest.config.e2e.ts && yarn test:browser","test:e2e:watch":"yarn g:vitest watch -c vitest.config.e2e.ts","test:watch":"yarn g:vitest watch"},"main":"./dist-cjs/index.js","types":"./dist-types/index.d.ts","module":"./dist-es/index.js","sideEffects":false,"dependencies":{"@aws-crypto/sha1-browser":"5.2.0","@aws-crypto/sha256-browser":"5.2.0","@aws-crypto/sha256-js":"5.2.0","@aws-sdk/core":"3.750.0","@aws-sdk/credential-provider-node":"3.750.0","@aws-sdk/middleware-bucket-endpoint":"3.734.0","@aws-sdk/middleware-expect-continue":"3.734.0","@aws-sdk/middleware-flexible-checksums":"3.750.0","@aws-sdk/middleware-host-header":"3.734.0","@aws-sdk/middleware-location-constraint":"3.734.0","@aws-sdk/middleware-logger":"3.734.0","@aws-sdk/middleware-recursion-detection":"3.734.0","@aws-sdk/middleware-sdk-s3":"3.750.0","@aws-sdk/middleware-ssec":"3.734.0","@aws-sdk/middleware-user-agent":"3.750.0","@aws-sdk/region-config-resolver":"3.734.0","@aws-sdk/signature-v4-multi-region":"3.750.0","@aws-sdk/types":"3.734.0","@aws-sdk/util-endpoints":"3.743.0","@aws-sdk/util-user-agent-browser":"3.734.0","@aws-sdk/util-user-agent-node":"3.750.0","@aws-sdk/xml-builder":"3.734.0","@smithy/config-resolver":"^4.0.1","@smithy/core":"^3.1.4","@smithy/eventstream-serde-browser":"^4.0.1","@smithy/eventstream-serde-config-resolver":"^4.0.1","@smithy/eventstream-serde-node":"^4.0.1","@smithy/fetch-http-handler":"^5.0.1","@smithy/hash-blob-browser":"^4.0.1","@smithy/hash-node":"^4.0.1","@smithy/hash-stream-node":"^4.0.1","@smithy/invalid-dependency":"^4.0.1","@smithy/md5-js":"^4.0.1","@smithy/middleware-content-length":"^4.0.1","@smithy/middleware-endpoint":"^4.0.5","@smithy/middleware-retry":"^4.0.6","@smithy/middleware-serde":"^4.0.2","@smithy/middleware-stack":"^4.0.1","@smithy/node-config-provider":"^4.0.1","@smithy/node-http-handler":"^4.0.2","@smithy/protocol-http":"^5.0.1","@smithy/smithy-client":"^4.1.5","@smithy/types":"^4.1.0","@smithy/url-parser":"^4.0.1","@smithy/util-base64":"^4.0.0","@smithy/util-body-length-browser":"^4.0.0","@smithy/util-body-length-node":"^4.0.0","@smithy/util-defaults-mode-browser":"^4.0.6","@smithy/util-defaults-mode-node":"^4.0.6","@smithy/util-endpoints":"^3.0.1","@smithy/util-middleware":"^4.0.1","@smithy/util-retry":"^4.0.1","@smithy/util-stream":"^4.1.1","@smithy/util-utf8":"^4.0.0","@smithy/util-waiter":"^4.0.2","tslib":"^2.6.2"},"devDependencies":{"@aws-sdk/signature-v4-crt":"3.750.0","@tsconfig/node18":"18.2.4","@types/node":"^18.19.69","concurrently":"7.0.0","downlevel-dts":"0.10.1","rimraf":"3.0.2","typescript":"~5.2.2"},"engines":{"node":">=18.0.0"},"typesVersions":{"<4.0":{"dist-types/*":["dist-types/ts3.4/*"]}},"files":["dist-*/**"],"author":{"name":"AWS SDK for JavaScript Team","url":"https://aws.amazon.com/javascript/"},"license":"Apache-2.0","browser":{"./dist-es/runtimeConfig":"./dist-es/runtimeConfig.browser"},"react-native":{"./dist-es/runtimeConfig":"./dist-es/runtimeConfig.native"},"homepage":"https://github.com/aws/aws-sdk-js-v3/tree/main/clients/client-s3","repository":{"type":"git","url":"https://github.com/aws/aws-sdk-js-v3.git","directory":"clients/client-s3"},"_lastModified":"2025-05-15T12:26:43.139Z"}

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

@@ -1 +1 @@
-{"name":"mime-match","version":"1.0.2","description":"A simple function to check whether a mimetype matches the specified mimetype (with wildcard support)","main":"index.js","scripts":{"test":"node test.js","gendocs":"gendocs > README.md"},"repository":{"type":"git","url":"https://github.com/DamonOehlman/mime-match.git"},"keywords":["mime","wildcard"],"author":"Damon Oehlman <damon.oehlman@gmail.com>","license":"ISC","bugs":{"url":"https://github.com/DamonOehlman/mime-match/issues"},"homepage":"https://github.com/DamonOehlman/mime-match","dependencies":{"wildcard":"^1.1.0"},"devDependencies":{"tape":"^4.5.1"},"_lastModified":"2025-05-09T15:32:50.977Z"}
+{"name":"mime-match","version":"1.0.2","description":"A simple function to check whether a mimetype matches the specified mimetype (with wildcard support)","main":"index.js","scripts":{"test":"node test.js","gendocs":"gendocs > README.md"},"repository":{"type":"git","url":"https://github.com/DamonOehlman/mime-match.git"},"keywords":["mime","wildcard"],"author":"Damon Oehlman <damon.oehlman@gmail.com>","license":"ISC","bugs":{"url":"https://github.com/DamonOehlman/mime-match/issues"},"homepage":"https://github.com/DamonOehlman/mime-match","dependencies":{"wildcard":"^1.1.0"},"devDependencies":{"tape":"^4.5.1"},"_lastModified":"2025-05-15T12:26:37.391Z"}

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-05-09T15:32:55.792Z"}
+{"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-05-15T12:26:41.850Z"}

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-05-09T15:32:55.708Z"}
+{"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-05-15T12:26:41.773Z"}

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-05-09T15:33:02.871Z"}
+{"_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-05-15T12:26:48.348Z"}

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-05-09T15:32:58.825Z"}
+{"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-05-15T12:26:44.596Z"}

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-05-09T15:32:50.884Z"}
+{"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-05-15T12:26:37.307Z"}

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/server.d.ts

@@ -29,7 +29,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>;

package/dist/server/server.js

@@ -40,14 +40,13 @@ __export(server_exports, {
   default: () => server_default
 });
 module.exports = __toCommonJS(server_exports);
+var import_path = require("path");
+var import_fs = __toESM(require("fs"));
 var import_server = require("@nocobase/server");
 var import_utils = require("@nocobase/utils");
-var import_path = require("path");
 var import_database = require("@nocobase/database");
-var import_fs = __toESM(require("fs"));
 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 +110,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 +142,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 +175,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 +211,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 +226,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`,

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

@@ -23,7 +23,7 @@ export interface AttachmentModel {
     title: string;
     filename: string;
     path: string;
-    url: string;
+    url?: string;
     storageId: number;
 }
 export declare abstract class StorageType {
@@ -34,10 +34,15 @@ 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>;
 }

package/dist/server/storages/index.js

@@ -39,8 +39,9 @@ __export(storages_exports, {
   StorageType: () => StorageType
 });
 module.exports = __toCommonJS(storages_exports);
-var import_utils = require("@nocobase/utils");
+var import_path = __toESM(require("path"));
 var import_url_join = __toESM(require("url-join"));
+var import_utils = require("@nocobase/utils");
 var import_utils2 = require("../utils");
 class StorageType {
   constructor(storage) {
@@ -53,6 +54,24 @@ class StorageType {
   getFileKey(record) {
     return (0, import_utils2.getFileKey)(record);
   }
+  getFileData(file, meta = {}) {
+    const { [this.constructor.filenameKey || "filename"]: name } = file;
+    const filename = import_path.default.basename(name);
+    const extname = import_path.default.extname(filename);
+    const path = (this.storage.path || "").replace(/^\/|\/$/g, "");
+    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,
+      storageId: this.storage.id
+    };
+    return data;
+  }
   getFileURL(file, preview) {
     if (file.url && (0, import_utils.isURL)(file.url)) {
       if (preview) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-file-manager",
-  "version": "1.6.28",
+  "version": "1.6.30",
   "displayName": "File manager",
   "displayName.zh-CN": "文件管理器",
   "description": "Provides files storage services with files collection template and attachment field.",
@@ -44,5 +44,5 @@
     "Collections",
     "Collection fields"
   ],
-  "gitHead": "081720ca71350c23e8c7e013a7284eeaef4f5dfc"
+  "gitHead": "1c48773b55a978030c8a3de4cd88a8d5a2c45a16"
 }