@kevisual/oss 0.0.4 → 0.0.6

package/dist/{index-z-16S9o1.d.ts → index-CcgwzWpW.d.ts}

@@ -92,7 +92,7 @@ type OssBaseOptions<T = {
     /**
      * 已经初始化好的minio client
      */
-    client?: Client;
+    client: Client;
     /**
      * 桶名
      */
@@ -114,7 +114,17 @@ 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;
@@ -128,7 +138,7 @@ declare class OssBase implements OssBaseOperation {
      * @param hash
      * @returns
      */
-    checkFileHash(objectName: string, hash: string): Promise<boolean>;
+    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;

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-z-16S9o1.js';
+export { O as OssBase, a as OssBaseOptions } from './index-CcgwzWpW.js';

package/dist/index.js

@@ -71,15 +71,34 @@ 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") {
+    if (data instanceof Object) {
       putData = JSON.stringify(data);
       size = putData.length;
     } 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);
@@ -138,7 +157,7 @@ var OssBase = class {
    * @param hash
    * @returns
    */
-  async checkFileHash(objectName, hash2) {
+  async checkObjectHash(objectName, hash2) {
     const obj = await this.statObject(`${this.prefix}${objectName}`, true);
     if (!obj) {
       return false;

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, e as OssService, a as OssBaseOptions, L as ListFileObject, c as ListObjectResult } from '../index-z-16S9o1.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,15 +74,34 @@ 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") {
+    if (data instanceof Object) {
       putData = JSON.stringify(data);
       size = putData.length;
     } 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);
@@ -141,7 +160,7 @@ var OssBase = class {
    * @param hash
    * @returns
    */
-  async checkFileHash(objectName, hash2) {
+  async checkObjectHash(objectName, hash2) {
     const obj = await this.statObject(`${this.prefix}${objectName}`, true);
     if (!obj) {
       return false;

package/dist/services/index.d.ts

@@ -1,5 +1,5 @@
-import { O as OssBase } from '../index-z-16S9o1.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-z-16S9o1.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,15 +74,34 @@ 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") {
+    if (data instanceof Object) {
       putData = JSON.stringify(data);
       size = putData.length;
     } 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);
@@ -141,7 +160,7 @@ var OssBase = class {
    * @param hash
    * @returns
    */
-  async checkFileHash(objectName, hash2) {
+  async checkObjectHash(objectName, hash2) {
     const obj = await this.statObject(`${this.prefix}${objectName}`, true);
     if (!obj) {
       return false;

package/package.json

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