@nocobase/plugin-file-manager 0.5.0-alpha.32 → 0.5.0-alpha.36

package/lib/actions/upload.d.ts.map

@@ -1 +1 @@
-{"version":3,"sources":["actions/upload.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AA2BlD,wBAAsB,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,gBAkDxD;AAED,wBAAsB,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,kBAwCpD","file":"upload.d.ts","sourcesContent":["import path from 'path';\nimport multer from '@koa/multer';\nimport { Context, Next } from '@nocobase/actions';\nimport storageMakers from '../storages';\nimport * as Rules from '../rules';\nimport { FILE_FIELD_NAME, LIMIT_FILES, LIMIT_MAX_FILE_SIZE } from '../constants';\n\nfunction getRules(ctx: Context) {\n  const { resourceField } = ctx.action.params;\n  if (!resourceField) {\n    return ctx.storage.rules;\n  }\n  const { rules = {} } = resourceField.getOptions().attachment || {};\n  return Object.assign({}, ctx.storage.rules, rules);\n}\n\n// TODO(optimize): 需要优化错误处理，计算失败后需要抛出对应错误，以便程序处理\nfunction getFileFilter(ctx: Context) {\n  return (req, file, cb) => {\n    // size 交给 limits 处理\n    const { size, ...rules } = getRules(ctx);\n    const ruleKeys = Object.keys(rules);\n    const result = !ruleKeys.length || !ruleKeys\n      .some(key => typeof Rules[key] !== 'function'\n        || !Rules[key](file, rules[key], ctx));\n    cb(null, result);\n  }\n}\n\nexport async function middleware(ctx: Context, next: Next) {\n  const { resourceName, actionName, resourceField } = ctx.action.params;\n  if (actionName !== 'upload') {\n    return next();\n  }\n\n  // NOTE:\n  // 1. 存储引擎选择依赖于字段定义\n  // 2. 字段定义中需包含引擎的外键值\n  // 3. 无字段时按 storages 表的默认项\n  // 4. 插件初始化后应提示用户添加至少一个存储引擎并设为默认\n\n  const StorageModel = ctx.db.getModel('storages');\n  let storage;\n\n  if (resourceName === 'attachments') {\n    // 如果没有包含关联，则直接按默认文件上传至默认存储引擎\n    storage = await StorageModel.findOne({ where: { default: true } });\n  } else {\n    const fieldOptions = resourceField.getOptions();\n    storage = await StorageModel.findOne({\n      where: fieldOptions.defaultValue\n        ? { [StorageModel.primaryKeyAttribute]: fieldOptions.defaultValue }\n        : { default: true }\n    });\n  }\n\n  if (!storage) {\n    console.error('[file-manager] no default or linked storage provided');\n    return ctx.throw(500);\n  }\n  // 传递已取得的存储引擎，避免重查\n  ctx.storage = storage;\n\n  const makeStorage = storageMakers.get(storage.type);\n  if (!makeStorage) {\n    console.error(`[file-manager] storage type \"${storage.type}\" is not defined`);\n    return ctx.throw(500);\n  }\n  const multerOptions = {\n    fileFilter: getFileFilter(ctx),\n    limits: {\n      fileSize: Math.min(getRules(ctx).size || LIMIT_MAX_FILE_SIZE, LIMIT_MAX_FILE_SIZE),\n      // 每次只允许提交一个文件\n      files: LIMIT_FILES\n    },\n    storage: makeStorage(storage),\n  };\n  const upload = multer(multerOptions);\n  return upload.single(FILE_FIELD_NAME)(ctx, next);\n};\n\nexport async function action(ctx: Context, next: Next) {\n  const { [FILE_FIELD_NAME]: file, storage } = ctx;\n  if (!file) {\n    return ctx.throw(400, 'file validation failed');\n  }\n  const { associatedName, associatedKey, resourceField } = ctx.action.params;\n  const extname = path.extname(file.filename);\n  const data = {\n    title: file.originalname.replace(extname, ''),\n    filename: file.filename,\n    extname,\n    // TODO(feature): 暂时两者相同，后面 storage.path 模版化以后，这里只是 file 实际的 path\n    path: storage.path,\n    size: file.size,\n    // 直接缓存起来\n    url: `${storage.baseUrl}${storage.path}/${file.filename}`,\n    mimetype: file.mimetype,\n    // @ts-ignore\n    meta: ctx.request.body\n  }\n\n  const attachment = await ctx.db.sequelize.transaction(async transaction => {\n    // TODO(optimize): 应使用关联 accessors 获取\n    const result = await storage.createAttachment(data, { transaction });\n\n    if (associatedKey && resourceField) {\n      const Attachment = ctx.db.getModel('attachments');\n      const SourceModel = ctx.db.getModel(associatedName);\n      const source = await SourceModel.findByPk(associatedKey, { transaction });\n      await source[resourceField.getAccessors().set](result[Attachment.primaryKeyAttribute], { transaction });\n    }\n\n    return result;\n  });\n\n  // 将存储引擎的信息附在已创建的记录里，节省一次查询\n  // attachment.setDataValue('storage', storage);\n  ctx.body = attachment;\n\n  await next();\n};\n"]}
+{"version":3,"sources":["actions/upload.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AA2BlD,wBAAsB,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,gBAkDxD;AAED,wBAAsB,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,kBAkDpD","file":"upload.d.ts","sourcesContent":["import path from 'path';\nimport multer from '@koa/multer';\nimport { Context, Next } from '@nocobase/actions';\nimport { getStorageConfig } from '../storages';\nimport * as Rules from '../rules';\nimport { FILE_FIELD_NAME, LIMIT_FILES, LIMIT_MAX_FILE_SIZE } from '../constants';\n\nfunction getRules(ctx: Context) {\n  const { resourceField } = ctx.action.params;\n  if (!resourceField) {\n    return ctx.storage.rules;\n  }\n  const { rules = {} } = resourceField.getOptions().attachment || {};\n  return Object.assign({}, ctx.storage.rules, rules);\n}\n\n// TODO(optimize): 需要优化错误处理，计算失败后需要抛出对应错误，以便程序处理\nfunction getFileFilter(ctx: Context) {\n  return (req, file, cb) => {\n    // size 交给 limits 处理\n    const { size, ...rules } = getRules(ctx);\n    const ruleKeys = Object.keys(rules);\n    const result = !ruleKeys.length || !ruleKeys\n      .some(key => typeof Rules[key] !== 'function'\n        || !Rules[key](file, rules[key], ctx));\n    cb(null, result);\n  }\n}\n\nexport async function middleware(ctx: Context, next: Next) {\n  const { resourceName, actionName, resourceField } = ctx.action.params;\n  if (actionName !== 'upload') {\n    return next();\n  }\n\n  // NOTE:\n  // 1. 存储引擎选择依赖于字段定义\n  // 2. 字段定义中需包含引擎的外键值\n  // 3. 无字段时按 storages 表的默认项\n  // 4. 插件初始化后应提示用户添加至少一个存储引擎并设为默认\n\n  const StorageModel = ctx.db.getModel('storages');\n  let storage;\n\n  if (resourceName === 'attachments') {\n    // 如果没有包含关联，则直接按默认文件上传至默认存储引擎\n    storage = await StorageModel.findOne({ where: { default: true } });\n  } else {\n    const { attachment = {} } = resourceField.getOptions();\n    storage = await StorageModel.findOne({\n      where: attachment.storage\n        ? { name: attachment.storage }\n        : { default: true }\n    });\n  }\n\n  if (!storage) {\n    console.error('[file-manager] no default or linked storage provided');\n    return ctx.throw(500);\n  }\n  // 传递已取得的存储引擎，避免重查\n  ctx.storage = storage;\n\n  const storageConfig = getStorageConfig(storage.type);\n  if (!storageConfig) {\n    console.error(`[file-manager] storage type \"${storage.type}\" is not defined`);\n    return ctx.throw(500);\n  }\n  const multerOptions = {\n    fileFilter: getFileFilter(ctx),\n    limits: {\n      fileSize: Math.min(getRules(ctx).size || LIMIT_MAX_FILE_SIZE, LIMIT_MAX_FILE_SIZE),\n      // 每次只允许提交一个文件\n      files: LIMIT_FILES\n    },\n    storage: storageConfig.make(storage),\n  };\n  const upload = multer(multerOptions).single(FILE_FIELD_NAME);\n  return upload(ctx, next);\n};\n\nexport async function action(ctx: Context, next: Next) {\n  const { [FILE_FIELD_NAME]: file, storage } = ctx;\n  if (!file) {\n    return ctx.throw(400, 'file validation failed');\n  }\n\n  const storageConfig = getStorageConfig(storage.type);\n  const { [storageConfig.filenameKey || 'filename']: name } = file;\n  // make compatible filename across cloud service (with path)\n  const filename = path.basename(name);\n  const extname = path.extname(filename);\n  const urlPath = storage.path\n    ? storage.path.replace(/^([^\\/])/, '/$1')\n    : '';\n\n  const data = {\n    title: file.originalname.replace(extname, ''),\n    filename,\n    extname,\n    // TODO(feature): 暂时两者相同，后面 storage.path 模版化以后，这里只是 file 实际的 path\n    path: storage.path,\n    size: file.size,\n    // 直接缓存起来\n    url: `${storage.baseUrl}${urlPath}/${filename}`,\n    mimetype: file.mimetype,\n    // @ts-ignore\n    meta: ctx.request.body,\n    ...(storageConfig.getFileData ? storageConfig.getFileData(file) : {})\n  };\n  \n  const attachment = await ctx.db.sequelize.transaction(async transaction => {\n    // TODO(optimize): 应使用关联 accessors 获取\n    const result = await storage.createAttachment(data, { transaction });\n    \n    const { associatedName, associatedIndex, resourceField } = ctx.action.params;\n    if (associatedIndex && resourceField) {\n      const Attachment = ctx.db.getModel('attachments');\n      const SourceModel = ctx.db.getModel(associatedName);\n      const source = await SourceModel.findByPk(associatedIndex, { transaction });\n      await source[resourceField.getAccessors().set](result[Attachment.primaryKeyAttribute], { transaction });\n    }\n\n    return result;\n  });\n\n  // 将存储引擎的信息附在已创建的记录里，节省一次查询\n  // attachment.setDataValue('storage', storage);\n  ctx.body = attachment;\n\n  await next();\n};\n"]}

package/lib/actions/upload.js

@@ -102,7 +102,7 @@ const path_1 = __importDefault(require("path"));
 
 const multer_1 = __importDefault(require("@koa/multer"));
 
-const storages_1 = __importDefault(require("../storages"));
+const storages_1 = require("../storages");
 
 const Rules = __importStar(require("../rules"));
 
@@ -155,10 +155,13 @@ function middleware(ctx, next) {
         }
       });
     } else {
-      const fieldOptions = resourceField.getOptions();
+      const _resourceField$getOpt = resourceField.getOptions(),
+            _resourceField$getOpt2 = _resourceField$getOpt.attachment,
+            attachment = _resourceField$getOpt2 === void 0 ? {} : _resourceField$getOpt2;
+
       storage = yield StorageModel.findOne({
-        where: fieldOptions.defaultValue ? {
-          [StorageModel.primaryKeyAttribute]: fieldOptions.defaultValue
+        where: attachment.storage ? {
+          name: attachment.storage
         } : {
           default: true
         }
@@ -171,9 +174,9 @@ function middleware(ctx, next) {
     }
 
     ctx.storage = storage;
-    const makeStorage = storages_1.default.get(storage.type);
+    const storageConfig = (0, storages_1.getStorageConfig)(storage.type);
 
-    if (!makeStorage) {
+    if (!storageConfig) {
       console.error(`[file-manager] storage type "${storage.type}" is not defined`);
       return ctx.throw(500);
     }
@@ -184,10 +187,10 @@ function middleware(ctx, next) {
         fileSize: Math.min(getRules(ctx).size || constants_1.LIMIT_MAX_FILE_SIZE, constants_1.LIMIT_MAX_FILE_SIZE),
         files: constants_1.LIMIT_FILES
       },
-      storage: makeStorage(storage)
+      storage: storageConfig.make(storage)
     };
-    const upload = multer_1.default(multerOptions);
-    return upload.single(constants_1.FILE_FIELD_NAME)(ctx, next);
+    const upload = (0, multer_1.default)(multerOptions).single(constants_1.FILE_FIELD_NAME);
+    return upload(ctx, next);
   });
 }
 
@@ -203,30 +206,34 @@ function action(ctx, next) {
       return ctx.throw(400, 'file validation failed');
     }
 
-    const _ctx$action$params2 = ctx.action.params,
-          associatedName = _ctx$action$params2.associatedName,
-          associatedKey = _ctx$action$params2.associatedKey,
-          resourceField = _ctx$action$params2.resourceField;
-    const extname = path_1.default.extname(file.filename);
-    const data = {
+    const storageConfig = (0, storages_1.getStorageConfig)(storage.type);
+    const name = file[storageConfig.filenameKey || 'filename'];
+    const filename = path_1.default.basename(name);
+    const extname = path_1.default.extname(filename);
+    const urlPath = storage.path ? storage.path.replace(/^([^\/])/, '/$1') : '';
+    const data = Object.assign({
       title: file.originalname.replace(extname, ''),
-      filename: file.filename,
+      filename,
       extname,
       path: storage.path,
       size: file.size,
-      url: `${storage.baseUrl}${storage.path}/${file.filename}`,
+      url: `${storage.baseUrl}${urlPath}/${filename}`,
       mimetype: file.mimetype,
       meta: ctx.request.body
-    };
+    }, storageConfig.getFileData ? storageConfig.getFileData(file) : {});
     const attachment = yield ctx.db.sequelize.transaction(transaction => __awaiter(this, void 0, void 0, function* () {
       const result = yield storage.createAttachment(data, {
         transaction
       });
+      const _ctx$action$params2 = ctx.action.params,
+            associatedName = _ctx$action$params2.associatedName,
+            associatedIndex = _ctx$action$params2.associatedIndex,
+            resourceField = _ctx$action$params2.resourceField;
 
-      if (associatedKey && resourceField) {
+      if (associatedIndex && resourceField) {
         const Attachment = ctx.db.getModel('attachments');
         const SourceModel = ctx.db.getModel(associatedName);
-        const source = yield SourceModel.findByPk(associatedKey, {
+        const source = yield SourceModel.findByPk(associatedIndex, {
           transaction
         });
         yield source[resourceField.getAccessors().set](result[Attachment.primaryKeyAttribute], {

package/lib/actions/upload.js.map

@@ -1 +1 @@
-{"version":3,"sources":["actions/upload.ts"],"names":[],"mappings":"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","file":"upload.js","sourcesContent":["import path from 'path';\nimport multer from '@koa/multer';\nimport { Context, Next } from '@nocobase/actions';\nimport storageMakers from '../storages';\nimport * as Rules from '../rules';\nimport { FILE_FIELD_NAME, LIMIT_FILES, LIMIT_MAX_FILE_SIZE } from '../constants';\n\nfunction getRules(ctx: Context) {\n  const { resourceField } = ctx.action.params;\n  if (!resourceField) {\n    return ctx.storage.rules;\n  }\n  const { rules = {} } = resourceField.getOptions().attachment || {};\n  return Object.assign({}, ctx.storage.rules, rules);\n}\n\n// TODO(optimize): 需要优化错误处理，计算失败后需要抛出对应错误，以便程序处理\nfunction getFileFilter(ctx: Context) {\n  return (req, file, cb) => {\n    // size 交给 limits 处理\n    const { size, ...rules } = getRules(ctx);\n    const ruleKeys = Object.keys(rules);\n    const result = !ruleKeys.length || !ruleKeys\n      .some(key => typeof Rules[key] !== 'function'\n        || !Rules[key](file, rules[key], ctx));\n    cb(null, result);\n  }\n}\n\nexport async function middleware(ctx: Context, next: Next) {\n  const { resourceName, actionName, resourceField } = ctx.action.params;\n  if (actionName !== 'upload') {\n    return next();\n  }\n\n  // NOTE:\n  // 1. 存储引擎选择依赖于字段定义\n  // 2. 字段定义中需包含引擎的外键值\n  // 3. 无字段时按 storages 表的默认项\n  // 4. 插件初始化后应提示用户添加至少一个存储引擎并设为默认\n\n  const StorageModel = ctx.db.getModel('storages');\n  let storage;\n\n  if (resourceName === 'attachments') {\n    // 如果没有包含关联，则直接按默认文件上传至默认存储引擎\n    storage = await StorageModel.findOne({ where: { default: true } });\n  } else {\n    const fieldOptions = resourceField.getOptions();\n    storage = await StorageModel.findOne({\n      where: fieldOptions.defaultValue\n        ? { [StorageModel.primaryKeyAttribute]: fieldOptions.defaultValue }\n        : { default: true }\n    });\n  }\n\n  if (!storage) {\n    console.error('[file-manager] no default or linked storage provided');\n    return ctx.throw(500);\n  }\n  // 传递已取得的存储引擎，避免重查\n  ctx.storage = storage;\n\n  const makeStorage = storageMakers.get(storage.type);\n  if (!makeStorage) {\n    console.error(`[file-manager] storage type \"${storage.type}\" is not defined`);\n    return ctx.throw(500);\n  }\n  const multerOptions = {\n    fileFilter: getFileFilter(ctx),\n    limits: {\n      fileSize: Math.min(getRules(ctx).size || LIMIT_MAX_FILE_SIZE, LIMIT_MAX_FILE_SIZE),\n      // 每次只允许提交一个文件\n      files: LIMIT_FILES\n    },\n    storage: makeStorage(storage),\n  };\n  const upload = multer(multerOptions);\n  return upload.single(FILE_FIELD_NAME)(ctx, next);\n};\n\nexport async function action(ctx: Context, next: Next) {\n  const { [FILE_FIELD_NAME]: file, storage } = ctx;\n  if (!file) {\n    return ctx.throw(400, 'file validation failed');\n  }\n  const { associatedName, associatedKey, resourceField } = ctx.action.params;\n  const extname = path.extname(file.filename);\n  const data = {\n    title: file.originalname.replace(extname, ''),\n    filename: file.filename,\n    extname,\n    // TODO(feature): 暂时两者相同，后面 storage.path 模版化以后，这里只是 file 实际的 path\n    path: storage.path,\n    size: file.size,\n    // 直接缓存起来\n    url: `${storage.baseUrl}${storage.path}/${file.filename}`,\n    mimetype: file.mimetype,\n    // @ts-ignore\n    meta: ctx.request.body\n  }\n\n  const attachment = await ctx.db.sequelize.transaction(async transaction => {\n    // TODO(optimize): 应使用关联 accessors 获取\n    const result = await storage.createAttachment(data, { transaction });\n\n    if (associatedKey && resourceField) {\n      const Attachment = ctx.db.getModel('attachments');\n      const SourceModel = ctx.db.getModel(associatedName);\n      const source = await SourceModel.findByPk(associatedKey, { transaction });\n      await source[resourceField.getAccessors().set](result[Attachment.primaryKeyAttribute], { transaction });\n    }\n\n    return result;\n  });\n\n  // 将存储引擎的信息附在已创建的记录里，节省一次查询\n  // attachment.setDataValue('storage', storage);\n  ctx.body = attachment;\n\n  await next();\n};\n"]}
+{"version":3,"sources":["actions/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AACxB,yDAAiC;AAEjC,0CAA+C;AAC/C,gDAAkC;AAClC,4CAAiF;AAEjF,SAAS,QAAQ,CAAC,GAAY;IAC5B,MAAM,EAAE,aAAa,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC;IAC5C,IAAI,CAAC,aAAa,EAAE;QAClB,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC;KAC1B;IACD,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,GAAG,aAAa,CAAC,UAAU,EAAE,CAAC,UAAU,IAAI,EAAE,CAAC;IACnE,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AACrD,CAAC;AAGD,SAAS,aAAa,CAAC,GAAY;IACjC,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE;QAEvB,MAAM,KAAqB,QAAQ,CAAC,GAAG,CAAC,EAAlC,EAAE,IAAI,OAA4B,EAAvB,KAAK,cAAhB,QAAkB,CAAgB,CAAC;QACzC,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpC,MAAM,MAAM,GAAG,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,QAAQ;aACzC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,KAAK,CAAC,GAAG,CAAC,KAAK,UAAU;eACxC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;QAC3C,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACnB,CAAC,CAAA;AACH,CAAC;AAED,SAAsB,UAAU,CAAC,GAAY,EAAE,IAAU;;QACvD,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC;QACtE,IAAI,UAAU,KAAK,QAAQ,EAAE;YAC3B,OAAO,IAAI,EAAE,CAAC;SACf;QAQD,MAAM,YAAY,GAAG,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACjD,IAAI,OAAO,CAAC;QAEZ,IAAI,YAAY,KAAK,aAAa,EAAE;YAElC,OAAO,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;SACpE;aAAM;YACL,MAAM,EAAE,UAAU,GAAG,EAAE,EAAE,GAAG,aAAa,CAAC,UAAU,EAAE,CAAC;YACvD,OAAO,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC;gBACnC,KAAK,EAAE,UAAU,CAAC,OAAO;oBACvB,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,OAAO,EAAE;oBAC9B,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE;aACtB,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAC;YACtE,OAAO,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACvB;QAED,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC;QAEtB,MAAM,aAAa,GAAG,IAAA,2BAAgB,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACrD,IAAI,CAAC,aAAa,EAAE;YAClB,OAAO,CAAC,KAAK,CAAC,gCAAgC,OAAO,CAAC,IAAI,kBAAkB,CAAC,CAAC;YAC9E,OAAO,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACvB;QACD,MAAM,aAAa,GAAG;YACpB,UAAU,EAAE,aAAa,CAAC,GAAG,CAAC;YAC9B,MAAM,EAAE;gBACN,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,+BAAmB,EAAE,+BAAmB,CAAC;gBAElF,KAAK,EAAE,uBAAW;aACnB;YACD,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC;SACrC,CAAC;QACF,MAAM,MAAM,GAAG,IAAA,gBAAM,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,2BAAe,CAAC,CAAC;QAC7D,OAAO,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC3B,CAAC;CAAA;AAlDD,gCAkDC;AAAA,CAAC;AAEF,SAAsB,MAAM,CAAC,GAAY,EAAE,IAAU;;QACnD,MAAM,EAAE,CAAC,2BAAe,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;QACjD,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,wBAAwB,CAAC,CAAC;SACjD;QAED,MAAM,aAAa,GAAG,IAAA,2BAAgB,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,EAAE,CAAC,aAAa,CAAC,WAAW,IAAI,UAAU,CAAC,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QAEjE,MAAM,QAAQ,GAAG,cAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACrC,MAAM,OAAO,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACvC,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI;YAC1B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC;YACzC,CAAC,CAAC,EAAE,CAAC;QAEP,MAAM,IAAI,mBACR,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,EAC7C,QAAQ;YACR,OAAO,EAEP,IAAI,EAAE,OAAO,CAAC,IAAI,EAClB,IAAI,EAAE,IAAI,CAAC,IAAI,EAEf,GAAG,EAAE,GAAG,OAAO,CAAC,OAAO,GAAG,OAAO,IAAI,QAAQ,EAAE,EAC/C,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAEvB,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,IACnB,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CACtE,CAAC;QAEF,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,CAAM,WAAW,EAAC,EAAE;YAExE,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;YAErE,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,aAAa,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC;YAC7E,IAAI,eAAe,IAAI,aAAa,EAAE;gBACpC,MAAM,UAAU,GAAG,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;gBAClD,MAAM,WAAW,GAAG,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;gBACpD,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC,eAAe,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;gBAC5E,MAAM,MAAM,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;aACzG;YAED,OAAO,MAAM,CAAC;QAChB,CAAC,CAAA,CAAC,CAAC;QAIH,GAAG,CAAC,IAAI,GAAG,UAAU,CAAC;QAEtB,MAAM,IAAI,EAAE,CAAC;IACf,CAAC;CAAA;AAlDD,wBAkDC;AAAA,CAAC","file":"upload.js","sourcesContent":["import path from 'path';\nimport multer from '@koa/multer';\nimport { Context, Next } from '@nocobase/actions';\nimport { getStorageConfig } from '../storages';\nimport * as Rules from '../rules';\nimport { FILE_FIELD_NAME, LIMIT_FILES, LIMIT_MAX_FILE_SIZE } from '../constants';\n\nfunction getRules(ctx: Context) {\n  const { resourceField } = ctx.action.params;\n  if (!resourceField) {\n    return ctx.storage.rules;\n  }\n  const { rules = {} } = resourceField.getOptions().attachment || {};\n  return Object.assign({}, ctx.storage.rules, rules);\n}\n\n// TODO(optimize): 需要优化错误处理，计算失败后需要抛出对应错误，以便程序处理\nfunction getFileFilter(ctx: Context) {\n  return (req, file, cb) => {\n    // size 交给 limits 处理\n    const { size, ...rules } = getRules(ctx);\n    const ruleKeys = Object.keys(rules);\n    const result = !ruleKeys.length || !ruleKeys\n      .some(key => typeof Rules[key] !== 'function'\n        || !Rules[key](file, rules[key], ctx));\n    cb(null, result);\n  }\n}\n\nexport async function middleware(ctx: Context, next: Next) {\n  const { resourceName, actionName, resourceField } = ctx.action.params;\n  if (actionName !== 'upload') {\n    return next();\n  }\n\n  // NOTE:\n  // 1. 存储引擎选择依赖于字段定义\n  // 2. 字段定义中需包含引擎的外键值\n  // 3. 无字段时按 storages 表的默认项\n  // 4. 插件初始化后应提示用户添加至少一个存储引擎并设为默认\n\n  const StorageModel = ctx.db.getModel('storages');\n  let storage;\n\n  if (resourceName === 'attachments') {\n    // 如果没有包含关联，则直接按默认文件上传至默认存储引擎\n    storage = await StorageModel.findOne({ where: { default: true } });\n  } else {\n    const { attachment = {} } = resourceField.getOptions();\n    storage = await StorageModel.findOne({\n      where: attachment.storage\n        ? { name: attachment.storage }\n        : { default: true }\n    });\n  }\n\n  if (!storage) {\n    console.error('[file-manager] no default or linked storage provided');\n    return ctx.throw(500);\n  }\n  // 传递已取得的存储引擎，避免重查\n  ctx.storage = storage;\n\n  const storageConfig = getStorageConfig(storage.type);\n  if (!storageConfig) {\n    console.error(`[file-manager] storage type \"${storage.type}\" is not defined`);\n    return ctx.throw(500);\n  }\n  const multerOptions = {\n    fileFilter: getFileFilter(ctx),\n    limits: {\n      fileSize: Math.min(getRules(ctx).size || LIMIT_MAX_FILE_SIZE, LIMIT_MAX_FILE_SIZE),\n      // 每次只允许提交一个文件\n      files: LIMIT_FILES\n    },\n    storage: storageConfig.make(storage),\n  };\n  const upload = multer(multerOptions).single(FILE_FIELD_NAME);\n  return upload(ctx, next);\n};\n\nexport async function action(ctx: Context, next: Next) {\n  const { [FILE_FIELD_NAME]: file, storage } = ctx;\n  if (!file) {\n    return ctx.throw(400, 'file validation failed');\n  }\n\n  const storageConfig = getStorageConfig(storage.type);\n  const { [storageConfig.filenameKey || 'filename']: name } = file;\n  // make compatible filename across cloud service (with path)\n  const filename = path.basename(name);\n  const extname = path.extname(filename);\n  const urlPath = storage.path\n    ? storage.path.replace(/^([^\\/])/, '/$1')\n    : '';\n\n  const data = {\n    title: file.originalname.replace(extname, ''),\n    filename,\n    extname,\n    // TODO(feature): 暂时两者相同，后面 storage.path 模版化以后，这里只是 file 实际的 path\n    path: storage.path,\n    size: file.size,\n    // 直接缓存起来\n    url: `${storage.baseUrl}${urlPath}/${filename}`,\n    mimetype: file.mimetype,\n    // @ts-ignore\n    meta: ctx.request.body,\n    ...(storageConfig.getFileData ? storageConfig.getFileData(file) : {})\n  };\n  \n  const attachment = await ctx.db.sequelize.transaction(async transaction => {\n    // TODO(optimize): 应使用关联 accessors 获取\n    const result = await storage.createAttachment(data, { transaction });\n    \n    const { associatedName, associatedIndex, resourceField } = ctx.action.params;\n    if (associatedIndex && resourceField) {\n      const Attachment = ctx.db.getModel('attachments');\n      const SourceModel = ctx.db.getModel(associatedName);\n      const source = await SourceModel.findByPk(associatedIndex, { transaction });\n      await source[resourceField.getAccessors().set](result[Attachment.primaryKeyAttribute], { transaction });\n    }\n\n    return result;\n  });\n\n  // 将存储引擎的信息附在已创建的记录里，节省一次查询\n  // attachment.setDataValue('storage', storage);\n  ctx.body = attachment;\n\n  await next();\n};\n"]}

package/lib/constants.d.ts

@@ -3,3 +3,4 @@ export declare const LIMIT_FILES = 1;
 export declare const LIMIT_MAX_FILE_SIZE: number;
 export declare const STORAGE_TYPE_LOCAL = "local";
 export declare const STORAGE_TYPE_ALI_OSS = "ali-oss";
+export declare const STORAGE_TYPE_S3 = "s3";

package/lib/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"sources":["constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe,SAAS,CAAC;AACtC,eAAO,MAAM,WAAW,IAAI,CAAC;AAC7B,eAAO,MAAM,mBAAmB,QAAqB,CAAC;AAEtD,eAAO,MAAM,kBAAkB,UAAU,CAAC;AAC1C,eAAO,MAAM,oBAAoB,YAAY,CAAC","file":"constants.d.ts","sourcesContent":["export const FILE_FIELD_NAME = 'file';\nexport const LIMIT_FILES = 1;\nexport const LIMIT_MAX_FILE_SIZE = 1024 * 1024 * 1024;\n\nexport const STORAGE_TYPE_LOCAL = 'local';\nexport const STORAGE_TYPE_ALI_OSS = 'ali-oss';\n"]}
+{"version":3,"sources":["constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe,SAAS,CAAC;AACtC,eAAO,MAAM,WAAW,IAAI,CAAC;AAC7B,eAAO,MAAM,mBAAmB,QAAqB,CAAC;AAEtD,eAAO,MAAM,kBAAkB,UAAU,CAAC;AAC1C,eAAO,MAAM,oBAAoB,YAAY,CAAC;AAC9C,eAAO,MAAM,eAAe,OAAO,CAAC","file":"constants.d.ts","sourcesContent":["export const FILE_FIELD_NAME = 'file';\nexport const LIMIT_FILES = 1;\nexport const LIMIT_MAX_FILE_SIZE = 1024 * 1024 * 1024;\n\nexport const STORAGE_TYPE_LOCAL = 'local';\nexport const STORAGE_TYPE_ALI_OSS = 'ali-oss';\nexport const STORAGE_TYPE_S3 = 's3';\n"]}

package/lib/constants.js

@@ -15,10 +15,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.STORAGE_TYPE_ALI_OSS = exports.STORAGE_TYPE_LOCAL = exports.LIMIT_MAX_FILE_SIZE = exports.LIMIT_FILES = exports.FILE_FIELD_NAME = void 0;
+exports.STORAGE_TYPE_S3 = exports.STORAGE_TYPE_ALI_OSS = exports.STORAGE_TYPE_LOCAL = exports.LIMIT_MAX_FILE_SIZE = exports.LIMIT_FILES = exports.FILE_FIELD_NAME = void 0;
 exports.FILE_FIELD_NAME = 'file';
 exports.LIMIT_FILES = 1;
 exports.LIMIT_MAX_FILE_SIZE = 1024 * 1024 * 1024;
 exports.STORAGE_TYPE_LOCAL = 'local';
 exports.STORAGE_TYPE_ALI_OSS = 'ali-oss';
+exports.STORAGE_TYPE_S3 = 's3';
 //# sourceMappingURL=constants.js.map

package/lib/constants.js.map

@@ -1 +1 @@
-{"version":3,"sources":["constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG,MAAM,CAAC;AACzB,QAAA,WAAW,GAAG,CAAC,CAAC;AAChB,QAAA,mBAAmB,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;AAEzC,QAAA,kBAAkB,GAAG,OAAO,CAAC;AAC7B,QAAA,oBAAoB,GAAG,SAAS,CAAC","file":"constants.js","sourcesContent":["export const FILE_FIELD_NAME = 'file';\nexport const LIMIT_FILES = 1;\nexport const LIMIT_MAX_FILE_SIZE = 1024 * 1024 * 1024;\n\nexport const STORAGE_TYPE_LOCAL = 'local';\nexport const STORAGE_TYPE_ALI_OSS = 'ali-oss';\n"]}
+{"version":3,"sources":["constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG,MAAM,CAAC;AACzB,QAAA,WAAW,GAAG,CAAC,CAAC;AAChB,QAAA,mBAAmB,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;AAEzC,QAAA,kBAAkB,GAAG,OAAO,CAAC;AAC7B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,eAAe,GAAG,IAAI,CAAC","file":"constants.js","sourcesContent":["export const FILE_FIELD_NAME = 'file';\nexport const LIMIT_FILES = 1;\nexport const LIMIT_MAX_FILE_SIZE = 1024 * 1024 * 1024;\n\nexport const STORAGE_TYPE_LOCAL = 'local';\nexport const STORAGE_TYPE_ALI_OSS = 'ali-oss';\nexport const STORAGE_TYPE_S3 = 's3';\n"]}

package/lib/index.d.ts

@@ -1 +1,2 @@
-
+export * from './constants';
+export { default } from './server';

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"sources":["index.ts"],"names":[],"mappings":"","file":"index.d.ts","sourcesContent":[""]}
+{"version":3,"sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC","file":"index.d.ts","sourcesContent":["export * from './constants';\nexport { default } from './server';\n"]}

package/lib/index.js

@@ -11,4 +11,43 @@ function _react() {
 }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var __createBinding = void 0 && (void 0).__createBinding || (Object.create ? function (o, m, k, k2) {
+  if (k2 === undefined) k2 = k;
+  Object.defineProperty(o, k2, {
+    enumerable: true,
+    get: function get() {
+      return m[k];
+    }
+  });
+} : function (o, m, k, k2) {
+  if (k2 === undefined) k2 = k;
+  o[k2] = m[k];
+});
+
+var __exportStar = void 0 && (void 0).__exportStar || function (m, exports) {
+  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+
+var __importDefault = void 0 && (void 0).__importDefault || function (mod) {
+  return mod && mod.__esModule ? mod : {
+    "default": mod
+  };
+};
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+__exportStar(require("./constants"), exports);
+
+var server_1 = require("./server");
+
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function get() {
+    return __importDefault(server_1).default;
+  }
+});
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["index.ts"],"names":[],"mappings":"","file":"index.js","sourcesContent":[""]}
+{"version":3,"sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8CAA4B;AAC5B,mCAAmC;AAA1B,kHAAA,OAAO,OAAA","file":"index.js","sourcesContent":["export * from './constants';\nexport { default } from './server';\n"]}

package/lib/rules/mimetype.js

@@ -25,7 +25,7 @@ Object.defineProperty(exports, "__esModule", {
 const mime_match_1 = __importDefault(require("mime-match"));
 
 function default_1(file, options = '*', ctx) {
-  return options.toString().split(',').some(mime_match_1.default(file.mimetype));
+  return options.toString().split(',').some((0, mime_match_1.default)(file.mimetype));
 }
 
 exports.default = default_1;

package/lib/rules/mimetype.js.map

@@ -1 +1 @@
-{"version":3,"sources":["rules/mimetype.ts"],"names":[],"mappings":";;;;;AAAA,4DAA+B;AAE/B,mBAAyB,IAAI,EAAE,UAA6B,GAAG,EAAE,GAAG;IAClE,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,oBAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;AAClE,CAAC;AAFD,4BAEC","file":"mimetype.js","sourcesContent":["import match from 'mime-match';\n\nexport default function (file, options: string | string[] = '*', ctx): boolean {\n  return options.toString().split(',').some(match(file.mimetype));\n}\n"]}
+{"version":3,"sources":["rules/mimetype.ts"],"names":[],"mappings":";;;;;AAAA,4DAA+B;AAE/B,mBAAyB,IAAI,EAAE,UAA6B,GAAG,EAAE,GAAG;IAClE,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,oBAAK,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;AAClE,CAAC;AAFD,4BAEC","file":"mimetype.js","sourcesContent":["import match from 'mime-match';\n\nexport default function (file, options: string | string[] = '*', ctx): boolean {\n  return options.toString().split(',').some(match(file.mimetype));\n}\n"]}

package/lib/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"sources":["server.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAU,MAAM,kBAAkB,CAAC;;AAUzD,wBAuCmB","file":"server.d.ts","sourcesContent":["import path from 'path';\nimport Database from '@nocobase/database';\nimport Resourcer from '@nocobase/resourcer';\nimport { PluginOptions, Plugin } from '@nocobase/server';\n\nimport {\n  action as uploadAction,\n  middleware as uploadMiddleware,\n} from './actions/upload';\nimport {\n  middleware as localMiddleware,\n} from './storages/local';\n\nexport default {\n  name: 'file-manager',\n  async load() {\n    const database: Database = this.app.db;\n    const resourcer: Resourcer = this.app.resourcer;\n  \n    database.import({\n      directory: path.resolve(__dirname, 'collections'),\n    });\n  \n    // 暂时中间件只能通过 use 加进来\n    resourcer.use(uploadMiddleware);\n    resourcer.registerActionHandler('upload', uploadAction);\n    localMiddleware(this.app);\n  \n    const Storage = database.getModel('storages');\n  \n    this.app.on('db.init', async () => {\n      await Storage.create({\n        title: '本地存储',\n        name: `local`,\n        type: 'local',\n        baseUrl: process.env.LOCAL_STORAGE_BASE_URL,\n        default: process.env.STORAGE_TYPE === 'local',\n      });\n      await Storage.create({\n        name: `ali-oss`,\n        type: 'ali-oss',\n        baseUrl: process.env.ALI_OSS_STORAGE_BASE_URL,\n        options: {\n          region: process.env.ALI_OSS_REGION,\n          accessKeyId: process.env.ALI_OSS_ACCESS_KEY_ID,\n          accessKeySecret: process.env.ALI_OSS_ACCESS_KEY_SECRET,\n          bucket: process.env.ALI_OSS_BUCKET,\n        },\n        default: process.env.STORAGE_TYPE === 'ali-oss',\n      });\n    });\n  },\n} as PluginOptions;\n"]}
+{"version":3,"sources":["server.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;;AASjD,wBAkCmB","file":"server.d.ts","sourcesContent":["import path from 'path';\nimport Database from '@nocobase/database';\nimport Resourcer from '@nocobase/resourcer';\nimport { PluginOptions } from '@nocobase/server';\n\nimport {\n  action as uploadAction,\n  middleware as uploadMiddleware,\n} from './actions/upload';\nimport { getStorageConfig } from './storages';\nimport { STORAGE_TYPE_LOCAL } from './constants';\n\nexport default {\n  name: 'file-manager',\n  async load() {\n    const database: Database = this.app.db;\n    const resourcer: Resourcer = this.app.resourcer;\n  \n    database.import({\n      directory: path.resolve(__dirname, 'collections'),\n    });\n  \n    // 暂时中间件只能通过 use 加进来\n    resourcer.use(uploadMiddleware);\n    resourcer.registerActionHandler('upload', uploadAction);\n\n    const { DEFAULT_STORAGE_TYPE } = process.env;\n\n    if (process.env.NOCOBASE_ENV !== 'production') {\n      this.app.on('beforeStart', async () => {\n        await getStorageConfig(STORAGE_TYPE_LOCAL).middleware(this.app);\n      });\n    }\n\n    this.app.on('db.init', async () => {\n      const defaultStorageConfig = getStorageConfig(DEFAULT_STORAGE_TYPE);\n      if (defaultStorageConfig) {\n        const StorageModel = database.getModel('storages');\n        await StorageModel.create({\n          ...defaultStorageConfig.defaults(),\n          type: DEFAULT_STORAGE_TYPE,\n          default: true\n        });\n      }\n    });\n  },\n} as PluginOptions;\n"]}

package/lib/server.js

@@ -58,7 +58,9 @@ const path_1 = __importDefault(require("path"));
 
 const upload_1 = require("./actions/upload");
 
-const local_1 = require("./storages/local");
+const storages_1 = require("./storages");
+
+const constants_1 = require("./constants");
 
 exports.default = {
   name: 'file-manager',
@@ -72,28 +74,24 @@ exports.default = {
       });
       resourcer.use(upload_1.middleware);
       resourcer.registerActionHandler('upload', upload_1.action);
-      local_1.middleware(this.app);
-      const Storage = database.getModel('storages');
+      const DEFAULT_STORAGE_TYPE = process.env.DEFAULT_STORAGE_TYPE;
+
+      if (process.env.NOCOBASE_ENV !== 'production') {
+        this.app.on('beforeStart', () => __awaiter(this, void 0, void 0, function* () {
+          yield (0, storages_1.getStorageConfig)(constants_1.STORAGE_TYPE_LOCAL).middleware(this.app);
+        }));
+      }
+
       this.app.on('db.init', () => __awaiter(this, void 0, void 0, function* () {
-        yield Storage.create({
-          title: '本地存储',
-          name: `local`,
-          type: 'local',
-          baseUrl: process.env.LOCAL_STORAGE_BASE_URL,
-          default: process.env.STORAGE_TYPE === 'local'
-        });
-        yield Storage.create({
-          name: `ali-oss`,
-          type: 'ali-oss',
-          baseUrl: process.env.ALI_OSS_STORAGE_BASE_URL,
-          options: {
-            region: process.env.ALI_OSS_REGION,
-            accessKeyId: process.env.ALI_OSS_ACCESS_KEY_ID,
-            accessKeySecret: process.env.ALI_OSS_ACCESS_KEY_SECRET,
-            bucket: process.env.ALI_OSS_BUCKET
-          },
-          default: process.env.STORAGE_TYPE === 'ali-oss'
-        });
+        const defaultStorageConfig = (0, storages_1.getStorageConfig)(DEFAULT_STORAGE_TYPE);
+
+        if (defaultStorageConfig) {
+          const StorageModel = database.getModel('storages');
+          yield StorageModel.create(Object.assign(Object.assign({}, defaultStorageConfig.defaults()), {
+            type: DEFAULT_STORAGE_TYPE,
+            default: true
+          }));
+        }
       }));
     });
   }

package/lib/server.js.map

@@ -1 +1 @@
-{"version":3,"sources":["server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,gDAAwB;AAKxB,6CAG0B;AAC1B,4CAE0B;AAE1B,kBAAe;IACb,IAAI,EAAE,cAAc;IACd,IAAI;;YACR,MAAM,QAAQ,GAAa,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YACvC,MAAM,SAAS,GAAc,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC;YAEhD,QAAQ,CAAC,MAAM,CAAC;gBACd,SAAS,EAAE,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC;aAClD,CAAC,CAAC;YAGH,SAAS,CAAC,GAAG,CAAC,mBAAgB,CAAC,CAAC;YAChC,SAAS,CAAC,qBAAqB,CAAC,QAAQ,EAAE,eAAY,CAAC,CAAC;YACxD,kBAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAE1B,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YAE9C,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,EAAE,GAAS,EAAE;gBAChC,MAAM,OAAO,CAAC,MAAM,CAAC;oBACnB,KAAK,EAAE,MAAM;oBACb,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,OAAO;oBACb,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB;oBAC3C,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,OAAO;iBAC9C,CAAC,CAAC;gBACH,MAAM,OAAO,CAAC,MAAM,CAAC;oBACnB,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,SAAS;oBACf,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB;oBAC7C,OAAO,EAAE;wBACP,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;wBAClC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;wBAC9C,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB;wBACtD,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;qBACnC;oBACD,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,SAAS;iBAChD,CAAC,CAAC;YACL,CAAC,CAAA,CAAC,CAAC;QACL,CAAC;KAAA;CACe,CAAC","file":"server.js","sourcesContent":["import path from 'path';\nimport Database from '@nocobase/database';\nimport Resourcer from '@nocobase/resourcer';\nimport { PluginOptions, Plugin } from '@nocobase/server';\n\nimport {\n  action as uploadAction,\n  middleware as uploadMiddleware,\n} from './actions/upload';\nimport {\n  middleware as localMiddleware,\n} from './storages/local';\n\nexport default {\n  name: 'file-manager',\n  async load() {\n    const database: Database = this.app.db;\n    const resourcer: Resourcer = this.app.resourcer;\n  \n    database.import({\n      directory: path.resolve(__dirname, 'collections'),\n    });\n  \n    // 暂时中间件只能通过 use 加进来\n    resourcer.use(uploadMiddleware);\n    resourcer.registerActionHandler('upload', uploadAction);\n    localMiddleware(this.app);\n  \n    const Storage = database.getModel('storages');\n  \n    this.app.on('db.init', async () => {\n      await Storage.create({\n        title: '本地存储',\n        name: `local`,\n        type: 'local',\n        baseUrl: process.env.LOCAL_STORAGE_BASE_URL,\n        default: process.env.STORAGE_TYPE === 'local',\n      });\n      await Storage.create({\n        name: `ali-oss`,\n        type: 'ali-oss',\n        baseUrl: process.env.ALI_OSS_STORAGE_BASE_URL,\n        options: {\n          region: process.env.ALI_OSS_REGION,\n          accessKeyId: process.env.ALI_OSS_ACCESS_KEY_ID,\n          accessKeySecret: process.env.ALI_OSS_ACCESS_KEY_SECRET,\n          bucket: process.env.ALI_OSS_BUCKET,\n        },\n        default: process.env.STORAGE_TYPE === 'ali-oss',\n      });\n    });\n  },\n} as PluginOptions;\n"]}
+{"version":3,"sources":["server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,gDAAwB;AAKxB,6CAG0B;AAC1B,yCAA8C;AAC9C,2CAAiD;AAEjD,kBAAe;IACb,IAAI,EAAE,cAAc;IACd,IAAI;;YACR,MAAM,QAAQ,GAAa,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YACvC,MAAM,SAAS,GAAc,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC;YAEhD,QAAQ,CAAC,MAAM,CAAC;gBACd,SAAS,EAAE,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC;aAClD,CAAC,CAAC;YAGH,SAAS,CAAC,GAAG,CAAC,mBAAgB,CAAC,CAAC;YAChC,SAAS,CAAC,qBAAqB,CAAC,QAAQ,EAAE,eAAY,CAAC,CAAC;YAExD,MAAM,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;YAE7C,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,YAAY,EAAE;gBAC7C,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,aAAa,EAAE,GAAS,EAAE;oBACpC,MAAM,IAAA,2BAAgB,EAAC,8BAAkB,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAClE,CAAC,CAAA,CAAC,CAAC;aACJ;YAED,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,EAAE,GAAS,EAAE;gBAChC,MAAM,oBAAoB,GAAG,IAAA,2BAAgB,EAAC,oBAAoB,CAAC,CAAC;gBACpE,IAAI,oBAAoB,EAAE;oBACxB,MAAM,YAAY,GAAG,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;oBACnD,MAAM,YAAY,CAAC,MAAM,iCACpB,oBAAoB,CAAC,QAAQ,EAAE,KAClC,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,IAAI,IACb,CAAC;iBACJ;YACH,CAAC,CAAA,CAAC,CAAC;QACL,CAAC;KAAA;CACe,CAAC","file":"server.js","sourcesContent":["import path from 'path';\nimport Database from '@nocobase/database';\nimport Resourcer from '@nocobase/resourcer';\nimport { PluginOptions } from '@nocobase/server';\n\nimport {\n  action as uploadAction,\n  middleware as uploadMiddleware,\n} from './actions/upload';\nimport { getStorageConfig } from './storages';\nimport { STORAGE_TYPE_LOCAL } from './constants';\n\nexport default {\n  name: 'file-manager',\n  async load() {\n    const database: Database = this.app.db;\n    const resourcer: Resourcer = this.app.resourcer;\n  \n    database.import({\n      directory: path.resolve(__dirname, 'collections'),\n    });\n  \n    // 暂时中间件只能通过 use 加进来\n    resourcer.use(uploadMiddleware);\n    resourcer.registerActionHandler('upload', uploadAction);\n\n    const { DEFAULT_STORAGE_TYPE } = process.env;\n\n    if (process.env.NOCOBASE_ENV !== 'production') {\n      this.app.on('beforeStart', async () => {\n        await getStorageConfig(STORAGE_TYPE_LOCAL).middleware(this.app);\n      });\n    }\n\n    this.app.on('db.init', async () => {\n      const defaultStorageConfig = getStorageConfig(DEFAULT_STORAGE_TYPE);\n      if (defaultStorageConfig) {\n        const StorageModel = database.getModel('storages');\n        await StorageModel.create({\n          ...defaultStorageConfig.defaults(),\n          type: DEFAULT_STORAGE_TYPE,\n          default: true\n        });\n      }\n    });\n  },\n} as PluginOptions;\n"]}

package/lib/storages/ali-oss.d.ts

@@ -1,9 +1,16 @@
-export declare class AliOssStorage {
-    private client;
-    private getFilename;
-    constructor(opts: any);
-    _handleFile(req: any, file: any, cb: any): any;
-    _removeFile(req: any, file: any, cb: any): any;
-}
-declare const _default: (storage: any) => AliOssStorage;
+declare const _default: {
+    make(storage: any): any;
+    defaults(): {
+        title: string;
+        type: string;
+        name: string;
+        baseUrl: string;
+        options: {
+            region: string;
+            accessKeyId: string;
+            accessKeySecret: string;
+            bucket: string;
+        };
+    };
+};
 export default _default;

package/lib/storages/ali-oss.d.ts.map

@@ -1 +1 @@
-{"version":3,"sources":["storages/ali-oss.ts"],"names":[],"mappings":"AAGA,qBAAa,aAAa;IAExB,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,WAAW,CAAW;gBAElB,IAAI,KAAA;IAKhB,WAAW,CAAC,GAAG,KAAA,EAAE,IAAI,KAAA,EAAE,EAAE,KAAA;IAgBzB,WAAW,CAAC,GAAG,KAAA,EAAE,IAAI,KAAA,EAAE,EAAE,KAAA;CAS1B;;AAED,wBAA2E","file":"ali-oss.d.ts","sourcesContent":["import AliOss from 'ali-oss';\nimport { getFilename } from '../utils';\n\nexport class AliOssStorage {\n\n  private client: AliOss;\n\n  private getFilename: Function;\n\n  constructor(opts) {\n    this.client = new AliOss(opts.config);\n    this.getFilename = opts.filename || getFilename;\n  }\n\n  _handleFile(req, file, cb) {\n    if (!this.client) {\n      console.error('oss client undefined');\n      return cb({ message: 'oss client undefined' });\n    }\n    this.getFilename(req, file, (err, filename) => {\n      if (err) return cb(err)\n      this.client.putStream(filename, file.stream).then(\n        result => cb(null, {\n          filename: result.name,\n          url: result.url\n        })\n      ).catch(cb);\n    });\n  }\n\n  _removeFile(req, file, cb) {\n    if (!this.client) {\n      console.error('oss client undefined');\n      return cb({ message: 'oss client undefined' });\n    }\n    this.client.delete(file.filename).then(\n      result => cb(null, result)\n    ).catch(cb);\n  }\n}\n\nexport default (storage) => new AliOssStorage({ config: storage.options });\n"]}
+{"version":3,"sources":["storages/ali-oss.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAGA,wBAsBC","file":"ali-oss.d.ts","sourcesContent":["import { STORAGE_TYPE_ALI_OSS } from '../constants';\nimport { cloudFilenameGetter } from '../utils';\n\nexport default {\n  make(storage) {\n    const createAliOssStorage = require('multer-aliyun-oss');\n    return new createAliOssStorage({\n      config: storage.options,\n      filename: cloudFilenameGetter(storage)\n    });\n  },\n  defaults() {\n    return {\n      title: '阿里云对象存储',\n      type: STORAGE_TYPE_ALI_OSS,\n      name: 'ali-oss-1',\n      baseUrl: process.env.ALI_OSS_STORAGE_BASE_URL,\n      options: {\n        region: process.env.ALI_OSS_REGION,\n        accessKeyId: process.env.ALI_OSS_ACCESS_KEY_ID,\n        accessKeySecret: process.env.ALI_OSS_ACCESS_KEY_SECRET,\n        bucket: process.env.ALI_OSS_BUCKET,\n      }\n    }\n  }\n}\n"]}

package/lib/storages/ali-oss.js

@@ -12,60 +12,38 @@ function _react() {
 
 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
-  };
-};
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.AliOssStorage = void 0;
 
-const ali_oss_1 = __importDefault(require("ali-oss"));
+const constants_1 = require("../constants");
 
 const utils_1 = require("../utils");
 
-class AliOssStorage {
-  constructor(opts) {
-    this.client = new ali_oss_1.default(opts.config);
-    this.getFilename = opts.filename || utils_1.getFilename;
-  }
+exports.default = {
+  make(storage) {
+    const createAliOssStorage = require('multer-aliyun-oss');
 
-  _handleFile(req, file, cb) {
-    if (!this.client) {
-      console.error('oss client undefined');
-      return cb({
-        message: 'oss client undefined'
-      });
-    }
-
-    this.getFilename(req, file, (err, filename) => {
-      if (err) return cb(err);
-      this.client.putStream(filename, file.stream).then(result => cb(null, {
-        filename: result.name,
-        url: result.url
-      })).catch(cb);
+    return new createAliOssStorage({
+      config: storage.options,
+      filename: (0, utils_1.cloudFilenameGetter)(storage)
     });
+  },
+
+  defaults() {
+    return {
+      title: '阿里云对象存储',
+      type: constants_1.STORAGE_TYPE_ALI_OSS,
+      name: 'ali-oss-1',
+      baseUrl: process.env.ALI_OSS_STORAGE_BASE_URL,
+      options: {
+        region: process.env.ALI_OSS_REGION,
+        accessKeyId: process.env.ALI_OSS_ACCESS_KEY_ID,
+        accessKeySecret: process.env.ALI_OSS_ACCESS_KEY_SECRET,
+        bucket: process.env.ALI_OSS_BUCKET
+      }
+    };
   }
 
-  _removeFile(req, file, cb) {
-    if (!this.client) {
-      console.error('oss client undefined');
-      return cb({
-        message: 'oss client undefined'
-      });
-    }
-
-    this.client.delete(file.filename).then(result => cb(null, result)).catch(cb);
-  }
-
-}
-
-exports.AliOssStorage = AliOssStorage;
-
-exports.default = storage => new AliOssStorage({
-  config: storage.options
-});
+};
 //# sourceMappingURL=ali-oss.js.map

package/lib/storages/ali-oss.js.map

@@ -1 +1 @@
-{"version":3,"sources":["storages/ali-oss.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA6B;AAC7B,oCAAuC;AAEvC,MAAa,aAAa;IAMxB,YAAY,IAAI;QACd,IAAI,CAAC,MAAM,GAAG,IAAI,iBAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACtC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,QAAQ,IAAI,mBAAW,CAAC;IAClD,CAAC;IAED,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QACvB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;YACtC,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,sBAAsB,EAAE,CAAC,CAAC;SAChD;QACD,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;YAC5C,IAAI,GAAG;gBAAE,OAAO,EAAE,CAAC,GAAG,CAAC,CAAA;YACvB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAC/C,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE;gBACjB,QAAQ,EAAE,MAAM,CAAC,IAAI;gBACrB,GAAG,EAAE,MAAM,CAAC,GAAG;aAChB,CAAC,CACH,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IAED,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QACvB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;YACtC,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,sBAAsB,EAAE,CAAC,CAAC;SAChD;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CACpC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAC3B,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACd,CAAC;CACF;AApCD,sCAoCC;AAED,kBAAe,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,aAAa,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC","file":"ali-oss.js","sourcesContent":["import AliOss from 'ali-oss';\nimport { getFilename } from '../utils';\n\nexport class AliOssStorage {\n\n  private client: AliOss;\n\n  private getFilename: Function;\n\n  constructor(opts) {\n    this.client = new AliOss(opts.config);\n    this.getFilename = opts.filename || getFilename;\n  }\n\n  _handleFile(req, file, cb) {\n    if (!this.client) {\n      console.error('oss client undefined');\n      return cb({ message: 'oss client undefined' });\n    }\n    this.getFilename(req, file, (err, filename) => {\n      if (err) return cb(err)\n      this.client.putStream(filename, file.stream).then(\n        result => cb(null, {\n          filename: result.name,\n          url: result.url\n        })\n      ).catch(cb);\n    });\n  }\n\n  _removeFile(req, file, cb) {\n    if (!this.client) {\n      console.error('oss client undefined');\n      return cb({ message: 'oss client undefined' });\n    }\n    this.client.delete(file.filename).then(\n      result => cb(null, result)\n    ).catch(cb);\n  }\n}\n\nexport default (storage) => new AliOssStorage({ config: storage.options });\n"]}
+{"version":3,"sources":["storages/ali-oss.ts"],"names":[],"mappings":";;AAAA,4CAAoD;AACpD,oCAA+C;AAE/C,kBAAe;IACb,IAAI,CAAC,OAAO;QACV,MAAM,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;QACzD,OAAO,IAAI,mBAAmB,CAAC;YAC7B,MAAM,EAAE,OAAO,CAAC,OAAO;YACvB,QAAQ,EAAE,IAAA,2BAAmB,EAAC,OAAO,CAAC;SACvC,CAAC,CAAC;IACL,CAAC;IACD,QAAQ;QACN,OAAO;YACL,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,gCAAoB;YAC1B,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB;YAC7C,OAAO,EAAE;gBACP,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;gBAClC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;gBAC9C,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB;gBACtD,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;aACnC;SACF,CAAA;IACH,CAAC;CACF,CAAA","file":"ali-oss.js","sourcesContent":["import { STORAGE_TYPE_ALI_OSS } from '../constants';\nimport { cloudFilenameGetter } from '../utils';\n\nexport default {\n  make(storage) {\n    const createAliOssStorage = require('multer-aliyun-oss');\n    return new createAliOssStorage({\n      config: storage.options,\n      filename: cloudFilenameGetter(storage)\n    });\n  },\n  defaults() {\n    return {\n      title: '阿里云对象存储',\n      type: STORAGE_TYPE_ALI_OSS,\n      name: 'ali-oss-1',\n      baseUrl: process.env.ALI_OSS_STORAGE_BASE_URL,\n      options: {\n        region: process.env.ALI_OSS_REGION,\n        accessKeyId: process.env.ALI_OSS_ACCESS_KEY_ID,\n        accessKeySecret: process.env.ALI_OSS_ACCESS_KEY_SECRET,\n        bucket: process.env.ALI_OSS_BUCKET,\n      }\n    }\n  }\n}\n"]}

package/lib/storages/index.d.ts

@@ -1,2 +1,8 @@
-declare const map: Map<string, Function>;
-export default map;
+export interface IStorage {
+    filenameKey?: string;
+    middleware?: Function;
+    getFileData?: Function;
+    make: Function;
+    defaults: Function;
+}
+export declare function getStorageConfig(key: string): IStorage;

package/lib/storages/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"sources":["storages/index.ts"],"names":[],"mappings":"AAMA,QAAA,MAAM,GAAG,uBAA8B,CAAC;AAIxC,eAAe,GAAG,CAAC","file":"index.d.ts","sourcesContent":["import local from './local';\nimport oss from './ali-oss';\nimport { STORAGE_TYPE_LOCAL, STORAGE_TYPE_ALI_OSS } from '../constants';\n\n\n\nconst map = new Map<string, Function>();\nmap.set(STORAGE_TYPE_LOCAL, local);\nmap.set(STORAGE_TYPE_ALI_OSS, oss);\n\nexport default map;\n"]}
+{"version":3,"sources":["storages/index.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,QAAQ;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,QAAQ,CAAC;IACtB,WAAW,CAAC,EAAE,QAAQ,CAAC;IACvB,IAAI,EAAE,QAAQ,CAAC;IACf,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAQD,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAEtD","file":"index.d.ts","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"]}

package/lib/storages/index.js

@@ -21,15 +21,25 @@ var __importDefault = void 0 && (void 0).__importDefault || function (mod) {
 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);
-exports.default = map;
+map.set(constants_1.STORAGE_TYPE_S3, s3_1.default);
+
+function getStorageConfig(key) {
+  return map.get(key);
+}
+
+exports.getStorageConfig = getStorageConfig;
+;
 //# 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,4CAAwE;AAIxE,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;AAEnC,kBAAe,GAAG,CAAC","file":"index.js","sourcesContent":["import local from './local';\nimport oss from './ali-oss';\nimport { STORAGE_TYPE_LOCAL, STORAGE_TYPE_ALI_OSS } from '../constants';\n\n\n\nconst map = new Map<string, Function>();\nmap.set(STORAGE_TYPE_LOCAL, local);\nmap.set(STORAGE_TYPE_ALI_OSS, oss);\n\nexport default map;\n"]}
+{"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"]}

package/lib/storages/local.d.ts

@@ -1,5 +1,13 @@
 import multer from 'multer';
-export declare function getDocumentRoot(storage: any): string;
-export declare function middleware(app: any): any;
-declare const _default: (storage: any) => multer.StorageEngine;
+declare function middleware(app: any, options?: any): Promise<void>;
+declare const _default: {
+    middleware: typeof middleware;
+    make(storage: any): multer.StorageEngine;
+    defaults(): {
+        title: string;
+        type: string;
+        name: string;
+        baseUrl: string;
+    };
+};
 export default _default;

package/lib/storages/local.d.ts.map

@@ -1 +1 @@
-{"version":3,"sources":["storages/local.ts"],"names":[],"mappings":"AAGA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAM5B,wBAAgB,eAAe,CAAC,OAAO,KAAA,GAAG,MAAM,CAM/C;AAGD,wBAAgB,UAAU,CAAC,GAAG,KAAA,OAkD7B;;AAED,wBAQG","file":"local.d.ts","sourcesContent":["import path from 'path';\nimport { URL } from 'url';\nimport mkdirp from 'mkdirp';\nimport multer from 'multer';\nimport serve from 'koa-static';\nimport mount from 'koa-mount';\nimport { STORAGE_TYPE_LOCAL } from '../constants';\nimport { getFilename } from '../utils';\n\nexport function 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), storage.path);\n}\n\n// TODO(optimize): 初始化的时机不应该放在中间件里\nexport function middleware(app) {\n  if (process.env.NOCOBASE_ENV === 'production') {\n    return;\n  }\n\n  const storages = new Map<string, any>();\n  const StorageModel = app.db.getModel('storages');\n\n  return app.use(async function (ctx, next) {\n    const items = await StorageModel.findAll({\n      where: {\n        type: STORAGE_TYPE_LOCAL,\n      }\n    });\n\n    const primaryKey = StorageModel.primaryKeyAttribute;\n\n    for (const storage of items) {\n\n      // TODO：未解决 storage 更新问题\n      if (storages.has(storage[primaryKey])) {\n        continue;\n      }\n\n      const baseUrl = storage.get('baseUrl');\n\n      let url;\n      try {\n        url = new URL(baseUrl);\n      } catch (e) {\n        url = {\n          protocol: 'http:',\n          hostname: 'localhost',\n          port: process.env.API_PORT,\n          pathname: baseUrl\n        };\n      }\n\n      // 以下情况才认为当前进程所应该提供静态服务\n      // 否则都忽略，交给其他 server 来提供（如 nginx/cdn 等）\n      // TODO(bug): https、端口 80 默认值和其他本地 ip/hostname 的情况未考虑\n      // TODO 实际应该用 NOCOBASE_ENV 来判断，或者抛给 env 处理\n      if (process.env.LOCAL_STORAGE_USE_STATIC_SERVER) {\n        const basePath = url.pathname.startsWith('/') ? url.pathname : `/${url.pathname}`;\n        app.use(mount(basePath, serve(getDocumentRoot(storage))));\n      }\n      storages.set(storage.primaryKey, storage);\n    }\n    await next();\n  });\n}\n\nexport default (storage) => multer.diskStorage({\n  destination: function (req, file, cb) {\n    const destPath = getDocumentRoot(storage);\n    mkdirp(destPath).then(() => {\n      cb(null, destPath);\n    }).catch(cb);\n  },\n  filename: getFilename\n});\n"]}
+{"version":3,"sources":["storages/local.ts"],"names":[],"mappings":"AAGA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAoD5B,iBAAe,UAAU,CAAC,GAAG,KAAA,EAAE,OAAO,CAAC,KAAA,iBAmDtC;;;;;;;;;;;AAED,wBAmBE","file":"local.d.ts","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"]}

package/lib/storages/local.js

@@ -59,7 +59,6 @@ var __importDefault = void 0 && (void 0).__importDefault || function (mod) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.middleware = exports.getDocumentRoot = void 0;
 
 const path_1 = __importDefault(require("path"));
 
@@ -71,90 +70,151 @@ const multer_1 = __importDefault(require("multer"));
 
 const koa_static_1 = __importDefault(require("koa-static"));
 
-const koa_mount_1 = __importDefault(require("koa-mount"));
-
 const constants_1 = require("../constants");
 
 const utils_1 = require("../utils");
 
-function getDocumentRoot(storage) {
-  const _ref = storage.options || {},
-        _ref$documentRoot = _ref.documentRoot,
-        documentRoot = _ref$documentRoot === void 0 ? 'uploads' : _ref$documentRoot;
+function match(basePath, pathname) {
+  if (!pathname.startsWith(basePath)) {
+    return false;
+  }
 
-  return path_1.default.resolve(path_1.default.isAbsolute(documentRoot) ? documentRoot : path_1.default.join(process.cwd(), documentRoot), storage.path);
+  const newPath = pathname.replace(basePath, '') || '/';
+
+  if (basePath.slice(-1) === '/') {
+    return true;
+  }
+
+  return newPath[0] === '/';
 }
 
-exports.getDocumentRoot = getDocumentRoot;
+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
+      }
+    });
+    const primaryKey = StorageModel.primaryKeyAttribute;
+    storages.clear();
+
+    var _iterator = _createForOfIteratorHelper(items),
+        _step;
 
-function middleware(app) {
-  if (process.env.NOCOBASE_ENV === 'production') {
-    return;
-  }
+    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();
+    }
+  });
+}
 
-  const storages = new Map();
-  const StorageModel = app.db.getModel('storages');
-  return app.use(function (ctx, next) {
+function createLocalServerUpdateHook(app, storages) {
+  return function (row) {
     return __awaiter(this, void 0, void 0, function* () {
-      const items = yield StorageModel.findAll({
-        where: {
-          type: constants_1.STORAGE_TYPE_LOCAL
-        }
-      });
-      const primaryKey = StorageModel.primaryKeyAttribute;
-
-      var _iterator = _createForOfIteratorHelper(items),
-          _step;
+      if (row.get('type') === constants_1.STORAGE_TYPE_LOCAL) {
+        yield update(app, storages);
+      }
+    });
+  };
+}
 
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          const storage = _step.value;
+function getDocumentRoot(storage) {
+  const _ref = storage.options || {},
+        _ref$documentRoot = _ref.documentRoot,
+        documentRoot = _ref$documentRoot === void 0 ? 'uploads' : _ref$documentRoot;
 
-          if (storages.has(storage[primaryKey])) {
-            continue;
-          }
+  return path_1.default.resolve(path_1.default.isAbsolute(documentRoot) ? documentRoot : path_1.default.join(process.cwd(), documentRoot));
+}
 
-          const baseUrl = storage.get('baseUrl');
-          let url;
-
-          try {
-            url = new url_1.URL(baseUrl);
-          } catch (e) {
-            url = {
-              protocol: 'http:',
-              hostname: 'localhost',
-              port: process.env.API_PORT,
-              pathname: baseUrl
-            };
-          }
+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;
+            }
 
-          if (process.env.LOCAL_STORAGE_USE_STATIC_SERVER) {
             const basePath = url.pathname.startsWith('/') ? url.pathname : `/${url.pathname}`;
-            app.use(koa_mount_1.default(basePath, koa_static_1.default(getDocumentRoot(storage))));
-          }
 
-          storages.set(storage.primaryKey, storage);
+            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();
         }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
-      }
 
-      yield next();
+        yield next();
+      });
     });
   });
 }
 
-exports.middleware = middleware;
+exports.default = {
+  middleware,
 
-exports.default = storage => multer_1.default.diskStorage({
-  destination: function destination(req, file, cb) {
-    const destPath = getDocumentRoot(storage);
-    mkdirp_1.default(destPath).then(() => {
-      cb(null, destPath);
-    }).catch(cb);
+  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
+    });
   },
-  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`
+    };
+  }
+
+};
 //# 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 mount from 'koa-mount';\nimport { STORAGE_TYPE_LOCAL } from '../constants';\nimport { getFilename } from '../utils';\n\nexport function 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), storage.path);\n}\n\n// TODO(optimize): 初始化的时机不应该放在中间件里\nexport function middleware(app) {\n  if (process.env.NOCOBASE_ENV === 'production') {\n    return;\n  }\n\n  const storages = new Map<string, any>();\n  const StorageModel = app.db.getModel('storages');\n\n  return app.use(async function (ctx, next) {\n    const items = await StorageModel.findAll({\n      where: {\n        type: STORAGE_TYPE_LOCAL,\n      }\n    });\n\n    const primaryKey = StorageModel.primaryKeyAttribute;\n\n    for (const storage of items) {\n\n      // TODO：未解决 storage 更新问题\n      if (storages.has(storage[primaryKey])) {\n        continue;\n      }\n\n      const baseUrl = storage.get('baseUrl');\n\n      let url;\n      try {\n        url = new URL(baseUrl);\n      } catch (e) {\n        url = {\n          protocol: 'http:',\n          hostname: 'localhost',\n          port: process.env.API_PORT,\n          pathname: baseUrl\n        };\n      }\n\n      // 以下情况才认为当前进程所应该提供静态服务\n      // 否则都忽略，交给其他 server 来提供（如 nginx/cdn 等）\n      // TODO(bug): https、端口 80 默认值和其他本地 ip/hostname 的情况未考虑\n      // TODO 实际应该用 NOCOBASE_ENV 来判断，或者抛给 env 处理\n      if (process.env.LOCAL_STORAGE_USE_STATIC_SERVER) {\n        const basePath = url.pathname.startsWith('/') ? url.pathname : `/${url.pathname}`;\n        app.use(mount(basePath, serve(getDocumentRoot(storage))));\n      }\n      storages.set(storage.primaryKey, storage);\n    }\n    await next();\n  });\n}\n\nexport default (storage) => multer.diskStorage({\n  destination: function (req, file, cb) {\n    const destPath = getDocumentRoot(storage);\n    mkdirp(destPath).then(() => {\n      cb(null, destPath);\n    }).catch(cb);\n  },\n  filename: getFilename\n});\n"]}
+{"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"]}

package/lib/storages/s3.d.ts

@@ -0,0 +1,17 @@
+declare const _default: {
+    filenameKey: string;
+    make(storage: any): any;
+    defaults(): {
+        title: string;
+        name: string;
+        type: string;
+        baseUrl: string;
+        options: {
+            region: string;
+            accessKeyId: string;
+            secretAccessKey: string;
+            bucket: string;
+        };
+    };
+};
+export default _default;

package/lib/storages/s3.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"sources":["storages/s3.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAGA,wBAiDC","file":"s3.d.ts","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"]}

package/lib/storages/s3.js

@@ -0,0 +1,90 @@
+"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;
+};
+
+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
+      }
+    };
+  }
+
+};
+//# sourceMappingURL=s3.js.map

package/lib/storages/s3.js.map

@@ -0,0 +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"]}

package/lib/utils.d.ts

@@ -1 +1,2 @@
 export declare function getFilename(req: any, file: any, cb: any): void;
+export declare const cloudFilenameGetter: (storage: any) => (req: any, file: any, cb: any) => void;

package/lib/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"sources":["utils.ts"],"names":[],"mappings":"AAGA,wBAAgB,WAAW,CAAC,GAAG,KAAA,EAAE,IAAI,KAAA,EAAE,EAAE,KAAA,QAIxC","file":"utils.d.ts","sourcesContent":["import crypto from 'crypto';\nimport path from 'path';\n\nexport function getFilename(req, file, cb) {\n  crypto.pseudoRandomBytes(16, function (err, raw) {\n    cb(err, err ? undefined : `${raw.toString('hex')}${path.extname(file.originalname)}`)\n  })\n}\n"]}
+{"version":3,"sources":["utils.ts"],"names":[],"mappings":"AAGA,wBAAgB,WAAW,CAAC,GAAG,KAAA,EAAE,IAAI,KAAA,EAAE,EAAE,KAAA,QAIxC;AAED,eAAO,MAAM,mBAAmB,0DAO/B,CAAA","file":"utils.d.ts","sourcesContent":["import crypto from 'crypto';\nimport path from 'path';\n\nexport function getFilename(req, file, cb) {\n  crypto.pseudoRandomBytes(16, function (err, raw) {\n    cb(err, err ? undefined : `${raw.toString('hex')}${path.extname(file.originalname)}`)\n  });\n}\n\nexport const cloudFilenameGetter = storage => (req, file, cb) => {\n  getFilename(req, file, (err, filename) => {\n    if (err) {\n      return cb(err);\n    }\n    cb(null, `${storage.path ? `${storage.path}/` : ''}${filename}`);\n  });\n}\n"]}

package/lib/utils.js

@@ -21,7 +21,7 @@ var __importDefault = void 0 && (void 0).__importDefault || function (mod) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getFilename = void 0;
+exports.cloudFilenameGetter = exports.getFilename = void 0;
 
 const crypto_1 = __importDefault(require("crypto"));
 
@@ -34,4 +34,16 @@ function getFilename(req, file, cb) {
 }
 
 exports.getFilename = getFilename;
+
+const cloudFilenameGetter = storage => (req, file, cb) => {
+  getFilename(req, file, (err, filename) => {
+    if (err) {
+      return cb(err);
+    }
+
+    cb(null, `${storage.path ? `${storage.path}/` : ''}${filename}`);
+  });
+};
+
+exports.cloudFilenameGetter = cloudFilenameGetter;
 //# sourceMappingURL=utils.js.map

package/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["utils.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,gDAAwB;AAExB,SAAgB,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;IACvC,gBAAM,CAAC,iBAAiB,CAAC,EAAE,EAAE,UAAU,GAAG,EAAE,GAAG;QAC7C,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;IACvF,CAAC,CAAC,CAAA;AACJ,CAAC;AAJD,kCAIC","file":"utils.js","sourcesContent":["import crypto from 'crypto';\nimport path from 'path';\n\nexport function getFilename(req, file, cb) {\n  crypto.pseudoRandomBytes(16, function (err, raw) {\n    cb(err, err ? undefined : `${raw.toString('hex')}${path.extname(file.originalname)}`)\n  })\n}\n"]}
+{"version":3,"sources":["utils.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,gDAAwB;AAExB,SAAgB,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;IACvC,gBAAM,CAAC,iBAAiB,CAAC,EAAE,EAAE,UAAU,GAAG,EAAE,GAAG;QAC7C,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;IACvF,CAAC,CAAC,CAAC;AACL,CAAC;AAJD,kCAIC;AAEM,MAAM,mBAAmB,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE;IAC9D,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;QACvC,IAAI,GAAG,EAAE;YACP,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;SAChB;QACD,EAAE,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;AACL,CAAC,CAAA;AAPY,QAAA,mBAAmB,uBAO/B","file":"utils.js","sourcesContent":["import crypto from 'crypto';\nimport path from 'path';\n\nexport function getFilename(req, file, cb) {\n  crypto.pseudoRandomBytes(16, function (err, raw) {\n    cb(err, err ? undefined : `${raw.toString('hex')}${path.extname(file.originalname)}`)\n  });\n}\n\nexport const cloudFilenameGetter = storage => (req, file, cb) => {\n  getFilename(req, file, (err, filename) => {\n    if (err) {\n      return cb(err);\n    }\n    cb(null, `${storage.path ? `${storage.path}/` : ''}${filename}`);\n  });\n}\n"]}

package/package.json

@@ -1,20 +1,19 @@
 {
   "name": "@nocobase/plugin-file-manager",
-  "version": "0.5.0-alpha.32",
+  "version": "0.5.0-alpha.36",
   "main": "lib/index.js",
   "license": "MIT",
   "dependencies": {
     "@koa/multer": "^3.0.0",
-    "@nocobase/server": "^0.5.0-alpha.32",
-    "ali-oss": "^6.12.0",
-    "koa-mount": "^4.0.0",
+    "aws-sdk": "^2.2.32",
     "koa-static": "^5.0.0",
     "mime-match": "^1.0.2",
-    "multer": "^1.4.2"
+    "multer": "^1.4.2",
+    "multer-aliyun-oss": "1.1.1",
+    "multer-s3": "^2.10.0"
   },
   "devDependencies": {
-    "@nocobase/test": "^0.5.0-alpha.32",
     "@types/multer": "^1.4.5"
   },
-  "gitHead": "7be6327458cb376e7281cff42a43a282105b65f8"
+  "gitHead": "9998cd903bf87bf9a5d8a7616055f0cd1a007a72"
 }