@kevisual/oss 0.0.2 → 0.0.5

package/dist/{index-CQoepWCw.d.ts → index-CcgwzWpW.d.ts}

@@ -92,7 +92,7 @@ type OssBaseOptions<T = {
     /**
      * 已经初始化好的minio client
      */
-    client?: Client;
+    client: Client;
     /**
      * 桶名
      */
@@ -114,14 +114,31 @@ declare class OssBase implements OssBaseOperation {
     setPrefix(prefix: string): void;
     getObject(objectName: string): Promise<stream.Readable>;
     getJson(objectName: string): Promise<Record<string, any>>;
-    putObject(objectName: string, data: Buffer | string | Object, metaData?: ItemBucketMetadata): Promise<minio_dist_esm_internal_type_mjs.UploadedObjectInfo>;
+    /**
+     * 上传文件,
+     * @param objectName
+     * @param data
+     * @param metaData
+     * @param options 如果文件本身存在，则复制原有的meta的内容
+     * @returns
+     */
+    putObject(objectName: string, data: Buffer | string | Object, metaData?: ItemBucketMetadata, options?: {
+        check?: boolean;
+    }): Promise<minio_dist_esm_internal_type_mjs.UploadedObjectInfo>;
     deleteObject(objectName: string): Promise<void>;
     listObjects<IS_FILE = false>(objectName: string, opts?: {
         recursive?: boolean;
         startAfter?: string;
     }): Promise<IS_FILE extends true ? ListFileObject[] : ListObjectResult[]>;
     fPutObject(objectName: string, filePath: string, metaData?: ItemBucketMetadata): Promise<any>;
-    statObject(objectName: string): Promise<minio.BucketItemStat>;
+    statObject(objectName: string, checkFile?: boolean): Promise<minio.BucketItemStat>;
+    /**
+     * 检查文件hash是否一致
+     * @param objectName
+     * @param hash
+     * @returns
+     */
+    checkObjectHash(objectName: string, hash: string): Promise<boolean>;
     copyObject(sourceObject: any, targetObject: any): Promise<minio_dist_esm_internal_type_mjs.CopyObjectResult>;
     replaceObject(objectName: string, meta: {
         [key: string]: string;
@@ -133,4 +150,4 @@ declare class OssBase implements OssBaseOperation {
     }): T;
 }
 
-export { type ListFileObject as L, OssBase as O, type OssBaseOptions as a, type OssService as b, type ListObjectResult as c };
+export { type ListFileObject as L, OssBase as O, type StatObjectResult as S, type UploadedObjectInfo as U, type OssBaseOptions as a, type ListDirectoryObject as b, type ListObjectResult as c, type OssBaseOperation as d, type OssService as e };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 import 'minio';
 import 'minio/dist/esm/internal/type.mjs';
 import 'stream';
-export { O as OssBase, a as OssBaseOptions } from './index-CQoepWCw.js';
+export { O as OssBase, a as OssBaseOptions } from './index-CcgwzWpW.js';

package/dist/index.js

@@ -71,7 +71,15 @@ var OssBase = class {
       });
     });
   }
