@kne/fastify-file-manager 3.0.1-alpha.1 → 3.0.1-alpha.3

package/libs/services/file-record.js

@@ -13,6 +13,8 @@ module.exports = fp(async (fastify, fastifyOptions) => {
   const { models, services } = fastify.fileManager;
   const { Op } = fastify.sequelize.Sequelize;
 
+  const sanitizeFilename = filename => filename.replace(/[\\/:*?"<>|\0]/g, '_');
+
   const detail = async ({ id, uuid, namespace }) => {
     const file = await models.fileRecord.findOne({
       where: { uuid: String(id || uuid).split('?')[0] }
@@ -25,14 +27,14 @@ module.exports = fp(async (fastify, fastifyOptions) => {
     return file;
   };
   const uploadToFileSystem = async ({ id, file, namespace, options }) => {
-    const { filename, encoding, mimetype } = file;
+    const { encoding, mimetype } = file;
+    const filename = sanitizeFilename(file.filename);
     const hash = crypto.createHash('md5');
     const extension = path.extname(filename);
     const tmpPath = path.resolve(os.tmpdir(), `temp_${filename}_${crypto.randomBytes(6).toString('hex')}`);
     let fileSize = 0;
     if (file.file) {
       const writeStream = fs.createWriteStream(tmpPath);
-
       await new Promise((resolve, reject) => {
         const cleanup = () => {
           file.file.removeAllListeners();
@@ -74,8 +76,15 @@ module.exports = fp(async (fastify, fastifyOptions) => {
       await fs.writeFile(tmpPath, buffer);
       fileSize = buffer.byteLength;
     } else if (file.filepath) {
+      const readStream = fs.createReadStream(file.filepath);
+      await new Promise((resolve, reject) => {
+        readStream.on('data', chunk => hash.update(chunk));
+        readStream.on('end', resolve);
+        readStream.on('error', reject);
+      });
       await fs.copy(file.filepath, tmpPath);
       const stat = await fs.stat(tmpPath);
+
       fileSize = stat.size;
     } else {
       throw new Error('文件类型不支持');
@@ -118,16 +127,18 @@ module.exports = fp(async (fastify, fastifyOptions) => {
       file.options = options;
       await file.save();
       return file;
-    })(() => models.fileRecord.create({
-      filename,
-      namespace: namespace || fastifyOptions.namespace,
-      encoding,
-      mimetype,
-      hash: digest,
-      size: fileSize,
-      storageType,
-      options
-    }));
+    })(() =>
+      models.fileRecord.create({
+        filename,
+        namespace: namespace || fastifyOptions.namespace,
+        encoding,
+        mimetype,
+        hash: digest,
+        size: fileSize,
+        storageType,
+        options
+      })
+    );
     return Object.assign({}, outputFile.get({ plain: true }), { id: outputFile.uuid });
   };
 
@@ -182,7 +193,10 @@ module.exports = fp(async (fastify, fastifyOptions) => {
     }
 
     const tempFile = {
-      filename, mimetype: response.headers.get('content-type'), encoding: 'binary', file: nodeStream
+      filename: sanitizeFilename(filename),
+      mimetype: response.headers.get('content-type'),
+      encoding: 'binary',
+      file: nodeStream
     };
     return await uploadToFileSystem({ id, file: tempFile, namespace, options });
   };
@@ -217,7 +231,9 @@ module.exports = fp(async (fastify, fastifyOptions) => {
       targetFile = await ossServices.downloadFile({ filename: targetFileName });
     }
     return Object.assign({}, file.get({ pain: true }), {
-      id: file.uuid, filePath: targetFileName, targetFile
+      id: file.uuid,
+      filePath: targetFileName,
+      targetFile
     });
   };
 
@@ -272,10 +288,14 @@ module.exports = fp(async (fastify, fastifyOptions) => {
     });
 
     const { count, rows } = await models.fileRecord.findAndCountAll({
-      where: queryFilter, offset: perPage * (currentPage - 1), limit: perPage, order: [['createdAt', 'desc']]
+      where: queryFilter,
+      offset: perPage * (currentPage - 1),
+      limit: perPage,
+      order: [['createdAt', 'desc']]
     });
     return {
-      pageData: rows.map(item => Object.assign({}, item.get({ plain: true }), { id: item.uuid })), totalCount: count
+      pageData: rows.map(item => Object.assign({}, item.get({ plain: true }), { id: item.uuid })),
+      totalCount: count
     };
   };
 
@@ -291,6 +311,10 @@ module.exports = fp(async (fastify, fastifyOptions) => {
 
   const renameFile = async ({ id, filename }) => {
     const file = await detail({ id });
+    filename = sanitizeFilename(filename);
+    if (!path.extname(filename) && path.extname(file.filename)) {
+      filename += path.extname(file.filename);
+    }
     file.filename = filename;
     await file.save();
   };
@@ -320,7 +344,8 @@ module.exports = fp(async (fastify, fastifyOptions) => {
     }
 
     return Object.assign({}, file.get({ plain: true }), {
-      id: file.uuid, buffer
+      id: file.uuid,
+      buffer
     });
   };
 
@@ -396,7 +421,8 @@ module.exports = fp(async (fastify, fastifyOptions) => {
     const tmpPath = path.resolve(os.tmpdir(), `temp_${id}_${crypto.randomBytes(6).toString('hex')}`);
     await compressing[type].uncompress(fileStream, tmpPath);
     const files = await glob(globOptions, {
-      cwd: tmpPath, nodir: true
+      cwd: tmpPath,
+      nodir: true
     });
     //将文件上传到文件系统
     const fileList = [];
@@ -406,11 +432,17 @@ module.exports = fp(async (fastify, fastifyOptions) => {
       const mimetype = MimeTypes.lookup(filepath) || 'application/octet-stream';
       const file = await uploadToFileSystem({
         file: {
-          filename, mimetype, encoding: 'binary', filepath
-        }, filename, namespace
+          filename,
+          mimetype,
+          encoding: 'binary',
+          filepath
+        },
+        filename,
+        namespace
       });
       fileList.push({
-        dir, file
+        dir,
+        file
       });
     }
     fs.remove(tmpPath).catch(console.error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kne/fastify-file-manager",
-  "version": "3.0.1-alpha.1",
+  "version": "3.0.1-alpha.3",
   "description": "用于管理静态文件上传查看等",
   "main": "index.js",
   "scripts": {
@@ -8,7 +8,8 @@
     "build:md": "npx @kne/md-doc",
     "start:md": "npx @kne/md-doc --watch",
     "prettier": "prettier --config .prettierrc --write '{libs/**/*,index}.{js,jsx,ts,tsx,json,css,scss}'",
-    "lint-staged": "npx lint-staged"
+    "lint-staged": "npx lint-staged",
+    "test": "mocha tests/**/*.test.js --timeout 30000"
   },
   "lint-staged": {
     "{libs/**/*,index}.{js,jsx,ts,tsx,json,css,scss}": [
@@ -37,6 +38,7 @@
     "@kne/fastify-sequelize": "^2.0.1",
     "fastify": "^5.3.2",
     "husky": "^9.0.11",
+    "mocha": "^11.7.5",
     "prettier": "^3.2.5",
     "qs": "^6.12.3",
     "sqlite3": "^5.1.7"