@kne/fastify-file-manager 1.1.3 → 1.2.1

package/index.js

@@ -13,9 +13,12 @@ module.exports = fp(
         dbTableNamePrefix: 't_file_manager_',
         multipart: {},
         static: {},
-        authenticateFileRead: async () => {},
-        authenticateFileMange: async () => {},
-        authenticateFileWrite: async () => {}
+        ossAdapter: () => {
+          return {};
+        },
+        createAuthenticate: () => {
+          return [];
+        }
       },
       options
     );

package/libs/controllers/index.js

@@ -5,7 +5,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/upload`,
     {
-      onRequest: [options.authenticateFileWrite],
+      onRequest: options.createAuthenticate('file:write'),
       schema: {
         query: {
           type: 'object',
@@ -31,7 +31,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.get(
     `${options.prefix}/file-url/:id`,
     {
-      onRequest: [options.authenticateFileRead],
+      onRequest: options.createAuthenticate('file:read'),
       schema: {
         params: {
           type: 'object',
@@ -51,7 +51,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.get(
     `${options.prefix}/file-id/:id`,
     {
-      onRequest: [options.authenticateFileRead],
+      onRequest: options.createAuthenticate('file:read'),
       schema: {
         query: {
           type: 'object',
@@ -72,17 +72,23 @@ module.exports = fp(async (fastify, options) => {
     async (request, reply) => {
       const { id } = request.params;
       const { attachment, filename: targetFilename } = request.query;
-      const { targetFileName, filename } = await services.fileRecord.getFileInfo({
+      const { filePath, targetFile, filename, mimetype, ...props } = await services.fileRecord.getFileInfo({
         id
       });
-      return attachment ? reply.download(targetFileName, targetFilename || filename) : reply.sendFile(targetFileName);
+      if (targetFile) {
+        const outputFilename = encodeURIComponent(targetFilename || filename);
+        reply.header('Content-Type', mimetype);
+        reply.header('Content-Disposition', attachment ? `attachment; filename="${outputFilename}"` : `filename="${outputFilename}"`);
+        return reply.send(targetFile);
+      }
+      return attachment ? reply.download(filePath, targetFilename || filename) : reply.sendFile(filePath);
     }
   );
 
   fastify.post(
     `${options.prefix}/file-list`,
     {
-      onRequest: [options.authenticateFileMange],
+      onRequest: options.createAuthenticate('file:mange'),
       schema: {
         body: {
           type: 'object',
@@ -123,7 +129,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/replace-file`,
     {
-      onRequest: [options.authenticateFileMange],
+      onRequest: options.createAuthenticate('file:mange'),
       schema: {
         type: 'object',
         properties: {
@@ -143,7 +149,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/rename-file`,
     {
-      onRequest: [options.authenticateFileMange],
+      onRequest: options.createAuthenticate('file:mange'),
       schema: {
         type: 'object',
         properties: {
@@ -161,7 +167,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/delete-files`,
     {
-      onRequest: [options.authenticateFileMange],
+      onRequest: options.createAuthenticate('file:mange'),
       schema: {
         body: {
           type: 'object',

package/libs/models/file-record.js

@@ -22,7 +22,12 @@ module.exports = ({ DataTypes }) => {
         allowNull: false
       },
       encoding: DataTypes.STRING,
-      mimetype: DataTypes.STRING
+      mimetype: DataTypes.STRING,
+      storageType: {
+        type: DataTypes.STRING,
+        allowNull: false,
+        comment: '存储类型:local本地文件系统,oss远程oss存储'
+      }
     },
     options: {
       indexes: [

package/libs/services/file-record.js

@@ -2,6 +2,7 @@ const fp = require('fastify-plugin');
 const fs = require('fs-extra');
 const crypto = require('crypto');
 const path = require('path');
+const { NotFound } = require('http-errors');
 
 module.exports = fp(async (fastify, options) => {
   const { models, services } = fastify.fileManager;
@@ -13,8 +14,17 @@ module.exports = fp(async (fastify, options) => {
     hash.update(buffer);
     const digest = hash.digest('hex');
     const extension = path.extname(filename);
-    const filepath = path.resolve(options.root, `${digest}${extension}`);
-    await fs.writeFile(filepath, buffer);
+
+    let storageType;
+    const ossServices = options.ossAdapter();
+    if (typeof ossServices.uploadFile === 'function') {
+      await ossServices.uploadFile({ file: buffer, filename: `${digest}${extension}` });
+      storageType = 'oss';
+    } else {
+      const filepath = path.resolve(options.root, `${digest}${extension}`);
+      await fs.writeFile(filepath, buffer);
+      storageType = 'local';
+    }
 
     const outputFile = await (async create => {
       if (!id) {
@@ -29,6 +39,7 @@ module.exports = fp(async (fastify, options) => {
       file.mimetype = mimetype;
       file.hash = digest;
       file.size = buffer.byteLength;
+      file.storageType = storageType;
       await file.save();
       return file;
     })(() =>
@@ -38,7 +49,8 @@ module.exports = fp(async (fastify, options) => {
         encoding,
         mimetype,
         hash: digest,
-        size: buffer.byteLength
+        size: buffer.byteLength,
+        storageType
       })
     );
     return Object.assign({}, outputFile.get({ plain: true }), { id: outputFile.uuid });
@@ -52,6 +64,17 @@ module.exports = fp(async (fastify, options) => {
       throw new Error('文件不存在');
     }
     const extension = path.extname(file.filename);
+    const ossServices = options.ossAdapter();
+    if (file.storageType === 'oss' && typeof ossServices.getFileLink !== 'function') {
+      throw new Error('ossAdapter未正确配置无法读取oss类型存储文件');
+    }
+    if (file.storageType === 'oss') {
+      return await ossServices.getFileLink({ filename: `${file.hash}${extension}` });
+    }
+
+    if (!(await fs.exists(`${options.root}/${file.hash}${extension}`))) {
+      throw new NotFound();
+    }
     return `${options.prefix}/file/${file.hash}${extension}?filename=${file.filename}`;
   };
 
@@ -63,9 +86,19 @@ module.exports = fp(async (fastify, options) => {
       throw new Error('文件不存在');
     }
     const extension = path.extname(file.filename);
-    return Object.assign({}, file, {
+    const targetFileName = `${file.hash}${extension}`;
+    const ossServices = options.ossAdapter();
+    if (file.storageType === 'oss' && typeof ossServices.downloadFile !== 'function') {
+      throw new Error('ossAdapter未正确配置无法读取oss类型存储文件');
+    }
+    let targetFile;
+    if (file.storageType === 'oss') {
+      targetFile = await ossServices.downloadFile({ filename: targetFileName });
+    }
+    return Object.assign({}, file.get({ pain: true }), {
       id: file.uuid,
-      targetFileName: `${file.hash}${extension}`
+      filePath: targetFileName,
+      targetFile
     });
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kne/fastify-file-manager",
-  "version": "1.1.3",
+  "version": "1.2.1",
   "description": "用于管理静态文件上传查看等",
   "main": "index.js",
   "scripts": {
@@ -32,6 +32,8 @@
   },
   "homepage": "https://github.com/kne-union/fastify-file-manager#readme",
   "devDependencies": {
+    "@fastify/env": "^4.4.0",
+    "@kne/fastify-aliyun": "^1.1.1",
     "@kne/fastify-sequelize": "^2.0.1",
     "fastify": "^4.27.0",
     "husky": "^9.0.11",
@@ -44,6 +46,7 @@
     "@fastify/static": "^7.0.4",
     "@kne/fastify-namespace": "^0.1.0",
     "fastify-plugin": "^4.5.1",
-    "fs-extra": "^11.2.0"
+    "fs-extra": "^11.2.0",
+    "http-errors": "^2.0.0"
   }
 }