@abtnode/core 1.16.6-beta-7c9b42cc → 1.16.6-beta-9e9fec72

package/lib/blocklet/manager/disk.js

@@ -576,7 +576,7 @@ class BlockletManager extends BaseBlockletManager {
     logger.info('blocklet stopped successfully', { processId, did });
 
     if (updateStatus) {
-      const res = await this.status(did, { forceSync: true });
+      const res = await states.blocklet.setBlockletStatus(did, BlockletStatus.stopped);
       // send notification to websocket channel
       this.emit(BlockletEvents.statusChange, res);
 
@@ -669,10 +669,9 @@ class BlockletManager extends BaseBlockletManager {
 
     await states.blocklet.setBlockletStatus(did, BlockletStatus.stopping);
     await reloadBlockletProcess(blocklet);
-    await states.blocklet.setBlockletStatus(did, BlockletStatus.running);
+    const res = await states.blocklet.setBlockletStatus(did, BlockletStatus.running);
     logger.info('blocklet reload successfully', { did });
 
-    const res = await this.status(did);
     this.emit(BlockletEvents.statusChange, res);
     return res;
   }
@@ -2351,7 +2350,11 @@ class BlockletManager extends BaseBlockletManager {
         await states.blockletExtras.setConfigs([...ancestors.map((x) => x.meta.did), b.meta.did], environments);
 
         // chain config
-        await this._ensureAppChainConfig(blocklet.meta.did, environments, 'name');
+        await this._ensureAppChainConfig(
+          blocklet.meta.did,
+          environments.map((x) => ({ key: x.name, value: x.default })),
+          { force: false }
+        );
       });
     } else {
       const child = blocklet.children.find((x) => x.meta.did === childDid);
@@ -2362,7 +2365,11 @@ class BlockletManager extends BaseBlockletManager {
         );
 
         // chain config
-        await this._ensureAppChainConfig(blocklet.meta.did, get(b.meta, 'environments', []), 'name');
+        await this._ensureAppChainConfig(
+          blocklet.meta.did,
+          get(b.meta, 'environments', []).map((x) => ({ key: x.name, value: x.default })),
+          { force: false }
+        );
       });
     }
   }
@@ -2719,12 +2726,24 @@ class BlockletManager extends BaseBlockletManager {
     }
   }
 
