@kne/fastify-file-manager 2.0.0 → 2.0.2

package/libs/services/file-record.js

@@ -1,8 +1,9 @@
 const fp = require('fastify-plugin');
 const fs = require('fs-extra');
-const crypto = require('crypto');
-const path = require('path');
+const crypto = require('node:crypto');
+const path = require('node:path');
 const { NotFound } = require('http-errors');
+const os = require('node:os');
 
 module.exports = fp(async (fastify, options) => {
   const { models, services } = fastify.fileManager;
@@ -11,28 +12,46 @@ module.exports = fp(async (fastify, options) => {
     const { filename, encoding, mimetype } = file;
     const hash = crypto.createHash('md5');
     const extension = path.extname(filename);
-    let buffer = Buffer.alloc(0);
+    const tmpPath = path.resolve(os.tmpdir(), `temp_${filename}_${crypto.randomBytes(6).toString('hex')}`);
+    const writeStream = fs.createWriteStream(tmpPath);
+    let fileSize = 0;
+    if (file.file) {
+      file.file.on('data', (chunk) => {
+        hash.update(chunk); // 更新哈希
+        writeStream.write(chunk); // 写入文件
+        fileSize += chunk.length; // 更新文件大小
+      });
 
-    // 使用流处理文件数据
-    const stream = file.createReadStream();
-    for await (const chunk of stream) {
-      hash.update(chunk);
-      buffer = Buffer.concat([buffer, chunk]);
+      await new Promise((resolve, reject) => {
+        file.file.on('end', () => {
+          writeStream.end(); // 关闭写入流
+          resolve();
+        });
+        file.file.on('error', reject);
+      });
+    } else if (file.toBuffer) {
+      const buffer = await file.toBuffer();
+      hash.update(buffer);
+      writeStream.write(buffer);
+      fileSize = buffer.byteLength;
+    } else {
+      throw new Error('文件类型不支持');
     }
+
     const digest = hash.digest('hex');
 
     let storageType;
     const ossServices = options.ossAdapter();
     if (typeof ossServices.uploadFile === 'function') {
       // 使用流上传到OSS
-      const uploadStream = file.createReadStream();
-      await ossServices.uploadFileStream({ stream: uploadStream, filename: `${digest}${extension}` });
+      const readStream = fs.createReadStream(tmpPath);
+      await ossServices.uploadFileStream({ stream: readStream, filename: `${digest}${extension}` });
       storageType = 'oss';
     } else {
       // 使用流写入本地文件
       const filepath = path.resolve(options.root, `${digest}${extension}`);
       const writeStream = fs.createWriteStream(filepath);
-      const readStream = file.createReadStream();
+      const readStream = fs.createReadStream(tmpPath);
       await new Promise((resolve, reject) => {
         readStream.pipe(writeStream)
           .on('finish', resolve)
@@ -41,6 +60,9 @@ module.exports = fp(async (fastify, options) => {
       storageType = 'local';
     }
 
+    //清楚临时文件
+    await fs.remove(tmpPath);
+
     const outputFile = await (async create => {
       if (!id) {
         return await create();
@@ -53,21 +75,19 @@ module.exports = fp(async (fastify, options) => {
       file.encoding = encoding;
       file.mimetype = mimetype;
       file.hash = digest;
-      file.size = buffer.byteLength;
+      file.size = fileSize;
       file.storageType = storageType;
       await file.save();
       return file;
-    })(() =>
-      models.fileRecord.create({
-        filename,
-        namespace: namespace || options.namespace,
-        encoding,
-        mimetype,
-        hash: digest,
-        size: buffer.byteLength,
-        storageType
-      })
-    );
+    })(() => models.fileRecord.create({
+      filename,
+      namespace: namespace || options.namespace,
+      encoding,
+      mimetype,
+      hash: digest,
+      size: fileSize,
+      storageType
+    }));
     return Object.assign({}, outputFile.get({ plain: true }), { id: outputFile.uuid });
   };
 
@@ -76,21 +96,11 @@ module.exports = fp(async (fastify, options) => {
     if (!response.ok) {
       throw new Error('下载文件失败');
     }
-    const chunks = [];
-    for await (const chunk of response.body) {
-      chunks.push(chunk);
-    }
-    const buffer = Buffer.concat(chunks);
     const tempFile = {
       filename: path.basename(url).split('?')[0],
       mimetype: response.headers.get('content-type'),
       encoding: 'binary',
-      createReadStream: () => {
-        const readable = new require('stream').Readable();
-        readable.push(buffer);
-        readable.push(null);
-        return readable;
-      }
+      file: response.body
     };
     return await uploadToFileSystem({ id, file: tempFile, namespace });
   };
@@ -135,9 +145,7 @@ module.exports = fp(async (fastify, options) => {
       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
     });
   };
 
@@ -166,13 +174,10 @@ module.exports = fp(async (fastify, options) => {
     }
 
     const { count, rows } = await models.fileRecord.findAndCountAll({
-      where: queryFilter,
-      offset: perPage * (currentPage - 1),
-      limit: perPage
+      where: queryFilter, offset: perPage * (currentPage - 1), limit: perPage
     });
     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
     };
   };
 
@@ -198,8 +203,7 @@ module.exports = fp(async (fastify, options) => {
   };
 
   Object.assign(services, {
-    uploadToFileSystem, uploadFromUrl, getFileUrl, getFileInfo, getFileList, deleteFiles, renameFile,
-    // 兼容之前api，后面可能会删掉
+    uploadToFileSystem, uploadFromUrl, getFileUrl, getFileInfo, getFileList, deleteFiles, renameFile, // 兼容之前api，后面可能会删掉
     fileRecord: { uploadToFileSystem, uploadFromUrl, getFileUrl, getFileInfo, getFileList, deleteFiles, renameFile }
   });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kne/fastify-file-manager",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "用于管理静态文件上传查看等",
   "main": "index.js",
   "scripts": {