@kne/fastify-file-manager 0.1.1-alpha.1 → 1.0.1

package/index.js

@@ -1,5 +1,4 @@
 const fp = require('fastify-plugin');
-const autoload = require('@fastify/autoload');
 const path = require('path');
 const fs = require('fs-extra');
 
@@ -19,12 +18,15 @@ module.exports = fp(
       options
     );
     await fs.ensureDir(options.root);
-    await fastify.sequelize.addModels(path.resolve(__dirname, './models'));
-
     fastify.register(require('@fastify/multipart'), options.multipart);
-    fastify.register(autoload, {
-      dir: path.resolve(__dirname, './libs'),
-      options
+    fastify.register(require('@kne/fastify-namespace'), {
+      name: 'fileManager',
+      options,
+      modules: [
+        ['models', await fastify.sequelize.addModels(path.resolve(__dirname, './libs/models'))],
+        ['services', path.resolve(__dirname, './libs/services')],
+        ['controllers', path.resolve(__dirname, './libs/controllers')]
+      ]
     });
     fastify.register(
       require('@fastify/static'),

package/libs/{controller.js → controllers/index.js}

@@ -1,6 +1,7 @@
 const fp = require('fastify-plugin');
 
 module.exports = fp(async (fastify, options) => {
+  const { services } = fastify.fileManager;
   fastify.post(
     `${options.prefix}/upload`,
     {
@@ -12,7 +13,7 @@ module.exports = fp(async (fastify, options) => {
         throw new Error('不能获取到上传文件');
       }
       //1. 保存到服务器目录 2.对接oss
-      return await fastify.fileManagerServices.uploadToFileSystem({ file, namespace: options.namespace });
+      return await services.fileRecord.uploadToFileSystem({ file, namespace: options.namespace });
     }
   );
 
@@ -32,7 +33,7 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { id } = request.params;
-      return await fastify.fileManagerServices.getFileUrl({ id, namespace: options.namespace });
+      return await services.fileRecord.getFileUrl({ id, namespace: options.namespace });
     }
   );
 
@@ -60,7 +61,7 @@ module.exports = fp(async (fastify, options) => {
     async (request, reply) => {
       const { id } = request.params;
       const { attachment, filename: targetFilename } = request.query;
-      const { targetFileName, filename } = await fastify.fileManagerServices.getFileInfo({
+      const { targetFileName, filename } = await services.fileRecord.getFileInfo({
         id,
         namespace: options.namespace
       });
@@ -81,7 +82,7 @@ module.exports = fp(async (fastify, options) => {
         perPage: 20,
         currentPage: 1
       });
-      return await fastify.fileManagerServices.getFileList({
+      return await services.fileRecord.getFileList({
         filter,
         namespace: options.namespace,
         perPage,
@@ -106,7 +107,7 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { id } = request.body;
-      await fastify.fileManagerServices.deleteFile({ id, namespace: options.namespace });
+      await services.fileRecord.deleteFile({ id, namespace: options.namespace });
       return {};
     }
   );

package/libs/models/file-record.js

@@ -0,0 +1,43 @@
+module.exports = (sequelize, DataTypes) => {
+  return sequelize.define(
+    'fileRecord',
+    {
+      id: {
+        type: DataTypes.UUID,
+        defaultValue: DataTypes.UUIDV4,
+        primaryKey: true
+      },
+      filename: {
+        type: DataTypes.STRING,
+        allowNull: false
+      },
+      hash: {
+        type: DataTypes.STRING,
+        allowNull: false
+      },
+      namespace: {
+        type: DataTypes.STRING,
+        defaultValue: 'default'
+      },
+      size: {
+        type: DataTypes.INTEGER,
+        allowNull: false
+      },
+      encoding: DataTypes.STRING,
+      mimetype: DataTypes.STRING
+    },
+    {
+      indexes: [
+        {
+          fields: ['namespace']
+        },
+        {
+          fields: ['filename']
+        },
+        {
+          fields: ['hash']
+        }
+      ]
+    }
+  );
+};

package/libs/{service.js → services/file-record.js}

@@ -4,6 +4,7 @@ const crypto = require('crypto');
 const path = require('path');
 
 module.exports = fp(async (fastify, options) => {
+  const { models, services } = fastify.fileManager;
   const uploadToFileSystem = async ({ file, namespace }) => {
     const { filename, encoding, mimetype } = file;
     const buffer = await file.toBuffer();
@@ -13,9 +14,9 @@ module.exports = fp(async (fastify, options) => {
     const extension = path.extname(filename);
     const filepath = path.resolve(options.root, `${digest}${extension}`);
     await fs.writeFile(filepath, buffer);
-    return await fastify.models.fileManager.create({
+    return await models.fileRecord.create({
       filename,
-      namespace,
+      namespace: namespace || options.namespace,
       encoding,
       mimetype,
       hash: digest,
@@ -24,8 +25,8 @@ module.exports = fp(async (fastify, options) => {
   };
 
   const getFileUrl = async ({ id, namespace }) => {
-    const file = await fastify.models.fileManager.findByPk(id, {
-      where: { namespace }
+    const file = await models.fileRecord.findByPk(id, {
+      where: { namespace: namespace || options.namespace }
     });
     if (!file) {
       throw new Error('文件不存在');
@@ -35,8 +36,8 @@ module.exports = fp(async (fastify, options) => {
   };
 
   const getFileInfo = async ({ id, namespace }) => {
-    const file = await fastify.models.fileManager.findByPk(id, {
-      where: { namespace }
+    const file = await models.fileRecord.findByPk(id, {
+      where: { namespace: namespace || options.namespace }
     });
     if (!file) {
       throw new Error('文件不存在');
@@ -48,8 +49,8 @@ module.exports = fp(async (fastify, options) => {
   };
 
   const getFileList = async ({ filter, namespace, currentPage, perPage }) => {
-    const queryFilter = { namespace };
-    const { count, rows } = await fastify.models.fileManager.findAndCountAll({
+    const queryFilter = { namespace: namespace || options.namespace };
+    const { count, rows } = await models.fileRecord.findAndCountAll({
       where: queryFilter,
       offset: currentPage * (currentPage - 1),
       limit: perPage
@@ -61,8 +62,8 @@ module.exports = fp(async (fastify, options) => {
   };
 
   const deleteFile = async ({ id, namespace }) => {
-    const file = await fastify.models.fileManager.findByPk(id, {
-      where: { namespace }
+    const file = await models.fileRecord.findByPk(id, {
+      where: { namespace: namespace || options.namespace }
     });
     if (!file) {
       throw new Error('文件不存在');
@@ -70,6 +71,5 @@ module.exports = fp(async (fastify, options) => {
 
     await file.destroy();
   };
-
-  fastify.decorate('fileManagerServices', { uploadToFileSystem, getFileUrl, getFileInfo, getFileList, deleteFile });
+  services.fileRecord = { uploadToFileSystem, getFileUrl, getFileInfo, getFileList, deleteFile };
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kne/fastify-file-manager",
-  "version": "0.1.1-alpha.1",
+  "version": "1.0.1",
   "description": "用于管理静态文件上传查看等",
   "main": "index.js",
   "scripts": {
@@ -18,8 +18,7 @@
   },
   "files": [
     "index.js",
-    "libs",
-    "models"
+    "libs"
   ],
   "repository": {
     "type": "git",
@@ -33,16 +32,16 @@
   },
   "homepage": "https://github.com/kne-union/fastify-file-manager#readme",
   "devDependencies": {
-    "@kne/fastify-sequelize": "^0.1.3",
+    "@kne/fastify-sequelize": "^1.0.0",
     "fastify": "^4.27.0",
     "husky": "^9.0.11",
     "prettier": "^3.2.5",
     "sqlite3": "^5.1.7"
   },
   "dependencies": {
-    "@fastify/autoload": "^5.8.2",
     "@fastify/multipart": "^8.2.0",
     "@fastify/static": "^7.0.4",
+    "@kne/fastify-namespace": "^0.1.0",
     "fastify-plugin": "^4.5.1",
     "fs-extra": "^11.2.0"
   }

package/models/file-manager.js

@@ -1,23 +0,0 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define('fileManager', {
-    id: {
-      type: DataTypes.UUID, defaultValue: DataTypes.UUIDV4, primaryKey: true
-    }, filename: {
-      type: DataTypes.STRING, allowNull: false
-    }, hash: {
-      type: DataTypes.STRING, allowNull: false
-    }, namespace: {
-      type: DataTypes.STRING, defaultValue: 'default'
-    }, size: {
-      type: DataTypes.INTEGER, allowNull: false
-    }, encoding: DataTypes.STRING, mimetype: DataTypes.STRING
-  }, {
-    indexes: [{
-      fields: ['namespace']
-    }, {
-      fields: ['filename']
-    }, {
-      fields: ['hash']
-    }]
-  });
-};