@abtnode/core 1.16.15-beta-d8e7b6c0 → 1.16.15-beta-9318a201

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

@@ -8,7 +8,6 @@ const { toBase58 } = require('@ocap/util');
 const defaultLogger = require('@abtnode/logger')('@abtnode/core:blocklet-downloader');
 
 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');
 
@@ -54,14 +53,6 @@ const needDownload = (
     return true;
   }
 
-  // check bundle broken
-  try {
-    validateBlockletEntry(bundleDir, component.meta);
-  } catch (err) {
-    logger.error('bundle is broken', { bundleId, msg: err.message });
-    return true;
-  }
-
   if (!isSourceAccessible(component)) {
     return false;
   }

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

@@ -2,7 +2,6 @@ const path = require('path');
 const fs = require('fs-extra');
 const { Throttle } = require('stream-throttle');
 
-const validateBlockletEntry = require('@blocklet/meta/lib/entry');
 const { BLOCKLET_BUNDLE_FOLDER } = require('@blocklet/constant');
 
 const defaultLogger = require('@abtnode/logger')('@abtnode/core:resolve-download');
@@ -71,7 +70,7 @@ const resolveDownload = async (
     await fs.move(dir, downloadDir, { overwrite: true });
     fs.removeSync(tmp);
 
-    meta = getBlockletMeta(downloadDir, { ensureMain: true });
+    meta = getBlockletMeta(downloadDir);
     const { did, name, version } = meta;
 
     // validate
@@ -79,7 +78,6 @@ const resolveDownload = async (
       logger.error('Meta has differences', { originalMeta, meta });
       throw new Error('There are differences between the meta from tarball file and the original meta');
     }
-    await validateBlockletEntry(downloadDir, meta);
 
     if (typeof onProgress === 'function') {
       onProgress({ name: 'blocklet.zip' });
@@ -152,7 +150,7 @@ const resolveDiffDownload = async (
     };
     await walkDiff(diffDir);
     fs.removeSync(diffDir);
-    const meta = getBlockletMeta(downloadDir, { ensureMain: true });
+    const meta = getBlockletMeta(downloadDir);
 
     await ensureBlockletExpanded(meta, downloadDir);
 

package/lib/blocklet/manager/disk.js

@@ -41,12 +41,13 @@ const {
   getRolesFromAuthConfig,
   isInProgress,
   isBeforeInstalled,
-  getComponentsInternalInfo,
   forEachComponentV2,
   forEachComponentV2Sync,
   findComponentByIdV2,
   isGatewayBlocklet,
+  hasStartEngine,
 } = require('@blocklet/meta/lib/util');
+const { getComponentsInternalInfo } = require('@blocklet/meta/lib/blocklet');
 const { update: updateMetaFile } = require('@blocklet/meta/lib/file');
 const { titleSchema, updateMountPointSchema, environmentNameSchema } = require('@blocklet/meta/lib/schema');
 const { emailConfigSchema } = require('@blocklet/sdk/lib/validators/email');
@@ -383,7 +384,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     logger.info('dev component', { folder, rootDid, mountPoint });
 
     const meta = getBlockletMeta(folder, { defaultStoreUrl });
-    if (meta.group !== 'static' && (!meta.scripts || !meta.scripts.dev)) {
+    if (meta.group !== 'static' && hasStartEngine(meta) && (!meta.scripts || !meta.scripts.dev)) {
       throw new Error('Incorrect blocklet.yml: missing `scripts.dev` field');
     }
 
@@ -522,6 +523,7 @@ class DiskBlockletManager extends BaseBlockletManager {
 
       if (checkHealthImmediately) {
         await this._onCheckIfStarted(params, { throwOnError });
+        blocklet.status = BlockletStatus.running;
       } else {
         this.startQueue.push({
           entity: 'blocklet',
@@ -613,6 +615,13 @@ class DiskBlockletManager extends BaseBlockletManager {
       // send notification to wallet
       this.emit(BlockletEvents.stopped, { ...res, componentDids });
 
+      this.emit(BlockletInternalEvents.componentStopped, {
+        appDid: blocklet.appDid,
+        components: componentDids?.length
+          ? 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),
@@ -939,6 +948,11 @@ class DiskBlockletManager extends BaseBlockletManager {
       componentDids: [child.meta.did],
     });
 
+    this.emit(BlockletInternalEvents.componentRemoved, {
+      appDid: blocklet.appDid,
+      components: [{ did: child.meta.did }],
+    });
+    // for backward compatibility
     this.emit(BlockletInternalEvents.componentsUpdated, {
       appDid: blocklet.appDid,
       components: getComponentsInternalInfo(newBlocklet),
@@ -1395,6 +1409,11 @@ class DiskBlockletManager extends BaseBlockletManager {
     await states.blocklet.updateBlocklet(rootDid, { mountPoint: blocklet.mountPoint, children: blocklet.children });
 
     this.emit(BlockletEvents.upgraded, { blocklet, context: { ...context, createAuditLog: false } }); // trigger router refresh
+    this.emit(BlockletInternalEvents.componentUpdated, {
+      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),
@@ -1514,6 +1533,10 @@ class DiskBlockletManager extends BaseBlockletManager {
           return;
         }
 
+        if (!hasStartEngine(component.meta)) {
+          return;
+        }
+
         try {
           const status = await getProcessState(component.env.processId);
           const oldStatus = component.status;
@@ -2044,6 +2067,11 @@ class DiskBlockletManager extends BaseBlockletManager {
 
       const res = await this.getBlocklet(did);
 
+      this.emit(BlockletInternalEvents.componentStarted, {
+        appDid: blocklet.appDid,
+        components: (componentDids || []).map((x) => ({ did: x })),
+      });
+      // for backward compatibility
       this.emit(BlockletInternalEvents.componentsUpdated, {
         appDid: blocklet.appDid,
         components: getComponentsInternalInfo(res),
@@ -2051,11 +2079,14 @@ class DiskBlockletManager extends BaseBlockletManager {
 
       this.emit(BlockletEvents.statusChange, res);
       this.emit(BlockletEvents.started, { ...res, componentDids });
+
+      const componentNames = getComponentNamesWithVersion(blocklet, componentDids);
+      const description = componentNames
+        ? `${getComponentNamesWithVersion(blocklet, componentDids)} is successfully started for ${blocklet.meta.title}.`
+        : `${blocklet.meta.title} is successfully started`;
       this._createNotification(did, {
         title: '',
-        description: `${getComponentNamesWithVersion(blocklet, componentDids)} is successfully started for ${
-          blocklet.meta.title
-        }.`,
+        description,
         entityType: 'blocklet',
         entityId: did,
         severity: 'success',
@@ -2074,9 +2105,10 @@ class DiskBlockletManager extends BaseBlockletManager {
       await this.deleteProcess({ did, componentDids }, context);
       const doc = await states.blocklet.setBlockletStatus(did, BlockletStatus.error, { componentDids });
 
-      const description = `${getComponentNamesWithVersion(blocklet, componentDids)} start failed for ${title}: ${
-        error.message
-      }`;
+      const componentNames = getComponentNamesWithVersion(blocklet, componentDids);
+      const description = componentNames
+        ? `${getComponentNamesWithVersion(blocklet, componentDids)} start failed for ${title}: ${error.message}`
+        : `${blocklet.meta.title} start failed: ${error.message}`;
 
       this._createNotification(did, {
         title: '',
@@ -2671,7 +2703,6 @@ class DiskBlockletManager extends BaseBlockletManager {
       logger.info('updated blocklet for upgrading', { did, version, source, name });
 
       if (oldBlocklet.status === BlockletStatus.running) {
-        // start new process
         try {
           await this.start({ did, componentDids }, context);
           logger.info('started blocklet for upgrading', { did, version, componentDids });
@@ -2723,6 +2754,18 @@ class DiskBlockletManager extends BaseBlockletManager {
 
       await this._rollbackCache.remove({ did: blocklet.meta.did });
 
+      if (oldBlocklet.status === BlockletStatus.running) {
+        this.emit(
+          action === INSTALL_ACTIONS.INSTALL_COMPONENT
+            ? BlockletInternalEvents.componentInstalled
+            : BlockletInternalEvents.componentUpgraded,
+          {
+            appDid: blocklet.appDid,
+            components: getComponentsInternalInfo(blocklet).filter((c) => componentDids.includes(c.did)),
+          }
+        );
+      }
+      // for backward compatibility
       this.emit(BlockletInternalEvents.componentsUpdated, {
         appDid: blocklet.appDid,
         components: getComponentsInternalInfo(blocklet),

package/lib/blocklet/manager/helper/install-component-from-upload.js

@@ -92,15 +92,20 @@ const installComponentFromUpload = async ({
   if (index >= 0) {
     // if upgrade, do not update mountPoint
     newChild.mountPoint = newBlocklet.children[index].mountPoint;
+    newChild.installedAt = newBlocklet.children[index].installedAt || new Date();
     newBlocklet.children.splice(index, 1, newChild);
   } else {
+    newChild.installedAt = new Date();
     newBlocklet.children.push(newChild);
   }
 
   const action = index >= 0 ? INSTALL_ACTIONS.UPGRADE_COMPONENT : INSTALL_ACTIONS.INSTALL_COMPONENT;
 
   const { dynamicComponents } = await parseComponents(newChild);
-  const newChildren = filterDuplicateComponents(dynamicComponents, newBlocklet.children);
+  const newChildren = filterDuplicateComponents(dynamicComponents, newBlocklet.children).map((x) => ({
+    ...x,
+    installedAt: new Date(),
+  }));
 
   newBlocklet.children.push(...newChildren);
 

package/lib/blocklet/storage/backup/spaces.js

@@ -215,6 +215,12 @@ class SpacesBackup extends BaseBackup {
           return object.name !== '.DS_Store';
         },
         onAfterUpload: async (data) => {
+          // @note: 当备份失败时 && 偶然会存在一些其他的备份请求后来发送成功了，此时会造成备份进度紊乱(明明失败了，错误信息显示上传某个文件成功了)的情况，所以失败的备份不需要再发送事件了
+          const currentBackup = await states.backup.findOne({ id: this.input.backup.id });
+          if (currentBackup.status === 1) {
+            return;
+          }
+
           logger.info('backup progress', { appDid: this.input.appDid, data });
           const percent = (data.completed * 100) / data.total;
           // 0.8 是因为上传文件到 spaces 占进度的 80%，+ 20 是因为需要累加之前的进度
@@ -225,7 +231,6 @@ class SpacesBackup extends BaseBackup {
             progress,
             message: progressMessage,
           });
-
           this.input.event.emit(BlockletEvents.backupProgress, {
             appDid: this.input.appDid,
             meta: { did: this.input.appDid },

package/lib/monitor/blocklet-runtime-monitor.js

@@ -2,10 +2,10 @@ const EventEmitter = require('events');
 
 const cloneDeep = require('lodash/cloneDeep');
 const pLimit = require('p-limit');
-const { forEachBlocklet } = require('@blocklet/meta/lib/util');
+const { forEachBlocklet, isGatewayBlocklet, hasStartEngine } = require('@blocklet/meta/lib/util');
 const getComponentProcessId = require('@blocklet/meta/lib/get-component-process-id');
 const { EVENTS } = require('@abtnode/constant');
-const { BlockletStatus, BlockletGroup } = require('@blocklet/constant');
+const { BlockletStatus } = require('@blocklet/constant');
 const defaultLogger = require('@abtnode/logger')('blocklet-runtime-monitor');
 
 const { getRuntimeInfo } = require('../util/blocklet');
@@ -109,7 +109,8 @@ class BlockletRuntimeMonitor extends EventEmitter {
     await forEachBlocklet(
       blocklet,
       async (component, { id: componentId, ancestors }) => {
-        if (component.meta.group !== BlockletGroup.gateway && component.status === BlockletStatus.running) {
+        const { meta } = component;
+        if (!isGatewayBlocklet(meta) && hasStartEngine(meta) && component.status === BlockletStatus.running) {
           const processId = getComponentProcessId(component, ancestors);
           try {
             const runtimeInfo = await getRuntimeInfo(processId);

package/lib/router/index.js

@@ -199,6 +199,7 @@ Router.formatSites = (sites = []) => {
       site.rules.push({
         dynamic: true,
         from: {
+          root: true,
           pathPrefix: '/',
           groupPathPrefix: '/',
           pathSuffix: '/(robots.txt|sitemap.xml)',

package/lib/router/manager.js

@@ -30,7 +30,7 @@ const {
   BLOCKLET_INTERFACE_TYPE_WEB,
   BlockletGroup,
 } = require('@blocklet/constant');
-const { forEachChildSync } = require('@blocklet/meta/lib/util');
+const { forEachChildSync, hasStartEngine, isGatewayBlocklet } = require('@blocklet/meta/lib/util');
 
 const {
   validateAddSite,
@@ -625,7 +625,8 @@ class RouterManager extends EventEmitter {
     }
 
     forEachChildSync(blocklet, (component, { id, ancestors }) => {
-      if (component.meta.group === BlockletGroup.gateway) {
+      const { meta } = component;
+      if (isGatewayBlocklet(meta) || !hasStartEngine(meta)) {
         return;
       }
 

package/lib/states/blocklet.js

@@ -249,6 +249,9 @@ class BlockletState extends BaseState {
       const ports = await this.getBlockletPorts({ interfaces: sanitized.interfaces || [] });
       const children = await this.fillChildrenPorts(rawChildren, { defaultPort: getMaxPort(ports) });
       fixChildren(children);
+      children.forEach((x) => {
+        x.installedAt = new Date();
+      });
 
       // add to db
       doc = await this.insert({
@@ -646,6 +649,7 @@ class BlockletState extends BaseState {
         mode,
         status: BlockletStatus.added,
         children: child.children,
+        installedAt: new Date(),
       });
 
       fixChildren(newChildren);

package/lib/util/blocklet.js

@@ -28,7 +28,6 @@ const sleep = require('@abtnode/util/lib/sleep');
 const getPm2ProcessInfo = require('@abtnode/util/lib/get-pm2-process-info');
 const { formatEnv } = require('@abtnode/util/lib/security');
 const ensureEndpointHealthy = require('@abtnode/util/lib/ensure-endpoint-healthy');
-const CustomError = require('@abtnode/util/lib/custom-error');
 const getFolderSize = require('@abtnode/util/lib/get-folder-size');
 const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 const hashFiles = require('@abtnode/util/lib/hash-files');
@@ -51,6 +50,7 @@ const {
 } = require('@blocklet/resolver');
 const formatBackSlash = require('@abtnode/util/lib/format-back-slash');
 const { isPortsOccupiedByOtherProcess, killProcessOccupiedPorts } = require('@abtnode/util/lib/port');
+const { getComponentApiKey } = require('@abtnode/util/lib/blocklet');
 const { toSvg: createDidLogo } =
   process.env.NODE_ENV !== 'test' ? require('@arcblock/did-motif') : require('@arcblock/did-motif/dist/did-motif.cjs');
 const { createBlockiesSvg } = require('@blocklet/meta/lib/blockies');
@@ -61,7 +61,6 @@ const {
   BlockletStatus,
   BlockletSource,
   BlockletGroup,
-  BLOCKLET_GROUPS,
   BLOCKLET_MODES,
   BLOCKLET_BUNDLE_FILE,
   BLOCKLET_ENTRY_FILE,
@@ -88,11 +87,12 @@ const {
   getComponentName,
   isEnvShareable,
   getBlockletAppIdList,
-  isBeforeInstalled,
   getChainInfo,
   isInProgress,
   isRunning,
+  hasStartEngine,
 } = require('@blocklet/meta/lib/util');
+const { getComponentsInternalInfo } = require('@blocklet/meta/lib/blocklet');
 const { titleSchema, descriptionSchema, logoSchema } = require('@blocklet/meta/lib/schema');
 const { getBlockletMetaFromUrl } = require('@blocklet/meta/lib/util-meta');
 const getComponentProcessId = require('@blocklet/meta/lib/get-component-process-id');
@@ -141,47 +141,20 @@ const PRIVATE_NODE_ENVS = [
 ];
 
 /**
- * @returns { dataDir, logsDir, cacheDir, appMain, appDir, mainDir, appCwd }
+ * @returns { dataDir, logsDir, cacheDir, appDir }
  * dataDir: dataDirs.data/name (root component) or dataDirs.data/name/childName (child component)
  * logsDir: dataDirs.log/name
  * cacheDir: dataDirs.cache/name (root component) or dataDirs.cache/name/childName (child component)
  * appDir: component bundle dir
- * mainDir: appDir (dapp) or appDir/main (static). Used for for static component
- * appMain: app entry file or script (run appMain to start component process)
- * appCwd: cwd of appMain
  */
-const getComponentDirs = (
-  component,
-  { dataDirs, ensure = false, e2eMode = false, validate = false, ancestors = [] } = {}
-) => {
-  // FIXME 这个函数做了太多的事
-  // get data dirs
-
+const getComponentDirs = (component, { dataDirs, ensure = false, ancestors = [] } = {}) => {
   const componentName = getComponentName(component, ancestors);
 
   const logsDir = path.join(dataDirs.logs, componentName);
   const dataDir = path.join(dataDirs.data, componentName);
   const cacheDir = path.join(dataDirs.cache, componentName);
 
-  // get app dirs
-
-  const { main, group } = component.meta;
-
-  let startFromDevEntry = '';
-  if (component.mode === BLOCKLET_MODES.DEVELOPMENT && component.meta.scripts) {
-    startFromDevEntry = component.meta.scripts.dev;
-    if (e2eMode && component.meta.scripts.e2eDev) {
-      startFromDevEntry = component.meta.scripts.e2eDev;
-    }
-  }
-
-  if (validate && !main && !startFromDevEntry && group !== BlockletGroup.gateway) {
-    throw new Error('Incorrect blocklet.yml: missing `main` field');
-  }
-
   let appDir = null;
-  let mainDir = null;
-
   if (component.source === BlockletSource.local) {
     appDir = component.deployedFrom;
   } else {
@@ -203,37 +176,57 @@ const getComponentDirs = (
     }
   }
 
-  mainDir = appDir;
+  return { dataDir, logsDir, cacheDir, appDir };
+};
 
-  if (validate && !startFromDevEntry && !isBeforeInstalled(component.status)) {
-    try {
-      validateBlockletEntry(appDir, component.meta);
-    } catch (err) {
-      throw new CustomError('BLOCKLET_CORRUPTED', err.message);
-    }
+/**
+ * @returns { cwd, script, args, environmentObj, interpreter, interpreterArgs }
+ */
+const getComponentStartEngine = (component, { e2eMode = false } = {}) => {
+  if (!hasStartEngine(component.meta)) {
+    return {};
   }
 
-  if (validate && !BLOCKLET_GROUPS.includes(group)) {
-    throw new CustomError('BLOCKLET_CORRUPTED', `Unsupported blocklet type ${group}`);
+  const { appDir } = component.env;
+
+  const cwd = appDir;
+
+  // get app dirs
+  const { main, group } = component.meta;
+
+  let startFromDevEntry = '';
+  if (component.mode === BLOCKLET_MODES.DEVELOPMENT && component.meta.scripts) {
+    startFromDevEntry = component.meta.scripts.dev;
+    if (e2eMode && component.meta.scripts.e2eDev) {
+      startFromDevEntry = component.meta.scripts.e2eDev;
+    }
   }
 
-  let appMain = null;
-  let appCwd = null;
+  const blockletEngineInfo = getBlockletEngine(component.meta);
+
+  let script = null;
+  let interpreter = '';
+  let interpreterArgs = '';
+  const environmentObj = {};
+  let args = [];
+
   if (startFromDevEntry) {
-    appMain = startFromDevEntry;
-    appCwd = appDir;
+    script = startFromDevEntry;
   } else if (group === 'dapp') {
-    appMain = getBlockletEngine(component.meta).script || BLOCKLET_ENTRY_FILE;
-    appCwd = appDir;
+    script = blockletEngineInfo.script || BLOCKLET_ENTRY_FILE;
+    args = blockletEngineInfo.args || [];
   } else if (group === 'static') {
-    mainDir = path.join(appDir, main);
+    script = require.resolve('@abtnode/static-server');
+    environmentObj.BLOCKLET_MAIN_DIR = path.join(appDir, main);
+  }
 
-    // We use the same start script for all static blocklets
-    appMain = require.resolve('@abtnode/static-server');
-    appCwd = path.resolve(appMain, '../../');
+  if (component.mode !== BLOCKLET_MODES.DEVELOPMENT) {
+    const engine = getEngine(blockletEngineInfo.interpreter);
+    interpreter = engine.interpreter === 'node' ? '' : engine.interpreter;
+    interpreterArgs = engine.args || '';
   }
 
-  return { dataDir, logsDir, cacheDir, appMain, appDir, mainDir, appCwd };
+  return { cwd, script, args, environmentObj, interpreter, interpreterArgs };
 };
 
 /**
@@ -372,7 +365,6 @@ const getComponentSystemEnvironments = (blocklet) => {
     BLOCKLET_LOG_DIR: blocklet.env.logsDir,
     BLOCKLET_CACHE_DIR: blocklet.env.cacheDir,
     BLOCKLET_APP_DIR: blocklet.env.appDir,
-    BLOCKLET_MAIN_DIR: blocklet.env.mainDir,
     ...portEnvironments,
   };
 };
@@ -409,22 +401,7 @@ const getRuntimeEnvironments = (blocklet, nodeEnvironments, ancestors) => {
     }
   });
 
-  const mountPoints = [];
-  for (const x of root.children || []) {
-    const mountPoint = {
-      title: x.meta.title,
-      did: x.meta.bundleDid,
-      name: x.meta.bundleName,
-      mountPoint: x.mountPoint || '',
-    };
-
-    const webInterface = findWebInterface(x);
-    if (webInterface && x.environmentObj[webInterface.port]) {
-      mountPoint.port = x.environmentObj[webInterface.port];
-    }
-
-    mountPoints.push(mountPoint);
-  }
+  const componentsInternalInfo = getComponentsInternalInfo(root);
 
   // use index 1 as the path to derive deterministic encryption key for blocklet
   const tmp = get(nodeEnvironments, 'ABT_NODE_SK')
@@ -433,17 +410,24 @@ const getRuntimeEnvironments = (blocklet, nodeEnvironments, ancestors) => {
 
   const BLOCKLET_APP_IDS = getBlockletAppIdList(root).join(',');
 
+  const componentApiKey = getComponentApiKey({
+    serverSk: nodeEnvironments.ABT_NODE_SK,
+    app: root,
+    component: blocklet,
+  });
+
   const env = {
     ...blocklet.configObj,
     ...getSharedConfigObj(blocklet, ancestors),
     ...blocklet.environmentObj,
     ...devEnvironments,
     BLOCKLET_WEB_PORTS: JSON.stringify(ports),
-    BLOCKLET_MOUNT_POINTS: JSON.stringify(mountPoints),
+    BLOCKLET_MOUNT_POINTS: JSON.stringify(componentsInternalInfo),
     BLOCKLET_MODE: blocklet.mode || BLOCKLET_MODES.PRODUCTION,
     BLOCKLET_APP_EK: tmp?.secretKey,
     BLOCKLET_APP_VERSION: root.meta.version,
     BLOCKLET_APP_IDS,
+    BLOCKLET_COMPONENT_API_KEY: componentApiKey,
     ...nodeEnvironments,
     ...safeNodeEnvironments,
   };
@@ -513,6 +497,8 @@ const startBlockletProcess = async (
     throw new Error('blocklet should not be empty');
   }
 
+  const now = Date.now();
+
   await forEachBlocklet(
     blocklet,
     async (b, { ancestors }) => {
@@ -520,7 +506,11 @@ const startBlockletProcess = async (
         return;
       }
 
-      const { appMain, processId, appCwd, logsDir } = b.env;
+      if (!hasStartEngine(b.meta)) {
+        return;
+      }
+
+      const { processId, logsDir, appDir } = b.env;
 
       if (skippedProcessIds.includes(processId)) {
         logger.info(`skip start skipped process ${processId}`);
@@ -532,6 +522,14 @@ const startBlockletProcess = async (
         return;
       }
 
+      if (b.mode !== BLOCKLET_MODES.DEVELOPMENT) {
+        validateBlockletEntry(appDir, b.meta);
+      }
+
+      const { cwd, script, args, environmentObj, interpreter, interpreterArgs } = getComponentStartEngine(b, {
+        e2eMode,
+      });
+
       // get env
       const env = getRuntimeEnvironments(b, nodeEnvironments, ancestors);
       const startedAt = Date.now();
@@ -553,7 +551,7 @@ const startBlockletProcess = async (
       const options = {
         namespace: 'blocklets',
         name: processId,
-        cwd: appCwd,
+        cwd,
         // FIXME @linchen [] does not work, so use () here
         log_date_format: '(YYYY-MM-DD HH:mm:ss)',
         output: path.join(logsDir, 'output.log'),
@@ -563,9 +561,15 @@ const startBlockletProcess = async (
         max_memory_restart: `${maxMemoryRestart}M`,
         max_restarts: b.mode === BLOCKLET_MODES.DEVELOPMENT ? 0 : 3,
         env: {
+          ...environmentObj,
           ...env,
           NODE_ENV: 'production',
+          BLOCKLET_START_AT: now,
         },
+        script,
+        args,
+        interpreter,
+        interpreterArgs,
       };
 
       const clusterMode = get(b.meta, 'capabilities.clusterMode', false);
@@ -580,10 +584,9 @@ const startBlockletProcess = async (
         options.env.NODE_ENV = e2eMode ? 'e2e' : 'development';
         options.env.BROWSER = 'none';
         options.env.PORT = options.env[BLOCKLET_DEFAULT_PORT_NAME];
-        options.script = appMain;
 
         if (process.platform === 'win32') {
-          const [cmd, ...args] = options.script.split(' ').filter(Boolean);
+          const [cmd, ...argList] = options.script.split(' ').filter(Boolean);
 
           if (!SCRIPT_ENGINES_WHITE_LIST.includes(cmd)) {
             throw new Error(`${cmd} script is not supported, ${SCRIPT_ENGINES_WHITE_LIST.join(', ')} are supported`);
@@ -597,16 +600,8 @@ const startBlockletProcess = async (
           const cmdBinPath = pkg.bin[cmd];
 
           options.script = path.resolve(cmdPath, cmdBinPath);
-          options.args = [...args].join(' ');
+          options.args = [...argList].join(' ');
         }
-      } else {
-        const blockletEngineInfo = getBlockletEngine(b.meta);
-        options.args = blockletEngineInfo.args || [];
-
-        const engine = getEngine(blockletEngineInfo.interpreter);
-        options.interpreter = engine.interpreter === 'node' ? '' : engine.interpreter;
-        options.interpreterArgs = engine.args || '';
-        options.script = blockletEngineInfo.script || appMain;
       }
 
       await pm2.startAsync(options);
@@ -657,6 +652,10 @@ const deleteBlockletProcess = async (blocklet, { preDelete = noop, skippedProces
         return;
       }
 
+      if (!hasStartEngine(b.meta)) {
+        return;
+      }
+
       await preDelete(b, { ancestors });
       await deleteProcess(b.env.processId);
     },
@@ -732,7 +731,7 @@ const reloadProcess = (processId) =>
   });
 
 const validateBlocklet = (blocklet) =>
-  forEachBlocklet(blocklet, (b) => {
+  forEachComponentV2(blocklet, (b) => {
     isRequirementsSatisfied(b.meta.requirements);
     validateEngine(getBlockletEngineNameByPlatform(b.meta));
   });
@@ -760,6 +759,10 @@ const checkBlockletProcessHealthy = async (blocklet, { minConsecutiveTime, timeo
         return;
       }
 
+      if (!hasStartEngine(b.meta)) {
+        return;
+      }
+
       if (shouldSkipComponent(b.meta.did, componentDids)) {
         logger.info('skip check component healthy not selected', { id: b.env.id, processId: b.env.processId });
         return;
@@ -1270,7 +1273,6 @@ const getBlocklet = async ({
       ...getComponentDirs(component, {
         dataDirs,
         ensure: ensureIntegrity,
-        validate: ensureIntegrity,
         ancestors,
         e2eMode: level === 0 ? e2eMode : false,
       }),

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.15-beta-d8e7b6c0",
+  "version": "1.16.15-beta-9318a201",
   "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.15-beta-d8e7b6c0",
-    "@abtnode/auth": "1.16.15-beta-d8e7b6c0",
-    "@abtnode/certificate-manager": "1.16.15-beta-d8e7b6c0",
-    "@abtnode/constant": "1.16.15-beta-d8e7b6c0",
-    "@abtnode/cron": "1.16.15-beta-d8e7b6c0",
-    "@abtnode/logger": "1.16.15-beta-d8e7b6c0",
-    "@abtnode/models": "1.16.15-beta-d8e7b6c0",
-    "@abtnode/queue": "1.16.15-beta-d8e7b6c0",
-    "@abtnode/rbac": "1.16.15-beta-d8e7b6c0",
-    "@abtnode/router-provider": "1.16.15-beta-d8e7b6c0",
-    "@abtnode/static-server": "1.16.15-beta-d8e7b6c0",
-    "@abtnode/timemachine": "1.16.15-beta-d8e7b6c0",
-    "@abtnode/util": "1.16.15-beta-d8e7b6c0",
+    "@abtnode/analytics": "1.16.15-beta-9318a201",
+    "@abtnode/auth": "1.16.15-beta-9318a201",
+    "@abtnode/certificate-manager": "1.16.15-beta-9318a201",
+    "@abtnode/constant": "1.16.15-beta-9318a201",
+    "@abtnode/cron": "1.16.15-beta-9318a201",
+    "@abtnode/logger": "1.16.15-beta-9318a201",
+    "@abtnode/models": "1.16.15-beta-9318a201",
+    "@abtnode/queue": "1.16.15-beta-9318a201",
+    "@abtnode/rbac": "1.16.15-beta-9318a201",
+    "@abtnode/router-provider": "1.16.15-beta-9318a201",
+    "@abtnode/static-server": "1.16.15-beta-9318a201",
+    "@abtnode/timemachine": "1.16.15-beta-9318a201",
+    "@abtnode/util": "1.16.15-beta-9318a201",
     "@arcblock/did": "1.18.89",
     "@arcblock/did-auth": "1.18.89",
     "@arcblock/did-ext": "^1.18.89",
@@ -42,11 +42,11 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.89",
     "@arcblock/vc": "1.18.89",
-    "@blocklet/constant": "1.16.15-beta-d8e7b6c0",
-    "@blocklet/meta": "1.16.15-beta-d8e7b6c0",
-    "@blocklet/resolver": "1.16.15-beta-d8e7b6c0",
-    "@blocklet/sdk": "1.16.15-beta-d8e7b6c0",
-    "@did-space/client": "^0.2.141",
+    "@blocklet/constant": "1.16.15-beta-9318a201",
+    "@blocklet/meta": "1.16.15-beta-9318a201",
+    "@blocklet/resolver": "1.16.15-beta-9318a201",
+    "@blocklet/sdk": "1.16.15-beta-9318a201",
+    "@did-space/client": "^0.2.163",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.89",
     "@ocap/util": "1.18.89",
@@ -98,5 +98,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "87ebe2e8267e634e2217d7ca28231d0b01636ae6"
+  "gitHead": "f3722cbd4fe10c5fa083cad7e859ecff6095060d"
 }