-  async putObject(objectName, data, metaData) {
+  /**
+   * 上传文件,
+   * @param objectName
+   * @param data
+   * @param metaData
+   * @param options 如果文件本身存在，则复制原有的meta的内容
+   * @returns
+   */
+  async putObject(objectName, data, metaData = {}, options) {
     let putData;
     let size;
     if (typeof data === "object") {
@@ -80,6 +88,17 @@ var OssBase = class {
     } else if (typeof data === "string") {
       putData = data;
       size = putData.length;
+    } else {
+      putData = data;
+    }
+    if (options?.check) {
+      const obj2 = await this.statObject(objectName, true);
+      if (obj2) {
+        metaData = {
+          ...obj2.metaData,
+          ...metaData
+        };
+      }
     }
     const bucketName = this.bucketName;
     const obj = await this.client.putObject(bucketName, `${this.prefix}${objectName}`, putData, size, metaData);
@@ -117,10 +136,13 @@ var OssBase = class {
     const obj = await this.client.fPutObject(bucketName, `${this.prefix}${objectName}`, filePath, metaData);
     return obj;
   }
-  async statObject(objectName) {
+  async statObject(objectName, checkFile = true) {
     const bucketName = this.bucketName;
     try {
       const obj = await this.client.statObject(bucketName, `${this.prefix}${objectName}`);
+      if (obj && checkFile && obj.size === 0) {
+        return null;
+      }
       return obj;
     } catch (e) {
       if (e.code === "NotFound") {
@@ -129,6 +151,19 @@ var OssBase = class {
       throw e;
     }
   }
+  /**
+   * 检查文件hash是否一致
+   * @param objectName
+   * @param hash
+   * @returns
+   */
+  async checkObjectHash(objectName, hash2) {
+    const obj = await this.statObject(`${this.prefix}${objectName}`, true);
+    if (!obj) {
+      return false;
+    }
+    return obj.etag === hash2;
+  }
   async copyObject(sourceObject, targetObject) {
     const bucketName = this.bucketName;
     const obj = await this.client.copyObject(bucketName, sourceObject, targetObject);

package/dist/services/config.d.ts

@@ -1,5 +1,5 @@
 import * as minio_dist_esm_internal_type_mjs from 'minio/dist/esm/internal/type.mjs';
-import { O as OssBase, b as OssService, a as OssBaseOptions, L as ListFileObject, c as ListObjectResult } from '../index-CQoepWCw.js';
+import { O as OssBase, e as OssService, a as OssBaseOptions, L as ListFileObject, c as ListObjectResult } from '../index-CcgwzWpW.js';
 import 'minio';
 import 'stream';
 

package/dist/services/config.js

@@ -74,7 +74,15 @@ var OssBase = class {
       });
     });
   }
-  async putObject(objectName, data, metaData) {
+  /**
+   * 上传文件,
+   * @param objectName
+   * @param data
+   * @param metaData
+   * @param options 如果文件本身存在，则复制原有的meta的内容
+   * @returns
+   */
+  async putObject(objectName, data, metaData = {}, options) {
     let putData;
     let size;
     if (typeof data === "object") {
@@ -83,6 +91,17 @@ var OssBase = class {
     } else if (typeof data === "string") {
       putData = data;
       size = putData.length;
+    } else {
+      putData = data;
+    }
+    if (options?.check) {
+      const obj2 = await this.statObject(objectName, true);
+      if (obj2) {
+        metaData = {
+          ...obj2.metaData,
+          ...metaData
+        };
+      }
     }
     const bucketName = this.bucketName;
     const obj = await this.client.putObject(bucketName, `${this.prefix}${objectName}`, putData, size, metaData);
@@ -120,10 +139,13 @@ var OssBase = class {
     const obj = await this.client.fPutObject(bucketName, `${this.prefix}${objectName}`, filePath, metaData);
     return obj;
   }
-  async statObject(objectName) {
+  async statObject(objectName, checkFile = true) {
     const bucketName = this.bucketName;
     try {
       const obj = await this.client.statObject(bucketName, `${this.prefix}${objectName}`);
+      if (obj && checkFile && obj.size === 0) {
+        return null;
+      }
       return obj;
     } catch (e) {
       if (e.code === "NotFound") {
@@ -132,6 +154,19 @@ var OssBase = class {
       throw e;
     }
   }
+  /**
+   * 检查文件hash是否一致
+   * @param objectName
+   * @param hash
+   * @returns
+   */
+  async checkObjectHash(objectName, hash2) {
+    const obj = await this.statObject(`${this.prefix}${objectName}`, true);
+    if (!obj) {
+      return false;
+    }
+    return obj.etag === hash2;
+  }
   async copyObject(sourceObject, targetObject) {
     const bucketName = this.bucketName;
     const obj = await this.client.copyObject(bucketName, sourceObject, targetObject);

package/dist/services/index.d.ts

@@ -1,5 +1,5 @@
-import { O as OssBase } from '../index-CQoepWCw.js';
-export { a as OssBaseOptions } from '../index-CQoepWCw.js';
+import { O as OssBase } from '../index-CcgwzWpW.js';
+export { b as ListDirectoryObject, L as ListFileObject, c as ListObjectResult, d as OssBaseOperation, a as OssBaseOptions, e as OssService, S as StatObjectResult, U as UploadedObjectInfo } from '../index-CcgwzWpW.js';
 export { ConfigOssService } from './config.js';
 import * as stream from 'stream';
 import { ServerResponse } from 'node:http';

package/dist/services/index.js

@@ -74,7 +74,15 @@ var OssBase = class {
       });
     });
   }
-  async putObject(objectName, data, metaData) {
+  /**
+   * 上传文件,
+   * @param objectName
+   * @param data
+   * @param metaData
+   * @param options 如果文件本身存在，则复制原有的meta的内容
+   * @returns
+   */
+  async putObject(objectName, data, metaData = {}, options) {
     let putData;
     let size;
     if (typeof data === "object") {
@@ -83,6 +91,17 @@ var OssBase = class {
     } else if (typeof data === "string") {
       putData = data;
       size = putData.length;
+    } else {
+      putData = data;
+    }
+    if (options?.check) {
+      const obj2 = await this.statObject(objectName, true);
+      if (obj2) {
+        metaData = {
+          ...obj2.metaData,
+          ...metaData
+        };
+      }
     }
     const bucketName = this.bucketName;
     const obj = await this.client.putObject(bucketName, `${this.prefix}${objectName}`, putData, size, metaData);
@@ -120,10 +139,13 @@ var OssBase = class {
     const obj = await this.client.fPutObject(bucketName, `${this.prefix}${objectName}`, filePath, metaData);
     return obj;
   }
-  async statObject(objectName) {
+  async statObject(objectName, checkFile = true) {
     const bucketName = this.bucketName;
     try {
       const obj = await this.client.statObject(bucketName, `${this.prefix}${objectName}`);
+      if (obj && checkFile && obj.size === 0) {
+        return null;
+      }
       return obj;
     } catch (e) {
       if (e.code === "NotFound") {
@@ -132,6 +154,19 @@ var OssBase = class {
       throw e;
     }
   }
+  /**
+   * 检查文件hash是否一致
+   * @param objectName
+   * @param hash
+   * @returns
+   */
+  async checkObjectHash(objectName, hash2) {
+    const obj = await this.statObject(`${this.prefix}${objectName}`, true);
+    if (!obj) {
+      return false;
+    }
+    return obj.etag === hash2;
+  }
   async copyObject(sourceObject, targetObject) {
     const bucketName = this.bucketName;
     const obj = await this.client.copyObject(bucketName, sourceObject, targetObject);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/oss",
-  "version": "0.0.2",
+  "version": "0.0.5",
   "description": "",
   "main": "dist/index.js",
   "scripts": {