@abtnode/core 1.16.11-next-73f5f388 → 1.16.11-next-49394ba1

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

@@ -134,7 +134,7 @@ class BlockletDownloader extends EventEmitter {
 
     const { preDownload = () => {}, postDownload = () => {}, skipCheckIntegrity, onProgress = () => {} } = options;
 
-    const { downloadComponentIds, downloadList } = await this.getDownloadList({
+    const { downloadComponentIds, downloadList, skipList } = await this.getDownloadList({
       blocklet,
       skipCheckIntegrity,
     });
@@ -142,24 +142,35 @@ class BlockletDownloader extends EventEmitter {
     await preDownload({ downloadList, downloadComponentIds });
 
     try {
+      // Fake progress events for cached bundles
+      skipList.forEach((meta) => {
+        const info = pick(meta, ['title', 'name', 'did', 'version']);
+        onProgress({ status: 'downloading', component: info });
+        setTimeout(
+          () => {
+            onProgress({ status: 'completed', component: info });
+          },
+          process.env.NODE_ENV === 'test' ? 0 : Math.random() * 800
+        );
+      });
+
       this.logger.info('Start Download Blocklet', {
         name,
         did,
         bundles: downloadList.map((x) => get(x, 'dist.tarball')),
       });
-      const tasks = [];
-      for (const meta of downloadList) {
-        const url = meta.dist.tarball;
-        tasks.push(
-          this.bundleDownloader.download(meta, did, url, {
+
+      const results = await Promise.all(
+        downloadList.map(async (meta) => {
+          const url = meta.dist.tarball;
+          return this.bundleDownloader.download(meta, did, url, {
             ...options,
             onProgress: (data) => {
               onProgress({ ...data, component: pick(meta, ['title', 'name', 'did', 'version']) });
             },
-          })
-        );
-      }
-      const results = await Promise.all(tasks);
+          });
+        })
+      );
 
       const isCancelled = results.some((x) => x.isCancelled);
 
@@ -187,19 +198,21 @@ class BlockletDownloader extends EventEmitter {
    * }}
    * @returns {{
    *   downloadList: Array<import('@abtnode/client').BlockletMeta>;
+   *   skipList: Array<import('@abtnode/client').BlockletMeta>;
    *   downloadComponentIds: Array<string>; // like: "z8ia1i2yq67x39vruqQTbkVcwCnqRGx8zSPsJ/z8iZwubkNdA1BfEUwc5NJpY2Jnfm7yEbyvmKS"
    * }}
    */
   async getDownloadList({ blocklet, skipCheckIntegrity }) {
     const downloadComponentIds = [];
-    const metas = {};
+    const scheduled = {};
+    const skipped = {};
 
     const cachedBundles = (await this.cache.get(CACHE_KEY)) || [];
 
     forEachComponentV2Sync(blocklet, (component) => {
       const bundleId = getComponentBundleId(component);
 
-      if (metas[bundleId]) {
+      if (scheduled[bundleId]) {
         this.logger.info(`skip download duplicate bundle ${bundleId}`);
         return;
       }
@@ -210,6 +223,7 @@ class BlockletDownloader extends EventEmitter {
         skipCheckIntegrity,
       });
       if (!needComponentDownload) {
+        skipped[bundleId] = component.meta;
         this.logger.info(`skip download existed bundle ${bundleId}`, { source: component.source });
         return;
       }
@@ -222,13 +236,14 @@ class BlockletDownloader extends EventEmitter {
         return;
       }
 
-      metas[bundleId] = component.meta;
+      scheduled[bundleId] = component.meta;
       downloadComponentIds.push(component.meta.did);
     });
 
-    const downloadList = Object.values(metas);
+    const downloadList = Object.values(scheduled);
+    const skipList = Object.values(skipped);
 
-    return { downloadList, downloadComponentIds };
+    return { downloadList, skipList, downloadComponentIds };
   }
 }
 

package/lib/blocklet/manager/disk.js

@@ -1437,6 +1437,16 @@ class BlockletManager extends BaseBlockletManager {
       return blocklet;
     }
 
+    // {Record<BlockletStatus, Array<Did>>}
+    const updates = new Map();
+    const addToUpdates = (componentDid, status) => {
+      if (updates.has(status)) {
+        updates.get(status).push(componentDid);
+      } else {
+        updates.set(status, [componentDid]);
+      }
+    };
+
     await forEachComponentV2(
       blocklet,
       async (component) => {
@@ -1452,7 +1462,7 @@ class BlockletManager extends BaseBlockletManager {
           const status = await getProcessState(component.env.processId);
           if (component.status !== status) {
             component.status = status;
-            await states.blocklet.setBlockletStatus(did, status, { componentDids: [component.meta.did] });
+            addToUpdates(component.meta.did, status);
           }
         } catch {
           if (
@@ -1467,13 +1477,20 @@ class BlockletManager extends BaseBlockletManager {
           ) {
             const status = BlockletStatus.stopped;
             component.status = status;
-            await states.blocklet.setBlockletStatus(did, status, { componentDids: [component.meta.did] });
+            addToUpdates(component.meta.did, status);
           }
         }
       },
       { parallel: true }
     );
 
+    // iterate updates
+    if (updates.size > 0) {
+      for (const [status, dids] of updates) {
+        await states.blocklet.setBlockletStatus(did, status, { componentDids: dids });
+      }
+    }
+
     blocklet.status = getBlockletStatus(blocklet);
 
     return blocklet;

package/lib/util/launcher.js

@@ -138,7 +138,7 @@ const setupAppOwner = async (node, sessionId) => {
       userDid: ownerDid,
       teamDid: appDid,
     }),
-    ownerProfile: { ...appOwnerProfile, avatar: parseUserAvatar(user.avatar, { dataDir: serverDataDir }) },
+    ownerProfile: { ...appOwnerProfile, avatar: await parseUserAvatar(user.avatar, { dataDir: serverDataDir }) },
     preferredColor: 'default',
     expirationDate: undefined,
   });

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.11-next-73f5f388",
+  "version": "1.16.11-next-49394ba1",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,18 +19,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.11-next-73f5f388",
-    "@abtnode/certificate-manager": "1.16.11-next-73f5f388",
-    "@abtnode/constant": "1.16.11-next-73f5f388",
-    "@abtnode/cron": "1.16.11-next-73f5f388",
-    "@abtnode/logger": "1.16.11-next-73f5f388",
-    "@abtnode/models": "1.16.11-next-73f5f388",
-    "@abtnode/queue": "1.16.11-next-73f5f388",
-    "@abtnode/rbac": "1.16.11-next-73f5f388",
-    "@abtnode/router-provider": "1.16.11-next-73f5f388",
-    "@abtnode/static-server": "1.16.11-next-73f5f388",
-    "@abtnode/timemachine": "1.16.11-next-73f5f388",
-    "@abtnode/util": "1.16.11-next-73f5f388",
+    "@abtnode/auth": "1.16.11-next-49394ba1",
+    "@abtnode/certificate-manager": "1.16.11-next-49394ba1",
+    "@abtnode/constant": "1.16.11-next-49394ba1",
+    "@abtnode/cron": "1.16.11-next-49394ba1",
+    "@abtnode/logger": "1.16.11-next-49394ba1",
+    "@abtnode/models": "1.16.11-next-49394ba1",
+    "@abtnode/queue": "1.16.11-next-49394ba1",
+    "@abtnode/rbac": "1.16.11-next-49394ba1",
+    "@abtnode/router-provider": "1.16.11-next-49394ba1",
+    "@abtnode/static-server": "1.16.11-next-49394ba1",
+    "@abtnode/timemachine": "1.16.11-next-49394ba1",
+    "@abtnode/util": "1.16.11-next-49394ba1",
     "@arcblock/did": "1.18.80",
     "@arcblock/did-auth": "1.18.80",
     "@arcblock/did-ext": "^1.18.80",
@@ -41,9 +41,9 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.80",
     "@arcblock/vc": "1.18.80",
-    "@blocklet/constant": "1.16.11-next-73f5f388",
-    "@blocklet/meta": "1.16.11-next-73f5f388",
-    "@blocklet/sdk": "1.16.11-next-73f5f388",
+    "@blocklet/constant": "1.16.11-next-49394ba1",
+    "@blocklet/meta": "1.16.11-next-49394ba1",
+    "@blocklet/sdk": "1.16.11-next-49394ba1",
     "@did-space/client": "^0.2.113",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.80",
@@ -96,5 +96,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "0f77a5958181b871bc285eeeda1eade9a5c1f231"
+  "gitHead": "bff5782698d3fdce6a5f1a3af144c809d283020d"
 }