-  async _ensureAppChainConfig(metaDid, configs, key = 'key') {
-    const chainConfigs = configs.filter((x) => ['CHAIN_HOST', 'CHAIN_ID', 'CHAIN_TYPE'].includes(x[key]));
+  async _ensureAppChainConfig(metaDid, configs, { force = true } = {}) {
+    const appConfigs = await states.blockletExtras.getConfigs([metaDid]);
+
+    const chainConfigs = configs
+      .filter((x) => ['CHAIN_HOST', 'CHAIN_ID', 'CHAIN_TYPE'].includes(x.key))
+      .filter((x) => {
+        if (force) {
+          return true;
+        }
+
+        const appConfig = appConfigs.find((y) => y.key === CHAIN_PROP_MAP_REVERSE[x.key]);
+        return !appConfig || !appConfig.value;
+      });
     if (chainConfigs.length) {
       const items = chainConfigs.map((x) => ({
         ...omit(x, ['description', 'validation']),
-        [key]: CHAIN_PROP_MAP_REVERSE[x[key]],
+        key: CHAIN_PROP_MAP_REVERSE[x.key],
+        value: x.value,
         shared: true,
         secure: false,
         required: false,

package/lib/migrations/1.16.6-chain-info.js

@@ -0,0 +1,78 @@
+/* eslint-disable no-await-in-loop */
+/* eslint-disable no-continue */
+
+const props = {
+  description: '',
+  validation: '',
+  shared: true,
+  secure: false,
+  required: false,
+  custom: false,
+};
+module.exports = async ({ states, printInfo }) => {
+  printInfo('Try to update app chain info...');
+
+  const blockletExtras = await states.blockletExtras.find({});
+
+  for (const extra of blockletExtras || []) {
+    const appConfigs = extra.configs || [];
+
+    const hasChainHostInApp = appConfigs.find((x) => x.key === 'BLOCKLET_APP_CHAIN_HOST');
+    const hasChainIdInApp = appConfigs.find((x) => x.key === 'BLOCKLET_APP_CHAIN_ID');
+    const hasChainTypeInApp = appConfigs.find((x) => x.key === 'BLOCKLET_APP_CHAIN_TYPE');
+    let shouldUpdate = false;
+    let hasSetChainHost = false;
+    let hasSetChainId = false;
+    let hasSetChainType = false;
+
+    const components = [];
+    for (const child of extra.children || []) {
+      components.push(child);
+    }
+    components.push(extra); // root component
+
+    for (const component of components) {
+      for (const config of component.configs || []) {
+        const { value } = config;
+
+        if (config.key === 'CHAIN_HOST' && value && !hasChainHostInApp && !hasSetChainHost) {
+          appConfigs.push({
+            key: 'BLOCKLET_APP_CHAIN_HOST',
+            value,
+            ...props,
+          });
+          shouldUpdate = true;
+          hasSetChainHost = true;
+          printInfo(`Should update blocklet ${extra.did}, CHAIN_HOST: ${value}`);
+        }
+
+        if (config.key === 'CHAIN_ID' && value && !hasChainIdInApp && !hasSetChainId) {
+          appConfigs.push({
+            key: 'BLOCKLET_APP_CHAIN_ID',
+            value,
+            ...props,
+          });
+          shouldUpdate = true;
+          hasSetChainId = true;
+          printInfo(`Should update blocklet ${extra.did}, CHAIN_ID: ${value}`);
+        }
+
+        if (config.key === 'CHAIN_TYPE' && value && !hasChainTypeInApp && !hasSetChainType) {
+          appConfigs.push({
+            key: 'BLOCKLET_APP_CHAIN_TYPE',
+            value,
+            ...props,
+          });
+          shouldUpdate = true;
+          hasSetChainType = true;
+          printInfo(`Should update blocklet ${extra.did}, CHAIN_TYPE: ${value}`);
+        }
+      }
+    }
+
+    if (shouldUpdate) {
+      await states.blockletExtras.update({ _id: extra._id }, { $set: { configs: appConfigs } });
+      printInfo(`Blocklet in blocklet_extra.db updated: ${extra.did}`);
+    }
+  }
+};

package/lib/states/blocklet-extras.js

@@ -148,6 +148,7 @@ class BlockletExtrasState extends BaseState {
     };
   }
 
+  // CAUTION: setConfig() 方法中非必要 **不要** 传入 [{ name: xxx }], 要传入 [{ key: xxx }]. 前者会导致某些配置被自动删掉
   generateSetFn(extra) {
     return async (dids, data) => {
       // eslint-disable-next-line no-param-reassign

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.6-beta-7c9b42cc",
+  "version": "1.16.6-beta-9e9fec72",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,18 +19,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.16.6-beta-7c9b42cc",
-    "@abtnode/certificate-manager": "1.16.6-beta-7c9b42cc",
-    "@abtnode/constant": "1.16.6-beta-7c9b42cc",
-    "@abtnode/cron": "1.16.6-beta-7c9b42cc",
-    "@abtnode/db": "1.16.6-beta-7c9b42cc",
-    "@abtnode/logger": "1.16.6-beta-7c9b42cc",
-    "@abtnode/queue": "1.16.6-beta-7c9b42cc",
-    "@abtnode/rbac": "1.16.6-beta-7c9b42cc",
-    "@abtnode/router-provider": "1.16.6-beta-7c9b42cc",
-    "@abtnode/static-server": "1.16.6-beta-7c9b42cc",
-    "@abtnode/timemachine": "1.16.6-beta-7c9b42cc",
-    "@abtnode/util": "1.16.6-beta-7c9b42cc",
+    "@abtnode/auth": "1.16.6-beta-9e9fec72",
+    "@abtnode/certificate-manager": "1.16.6-beta-9e9fec72",
+    "@abtnode/constant": "1.16.6-beta-9e9fec72",
+    "@abtnode/cron": "1.16.6-beta-9e9fec72",
+    "@abtnode/db": "1.16.6-beta-9e9fec72",
+    "@abtnode/logger": "1.16.6-beta-9e9fec72",
+    "@abtnode/queue": "1.16.6-beta-9e9fec72",
+    "@abtnode/rbac": "1.16.6-beta-9e9fec72",
+    "@abtnode/router-provider": "1.16.6-beta-9e9fec72",
+    "@abtnode/static-server": "1.16.6-beta-9e9fec72",
+    "@abtnode/timemachine": "1.16.6-beta-9e9fec72",
+    "@abtnode/util": "1.16.6-beta-9e9fec72",
     "@arcblock/did": "1.18.75",
     "@arcblock/did-auth": "1.18.75",
     "@arcblock/did-ext": "^1.18.75",
@@ -40,9 +40,9 @@
     "@arcblock/jwt": "^1.18.75",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "1.18.75",
-    "@blocklet/constant": "1.16.6-beta-7c9b42cc",
-    "@blocklet/meta": "1.16.6-beta-7c9b42cc",
-    "@blocklet/sdk": "1.16.6-beta-7c9b42cc",
+    "@blocklet/constant": "1.16.6-beta-9e9fec72",
+    "@blocklet/meta": "1.16.6-beta-9e9fec72",
+    "@blocklet/sdk": "1.16.6-beta-9e9fec72",
     "@did-space/client": "^0.2.80",
     "@fidm/x509": "^1.2.1",
     "@ocap/client": "1.18.75",
@@ -98,5 +98,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "113a82e948a779a050f1b06f5667c43c96315054"
+  "gitHead": "a30731223bc19231bac0dea7bd0d01a3bbf8e84c"
 }