@nocobase/plugin-file-manager 1.6.0-beta.10 → 1.6.0-beta.11

package/dist/externalVersion.js

@@ -8,7 +8,7 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.6.0-beta.10",
+  "@nocobase/client": "1.6.0-beta.11",
   "react": "18.2.0",
   "antd": "5.12.8",
   "@ant-design/icons": "5.2.6",
@@ -18,10 +18,10 @@ module.exports = {
   "@formily/antd-v5": "1.1.9",
   "@formily/core": "2.3.0",
   "@formily/react": "2.3.0",
-  "@nocobase/database": "1.6.0-beta.10",
+  "@nocobase/database": "1.6.0-beta.11",
   "multer": "1.4.4",
-  "@nocobase/server": "1.6.0-beta.10",
-  "@nocobase/utils": "1.6.0-beta.10",
-  "@nocobase/test": "1.6.0-beta.10",
-  "@nocobase/actions": "1.6.0-beta.10"
+  "@nocobase/server": "1.6.0-beta.11",
+  "@nocobase/utils": "1.6.0-beta.11",
+  "@nocobase/test": "1.6.0-beta.11",
+  "@nocobase/actions": "1.6.0-beta.11"
 };

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-02-24T06:52:23.987Z"}
+{"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-02-24T13:33:05.144Z"}

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-02-24T06:52:17.493Z"}
+{"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-02-24T13:32:58.451Z"}

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-02-24T06:52:22.535Z"}
+{"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-02-24T13:33:03.665Z"}

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-02-24T06:52:22.449Z"}
+{"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-02-24T13:33:03.574Z"}

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-02-24T06:52:29.583Z"}
+{"_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-02-24T13:33:11.055Z"}

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-02-24T06:52:25.516Z"}
+{"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-02-24T13:33:06.750Z"}

package/dist/server/actions/attachments.d.ts

@@ -7,5 +7,15 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Context, Next } from '@nocobase/actions';
-export declare function getFileData(ctx: Context): any;
+export declare function getFileData(ctx: Context): {
+    title: string;
+    filename: string;
+    extname: string;
+    path: any;
+    size: any;
+    url: string;
+    mimetype: any;
+    meta: unknown;
+    storageId: any;
+};
 export declare function createMiddleware(ctx: Context, next: Next): Promise<any>;

package/dist/server/actions/attachments.js

@@ -58,13 +58,14 @@ function getFileData(ctx) {
   if (!file) {
     return ctx.throw(400, "file validation failed");
   }
-  const storageConfig = ctx.app.pm.get(import__.default).storageTypes.get(storage.type);
-  const { [storageConfig.filenameKey || "filename"]: name } = file;
+  const StorageType = ctx.app.pm.get(import__.default).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, "");
   const baseUrl = storage.baseUrl.replace(/\/+$/, "");
   const pathname = [path, filename].filter(Boolean).join("/");
