@nocobase/plugin-file-manager 0.5.0-alpha.37 → 0.7.0-alpha.1

package/lib/storages/index.js

@@ -1,45 +1,19 @@
 "use strict";
-
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-
-  _react = function _react() {
-    return data;
-  };
-
-  return data;
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var __importDefault = void 0 && (void 0).__importDefault || function (mod) {
-  return mod && mod.__esModule ? mod : {
-    "default": mod
-  };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.getStorageConfig = void 0;
-
 const local_1 = __importDefault(require("./local"));
-
 const ali_oss_1 = __importDefault(require("./ali-oss"));
-
 const s3_1 = __importDefault(require("./s3"));
-
 const constants_1 = require("../constants");
-
 const map = new Map();
 map.set(constants_1.STORAGE_TYPE_LOCAL, local_1.default);
 map.set(constants_1.STORAGE_TYPE_ALI_OSS, ali_oss_1.default);
 map.set(constants_1.STORAGE_TYPE_S3, s3_1.default);
-
 function getStorageConfig(key) {
-  return map.get(key);
+    return map.get(key);
 }
-
 exports.getStorageConfig = getStorageConfig;
-;
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/lib/storages/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["storages/index.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,wDAA4B;AAC5B,8CAAsB;AAEtB,4CAIsB;AAUtB,MAAM,GAAG,GAAG,IAAI,GAAG,EAAoB,CAAC;AACxC,GAAG,CAAC,GAAG,CAAC,8BAAkB,EAAE,eAAK,CAAC,CAAC;AACnC,GAAG,CAAC,GAAG,CAAC,gCAAoB,EAAE,iBAAG,CAAC,CAAC;AACnC,GAAG,CAAC,GAAG,CAAC,2BAAe,EAAE,YAAE,CAAC,CAAC;AAG7B,SAAgB,gBAAgB,CAAC,GAAW;IAC1C,OAAO,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACtB,CAAC;AAFD,4CAEC;AAAA,CAAC","file":"index.js","sourcesContent":["import local from './local';\nimport oss from './ali-oss';\nimport s3 from './s3';\n\nimport {\n  STORAGE_TYPE_LOCAL,\n  STORAGE_TYPE_ALI_OSS,\n  STORAGE_TYPE_S3\n} from '../constants';\n\nexport interface IStorage {\n  filenameKey?: string;\n  middleware?: Function;\n  getFileData?: Function;\n  make: Function;\n  defaults: Function;\n}\n\nconst map = new Map<string, IStorage>();\nmap.set(STORAGE_TYPE_LOCAL, local);\nmap.set(STORAGE_TYPE_ALI_OSS, oss);\nmap.set(STORAGE_TYPE_S3, s3);\n\n\nexport function getStorageConfig(key: string): IStorage {\n  return map.get(key);\n};\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/storages/index.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,wDAA4B;AAC5B,8CAAsB;AAEtB,4CAAyF;AAUzF,MAAM,GAAG,GAAG,IAAI,GAAG,EAAoB,CAAC;AACxC,GAAG,CAAC,GAAG,CAAC,8BAAkB,EAAE,eAAK,CAAC,CAAC;AACnC,GAAG,CAAC,GAAG,CAAC,gCAAoB,EAAE,iBAAG,CAAC,CAAC;AACnC,GAAG,CAAC,GAAG,CAAC,2BAAe,EAAE,YAAE,CAAC,CAAC;AAE7B,SAAgB,gBAAgB,CAAC,GAAW;IAC1C,OAAO,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACtB,CAAC;AAFD,4CAEC","sourcesContent":["import local from './local';\nimport oss from './ali-oss';\nimport s3 from './s3';\n\nimport { STORAGE_TYPE_LOCAL, STORAGE_TYPE_ALI_OSS, STORAGE_TYPE_S3 } from '../constants';\n\nexport interface IStorage {\n  filenameKey?: string;\n  middleware?: Function;\n  getFileData?: Function;\n  make: Function;\n  defaults: Function;\n}\n\nconst map = new Map<string, IStorage>();\nmap.set(STORAGE_TYPE_LOCAL, local);\nmap.set(STORAGE_TYPE_ALI_OSS, oss);\nmap.set(STORAGE_TYPE_S3, s3);\n\nexport function getStorageConfig(key: string): IStorage {\n  return map.get(key);\n}\n"]}

package/lib/storages/local.d.ts

@@ -1,5 +1,6 @@
+import Application from '@nocobase/server';
 import multer from 'multer';
-declare function middleware(app: any, options?: any): Promise<void>;
+declare function middleware(app: Application, options?: any): Promise<void>;
 declare const _default: {
     middleware: typeof middleware;
     make(storage: any): multer.StorageEngine;

package/lib/storages/local.js

@@ -1,220 +1,132 @@
 "use strict";
-
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-
-  _react = function _react() {
-    return data;
-  };
-
-  return data;
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-
-var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
-  function adopt(value) {
-    return value instanceof P ? value : new P(function (resolve) {
-      resolve(value);
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
-  }
-
-  return new (P || (P = Promise))(function (resolve, reject) {
-    function fulfilled(value) {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-
-    function rejected(value) {
-      try {
-        step(generator["throw"](value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-
-    function step(result) {
-      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
-    }
-
-    step((generator = generator.apply(thisArg, _arguments || [])).next());
-  });
 };
-
-var __importDefault = void 0 && (void 0).__importDefault || function (mod) {
-  return mod && mod.__esModule ? mod : {
-    "default": mod
-  };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-const path_1 = __importDefault(require("path"));
-
-const url_1 = require("url");
-
+Object.defineProperty(exports, "__esModule", { value: true });
+const koa_static_1 = __importDefault(require("koa-static"));
 const mkdirp_1 = __importDefault(require("mkdirp"));
-
 const multer_1 = __importDefault(require("multer"));
-
-const koa_static_1 = __importDefault(require("koa-static"));
-
+const path_1 = __importDefault(require("path"));
+const url_1 = require("url");
 const constants_1 = require("../constants");
-
 const utils_1 = require("../utils");
-
+// use koa-mount match logic
 function match(basePath, pathname) {
-  if (!pathname.startsWith(basePath)) {
-    return false;
-  }
-
-  const newPath = pathname.replace(basePath, '') || '/';
-
-  if (basePath.slice(-1) === '/') {
-    return true;
-  }
-
-  return newPath[0] === '/';
+    if (!pathname.startsWith(basePath)) {
+        return false;
+    }
+    const newPath = pathname.replace(basePath, '') || '/';
+    if (basePath.slice(-1) === '/') {
+        return true;
+    }
+    return newPath[0] === '/';
 }
-
 function update(app, storages) {
-  return __awaiter(this, void 0, void 0, function* () {
-    const StorageModel = app.db.getModel('storages');
-    const items = yield StorageModel.findAll({
-      where: {
-        type: constants_1.STORAGE_TYPE_LOCAL
-      }
+    return __awaiter(this, void 0, void 0, function* () {
+        const Storage = app.db.getCollection('storages');
+        const items = yield Storage.repository.find({
+            filter: {
+                type: constants_1.STORAGE_TYPE_LOCAL,
+            },
+        });
+        const primaryKey = Storage.model.primaryKeyAttribute;
+        storages.clear();
+        for (const storage of items) {
+            storages.set(storage[primaryKey], storage);
+        }
     });
-    const primaryKey = StorageModel.primaryKeyAttribute;
-    storages.clear();
-
-    var _iterator = _createForOfIteratorHelper(items),
-        _step;
-
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        const storage = _step.value;
-        storages.set(storage[primaryKey], storage);
-      }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
-    }
-  });
 }
-
 function createLocalServerUpdateHook(app, storages) {
-  return function (row) {
-    return __awaiter(this, void 0, void 0, function* () {
-      if (row.get('type') === constants_1.STORAGE_TYPE_LOCAL) {
-        yield update(app, storages);
-      }
-    });
-  };
+    return function (row) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (row.get('type') === constants_1.STORAGE_TYPE_LOCAL) {
+                yield update(app, storages);
+            }
+        });
+    };
 }
-
 function getDocumentRoot(storage) {
-  const _ref = storage.options || {},
-        _ref$documentRoot = _ref.documentRoot,
-        documentRoot = _ref$documentRoot === void 0 ? 'uploads' : _ref$documentRoot;
-
-  return path_1.default.resolve(path_1.default.isAbsolute(documentRoot) ? documentRoot : path_1.default.join(process.cwd(), documentRoot));
+    const { documentRoot = 'uploads' } = storage.options || {};
+    // TODO(feature): 后面考虑以字符串模板的方式使用，可注入 req/action 相关变量，以便于区分文件夹
+    return path_1.default.resolve(path_1.default.isAbsolute(documentRoot) ? documentRoot : path_1.default.join(process.cwd(), documentRoot));
 }
-
 function middleware(app, options) {
-  return __awaiter(this, void 0, void 0, function* () {
-    const LOCALHOST = `http://localhost:${process.env.API_PORT}`;
-    const StorageModel = app.db.getModel('storages');
-    const storages = new Map();
-    const localServerUpdateHook = createLocalServerUpdateHook(app, storages);
-    StorageModel.addHook('afterCreate', localServerUpdateHook);
-    StorageModel.addHook('afterUpdate', localServerUpdateHook);
-    StorageModel.addHook('afterDestroy', localServerUpdateHook);
-    yield update(app, storages);
-    app.use(function (ctx, next) {
-      return __awaiter(this, void 0, void 0, function* () {
-        var _iterator2 = _createForOfIteratorHelper(storages.values()),
-            _step2;
-
-        try {
-          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-            const storage = _step2.value;
-            const baseUrl = storage.get('baseUrl');
-            let url;
-
-            try {
-              url = new url_1.URL(baseUrl);
-            } catch (e) {
-              url = {
-                pathname: baseUrl
-              };
-            }
-
-            if (url.origin && url.origin !== LOCALHOST) {
-              continue;
-            }
-
-            const basePath = url.pathname.startsWith('/') ? url.pathname : `/${url.pathname}`;
-
-            if (!match(basePath, ctx.path)) {
-              continue;
-            }
-
-            return (0, koa_static_1.default)(getDocumentRoot(storage), {
-              defer: true
-            })(ctx, () => __awaiter(this, void 0, void 0, function* () {
-              if (ctx.path.startsWith(basePath)) {
-                ctx.path = ctx.path.replace(basePath, '');
-              }
-
-              yield next();
-            }));
-          }
-        } catch (err) {
-          _iterator2.e(err);
-        } finally {
-          _iterator2.f();
-        }
-
-        yield next();
-      });
+    return __awaiter(this, void 0, void 0, function* () {
+        const LOCALHOST = `http://localhost:${process.env.SERVER_PORT || '13002'}`;
+        const Storage = app.db.getCollection('storages');
+        const storages = new Map();
+        const localServerUpdateHook = createLocalServerUpdateHook(app, storages);
+        Storage.model.addHook('afterCreate', localServerUpdateHook);
+        Storage.model.addHook('afterUpdate', localServerUpdateHook);
+        Storage.model.addHook('afterDestroy', localServerUpdateHook);
+        app.on('beforeStart', () => __awaiter(this, void 0, void 0, function* () {
+            yield update(app, storages);
+        }));
+        app.use(function (ctx, next) {
+            var _a;
+            return __awaiter(this, void 0, void 0, function* () {
+                for (const storage of storages.values()) {
+                    const baseUrl = storage.get('baseUrl');
+                    let url;
+                    try {
+                        url = new url_1.URL(baseUrl);
+                    }
+                    catch (e) {
+                        url = {
+                            pathname: baseUrl,
+                        };
+                    }
+                    // 以下情况才认为当前进程所应该提供静态服务
+                    // 否则都忽略，交给其他 server 来提供（如 nginx/cdn 等）
+                    if (url.origin && ((_a = storage === null || storage === void 0 ? void 0 : storage.options) === null || _a === void 0 ? void 0 : _a.serve) === false) {
+                        continue;
+                    }
+                    const basePath = url.pathname.startsWith('/') ? url.pathname : `/${url.pathname}`;
+                    if (!match(basePath, ctx.path)) {
+                        continue;
+                    }
+                    return (0, koa_static_1.default)(getDocumentRoot(storage), {
+                        // for handle files after any api handlers
+                        defer: true,
+                    })(ctx, () => __awaiter(this, void 0, void 0, function* () {
+                        if (ctx.path.startsWith(basePath)) {
+                            ctx.path = ctx.path.replace(basePath, '');
+                        }
+                        yield next();
+                    }));
+                }
+                yield next();
+            });
+        });
     });
-  });
 }
-
 exports.default = {
-  middleware,
-
-  make(storage) {
-    return multer_1.default.diskStorage({
-      destination: function destination(req, file, cb) {
-        const destPath = path_1.default.join(getDocumentRoot(storage), storage.path);
-        (0, mkdirp_1.default)(destPath, err => cb(err, destPath));
-      },
-      filename: utils_1.getFilename
-    });
-  },
-
-  defaults() {
-    return {
-      title: '本地存储',
-      type: constants_1.STORAGE_TYPE_LOCAL,
-      name: `local`,
-      baseUrl: process.env.LOCAL_STORAGE_BASE_URL || `http://localhost:${process.env.API_PORT}/uploads`
-    };
-  }
-
+    middleware,
+    make(storage) {
+        return multer_1.default.diskStorage({
+            destination: function (req, file, cb) {
+                const destPath = path_1.default.join(getDocumentRoot(storage), storage.path);
+                (0, mkdirp_1.default)(destPath, (err) => cb(err, destPath));
+            },
+            filename: utils_1.getFilename,
+        });
+    },
+    defaults() {
+        return {
+            title: '本地存储',
+            type: constants_1.STORAGE_TYPE_LOCAL,
+            name: `local`,
+            baseUrl: process.env.LOCAL_STORAGE_BASE_URL || `http://localhost:${process.env.SERVER_PORT || '13002'}/uploads`,
+        };
+    },
 };
-//# sourceMappingURL=local.js.map
+//# sourceMappingURL=local.js.map

package/lib/storages/local.js.map

@@ -1 +1 @@
-{"version":3,"sources":["storages/local.ts"],"names":[],"mappings":"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","file":"local.js","sourcesContent":["import path from 'path';\nimport { URL } from 'url';\nimport mkdirp from 'mkdirp';\nimport multer from 'multer';\nimport serve from 'koa-static';\nimport { STORAGE_TYPE_LOCAL } from '../constants';\nimport { getFilename } from '../utils';\n\n// use koa-mount match logic\nfunction match(basePath: string, pathname: string): boolean {\n  if (!pathname.startsWith(basePath)) {\n    return false;\n  }\n\n  const newPath = pathname.replace(basePath, '') || '/';\n  if (basePath.slice(-1) === '/') {\n    return true;\n  }\n\n  return newPath[0] === '/';\n}\n\nasync function update(app, storages) {\n  const StorageModel = app.db.getModel('storages');\n\n  const items = await StorageModel.findAll({\n    where: {\n      type: STORAGE_TYPE_LOCAL,\n    }\n  });\n\n  const primaryKey = StorageModel.primaryKeyAttribute;\n\n  storages.clear();\n  for (const storage of items) {\n    storages.set(storage[primaryKey], storage);\n  }\n}\n\nfunction createLocalServerUpdateHook(app, storages) {\n  return async function (row) {\n    if (row.get('type') === STORAGE_TYPE_LOCAL) {\n      await update(app, storages);\n    }\n  }\n}\n\nfunction getDocumentRoot(storage): string {\n  const { documentRoot = 'uploads' } = storage.options || {};\n  // TODO(feature): 后面考虑以字符串模板的方式使用，可注入 req/action 相关变量，以便于区分文件夹\n  return path.resolve(path.isAbsolute(documentRoot)\n    ? documentRoot\n    : path.join(process.cwd(), documentRoot));\n}\n\nasync function middleware(app, options?) {\n  const LOCALHOST = `http://localhost:${process.env.API_PORT}`;\n\n  const StorageModel = app.db.getModel('storages');\n  const storages = new Map<string, any>();\n\n  const localServerUpdateHook = createLocalServerUpdateHook(app, storages);\n  StorageModel.addHook('afterCreate', localServerUpdateHook);\n  StorageModel.addHook('afterUpdate', localServerUpdateHook);\n  StorageModel.addHook('afterDestroy', localServerUpdateHook);\n\n  await update(app, storages);\n\n  app.use(async function (ctx, next) {\n    for (const storage of storages.values()) {\n      const baseUrl = storage.get('baseUrl');\n\n      let url;\n      try {\n        url = new URL(baseUrl);\n      } catch (e) {\n        url = {\n          pathname: baseUrl\n        };\n      }\n\n      // 以下情况才认为当前进程所应该提供静态服务\n      // 否则都忽略，交给其他 server 来提供（如 nginx/cdn 等）\n      if (url.origin && url.origin !== LOCALHOST) {\n        continue;\n      }\n\n      const basePath = url.pathname.startsWith('/') ? url.pathname : `/${url.pathname}`;\n      if (!match(basePath, ctx.path)) {\n        continue;\n      }\n\n      return serve(getDocumentRoot(storage), {\n        // for handle files after any api handlers\n        defer: true\n      })(ctx, async () => {\n        if (ctx.path.startsWith(basePath)) {\n          ctx.path = ctx.path.replace(basePath, '');\n        }\n        // console.log('file request:', `${basePath}${ctx.path}`);\n        await next();\n      });\n    }\n\n    await next();\n  });\n}\n\nexport default {\n  middleware,\n  make(storage) {\n    return multer.diskStorage({\n      destination: function (req, file, cb) {\n        const destPath = path.join(getDocumentRoot(storage), storage.path);\n        mkdirp(destPath, (err: Error | null) => cb(err, destPath));\n      },\n      filename: getFilename\n    });\n  },\n  defaults() {\n    return {\n      title: '本地存储',\n      type: STORAGE_TYPE_LOCAL,\n      name: `local`,\n      baseUrl: process.env.LOCAL_STORAGE_BASE_URL || `http://localhost:${process.env.API_PORT}/uploads`\n    };\n  }\n};\n"]}
+{"version":3,"file":"local.js","sourceRoot":"","sources":["../../src/storages/local.ts"],"names":[],"mappings":"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","sourcesContent":["import Application from '@nocobase/server';\nimport serve from 'koa-static';\nimport mkdirp from 'mkdirp';\nimport multer from 'multer';\nimport path from 'path';\nimport { URL } from 'url';\nimport { STORAGE_TYPE_LOCAL } from '../constants';\nimport { getFilename } from '../utils';\n\n// use koa-mount match logic\nfunction match(basePath: string, pathname: string): boolean {\n  if (!pathname.startsWith(basePath)) {\n    return false;\n  }\n\n  const newPath = pathname.replace(basePath, '') || '/';\n  if (basePath.slice(-1) === '/') {\n    return true;\n  }\n\n  return newPath[0] === '/';\n}\n\nasync function update(app: Application, storages) {\n  const Storage = app.db.getCollection('storages');\n\n  const items = await Storage.repository.find({\n    filter: {\n      type: STORAGE_TYPE_LOCAL,\n    },\n  });\n\n  const primaryKey = Storage.model.primaryKeyAttribute;\n\n  storages.clear();\n  for (const storage of items) {\n    storages.set(storage[primaryKey], storage);\n  }\n}\n\nfunction createLocalServerUpdateHook(app, storages) {\n  return async function (row) {\n    if (row.get('type') === STORAGE_TYPE_LOCAL) {\n      await update(app, storages);\n    }\n  };\n}\n\nfunction getDocumentRoot(storage): string {\n  const { documentRoot = 'uploads' } = storage.options || {};\n  // TODO(feature): 后面考虑以字符串模板的方式使用，可注入 req/action 相关变量，以便于区分文件夹\n  return path.resolve(path.isAbsolute(documentRoot) ? documentRoot : path.join(process.cwd(), documentRoot));\n}\n\nasync function middleware(app: Application, options?) {\n  const LOCALHOST = `http://localhost:${process.env.SERVER_PORT || '13002'}`;\n\n  const Storage = app.db.getCollection('storages');\n  const storages = new Map<string, any>();\n\n  const localServerUpdateHook = createLocalServerUpdateHook(app, storages);\n  Storage.model.addHook('afterCreate', localServerUpdateHook);\n  Storage.model.addHook('afterUpdate', localServerUpdateHook);\n  Storage.model.addHook('afterDestroy', localServerUpdateHook);\n\n  app.on('beforeStart', async () => {\n    await update(app, storages);\n  });\n\n  app.use(async function (ctx, next) {\n    for (const storage of storages.values()) {\n      const baseUrl = storage.get('baseUrl');\n\n      let url;\n      try {\n        url = new URL(baseUrl);\n      } catch (e) {\n        url = {\n          pathname: baseUrl,\n        };\n      }\n\n      // 以下情况才认为当前进程所应该提供静态服务\n      // 否则都忽略，交给其他 server 来提供（如 nginx/cdn 等）\n      if (url.origin && storage?.options?.serve === false) {\n        continue;\n      }\n\n      const basePath = url.pathname.startsWith('/') ? url.pathname : `/${url.pathname}`;\n\n      if (!match(basePath, ctx.path)) {\n        continue;\n      }\n\n      return serve(getDocumentRoot(storage), {\n        // for handle files after any api handlers\n        defer: true,\n      })(ctx, async () => {\n        if (ctx.path.startsWith(basePath)) {\n          ctx.path = ctx.path.replace(basePath, '');\n        }\n        await next();\n      });\n    }\n\n    await next();\n  });\n}\n\nexport default {\n  middleware,\n  make(storage) {\n    return multer.diskStorage({\n      destination: function (req, file, cb) {\n        const destPath = path.join(getDocumentRoot(storage), storage.path);\n        mkdirp(destPath, (err: Error | null) => cb(err, destPath));\n      },\n      filename: getFilename,\n    });\n  },\n  defaults() {\n    return {\n      title: '本地存储',\n      type: STORAGE_TYPE_LOCAL,\n      name: `local`,\n      baseUrl: process.env.LOCAL_STORAGE_BASE_URL || `http://localhost:${process.env.SERVER_PORT || '13002'}/uploads`,\n    };\n  },\n};\n"]}

package/lib/storages/s3.js

@@ -1,90 +1,55 @@
 "use strict";
-
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-
-  _react = function _react() {
-    return data;
-  };
-
-  return data;
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var __rest = void 0 && (void 0).__rest || function (s, e) {
-  var t = {};
-
-  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
-
-  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
-  }
-  return t;
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
 };
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
+Object.defineProperty(exports, "__esModule", { value: true });
 const constants_1 = require("../constants");
-
 const utils_1 = require("../utils");
-
 exports.default = {
-  filenameKey: 'key',
-
-  make(storage) {
-    const S3Client = require('aws-sdk/clients/s3');
-
-    const multerS3 = require('multer-s3');
-
-    const _a = storage.options,
-          accessKeyId = _a.accessKeyId,
-          secretAccessKey = _a.secretAccessKey,
-          bucket = _a.bucket,
-          _a$acl = _a.acl,
-          acl = _a$acl === void 0 ? 'public-read' : _a$acl,
-          options = __rest(_a, ["accessKeyId", "secretAccessKey", "bucket", "acl"]);
-
-    const s3 = new S3Client(Object.assign(Object.assign({}, options), {
-      credentials: {
-        accessKeyId,
-        secretAccessKey
-      }
-    }));
-    return multerS3({
-      s3,
-      bucket,
-      acl,
-
-      contentType(req, file, cb) {
-        if (file.mimetype) {
-          cb(null, file.mimetype);
-          return;
-        }
-
-        multerS3.AUTO_CONTENT_TYPE(req, file, cb);
-      },
-
-      key: (0, utils_1.cloudFilenameGetter)(storage)
-    });
-  },
-
-  defaults() {
-    return {
-      title: 'AWS S3',
-      name: 'aws-s3',
-      type: constants_1.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
-      }
-    };
-  }
-
+    filenameKey: 'key',
+    make(storage) {
+        const S3Client = require('aws-sdk/clients/s3');
+        const multerS3 = require('multer-s3');
+        const _a = storage.options, { accessKeyId, secretAccessKey, bucket, acl = 'public-read' } = _a, options = __rest(_a, ["accessKeyId", "secretAccessKey", "bucket", "acl"]);
+        const s3 = new S3Client(Object.assign(Object.assign({}, options), { credentials: {
+                accessKeyId,
+                secretAccessKey,
+            } }));
+        return multerS3({
+            s3,
+            bucket,
+            acl,
+            contentType(req, file, cb) {
+                if (file.mimetype) {
+                    cb(null, file.mimetype);
+                    return;
+                }
+                multerS3.AUTO_CONTENT_TYPE(req, file, cb);
+            },
+            key: (0, utils_1.cloudFilenameGetter)(storage),
+        });
+    },
+    defaults() {
+        return {
+            title: 'AWS S3',
+            name: 'aws-s3',
+            type: constants_1.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,
+            },
+        };
+    },
 };
-//# sourceMappingURL=s3.js.map
+//# sourceMappingURL=s3.js.map

package/lib/storages/s3.js.map

@@ -1 +1 @@
-{"version":3,"sources":["storages/s3.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,4CAA+C;AAC/C,oCAA+C;AAE/C,kBAAe;IACb,WAAW,EAAE,KAAK;IAClB,IAAI,CAAC,OAAO;QACV,MAAM,QAAQ,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;QAC/C,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;QACtC,MAAM,KAMF,OAAO,CAAC,OAAO,EANb,EACJ,WAAW,EACX,eAAe,EACf,MAAM,EACN,GAAG,GAAG,aAAa,OAEF,EADd,OAAO,cALN,mDAML,CAAkB,CAAC;QACpB,MAAM,EAAE,GAAG,IAAI,QAAQ,iCAClB,OAAO,KACV,WAAW,EAAE;gBACX,WAAW;gBACX,eAAe;aAChB,IACD,CAAC;QAEH,OAAO,QAAQ,CAAC;YACd,EAAE;YACF,MAAM;YACN,GAAG;YACH,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;gBACvB,IAAI,IAAI,CAAC,QAAQ,EAAE;oBACjB,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACxB,OAAO;iBACR;gBAED,QAAQ,CAAC,iBAAiB,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;YAC5C,CAAC;YACD,GAAG,EAAE,IAAA,2BAAmB,EAAC,OAAO,CAAC;SAClC,CAAC,CAAC;IACL,CAAC;IACD,QAAQ;QACN,OAAO;YACL,KAAK,EAAE,QAAQ;YACf,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,2BAAe;YACrB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB;YAC5C,OAAO,EAAE;gBACP,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;gBACjC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;gBAC1C,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;gBAClD,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;aAClC;SACF,CAAA;IACH,CAAC;CACF,CAAA","file":"s3.js","sourcesContent":["import { STORAGE_TYPE_S3 } from '../constants';\nimport { cloudFilenameGetter } from '../utils';\n\nexport default {\n  filenameKey: 'key',\n  make(storage) {\n    const S3Client = require('aws-sdk/clients/s3');\n    const multerS3 = require('multer-s3');\n    const {\n      accessKeyId,\n      secretAccessKey,\n      bucket,\n      acl = 'public-read',\n      ...options\n    } = storage.options;\n    const s3 = new S3Client({\n      ...options,\n      credentials: {\n        accessKeyId,\n        secretAccessKey\n      }\n    });\n\n    return multerS3({\n      s3,\n      bucket,\n      acl,\n      contentType(req, file, cb) {\n        if (file.mimetype) {\n          cb(null, file.mimetype);\n          return;\n        }\n      \n        multerS3.AUTO_CONTENT_TYPE(req, file, cb);\n      },\n      key: cloudFilenameGetter(storage)\n    });\n  },\n  defaults() {\n    return {\n      title: 'AWS S3',\n      name: 'aws-s3',\n      type: STORAGE_TYPE_S3,\n      baseUrl: process.env.AWS_S3_STORAGE_BASE_URL,\n      options: {\n        region: process.env.AWS_S3_REGION,\n        accessKeyId: process.env.AWS_ACCESS_KEY_ID,\n        secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,\n        bucket: process.env.AWS_S3_BUCKET,\n      }\n    }\n  }\n}\n"]}
+{"version":3,"file":"s3.js","sourceRoot":"","sources":["../../src/storages/s3.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,4CAA+C;AAC/C,oCAA+C;AAE/C,kBAAe;IACb,WAAW,EAAE,KAAK;IAClB,IAAI,CAAC,OAAO;QACV,MAAM,QAAQ,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;QAC/C,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;QACtC,MAAM,KAA4E,OAAO,CAAC,OAAO,EAA3F,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,GAAG,aAAa,OAAgC,EAA3B,OAAO,cAAvE,mDAAyE,CAAkB,CAAC;QAClG,MAAM,EAAE,GAAG,IAAI,QAAQ,iCAClB,OAAO,KACV,WAAW,EAAE;gBACX,WAAW;gBACX,eAAe;aAChB,IACD,CAAC;QAEH,OAAO,QAAQ,CAAC;YACd,EAAE;YACF,MAAM;YACN,GAAG;YACH,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;gBACvB,IAAI,IAAI,CAAC,QAAQ,EAAE;oBACjB,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACxB,OAAO;iBACR;gBAED,QAAQ,CAAC,iBAAiB,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;YAC5C,CAAC;YACD,GAAG,EAAE,IAAA,2BAAmB,EAAC,OAAO,CAAC;SAClC,CAAC,CAAC;IACL,CAAC;IACD,QAAQ;QACN,OAAO;YACL,KAAK,EAAE,QAAQ;YACf,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,2BAAe;YACrB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB;YAC5C,OAAO,EAAE;gBACP,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;gBACjC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;gBAC1C,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;gBAClD,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;aAClC;SACF,CAAC;IACJ,CAAC;CACF,CAAC","sourcesContent":["import { STORAGE_TYPE_S3 } from '../constants';\nimport { cloudFilenameGetter } from '../utils';\n\nexport default {\n  filenameKey: 'key',\n  make(storage) {\n    const S3Client = require('aws-sdk/clients/s3');\n    const multerS3 = require('multer-s3');\n    const { accessKeyId, secretAccessKey, bucket, acl = 'public-read', ...options } = storage.options;\n    const s3 = new S3Client({\n      ...options,\n      credentials: {\n        accessKeyId,\n        secretAccessKey,\n      },\n    });\n\n    return multerS3({\n      s3,\n      bucket,\n      acl,\n      contentType(req, file, cb) {\n        if (file.mimetype) {\n          cb(null, file.mimetype);\n          return;\n        }\n\n        multerS3.AUTO_CONTENT_TYPE(req, file, cb);\n      },\n      key: cloudFilenameGetter(storage),\n    });\n  },\n  defaults() {\n    return {\n      title: 'AWS S3',\n      name: 'aws-s3',\n      type: STORAGE_TYPE_S3,\n      baseUrl: process.env.AWS_S3_STORAGE_BASE_URL,\n      options: {\n        region: process.env.AWS_S3_REGION,\n        accessKeyId: process.env.AWS_ACCESS_KEY_ID,\n        secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,\n        bucket: process.env.AWS_S3_BUCKET,\n      },\n    };\n  },\n};\n"]}