@alibarbar/common 1.1.2 → 1.1.4

package/dist/upload.cjs

@@ -46,6 +46,8 @@ var ChunkUploader = class {
     this.uploadedChunks = /* @__PURE__ */ new Set();
     this.status = "pending" /* PENDING */;
     this.abortController = null;
+    /** 进度流专用 AbortController，用于在上传结束/取消时关闭流 */
+    this.progressStreamAbortController = null;
     this.file = file;
     this.options = {
       chunkSize: options.chunkSize || 2 * 1024 * 1024,
@@ -153,7 +155,6 @@ var ChunkUploader = class {
       });
       if (response.code === 200 && response.data.success) {
         this.uploadedChunks.add(chunkInfo.index);
-        await this.updateProgress();
       } else {
         throw new Error(response.message || "\u5206\u7247\u4E0A\u4F20\u5931\u8D25");
       }
@@ -188,23 +189,60 @@ var ChunkUploader = class {
     await Promise.all(tasks);
   }
   /**
-   * 更新上传进度（仅用于回调前端显示）
+   * 启动进度流式接口（单次请求，通过 ReadableStream 消费多条 SSE 事件）
    */
-  async updateProgress() {
+  startProgressStream() {
     if (!this.taskId) return;
-    try {
-      const response = await this.request(
-        `/api/files/common/progress/${this.taskId}`,
-        {
-          method: "GET",
-          headers: this.options.headers
+    this.progressStreamAbortController = new AbortController();
+    const url = `${this.options.baseURL}/api/files/common/progress/${this.taskId}`;
+    fetch(url, {
+      method: "GET",
+      headers: {
+        Accept: "text/event-stream",
+        ...this.options.headers
+      },
+      signal: this.progressStreamAbortController.signal
+    }).then(async (response) => {
+      if (!response.ok || !response.body) return;
+      const reader = response.body.getReader();
+      const decoder = new TextDecoder();
+      let buffer = "";
+      try {
+        while (true) {
+          const { done, value } = await reader.read();
+          if (done) break;
+          buffer += decoder.decode(value, { stream: true });
+          const lines = buffer.split("\n");
+          buffer = lines.pop() ?? "";
+          for (const line of lines) {
+            if (line.startsWith("data: ")) {
+              const jsonStr = line.slice(6).trim();
+              if (!jsonStr) continue;
+              try {
+                const apiRes = JSON.parse(jsonStr);
+                if (apiRes.code === 200 && apiRes.data) {
+                  this.options.onProgress(apiRes.data);
+                }
+              } catch {
+              }
+            }
+          }
         }
-      );
-      if (response.code === 200 && response.data) {
-        this.options.onProgress(response.data);
+      } finally {
+        reader.releaseLock();
       }
-    } catch (error) {
-      console.warn("\u83B7\u53D6\u4E0A\u4F20\u8FDB\u5EA6\u5931\u8D25:", error);
+    }).catch((error) => {
+      if (error?.name === "AbortError") return;
+      console.warn("\u8FDB\u5EA6\u6D41\u5F0F\u63A5\u53E3\u5F02\u5E38:", error);
+    });
+  }
+  /**
+   * 关闭进度流
+   */
+  closeProgressStream() {
+    if (this.progressStreamAbortController) {
+      this.progressStreamAbortController.abort();
+      this.progressStreamAbortController = null;
     }
   }
   /**
@@ -277,6 +315,7 @@ var ChunkUploader = class {
         this.options.onComplete(result);
         return result;
       }
+      this.startProgressStream();
       console.log("[\u4E0A\u4F20\u6D41\u7A0B] 2. \u51C6\u5907\u5206\u7247");
       this.prepareChunks();
       const totalChunks = this.chunks.length;
@@ -320,6 +359,8 @@ var ChunkUploader = class {
       this.options.onError(err);
       console.error("[\u4E0A\u4F20\u6D41\u7A0B] \u274C \u4E0A\u4F20\u5931\u8D25:", err);
       throw err;
+    } finally {
+      this.closeProgressStream();
     }
   }
   /**
@@ -346,6 +387,7 @@ var ChunkUploader = class {
    * 取消上传
    */
   async cancel() {
+    this.closeProgressStream();
     if (this.taskId && this.status === "uploading" /* UPLOADING */) {
       try {
         await this.request(`/api/files/common/cancel/${this.taskId}`, {

package/dist/upload.d.mts

@@ -1 +1 @@
-export { C as ChunkUploader, c as createUploader, u as uploadFile } from './index-DchqyDBQ.mjs';
+export { C as ChunkUploader, c as createUploader, u as uploadFile } from './index-j5EqxJaC.mjs';

package/dist/upload.d.ts

@@ -1 +1 @@
-export { C as ChunkUploader, c as createUploader, u as uploadFile } from './index-DchqyDBQ.js';
+export { C as ChunkUploader, c as createUploader, u as uploadFile } from './index-j5EqxJaC.js';

package/dist/upload.js

@@ -44,6 +44,8 @@ var ChunkUploader = class {
     this.uploadedChunks = /* @__PURE__ */ new Set();
     this.status = "pending" /* PENDING */;
     this.abortController = null;
+    /** 进度流专用 AbortController，用于在上传结束/取消时关闭流 */
+    this.progressStreamAbortController = null;
     this.file = file;
     this.options = {
       chunkSize: options.chunkSize || 2 * 1024 * 1024,
@@ -151,7 +153,6 @@ var ChunkUploader = class {
       });
       if (response.code === 200 && response.data.success) {
         this.uploadedChunks.add(chunkInfo.index);
-        await this.updateProgress();
       } else {
         throw new Error(response.message || "\u5206\u7247\u4E0A\u4F20\u5931\u8D25");
       }
@@ -186,23 +187,60 @@ var ChunkUploader = class {
     await Promise.all(tasks);
   }
   /**
-   * 更新上传进度（仅用于回调前端显示）
+   * 启动进度流式接口（单次请求，通过 ReadableStream 消费多条 SSE 事件）
    */
-  async updateProgress() {
+  startProgressStream() {
     if (!this.taskId) return;
-    try {
-      const response = await this.request(
-        `/api/files/common/progress/${this.taskId}`,
-        {
-          method: "GET",
-          headers: this.options.headers
+    this.progressStreamAbortController = new AbortController();
+    const url = `${this.options.baseURL}/api/files/common/progress/${this.taskId}`;
+    fetch(url, {
+      method: "GET",
+      headers: {
+        Accept: "text/event-stream",
+        ...this.options.headers
+      },
+      signal: this.progressStreamAbortController.signal
+    }).then(async (response) => {
+      if (!response.ok || !response.body) return;
+      const reader = response.body.getReader();
+      const decoder = new TextDecoder();
+      let buffer = "";
+      try {
+        while (true) {
+          const { done, value } = await reader.read();
+          if (done) break;
+          buffer += decoder.decode(value, { stream: true });
+          const lines = buffer.split("\n");
+          buffer = lines.pop() ?? "";
+          for (const line of lines) {
+            if (line.startsWith("data: ")) {
+              const jsonStr = line.slice(6).trim();
+              if (!jsonStr) continue;
+              try {
+                const apiRes = JSON.parse(jsonStr);
+                if (apiRes.code === 200 && apiRes.data) {
+                  this.options.onProgress(apiRes.data);
+                }
+              } catch {
+              }
+            }
+          }
         }
-      );
-      if (response.code === 200 && response.data) {
-        this.options.onProgress(response.data);
+      } finally {
+        reader.releaseLock();
       }
-    } catch (error) {
-      console.warn("\u83B7\u53D6\u4E0A\u4F20\u8FDB\u5EA6\u5931\u8D25:", error);
+    }).catch((error) => {
+      if (error?.name === "AbortError") return;
+      console.warn("\u8FDB\u5EA6\u6D41\u5F0F\u63A5\u53E3\u5F02\u5E38:", error);
+    });
+  }
+  /**
+   * 关闭进度流
+   */
+  closeProgressStream() {
+    if (this.progressStreamAbortController) {
+      this.progressStreamAbortController.abort();
+      this.progressStreamAbortController = null;
     }
   }
   /**
@@ -275,6 +313,7 @@ var ChunkUploader = class {
         this.options.onComplete(result);
         return result;
       }
+      this.startProgressStream();
       console.log("[\u4E0A\u4F20\u6D41\u7A0B] 2. \u51C6\u5907\u5206\u7247");
       this.prepareChunks();
       const totalChunks = this.chunks.length;
@@ -318,6 +357,8 @@ var ChunkUploader = class {
       this.options.onError(err);
       console.error("[\u4E0A\u4F20\u6D41\u7A0B] \u274C \u4E0A\u4F20\u5931\u8D25:", err);
       throw err;
+    } finally {
+      this.closeProgressStream();
     }
   }
   /**
@@ -344,6 +385,7 @@ var ChunkUploader = class {
    * 取消上传
    */
   async cancel() {
+    this.closeProgressStream();
     if (this.taskId && this.status === "uploading" /* UPLOADING */) {
       try {
         await this.request(`/api/files/common/cancel/${this.taskId}`, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alibarbar/common",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Alibarbar 通用工具库",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -66,6 +66,11 @@
       "import": "./dist/crypto.js",
       "require": "./dist/crypto.cjs"
     },
+    "./helper/encryption": {
+      "types": "./dist/crypto.d.ts",
+      "import": "./dist/crypto.js",
+      "require": "./dist/crypto.cjs"
+    },
     "./network": {
       "types": "./dist/network.d.ts",
       "import": "./dist/network.js",
@@ -170,6 +175,7 @@
     "eslint-plugin-prettier": "^5.1.3",
     "husky": "^9.0.11",
     "jest": "^29.7.0",
+    "jest-environment-jsdom": "^30.2.0",
     "prettier": "^3.2.4",
     "qs": "^6.11.2",
     "ts-jest": "^29.1.2",
@@ -178,8 +184,10 @@
   },
   "peerDependencies": {
     "axios": "^1.7.0",
+    "jsencrypt": "^3.5.4",
     "qs": "^6.11.2"
   },
-  "dependencies": {}
+  "dependencies": {
+    "jsencrypt": "^3.3.2"
+  }
 }
-