@kne/fastify-file-manager 1.1.1 → 1.1.3

package/index.js

@@ -1,6 +1,7 @@
 const fp = require('fastify-plugin');
 const path = require('path');
 const fs = require('fs-extra');
+const packageJson = require('./package.json');
 
 module.exports = fp(
   async (fastify, options) => {
@@ -8,12 +9,13 @@ module.exports = fp(
       {
         root: path.join(process.cwd(), 'static'),
         namespace: 'default',
-        prefix: '/api/static',
+        prefix: `/api/v${packageJson.version.split('.')[0]}/static`,
+        dbTableNamePrefix: 't_file_manager_',
         multipart: {},
         static: {},
         authenticateFileRead: async () => {},
         authenticateFileMange: async () => {},
-        authenticateFileUpload: async () => {}
+        authenticateFileWrite: async () => {}
       },
       options
     );
@@ -26,7 +28,7 @@ module.exports = fp(
         [
           'models',
           await fastify.sequelize.addModels(path.resolve(__dirname, './libs/models'), {
-            prefix: 't_file_manager_'
+            prefix: options.dbTableNamePrefix
           })
         ],
         ['services', path.resolve(__dirname, './libs/services')],

package/libs/controllers/index.js

@@ -5,7 +5,15 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/upload`,
     {
-      onRequest: [options.authenticateFileUpload]
+      onRequest: [options.authenticateFileWrite],
+      schema: {
+        query: {
+          type: 'object',
+          properties: {
+            namespace: { type: 'string' }
+          }
+        }
+      }
     },
     async request => {
       const file = await request.file();
@@ -13,7 +21,10 @@ module.exports = fp(async (fastify, options) => {
         throw new Error('不能获取到上传文件');
       }
       //1. 保存到服务器目录 2.对接oss
-      return await services.fileRecord.uploadToFileSystem({ file, namespace: options.namespace });
+      return await services.fileRecord.uploadToFileSystem({
+        file,
+        namespace: request.query.namespace || options.namespace
+      });
     }
   );
 
@@ -33,7 +44,7 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { id } = request.params;
-      return await services.fileRecord.getFileUrl({ id, namespace: options.namespace });
+      return await services.fileRecord.getFileUrl({ id });
     }
   );
 
@@ -62,57 +73,109 @@ module.exports = fp(async (fastify, options) => {
       const { id } = request.params;
       const { attachment, filename: targetFilename } = request.query;
       const { targetFileName, filename } = await services.fileRecord.getFileInfo({
-        id,
-        namespace: options.namespace
+        id
       });
       return attachment ? reply.download(targetFileName, targetFilename || filename) : reply.sendFile(targetFileName);
     }
   );
 
-  fastify.get(
+  fastify.post(
     `${options.prefix}/file-list`,
     {
       onRequest: [options.authenticateFileMange],
       schema: {
-        query: {}
+        body: {
+          type: 'object',
+          properties: {
+            perPage: { type: 'number' },
+            currentPage: { type: 'number' },
+            filter: {
+              type: 'object',
+              properties: {
+                namespace: { type: 'string' },
+                size: { type: 'array', items: { type: 'number' } },
+                filename: { type: 'string' }
+              }
+            }
+          }
+        }
       }
     },
     async request => {
-      const { filter, perPage, currentPage } = Object.assign({}, request.query, {
-        perPage: 20,
-        currentPage: 1
-      });
+      const { filter, perPage, currentPage } = Object.assign(
+        {},
+        {
+          perPage: 20,
+          currentPage: 1
+        },
+        request.body
+      );
       return await services.fileRecord.getFileList({
         filter,
-        namespace: options.namespace,
         perPage,
         currentPage
       });
     }
   );
 
+  // Replace file
+
+  fastify.post(
+    `${options.prefix}/replace-file`,
+    {
+      onRequest: [options.authenticateFileMange],
+      schema: {
+        type: 'object',
+        properties: {
+          id: { type: 'string' }
+        }
+      }
+    },
+    async request => {
+      const file = await request.file();
+      if (!file) {
+        throw new Error('不能获取到上传文件');
+      }
+      return await services.fileRecord.uploadToFileSystem({ id: request.query.id, file });
+    }
+  );
+
+  fastify.post(
+    `${options.prefix}/rename-file`,
+    {
+      onRequest: [options.authenticateFileMange],
+      schema: {
+        type: 'object',
+        properties: {
+          id: { type: 'string' },
+          filename: { type: 'string' }
+        }
+      }
+    },
+    async request => {
+      await services.fileRecord.renameFile(request.body);
+      return {};
+    }
+  );
+
   fastify.post(
-    `${options.prefix}/delete-file`,
+    `${options.prefix}/delete-files`,
     {
       onRequest: [options.authenticateFileMange],
       schema: {
         body: {
           type: 'object',
-          required: ['id'],
+          required: ['ids'],
           properties: {
-            id: { type: 'string' }
+            ids: { type: 'array', items: { type: 'string' } }
           }
         }
       }
     },
     async request => {
-      const { id } = request.body;
-      await services.fileRecord.deleteFile({ id, namespace: options.namespace });
+      const { ids } = request.body;
+      await services.fileRecord.deleteFiles({ ids });
       return {};
     }
   );
-
-  fastify.get(`${options.prefix}`, async () => {
-    return 'living';
-  });
 });

package/libs/services/file-record.js

@@ -5,7 +5,8 @@ const path = require('path');
 
 module.exports = fp(async (fastify, options) => {
   const { models, services } = fastify.fileManager;
-  const uploadToFileSystem = async ({ file, namespace }) => {
+  const { Op } = fastify.sequelize.Sequelize;
+  const uploadToFileSystem = async ({ id, file, namespace }) => {
     const { filename, encoding, mimetype } = file;
     const buffer = await file.toBuffer();
     const hash = crypto.createHash('md5');
@@ -14,20 +15,38 @@ module.exports = fp(async (fastify, options) => {
     const extension = path.extname(filename);
     const filepath = path.resolve(options.root, `${digest}${extension}`);
     await fs.writeFile(filepath, buffer);
-    const outputFile = await models.fileRecord.create({
-      filename,
-      namespace: namespace || options.namespace,
-      encoding,
-      mimetype,
-      hash: digest,
-      size: buffer.byteLength
-    });
+
+    const outputFile = await (async create => {
+      if (!id) {
+        return await create();
+      }
+      const file = await models.fileRecord.findOne({ where: { uuid: id } });
+      if (!file) {
+        throw new Error('原文件不存在');
+      }
+      file.filename = filename;
+      file.encoding = encoding;
+      file.mimetype = mimetype;
+      file.hash = digest;
+      file.size = buffer.byteLength;
+      await file.save();
+      return file;
+    })(() =>
+      models.fileRecord.create({
+        filename,
+        namespace: namespace || options.namespace,
+        encoding,
+        mimetype,
+        hash: digest,
+        size: buffer.byteLength
+      })
+    );
     return Object.assign({}, outputFile.get({ plain: true }), { id: outputFile.uuid });
   };
 
   const getFileUrl = async ({ id, namespace }) => {
     const file = await models.fileRecord.findOne({
-      where: { uuid: id, namespace: namespace || options.namespace }
+      where: { uuid: id }
     });
     if (!file) {
       throw new Error('文件不存在');
@@ -36,9 +55,9 @@ module.exports = fp(async (fastify, options) => {
     return `${options.prefix}/file/${file.hash}${extension}?filename=${file.filename}`;
   };
 
-  const getFileInfo = async ({ id, namespace }) => {
+  const getFileInfo = async ({ id }) => {
     const file = await models.fileRecord.findOne({
-      where: { uuid: id, namespace: namespace || options.namespace }
+      where: { uuid: id }
     });
     if (!file) {
       throw new Error('文件不存在');
@@ -50,11 +69,33 @@ module.exports = fp(async (fastify, options) => {
     });
   };
 
-  const getFileList = async ({ filter, namespace, currentPage, perPage }) => {
-    const queryFilter = { namespace: namespace || options.namespace };
+  const getFileList = async ({ filter, currentPage, perPage }) => {
+    // namespace: namespace || options.namespace
+    const queryFilter = {};
+
+    if (filter?.filename) {
+      queryFilter.filename = {
+        [Op.like]: `%${filter.filename}%`
+      };
+    }
+    if (filter?.size && filter.size.length > 0) {
+      queryFilter.size = {};
+      if (filter.size[0]) {
+        queryFilter.size[Op.gt] = filter.size[0] * 1024;
+      }
+      if (filter.size[1]) {
+        queryFilter.size[Op.lt] = filter.size[1] * 1024;
+      }
+    }
+    if (filter?.namespace) {
+      queryFilter.namespace = {
+        [Op.like]: `%${filter.namespace}%`
+      };
+    }
+
     const { count, rows } = await models.fileRecord.findAndCountAll({
       where: queryFilter,
-      offset: currentPage * (currentPage - 1),
+      offset: perPage * (currentPage - 1),
       limit: perPage
     });
     return {
@@ -63,15 +104,26 @@ module.exports = fp(async (fastify, options) => {
     };
   };
 
-  const deleteFile = async ({ id, namespace }) => {
+  const deleteFiles = async ({ ids }) => {
+    await models.fileRecord.destroy({
+      where: {
+        uuid: {
+          [Op.in]: ids
+        }
+      }
+    });
+  };
+
+  const renameFile = async ({ id, filename }) => {
     const file = await models.fileRecord.findOne({
-      where: { uuid: id, namespace: namespace || options.namespace }
+      where: { uuid: id }
     });
     if (!file) {
       throw new Error('文件不存在');
     }
-
-    await file.destroy();
+    file.filename = filename;
+    await file.save();
   };
-  services.fileRecord = { uploadToFileSystem, getFileUrl, getFileInfo, getFileList, deleteFile };
+
+  services.fileRecord = { uploadToFileSystem, getFileUrl, getFileInfo, getFileList, deleteFiles, renameFile };
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kne/fastify-file-manager",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "用于管理静态文件上传查看等",
   "main": "index.js",
   "scripts": {
@@ -36,6 +36,7 @@
     "fastify": "^4.27.0",
     "husky": "^9.0.11",
     "prettier": "^3.2.5",
+    "qs": "^6.12.3",
     "sqlite3": "^5.1.7"
   },
   "dependencies": {