@abtnode/core 1.16.11-beta-0ae58a71 → 1.16.11-beta-f9719c31

package/lib/api/node.js

@@ -83,7 +83,7 @@ class NodeAPI {
   }
 
   deleteCache() {
-    this.cache.del('del');
+    this.cache.del('info');
   }
 
   async getDiskInfo() {

package/lib/api/team.js

@@ -642,7 +642,7 @@ class TeamAPI extends EventEmitter {
   /**
    * this function is only used to create server owner transfer invitation
    */
-  async createTransferInvitation({ teamDid, remark }, context = {}) {
+  createTransferInvitation({ teamDid, remark }, context = {}) {
     return this.createMemberInvitation(
       { teamDid, expireTime: this.transferOwnerExpireTime, remark, role: 'owner' },
       context
@@ -956,7 +956,7 @@ class TeamAPI extends EventEmitter {
 
   // Access Control
 
-  async getRoles({ teamDid }) {
+  getRoles({ teamDid }) {
     return this.teamManager.getRoles(teamDid);
   }
 
@@ -1171,15 +1171,15 @@ class TeamAPI extends EventEmitter {
   // Private
   // =======
 
-  async getRBAC(did) {
+  getRBAC(did) {
     return this.teamManager.getRBAC(did);
   }
 
-  async getUserState(did) {
+  getUserState(did) {
     return this.teamManager.getUserState(did);
   }
 
-  async getSessionState(did) {
+  getSessionState(did) {
     return this.teamManager.getSessionState(did);
   }
 

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

@@ -7,7 +7,7 @@ const { toBase58 } = require('@ocap/util');
 
 const defaultLogger = require('@abtnode/logger')('@abtnode/core:blocklet-downloader');
 
-const { forEachBlockletSync, getComponentBundleId } = require('@blocklet/meta/lib/util');
+const { forEachComponentV2Sync, getComponentBundleId } = require('@blocklet/meta/lib/util');
 const validateBlockletEntry = require('@blocklet/meta/lib/entry');
 
 const { BlockletSource, BLOCKLET_META_FILE, BLOCKLET_META_FILE_ALT, BLOCKLET_MODES } = require('@blocklet/constant');
@@ -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((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);
 
@@ -177,7 +188,7 @@ class BlockletDownloader extends EventEmitter {
     return { isCancelled: false };
   }
 
-  async cancelDownload(did) {
+  cancelDownload(did) {
     return this.bundleDownloader.cancelDownload(did);
   }
 
@@ -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)) || [];
 
-    forEachBlockletSync(blocklet, (component, { id: componentId }) => {
+    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;
-      downloadComponentIds.push(componentId);
+      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/downloader/bundle-downloader.js

@@ -121,7 +121,7 @@ class BundleDownloader extends EventEmitter {
   }
 
   // eslint-disable-next-line no-unused-vars
-  async cancelDownload(rootDid) {
+  cancelDownload(rootDid) {
     if (this.downloadCtrls[rootDid]) {
       for (const cancelCtrl of this.downloadCtrls[rootDid].values()) {
         cancelCtrl.cancel();
@@ -294,7 +294,7 @@ class BundleDownloader extends EventEmitter {
     await this.cache.set(CACHE_KEY, cacheList);
   }
 
-  async _getCachedTarFile(integrity) {
+  _getCachedTarFile(integrity) {
     // eslint-disable-next-line no-param-reassign
     integrity = toBase58(integrity);
 

package/lib/blocklet/hooks.js

@@ -57,7 +57,7 @@ const runUserHook = async (label, hookName, args) => {
 const preInstall = (label, ...args) => runUserHook(label, 'pre-install', ...args);
 const postInstall = (label, ...args) => runUserHook(label, 'post-install', ...args);
 const preConfig = (label, ...args) => runUserHook(label, 'pre-config', ...args);
-const preStart = async (blocklet, options) => {
+const preStart = (blocklet, options) => {
   // check required environments
   let environments = get(blocklet, 'meta.environments', []);
   if (!Array.isArray(environments)) {

package/lib/blocklet/manager/base.js

@@ -16,39 +16,39 @@ class BaseBlockletManager extends EventEmitter {
     }
   }
 
-  async install() {
+  install() {
     throw new Error('Install must be implemented in sub class');
   }
 
-  async start() {
+  start() {
     throw new Error('Install must be implemented in sub class');
   }
 
-  async stop() {
+  stop() {
     throw new Error('Stop must be implemented in sub class');
   }
 
-  async restart() {
+  restart() {
     throw new Error('Restart must be implemented in sub class');
   }
 
-  async reload() {
+  reload() {
     throw new Error('Reload must be implemented in sub class');
   }
 
-  async delete() {
+  delete() {
     throw new Error('Delete must be implemented in sub class');
   }
 
-  async detail() {
+  detail() {
     throw new Error('Detail must be implemented in sub class');
   }
 
-  async list() {
+  list() {
     throw new Error('List must be implemented in sub class');
   }
 
-  async config() {
+  config() {
     throw new Error('Config must be implemented in sub class');
   }
 }