@kne/fastify-file-manager 3.0.1-alpha.0 → 3.0.1-alpha.2

package/libs/services/file-record.js

@@ -29,39 +29,64 @@ module.exports = fp(async (fastify, fastifyOptions) => {
     const hash = crypto.createHash('md5');
     const extension = path.extname(filename);
     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 writeStream = fs.createWriteStream(tmpPath);
       await new Promise((resolve, reject) => {
+        const cleanup = () => {
+          file.file.removeAllListeners();
+          writeStream.removeAllListeners();
+        };
+
+        const handleError = err => {
+          cleanup();
+          reject(err);
+        };
+
+        writeStream.on('error', handleError);
+        writeStream.on('drain', () => {
+          file.file.resume();
+        });
+
+        file.file.on('data', chunk => {
+          hash.update(chunk);
+          const canWrite = writeStream.write(chunk);
+          if (!canWrite) {
+            file.file.pause();
+          }
+          fileSize += chunk.length;
+        });
+
         file.file.on('end', () => {
-          writeStream.end(); // 关闭写入流
+          writeStream.end();
+        });
+
+        file.file.on('error', handleError);
+        writeStream.on('finish', () => {
+          cleanup();
           resolve();
         });
-        file.file.on('error', reject);
       });
-    } else if (file.toBuffer) {
-      const buffer = await file.toBuffer();
+    } else if (file.toBuffer || file.buffer) {
+      const buffer = file.toBuffer ? await file.toBuffer() : file.buffer;
       hash.update(buffer);
-      writeStream.write(buffer);
+      await fs.writeFile(tmpPath, buffer);
       fileSize = buffer.byteLength;
-      writeStream.end();
+    } 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('文件类型不支持');
     }
 
-    await new Promise((resolve, reject) => {
-      writeStream.on('finish', () => {
-        resolve();
-      });
-      writeStream.on('error', reject);
-    });
-
     const digest = hash.digest('hex');
 
     let storageType;
@@ -392,26 +417,22 @@ module.exports = fp(async (fastify, fastifyOptions) => {
       cwd: tmpPath,
       nodir: true
     });
-    console.log('---->1:', files);
     //将文件上传到文件系统
     const fileList = [];
     for (let dir of files) {
       const filepath = path.resolve(tmpPath, dir);
       const filename = path.basename(dir);
-      const fileStream = fs.createReadStream(filepath);
       const mimetype = MimeTypes.lookup(filepath) || 'application/octet-stream';
-      console.log(filename, mimetype);
       const file = await uploadToFileSystem({
         file: {
           filename,
           mimetype,
           encoding: 'binary',
-          file: fileStream
+          filepath
         },
         filename,
         namespace
       });
-      console.log('---->2:', dir, file);
       fileList.push({
         dir,
         file

package/package.json

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