@abtnode/core 1.16.29-beta-112566d5 → 1.16.29-beta-1fedbcdd

package/lib/blocklet/manager/disk.js

@@ -898,11 +898,6 @@ class DiskBlockletManager extends BaseBlockletManager {
           ? componentDids.map((x) => ({ did: x }))
           : blocklet.children.map((x) => ({ did: x.meta.did })),
       });
-      // for backward compatibility
-      this.emit(BlockletInternalEvents.componentsUpdated, {
-        appDid: blocklet.appDid,
-        components: getComponentsInternalInfo(res),
-      });
       this.configSynchronizer.throttledSyncAppConfig(blocklet.meta.did);
 
       let description = `${
@@ -1265,11 +1260,6 @@ class DiskBlockletManager extends BaseBlockletManager {
       appDid: app.appDid,
       components: [{ did: child.meta.did }],
     });
-    // for backward compatibility
-    this.emit(BlockletInternalEvents.componentsUpdated, {
-      appDid: app.appDid,
-      components: getComponentsInternalInfo(newBlocklet),
-    });
     this.configSynchronizer.throttledSyncAppConfig(app.meta.did);
 
     return { ...newBlocklet, deletedComponent: child };
@@ -1349,17 +1339,31 @@ class DiskBlockletManager extends BaseBlockletManager {
     }
   }
 
-  // eslint-disable-next-line no-unused-vars
-  async deleteProcess({ did, componentDids }, context) {
+  /**
+   *
+   * @param {object} param - params
+   * @param {string} param.did - blocklet did
+   * @param {string[]} param.componentDids - component dids
+   * @param {boolean} param.shouldUpdateBlockletStatus - should update blocklet status
+   * @param {*} context
+   * @returns
+   */
+  async deleteProcess({ did, componentDids, shouldUpdateBlockletStatus = true }, context) {
     const blocklet = await this.getBlocklet(did);
 
     logger.info('delete blocklet process', { did, componentDids });
 
     await deleteBlockletProcess(blocklet, { ...context, componentDids });
-
-    const result = await states.blocklet.setBlockletStatus(did, BlockletStatus.stopped, { componentDids });
     logger.info('blocklet process deleted successfully', { did, componentDids });
-    return result;
+
+    // 有些情况不需要更新 blocklet 状态, 比如下载完成，安装之前清理 process 时, 不需要更新 blocklet 状态
+    if (shouldUpdateBlockletStatus) {
+      const result = await states.blocklet.setBlockletStatus(did, BlockletStatus.stopped, { componentDids });
+      logger.info('blocklet status updated to stopped after deleted processes', { did, componentDids });
+      return result;
+    }
+
+    return blocklet;
   }
 
   // Get blocklet by blockletDid or appDid
@@ -1566,7 +1570,6 @@ class DiskBlockletManager extends BaseBlockletManager {
         this.configSynchronizer.throttledSyncAppConfig(blocklet.meta.did);
       }
 
-      this.emit(BlockletEvents.updated, { ...newState, context });
       const serverSk = (await states.node.read()).sk;
       if (childDid) {
         const configs = JSON.stringify(finalConfigs.map((x) => ({ key: x.key, value: x.value })));
@@ -1579,6 +1582,8 @@ class DiskBlockletManager extends BaseBlockletManager {
         this.configSynchronizer.syncComponentConfig(childDid, rootDid, { serverSk });
       }
 
+      this.emit(BlockletEvents.updated, { ...newState, context });
+
       try {
         const observableConfigs = [
           BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_URL,
@@ -1853,11 +1858,6 @@ class DiskBlockletManager extends BaseBlockletManager {
       appDid: blocklet.appDid,
       components: getComponentsInternalInfo(blocklet).filter((x) => x.did === component.meta.did),
     });
-    // for backward compatibility
-    this.emit(BlockletInternalEvents.componentsUpdated, {
-      appDid: blocklet.appDid,
-      components: getComponentsInternalInfo(blocklet),
-    });
     this.configSynchronizer.throttledSyncAppConfig(blocklet.meta.did);
 
     return this.getBlocklet(rootDid);
@@ -2709,11 +2709,6 @@ class DiskBlockletManager extends BaseBlockletManager {
         appDid: blocklet.appDid,
         components: (componentDids || []).map((x) => ({ did: x })),
       });
-      // for backward compatibility
-      this.emit(BlockletInternalEvents.componentsUpdated, {
-        appDid: blocklet.appDid,
-        components: getComponentsInternalInfo(res),
-      });
       this.configSynchronizer.throttledSyncAppConfig(res);
 
       this.emit(BlockletEvents.statusChange, res);
@@ -3259,7 +3254,9 @@ class DiskBlockletManager extends BaseBlockletManager {
         return null;
       }
 
-      blocklet.site.domainAliases = await this.getDomainAliases(blocklet, context);
+      if (blocklet.site) {
+        blocklet.site.domainAliases = await this.getDomainAliases(blocklet, context);
+      }
 
       // app runtime info, app status
       blocklet.appRuntimeInfo = this.runtimeMonitor.getRuntimeInfo(blocklet.meta.did);
@@ -3449,7 +3446,7 @@ class DiskBlockletManager extends BaseBlockletManager {
 
       // ensure delete process
       try {
-        await this.deleteProcess({ did }, context);
+        await this.deleteProcess({ did, shouldUpdateBlockletStatus: false }, context);
         logger.info('ensure delete blocklet process for installing', { did, name: meta.name });
       } catch (err) {
         logger.error('ensure delete blocklet process failed for installing', { did, name: meta.name, error: err });
@@ -3747,11 +3744,6 @@ class DiskBlockletManager extends BaseBlockletManager {
           }
         );
       }
-      // for backward compatibility
-      this.emit(BlockletInternalEvents.componentsUpdated, {
-        appDid: blocklet.appDid,
-        components: getComponentsInternalInfo(blocklet),
-      });
       this.configSynchronizer.throttledSyncAppConfig(blocklet);
 
       return blocklet;

package/lib/event/index.js

@@ -357,11 +357,7 @@ module.exports = ({
       }
     }
 
-    if (
-      [BlockletEvents.started, BlockletEvents.startFailed, BlockletEvents.stopped, BlockletEvents.reloaded].includes(
-        eventName
-      )
-    ) {
+    if ([BlockletEvents.started, BlockletEvents.startFailed, BlockletEvents.stopped].includes(eventName)) {
       try {
         await blockletManager.runtimeMonitor.monit(blocklet.meta.did);
       } catch (error) {

package/lib/states/user.js

@@ -392,6 +392,7 @@ class User extends ExtendBase {
         'fullName',
         'email',
         'avatar',
+        'url',
         'role',
 
         'locale',

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.29-beta-112566d5",
+  "version": "1.16.29-beta-1fedbcdd",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,19 +19,19 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.29-beta-112566d5",
-    "@abtnode/auth": "1.16.29-beta-112566d5",
-    "@abtnode/certificate-manager": "1.16.29-beta-112566d5",
-    "@abtnode/constant": "1.16.29-beta-112566d5",
-    "@abtnode/cron": "1.16.29-beta-112566d5",
-    "@abtnode/logger": "1.16.29-beta-112566d5",
-    "@abtnode/models": "1.16.29-beta-112566d5",
-    "@abtnode/queue": "1.16.29-beta-112566d5",
-    "@abtnode/rbac": "1.16.29-beta-112566d5",
-    "@abtnode/router-provider": "1.16.29-beta-112566d5",
-    "@abtnode/static-server": "1.16.29-beta-112566d5",
-    "@abtnode/timemachine": "1.16.29-beta-112566d5",
-    "@abtnode/util": "1.16.29-beta-112566d5",
+    "@abtnode/analytics": "1.16.29-beta-1fedbcdd",
+    "@abtnode/auth": "1.16.29-beta-1fedbcdd",
+    "@abtnode/certificate-manager": "1.16.29-beta-1fedbcdd",
+    "@abtnode/constant": "1.16.29-beta-1fedbcdd",
+    "@abtnode/cron": "1.16.29-beta-1fedbcdd",
+    "@abtnode/logger": "1.16.29-beta-1fedbcdd",
+    "@abtnode/models": "1.16.29-beta-1fedbcdd",
+    "@abtnode/queue": "1.16.29-beta-1fedbcdd",
+    "@abtnode/rbac": "1.16.29-beta-1fedbcdd",
+    "@abtnode/router-provider": "1.16.29-beta-1fedbcdd",
+    "@abtnode/static-server": "1.16.29-beta-1fedbcdd",
+    "@abtnode/timemachine": "1.16.29-beta-1fedbcdd",
+    "@abtnode/util": "1.16.29-beta-1fedbcdd",
     "@arcblock/did": "1.18.126",
     "@arcblock/did-auth": "1.18.126",
     "@arcblock/did-ext": "^1.18.126",
@@ -42,13 +42,13 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.126",
     "@arcblock/vc": "1.18.126",
-    "@blocklet/constant": "1.16.29-beta-112566d5",
-    "@blocklet/env": "1.16.29-beta-112566d5",
-    "@blocklet/meta": "1.16.29-beta-112566d5",
-    "@blocklet/resolver": "1.16.29-beta-112566d5",
-    "@blocklet/sdk": "1.16.29-beta-112566d5",
-    "@blocklet/store": "1.16.29-beta-112566d5",
-    "@did-space/client": "^0.5.4",
+    "@blocklet/constant": "1.16.29-beta-1fedbcdd",
+    "@blocklet/env": "1.16.29-beta-1fedbcdd",
+    "@blocklet/meta": "1.16.29-beta-1fedbcdd",
+    "@blocklet/resolver": "1.16.29-beta-1fedbcdd",
+    "@blocklet/sdk": "1.16.29-beta-1fedbcdd",
+    "@blocklet/store": "1.16.29-beta-1fedbcdd",
+    "@did-space/client": "^0.5.7",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.126",
     "@ocap/util": "1.18.126",
@@ -103,5 +103,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "4c6213560b79dc862b0b5e48b50f65c39de54aef"
+  "gitHead": "e66e220d775e821c85b8bd6286342c202ad143f0"
 }