@abtnode/core 1.16.6-beta-79e0bbcc → 1.16.6-beta-56be9f01

package/lib/blocklet/hooks.js

@@ -7,8 +7,18 @@ const logger = require('@abtnode/logger')(`${require('../../package.json').name}
 
 const { getSafeEnv } = require('../util');
 
-const runUserHook = async (processId, hookName, args) => {
-  const { appDir, hooks, env, exitOnError = true, silent = false, notification, did } = args;
+const runUserHook = async (label, hookName, args) => {
+  const {
+    appDir,
+    hooks,
+    env,
+    exitOnError = true,
+    silent = false,
+    notification,
+    did,
+    output: outputFile,
+    error: errorFile,
+  } = args;
   const hook = get(hooks, `[${hookName}]`) || get(hooks, `[${camelCase(hookName)}]`);
 
   try {
@@ -16,10 +26,17 @@ const runUserHook = async (processId, hookName, args) => {
       return;
     }
 
-    logger.info(`run hook:${hookName}:`, { processId, hook });
-    await runScript(hook, [processId, hookName].join(':'), { cwd: appDir, env: getSafeEnv(env), silent });
+    logger.info(`run hook:${hookName}:`, { label, hook });
+    // FIXME @linchen timeout 应该动态设置或不设置
+    await runScript(hook, [label, hookName].join(':'), {
+      cwd: appDir,
+      env: getSafeEnv(env),
+      silent,
+      output: outputFile,
+      error: errorFile,
+    });
   } catch (error) {
-    logger.error(`run ${hook} error:`, { processId, error });
+    logger.error(`run ${hook} error:`, { label, error });
 
     if (notification) {
       notification.create({
@@ -32,14 +49,14 @@ const runUserHook = async (processId, hookName, args) => {
     }
 
     if (exitOnError) {
-      throw new Error(`Run [${processId} - ${hookName}] failed: ${error.message}`);
+      throw new Error(`Run [${label} - ${hookName}] failed: ${error.message}`);
     }
   }
 };
 
-const preInstall = (processId, ...args) => runUserHook(processId, 'pre-install', ...args);
-const postInstall = (processId, ...args) => runUserHook(processId, 'post-install', ...args);
-const preConfig = (processId, ...args) => runUserHook(processId, 'pre-config', ...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) => {
   // check required environments
   let environments = get(blocklet, 'meta.environments', []);
@@ -52,11 +69,11 @@ const preStart = async (blocklet, options) => {
     throw new Error(`Required environments is not set: ${tmp.join(',')}`);
   }
 
-  return runUserHook(blocklet.env.processId, 'pre-start', options);
+  return runUserHook(blocklet.meta.title, 'pre-start', options);
 };
 
-const postStart = (blocklet, ...args) => runUserHook(blocklet.env.processId, 'post-start', ...args);
-const preUninstall = (processId, ...args) => runUserHook(processId, 'pre-uninstall', ...args);
-const preStop = (processId, ...args) => runUserHook(processId, 'pre-stop', ...args);
+const postStart = (blocklet, ...args) => runUserHook(blocklet.meta.title, 'post-start', ...args);
+const preUninstall = (label, ...args) => runUserHook(label, 'pre-uninstall', ...args);
+const preStop = (label, ...args) => runUserHook(label, 'pre-stop', ...args);
 
 module.exports = { preInstall, postInstall, preStart, postStart, preUninstall, preStop, preConfig };

package/lib/blocklet/manager/disk.js

@@ -98,7 +98,6 @@ const {
   checkDuplicateMountPoint,
   validateStore,
   isRotatingAppSk,
-  isRotatingAppDid,
   checkVersionCompatibility,
   getBlockletKnownAs,
   updateBlockletFallbackLogo,
@@ -134,6 +133,11 @@ const { formatEnvironments, shouldUpdateBlockletStatus, getBlockletMeta, validat
 
 const statusLock = new Lock('blocklet-status-lock');
 
+const getHooksOutputFiles = (blocklet) => ({
+  output: path.join(blocklet.env.logsDir, 'output.log'),
+  error: path.join(blocklet.env.logsDir, 'error.log'),
+});
+
 const pm2StatusMap = {
   online: BlockletStatus.running,
   stop: BlockletStatus.stopped,
@@ -473,6 +477,7 @@ class BlockletManager extends BaseBlockletManager {
             hooks: Object.assign(b.meta.hooks || {}, b.meta.scripts || {}),
             env,
             did, // root blocklet did,
+            ...getHooksOutputFiles(b),
           });
 
       // start process
@@ -553,7 +558,7 @@ class BlockletManager extends BaseBlockletManager {
       const nodeEnvironments = await states.node.getEnvironments();
       await stopBlockletProcess(blocklet, {
         preStop: (b, { ancestors }) =>
-          hooks.preStop(b.env.processId, {
+          hooks.preStop(b.meta.title, {
             appDir: b.env.appDir,
             hooks: Object.assign(b.meta.hooks || {}, b.meta.scripts || {}),
             env: getRuntimeEnvironments(b, nodeEnvironments, ancestors),
@@ -562,6 +567,7 @@ class BlockletManager extends BaseBlockletManager {
             context,
             exitOnError: false,
             silent,
+            ...getHooksOutputFiles(b),
           }),
       });
     } catch (error) {
@@ -689,7 +695,7 @@ class BlockletManager extends BaseBlockletManager {
       const nodeEnvironments = await states.node.getEnvironments();
       await deleteBlockletProcess(blocklet, {
         preDelete: (b, { ancestors }) =>
-          hooks.preUninstall(b.env.processId, {
+          hooks.preUninstall(b.meta.title, {
             appDir: b.env.appDir,
             hooks: Object.assign(b.meta.hooks || {}, b.meta.scripts || {}),
             env: getRuntimeEnvironments(b, nodeEnvironments, ancestors),
@@ -697,6 +703,7 @@ class BlockletManager extends BaseBlockletManager {
             notification: states.notification,
             context,
             exitOnError: false,
+            ...getHooksOutputFiles(b),
           }),
       });
 
@@ -749,8 +756,7 @@ class BlockletManager extends BaseBlockletManager {
       fs.removeSync(logsDir);
 
       // Reset config in db
-      await states.blockletExtras.remove({ did: blocklet.meta.did });
-      await this._setConfigsFromMeta(did);
+      await this._resetExtras(blocklet.meta.did);
       await this._updateBlockletEnvironment(did);
       await this.resetSiteByDid(did, context);
     } else {
@@ -1029,7 +1035,9 @@ class BlockletManager extends BaseBlockletManager {
 
     const configObj = {};
     for (const x of newConfigs) {
-      if (x.custom === true) {
+      if (['CHAIN_TYPE', 'BLOCKLET_APP_CHAIN_TYPE'].includes(x.key)) {
+        throw new Error(`${x.key} should not be changed`);
+      } else if (x.custom === true) {
         // custom key
         await environmentNameSchema.validateAsync(x.key);
       } else if (BLOCKLET_CONFIGURABLE_KEY[x.key] && x.key.startsWith('BLOCKLET_')) {
@@ -1038,7 +1046,6 @@ class BlockletManager extends BaseBlockletManager {
           logger.error(`Cannot set ${x.key} to child blocklet`, [dids]);
           throw new Error(`Cannot set ${x.key} to child blocklet`);
         }
-
         await validateAppConfig(x, states);
       } else if (!BLOCKLET_CONFIGURABLE_KEY[x.key] && !isPreferenceKey(x)) {
         if (!(blocklet.meta.environments || []).some((y) => y.name === x.key)) {
@@ -1051,7 +1058,6 @@ class BlockletManager extends BaseBlockletManager {
     }
 
     const willAppSkChange = isRotatingAppSk(newConfigs, blocklet.configs, blocklet.externalSk);
-    const willAppDidChange = isRotatingAppDid(newConfigs, blocklet.configs, blocklet.externalSk);
 
     // NOTICE: cannot use appDid as did param because appDid will become old appDid in alsoKnownAs and cannot get blocklet by the old appDid
     if (willAppSkChange && rootDid !== rootMetaDid) {
@@ -1062,13 +1068,14 @@ class BlockletManager extends BaseBlockletManager {
     if (!skipHook) {
       const nodeEnvironments = await states.node.getEnvironments();
       // FIXME: we should also call preConfig for child blocklets
-      await hooks.preConfig(blocklet.env.processId, {
+      await hooks.preConfig(blocklet.meta.title, {
         appDir: blocklet.env.appDir,
         hooks: Object.assign(blocklet.meta.hooks || {}, blocklet.meta.scripts || {}),
         exitOnError: true,
         env: { ...getRuntimeEnvironments(blocklet, nodeEnvironments, ancestors), ...configObj },
         did,
         context,
+        ...getHooksOutputFiles(blocklet),
       });
     }
 
@@ -1120,7 +1127,7 @@ class BlockletManager extends BaseBlockletManager {
     // response
     const newState = await this.getBlocklet(rootDid);
 
-    if (willAppDidChange && !skipDidDocument) {
+    if (willAppSkChange && !skipDidDocument) {
       await this._updateDidDocument(newState);
     }
 
@@ -1349,8 +1356,8 @@ class BlockletManager extends BaseBlockletManager {
     let shouldUpdateStatus = forceSync || shouldUpdateBlockletStatus(blocklet.status);
     if (isInProgress(blocklet.status)) {
       const uptime = Date.now() - new Date(blocklet.updatedAt).getTime();
-      // if uptime great than 30s, sync the status from pm2
-      if (uptime > 30 * 1000) {
+      // FIXME @linchen 在彻底修复 blocklet status 稳定性之后, uptime check 应该去掉. 如果 hook 执行时间很长, uptime check 会影响 hook 执行过程中的 blocklet status
+      if (uptime > 120 * 1000) {
         shouldUpdateStatus = true;
       }
     }
@@ -1866,6 +1873,8 @@ class BlockletManager extends BaseBlockletManager {
   }
 
   async _addBlocklet({ component, mode = BLOCKLET_MODES.PRODUCTION, name, did, title, description, skSource = '' }) {
+    const environments = component?.meta?.environments || [];
+
     const meta = {
       name,
       did,
@@ -1884,7 +1893,7 @@ class BlockletManager extends BaseBlockletManager {
         },
       ],
       specVersion: BLOCKLET_LATEST_SPEC_VERSION,
-      environments: component?.meta?.environments || [],
+      environments,
       timeout: {
         start: process.env.NODE_ENV === 'test' ? 10 : 60,
       },
@@ -1934,6 +1943,18 @@ class BlockletManager extends BaseBlockletManager {
 
     const blocklet = await states.blocklet.addBlocklet(params);
 
+    // set chain type
+    const chainTypeEnv = {
+      key: BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_CHAIN_TYPE,
+      value: 'arcblock',
+      shared: true,
+    };
+    const customChainType = environments.find((x) => x.name === 'CHAIN_TYPE')?.default;
+    if (['eth', 'ethereum'].includes(customChainType)) {
+      chainTypeEnv.value = 'ethereum';
+    }
+    await states.blockletExtras.setConfigs(blocklet.meta.did, [chainTypeEnv]);
+
     return blocklet;
   }
 
@@ -2396,13 +2417,14 @@ class BlockletManager extends BaseBlockletManager {
     const nodeEnvironments = await states.node.getEnvironments();
 
     const preInstall = (b) =>
-      hooks.preInstall(b.env.processId, {
+      hooks.preInstall(b.meta.title, {
         hooks: Object.assign(b.meta.hooks || {}, b.meta.scripts || {}),
         env: { ...nodeEnvironments },
         appDir: b.env.appDir,
         did: blocklet.meta.did, // root blocklet did
         notification: states.notification,
         context,
+        ...getHooksOutputFiles(b),
       });
 
     await forEachBlocklet(blocklet, preInstall, { parallel: true });
@@ -2412,13 +2434,14 @@ class BlockletManager extends BaseBlockletManager {
     const nodeEnvironments = await states.node.getEnvironments();
 
     const postInstall = (b, { ancestors }) =>
-      hooks.postInstall(b.env.processId, {
+      hooks.postInstall(b.meta.title, {
         hooks: Object.assign(b.meta.hooks || {}, b.meta.scripts || {}),
         env: getRuntimeEnvironments(b, nodeEnvironments, ancestors),
         appDir: b.env.appDir,
         did: blocklet.meta.did, // root blocklet did
         notification: states.notification,
         context,
+        ...getHooksOutputFiles(b),
       });
 
     await forEachBlocklet(blocklet, postInstall, { parallel: true });
@@ -2744,7 +2767,8 @@ class BlockletManager extends BaseBlockletManager {
     const appConfigs = await states.blockletExtras.getConfigs([metaDid]);
 
     const chainConfigs = configs
-      .filter((x) => ['CHAIN_HOST', 'CHAIN_ID', 'CHAIN_TYPE'].includes(x.key))
+      // CHAIN_TYPE should not changed after first set
+      .filter((x) => ['CHAIN_HOST', 'CHAIN_ID'].includes(x.key))
       .filter((x) => {
         if (force) {
           return true;
@@ -2766,6 +2790,20 @@ class BlockletManager extends BaseBlockletManager {
       await states.blockletExtras.setConfigs(metaDid, items);
     }
   }
+
+  async _resetExtras(metaDid) {
+    const did = metaDid;
+    const configs = await states.blockletExtras.getConfigs(metaDid);
+    const chainType = (configs || []).find((x) => x.key === 'BLOCKLET_APP_CHAIN_TYPE');
+    await states.blockletExtras.remove({ did });
+
+    if (chainType) {
+      await states.blockletExtras.setConfigs(metaDid, [chainType]);
+    } else {
+      logger.error(`chainType does not exist in app ${metaDid}`);
+    }
+    await this._setConfigsFromMeta(did);
+  }
 }
 
 module.exports = BlockletManager;

package/lib/blocklet/manager/helper/install-application-from-backup.js

@@ -71,10 +71,7 @@ const installApplicationFromBackup = async ({
     '_id',
     'createdAt',
     'updatedAt',
-    'controller.nftId',
-    'controller.nftOwner',
-    'controller.chainHost',
-    'controller.appMaxCount',
+    'controller',
   ]);
 
   if (blockletState.meta.did !== extra.did) {

package/lib/blocklet/manager/helper/install-application-from-general.js

@@ -70,7 +70,7 @@ const installApplicationFromGeneral = async ({
   let component;
   if (componentSourceUrl) {
     const meta = await getBlockletMetaFromUrl(componentSourceUrl);
-    const blockletWalletTypeEnv = (meta.environments || []).find((x) => x.name === 'BLOCKLET_WALLET_TYPE');
+    const blockletWalletTypeEnv = (meta.environments || []).find((x) => x.name === 'CHAIN_TYPE');
     if (blockletWalletTypeEnv) {
       blockletWalletType = blockletWalletTypeEnv.default;
     }

package/lib/blocklet/manager/helper/migrate-application-to-struct-v2.js

@@ -137,6 +137,7 @@ const migrateAppOnChain = async (blocklet, oldSk, newSk) => {
   }
 
   // ensure account changed
+  // 2023.04.26 eth type application need not be supported
   const type = blocklet.configObj?.BLOCKLET_WALLET_TYPE;
   const oldWallet = getBlockletWallet(oldSk, undefined, type);
   const newWallet = getBlockletWallet(newSk, undefined, type);

package/lib/util/blocklet.js

@@ -339,7 +339,7 @@ const getAppOverwrittenEnvironments = (blocklet, nodeInfo) => {
     result[x] = blocklet.configObj[x];
   });
 
-  const keys = ['BLOCKLET_APP_SK', 'BLOCKLET_WALLET_TYPE'];
+  const keys = ['BLOCKLET_APP_SK', 'BLOCKLET_APP_CHAIN_TYPE'];
   const isAppDidRewritten = keys.some((key) => blocklet.configObj[key]);
   if (!isAppDidRewritten) {
     return result;
@@ -1609,29 +1609,6 @@ const isRotatingAppSk = (newConfigs, oldConfigs, externalSk) => {
   return false;
 };
 
-const isRotatingAppDid = (newConfigs, oldConfigs, externalSk) => {
-  if (isRotatingAppSk(newConfigs, oldConfigs, externalSk)) {
-    return true;
-  }
-
-  const newType = newConfigs.find((x) => BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_WALLET_TYPE === x.key);
-  const oldType = oldConfigs.find((x) => BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_WALLET_TYPE === x.key);
-  if (!newType) {
-    return false;
-  }
-
-  if (!oldType) {
-    return true;
-  }
-
-  // eslint-disable-next-line sonarjs/prefer-single-boolean-return
-  if (oldType !== newType) {
-    return true;
-  }
-
-  return false;
-};
-
 /**
  * this function has side effect on config.value
  * @param {{ key: string, value?: string }} config
@@ -1683,8 +1660,8 @@ const validateAppConfig = async (config, states) => {
     x.value = await logoSchema.validateAsync(x.value);
   }
 
-  if (x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_WALLET_TYPE) {
-    if (['default', 'eth'].includes(x.value) === false) {
+  if (x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_CHAIN_TYPE) {
+    if (['arcblock', 'ethereum'].includes(x.value) === false) {
       throw new Error('Invalid blocklet wallet type, only "default" and "eth" are supported');
     }
   }
@@ -1989,7 +1966,6 @@ module.exports = {
   validateAppConfig,
   isBlockletAppSkUsed,
   isRotatingAppSk,
-  isRotatingAppDid,
   checkDuplicateAppSk,
   checkDuplicateMountPoint,
   validateStore,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.6-beta-79e0bbcc",
+  "version": "1.16.6-beta-56be9f01",
   "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-79e0bbcc",
-    "@abtnode/certificate-manager": "1.16.6-beta-79e0bbcc",
-    "@abtnode/constant": "1.16.6-beta-79e0bbcc",
-    "@abtnode/cron": "1.16.6-beta-79e0bbcc",
-    "@abtnode/db": "1.16.6-beta-79e0bbcc",
-    "@abtnode/logger": "1.16.6-beta-79e0bbcc",
-    "@abtnode/queue": "1.16.6-beta-79e0bbcc",
-    "@abtnode/rbac": "1.16.6-beta-79e0bbcc",
-    "@abtnode/router-provider": "1.16.6-beta-79e0bbcc",
-    "@abtnode/static-server": "1.16.6-beta-79e0bbcc",
-    "@abtnode/timemachine": "1.16.6-beta-79e0bbcc",
-    "@abtnode/util": "1.16.6-beta-79e0bbcc",
+    "@abtnode/auth": "1.16.6-beta-56be9f01",
+    "@abtnode/certificate-manager": "1.16.6-beta-56be9f01",
+    "@abtnode/constant": "1.16.6-beta-56be9f01",
+    "@abtnode/cron": "1.16.6-beta-56be9f01",
+    "@abtnode/db": "1.16.6-beta-56be9f01",
+    "@abtnode/logger": "1.16.6-beta-56be9f01",
+    "@abtnode/queue": "1.16.6-beta-56be9f01",
+    "@abtnode/rbac": "1.16.6-beta-56be9f01",
+    "@abtnode/router-provider": "1.16.6-beta-56be9f01",
+    "@abtnode/static-server": "1.16.6-beta-56be9f01",
+    "@abtnode/timemachine": "1.16.6-beta-56be9f01",
+    "@abtnode/util": "1.16.6-beta-56be9f01",
     "@arcblock/did": "1.18.76",
     "@arcblock/did-auth": "1.18.76",
     "@arcblock/did-ext": "^1.18.76",
@@ -40,9 +40,9 @@
     "@arcblock/jwt": "^1.18.76",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "1.18.76",
-    "@blocklet/constant": "1.16.6-beta-79e0bbcc",
-    "@blocklet/meta": "1.16.6-beta-79e0bbcc",
-    "@blocklet/sdk": "1.16.6-beta-79e0bbcc",
+    "@blocklet/constant": "1.16.6-beta-56be9f01",
+    "@blocklet/meta": "1.16.6-beta-56be9f01",
+    "@blocklet/sdk": "1.16.6-beta-56be9f01",
     "@did-space/client": "^0.2.87",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.76",
@@ -94,5 +94,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "a14091393bf4c1a7b430155cf27343a0f23ffa2c"
+  "gitHead": "f93c24693ed27c4a2821ec33c345696afe6f001a"
 }