@abtnode/core 1.16.13-beta-55b3e93d → 1.16.13-beta-423a40b1

package/lib/api/team.js

@@ -340,6 +340,7 @@ class TeamAPI extends EventEmitter {
     logger.info('user approval updated successfully', { teamDid, userDid: user.did, approved: user.approved });
 
     this.emit(EVENTS.USER_UPDATED, { teamDid, user: doc2 });
+    this.emit(EVENTS.USER_PERMISSION_UPDATED, { teamDid, user: doc2 });
 
     return doc2;
   }
@@ -442,6 +443,7 @@ class TeamAPI extends EventEmitter {
     logger.info('user passport revoked successfully', { teamDid, userDid, passportId });
 
     this.emit(EVENTS.USER_UPDATED, { teamDid, user: doc });
+    this.emit(EVENTS.USER_PERMISSION_UPDATED, { teamDid, user: doc });
 
     return doc;
   }
@@ -458,6 +460,7 @@ class TeamAPI extends EventEmitter {
     logger.info('user passport enabled successfully', { teamDid, userDid, passportId });
 
     this.emit(EVENTS.USER_UPDATED, { teamDid, user: doc });
+    this.emit(EVENTS.USER_PERMISSION_UPDATED, { teamDid, user: doc });
 
     return doc;
   }

package/lib/blocklet/hooks.js