+  const storageInstance = new StorageType(storage);
   return {
     title: Buffer.from(file.originalname, "latin1").toString("utf8").replace(extname, ""),
     filename,
@@ -78,7 +79,7 @@ function getFileData(ctx) {
     // @ts-ignore
     meta: ctx.request.body,
     storageId: storage.id,
-    ...storageConfig.getFileData ? storageConfig.getFileData(file) : {}
+    ...storageInstance.getFileData ? storageInstance.getFileData(file) : {}
   };
 }
 async function multipart(ctx, next) {
@@ -87,18 +88,19 @@ async function multipart(ctx, next) {
     ctx.logger.error("[file-manager] no linked or default storage provided");
     return ctx.throw(500);
   }
-  const storageConfig = ctx.app.pm.get(import__.default).storageTypes.get(storage.type);
-  if (!storageConfig) {
+  const StorageType = ctx.app.pm.get(import__.default).storageTypes.get(storage.type);
+  if (!StorageType) {
     ctx.logger.error(`[file-manager] storage type "${storage.type}" is not defined`);
     return ctx.throw(500);
   }
+  const storageInstance = new StorageType(storage);
   const multerOptions = {
     fileFilter: getFileFilter(storage),
     limits: {
       // 每次只允许提交一个文件
       files: import_constants.LIMIT_FILES
     },
-    storage: storageConfig.make(storage)
+    storage: storageInstance.make()
   };
   multerOptions.limits["fileSize"] = Math.min(
     Math.max(import_constants.FILE_SIZE_LIMIT_MIN, storage.rules.size ?? import_constants.FILE_SIZE_LIMIT_DEFAULT),

package/dist/server/index.d.ts

@@ -8,6 +8,6 @@
  */
 import { StorageEngine } from 'multer';
 export * from '../constants';
-export { AttachmentModel, default, IStorage, PluginFileManagerServer, StorageModel } from './server';
+export { AttachmentModel, default, PluginFileManagerServer, StorageModel } from './server';
 export { StorageType } from './storages';
 export { StorageEngine };

package/dist/server/index.js

@@ -38,7 +38,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var server_exports = {};
 __export(server_exports, {
   AttachmentModel: () => import_server.AttachmentModel,
-  IStorage: () => import_server.IStorage,
   PluginFileManagerServer: () => import_server.PluginFileManagerServer,
   StorageEngine: () => import_multer.StorageEngine,
   StorageModel: () => import_server.StorageModel,
@@ -53,7 +52,6 @@ var import_storages = require("./storages");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AttachmentModel,
-  IStorage,
   PluginFileManagerServer,
   StorageEngine,
   StorageModel,

package/dist/server/server.d.ts

@@ -9,7 +9,7 @@
 import { Plugin } from '@nocobase/server';
 import { Registry } from '@nocobase/utils';
 import { Model, Transactionable } from '@nocobase/database';
-import { IStorage, StorageModel } from './storages';
+import { AttachmentModel, StorageClassType, StorageModel } from './storages';
 export type * from './storages';
 export type FileRecordOptions = {
     collectionName: string;
@@ -23,13 +23,23 @@ export type UploadFileOptions = {
     documentRoot?: string;
 };
 export declare class PluginFileManagerServer extends Plugin {
-    storageTypes: Registry<IStorage>;
+    storageTypes: Registry<StorageClassType>;
     storagesCache: Map<number, StorageModel>;
     afterDestroy: (record: Model, options: any) => Promise<void>;
-    registerStorageType(type: string, options: IStorage): void;
+    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: any;
+        size: any;
+        url: string;
+        mimetype: any;
+        meta: unknown;
+        storageId: any;
+    }>;
     loadStorages(options?: {
         transaction: any;
     }): Promise<void>;
@@ -37,5 +47,6 @@ export declare class PluginFileManagerServer extends Plugin {
     handleSyncMessage(message: any): Promise<void>;
     beforeLoad(): Promise<void>;
     load(): Promise<void>;
+    getFileURL(file: AttachmentModel): string | Promise<string>;
 }
 export default PluginFileManagerServer;

package/dist/server/server.js

@@ -75,14 +75,15 @@ class PluginFileManagerServer extends import_server.Plugin {
     if (storage == null ? void 0 : storage.paranoid) {
       return;
     }
-    const storageConfig = this.storageTypes.get(storage.type);
-    const result = await storageConfig.delete(storage, [record]);
+    const Type = this.storageTypes.get(storage.type);
+    const storageConfig = new Type(storage);
+    const result = await storageConfig.delete([record]);
     if (!result[0]) {
       throw new FileDeleteError("Failed to delete file", record);
     }
   };
-  registerStorageType(type, options) {
-    this.storageTypes.register(type, options);
+  registerStorageType(type, Type) {
+    this.storageTypes.register(type, Type);
   }
   async createFileRecord(options) {
     const { values, storageName, collectionName, filePath, transaction } = options;
@@ -102,20 +103,13 @@ class PluginFileManagerServer extends import_server.Plugin {
     const { storageName, filePath, documentRoot } = options;
     const storageRepository = this.db.getRepository("storages");
     let storageInstance;
-    if (storageName) {
-      storageInstance = await storageRepository.findOne({
-        filter: {
-          name: storageName
-        }
-      });
-    }
-    if (!storageInstance) {
-      storageInstance = await storageRepository.findOne({
-        filter: {
-          default: true
-        }
-      });
-    }
+    storageInstance = await storageRepository.findOne({
+      filter: storageName ? {
+        name: storageName
+      } : {
+        default: true
+      }
+    });
     const fileStream = import_fs.default.createReadStream(filePath);
     if (!storageInstance) {
       throw new Error("[file-manager] no linked or default storage provided");
@@ -124,11 +118,12 @@ class PluginFileManagerServer extends import_server.Plugin {
     if (documentRoot) {
       storageInstance.options["documentRoot"] = documentRoot;
     }
-    const storageConfig = this.storageTypes.get(storageInstance.type);
-    if (!storageConfig) {
+    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 engine = storageConfig.make(storageInstance);
+    const engine = storage.make();
     const file = {
       originalname: (0, import_path.basename)(filePath),
       path: filePath,
@@ -157,19 +152,19 @@ class PluginFileManagerServer extends import_server.Plugin {
     this.db["_fileStorages"] = this.storagesCache;
   }
   async install() {
-    const defaultStorageConfig = this.storageTypes.get(DEFAULT_STORAGE_TYPE);
-    if (defaultStorageConfig) {
+    const defaultStorageType = this.storageTypes.get(DEFAULT_STORAGE_TYPE);
+    if (defaultStorageType) {
       const Storage = this.db.getCollection("storages");
       if (await Storage.repository.findOne({
         filter: {
-          name: defaultStorageConfig.defaults().name
+          name: defaultStorageType.defaults().name
         }
       })) {
         return;
       }
       await Storage.repository.create({
         values: {
-          ...defaultStorageConfig.defaults(),
+          ...defaultStorageType.defaults(),
           type: DEFAULT_STORAGE_TYPE,
           default: true
         }
@@ -203,10 +198,10 @@ class PluginFileManagerServer extends import_server.Plugin {
   }
   async load() {
     this.db.on("afterDestroy", this.afterDestroy);
-    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());
+    this.storageTypes.register(import_constants.STORAGE_TYPE_LOCAL, import_local.default);
+    this.storageTypes.register(import_constants.STORAGE_TYPE_ALI_OSS, import_ali_oss.default);
+    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());
@@ -254,6 +249,11 @@ class PluginFileManagerServer extends import_server.Plugin {
     this.app.acl.addFixedParams("attachments", "destroy", ownMerger);
     this.app.db.interfaceManager.registerInterfaceType("attachment", import_attachment_interface.AttachmentInterface);
   }
+  getFileURL(file) {
+    const storage = this.storagesCache.get(file.storageId);
+    const storageType = this.storageTypes.get(storage.type);
+    return new storageType(storage).getFileURL(file);
+  }
 }
 var server_default = PluginFileManagerServer;
 // Annotate the CommonJS export names for ESM import in node:

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

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

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

@@ -33,14 +33,7 @@ var import__ = require(".");
 var import_constants = require("../../constants");
 var import_utils = require("../utils");
 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() {
+  static defaults() {
     return {
       title: "\u963F\u91CC\u4E91\u5BF9\u8C61\u5B58\u50A8",
       type: import_constants.STORAGE_TYPE_ALI_OSS,
@@ -54,8 +47,15 @@ class ali_oss_default extends import__.StorageType {
       }
     };
   }
-  async delete(storage, records) {
-    const { client } = this.make(storage);
+  make() {
+    const createAliOssStorage = require("multer-aliyun-oss");
+    return new createAliOssStorage({
+      config: this.storage.options,
+      filename: (0, import_utils.cloudFilenameGetter)(this.storage)
+    });
+  }
+  async delete(records) {
+    const { client } = this.make();
     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

@@ -6,7 +6,6 @@
  * 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 Application from '@nocobase/server';
 import { StorageEngine } from 'multer';
 export interface StorageModel {
     id?: number;
@@ -24,21 +23,23 @@ export interface AttachmentModel {
     title: string;
     filename: string;
     path: string;
+    url: string;
+    storageId: number;
 }
-export interface IStorage {
-    filenameKey?: string;
-    middleware?(app: Application): void;
+export declare abstract class StorageType {
+    storage: StorageModel;
+    static defaults(): StorageModel;
+    static filenameKey?: string;
+    constructor(storage: StorageModel);
+    abstract make(): StorageEngine;
+    abstract delete(records: AttachmentModel[]): [number, AttachmentModel[]] | Promise<[number, AttachmentModel[]]>;
     getFileData?(file: {
         [key: string]: any;
     }): {
         [key: string]: any;
     };
-    make(storage: StorageModel): StorageEngine;
-    defaults(): StorageModel;
-    delete(storage: StorageModel, records: AttachmentModel[]): Promise<[number, AttachmentModel[]]>;
-}
-export declare abstract class StorageType implements IStorage {
-    abstract make(storage: StorageModel): StorageEngine;
-    abstract delete(storage: StorageModel, records: AttachmentModel[]): Promise<[number, AttachmentModel[]]>;
-    defaults(): StorageModel;
+    getFileURL(file: AttachmentModel): string | Promise<string>;
 }
+export type StorageClassType = {
+    new (storage: StorageModel): StorageType;
+} & typeof StorageType;

package/dist/server/storages/index.js

@@ -30,9 +30,16 @@ __export(storages_exports, {
 });
 module.exports = __toCommonJS(storages_exports);
 class StorageType {
-  defaults() {
+  constructor(storage) {
+    this.storage = storage;
+  }
+  static defaults() {
     return {};
   }
+  static filenameKey;
+  getFileURL(file) {
+    return file.url;
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -9,8 +9,7 @@
 import multer from 'multer';
 import { AttachmentModel, StorageType } from '.';
 export default class extends StorageType {
-    make(storage: any): multer.StorageEngine;
-    defaults(): {
+    static defaults(): {
         title: string;
         type: string;
         name: string;
@@ -22,5 +21,7 @@ export default class extends StorageType {
             size: number;
         };
     };
-    delete(storage: any, records: AttachmentModel[]): Promise<[number, AttachmentModel[]]>;
+    make(): multer.StorageEngine;
+    delete(records: AttachmentModel[]): Promise<[number, AttachmentModel[]]>;
+    getFileURL(file: AttachmentModel): string;
 }

package/dist/server/storages/local.js

@@ -51,16 +51,7 @@ function getDocumentRoot(storage) {
   return import_path.default.resolve(import_path.default.isAbsolute(documentRoot) ? documentRoot : import_path.default.join(process.cwd(), documentRoot));
 }
 class local_default extends import__.StorageType {
-  make(storage) {
-    return import_multer.default.diskStorage({
-      destination: function(req, file, cb) {
-        const destPath = import_path.default.join(getDocumentRoot(storage), storage.path);
-        (0, import_mkdirp.default)(destPath, (err) => cb(err, destPath));
-      },
-      filename: import_utils.getFilename
-    });
-  }
-  defaults() {
+  static defaults() {
     return {
       title: "Local storage",
       type: import_constants.STORAGE_TYPE_LOCAL,
@@ -74,8 +65,17 @@ class local_default extends import__.StorageType {
       }
     };
   }
-  async delete(storage, records) {
-    const documentRoot = getDocumentRoot(storage);
+  make() {
+    return import_multer.default.diskStorage({
+      destination: (req, file, cb) => {
+        const destPath = import_path.default.join(getDocumentRoot(this.storage), this.storage.path);
+        (0, import_mkdirp.default)(destPath, (err) => cb(err, destPath));
+      },
+      filename: import_utils.getFilename
+    });
+  }
+  async delete(records) {
+    const documentRoot = getDocumentRoot(this.storage);
     let count = 0;
     const undeleted = [];
     await records.reduce(
@@ -97,4 +97,7 @@ class local_default extends import__.StorageType {
     );
     return [count, undeleted];
   }
+  getFileURL(file) {
+    return process.env.APP_PUBLIC_PATH ? `${process.env.APP_PUBLIC_PATH.replace(/\/$/g, "")}${file.url}` : file.url;
+  }
 }

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-file-manager",
-  "version": "1.6.0-beta.10",
+  "version": "1.6.0-beta.11",
   "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": "72684ad7261e46b67969ecc4db0f1bcbea545a8d"
+  "gitHead": "6cff97cdc31b9f191aaecb0f0d358c29e87ebde0"
 }