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

package/lib/blocklet/downloader/blocklet-downloader.js

@@ -153,7 +153,7 @@ class BlockletDownloader extends EventEmitter {
         bundles: downloadList.map((x) => get(x, 'dist.tarball')),
       });
 
-      const results = await Promise.all(
+      await Promise.all(
         downloadList.map((meta) => {
           const url = meta.dist.tarball;
           return this.bundleDownloader.download(meta, did, url, {
@@ -165,7 +165,7 @@ class BlockletDownloader extends EventEmitter {
         })
       );
 
-      const isCancelled = results.some((x) => x.isCancelled);
+      const isCancelled = await this.bundleDownloader.isCanceled(did);
 
       await postDownload({ downloadList, downloadComponentIds, isCancelled });
 

package/lib/blocklet/downloader/bundle-downloader.js

@@ -40,11 +40,6 @@ class BundleDownloader extends EventEmitter {
     this.cache = cache;
     this.logger = logger;
     this.getNodeInfo = getNodeInfo;
-
-    /**
-     * { did: Map({ <childDid>: <downloadFile.cancelCtrl> }) }
-     */
-    this.downloadCtrls = {};
     /**
      * { [download-did-version]: Lock }
      */
@@ -86,18 +81,17 @@ class BundleDownloader extends EventEmitter {
           tarball,
           integrity,
           verify: true,
-          ctrlStore: this.downloadCtrls,
-          rootDid,
           url,
           context,
           onProgress,
+          rootDid,
         });
       } catch (error) {
         this.logger.error('download bundle failed', { did, title, version, url, error });
         throw error;
       }
       this.logger.info('downloaded blocklet tar file', { name, version, tarballPath });
-      if (tarballPath === downloadFile.CANCEL) {
+      if (await this.isCanceled(rootDid)) {
         return { isCancelled: true };
       }
 
@@ -121,13 +115,14 @@ class BundleDownloader extends EventEmitter {
   }
 
   // eslint-disable-next-line no-unused-vars
-  cancelDownload(rootDid) {
-    if (this.downloadCtrls[rootDid]) {
-      for (const cancelCtrl of this.downloadCtrls[rootDid].values()) {
-        cancelCtrl.cancel();
-      }
-    }
-  }
+  cancelDownload = async (rootDid) => {
+    await lock.groupSet('download-ctrl', rootDid, 'canceled');
+  };
+
+  isCanceled = async (rootDid) => {
+    const canceled = await lock.groupGet('download-ctrl', rootDid);
+    return canceled === 'canceled';
+  };
 
   /**
    *
@@ -139,10 +134,9 @@ class BundleDownloader extends EventEmitter {
    *   did: string,
    *   integrity: string,
    *   verify: boolean = true,
-   *   ctrlStore: {},
    *   rootDid: string,
    *   context: {} = {},
-   * }} { url, cwd, tarball, did, integrity, verify = true, ctrlStore = {}, rootDid, context = {} }
+   * }} { url, cwd, tarball, did, integrity, verify = true, rootDid, context = {} }
    * @return {*}
    * @memberof BlockletManager
    */
@@ -153,10 +147,9 @@ class BundleDownloader extends EventEmitter {
     did,
     integrity,
     verify = true,
-    ctrlStore = {},
-    rootDid,
     context = {},
     onProgress = () => {},
+    rootDid,
   }) {
     fs.mkdirSync(cwd, { recursive: true });
 
@@ -182,13 +175,6 @@ class BundleDownloader extends EventEmitter {
     } else if (protocol.startsWith('file')) {
       await fs.copy(decodeURIComponent(fileURLToPath(url)), tarballPath);
     } else {
-      const cancelCtrl = new downloadFile.CancelCtrl();
-
-      if (!ctrlStore[rootDid]) {
-        ctrlStore[rootDid] = new Map();
-      }
-      ctrlStore[rootDid].set(did, cancelCtrl);
-
       const headers = pick(context.headers ? cloneDeep(context.headers) : {}, [
         'x-server-did',
         'x-server-public-key',
@@ -203,7 +189,7 @@ class BundleDownloader extends EventEmitter {
         url,
         path.join(cwd, tarballName),
         {
-          cancelCtrl,
+          checkCanceled: () => this.isCanceled(rootDid),
           onProgress: ({ total, current }) => {
             onProgress({ status: 'downloading', total, current });
           },
@@ -213,17 +199,6 @@ class BundleDownloader extends EventEmitter {
           headers,
         }
       );
-
-      if (ctrlStore[rootDid]) {
-        ctrlStore[rootDid].delete(did);
-        if (!ctrlStore[rootDid].size) {
-          delete ctrlStore[rootDid];
-        }
-      }
-
-      if (cancelCtrl.isCancelled) {
-        return downloadFile.CANCEL;
-      }
     }
 
     if (verify) {