@abtnode/core 1.8.65-beta-5405baf2 → 1.8.65-beta-f7af64a4

package/lib/api/team.js

@@ -178,6 +178,7 @@ class TeamAPI extends EventEmitter {
             'passports',
             'firstLoginAt',
             'lastLoginAt',
+            'lastLoginIp',
             'remark',
             'avatar',
             'locale',

package/lib/blocklet/manager/disk.js

@@ -444,6 +444,7 @@ class BlockletManager extends BaseBlockletManager {
 
   async start({ did, throwOnError, checkHealthImmediately = false, e2eMode = false }, context) {
     logger.info('start blocklet', { did });
+    // should check blocklet integrity
     const blocklet = await this.ensureBlocklet(did, { e2eMode });
 
     try {
@@ -557,7 +558,7 @@ class BlockletManager extends BaseBlockletManager {
   async stop({ did, updateStatus = true, silent = false }, context) {
     logger.info('stop blocklet', { did });
 
-    const blocklet = await this.ensureBlocklet(did);
+    const blocklet = await this.getBlocklet(did);
     const { processId } = blocklet.env;
 
     if (updateStatus) {
@@ -655,7 +656,7 @@ class BlockletManager extends BaseBlockletManager {
 
   // eslint-disable-next-line no-unused-vars
   async reload({ did }, context) {
-    const blocklet = await this.ensureBlocklet(did);
+    const blocklet = await this.getBlocklet(did);
 
     await states.blocklet.setBlockletStatus(did, BlockletStatus.stopping);
     await reloadBlockletProcess(blocklet);
@@ -671,13 +672,12 @@ class BlockletManager extends BaseBlockletManager {
     logger.info('delete blocklet', { did, keepData });
 
     try {
-      const blocklet = await this.ensureBlocklet(did, { validateEnv: false });
+      const blocklet = await this.getBlocklet(did);
       if (isDeletableBlocklet(blocklet) === false) {
         throw new Error('Blocklet is protected from accidental deletion');
       }
 
       const nodeEnvironments = await states.node.getEnvironments();
-
       await deleteBlockletProcess(blocklet, {
         preDelete: (b, { ancestors }) =>
           hooks.preUninstall(b.env.processId, {
@@ -700,31 +700,27 @@ class BlockletManager extends BaseBlockletManager {
         severity: 'success',
       });
       return doc;
-    } catch (err) {
+    } catch (error) {
       // If we installed a corrupted blocklet accidentally, just cleanup the disk and state db
-      if (err.code === 'BLOCKLET_CORRUPTED') {
-        logger.info('blocklet is corrupted, will delete again', { did });
-        const doc = await this._deleteBlocklet({ did, keepData, keepLogsDir, keepConfigs }, context);
-
-        this._createNotification(doc.meta.did, {
-          title: 'Blocklet Deleted',
-          description: `Blocklet ${doc.meta.name}@${doc.meta.version} is deleted.`,
-          entityType: 'blocklet',
-          entityId: doc.meta.did,
-          severity: 'success',
-        });
+      logger.error('blocklet delete failed, will delete again', { did, error });
+      const doc = await this._deleteBlocklet({ did, keepData, keepLogsDir, keepConfigs }, context);
 
-        return doc;
-      }
+      this._createNotification(doc.meta.did, {
+        title: 'Blocklet Deleted',
+        description: `Blocklet ${doc.meta.name}@${doc.meta.version} is deleted.`,
+        entityType: 'blocklet',
+        entityId: doc.meta.did,
+        severity: 'success',
+      });
 
-      throw err;
+      return doc;
     }
   }
 
   async reset({ did, childDid }, context = {}) {
     logger.info('reset blocklet', { did, childDid });
 
-    const blocklet = await this.ensureBlocklet(did);
+    const blocklet = await this.getBlocklet(did);
 
     if (isInProgress(blocklet.status || blocklet.status === BlockletStatus.running)) {
       throw new Error('Cannot reset when blocklet is in progress');
@@ -774,7 +770,7 @@ class BlockletManager extends BaseBlockletManager {
   async deleteComponent({ did, rootDid, keepData, keepState }, context) {
     logger.info('delete blocklet component', { did, rootDid, keepData });
 
-    const blocklet = await this.ensureBlocklet(rootDid, { validateEnv: false });
+    const blocklet = await this.getBlocklet(rootDid);
     const child = blocklet.children.find((x) => x.meta.did === did);
     if (!child) {
       throw new Error('Component does not exist');
@@ -828,7 +824,7 @@ class BlockletManager extends BaseBlockletManager {
       await states.blockletExtras.delConfigs([blocklet.meta.did, child.meta.did]);
     }
 
-    const newBlocklet = await this.ensureBlocklet(rootDid);
+    const newBlocklet = await this.getBlocklet(rootDid);
     this.emit(BlockletEvents.upgraded, { blocklet: newBlocklet, context: { ...context, createAuditLog: false } }); // trigger router refresh
 
     this._createNotification(newBlocklet.meta.did, {
@@ -881,7 +877,7 @@ class BlockletManager extends BaseBlockletManager {
 
   // eslint-disable-next-line no-unused-vars
   async deleteProcess({ did }, context) {
-    const blocklet = await this.ensureBlocklet(did);
+    const blocklet = await this.getBlocklet(did);
 
     logger.info('delete blocklet process', { did });
 
@@ -904,17 +900,17 @@ class BlockletManager extends BaseBlockletManager {
 
     if (!attachRuntimeInfo) {
       try {
-        const blocklet = await this.ensureBlocklet(did, { throwOnNotExist: false });
+        const blocklet = await this.getBlocklet(did, { throwOnNotExist: false });
         return blocklet;
       } catch (e) {
         logger.error('get blocklet detail error', { error: e });
-        return null; // TODO: 直接返回没有 runtime info 的数据
+        return states.blocklet.getBlocklet(did);
       }
     }
 
     const nodeInfo = await states.node.read();
 
-    return this.attachRuntimeInfo({ did, nodeInfo, diskInfo: true, context });
+    return this._attachRuntimeInfo({ did, nodeInfo, diskInfo: true, context });
   }
 
   async attachBlockletListRuntimeInfo({ blocklets, useCache }, context) {
@@ -929,7 +925,7 @@ class BlockletManager extends BaseBlockletManager {
           const cachedBlocklet =
             useCache && this.cachedBlocklets ? this.cachedBlocklets.find((y) => y.meta.did === x.meta.did) : null;
 
-          return this.attachRuntimeInfo({
+          return this._attachRuntimeInfo({
             did: x.meta.did,
             nodeInfo,
             diskInfo: false,
@@ -977,7 +973,7 @@ class BlockletManager extends BaseBlockletManager {
     const [rootDid, ...childDids] = dids;
     logger.info('config blocklet', { dids });
 
-    let blocklet = await this.ensureBlocklet(rootDid);
+    let blocklet = await this.getBlocklet(rootDid);
     for (const childDid of childDids) {
       blocklet = blocklet.children.find((x) => x.meta.did === childDid);
       if (!blocklet) {
@@ -1035,20 +1031,20 @@ class BlockletManager extends BaseBlockletManager {
     await this.updateBlockletEnvironment(rootDid);
 
     // response
-    const newState = await this.ensureBlocklet(rootDid);
+    const newState = await this.getBlocklet(rootDid);
     this.emit(BlockletEvents.updated, newState);
     return newState;
   }
 
   async configPublicToStore({ did, publicToStore = false }) {
-    const blocklet = await this.ensureBlocklet(did);
+    const blocklet = await this.getBlocklet(did);
     // publicToStore 由用户传入
     // handleInstanceInStore 方法写在前面，保证向 store 操作成功后才会更改 blocklet 中的 publicToStore值
     // handleInstanceInStore 中会校验修改 publicToStore字段 的条件，不符合则会抛错，就不会执行下面更新 publicToStore 的逻辑
     await handleInstanceInStore(blocklet, { publicToStore });
     await states.blockletExtras.setSettings(did, { publicToStore });
 
-    const newState = await this.ensureBlocklet(did);
+    const newState = await this.getBlocklet(did);
     return newState;
   }
 
@@ -1058,7 +1054,7 @@ class BlockletManager extends BaseBlockletManager {
     }
     await states.blockletExtras.setSettings(did, { navigations });
 
-    const newState = await this.ensureBlocklet(did);
+    const newState = await this.getBlocklet(did);
     this.emit(BlockletEvents.updated, newState);
     return newState;
   }
@@ -1110,7 +1106,7 @@ class BlockletManager extends BaseBlockletManager {
       await states.blockletExtras.setConfigs(dids, configs);
     }
 
-    const blocklet = await this.ensureBlocklet(rootDid);
+    const blocklet = await this.getBlocklet(rootDid);
 
     this.emit(BlockletEvents.updated, { meta: { did: blocklet.meta.did } });
 
@@ -1158,7 +1154,7 @@ class BlockletManager extends BaseBlockletManager {
     // trigger dashboard frontend refresh
     this.emit(BlockletEvents.updated, blocklet);
 
-    return this.ensureBlocklet(rootDid);
+    return this.getBlocklet(rootDid);
   }
 
   async updateComponentMountPoint({ did, rootDid: inputRootDid, mountPoint }, context) {
@@ -1194,7 +1190,7 @@ class BlockletManager extends BaseBlockletManager {
 
     this.emit(BlockletEvents.upgraded, { blocklet, context: { ...context, createAuditLog: false } }); // trigger router refresh
 
-    return this.ensureBlocklet(rootDid);
+    return this.getBlocklet(rootDid);
   }
 
   /**
@@ -1540,6 +1536,8 @@ class BlockletManager extends BaseBlockletManager {
 
     // Add Config
     await this._setConfigsFromMeta(did);
+
+    // should ensure blocklet integrity
     let blocklet = await this.ensureBlocklet(did);
 
     // pre install
@@ -1547,14 +1545,14 @@ class BlockletManager extends BaseBlockletManager {
 
     // Add environments
     await this.updateBlockletEnvironment(did);
-    blocklet = await this.ensureBlocklet(did);
+    blocklet = await this.getBlocklet(did);
 
     // post install
     await this._runPostInstallHook(blocklet);
 
     await states.blocklet.setBlockletStatus(did, BlockletStatus.installed);
 
-    blocklet = await this.ensureBlocklet(did);
+    blocklet = await this.getBlocklet(did);
 
     await fs.writeFile(path.join(blocklet.env.dataDir, 'logo.svg'), createDidLogo(blocklet.meta.did));
 
@@ -1607,6 +1605,8 @@ class BlockletManager extends BaseBlockletManager {
 
     // Add Config
     await this._setConfigsFromMeta(rootDid);
+
+    // should ensure blocklet integrity
     let blocklet = await this.ensureBlocklet(rootDid);
 
     // pre install
@@ -1614,14 +1614,14 @@ class BlockletManager extends BaseBlockletManager {
 
     // Add environments
     await this.updateBlockletEnvironment(rootDid);
-    blocklet = await this.ensureBlocklet(rootDid);
+    blocklet = await this.getBlocklet(rootDid);
 
     // post install
     await this._runPostInstallHook(blocklet);
 
     logger.info('add blocklet component for dev', { did, version, meta });
 
-    blocklet = await this.ensureBlocklet(rootDid);
+    blocklet = await this.getBlocklet(rootDid);
 
     return blocklet;
   }
@@ -1645,7 +1645,11 @@ class BlockletManager extends BaseBlockletManager {
   }
 
   async ensureBlocklet(did, opts = {}) {
-    return getBlocklet({ ...opts, states, dataDirs: this.dataDirs, did });
+    return getBlocklet({ ...opts, states, dataDirs: this.dataDirs, did, ensureIntegrity: true });
+  }
+
+  async getBlocklet(did, opts = {}) {
+    return getBlocklet({ ...opts, states, dataDirs: this.dataDirs, did, ensureIntegrity: false });
   }
 
   async hasBlocklet({ did }) {
@@ -1663,7 +1667,7 @@ class BlockletManager extends BaseBlockletManager {
 
     this.emit(BlockletEvents.updated, { meta: { did: blocklet.meta.did } });
 
-    return this.ensureBlocklet(did);
+    return this.getBlocklet(did);
   }
 
   async status(did, { forceSync = false } = {}) {
@@ -1680,7 +1684,7 @@ class BlockletManager extends BaseBlockletManager {
       return res;
     };
 
-    const blocklet = await this.ensureBlocklet(did);
+    const blocklet = await this.getBlocklet(did);
 
     let shouldUpdateStatus = forceSync || shouldUpdateBlockletStatus(blocklet.status);
     if (isInProgress(blocklet.status)) {
@@ -1709,80 +1713,6 @@ class BlockletManager extends BaseBlockletManager {
     }
   }
 
-  async attachRuntimeInfo({ did, nodeInfo, diskInfo = true, context, cachedBlocklet }) {
-    if (!did) {
-      throw new Error('did should not be empty');
-    }
-
-    try {
-      const blocklet = await this.ensureBlocklet(did, { throwOnNotExist: false });
-
-      if (!blocklet) {
-        return null;
-      }
-
-      const fromCache = !!cachedBlocklet;
-
-      // if from cached data, only use cache data of runtime info (engine, diskInfo, runtimeInfo...)
-      if (fromCache) {
-        const cached = {};
-        forEachBlockletSync(cachedBlocklet, (component, { id }) => {
-          cached[id] = component;
-        });
-
-        Object.assign(blocklet, pick(cachedBlocklet, ['appRuntimeInfo', 'diskInfo']));
-
-        forEachBlockletSync(blocklet, (component, { id }) => {
-          if (cached[id]) {
-            Object.assign(component, pick(cached[id], ['runtimeInfo']));
-          }
-        });
-      }
-
-      // 处理 domainAliases#value SLOT_FOR_IP_DNS_SITE
-      if (blocklet?.site?.domainAliases?.length) {
-        const nodeIp = await getAccessibleExternalNodeIp(nodeInfo);
-        blocklet.site.domainAliases = blocklet.site.domainAliases.map((x) => ({
-          ...x,
-          value: util.replaceDomainSlot({ domain: x.value, context, nodeIp }),
-        }));
-      }
-
-      // app runtime info, app status
-      blocklet.appRuntimeInfo = this.runtimeMonitor.getRuntimeInfo(blocklet.meta.did);
-
-      if (!fromCache) {
-        // app disk info, component runtime info, component status, component engine
-        await forEachBlocklet(blocklet, async (component, { level }) => {
-          component.engine = getEngine(getBlockletEngineNameByPlatform(component.meta)).describe();
-
-          if (level === 0) {
-            component.diskInfo = await getDiskInfo(component, {
-              useFakeDiskInfo: !diskInfo,
-            });
-          }
-
-          component.runtimeInfo = this.runtimeMonitor.getRuntimeInfo(blocklet.meta.did, component.env.id);
-
-          if (component.runtimeInfo?.status && shouldUpdateBlockletStatus(component.status)) {
-            component.status = statusMap[component.runtimeInfo.status];
-          }
-        });
-      }
-
-      return blocklet;
-    } catch (err) {
-      const simpleState = await states.blocklet.getBlocklet(did);
-      logger.error('failed to get blocklet info', {
-        did,
-        name: get(simpleState, 'meta.name'),
-        status: get(simpleState, 'status'),
-        error: err,
-      });
-      return simpleState;
-    }
-  }
-
   async refreshListCache() {
     this.list({ useCache: false }).catch((err) => {
       logger.error('refresh blocklet list failed', { error: err });
@@ -1981,7 +1911,7 @@ class BlockletManager extends BaseBlockletManager {
 
   async onCheckIfStarted(jobInfo, { throwOnError } = {}) {
     const { did, context, minConsecutiveTime = 5000, timeout } = jobInfo;
-    const blocklet = await this.ensureBlocklet(did);
+    const blocklet = await this.getBlocklet(did);
 
     const { meta } = blocklet;
     const { name } = meta;
@@ -2022,7 +1952,7 @@ class BlockletManager extends BaseBlockletManager {
   }
 
   async updateBlockletEnvironment(did) {
-    const blockletWithEnv = await this.ensureBlocklet(did);
+    const blockletWithEnv = await this.getBlocklet(did);
     const blocklet = await states.blocklet.getBlocklet(did);
     const nodeInfo = await states.node.read();
 
@@ -2650,6 +2580,80 @@ class BlockletManager extends BaseBlockletManager {
     ];
   }
 
+  async _attachRuntimeInfo({ did, nodeInfo, diskInfo = true, context, cachedBlocklet }) {
+    if (!did) {
+      throw new Error('did should not be empty');
+    }
+
+    try {
+      const blocklet = await this.getBlocklet(did, { throwOnNotExist: false });
+
+      if (!blocklet) {
+        return null;
+      }
+
+      const fromCache = !!cachedBlocklet;
+
+      // if from cached data, only use cache data of runtime info (engine, diskInfo, runtimeInfo...)
+      if (fromCache) {
+        const cached = {};
+        forEachBlockletSync(cachedBlocklet, (component, { id }) => {
+          cached[id] = component;
+        });
+
+        Object.assign(blocklet, pick(cachedBlocklet, ['appRuntimeInfo', 'diskInfo']));
+
+        forEachBlockletSync(blocklet, (component, { id }) => {
+          if (cached[id]) {
+            Object.assign(component, pick(cached[id], ['runtimeInfo']));
+          }
+        });
+      }
+
+      // 处理 domainAliases#value SLOT_FOR_IP_DNS_SITE
+      if (blocklet?.site?.domainAliases?.length) {
+        const nodeIp = await getAccessibleExternalNodeIp(nodeInfo);
+        blocklet.site.domainAliases = blocklet.site.domainAliases.map((x) => ({
+          ...x,
+          value: util.replaceDomainSlot({ domain: x.value, context, nodeIp }),
+        }));
+      }
+
+      // app runtime info, app status
+      blocklet.appRuntimeInfo = this.runtimeMonitor.getRuntimeInfo(blocklet.meta.did);
+
+      if (!fromCache) {
+        // app disk info, component runtime info, component status, component engine
+        await forEachBlocklet(blocklet, async (component, { level }) => {
+          component.engine = getEngine(getBlockletEngineNameByPlatform(component.meta)).describe();
+
+          if (level === 0) {
+            component.diskInfo = await getDiskInfo(component, {
+              useFakeDiskInfo: !diskInfo,
+            });
+          }
+
+          component.runtimeInfo = this.runtimeMonitor.getRuntimeInfo(blocklet.meta.did, component.env.id);
+
+          if (component.runtimeInfo?.status && shouldUpdateBlockletStatus(component.status)) {
+            component.status = statusMap[component.runtimeInfo.status];
+          }
+        });
+      }
+
+      return blocklet;
+    } catch (err) {
+      const simpleState = await states.blocklet.getBlocklet(did);
+      logger.error('failed to get blocklet info', {
+        did,
+        name: get(simpleState, 'meta.name'),
+        status: get(simpleState, 'status'),
+        error: err,
+      });
+      return simpleState;
+    }
+  }
+
   async _syncBlockletStatus() {
     const run = async (blocklet) => {
       try {
@@ -2898,6 +2902,7 @@ class BlockletManager extends BaseBlockletManager {
    */
   async _installBlocklet({ did, oldBlocklet, context }) {
     try {
+      // should ensure blocklet integrity
       let blocklet = await this.ensureBlocklet(did);
       const { meta, source, deployedFrom } = blocklet;
 
@@ -2914,13 +2919,13 @@ class BlockletManager extends BaseBlockletManager {
 
       // Add environments
       await this.updateBlockletEnvironment(meta.did);
-      blocklet = await this.ensureBlocklet(did);
+      blocklet = await this.getBlocklet(did);
 
       // post install
       await this._runPostInstallHook(blocklet, context);
 
       await states.blocklet.setBlockletStatus(did, BlockletStatus.installed);
-      blocklet = await this.ensureBlocklet(did);
+      blocklet = await this.getBlocklet(did);
       logger.info('blocklet installed', { source, did: meta.did });
 
       await fs.writeFile(path.join(blocklet.env.dataDir, 'logo.svg'), createDidLogo(blocklet.meta.did));
@@ -3005,6 +3010,7 @@ class BlockletManager extends BaseBlockletManager {
       await states.blocklet.upgradeBlocklet({ meta, source, deployedFrom, children });
       await this._setConfigsFromMeta(did);
 
+      // should ensure blocklet integrity
       let blocklet = await this.ensureBlocklet(did);
 
       // pre install
@@ -3012,7 +3018,7 @@ class BlockletManager extends BaseBlockletManager {
 
       // Add environments
       await this.updateBlockletEnvironment(did);
-      blocklet = await this.ensureBlocklet(did);
+      blocklet = await this.getBlocklet(did);
 
       // post install
       await this._runPostInstallHook(blocklet, context);
@@ -3052,7 +3058,7 @@ class BlockletManager extends BaseBlockletManager {
         logger.info('started blocklet for upgrading', { did, version });
       }
 
-      blocklet = await this.ensureBlocklet(did, context);
+      blocklet = await this.getBlocklet(did, context);
 
       await fs.writeFile(path.join(blocklet.env.dataDir, 'logo.svg'), createDidLogo(blocklet.meta.did));
 
@@ -3283,7 +3289,7 @@ class BlockletManager extends BaseBlockletManager {
   }
 
   async _setConfigsFromMeta(did, childDid) {
-    const blocklet = await getBlocklet({ states, dataDirs: this.dataDirs, did, validateEnv: false, ensureDirs: false });
+    const blocklet = await getBlocklet({ states, dataDirs: this.dataDirs, did });
 
     if (!childDid) {
       await forEachBlocklet(blocklet, async (b, { ancestors }) => {
@@ -3563,7 +3569,7 @@ class BlockletManager extends BaseBlockletManager {
 
     this.emit(BlockletEvents.appDidChanged, blocklet);
 
-    const blockletWithEnv = await this.ensureBlocklet(blocklet.meta.did);
+    const blockletWithEnv = await this.getBlocklet(blocklet.meta.did);
     const appSystemEnvironments = getAppOverwrittenEnvironments(blockletWithEnv, nodeInfo);
 
     await didDocument.updateBlockletDocument({

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

@@ -71,6 +71,8 @@ module.exports = async ({ url, blockletSecretKey, moveDir, context = {}, states,
     const skConfig = extra.configs.find((x) => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SK);
     if (skConfig) {
       skConfig.value = blockletSecretKey;
+      skConfig.secure = true;
+      skConfig.shared = false;
     } else {
       extra.configs.push({
         key: BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SK,

package/lib/router/helper.js

@@ -21,6 +21,7 @@ const {
   DOMAIN_FOR_INTERNAL_SITE,
   WELLKNOWN_PATH_PREFIX,
   WELLKNOWN_SERVICE_PATH_PREFIX,
+  USER_AVATAR_PATH_PREFIX,
   DOMAIN_FOR_IP_SITE,
   NAME_FOR_WELLKNOWN_SITE,
   DEFAULT_HTTP_PORT,
@@ -210,6 +211,9 @@ const ensureLatestInterfaceInfo = async (sites = []) => {
       if (rule.isProtected && rule.to.target === WELLKNOWN_SERVICE_PATH_PREFIX) {
         return rule;
       }
+      if (rule.isProtected && rule.to.target === joinUrl(WELLKNOWN_SERVICE_PATH_PREFIX, USER_AVATAR_PATH_PREFIX)) {
+        return rule;
+      }
 
       const { did, interfaceName } = rule.to;
       if (interfaces[did] && interfaces[did][interfaceName]) {
@@ -273,6 +277,18 @@ const ensureWellknownRule = async (sites) => {
         if (!site.rules.some((x) => x.from.pathPrefix === servicePathPrefix)) {
           const rule = cloneDeep(rootBlockletRule || blockletRules[0]);
           rule.from.pathPrefix = servicePathPrefix;
+          rule.to.target = servicePathPrefix;
+          rule.isProtected = true;
+          site.rules.push(rule);
+        }
+
+        // Cache user avatar in nginx
+        const avatarPathPrefix = joinUrl(servicePathPrefix, USER_AVATAR_PATH_PREFIX);
+        if (!site.rules.some((x) => x.from.pathPrefix === avatarPathPrefix)) {
+          const rule = cloneDeep(rootBlockletRule || blockletRules[0]);
+          rule.from.pathPrefix = avatarPathPrefix;
+          rule.to.cacheGroup = 'blockletProxy';
+          rule.to.target = avatarPathPrefix;
           rule.isProtected = true;
           site.rules.push(rule);
         }
@@ -321,7 +337,12 @@ const filterSitesForRemovedBlocklets = async (sites = []) => {
     }
 
     const did = getDidFromDomainGroupName(site.domain);
-    return blocklets.some((x) => x.meta.did === did);
+    const blocklet = blocklets.find((x) => x.meta.did === did);
+    if (blocklet) {
+      site.mode = blocklet.mode;
+    }
+
+    return !!blocklet;
   });
 };
 
@@ -1125,7 +1146,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
       // Ensure we have system rules for blocklets
       const blocklets = await blockletState.getBlocklets();
       const ensureBlocklet = async (x) => {
-        const blocklet = await blockletManager.ensureBlocklet(x.meta.did);
+        const blocklet = await blockletManager.getBlocklet(x.meta.did);
         return ensureBlockletRouting(blocklet, context);
       };
       const ensureBlockletResults = await Promise.all(blocklets.map((x) => ensureBlocklet(x)));

package/lib/router/index.js

@@ -10,7 +10,7 @@ const {
   BLOCKLET_SITE_GROUP_SUFFIX,
   GATEWAY_REQ_LIMIT,
 } = require('@abtnode/constant');
-const { BLOCKLET_UI_INTERFACES } = require('@blocklet/constant');
+const { BLOCKLET_UI_INTERFACES, BLOCKLET_MODES } = require('@blocklet/constant');
 const logger = require('@abtnode/logger')('@abtnode/core:router');
 
 const expandSites = (sites = []) => {
@@ -208,6 +208,7 @@ Router.formatSites = (sites = []) => {
               port: daemonRule.to.port,
               did: rule.to.did,
               componentId: rule.to.componentId,
+              cacheGroup: site.mode === BLOCKLET_MODES.PRODUCTION ? 'blockletJs' : '',
             },
           });
           site.rules.push({
@@ -221,6 +222,7 @@ Router.formatSites = (sites = []) => {
               port: daemonRule.to.port,
               did: rule.to.did,
               componentId: rule.to.componentId,
+              cacheGroup: site.mode === BLOCKLET_MODES.PRODUCTION ? 'blockletJs' : '',
             },
           });
 
@@ -233,6 +235,7 @@ Router.formatSites = (sites = []) => {
               did: rule.to.did,
               type: ROUTING_RULE_TYPES.DAEMON,
               target: BLOCKLET_PROXY_PATH_PREFIX,
+              cacheGroup: site.mode === BLOCKLET_MODES.PRODUCTION ? 'blockletProxy' : '',
             },
           });
         }

package/lib/states/blocklet.js

@@ -53,6 +53,9 @@ const formatBlocklet = (blocklet, phase, dek) => {
       if (!env) {
         return;
       }
+      // salt in blocklet state is different from the salt in blocklet-extra state
+      // in blocklet-extra state, salt is app meta did in each component
+      // in blocklet state, salt is component meta did in each component
       if (phase === 'onUpdate' && isHex(env.value) === true) {
         env.value = security.encrypt(env.value, b.meta.did, dek);
       }

package/lib/util/blocklet.js

@@ -142,8 +142,9 @@ const PRIVATE_NODE_ENVS = [
  */
 const getComponentDirs = (
   component,
-  { dataDirs, ensure = false, e2eMode = false, validate = true, ancestors = [] } = {}
+  { dataDirs, ensure = false, e2eMode = false, validate = false, ancestors = [] } = {}
 ) => {
+  // FIXME 这个函数做了太多的事
   // get data dirs
 
   const { name: appName } = ancestors.concat(component)[0].meta;
@@ -1360,9 +1361,8 @@ const getBlocklet = async ({
   dataDirs,
   states,
   e2eMode = false,
-  validateEnv = true,
   throwOnNotExist = true,
-  ensureDirs = true,
+  ensureIntegrity = false,
 } = {}) => {
   if (!did) {
     throw new Error('Blocklet did does not exist');
@@ -1381,7 +1381,7 @@ const getBlocklet = async ({
 
   const blocklet = await states.blocklet.getBlocklet(did);
   if (!blocklet) {
-    if (throwOnNotExist) {
+    if (throwOnNotExist || ensureIntegrity) {
       throw new Error(`can not find blocklet in database by did ${did}`);
     }
     return null;
@@ -1418,8 +1418,8 @@ const getBlocklet = async ({
       processId: getComponentProcessId(component, ancestors),
       ...getComponentDirs(component, {
         dataDirs,
-        ensure: ensureDirs,
-        validate: validateEnv,
+        ensure: ensureIntegrity,
+        validate: ensureIntegrity,
         ancestors,
         e2eMode: level === 0 ? e2eMode : false,
       }),
@@ -1554,6 +1554,9 @@ const createDataArchive = (dataDir, fileName) => {
 const validateAppConfig = async (config, blockletDid, states) => {
   const x = config;
 
+  // sk should be force secured while other app prop should not be secured
+  config.secure = x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SK;
+
   if (x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SK) {
     if (x.value) {
       try {

package/lib/validators/router.js

@@ -1,6 +1,6 @@
 /* eslint-disable newline-per-chained-call */
 const Joi = require('joi');
-const { DOMAIN_FOR_DEFAULT_SITE, ROUTING_RULE_TYPES } = require('@abtnode/constant');
+const { DOMAIN_FOR_DEFAULT_SITE, ROUTING_RULE_TYPES, ROUTER_CACHE_GROUPS } = require('@abtnode/constant');
 const { getMultipleLangParams } = require('./util');
 
 const WILDCARD_DOMAIN_REGEX = /^\*.(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]/;
@@ -62,6 +62,12 @@ const ruleSchema = {
         then: Joi.required(),
       }),
     componentId: Joi.string().label('component id'), // component global id
+    // FUTURE: blocklets can register routing rules for provider cache
+    cacheGroup: Joi.string()
+      .label('cache group')
+      .valid(...Object.keys(ROUTER_CACHE_GROUPS))
+      .allow('')
+      .default(''),
   },
 
   // List of services that manipulate the request before the upstream blocklet

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.65-beta-5405baf2",
+  "version": "1.8.65-beta-f7af64a4",
   "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.8.65-beta-5405baf2",
-    "@abtnode/certificate-manager": "1.8.65-beta-5405baf2",
-    "@abtnode/constant": "1.8.65-beta-5405baf2",
-    "@abtnode/cron": "1.8.65-beta-5405baf2",
-    "@abtnode/db": "1.8.65-beta-5405baf2",
-    "@abtnode/logger": "1.8.65-beta-5405baf2",
-    "@abtnode/queue": "1.8.65-beta-5405baf2",
-    "@abtnode/rbac": "1.8.65-beta-5405baf2",
-    "@abtnode/router-provider": "1.8.65-beta-5405baf2",
-    "@abtnode/static-server": "1.8.65-beta-5405baf2",
-    "@abtnode/timemachine": "1.8.65-beta-5405baf2",
-    "@abtnode/util": "1.8.65-beta-5405baf2",
+    "@abtnode/auth": "1.8.65-beta-f7af64a4",
+    "@abtnode/certificate-manager": "1.8.65-beta-f7af64a4",
+    "@abtnode/constant": "1.8.65-beta-f7af64a4",
+    "@abtnode/cron": "1.8.65-beta-f7af64a4",
+    "@abtnode/db": "1.8.65-beta-f7af64a4",
+    "@abtnode/logger": "1.8.65-beta-f7af64a4",
+    "@abtnode/queue": "1.8.65-beta-f7af64a4",
+    "@abtnode/rbac": "1.8.65-beta-f7af64a4",
+    "@abtnode/router-provider": "1.8.65-beta-f7af64a4",
+    "@abtnode/static-server": "1.8.65-beta-f7af64a4",
+    "@abtnode/timemachine": "1.8.65-beta-f7af64a4",
+    "@abtnode/util": "1.8.65-beta-f7af64a4",
     "@arcblock/did": "1.18.37",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/did-util": "1.18.37",
@@ -38,9 +38,9 @@
     "@arcblock/jwt": "^1.18.37",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "1.18.37",
-    "@blocklet/constant": "1.8.65-beta-5405baf2",
-    "@blocklet/meta": "1.8.65-beta-5405baf2",
-    "@blocklet/sdk": "1.8.65-beta-5405baf2",
+    "@blocklet/constant": "1.8.65-beta-f7af64a4",
+    "@blocklet/meta": "1.8.65-beta-f7af64a4",
+    "@blocklet/sdk": "1.8.65-beta-f7af64a4",
     "@did-space/client": "^0.1.66",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.37",
@@ -88,5 +88,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "e5dc838baded7031096118462a604fd70d78ff1c"
+  "gitHead": "97607d6e12bf8508ac29ab6546110c4ae3b31a82"
 }