@kne/fastify-file-manager 1.0.1 → 1.1.1

package/index.js

@@ -23,7 +23,12 @@ module.exports = fp(
       name: 'fileManager',
       options,
       modules: [
-        ['models', await fastify.sequelize.addModels(path.resolve(__dirname, './libs/models'))],
+        [
+          'models',
+          await fastify.sequelize.addModels(path.resolve(__dirname, './libs/models'), {
+            prefix: 't_file_manager_'
+          })
+        ],
         ['services', path.resolve(__dirname, './libs/services')],
         ['controllers', path.resolve(__dirname, './libs/controllers')]
       ]

package/libs/models/file-record.js

@@ -1,11 +1,9 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'fileRecord',
-    {
-      id: {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
+      uuid: {
         type: DataTypes.UUID,
-        defaultValue: DataTypes.UUIDV4,
-        primaryKey: true
+        defaultValue: DataTypes.UUIDV4
       },
       filename: {
         type: DataTypes.STRING,
@@ -26,8 +24,12 @@ module.exports = (sequelize, DataTypes) => {
       encoding: DataTypes.STRING,
       mimetype: DataTypes.STRING
     },
-    {
+    options: {
       indexes: [
+        {
+          unique: true,
+          fields: ['uuid', 'deleted_at']
+        },
         {
           fields: ['namespace']
         },
@@ -39,5 +41,5 @@ module.exports = (sequelize, DataTypes) => {
         }
       ]
     }
-  );
+  };
 };

package/libs/services/file-record.js

@@ -14,7 +14,7 @@ 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 models.fileRecord.create({
+    const outputFile = await models.fileRecord.create({
       filename,
       namespace: namespace || options.namespace,
       encoding,
@@ -22,11 +22,12 @@ module.exports = fp(async (fastify, options) => {
       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.findByPk(id, {
-      where: { namespace: namespace || options.namespace }
+    const file = await models.fileRecord.findOne({
+      where: { uuid: id, namespace: namespace || options.namespace }
     });
     if (!file) {
       throw new Error('文件不存在');
@@ -36,14 +37,15 @@ module.exports = fp(async (fastify, options) => {
   };
 
   const getFileInfo = async ({ id, namespace }) => {
-    const file = await models.fileRecord.findByPk(id, {
-      where: { namespace: namespace || options.namespace }
+    const file = await models.fileRecord.findOne({
+      where: { uuid: id, namespace: namespace || options.namespace }
     });
     if (!file) {
       throw new Error('文件不存在');
     }
     const extension = path.extname(file.filename);
     return Object.assign({}, file, {
+      id: file.uuid,
       targetFileName: `${file.hash}${extension}`
     });
   };
@@ -56,14 +58,14 @@ module.exports = fp(async (fastify, options) => {
       limit: perPage
     });
     return {
-      pageData: rows,
+      pageData: rows.map(item => Object.assign({}, item.get({ plain: true }), { id: item.uuid })),
       totalCount: count
     };
   };
 
   const deleteFile = async ({ id, namespace }) => {
-    const file = await models.fileRecord.findByPk(id, {
-      where: { namespace: namespace || options.namespace }
+    const file = await models.fileRecord.findOne({
+      where: { uuid: id, namespace: namespace || options.namespace }
     });
     if (!file) {
       throw new Error('文件不存在');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kne/fastify-file-manager",
-  "version": "1.0.1",
+  "version": "1.1.1",
   "description": "用于管理静态文件上传查看等",
   "main": "index.js",
   "scripts": {
@@ -32,7 +32,7 @@
   },
   "homepage": "https://github.com/kne-union/fastify-file-manager#readme",
   "devDependencies": {
-    "@kne/fastify-sequelize": "^1.0.0",
+    "@kne/fastify-sequelize": "^2.0.1",
     "fastify": "^4.27.0",
     "husky": "^9.0.11",
     "prettier": "^3.2.5",