@abtnode/core 1.8.65-beta-5405baf2 → 1.8.65-beta-bfcc12ce

package/lib/api/team.js

@@ -178,6 +178,7 @@ class TeamAPI extends EventEmitter {
             'passports',
             'firstLoginAt',
             'lastLoginAt',
+            'lastLoginIp',
             'remark',
             'avatar',
             'locale',

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

@@ -32,7 +32,10 @@ const isMetaFileExist = (dir) => {
  * }}
  * @returns {boolean}
  */
-const needDownload = (component, { installDir, logger = defaultLogger, cachedBundles = [] } = {}) => {
+const needDownload = (
+  component,
+  { installDir, logger = defaultLogger, cachedBundles = [], skipCheckIntegrity } = {}
+) => {
   if (component.mode === BLOCKLET_MODES.DEVELOPMENT) {
     return false;
   }
@@ -62,10 +65,15 @@ const needDownload = (component, { installDir, logger = defaultLogger, cachedBun
     return false;
   }
 
+  if (skipCheckIntegrity) {
+    return false;
+  }
+
   // check integrity
 
   const cachedBundle = cachedBundles.find((x) => x.bundleId === bundleId);
 
+  // FIXME: 不是新安装的组件不应该 check, 不应该 block 安装成功 https://github.com/blocklet/launcher/actions/runs/4184577090/jobs/7250416272
   if (!cachedBundle) {
     return true;
   }
@@ -84,10 +92,12 @@ const needDownload = (component, { installDir, logger = defaultLogger, cachedBun
 class BlockletDownloader extends EventEmitter {
   /**
    * @param {{
+   *   installDir: string,
+   *   downloadDir: string,
    *   cache: {
    *     set: (key: string, value: any) => Promise
    *     get: (key: string) => Promise<any>
-   *   }
+   *   },
    * }}
    */
   constructor({ installDir, downloadDir, cache, logger = defaultLogger }) {
@@ -106,20 +116,25 @@ class BlockletDownloader extends EventEmitter {
 
   /**
    * @param {{}} blocklet
-   * @param {{}} [context={}]
+   * @param {{
+   *   preDownload: ({ downloadList: Array<meta>, downloadComponentIds: Array<string> }) => any
+   *   postDownload: ({ downloadList: Array<meta>, downloadComponentIds: Array<string>, isCancelled: boolean }) => any
+   *   skipCheckIntegrity: boolean
+   * }} [options={}]
    * @return {*}
    */
-  async download(blocklet, context = {}) {
+  async download(blocklet, options = {}) {
     const {
       meta: { name, did },
     } = blocklet;
 
     this.logger.info('Download Blocklet', { name, did });
 
-    const { preDownload = () => {}, postDownload = () => {} } = context;
+    const { preDownload = () => {}, postDownload = () => {}, skipCheckIntegrity } = options;
 
     const { downloadComponentIds, downloadList } = await this.getDownloadList({
       blocklet,
+      skipCheckIntegrity,
     });
 
     await preDownload({ downloadList, downloadComponentIds });
@@ -133,13 +148,15 @@ class BlockletDownloader extends EventEmitter {
       const tasks = [];
       for (const meta of downloadList) {
         const url = meta.dist.tarball;
-        tasks.push(this.bundleDownloader.download(meta, did, url, context));
+        tasks.push(this.bundleDownloader.download(meta, did, url, options));
       }
       const results = await Promise.all(tasks);
 
-      await postDownload({ downloadList, downloadComponentIds });
+      const isCancelled = results.some((x) => x.isCancelled);
+
+      await postDownload({ downloadList, downloadComponentIds, isCancelled });
 
-      if (results.find((x) => x.isCancelled)) {
+      if (isCancelled) {
         return { isCancelled: true };
       }
     } catch (error) {
@@ -160,11 +177,11 @@ class BlockletDownloader extends EventEmitter {
    *   blocklet;
    * }}
    * @returns {{
-   *   downloadList: Array<blockletMeta>;
-   *   downloadComponentIds: Array<string>;
+   *   downloadList: Array<import('@abtnode/client').BlockletMeta>;
+   *   downloadComponentIds: Array<string>; // like: "z8ia1i2yq67x39vruqQTbkVcwCnqRGx8zSPsJ/z8iZwubkNdA1BfEUwc5NJpY2Jnfm7yEbyvmKS"
    * }}
    */
-  async getDownloadList({ blocklet }) {
+  async getDownloadList({ blocklet, skipCheckIntegrity }) {
     const downloadComponentIds = [];
     const metas = {};
 
@@ -178,7 +195,11 @@ class BlockletDownloader extends EventEmitter {
         return;
       }
 
-      const needComponentDownload = needDownload(component, { installDir: this.installDir, cachedBundles });
+      const needComponentDownload = needDownload(component, {
+        installDir: this.installDir,
+        cachedBundles,
+        skipCheckIntegrity,
+      });
       if (!needComponentDownload) {
         this.logger.info(`skip download existed bundle ${bundleId}`, { source: component.source });
         return;