@kne/fastify-file-manager 2.0.7 → 2.0.9

package/libs/services/file-record.js

@@ -5,6 +5,7 @@ const path = require('node:path');
 const { NotFound } = require('http-errors');
 const os = require('node:os');
 const { Readable } = require('node:stream');
+const compressing = require('compressing');
 
 module.exports = fp(async (fastify, options) => {
   const { models, services } = fastify.fileManager;
@@ -29,7 +30,7 @@ module.exports = fp(async (fastify, options) => {
     const writeStream = fs.createWriteStream(tmpPath);
     let fileSize = 0;
     if (file.file) {
-      file.file.on('data', (chunk) => {
+      file.file.on('data', chunk => {
         hash.update(chunk); // 更新哈希
         writeStream.write(chunk); // 写入文件
         fileSize += chunk.length; // 更新文件大小
@@ -73,14 +74,12 @@ module.exports = fp(async (fastify, options) => {
       const writeStream = fs.createWriteStream(filepath);
       const readStream = fs.createReadStream(tmpPath);
       await new Promise((resolve, reject) => {
-        readStream.pipe(writeStream)
-          .on('finish', resolve)
-          .on('error', reject);
+        readStream.pipe(writeStream).on('finish', resolve).on('error', reject);
       });
       storageType = 'local';
     }
 
-    //清楚临时文件
+    //清除临时文件
     await fs.remove(tmpPath);
 
     const outputFile = await (async create => {
@@ -128,12 +127,28 @@ module.exports = fp(async (fastify, options) => {
         nodeStream.emit('error', err);
       }
     };
-    readChunk();
+    readChunk().catch(err => {
+      throw err;
+    });
+
+    let filename = path.basename(url).split('?')[0];
+
+    const contentDisposition = response.headers.get('content-disposition');
+
+    if (contentDisposition) {
+      const filenameMatch = contentDisposition.match(/filename="?(.+)"?/i);
+      if (filenameMatch && filenameMatch[1]) {
+        filename = filenameMatch[1];
+      }
+    }
+
+    const searchParams = new URLSearchParams(url.split('?')[1]);
+    if (searchParams.get('filename')) {
+      filename = searchParams.get('filename');
+    }
+
     const tempFile = {
-      filename: path.basename(url).split('?')[0],
-      mimetype: response.headers.get('content-type'),
-      encoding: 'binary',
-      file: nodeStream
+      filename, mimetype: response.headers.get('content-type'), encoding: 'binary', file: nodeStream
     };
     return await uploadToFileSystem({ id, file: tempFile, namespace });
   };
@@ -208,7 +223,7 @@ module.exports = fp(async (fastify, options) => {
     await models.fileRecord.destroy({
       where: {
         uuid: {
-          [Op.in]: ids.map((str) => str.split('?')[0])
+          [Op.in]: ids.map(str => str.split('?')[0])
         }
       }
     });
@@ -249,27 +264,71 @@ module.exports = fp(async (fastify, options) => {
     });
   };
 
-  const getFileStream = async ({ id }) => {
-    const file = await detail({ id });
-
+  const getFileReadStream = file => {
     const extension = path.extname(file.filename);
     const targetFileName = `${file.hash}${extension}`;
     const ossServices = options.ossAdapter();
-
     if (file.storageType === 'oss') {
       if (typeof ossServices.getFileStream !== 'function') {
         throw new Error('ossAdapter未正确配置无法读取oss类型存储文件');
       }
-      return await ossServices.getFileStream({ filename: targetFileName });
+      return ossServices.getFileStream({ filename: targetFileName });
     } else {
       const filePath = path.resolve(options.root, targetFileName);
-      if (!(await fs.exists(filePath))) {
-        throw new NotFound();
-      }
       return fs.createReadStream(filePath);
     }
   };
 
+  const getFileStream = async ({ id }) => {
+    const file = await detail({ id });
+    return getFileReadStream(file);
+  };
+
+  const getCompressFileStream = async ({ ids, type = 'zip' }) => {
+    const fileList = await models.fileRecord.findAll({
+      where: {
+        uuid: {
+          [Op.in]: ids.map(str => str.split('?')[0])
+        }
+      }
+    });
+    const tmpPath = path.resolve(os.tmpdir(), `temp_compress_file_${crypto.randomBytes(6).toString('hex')}`);
+    await fs.mkdir(tmpPath);
+    const files = [];
+    for (const file of fileList) {
+      const filepath = path.resolve(tmpPath, file.filename);
+      const writeStream = fs.createWriteStream(filepath);
+      const fileStream = getFileReadStream(file);
+      fileStream.pipe(writeStream);
+      await new Promise((resolve, reject) => {
+        writeStream.on('finish', resolve);
+        writeStream.on('error', reject);
+      });
+      files.push(filepath);
+    }
+    const compressStream = new compressing[type].Stream();
+    files.forEach(filepath => {
+      compressStream.addEntry(path.resolve(filepath));
+    });
+    compressStream.on('error', () => {
+      fs.remove(tmpPath);
+    });
+    compressStream.on('end', () => {
+      fs.remove(tmpPath);
+    });
+    return compressStream;
+  };
+
+  const getCompressFileBlob = async (...args) => {
+    const compressStream = await getCompressFileStream(...args);
+    const chunks = [];
+    return new Promise((resolve, reject) => {
+      compressStream.on('data', chunk => chunks.push(chunk));
+      compressStream.on('end', () => resolve(Buffer.concat(chunks)));
+      compressStream.on('error', reject);
+    });
+  };
+
   const getFileInstance = async ({ id, uuid }) => {
     return detail({ id, uuid });
   };
@@ -283,8 +342,11 @@ module.exports = fp(async (fastify, options) => {
     deleteFiles,
     renameFile,
     getFileBlob,
-    getFileStream, // 兼容之前api，后面可能会删掉
-    getFileInstance,
+    getFileStream,
+    getFileReadStream,
+    getCompressFileStream,
+    getCompressFileBlob,
+    getFileInstance, // 兼容之前api，后面可能会删掉
     fileRecord: {
       uploadToFileSystem,
       uploadFromUrl,
@@ -295,6 +357,9 @@ module.exports = fp(async (fastify, options) => {
       renameFile,
       getFileBlob,
       getFileStream,
+      getFileReadStream,
+      getCompressFileStream,
+      getCompressFileBlob,
       getFileInstance
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kne/fastify-file-manager",
-  "version": "2.0.7",
+  "version": "2.0.9",
   "description": "用于管理静态文件上传查看等",
   "main": "index.js",
   "scripts": {
@@ -49,6 +49,7 @@
   "dependencies": {
     "@fastify/multipart": "^9.0.3",
     "@fastify/static": "^8.1.1",
+    "compressing": "^2.0.0",
     "fs-extra": "^11.2.0",
     "http-errors": "^2.0.0"
   }