@kevisual/api 0.0.31 → 0.0.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/api",
-  "version": "0.0.31",
+  "version": "0.0.32",
   "description": "",
   "main": "mod.ts",
   "scripts": {

package/query/query-resources/index.ts

@@ -62,15 +62,21 @@ export class QueryResources {
     const url = `${this.prefix}${filepath}`;
     return this.get({}, { url, method: 'GET', headers: this.header(opts?.headers, false), isText: true });
   }
-  async uploadFile(filepath: string, content: string, opts?: DataOpts): Promise<Result<any>> {
+  async uploadFile(filepath: string, content: string | Blob, opts?: DataOpts): Promise<Result<any>> {
     const pathname = `${this.prefix}${filepath}`;
     const filename = path.basename(pathname);
     const type = getContentType(filename);
     const url = new URL(pathname, window.location.origin);
-    const hash = hashContent(content);
+    const hashResult = hashContent(content);
+    // Blob 类型时 hashContent 返回 Promise
+    const hash = hashResult instanceof Promise ? await hashResult : hashResult;
     url.searchParams.set('hash', hash);
     const formData = new FormData();
-    formData.append('file', new Blob([content], { type }));
+    if (content instanceof Blob) {
+      formData.append('file', content);
+    } else {
+      formData.append('file', new Blob([content], { type }));
+    }
     return adapter({
       url: url.toString(),
       headers: { ...this.header(opts?.headers, false) },

package/query/query-resources/utils.ts

@@ -1,14 +1,40 @@
 import MD5 from 'crypto-js/md5';
 
-export const hashContent = (str: string | Buffer): string => {
+export const hashContent = (str: string | Blob | Buffer): Promise<string> | string => {
   if (typeof str === 'string') {
     return MD5(str).toString();
+  } else if (str instanceof Blob) {
+    return hashBlob(str);
   } else if (Buffer.isBuffer(str)) {
     return MD5(str.toString()).toString();
   }
-  console.error('hashContent error: input must be a string or Buffer');
+  console.error('hashContent error: input must be a string, Blob, or Buffer');
   return '';
 };
+
+export const hashBlob = (blob: Blob): Promise<string> => {
+  return new Promise((resolve, reject) => {
+    const reader = new FileReader();
+    reader.onload = async () => {
+      try {
+        const content = reader.result;
+        if (typeof content === 'string') {
+          resolve(MD5(content).toString());
+        } else if (content) {
+          const contentString = new TextDecoder().decode(content);
+          resolve(MD5(contentString).toString());
+        } else {
+          reject(new Error('Empty content'));
+        }
+      } catch (error) {
+        console.error('hashBlob error', error);
+        reject(error);
+      }
+    };
+    reader.onerror = (error) => reject(error);
+    reader.readAsArrayBuffer(blob);
+  });
+};
 export const hashFile = (file: File): Promise<string> => {
   return new Promise((resolve, reject) => {
     const reader = new FileReader();