@abtnode/util 1.16.52-beta-20251003-083412-fdfc4e36 → 1.16.52-beta-20251005-235515-42ad5caf

package/lib/download-file.js

@@ -50,17 +50,23 @@ async function streamToString(stream) {
  * @param {*} dest directory
  * @param {{
  *  timeout?: number; // unit: ms
- *  cancelCtrl?: any;
+ *  checkCanceled?: () => Promise<boolean>;
  *  onProgress?: any
  *  minProgressInterval?: number
- * }} [{ timeout = 600 * 1000, cancelCtrl, data }={}]
+ * }} [{ timeout = 600 * 1000, checkCanceled, data }={}]
  * @param {{}} context
  * @return {*}
  */
 const downloadFile = async (
   url,
   dest,
-  { timeout = 600 * 1000, minProgressInterval = 400, cancelCtrl, onProgress } = {},
+  {
+    timeout = 600 * 1000,
+    minProgressInterval = 400,
+    // eslint-disable-next-line no-promise-executor-return
+    checkCanceled = () => new Promise((resolve) => resolve(false)),
+    onProgress,
+  } = {},
   context = {}
 ) => {
   const CONNECTION_TIMEOUT = 20 * 1000;
@@ -74,17 +80,14 @@ const downloadFile = async (
 
       let fileStream;
 
-      if (cancelCtrl) {
-        cancelCtrl.cancel = () => {
-          clearTimeout(timer);
-          cancelCtrl.isCancelled = true;
-          source.cancel('Manual cancel');
-          if (fileStream) {
-            fileStream.destroy(new Error('Manual cancel'));
-            fileStream = null;
-          }
-        };
-      }
+      const cancelDownload = () => {
+        clearTimeout(timer);
+        source.cancel('Manual cancel');
+        if (fileStream) {
+          fileStream.destroy(new Error('Manual cancel'));
+          fileStream = null;
+        }
+      };
 
       const response = await axios({
         url,
@@ -97,12 +100,23 @@ const downloadFile = async (
         timeout,
       });
 
+      let t = Date.now();
+
       if (typeof onProgress === 'function') {
         const throttled = throttle(onProgress, minProgressInterval, { leading: false, trailing: true });
         const total = (response.headers || {})['content-length'] || 0;
         let current = 0;
         response.data.on('data', (chunk) => {
           current += chunk.length;
+          // 每 2 秒检查一次, db-cache 里是否标记了取消, 如果有, 则取消下载
+          if (Date.now() - t > 2000) {
+            t = Date.now();
+            checkCanceled().then((isCancelled) => {
+              if (isCancelled) {
+                cancelDownload();
+              }
+            });
+          }
           try {
             throttled({ total, current });
           } catch {
@@ -115,7 +129,7 @@ const downloadFile = async (
       fileStream = response.data.pipe(fs.createWriteStream(dest));
       await streamToPromise(fileStream);
 
-      if (cancelCtrl && cancelCtrl.isCancelled) {
+      if (await checkCanceled()) {
         if (fs.existsSync(dest)) {
           fs.truncateSync(dest, 0);
           fs.rmSync(dest, { force: true });
@@ -136,7 +150,7 @@ const downloadFile = async (
     }
 
     if (err.message === 'Manual cancel') {
-      if (cancelCtrl && cancelCtrl.isCancelled) {
+      if (await checkCanceled()) {
         return CANCEL;
       }
       throw new Error('Manual stop abnormal');

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.52-beta-20251003-083412-fdfc4e36",
+  "version": "1.16.52-beta-20251005-235515-42ad5caf",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,14 +18,14 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.52-beta-20251003-083412-fdfc4e36",
-    "@abtnode/db-cache": "1.16.52-beta-20251003-083412-fdfc4e36",
+    "@abtnode/constant": "1.16.52-beta-20251005-235515-42ad5caf",
+    "@abtnode/db-cache": "1.16.52-beta-20251005-235515-42ad5caf",
     "@arcblock/did": "1.25.6",
     "@arcblock/event-hub": "1.25.6",
     "@arcblock/pm2": "^6.0.12",
-    "@blocklet/constant": "1.16.52-beta-20251003-083412-fdfc4e36",
+    "@blocklet/constant": "1.16.52-beta-20251005-235515-42ad5caf",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.52-beta-20251003-083412-fdfc4e36",
+    "@blocklet/meta": "1.16.52-beta-20251005-235515-42ad5caf",
     "@blocklet/xss": "^0.2.9",
     "@ocap/client": "1.25.6",
     "@ocap/mcrypto": "1.25.6",
@@ -91,5 +91,5 @@
     "fs-extra": "^11.2.0",
     "jest": "^29.7.0"
   },
-  "gitHead": "973c4fe0d6c1bb59c9101cea4866105ab5ec89d2"
+  "gitHead": "7b295929a123edac2cb292c43f2edda0d3e3e6b8"
 }