@@ -30,7 +30,7 @@ const runUserHook = async (label, hookName, args) => {
     // FIXME @linchen timeout 应该动态设置或不设置
     await runScript(hook, [label, hookName].join(':'), {
       cwd: appDir,
-      env: getSafeEnv(env),
+      env: { ...getSafeEnv(env), BLOCKLET_HOOK_NAME: hookName },
       silent,
       output: outputFile,
       error: errorFile,

package/lib/blocklet/manager/disk.js

@@ -9,6 +9,7 @@ const omit = require('lodash/omit');
 const merge = require('lodash/merge');
 const pick = require('lodash/pick');
 const isEmpty = require('lodash/isEmpty');
+const cloneDeep = require('lodash/cloneDeep');
 const { isNFTExpired, getNftExpirationDate } = require('@abtnode/util/lib/nft');
 const didDocument = require('@abtnode/util/lib/did-document');
 const { sign } = require('@arcblock/jwt');
@@ -142,6 +143,7 @@ const RollbackCache = require('./helper/rollback-cache');
 const { migrateApplicationToStructV2 } = require('./helper/migrate-application-to-struct-v2');
 const { getBackupFilesUrlFromEndpoint, getBackupEndpoint, getSpaceNameByEndpoint } = require('../../util/spaces');
 const { validateAddSpaceGateway, validateUpdateSpaceGateway } = require('../../validators/space-gateway');
+const { sessionConfigSchema } = require('../../validators/util');
 
 const { formatEnvironments, getBlockletMeta, validateOwner } = util;
 
@@ -539,7 +541,7 @@ class BlockletManager extends BaseBlockletManager {
           entity: 'blocklet',
           action: 'check_if_started',
           ...params,
-          id: did,
+          id: `${did}/${(componentDids || []).join(',')}`,
         });
       }
 
@@ -701,7 +703,7 @@ class BlockletManager extends BaseBlockletManager {
     const ticket = this.startQueue.push({
       entity: 'blocklet',
       action: 'restart',
-      id: did,
+      id: `${did}/${(componentDids || []).join(',')}`,
       did,
       componentDids,
       context,
@@ -1385,6 +1387,27 @@ class BlockletManager extends BaseBlockletManager {
     return this.getBlocklet(rootDid);
   }
 
+  async updateAppSessionConfig({ did, config }) {
+    const validateConfig = await sessionConfigSchema.validateAsync(config);
+
+    const blocklet = await this.getBlocklet(did);
+    if (!blocklet) {
+      throw new Error('blocklet does not exist');
+    }
+
+    const sessionConfig = cloneDeep(blocklet.settings.session || {});
+
+    sessionConfig.cacheTtl = validateConfig.cacheTtl;
+    sessionConfig.ttl = validateConfig.ttl;
+
+    await states.blockletExtras.setSettings(blocklet.meta.did, { session: sessionConfig });
+
+    const newState = await this.getBlocklet(did);
+    this.emit(BlockletEvents.updated, newState);
+
+    return newState;
+  }
+
   // eslint-disable-next-line no-unused-vars
   async getRuntimeHistory({ did, hours }, context) {
     const metaDid = await states.blocklet.getBlockletMetaDid(did);
@@ -1944,7 +1967,8 @@ class BlockletManager extends BaseBlockletManager {
   }
 
   async _onCheckIfStarted(jobInfo, { throwOnError } = {}) {
-    const { did, context, minConsecutiveTime = 5000, timeout, componentDids } = jobInfo;
+    const startedAt = Date.now();
+    const { did, context, minConsecutiveTime = 2000, timeout, componentDids } = jobInfo;
     const blocklet = await this.getBlocklet(did);
 
     const { meta } = blocklet;
@@ -1965,6 +1989,7 @@ class BlockletManager extends BaseBlockletManager {
       });
 
       this.emit(BlockletEvents.started, res);
+      logger.info('blocklet healthy', { did, name, time: Date.now() - startedAt });
     } catch (error) {
       const status = await states.blocklet.getBlockletStatus(did);
       if ([BlockletStatus.stopping, BlockletStatus.stopped].includes(status)) {
@@ -1974,7 +1999,7 @@ class BlockletManager extends BaseBlockletManager {
 
       logger.error('check blocklet if started failed', { did, name, context, timeout, error });
 
-      await this.deleteProcess({ did }, context);
+      await this.deleteProcess({ did, componentDids }, context);
       await states.blocklet.setBlockletStatus(did, BlockletStatus.error, { componentDids });
 
       this._createNotification(did, {

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

@@ -145,6 +145,9 @@ const installApplicationFromBackup = async ({
       extra.controller = controller;
     }
 
+    // 在旧版本中安装的 Blocklet 不存在 extra.meta 字段，这里补充一下
+    extra.meta = extra.meta || { did, name: appName };
+
     await states.blockletExtras.insert(extra);
     logger.info('blocklet extra is copied successfully');
 

package/lib/event.js

@@ -105,6 +105,7 @@ module.exports = ({
 
   // Emit events to node listener
   // Call eventHandler
+  // NOT emit events to event hub
   const onInternalEvent = (name, data) => {
     events.emit(name, data);
     if (typeof eventHandler === 'function') {
@@ -421,6 +422,7 @@ module.exports = ({
   listen(teamAPI, EVENTS.USER_ADDED, onEvent);
   listen(teamAPI, EVENTS.USER_REMOVED, onEvent);
   listen(teamAPI, EVENTS.USER_UPDATED, onEvent);
+  listen(teamAPI, EVENTS.USER_PERMISSION_UPDATED, onEvent);
   listen(teamAPI, BlockletEvents.updated, onEvent);
   listen(teamManager, BlockletEvents.storeChange, onEvent);
 

package/lib/index.js

@@ -1,5 +1,6 @@
 const fs = require('fs');
 const path = require('path');
+const uniq = require('lodash/uniq');
 const md5 = require('@abtnode/util/lib/md5');
 const formatContext = require('@abtnode/util/lib/format-context');
 const Cron = require('@abtnode/cron');
@@ -259,6 +260,7 @@ function ABTNode(options) {
     configOAuth: blockletManager.configOAuth.bind(blockletManager),
     configNotification: blockletManager.configNotification.bind(blockletManager),
     updateWhoCanAccess: blockletManager.updateWhoCanAccess.bind(blockletManager),
+    updateAppSessionConfig: blockletManager.updateAppSessionConfig.bind(blockletManager),
     updateComponentTitle: blockletManager.updateComponentTitle.bind(blockletManager),
     updateComponentMountPoint: blockletManager.updateComponentMountPoint.bind(blockletManager),
     backupBlocklet: blockletManager.backup.bind(blockletManager),
@@ -390,7 +392,24 @@ function ABTNode(options) {
 
     // AuditLog
     createAuditLog: (params) => states.auditLog.create(params, instance),
-    getAuditLogs: states.auditLog.findPaginated.bind(states.auditLog),
+    getAuditLogs: async (params) => {
+      if (params.scope) {
+        const blocklet = await states.blocklet.getBlocklet(params.scope);
+        if (blocklet) {
+          params.scope = uniq(
+            [
+              params.scope,
+              blocklet.appDid,
+              blocklet.appPid,
+              blocklet.structV1Did,
+              ...blocklet.migratedFrom.map((x) => x.appDid),
+            ].filter(Boolean)
+          );
+        }
+      }
+
+      return states.auditLog.findPaginated.call(states.auditLog, params);
+    },
 
     // Routing
     routerManager,

package/lib/router/helper.js

@@ -3,13 +3,14 @@
 const fs = require('fs-extra');
 const path = require('path');
 const tar = require('tar');
+const UUID = require('uuid');
 const isUrl = require('is-url');
 const get = require('lodash/get');
 const cloneDeep = require('lodash/cloneDeep');
 const groupBy = require('lodash/groupBy');
 const isEqual = require('lodash/isEqual');
 const joinUrl = require('url-join');
-const { replaceSlotToIp, findComponentById, findWebInterface } = require('@blocklet/meta/lib/util');
+const { replaceSlotToIp, findComponentById, findWebInterface, getComponentId } = require('@blocklet/meta/lib/util');
 const { getProvider } = require('@abtnode/router-provider');
 const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 const getTmpDir = require('@abtnode/util/lib/get-tmp-directory');
@@ -488,6 +489,60 @@ const ensureBlockletWellknownRules = (sites, blocklets) => {
     .filter(Boolean);
 };
 
+// Expand component rules to blocklet rules
+const isComponentRule = (x) => x.to.type === ROUTING_RULE_TYPES.COMPONENT;
+const expandComponentRules = (sites = [], blocklets) => {
+  return sites
+    .map((site) => {
+      if (!site.domain.endsWith(BLOCKLET_SITE_GROUP_SUFFIX)) {
+        return site;
+      }
+
+      if (site.componentExpanded) {
+        return site;
+      }
+
+      const blocklet = blocklets.find((x) => x.meta.did === site.blockletDid);
+      const components = blocklet.children.filter((x) => x.mountPoint !== '/' && x.mode === BLOCKLET_MODES.PRODUCTION);
+      const expandedRules = [];
+
+      site.rules.filter(isComponentRule).forEach((baseRule) => {
+        components.forEach((x) => {
+          const newRule = {
+            id: UUID.v4(),
+            groupId: baseRule.groupId,
+            from: {
+              groupPathPrefix: '/',
+            },
+            to: {
+              type: ROUTING_RULE_TYPES.BLOCKLET,
+              componentId: getComponentId(x, [blocklet]),
+              interfaceName: BLOCKLET_INTERFACE_PUBLIC,
+              port: findInterfacePortByName(x, BLOCKLET_INTERFACE_PUBLIC),
+              did: blocklet.meta.did,
+              target: '/',
+            },
+          };
+
+          if (x.meta.did === baseRule.to.componentId) {
+            newRule.from.pathPrefix = baseRule.from.pathPrefix;
+            newRule.to.pageGroup = baseRule.to.pageGroup;
+          } else {
+            newRule.from.pathPrefix = joinUrl(baseRule.from.pathPrefix, x.mountPoint);
+          }
+
+          expandedRules.push(newRule);
+        });
+      });
+
+      site.rules = site.rules.filter((x) => !isComponentRule(x)).concat(expandedRules);
+      site.componentExpanded = true;
+
+      return site;
+    })
+    .filter(Boolean);
+};
+
 const ensureBlockletCache = (sites = [], blocklets) => {
   return sites
     .map((site) => {
@@ -545,12 +600,13 @@ const ensureLatestInfo = async (sites = [], { withDefaultCors = true } = {}) =>
   let result = await ensureLatestNodeInfo(sites, { withDefaultCors });
   result = await ensureBlockletDid(result);
   result = await filterSitesForRemovedBlocklets(sites, blocklets);
-  result = await ensureBlockletWellknownRules(result, blocklets);
   result = await ensureBlockletCache(result, blocklets);
   result = await ensureWellknownRule(result);
   result = await ensureCorsForWebWallet(result);
   result = await ensureCorsForDidSpace(result, blocklets);
   result = await ensureLatestInterfaceInfo(result);
+  result = await ensureBlockletWellknownRules(result, blocklets);
+  result = await expandComponentRules(result, blocklets);
 
   return result;
 };
@@ -1457,3 +1513,4 @@ module.exports.ensureLatestInterfaceInfo = ensureLatestInterfaceInfo;
 module.exports.ensureLatestInfo = ensureLatestInfo;
 module.exports.ensureWellknownRule = ensureWellknownRule;
 module.exports.ensureBlockletWellknownRules = ensureBlockletWellknownRules;
+module.exports.expandComponentRules = expandComponentRules;

package/lib/router/index.js

@@ -223,6 +223,7 @@ Router.formatSites = (sites = []) => {
           did: rule.to.did,
           componentId: rule.to.componentId,
           cacheGroup: site.mode === BLOCKLET_MODES.PRODUCTION ? 'blockletJs' : '',
+          pageGroup: rule.to.pageGroup,
         },
       });
       site.rules.push({
@@ -238,6 +239,7 @@ Router.formatSites = (sites = []) => {
           did: rule.to.did,
           componentId: rule.to.componentId,
           cacheGroup: site.mode === BLOCKLET_MODES.PRODUCTION ? 'blockletJs' : '',
+          pageGroup: rule.to.pageGroup,
         },
       });
     });
@@ -271,6 +273,7 @@ Router.formatSites = (sites = []) => {
             type: ROUTING_RULE_TYPES.DAEMON,
             port: daemonRule.to.port,
             cacheGroup: site.mode === BLOCKLET_MODES.PRODUCTION ? 'blockletJs' : '',
+            pageGroup: rule.to.pageGroup,
             did: rule.to.did,
           },
         });
@@ -287,6 +290,7 @@ Router.formatSites = (sites = []) => {
             type: ROUTING_RULE_TYPES.DAEMON,
             target: BLOCKLET_PROXY_PATH_PREFIX,
             cacheGroup: !isServiceFeDevelopment && site.mode === BLOCKLET_MODES.PRODUCTION ? 'blockletProxy' : '',
+            pageGroup: rule.to.pageGroup,
             did: rule.to.did,
           },
         });

package/lib/router/manager.js

@@ -598,30 +598,30 @@ class RouterManager extends EventEmitter {
 
   /**
    * get all rules to be add or update to site from root rule
-   * @param {*} rootRule
+   * @param {*} rawRule
    */
-  async getRulesForMutation(rootRule) {
-    if (rootRule.to.type !== ROUTING_RULE_TYPES.BLOCKLET) {
-      return [rootRule];
+  async getRulesForMutation(rawRule) {
+    if (rawRule.to.type !== ROUTING_RULE_TYPES.BLOCKLET) {
+      return [rawRule];
     }
 
     const rules = [];
 
     // get child rules
-    const blocklet = await states.blocklet.getBlocklet(rootRule.to.did);
+    const blocklet = await states.blocklet.getBlocklet(rawRule.to.did);
 
     // blocklet may be mounted in relative prefix (for old usage), so blockletPrefix may not be '/'
-    // blocklet prefix is the origin pathPrefix in rootRule
-    const blockletPrefix = normalizePathPrefix(rootRule.from.pathPrefix);
+    // blocklet prefix is the origin pathPrefix in rawRule
+    const blockletPrefix = normalizePathPrefix(rawRule.from.pathPrefix);
 
     // root component's mountPoint may not be '/'
     const rootComponentPrefix = joinUrl(blockletPrefix, blocklet.mountPoint || '/');
-    rootRule.from.pathPrefix = normalizePathPrefix(rootComponentPrefix);
+    rawRule.from.pathPrefix = normalizePathPrefix(rootComponentPrefix);
 
     const isOccupiable = blocklet.meta.group === BlockletGroup.gateway;
 
     if (!isOccupiable) {
-      rules.push(rootRule);
+      rules.push(rawRule);
     }
 
     forEachChildSync(blocklet, (component, { id, ancestors }) => {
@@ -650,7 +650,7 @@ class RouterManager extends EventEmitter {
         mountPoint
       );
 
-      const occupied = normalizePathPrefix(pathPrefix) === normalizePathPrefix(rootRule.from.pathPrefix);
+      const occupied = normalizePathPrefix(pathPrefix) === normalizePathPrefix(rawRule.from.pathPrefix);
 
       if (occupied && !isOccupiable) {
         return;
@@ -658,8 +658,8 @@ class RouterManager extends EventEmitter {
 
       // if is root path, child rule become root rule
       const childRule = {
-        id: occupied ? rootRule.id : uuid.v4(),
-        groupId: rootRule.id,
+        id: occupied ? rawRule.id : uuid.v4(),
+        groupId: rawRule.id,
         from: {
           pathPrefix: normalizePathPrefix(pathPrefix),
           groupPathPrefix: blockletPrefix,
@@ -667,11 +667,11 @@ class RouterManager extends EventEmitter {
         to: {
           type: ROUTING_RULE_TYPES.BLOCKLET,
           port: findInterfacePortByName(component, childWebInterface.name),
-          did: rootRule.to.did, // root component did
-          interfaceName: rootRule.to.interfaceName, // root component interface
+          did: rawRule.to.did, // root component did
+          interfaceName: rawRule.to.interfaceName, // root component interface
           componentId: id,
         },
-        isProtected: occupied ? rootRule.isProtected : true,
+        isProtected: occupied ? rawRule.isProtected : true,
       };
 
       rules.push(childRule);

package/lib/states/audit-log.js

@@ -167,6 +167,8 @@ const getLogContent = async (action, args, context, result, info, node) => {
       return `removed blocklet store ${args.url}`;
     case 'selectBlockletStore':
       return `selected blocklet store ${args.url}`;
+    case 'updateAppSessionConfig':
+      return `updated session config: ${JSON.stringify(args.config)}`;
 
     // teams: members/passports
     case 'addUser':

package/lib/states/blocklet.js

@@ -153,6 +153,7 @@ class BlockletState extends BaseState {
     this.defaultPort = config.blockletPort || 5555;
     // @didMap: { [did: string]: metaDid: string }
     this.didMap = new Map();
+    this.statusLocks = new Map();
   }
 
   async getBlocklet(did, { decryptSk = true } = {}) {
@@ -207,6 +208,8 @@ class BlockletState extends BaseState {
 
     this.didMap.delete(doc.meta?.did);
     this.didMap.delete(doc.appDid);
+    this.statusLocks.delete(doc.meta?.did);
+    this.statusLocks.delete(doc.appDid);
 
     this.emit('remove', doc);
     return formatBlocklet(doc, 'onRead', this.config.dek);
@@ -505,39 +508,49 @@ class BlockletState extends BaseState {
       throw new Error('Unsupported blocklet status');
     }
 
-    const doc = await this.getBlocklet(did);
-
-    if (doc.meta?.group === BlockletGroup.gateway && !doc.children?.length) {
-      return this.updateBlocklet(did, { status });
-    }
+    const statusLock = this._getStatusLock(did);
 
-    // for backward compatibility
-    if (!doc.structVersion && !doc.children?.length) {
-      return this.updateBlocklet(did, { status });
-    }
+    try {
+      await statusLock.acquire();
+      const doc = await this.getBlocklet(did);
 
-    // update children status
-    forEachComponentV2Sync(doc, (component) => {
-      if (component.meta.group === BlockletGroup.gateway) {
-        return;
+      if (doc.meta?.group === BlockletGroup.gateway && !doc.children?.length) {
+        return this.updateBlocklet(did, { status });
       }
 
-      if (shouldSkipComponent(component.meta.did, componentDids)) {
-        return;
+      // for backward compatibility
+      if (!doc.structVersion && !doc.children?.length) {
+        return this.updateBlocklet(did, { status });
       }
 
-      component.status = status;
-      if (status === BlockletStatus.running) {
-        component.startedAt = new Date();
-        component.stoppedAt = null;
-      }
-      if (status === BlockletStatus.stopped) {
-        component.startedAt = null;
-        component.stoppedAt = new Date();
-      }
-    });
+      // update children status
+      forEachComponentV2Sync(doc, (component) => {
+        if (component.meta.group === BlockletGroup.gateway) {
+          return;
+        }
 
-    return this.updateBlocklet(did, pick(doc, ['status', 'children']));
+        if (shouldSkipComponent(component.meta.did, componentDids)) {
+          return;
+        }
+
+        component.status = status;
+        if (status === BlockletStatus.running) {
+          component.startedAt = new Date();
+          component.stoppedAt = null;
+        }
+        if (status === BlockletStatus.stopped) {
+          component.startedAt = null;
+          component.stoppedAt = new Date();
+        }
+      });
+
+      const res = await this.updateBlocklet(did, pick(doc, ['status', 'children']));
+      statusLock.release();
+      return res;
+    } catch (error) {
+      statusLock.release();
+      throw error;
+    }
   }
 
   setInstalledAt(did) {
@@ -641,6 +654,14 @@ class BlockletState extends BaseState {
   updateStructV1Did(did, v1Did) {
     return this.updateBlocklet(did, { structV1Did: v1Did });
   }
+
+  _getStatusLock(did) {
+    if (!this.statusLocks.has(did)) {
+      this.statusLocks[did] = new Lock();
+    }
+
+    return this.statusLocks[did];
+  }
 }
 
 BlockletState.BlockletStatus = BlockletStatus;

package/lib/util/blocklet.js

@@ -41,6 +41,13 @@ const {
   APP_STRUCT_VERSION,
   EXPIRED_BLOCKLET_DATA_RETENTION_DAYS,
 } = require('@abtnode/constant');
+const {
+  parseComponents,
+  ensureMeta,
+  filterDuplicateComponents,
+  validateBlockletMeta,
+  getComponentConfig,
+} = require('@blocklet/resolver');
 const formatBackSlash = require('@abtnode/util/lib/format-back-slash');
 const { toSvg: createDidLogo } =
   process.env.NODE_ENV !== 'test' ? require('@arcblock/did-motif') : require('@arcblock/did-motif/dist/did-motif.cjs');
@@ -67,7 +74,6 @@ const validateBlockletEntry = require('@blocklet/meta/lib/entry');
 const getBlockletEngine = require('@blocklet/meta/lib/engine');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
 const getBlockletWallet = require('@blocklet/meta/lib/wallet');
-const { validateMeta, fixAndValidateService } = require('@blocklet/meta/lib/validate');
 const {
   forEachBlocklet,
   getDisplayName,
@@ -75,7 +81,6 @@ const {
   forEachBlockletSync,
   forEachChildSync,
   forEachComponentV2Sync,
-  isComponentBlocklet,
   getSharedConfigObj,
   getComponentName,
   isEnvShareable,
@@ -85,13 +90,8 @@ const {
   isInProgress,
   isRunning,
 } = require('@blocklet/meta/lib/util');
-const toBlockletDid = require('@blocklet/meta/lib/did');
 const { titleSchema, descriptionSchema, logoSchema } = require('@blocklet/meta/lib/schema');
-const {
-  getSourceUrlsFromConfig,
-  getBlockletMetaFromUrls,
-  getBlockletMetaFromUrl,
-} = require('@blocklet/meta/lib/util-meta');
+const { getBlockletMetaFromUrl } = require('@blocklet/meta/lib/util-meta');
 const getComponentProcessId = require('@blocklet/meta/lib/get-component-process-id');
 
 const { validate: validateEngine, get: getEngine } = require('../blocklet/manager/engine');
@@ -103,12 +103,6 @@ const externalIpUtil = require('./get-accessible-external-node-ip');
 const { getIpDnsDomainForBlocklet } = require('./get-domain-for-blocklet');
 const { replaceDomainSlot } = require('./index');
 
-const getComponentConfig = (meta) => {
-  const components = meta.components || meta.children || [];
-  const staticComponents = (meta.staticComponents || []).map((x) => ({ ...x, static: true }));
-  return [...components, ...staticComponents];
-};
-
 /**
  * get blocklet engine info, default is node
  * @param {object} blockletMeta blocklet meta
@@ -469,11 +463,11 @@ const isUsefulError = (err) =>
   !/^Process \d+ not found$/.test(err.message);
 
 const getHealthyCheckTimeout = (blocklet, { checkHealthImmediately } = {}) => {
-  let minConsecutiveTime = 5000;
+  let minConsecutiveTime = 2000;
   if (process.env.NODE_ENV === 'test' && process.env.ABT_NODE_TEST_MIN_CONSECUTIVE_TIME !== undefined) {
     minConsecutiveTime = process.env.ABT_NODE_TEST_MIN_CONSECUTIVE_TIME;
   } else if (checkHealthImmediately) {
-    minConsecutiveTime = 3000;
+    minConsecutiveTime = 1000;
   }
 
   if (process.env.BLOCKLET_START_TIMEOUT) {
@@ -540,6 +534,7 @@ const startBlockletProcess = async (
 
       // get env
       const env = getRuntimeEnvironments(b, nodeEnvironments, ancestors);
+      const startedAt = Date.now();
 
       // run hook
       await preStart(b, { env });
@@ -564,7 +559,7 @@ const startBlockletProcess = async (
         output: path.join(logsDir, 'output.log'),
         error: path.join(logsDir, 'error.log'),
         wait_ready: process.env.NODE_ENV !== 'test',
-        listen_timeout: 5000,
+        listen_timeout: 3000,
         max_memory_restart: `${maxMemoryRestart}M`,
         max_restarts: b.mode === BLOCKLET_MODES.DEVELOPMENT ? 0 : 3,
         env: {
@@ -618,9 +613,9 @@ const startBlockletProcess = async (
 
       const status = await getProcessState(processId);
       if (status === BlockletStatus.error) {
-        throw new Error(`${processId} is not running within 5 seconds`);
+        throw new Error(`${processId} is not running within 3 seconds`);
       }
-      logger.info('blocklet started', { processId, status });
+      logger.info('blocklet started', { processId, status, time: Date.now() - startedAt });
 
       // run hook
       postStart(b, { env }).catch((err) => {
@@ -736,128 +731,6 @@ const reloadProcess = (processId) =>
     });
   });
 
-/**
- * this function has side effect to component (will set component.children: Array<staticComponent> )
- * this function has side effect to dynamicComponents (will push dynamicComponent in dynamicComponents)
- *
- * @param {Component} component
- * @param {{
- *   ancestors: Array<{meta}>
- *   dynamicComponents: Array<{Component}>
- * }} context
- * @returns {{
- *   dynamicComponents: Array<Component>,
- *   staticComponents: Array<Component>,
- * }}
- */
-const parseComponents = async (component, context = {}) => {
-  const { ancestors = [], dynamicComponents = [] } = context;
-  if (ancestors.length > 40) {
-    throw new Error('The depth of component should not exceed 40');
-  }
-
-  const configs = getComponentConfig(component.meta) || [];
-
-  if (!configs || !configs.length) {
-    return {
-      staticComponents: [],
-      dynamicComponents,
-    };
-  }
-
-  const staticComponents = [];
-
-  // FIXME @linchen 改成并行获取
-  for (const config of configs) {
-    const isStatic = !!config.static;
-
-    if (isStatic) {
-      if (!config.name) {
-        throw new Error(`Name does not found in child ${config.name}`);
-      }
-
-      if (!config.mountPoint) {
-        throw new Error(`MountPoint does not found in child ${config.name}`);
-      }
-    }
-
-    const urls = getSourceUrlsFromConfig(config);
-
-    let rawMeta;
-    try {
-      rawMeta = await getBlockletMetaFromUrls(urls, { logger });
-    } catch (error) {
-      throw new Error(`Failed get component meta. Component: ${urls.join(', ')}, reason: ${error.message}`);
-    }
-
-    if (rawMeta.group === BlockletGroup.gateway) {
-      throw new Error(`Cannot add gateway component ${rawMeta.title || rawMeta.did}`);
-    }
-
-    validateBlockletMeta(rawMeta, { ensureDist: true });
-
-    if (!isComponentBlocklet(rawMeta)) {
-      throw new Error(
-        `The blocklet cannot be a component: ${rawMeta.title}. The reason may be that the developer set capabilities.component to false in blocklet.yml`
-      );
-    }
-
-    const webInterface = findWebInterface(rawMeta);
-    if (!webInterface) {
-      throw new Error(`Web interface does not found in component ${rawMeta.title || rawMeta.name}`);
-    }
-
-    const meta = ensureMeta(rawMeta, { name: isStatic ? config.name : null });
-
-    // check circular dependencies
-    if (ancestors.map((x) => x.meta?.bundleDid).indexOf(meta.bundleDid) > -1) {
-      throw new Error('Blocklet components have circular dependencies');
-    }
-
-    if (config.title) {
-      meta.title = config.title;
-      meta.title = await titleSchema.validateAsync(config.title);
-    }
-
-    if (config.description) {
-      meta.description = await descriptionSchema.validateAsync(config.description);
-    }
-
-    const mountPoint = isStatic ? config.mountPoint : config.mountPoint || `/${meta.did}`;
-
-    const child = {
-      mountPoint,
-      meta,
-      bundleSource: config.source,
-      dependencies: [],
-    };
-
-    if (isStatic) {
-      staticComponents.push(child);
-    } else {
-      dynamicComponents.push(child);
-      component.dependencies = component.dependencies || [];
-      component.dependencies.push({
-        did: child.meta.bundleDid,
-        required: !!config.required,
-        version: config.source.version || 'latest',
-      });
-    }
-
-    await parseComponents(child, {
-      ancestors: [...ancestors, { meta }],
-      dynamicComponents,
-    });
-  }
-
-  component.children = staticComponents;
-
-  return {
-    staticComponents,
-    dynamicComponents,
-  };
-};
-
 const validateBlocklet = (blocklet) =>
   forEachBlocklet(blocklet, (b) => {
     isRequirementsSatisfied(b.meta.requirements);
@@ -894,7 +767,9 @@ const checkBlockletProcessHealthy = async (blocklet, { minConsecutiveTime, timeo
 
       const logToTerminal = [blocklet.mode, b.mode].includes(BLOCKLET_MODES.DEVELOPMENT);
 
+      const startedAt = Date.now();
       await _checkProcessHealthy(b, { minConsecutiveTime, timeout, logToTerminal });
+      logger.info('component healthy', { did: b.meta.did, time: Date.now() - startedAt });
     },
     { parallel: true }
   );
@@ -923,10 +798,9 @@ const _checkProcessHealthy = async (blocklet, { minConsecutiveTime, timeout, log
       }
     };
 
-    await sleep(400);
     let status = await getStatus();
-    for (let i = 0; i < 10 && status !== 'online'; i++) {
-      const t = process.env.NODE_ENV !== 'test' ? 1000 : 30;
+    for (let i = 0; i < 20 && status !== 'online'; i++) {
+      const t = process.env.NODE_ENV !== 'test' ? 500 : 30;
       await sleep(t);
       status = await getStatus();
     }
@@ -945,11 +819,7 @@ const _checkProcessHealthy = async (blocklet, { minConsecutiveTime, timeout, log
       );
     }
     try {
-      await ensureEndpointHealthy({
-        port,
-        minConsecutiveTime,
-        timeout,
-      });
+      await ensureEndpointHealthy({ port, minConsecutiveTime, timeout });
     } catch (error) {
       logger.error('ensure endpoint healthy failed', { port, minConsecutiveTime, timeout });
       throw error;
@@ -1327,45 +1197,6 @@ const needBlockletDownload = (blocklet, oldBlocklet) => {
   return get(oldBlocklet, 'meta.dist.integrity') !== get(blocklet, 'meta.dist.integrity');
 };
 
-const isDidMatchName = (did, name) => {
-  if (isValidDid(did) && name === did) {
-    return true;
-  }
-
-  return toBlockletDid(name) === did;
-};
-
-/**
- * set bundleDid and bundleMeta in meta
- * update name and did to server index
- * in app structure 2.0, application's bundleDid, bundleName, meta, did will be same
- */
-const ensureMeta = (meta, { name, did } = {}) => {
-  if (name && did && !isDidMatchName(did, name)) {
-    throw new Error(`name does not match with did: ${name}, ${did}`);
-  }
-
-  const newMeta = {
-    ...meta,
-  };
-
-  if (!newMeta.did || !newMeta.name || !isDidMatchName(newMeta.did, newMeta.name)) {
-    throw new Error(`name does not match with did in meta: ${newMeta.name}, ${newMeta.did}`);
-  }
-
-  if (!meta.bundleDid) {
-    newMeta.bundleDid = meta.did;
-    newMeta.bundleName = meta.name;
-  }
-
-  if (name) {
-    newMeta.name = name;
-    newMeta.did = did || toBlockletDid(name);
-  }
-
-  return newMeta;
-};
-
 const getBlocklet = async ({
   did,
   dataDirs,
@@ -1784,36 +1615,6 @@ const checkVersionCompatibility = (components) => {
   }
 };
 
-const filterDuplicateComponents = (components = [], currents = []) => {
-  const arr = [];
-
-  components.forEach((component) => {
-    if (currents.some((x) => x.meta.did === component.meta.did)) {
-      return;
-    }
-
-    const index = arr.findIndex((x) => x.meta.did === component.meta.did);
-    if (index > -1) {
-      const exist = arr[index];
-
-      // 选择最小版本:
-      // 如果 com1 和 com2 都依赖某个 component, com1 声明依赖版本 1.0.0, 实际获取版本 1.0.0; com2 声明依赖版本 latest(不限), 实际获取版本 2.0.0 -> 则应该取 1.0.0
-      if (semver.lt(component.meta.version, exist.meta.version)) {
-        arr.splice(index, 1, component);
-      }
-    } else {
-      arr.push(component);
-    }
-  });
-
-  return arr;
-};
-
-const validateBlockletMeta = (meta, opts = {}) => {
-  fixAndValidateService(meta);
-  return validateMeta(meta, { ensureName: true, skipValidateDidName: true, schemaOptions: { ...opts } });
-};
-
 const getBlockletKnownAs = (blocklet) => {
   const alsoKnownAs = [blocklet.appDid];
   if (Array.isArray(blocklet.migratedFrom)) {

package/lib/util/launcher.js

@@ -181,7 +181,7 @@ const setupAppOwner = async (node, sessionId) => {
     passport,
     role,
     secret: appSecret,
-    expiresIn: '7d',
+    expiresIn: '1d',
   });
 
   await node.setBlockletOwner({ did: appDid, owner: { did: ownerDid, pk: ownerPk } });

package/lib/validators/router.js

@@ -17,19 +17,21 @@ const domainMessages = {
   },
 };
 
+const getPrefixSchema = (field) =>
+  Joi.string()
+    .trim()
+    .max(150)
+    .messages({
+      zh: { 'string.empty': `${field} 不能为空`, 'string.max': `${field} 的最大长度是 150` },
+      en: { 'string.empty': `${field} cannot be empty`, 'string.max': `The maximum length of ${field} is 150` },
+    })
+    .custom((value) => urlPathFriendly(value));
+
 const ruleSchema = {
   isProtected: Joi.boolean(),
 
   from: Joi.object({
-    pathPrefix: Joi.string()
-      .required()
-      .trim()
-      .max(150)
-      .messages({
-        zh: { 'string.empty': 'URL 前缀不能为空', 'string.max': 'URL 前缀的最大长度是 150' },
-        en: { 'string.empty': 'URL prefix cannot be empty', 'string.max': 'The maximum length of URL prefix is 150' },
-      })
-      .custom((value) => urlPathFriendly(value)),
+    pathPrefix: getPrefixSchema('from.pathPrefix').required(),
     groupPathPrefix: Joi.string().trim().min(1).max(150), // path prefix of interface of root blocklet
     header: Joi.any(), // TODO: header does not take effect
   }),
@@ -44,12 +46,24 @@ const ruleSchema = {
         ROUTING_RULE_TYPES.REDIRECT,
         ROUTING_RULE_TYPES.GENERAL_PROXY,
         ROUTING_RULE_TYPES.DIRECT_RESPONSE,
+        ROUTING_RULE_TYPES.GENERAL_REWRITE,
+        ROUTING_RULE_TYPES.COMPONENT,
         ROUTING_RULE_TYPES.NONE
       )
       .required(),
-    did: Joi.string().label('did').when('type', { is: ROUTING_RULE_TYPES.BLOCKLET, then: Joi.required() }), // root blocklet did
+    did: Joi.string()
+      .label('did')
+      .when('type', {
+        is: Joi.string().valid(ROUTING_RULE_TYPES.BLOCKLET, ROUTING_RULE_TYPES.COMPONENT),
+        then: Joi.required(),
+      }), // root blocklet did
     port: Joi.number().label('port').port().when('type', { is: ROUTING_RULE_TYPES.BLOCKLET, then: Joi.required() }),
-    url: Joi.string().label('url').when('type', { is: ROUTING_RULE_TYPES.REDIRECT, then: Joi.required() }),
+    url: Joi.string()
+      .label('url')
+      .when('type', {
+        is: Joi.string().valid(ROUTING_RULE_TYPES.REDIRECT, ROUTING_RULE_TYPES.GENERAL_REWRITE),
+        then: Joi.required(),
+      }),
     redirectCode: Joi.alternatives()
       .try(301, 302, 307, 308)
       .label('redirect code')
@@ -70,7 +84,8 @@ const ruleSchema = {
       .valid(...Object.keys(ROUTER_CACHE_GROUPS))
       .allow('')
       .default(''),
-    targetPrefix: Joi.string().trim().max(150), // path prefix of interface of target blocklet
+    targetPrefix: getPrefixSchema('to.targetPrefix'), // path prefix of interface of target blocklet
+    pageGroup: Joi.string().allow('').default(''),
   },
 
   // List of services that manipulate the request before the upstream blocklet

package/lib/validators/util.js

@@ -22,8 +22,20 @@ const blockletController = Joi.object({
 
 const createValidator = (schema) => (entity) => schema.validateAsync(entity);
 
+const sessionConfigSchema = Joi.object({
+  cacheTtl: Joi.number()
+    .min(5 * 60) // 5min
+    .max(86400) // 1d
+    .default(10 * 60), // 10min
+  ttl: Joi.number()
+    .min(86400) // 1d
+    .max(86400 * 30) // 30d
+    .default(86400 * 7), // 7d
+});
+
 module.exports = {
   createValidator,
   getMultipleLangParams,
   blockletController,
+  sessionConfigSchema,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.13-beta-55b3e93d",
+  "version": "1.16.13-beta-423a40b1",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,31 +19,32 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.13-beta-55b3e93d",
-    "@abtnode/certificate-manager": "1.16.13-beta-55b3e93d",
-    "@abtnode/constant": "1.16.13-beta-55b3e93d",
-    "@abtnode/cron": "1.16.13-beta-55b3e93d",
-    "@abtnode/logger": "1.16.13-beta-55b3e93d",
-    "@abtnode/models": "1.16.13-beta-55b3e93d",
-    "@abtnode/queue": "1.16.13-beta-55b3e93d",
-    "@abtnode/rbac": "1.16.13-beta-55b3e93d",
-    "@abtnode/router-provider": "1.16.13-beta-55b3e93d",
-    "@abtnode/static-server": "1.16.13-beta-55b3e93d",
-    "@abtnode/timemachine": "1.16.13-beta-55b3e93d",
-    "@abtnode/util": "1.16.13-beta-55b3e93d",
+    "@abtnode/auth": "1.16.13-beta-423a40b1",
+    "@abtnode/certificate-manager": "1.16.13-beta-423a40b1",
+    "@abtnode/constant": "1.16.13-beta-423a40b1",
+    "@abtnode/cron": "1.16.13-beta-423a40b1",
+    "@abtnode/logger": "1.16.13-beta-423a40b1",
+    "@abtnode/models": "1.16.13-beta-423a40b1",
+    "@abtnode/queue": "1.16.13-beta-423a40b1",
+    "@abtnode/rbac": "1.16.13-beta-423a40b1",
+    "@abtnode/router-provider": "1.16.13-beta-423a40b1",
+    "@abtnode/static-server": "1.16.13-beta-423a40b1",
+    "@abtnode/timemachine": "1.16.13-beta-423a40b1",
+    "@abtnode/util": "1.16.13-beta-423a40b1",
     "@arcblock/did": "1.18.84",
     "@arcblock/did-auth": "1.18.84",
     "@arcblock/did-ext": "^1.18.84",
-    "@arcblock/did-motif": "^1.1.10",
+    "@arcblock/did-motif": "^1.1.11",
     "@arcblock/did-util": "1.18.84",
     "@arcblock/event-hub": "1.18.84",
     "@arcblock/jwt": "^1.18.84",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.84",
     "@arcblock/vc": "1.18.84",
-    "@blocklet/constant": "1.16.13-beta-55b3e93d",
-    "@blocklet/meta": "1.16.13-beta-55b3e93d",
-    "@blocklet/sdk": "1.16.13-beta-55b3e93d",
+    "@blocklet/constant": "1.16.13-beta-423a40b1",
+    "@blocklet/meta": "1.16.13-beta-423a40b1",
+    "@blocklet/resolver": "1.16.13-beta-423a40b1",
+    "@blocklet/sdk": "1.16.13-beta-423a40b1",
     "@did-space/client": "^0.2.117",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.84",
@@ -96,5 +97,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "1c734de99ff70fad99e9cc3fb55834e0bb6f5bfd"
+  "gitHead": "1aee04f45042bd4784ca72f9f8b93918980be4d4"
 }