@kevisual/oss 0.0.17 → 0.0.19

package/dist/services.js

@@ -36456,15 +36456,21 @@ class OssBase {
         contentLength = Buffer.byteLength(putData);
       }
     } else {
-      putData = data;
       if (!contentLength) {
-        throw new Error("Stream upload requires size parameter");
+        const chunks = [];
+        for await (const chunk of data) {
+          chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+        }
+        putData = Buffer.concat(chunks);
+        contentLength = putData.length;
+      } else {
+        putData = data;
       }
     }
     if (opts?.check) {
       const obj = await this.statObject(objectName, true);
       if (obj) {
-        const omitMeta = ["size", "Content-Type", "Cache-Control", "app-source"];
+        const omitMeta = ["size", "content-type", "cache-control", "app-source"];
         const objMeta = JSON.parse(JSON.stringify(omit(obj.metaData, omitMeta)));
         metaData = {
           ...objMeta,
@@ -36493,22 +36499,41 @@ class OssBase {
     };
   }
   async fPutObject(objectName, filePath, metaData) {
-    const fileStream = fs.createReadStream(filePath);
     const stat = fs.statSync(filePath);
     const { standardHeaders, customMetadata } = extractStandardHeaders(metaData || {});
-    const command = new import_client_s3.PutObjectCommand({
-      Bucket: this.bucketName,
-      Key: `${this.prefix}${objectName}`,
-      Body: fileStream,
-      ContentLength: stat.size,
-      ContentType: standardHeaders.ContentType || getContentType(filePath),
-      CacheControl: standardHeaders.CacheControl,
-      ContentDisposition: standardHeaders.ContentDisposition,
-      ContentEncoding: standardHeaders.ContentEncoding,
-      ContentLanguage: standardHeaders.ContentLanguage,
-      Expires: standardHeaders.Expires,
-      Metadata: customMetadata
-    });
+    const THRESHOLD = 5 * 1024 * 1024;
+    let command;
+    if (stat.size < THRESHOLD) {
+      const fileBuffer = await fs.promises.readFile(filePath);
+      command = new import_client_s3.PutObjectCommand({
+        Bucket: this.bucketName,
+        Key: `${this.prefix}${objectName}`,
+        Body: fileBuffer,
+        ContentLength: fileBuffer.length,
+        ContentType: standardHeaders.ContentType || getContentType(filePath),
+        CacheControl: standardHeaders.CacheControl,
+        ContentDisposition: standardHeaders.ContentDisposition,
+        ContentEncoding: standardHeaders.ContentEncoding,
+        ContentLanguage: standardHeaders.ContentLanguage,
+        Expires: standardHeaders.Expires,
+        Metadata: customMetadata
+      });
+    } else {
+      const fileStream = fs.createReadStream(filePath);
+      command = new import_client_s3.PutObjectCommand({
+        Bucket: this.bucketName,
+        Key: `${this.prefix}${objectName}`,
+        Body: fileStream,
+        ContentLength: stat.size,
+        ContentType: standardHeaders.ContentType || getContentType(filePath),
+        CacheControl: standardHeaders.CacheControl,
+        ContentDisposition: standardHeaders.ContentDisposition,
+        ContentEncoding: standardHeaders.ContentEncoding,
+        ContentLanguage: standardHeaders.ContentLanguage,
+        Expires: standardHeaders.Expires,
+        Metadata: customMetadata
+      });
+    }
     const response = await this.client.send(command);
     return {
       etag: response.ETag?.replace(/"/g, "") || "",
@@ -36531,6 +36556,7 @@ class OssBase {
     const prefix = `${this.prefix}${objectName}`;
     const results = [];
     let continuationToken;
+    const getMeta = opts?.getMeta ?? false;
     do {
       const command = new import_client_s3.ListObjectsV2Command({
         Bucket: this.bucketName,
@@ -36543,12 +36569,19 @@ class OssBase {
       const response = await this.client.send(command);
       if (response.Contents) {
         for (const item of response.Contents) {
-          results.push({
+          const result = {
             name: item.Key || "",
             size: item.Size || 0,
             lastModified: item.LastModified || new Date,
             etag: item.ETag?.replace(/"/g, "") || ""
-          });
+          };
+          if (getMeta) {
+            const stat = await this.statObject(item.Key || "", false);
+            if (stat?.metaData) {
+              result.metaData = stat.metaData;
+            }
+          }
+          results.push(result);
         }
       }
       if (response.CommonPrefixes && !opts?.recursive) {
@@ -36571,6 +36604,13 @@ class OssBase {
       });
       const response = await this.client.send(command);
       return {
+        standardHeaders: {
+          contentType: response.ContentType,
+          cacheControl: response.CacheControl,
+          contentDisposition: response.ContentDisposition,
+          contentEncoding: response.ContentEncoding,
+          contentLanguage: response.ContentLanguage
+        },
         size: response.ContentLength || 0,
         etag: response.ETag?.replace?.(/"/g, "") || "",
         lastModified: response.LastModified || new Date,
@@ -36578,11 +36618,11 @@ class OssBase {
         versionId: response.VersionId || null
       };
     } catch (e) {
-      console.error("statObject error", e);
       const isNotFound = e.name === "NotFound" || e.name === "NoSuchBucket" || e.name === "NoSuchKey" || e.code === "NotFound" || e.code === "NoSuchBucket" || e.code === "NoSuchKey" || e.$metadata?.httpStatusCode === 404;
       if (checkFile && isNotFound) {
         return null;
       }
+      console.error("statObject error", e);
       throw e;
     }
   }
@@ -36723,69 +36763,12 @@ class ConfigOssService extends OssBase {
     return { list: listKeys, keys, keyEtagMap };
   }
 }
-// src/util/download.ts
-import fs2 from "node:fs";
-import path2 from "node:path";
-var viewableExtensions = ["jpg", "jpeg", "png", "gif", "svg", "webp", "mp4", "webm", "mp3", "wav", "ogg", "pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx"];
-var filterMetaDataKeys = (metaData, clearKeys = []) => {
-  const keys = Object.keys(metaData);
-  const removeKeys = ["password", "accesskey", "secretkey", ...clearKeys];
-  const filteredKeys = keys.filter((key) => !removeKeys.includes(key));
-  return filteredKeys.reduce((acc, key) => {
-    acc[key] = metaData[key];
-    return acc;
-  }, {});
-};
-var NotFoundFile = (res, msg, code = 404) => {
-  res.writeHead(code, { "Content-Type": "text/plain" });
-  res.end(msg || "Not Found File");
-  return;
-};
-var sendObject = async ({ res, objectName, client, isDownload = false }) => {
-  let stat;
-  try {
-    stat = await client.statObject(objectName);
-  } catch (e) {} finally {
-    if (!stat || stat.size === 0) {
-      return NotFoundFile(res);
-    }
-    const contentLength = stat.size;
-    const etag = stat.etag;
-    const lastModified = stat.lastModified.toISOString();
-    const filename = objectName.split("/").pop() || "no-file-name-download";
-    const fileExtension = filename.split(".").pop()?.toLowerCase() || "";
-    const filteredMetaData = filterMetaDataKeys(stat.metaData, ["size", "etag", "last-modified"]);
-    const contentDisposition = viewableExtensions.includes(fileExtension) && !isDownload ? "inline" : `attachment; filename="${filename}"`;
-    res.writeHead(200, {
-      "Content-Length": contentLength,
-      etag,
-      "last-modified": lastModified,
-      "Content-Disposition": contentDisposition,
-      ...filteredMetaData
-    });
-    const objectStream = await client.getObject(objectName);
-    objectStream.pipe(res, { end: true });
-  }
-};
-var downloadObject = async ({ objectName, client, filePath }) => {
-  const objectStream = await client.getObject(objectName);
-  const dir = path2.dirname(filePath);
-  if (!fs2.existsSync(dir)) {
-    fs2.mkdirSync(dir, { recursive: true });
-  }
-  objectStream.pipe(fs2.createWriteStream(filePath));
-  return objectStream;
-};
 export {
   standardHeaderKeys,
-  sendObject,
   hashSringify,
   hash,
   getContentType,
-  filterMetaDataKeys,
   extractStandardHeaders,
-  downloadObject,
   OssBase,
-  NotFoundFile,
   ConfigOssService
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/oss",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "main": "dist/index.js",
   "scripts": {
     "build": "bun run bun.config.ts"
@@ -21,8 +21,7 @@
     "bun-plugin-dts": "^0.3.0",
     "dotenv": "^17.2.3",
     "es-toolkit": "^1.44.0",
-    "fast-glob": "^3.3.3",
-    "minio": "^8.0.6"
+    "fast-glob": "^3.3.3"
   },
   "exports": {
     ".": {

package/src/index.ts

@@ -1 +1,3 @@
-export * from './s3/core.ts'
+export * from './s3/core.ts'
+
+export * from './s3/type.ts'

package/src/s3/core.ts

@@ -127,9 +127,16 @@ export class OssBase implements OssBaseOperation {
         contentLength = Buffer.byteLength(putData);
       }
     } else {
-      putData = data as Readable;
+      // Stream 上传：自动读取到 Buffer 以获取 contentLength
       if (!contentLength) {
-        throw new Error('Stream upload requires size parameter');
+        const chunks: Buffer[] = [];
+        for await (const chunk of data as Readable) {
+          chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+        }
+        putData = Buffer.concat(chunks);
+        contentLength = putData.length;
+      } else {
+        putData = data as Readable;
       }
     }
 
@@ -137,7 +144,7 @@ export class OssBase implements OssBaseOperation {
     if (opts?.check) {
       const obj = await this.statObject(objectName, true);
       if (obj) {
-        const omitMeta = ['size', 'Content-Type', 'Cache-Control', 'app-source'];
+        const omitMeta = ['size', 'content-type', 'cache-control', 'app-source'];
         const objMeta = JSON.parse(JSON.stringify(omit(obj.metaData, omitMeta)));
         metaData = {
           ...objMeta,
@@ -180,24 +187,45 @@ export class OssBase implements OssBaseOperation {
     filePath: string,
     metaData?: ItemBucketMetadata,
   ): Promise<UploadedObjectInfo> {
-    const fileStream = fs.createReadStream(filePath);
     const stat = fs.statSync(filePath);
-
     const { standardHeaders, customMetadata } = extractStandardHeaders(metaData || {});
 
-    const command = new PutObjectCommand({
-      Bucket: this.bucketName,
-      Key: `${this.prefix}${objectName}`,
-      Body: fileStream,
-      ContentLength: stat.size,
-      ContentType: standardHeaders.ContentType || getContentType(filePath),
-      CacheControl: standardHeaders.CacheControl,
-      ContentDisposition: standardHeaders.ContentDisposition,
-      ContentEncoding: standardHeaders.ContentEncoding,
-      ContentLanguage: standardHeaders.ContentLanguage,
-      Expires: standardHeaders.Expires,
-      Metadata: customMetadata,
-    });
+    const THRESHOLD = 5 * 1024 * 1024; // 5MB
+    let command: PutObjectCommand;
+
+    if (stat.size < THRESHOLD) {
+      // 小文件：读取到内存再上传，避免流式传输导致的 IncompleteBody 错误
+      const fileBuffer = await fs.promises.readFile(filePath);
+      command = new PutObjectCommand({
+        Bucket: this.bucketName,
+        Key: `${this.prefix}${objectName}`,
+        Body: fileBuffer,
+        ContentLength: fileBuffer.length,
+        ContentType: standardHeaders.ContentType || getContentType(filePath),
+        CacheControl: standardHeaders.CacheControl,
+        ContentDisposition: standardHeaders.ContentDisposition,
+        ContentEncoding: standardHeaders.ContentEncoding,
+        ContentLanguage: standardHeaders.ContentLanguage,
+        Expires: standardHeaders.Expires,
+        Metadata: customMetadata,
+      });
+    } else {
+      // 大文件：使用流式上传
+      const fileStream = fs.createReadStream(filePath);
+      command = new PutObjectCommand({
+        Bucket: this.bucketName,
+        Key: `${this.prefix}${objectName}`,
+        Body: fileStream,
+        ContentLength: stat.size,
+        ContentType: standardHeaders.ContentType || getContentType(filePath),
+        CacheControl: standardHeaders.CacheControl,
+        ContentDisposition: standardHeaders.ContentDisposition,
+        ContentEncoding: standardHeaders.ContentEncoding,
+        ContentLanguage: standardHeaders.ContentLanguage,
+        Expires: standardHeaders.Expires,
+        Metadata: customMetadata,
+      });
+    }
 
     const response = await this.client.send(command);
     return {
@@ -230,12 +258,12 @@ export class OssBase implements OssBaseOperation {
    */
   async listObjects<IS_FILE = false>(
     objectName: string,
-    opts?: { recursive?: boolean; startAfter?: string; maxKeys?: number },
+    opts?: { recursive?: boolean; startAfter?: string; maxKeys?: number, getMeta?: boolean },
   ): Promise<IS_FILE extends true ? ListFileObject[] : ListObjectResult[]> {
     const prefix = `${this.prefix}${objectName}`;
     const results: ListObjectResult[] = [];
     let continuationToken: string | undefined;
-
+    const getMeta = opts?.getMeta ?? false;
     do {
       const command = new ListObjectsV2Command({
         Bucket: this.bucketName,
@@ -251,12 +279,19 @@ export class OssBase implements OssBaseOperation {
       // 处理文件对象
       if (response.Contents) {
         for (const item of response.Contents) {
-          results.push({
+          const result: ListFileObject = {
             name: item.Key || '',
             size: item.Size || 0,
             lastModified: item.LastModified || new Date(),
             etag: item.ETag?.replace(/"/g, '') || '',
-          });
+          }
+          if (getMeta) {
+            const stat = await this.statObject(item.Key || '', false);
+            if (stat?.metaData) {
+              result.metaData = stat.metaData;
+            }
+          }
+          results.push(result);
         }
       }
 
@@ -290,6 +325,13 @@ export class OssBase implements OssBaseOperation {
       const response = await this.client.send(command);
 
       return {
+        standardHeaders: {
+          contentType: response.ContentType,
+          cacheControl: response.CacheControl,
+          contentDisposition: response.ContentDisposition,
+          contentEncoding: response.ContentEncoding,
+          contentLanguage: response.ContentLanguage,
+        },
         size: response.ContentLength || 0,
         etag: response.ETag?.replace?.(/"/g, '') || '',
         lastModified: response.LastModified || new Date(),
@@ -297,7 +339,6 @@ export class OssBase implements OssBaseOperation {
         versionId: response.VersionId || null,
       };
     } catch (e: any) {
-      console.error('statObject error', e);
       // 检查是否是 404 错误 - 支持多种 S3 兼容存储的错误格式
       const isNotFound =
         e.name === 'NotFound' ||
@@ -311,6 +352,7 @@ export class OssBase implements OssBaseOperation {
       if (checkFile && isNotFound) {
         return null;
       }
+      console.error('statObject error', e);
       throw e;
     }
   }
@@ -438,4 +480,11 @@ export class OssBase implements OssBaseOperation {
       ...opts,
     });
   }
+}
+
+export const getStram = (data: GetObjectCommandOutput) => {
+  if (data.Body) {
+    return data.Body as Readable;
+  }
+  throw new Error('Object body is empty');
 }

package/src/s3/type.ts

@@ -17,6 +17,13 @@ export type StatObjectResult = {
   lastModified: Date;
   metaData: ItemBucketMetadata;
   versionId?: string | null;
+  standardHeaders: {
+    contentType?: string;
+    cacheControl?: string;
+    contentDisposition?: string;
+    contentEncoding?: string;
+    contentLanguage?: string;
+  }
 };
 
 export type ListFileObject = {
@@ -24,6 +31,7 @@ export type ListFileObject = {
   size: number;
   lastModified: Date;
   etag: string;
+  metaData?: ItemBucketMetadata;
 };
 
 export type ListDirectoryObject = {

package/src/services/index.ts

@@ -6,4 +6,4 @@ export * from '../util/download.ts';
 
 export * from '../util/index.ts';
 
-export * from '../core/type.ts';
+export * from '../s3/type.ts';

package/src/util/download.ts

@@ -1,73 +1,73 @@
-import { ServerResponse } from 'node:http';
-import { BucketItemStat } from 'minio';
-import fs from 'node:fs';
-import path from 'node:path';
+// import { ServerResponse } from 'node:http';
+// import { BucketItemStat } from 'minio';
+// import fs from 'node:fs';
+// import path from 'node:path';
 
-const viewableExtensions = ['jpg', 'jpeg', 'png', 'gif', 'svg', 'webp', 'mp4', 'webm', 'mp3', 'wav', 'ogg', 'pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx'];
-import { OssBase } from '../index.ts';
-/**
- * 过滤 metaData 中的 key, 去除 password, accesskey, secretkey，
- * 并返回过滤后的 metaData
- * @param metaData
- * @returns
- */
-export const filterMetaDataKeys = (metaData: Record<string, string>, clearKeys: string[] = []) => {
-  const keys = Object.keys(metaData);
-  // remove X-Amz- meta data
-  const removeKeys = ['password', 'accesskey', 'secretkey', ...clearKeys];
-  const filteredKeys = keys.filter((key) => !removeKeys.includes(key));
-  return filteredKeys.reduce((acc, key) => {
-    acc[key] = metaData[key];
-    return acc;
-  }, {} as Record<string, string>);
-};
-type SendObjectOptions = {
-  res: ServerResponse;
-  client: OssBase;
-  objectName: string;
-  isDownload?: boolean;
-};
-export const NotFoundFile = (res: ServerResponse, msg?: string, code = 404) => {
-  res.writeHead(code, { 'Content-Type': 'text/plain' });
-  res.end(msg || 'Not Found File');
-  return;
-};
-export const sendObject = async ({ res, objectName, client, isDownload = false }: SendObjectOptions) => {
-  let stat: BucketItemStat;
-  try {
-    stat = await client.statObject(objectName);
-  } catch (e) {
-  } finally {
-    if (!stat || stat.size === 0) {
-      return NotFoundFile(res);
-    }
-    const contentLength = stat.size;
-    const etag = stat.etag;
-    const lastModified = stat.lastModified.toISOString();
-    const filename = objectName.split('/').pop() || 'no-file-name-download'; // Extract filename from objectName
-    const fileExtension = filename.split('.').pop()?.toLowerCase() || '';
-    const filteredMetaData = filterMetaDataKeys(stat.metaData, ['size', 'etag', 'last-modified']);
-    const contentDisposition = viewableExtensions.includes(fileExtension) && !isDownload ? 'inline' : `attachment; filename="${filename}"`;
+// const viewableExtensions = ['jpg', 'jpeg', 'png', 'gif', 'svg', 'webp', 'mp4', 'webm', 'mp3', 'wav', 'ogg', 'pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx'];
+// import { OssBase } from '../index.ts';
+// /**
+//  * 过滤 metaData 中的 key, 去除 password, accesskey, secretkey，
+//  * 并返回过滤后的 metaData
+//  * @param metaData
+//  * @returns
+//  */
+// export const filterMetaDataKeys = (metaData: Record<string, string>, clearKeys: string[] = []) => {
+//   const keys = Object.keys(metaData);
+//   // remove X-Amz- meta data
+//   const removeKeys = ['password', 'accesskey', 'secretkey', ...clearKeys];
+//   const filteredKeys = keys.filter((key) => !removeKeys.includes(key));
+//   return filteredKeys.reduce((acc, key) => {
+//     acc[key] = metaData[key];
+//     return acc;
+//   }, {} as Record<string, string>);
+// };
+// type SendObjectOptions = {
+//   res: ServerResponse;
+//   client: OssBase;
+//   objectName: string;
+//   isDownload?: boolean;
+// };
+// export const NotFoundFile = (res: ServerResponse, msg?: string, code = 404) => {
+//   res.writeHead(code, { 'Content-Type': 'text/plain' });
+//   res.end(msg || 'Not Found File');
+//   return;
+// };
+// export const sendObject = async ({ res, objectName, client, isDownload = false }: SendObjectOptions) => {
+//   let stat: BucketItemStat;
+//   try {
+//     stat = await client.statObject(objectName);
+//   } catch (e) {
+//   } finally {
+//     if (!stat || stat.size === 0) {
+//       return NotFoundFile(res);
+//     }
+//     const contentLength = stat.size;
+//     const etag = stat.etag;
+//     const lastModified = stat.lastModified.toISOString();
+//     const filename = objectName.split('/').pop() || 'no-file-name-download'; // Extract filename from objectName
+//     const fileExtension = filename.split('.').pop()?.toLowerCase() || '';
+//     const filteredMetaData = filterMetaDataKeys(stat.metaData, ['size', 'etag', 'last-modified']);
+//     const contentDisposition = viewableExtensions.includes(fileExtension) && !isDownload ? 'inline' : `attachment; filename="${filename}"`;
 
-    res.writeHead(200, {
-      'Content-Length': contentLength,
-      etag,
-      'last-modified': lastModified,
-      'Content-Disposition': contentDisposition,
-      ...filteredMetaData,
-    });
-    const objectStream = await client.getObject(objectName);
+//     res.writeHead(200, {
+//       'Content-Length': contentLength,
+//       etag,
+//       'last-modified': lastModified,
+//       'Content-Disposition': contentDisposition,
+//       ...filteredMetaData,
+//     });
+//     const objectStream = await client.getObject(objectName);
 
-    objectStream.pipe(res, { end: true });
-  }
-};
+//     objectStream.pipe(res, { end: true });
+//   }
+// };
 
-export const downloadObject = async ({ objectName, client, filePath }: Pick<SendObjectOptions, 'objectName' | 'client'> & { filePath: string }) => {
-  const objectStream = await client.getObject(objectName);
-  const dir = path.dirname(filePath);
-  if (!fs.existsSync(dir)) {
-    fs.mkdirSync(dir, { recursive: true });
-  }
-  objectStream.pipe(fs.createWriteStream(filePath));
-  return objectStream;
-};
+// export const downloadObject = async ({ objectName, client, filePath }: Pick<SendObjectOptions, 'objectName' | 'client'> & { filePath: string }) => {
+//   const objectStream = await client.getObject(objectName);
+//   const dir = path.dirname(filePath);
+//   if (!fs.existsSync(dir)) {
+//     fs.mkdirSync(dir, { recursive: true });
+//   }
+//   objectStream.pipe(fs.createWriteStream(filePath));
+//   return objectStream;
+// };

package/src/core/copy-object.ts

@@ -1,26 +0,0 @@
-import { Client, CopyDestinationOptions, CopySourceOptions } from 'minio';
-
-type CopyObjectOpts = {
-  bucketName: string;
-  newMetadata: Record<string, string>;
-  objectName: string;
-  client: Client;
-};
-/**
- * 复制对象 REPLACE 替换
- * @param param0
- * @returns
- */
-export const copyObject = async ({ bucketName, newMetadata, objectName, client }: CopyObjectOpts) => {
-  const source = new CopySourceOptions({ Bucket: bucketName, Object: objectName });
-  const stat = await client.statObject(bucketName, objectName);
-  const sourceMetadata = stat.metaData;
-  const destination = new CopyDestinationOptions({
-    Bucket: bucketName,
-    Object: objectName,
-    UserMetadata: { ...sourceMetadata, ...newMetadata },
-    MetadataDirective: 'REPLACE',
-  });
-  const copyResult = await client.copyObject(source, destination);
-  return copyResult;
-};