@kne/fastify-file-manager 2.0.2 → 2.0.4

package/libs/services/file-record.js

@@ -4,6 +4,7 @@ const crypto = require('node:crypto');
 const path = require('node:path');
 const { NotFound } = require('http-errors');
 const os = require('node:os');
+const { Readable } = require('stream');
 
 module.exports = fp(async (fastify, options) => {
   const { models, services } = fastify.fileManager;
@@ -80,13 +81,7 @@ module.exports = fp(async (fastify, options) => {
       await file.save();
       return file;
     })(() => models.fileRecord.create({
-      filename,
-      namespace: namespace || options.namespace,
-      encoding,
-      mimetype,
-      hash: digest,
-      size: fileSize,
-      storageType
+      filename, namespace: namespace || options.namespace, encoding, mimetype, hash: digest, size: fileSize, storageType
     }));
     return Object.assign({}, outputFile.get({ plain: true }), { id: outputFile.uuid });
   };
@@ -96,11 +91,33 @@ module.exports = fp(async (fastify, options) => {
     if (!response.ok) {
       throw new Error('下载文件失败');
     }
+
+    const nodeStream = new Readable({
+      read() {
+        // 空实现，数据通过push方法手动添加
+      }
+    });
+
+    const reader = response.body.getReader();
+    const readChunk = async () => {
+      try {
+        const { done, value } = await reader.read();
+        if (done) {
+          nodeStream.push(null);
+          return;
+        }
+        nodeStream.push(value);
+        readChunk();
+      } catch (err) {
+        nodeStream.emit('error', err);
+      }
+    };
+    readChunk();
     const tempFile = {
       filename: path.basename(url).split('?')[0],
       mimetype: response.headers.get('content-type'),
       encoding: 'binary',
-      file: response.body
+      file: nodeStream
     };
     return await uploadToFileSystem({ id, file: tempFile, namespace });
   };
@@ -202,8 +219,83 @@ module.exports = fp(async (fastify, options) => {
     await file.save();
   };
 
+  const getFileBlob = async ({ id }) => {
+    const file = await models.fileRecord.findOne({
+      where: { uuid: id }
+    });
+    if (!file) {
+      throw new Error('文件不存在');
+    }
+
+    const extension = path.extname(file.filename);
+    const targetFileName = `${file.hash}${extension}`;
+    const ossServices = options.ossAdapter();
+
+    let buffer;
+    if (file.storageType === 'oss') {
+      if (typeof ossServices.downloadFile !== 'function') {
+        throw new Error('ossAdapter未正确配置无法读取oss类型存储文件');
+      }
+      buffer = await ossServices.downloadFile({ filename: targetFileName });
+    } else {
+      const filePath = path.resolve(options.root, targetFileName);
+      if (!(await fs.exists(filePath))) {
+        throw new NotFound();
+      }
+      buffer = await fs.readFile(filePath);
+    }
+
+    return Object.assign({}, file.get({ plain: true }), {
+      id: file.uuid, buffer
+    });
+  };
+
+  const getFileStream = async ({ id }) => {
+    const file = await models.fileRecord.findOne({
+      where: { uuid: id }
+    });
+    if (!file) {
+      throw new Error('文件不存在');
+    }
+
+    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 });
+    } else {
+      const filePath = path.resolve(options.root, targetFileName);
+      if (!(await fs.exists(filePath))) {
+        throw new NotFound();
+      }
+      return fs.createReadStream(filePath);
+    }
+  };
+
   Object.assign(services, {
-    uploadToFileSystem, uploadFromUrl, getFileUrl, getFileInfo, getFileList, deleteFiles, renameFile, // 兼容之前api，后面可能会删掉
-    fileRecord: { uploadToFileSystem, uploadFromUrl, getFileUrl, getFileInfo, getFileList, deleteFiles, renameFile }
+    uploadToFileSystem,
+    uploadFromUrl,
+    getFileUrl,
+    getFileInfo,
+    getFileList,
+    deleteFiles,
+    renameFile,
+    getFileBlob,
+    getFileStream, // 兼容之前api，后面可能会删掉
+    fileRecord: {
+      uploadToFileSystem,
+      uploadFromUrl,
+      getFileUrl,
+      getFileInfo,
+      getFileList,
+      deleteFiles,
+      renameFile,
+      getFileBlob,
+      getFileStream
+    }
   });
 });

package/package.json

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