@abtnode/core 1.16.16-beta-d8a9fb09 → 1.16.16-beta-740ea329

package/lib/api/node.js

@@ -143,7 +143,7 @@ class NodeAPI {
 
   // eslint-disable-next-line no-unused-vars
   async getHistory({ hours = 1 } = {}, context) {
-    const history = await this.runtimeMonitor.getHistory();
+    const history = await this.runtimeMonitor.getHistory(hours);
     return getHistoryList({
       history,
       hours,

package/lib/blocklet/extras.js

@@ -6,15 +6,26 @@ const { BLOCKLET_CONFIGURABLE_KEY } = require('@blocklet/constant');
 const removeDeletedMetaConfigs = (oldConfigs, newConfigs) =>
   oldConfigs.filter((old) => newConfigs.some(({ key, name }) => [key, name].includes(old.key)));
 
+/**
+ * 从 blocklet.yml:environment 中导入配置：配置项字段是 name
+ * 主动配置：配置项字段是 key
+ *
+ * 自定义配置(customConfigs): 配置项的 custom 为 true
+ * 系统配置(appConfigs): 系统保留的配置项名，且 custom 为 false
+ * 组件配置(metaConfigs): 配置项的 custom 为 false, 且不是系统保留的配置项名
+ *   如果从 blocklet.yml 中导入组件配置，会删除已经删除的配置项
+ */
 const mergeConfigs = ({ old: oldConfigs, cur: newConfigs = [], did = '', dek = '' }) => {
   const enableSecurity = dek && did;
-  const isUpdatingCustomConfig = newConfigs.every((x) => x.key);
+
+  const isConfigFromMeta = newConfigs.every((x) => x.key);
 
   const customConfigs = (oldConfigs || []).filter((x) => x.custom);
   const appConfigs = (oldConfigs || []).filter((x) => !x.custom && !!BLOCKLET_CONFIGURABLE_KEY[x.key]);
 
   const allMetaConfigs = (oldConfigs || []).filter((x) => !x.custom && !BLOCKLET_CONFIGURABLE_KEY[x.key]);
-  const metaConfigs = isUpdatingCustomConfig ? allMetaConfigs : removeDeletedMetaConfigs(allMetaConfigs, newConfigs);
+
+  const metaConfigs = isConfigFromMeta ? allMetaConfigs : removeDeletedMetaConfigs(allMetaConfigs, newConfigs);
 
   // oldConfig 表示从数据库中可以用的字段
   const oldConfig = [...metaConfigs, ...appConfigs, ...customConfigs].reduce((acc, x) => {
@@ -65,16 +76,15 @@ const mergeConfigs = ({ old: oldConfigs, cur: newConfigs = [], did = '', dek = '
     const { name, key, value, default: defaultVal, required, description, secure, validation, custom, shared } = config;
     // 新增、更新或者删除
     if (key) {
-      const originalVal = oldConfig[key] || {};
+      const origin = oldConfig[key] || {};
       oldConfig[key] = {
-        ...originalVal,
         value,
-        required: required === undefined ? false : required,
-        description: description || '',
-        validation: validation || '',
-        secure: secure === undefined ? false : secure,
-        custom: custom === undefined ? false : custom,
-        shared,
+        required: required === undefined ? !!origin.required : required,
+        description: description || origin.description || '',
+        validation: validation || origin.validation || '',
+        secure: secure === undefined ? !!origin.secure : secure,
+        custom: custom === undefined ? !!origin.custom : custom,
+        shared: shared === undefined ? origin.shared : shared,
       };
       return;
     }

package/lib/blocklet/manager/config-synchronizer.js

@@ -64,7 +64,7 @@ class ConfigSynchronizer {
       const component = findComponentByIdV2(app, did);
       const env = {
         ...component.configObj,
-        ...getSharedConfigObj(component, [app]),
+        ...getSharedConfigObj(app, component),
       };
 
       const componentApiKey = getComponentApiKey({

package/lib/blocklet/manager/disk.js

@@ -115,7 +115,6 @@ const {
   filterDuplicateComponents,
   getBundleDir,
   getBlocklet,
-  ensureEnvDefault,
   getConfigFromPreferences,
   validateAppConfig,
   checkDuplicateMountPoint,
@@ -132,6 +131,9 @@ const {
   ensureAppPortsNotOccupied,
   getComponentNamesWithVersion,
   updateDidDocument: updateBlockletDocument,
+  getAppConfigsFromComponent,
+  removeAppConfigsFromComponent,
+  getConfigsFromInput,
 } = require('../../util/blocklet');
 const { getDidDomainForBlocklet } = require('../../util/get-domain-for-blocklet');
 const states = require('../../states');
@@ -472,7 +474,7 @@ class DiskBlockletManager extends BaseBlockletManager {
       // check required config
       for (const component of blocklet1.children) {
         if (!shouldSkipComponent(component.meta.did, componentDids)) {
-          const missingProps = getComponentMissingConfigs(component, [blocklet1]);
+          const missingProps = getComponentMissingConfigs(component, blocklet1);
           if (missingProps.length) {
             throw new Error(
               `Missing required configuration to start ${component.meta.title}: ${missingProps
@@ -931,7 +933,13 @@ class DiskBlockletManager extends BaseBlockletManager {
     fs.removeSync(path.join(app.env.dataDir, APP_CONFIG_DIR, child.meta.did, COMPONENT_ENV_FILE_NAME));
     if (keepData === false) {
       fs.removeSync(dataDir);
+
+      const componentEnvs = await states.blockletExtras.getConfigs([app.meta.did, child.meta.did]);
       await states.blockletExtras.delConfigs([app.meta.did, child.meta.did]);
+
+      // remove app configs if no component use it
+      const tmpApp = await this.getBlocklet(rootDid);
+      await removeAppConfigsFromComponent(componentEnvs, tmpApp, states.blockletExtras);
     }
 
     const newBlocklet = await this.getBlocklet(rootDid);
@@ -1149,9 +1157,17 @@ class DiskBlockletManager extends BaseBlockletManager {
         }
         await validateAppConfig(x, states);
       } else if (!BLOCKLET_CONFIGURABLE_KEY[x.key] && !isPreferenceKey(x)) {
-        if (!(blocklet.meta.environments || []).some((y) => y.name === x.key)) {
+        const hasEnvInMeta = (b) => (b.meta.environments || []).some((y) => y.name === x.key);
+        if (!hasEnvInMeta(blocklet)) {
           // forbid unknown format key
-          throw new Error(`unknown format key: ${x.key}`);
+          if (
+            // config should in component.meta.environments
+            childDid ||
+            // config should in app.meta.environments and or in one of component.meta.environments
+            !(blocklet.children || []).some(hasEnvInMeta)
+          ) {
+            throw new Error(`unknown format key: ${x.key}`);
+          }
         }
       }
 
@@ -1183,7 +1199,18 @@ class DiskBlockletManager extends BaseBlockletManager {
     Object.assign(blocklet.configObj, configObj);
 
     // update db
-    await states.blockletExtras.setConfigs([rootMetaDid, childDid].filter(Boolean), newConfigs);
+    if (childDid) {
+      const { sharedConfigs, selfConfigs } = getConfigsFromInput(newConfigs, blocklet.configs);
+
+      if (sharedConfigs.length) {
+        await states.blockletExtras.setConfigs([rootMetaDid], sharedConfigs);
+      }
+      if (selfConfigs.length) {
+        await states.blockletExtras.setConfigs([rootMetaDid, childDid], selfConfigs);
+      }
+    } else {
+      await states.blockletExtras.setConfigs([rootMetaDid], newConfigs);
+    }
 
     if (willAppSkChange) {
       const info = await states.node.read();
@@ -1479,7 +1506,7 @@ class DiskBlockletManager extends BaseBlockletManager {
   // eslint-disable-next-line no-unused-vars
   async getRuntimeHistory({ did, hours }, context) {
     const metaDid = await states.blocklet.getBlockletMetaDid(did);
-    const history = await this.runtimeMonitor.getHistory(metaDid);
+    const history = await this.runtimeMonitor.getHistory(metaDid, hours);
 
     return getHistoryList({
       history,
@@ -2665,13 +2692,14 @@ class DiskBlockletManager extends BaseBlockletManager {
       // delete old process
       try {
         await this.deleteProcess({ did, componentDids }, context);
-        logger.info('delete blocklet process for upgrading', { did, name });
+        logger.info('delete blocklet process for upgrading', { did, componentDids });
       } catch (err) {
-        logger.error('delete blocklet process for upgrading', { did, name, error: err });
+        logger.error('delete blocklet process for upgrading', { did, componentDids, error: err });
       }
 
       // update state
       await states.blocklet.upgradeBlocklet({ meta, source, deployedFrom, children });
+      logger.info('updated blocklet for upgrading', { did, componentDids, source, name });
       // ensure component status is upgrading
       await states.blocklet.setBlockletStatus(did, BlockletStatus.upgrading, { componentDids });
       await this._setConfigsFromMeta(did);
@@ -2689,20 +2717,22 @@ class DiskBlockletManager extends BaseBlockletManager {
       // post install
       await this._runPostInstallHook(blocklet, context);
 
-      logger.info('start migration');
+      logger.info('start migration on upgrading', { did, componentDids });
       {
         const oldVersions = {};
-        forEachBlockletSync(oldBlocklet, (b, { id }) => {
-          oldVersions[id] = b.meta.version;
+        forEachComponentV2Sync(oldBlocklet, (b) => {
+          if (componentDids.includes(b.meta.did)) {
+            oldVersions[b.meta.did] = b.meta.version;
+          }
         });
         const nodeEnvironments = await states.node.getEnvironments();
-        const runMigration = async (b, { id, ancestors }) => {
+        const runMigration = async (b) => {
           try {
             await runMigrationScripts({
               blocklet: b,
               appDir: b.env.appDir,
-              env: getRuntimeEnvironments(b, nodeEnvironments, ancestors),
-              oldVersion: oldVersions[id],
+              env: getRuntimeEnvironments(b, nodeEnvironments, [blocklet]),
+              oldVersion: oldVersions[b.meta.did],
               newVersion: b.meta.version,
               ...getHooksOutputFiles(b),
             });
@@ -2712,11 +2742,9 @@ class DiskBlockletManager extends BaseBlockletManager {
             throw error;
           }
         };
-        await forEachBlocklet(blocklet, runMigration, { parallel: true });
+        await forEachComponentV2(blocklet, runMigration, { parallel: true, concurrencyLimit: 2 });
       }
-      logger.info('end migration');
-
-      logger.info('updated blocklet for upgrading', { did, version, source, name });
+      logger.info('done migration on upgrading', { did, componentDids });
 
       if (oldBlocklet.status === BlockletStatus.running) {
         try {
@@ -2917,7 +2945,7 @@ class DiskBlockletManager extends BaseBlockletManager {
       // rollback blocklet extra state
       await states.blockletExtras.update({ did: blocklet.meta.did }, extraState);
 
-      logger.info('blocklet rollback successfully', { did });
+      logger.info('blocklet rollback successfully', { did, action });
       this.emit(BlockletEvents.updated, result);
       return result;
     }
@@ -2995,38 +3023,40 @@ class DiskBlockletManager extends BaseBlockletManager {
   async _setConfigsFromMeta(did, childDid) {
     const blocklet = await getBlocklet({ states, dataDirs: this.dataDirs, did });
 
-    if (!childDid) {
-      await forEachBlocklet(blocklet, async (b, { ancestors }) => {
-        const environments = [...get(b.meta, 'environments', []), ...getConfigFromPreferences(b)];
+    const setConfig = async (app, component) => {
+      const b = component || app;
+      const environments = [...get(b.meta, 'environments', []), ...getConfigFromPreferences(b)];
 
-        // remove default if ancestors has a value
-        ensureEnvDefault(environments, ancestors);
+      // write configs to db
+      await states.blockletExtras.setConfigs([app.meta.did, component?.meta?.did].filter(Boolean), environments);
 
-        // write configs to db
-        await states.blockletExtras.setConfigs([...ancestors.map((x) => x.meta.did), b.meta.did], environments);
+      if (component) {
+        const envsInApp = await states.blockletExtras.getConfigs([app.appPid]);
+        const envsInComponent = await states.blockletExtras.getConfigs([app.meta.did, component.meta.did]);
 
-        // chain config
-        await this._ensureAppChainConfig(
-          blocklet.meta.did,
-          environments.map((x) => ({ key: x.name, value: x.default })),
-          { force: false }
-        );
+        const configs = getAppConfigsFromComponent({ environments }, envsInApp, envsInComponent);
+        if (configs.length) {
+          await states.blockletExtras.setConfigs(app.meta.did, configs);
+        }
+      }
+
+      // chain config
+      await this._ensureAppChainConfig(
+        blocklet.appPid,
+        environments.map((x) => ({ key: x.name, value: x.default })),
+        { force: false }
+      );
+    };
+
+    if (!childDid) {
+      await setConfig(blocklet);
+      await forEachComponentV2(blocklet, async (component) => {
+        await setConfig(blocklet, component);
       });
     } else {
-      const child = blocklet.children.find((x) => x.meta.did === childDid);
-      await forEachBlocklet(child, async (b, { ancestors }) => {
-        await states.blockletExtras.setConfigs(
-          [blocklet.meta.did, ...ancestors.map((x) => x.meta.did), b.meta.did],
-          [...get(b.meta, 'environments', []), ...getConfigFromPreferences(child)]
-        );
+      const component = blocklet.children.find((x) => x.meta.did === childDid);
 
-        // chain config
-        await this._ensureAppChainConfig(
-          blocklet.meta.did,
-          get(b.meta, 'environments', []).map((x) => ({ key: x.name, value: x.default })),
-          { force: false }
-        );
-      });
+      await setConfig(blocklet, component);
     }
   }
 
@@ -3075,7 +3105,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         ...getHooksOutputFiles(b),
       });
 
-    await forEachBlocklet(blocklet, preInstall, { parallel: true });
+    await forEachBlocklet(blocklet, preInstall, { parallel: true, concurrencyLimit: 2 });
   }
 
   async _runPostInstallHook(blocklet, context) {
@@ -3092,7 +3122,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         ...getHooksOutputFiles(b),
       });
 
-    await forEachBlocklet(blocklet, postInstall, { parallel: true });
+    await forEachBlocklet(blocklet, postInstall, { parallel: true, concurrencyLimit: 2 });
   }
 
   async _createNotification(did, notification) {

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

@@ -1,6 +1,7 @@
 const path = require('path');
 const fs = require('fs-extra');
 const pick = require('lodash/pick');
+const get = require('lodash/get');
 const pRetry = require('p-retry');
 const urlPathFriendly = require('@blocklet/meta/lib/url-path-friendly').default;
 const { slugify } = require('transliteration');
@@ -9,12 +10,7 @@ const { getChainClient } = require('@abtnode/util/lib/get-chain-client');
 
 const logger = require('@abtnode/logger')('@abtnode/core:migrate-application-to-struct-v2');
 
-const {
-  forEachBlockletSync,
-  getSharedConfigObj,
-  getBlockletChainInfo,
-  isInProgress,
-} = require('@blocklet/meta/lib/util');
+const { forEachBlockletSync, getBlockletChainInfo, isInProgress } = require('@blocklet/meta/lib/util');
 const { SLOT_FOR_IP_DNS_SITE, MAIN_CHAIN_ENDPOINT } = require('@abtnode/constant');
 
 const {
@@ -33,6 +29,7 @@ const {
   BLOCKLET_CONFIGURABLE_KEY,
   BLOCKLET_META_FILE,
   BLOCKLET_UPLOADS_DIR,
+  CHAIN_PROP_MAP,
 } = require('@blocklet/constant');
 const { update: updateMetaFile } = require('@blocklet/meta/lib/file');
 const getBlockletWallet = require('@blocklet/meta/lib/wallet');
@@ -363,7 +360,55 @@ const migrateApplicationToStructV2 = async ({ did, appSk: newAppSk, context = {}
       configs: component.configs || [],
     });
 
-    const sharedConfigObj = getSharedConfigObj(component, ancestors);
+    const getSharedConfigObj = () => {
+      const res = {};
+
+      if (!ancestors || !ancestors.length) {
+        return res;
+      }
+
+      for (let i = ancestors.length - 1; i >= 0; i--) {
+        const ancestor = ancestors[i];
+
+        if (Array.isArray(ancestor.configs)) {
+          // eslint-disable-next-line no-loop-func
+          ancestor.configs.forEach(({ key, value, secure, shared }) => {
+            if (res[key]) {
+              return;
+            }
+            if (!value || secure !== false || shared === false || BLOCKLET_CONFIGURABLE_KEY[key]) {
+              return;
+            }
+            const config = (component.configs || []).find((x) => x.key === key);
+
+            if (config && config.value) {
+              return;
+            }
+            res[key] = get(ancestor, `configObj.${key}`) || value;
+          });
+        }
+      }
+
+      // share blocklet app chain config
+      const ancestor = ancestors[0];
+      (ancestor.configs || []).forEach(({ key, value }) => {
+        if (
+          ![
+            BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_CHAIN_HOST,
+            BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_CHAIN_ID,
+            BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_CHAIN_TYPE,
+          ].includes(key)
+        ) {
+          return;
+        }
+
+        res[CHAIN_PROP_MAP[key]] = value;
+      });
+
+      return res;
+    };
+
+    const sharedConfigObj = getSharedConfigObj();
     if (sharedConfigObj) {
       Object.entries(sharedConfigObj).forEach(([key, value]) => {
         if (!extraData.configs.some((x) => x.key === key)) {

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

@@ -2,6 +2,7 @@ const EventEmitter = require('events');
 
 const cloneDeep = require('lodash/cloneDeep');
 const pLimit = require('p-limit');
+const dayjs = require('@abtnode/util/lib/dayjs');
 const { forEachBlocklet, isGatewayBlocklet, hasStartEngine } = require('@blocklet/meta/lib/util');
 const getComponentProcessId = require('@blocklet/meta/lib/get-component-process-id');
 const { EVENTS } = require('@abtnode/constant');
@@ -53,8 +54,12 @@ class BlockletRuntimeMonitor extends EventEmitter {
     this.inProgress = false;
   }
 
-  async getHistory(blockletDid) {
-    const result = await this.states.runtimeInsight.findPaginated({ did: blockletDid });
+  async getHistory(blockletDid, hours = 1) {
+    const result = await this.states.runtimeInsight.findPaginated({
+      did: blockletDid,
+      startDate: dayjs().subtract(hours, 'hours').toDate().getTime(),
+      paging: { pageSize: hours * 360 },
+    });
     return (result.list || []).reverse();
   }
 

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

@@ -1,4 +1,5 @@
 const EventEmitter = require('events');
+const dayjs = require('@abtnode/util/lib/dayjs');
 const pick = require('lodash/pick');
 const cloneDeep = require('lodash/cloneDeep');
 
@@ -93,8 +94,12 @@ class NodeRuntimeMonitor extends EventEmitter {
     return this.data.realtime;
   }
 
-  async getHistory() {
-    const result = await this.state.findPaginated({ did: this.did });
+  async getHistory(hours = 1) {
+    const result = await this.state.findPaginated({
+      did: this.did,
+      startDate: dayjs().subtract(hours, 'hours').toDate().getTime(),
+      paging: { pageSize: hours * 360 },
+    });
     return (result.list || []).reverse();
   }
 

package/lib/router/index.js

@@ -247,7 +247,6 @@ Router.formatSites = (sites = []) => {
           port: daemonRule.to.port,
           did: rule.to.did,
           componentId: rule.to.componentId,
-          cacheGroup: site.mode === BLOCKLET_MODES.PRODUCTION ? 'blockletJs' : '',
           pageGroup: rule.to.pageGroup,
         },
       });
@@ -281,7 +280,6 @@ Router.formatSites = (sites = []) => {
           to: {
             type: ROUTING_RULE_TYPES.DAEMON,
             port: daemonRule.to.port,
-            cacheGroup: site.mode === BLOCKLET_MODES.PRODUCTION ? 'blockletJs' : '',
             pageGroup: rule.to.pageGroup,
             did: rule.to.did,
           },

package/lib/router/manager.js

@@ -140,9 +140,6 @@ class RouterManager extends EventEmitter {
       throw new Error("Can not delete this site because it's protected");
     }
 
-    // validate router config
-    await this.validateRouterConfig('deleteRoutingSite', { id });
-
     const removedSiteCount = await states.site.remove({ id });
 
     if (removedSiteCount === 0) {
@@ -365,9 +362,6 @@ class RouterManager extends EventEmitter {
       throw new Error('Deleting an system protected rule is forbidden');
     }
 
-    // validate router config
-    await this.validateRouterConfig('deleteRoutingRule', { id, ruleId });
-
     // 只要有匹配到的查询条件，不管是否删除成功都不会返回 0，所以这里没用 update 的返回值
     const doc = await states.site.findOne({ id });
     if (doc.rules.some((x) => x.id === ruleId || x.groupId === ruleId)) {
@@ -507,47 +501,34 @@ class RouterManager extends EventEmitter {
   }
 
   async validateRouterConfig(action, data) {
+    logger.info('validateRouterConfig.start', { action, data });
+
     // get data from db
     const info = await states.node.read();
     const httpsEnabled = get(info, 'routing.https', true);
 
     const certificates = httpsEnabled ? await this.certManager.getAllNormal() : [];
 
-    let sites = await states.site.getSites();
+    let site;
+    if (data.site) {
+      site = cloneDeep(data.site);
+    } else if (data.id) {
+      site = await states.site.getSiteById(data.id);
+    }
+
     // mutate data by input
     const mutations = {
-      addRoutingRule: ({ id, rule }) => {
-        sites.forEach((site) => {
-          if (site.id === id) {
-            site.rules.push(rule);
-          }
-        });
-      },
-      updateRoutingRule: ({ id, rule }) => {
-        sites.forEach((site) => {
-          if (site.id === id) {
-            site.rules = site.rules.map((x) => {
-              if (x.id === rule.id) {
-                return rule;
-              }
-              return x;
-            });
-          }
-        });
+      addRoutingRule: ({ rule }) => {
+        site.rules.push(rule);
       },
-      deleteRoutingRule: ({ id, ruleId }) => {
-        sites.forEach((site) => {
-          if (site.id === id) {
-            site.rules = site.rules.filter((rule) => rule.id !== ruleId);
+      updateRoutingRule: ({ rule }) => {
+        site.rules = site.rules.map((x) => {
+          if (x.id === rule.id) {
+            return rule;
           }
+          return x;
         });
       },
-      addRoutingSite: ({ site }) => {
-        sites.push(site);
-      },
-      deleteRoutingSite: ({ id }) => {
-        sites = sites.filter((site) => site.id !== id);
-      },
     };
     if (mutations[action]) {
       mutations[action](cloneDeep(data));
@@ -557,11 +538,12 @@ class RouterManager extends EventEmitter {
     const providerName = getProviderFromNodeInfo(info);
     const Provider = getProvider(providerName);
     const tmpDir = path.join(os.tmpdir(), `${providerName}-${Date.now()}`);
-    const provider = new Provider({ configDir: tmpDir });
+    // disable cache to reduce nginx reload time and memory consumption
+    const provider = new Provider({ configDir: tmpDir, cacheEnabled: false });
     const tempRouter = new Router({
       provider,
       getRoutingParams: async () => ({
-        sites: await ensureLatestInfo(sites),
+        sites: await ensureLatestInfo([site]),
         certificates,
         commonHeaders: get(info, 'routing.headers', {}),
         services: [], // TODO: do we need to add some item here?
@@ -573,9 +555,10 @@ class RouterManager extends EventEmitter {
     try {
       await tempRouter.validateConfig();
       await fse.remove(tmpDir);
+      logger.info('validateRouterConfig.done', { action, data });
     } catch (error) {
       // 如果出错，保留 Nginx 配置文件，方便定位问题
-      logger.error('validate router config failed', { error, action, data });
+      logger.error('validateRouterConfig.failed', { error, action, data });
       throw error;
     }
   }

package/lib/states/index.js

@@ -42,7 +42,7 @@ const init = (dataDirs, config = {}) => {
   const jobState = new JobState(models.Job, config);
   const backupState = new BackupState(models.Backup, config);
   const trafficInsight = new TrafficInsightState(models.TrafficInsight, config);
-  const runtimeInsight = new RuntimeInsightState(models.RuntimeInsight, config);
+  const runtimeInsight = new RuntimeInsightState(models.RuntimeInsight, { ...config, maxPageSize: 8640 });
 
   return {
     node: nodeState,

package/lib/states/runtime-insight.js

@@ -5,7 +5,6 @@ const BaseState = require('./base');
  * @extends BaseState<import('@abtnode/models').RuntimeInsightState>
  */
 class RuntimeInsight extends BaseState {
-  // fetch data for recent hour
   findPaginated({ did = '', startDate = '', endDate = '', paging = { pageSize: 360 } } = {}) {
     const where = {};
     if (did) {

package/lib/states/site.js

@@ -51,6 +51,10 @@ class SiteState extends BaseState {
     return sites.filter((x) => x.rules.some((r) => r.to?.did === did));
   }
 
+  getSiteById(id) {
+    return this.findOne({ id });
+  }
+
   async getSiteByRuleId(id, ruleId) {
     const site = await this.findOne({ id });
     if (site && site.rules.some((r) => r.id === ruleId)) {

package/lib/util/blocklet.js

@@ -85,12 +85,12 @@ const {
   forEachComponentV2Sync,
   getSharedConfigObj,
   getComponentName,
-  isEnvShareable,
   getBlockletAppIdList,
   getChainInfo,
   isInProgress,
   isRunning,
   hasStartEngine,
+  isEnvShareable,
 } = require('@blocklet/meta/lib/util');
 const { getComponentsInternalInfo } = require('@blocklet/meta/lib/blocklet');
 const { titleSchema, descriptionSchema, logoSchema } = require('@blocklet/meta/lib/schema');
@@ -419,7 +419,7 @@ const getRuntimeEnvironments = (blocklet, nodeEnvironments, ancestors) => {
 
   const env = {
     ...blocklet.configObj,
-    ...getSharedConfigObj(blocklet, ancestors),
+    ...getSharedConfigObj((ancestors || [])[0], blocklet),
     ...blocklet.environmentObj,
     ...devEnvironments,
     BLOCKLET_WEB_PORTS: JSON.stringify(ports),
@@ -499,7 +499,8 @@ const startBlockletProcess = async (
     throw new Error('blocklet should not be empty');
   }
 
-  const now = Date.now();
+  // 需要在在这里传入字符串类型，否则进程中如法转化成 Date 对象
+  const now = `${new Date()}`;
 
   await forEachBlocklet(
     blocklet,
@@ -515,12 +516,12 @@ const startBlockletProcess = async (
       const { processId, logsDir, appDir } = b.env;
 
       if (skippedProcessIds.includes(processId)) {
-        logger.info(`skip start skipped process ${processId}`);
+        logger.info('skip start skipped process', { processId });
         return;
       }
 
       if (shouldSkipComponent(b.meta.did, componentDids)) {
-        logger.info(`skip start process not selected: ${b.meta.did}`, { processId });
+        logger.info('skip start process not selected', { processId });
         return;
       }
 
@@ -616,14 +617,14 @@ const startBlockletProcess = async (
       if (status === BlockletStatus.error) {
         throw new Error(`${processId} is not running within 3 seconds`);
       }
-      logger.info('blocklet started', { processId, status, time: Date.now() - startedAt });
+      logger.info('done start blocklet', { processId, status, time: Date.now() - startedAt });
 
       // run hook
       postStart(b, { env }).catch((err) => {
         logger.error('blocklet post start failed', { processId, error: err });
       });
     },
-    { parallel: true }
+    { parallel: true, concurrencyLimit: 2 }
   );
 };
 
@@ -682,12 +683,12 @@ const reloadBlockletProcess = (blocklet, { componentDids } = {}) =>
       }
 
       if (shouldSkipComponent(b.meta.did, componentDids)) {
-        logger.info(`skip reload process not selected: ${b.meta.did}`, { processId: b.env.processId });
+        logger.info('skip reload process', { processId: b.env.processId });
         return;
       }
 
-      logger.info('reload process', { processId: b.env.processId });
       await reloadProcess(b.env.processId);
+      logger.info('done reload process', { processId: b.env.processId });
     },
     { parallel: false }
   );
@@ -716,10 +717,10 @@ const deleteProcess = (processId) =>
   new Promise((resolve, reject) => {
     pm2.delete(processId, (err) => {
       if (isUsefulError(err)) {
-        logger.error('blocklet process delete failed', { error: err });
+        logger.error('blocklet process delete failed', { processId, error: err });
         return reject(err);
       }
-      return resolve();
+      return resolve(processId);
     });
   });
 
@@ -728,11 +729,11 @@ const reloadProcess = (processId) =>
     pm2.reload(processId, (err) => {
       if (err) {
         if (isUsefulError(err)) {
-          logger.error('blocklet reload failed', { error: err });
+          logger.error('blocklet reload failed', { processId, error: err });
         }
         return reject(err);
       }
-      return resolve();
+      return resolve(processId);
     });
   });
 
@@ -770,7 +771,7 @@ const checkBlockletProcessHealthy = async (blocklet, { minConsecutiveTime, timeo
       }
 
       if (shouldSkipComponent(b.meta.did, componentDids)) {
-        logger.info('skip check component healthy not selected', { id: b.env.id, processId: b.env.processId });
+        logger.info('skip check component healthy', { processId: b.env.processId });
         return;
       }
 
@@ -778,7 +779,7 @@ const checkBlockletProcessHealthy = async (blocklet, { minConsecutiveTime, timeo
 
       const startedAt = Date.now();
       await _checkProcessHealthy(b, { minConsecutiveTime, timeout, logToTerminal });
-      logger.info('component healthy', { did: b.meta.did, time: Date.now() - startedAt });
+      logger.info('done check component healthy', { processId: b.env.processId, time: Date.now() - startedAt });
     },
     { parallel: true }
   );
@@ -1292,35 +1293,6 @@ const getBlocklet = async ({
   return blocklet;
 };
 
-/**
- * this function has side effect on environments
- */
-const ensureEnvDefault = (environments, ancestors) => {
-  // remove default if ancestors has a value
-  const envMap = environments.reduce((o, env) => {
-    o[env.name] = env;
-    return o;
-  }, {});
-
-  for (let i = ancestors.length - 1; i >= 0; i--) {
-    const ancestor = ancestors[i];
-    const aEnvironments = get(ancestor.meta, 'environments', []);
-    const aEnv = aEnvironments.find((x) => envMap[x.name]);
-
-    if (!isEnvShareable(aEnv)) {
-      break;
-    }
-
-    const env = envMap[aEnv.name];
-    if (isEnvShareable(env) && aEnv.default) {
-      env.default = '';
-      break;
-    }
-  }
-
-  return environments;
-};
-
 const fromProperty2Config = (properties = {}, result) => {
   Object.keys(properties).forEach((key) => {
     const prop = properties[key];
@@ -1334,7 +1306,7 @@ const fromProperty2Config = (properties = {}, result) => {
         name: `${BLOCKLET_PREFERENCE_PREFIX}${key}`,
         required: prop.required || false,
         secure,
-        shared: !secure,
+        shared: secure ? false : prop.shared,
       });
     }
   });
@@ -1875,6 +1847,61 @@ const updateDidDocument = async ({ blocklet, nodeInfo }) => {
   });
 };
 
+const getAppConfigsFromComponent = (meta, configsInApp = [], configsInComponent = []) => {
+  const configs = [];
+  for (const configInMeta of meta?.environments || []) {
+    if (isEnvShareable(configInMeta)) {
+      const configInApp = (configsInApp || []).find((x) => x.key === configInMeta.name);
+      if (!configInApp) {
+        const configInComponent = configsInComponent.find((y) => y.key === configInMeta.name);
+        if (configInComponent && isEnvShareable(configInComponent)) {
+          configs.push(configInComponent);
+        }
+      }
+    }
+  }
+  return configs;
+};
+
+const getConfigsFromInput = (configs = [], oldConfigs = []) => {
+  const sharedConfigs = [];
+  const selfConfigs = [];
+
+  configs.forEach((config) => {
+    const oldConfig = oldConfigs.find((y) => y.key === config.key);
+    if (isEnvShareable(config) || isEnvShareable(oldConfig)) {
+      sharedConfigs.push(config);
+    } else {
+      selfConfigs.push(config);
+    }
+  });
+
+  return { sharedConfigs, selfConfigs };
+};
+
+// remove app configs if no component use it
+const removeAppConfigsFromComponent = async (componentConfigs, app, blockletExtraState) => {
+  const appConfigs = app.configs || [];
+  const remainedConfigs = [].concat(...(app.children || []).map((x) => x.configs || []));
+  const removedAppConfigs = [];
+
+  componentConfigs.forEach((config) => {
+    const appConfig = appConfigs.find((x) => x.key === config.key);
+    if (
+      appConfig &&
+      !appConfig.custom &&
+      !(app.meta.environments || []).find((x) => x.name === config.key) &&
+      !remainedConfigs.find((x) => x.key === config.key && isEnvShareable(x))
+    ) {
+      removedAppConfigs.push({ key: appConfig.key, value: undefined });
+    }
+  });
+
+  if (removedAppConfigs.length) {
+    await blockletExtraState.setConfigs(app.meta.did, removedAppConfigs);
+  }
+};
+
 module.exports = {
   updateBlockletFallbackLogo,
   forEachBlocklet,
@@ -1913,7 +1940,6 @@ module.exports = {
   needBlockletDownload,
   ensureMeta,
   getBlocklet,
-  ensureEnvDefault,
   getConfigFromPreferences,
   createDataArchive,
   validateAppConfig,
@@ -1940,4 +1966,7 @@ module.exports = {
   updateDidDocument,
   getSlpDid,
   shouldEnableSlpDomain,
+  getAppConfigsFromComponent,
+  removeAppConfigsFromComponent,
+  getConfigsFromInput,
 };

package/lib/util/log.js

@@ -138,9 +138,11 @@ const getLogFiles = async ({ name, node }) => {
   if (name === 'blocklet-services') {
     const logDir = path.join(node.dataDirs.logs, '_abtnode');
     const info = path.join(logDir, 'service.log');
-    const error = path.join(logDir, 'service.error.log');
-    createFile({ info, error });
-    return { info, error };
+    const access = path.join(logDir, 'service.access.log');
+    const stdout = path.join(logDir, 'service.stdout.log');
+    const stderr = path.join(logDir, 'service.stderr.log');
+    createFile({ info, access, stdout, stderr });
+    return { info, access, stdout, stderr };
   }
 
   if (name.indexOf('blocklet-') === 0) {
@@ -230,8 +232,8 @@ const getDownloadLogFilesFromServer = async ({ dates, nodeInfo, node } = {}) =>
   list.push(path.join(logDir, 'access.log*'));
 
   // abt-node-service console & gateway
-  list.push(path.join(logDir, 'service.output.log*'));
-  list.push(path.join(logDir, 'service.error.log*'));
+  list.push(path.join(logDir, 'service.stdout.log*'));
+  list.push(path.join(logDir, 'service.stderr.log*'));
   list.push(path.join(logDir, 'service.log*'));
 
   // abt-node-db-hub console & backup

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.16-beta-d8a9fb09",
+  "version": "1.16.16-beta-740ea329",
   "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.16-beta-d8a9fb09",
-    "@abtnode/auth": "1.16.16-beta-d8a9fb09",
-    "@abtnode/certificate-manager": "1.16.16-beta-d8a9fb09",
-    "@abtnode/constant": "1.16.16-beta-d8a9fb09",
-    "@abtnode/cron": "1.16.16-beta-d8a9fb09",
-    "@abtnode/logger": "1.16.16-beta-d8a9fb09",
-    "@abtnode/models": "1.16.16-beta-d8a9fb09",
-    "@abtnode/queue": "1.16.16-beta-d8a9fb09",
-    "@abtnode/rbac": "1.16.16-beta-d8a9fb09",
-    "@abtnode/router-provider": "1.16.16-beta-d8a9fb09",
-    "@abtnode/static-server": "1.16.16-beta-d8a9fb09",
-    "@abtnode/timemachine": "1.16.16-beta-d8a9fb09",
-    "@abtnode/util": "1.16.16-beta-d8a9fb09",
+    "@abtnode/analytics": "1.16.16-beta-740ea329",
+    "@abtnode/auth": "1.16.16-beta-740ea329",
+    "@abtnode/certificate-manager": "1.16.16-beta-740ea329",
+    "@abtnode/constant": "1.16.16-beta-740ea329",
+    "@abtnode/cron": "1.16.16-beta-740ea329",
+    "@abtnode/logger": "1.16.16-beta-740ea329",
+    "@abtnode/models": "1.16.16-beta-740ea329",
+    "@abtnode/queue": "1.16.16-beta-740ea329",
+    "@abtnode/rbac": "1.16.16-beta-740ea329",
+    "@abtnode/router-provider": "1.16.16-beta-740ea329",
+    "@abtnode/static-server": "1.16.16-beta-740ea329",
+    "@abtnode/timemachine": "1.16.16-beta-740ea329",
+    "@abtnode/util": "1.16.16-beta-740ea329",
     "@arcblock/did": "1.18.89",
     "@arcblock/did-auth": "1.18.89",
     "@arcblock/did-ext": "^1.18.89",
@@ -42,12 +42,12 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.89",
     "@arcblock/vc": "1.18.89",
-    "@blocklet/constant": "1.16.16-beta-d8a9fb09",
-    "@blocklet/env": "1.16.16-beta-d8a9fb09",
-    "@blocklet/meta": "1.16.16-beta-d8a9fb09",
-    "@blocklet/resolver": "1.16.16-beta-d8a9fb09",
-    "@blocklet/sdk": "1.16.16-beta-d8a9fb09",
-    "@did-space/client": "^0.2.169",
+    "@blocklet/constant": "1.16.16-beta-740ea329",
+    "@blocklet/env": "1.16.16-beta-740ea329",
+    "@blocklet/meta": "1.16.16-beta-740ea329",
+    "@blocklet/resolver": "1.16.16-beta-740ea329",
+    "@blocklet/sdk": "1.16.16-beta-740ea329",
+    "@did-space/client": "^0.2.170",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.89",
     "@ocap/util": "1.18.89",
@@ -100,5 +100,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "a03d8972fd0fafe810369efa89b03ccd0647dce5"
+  "gitHead": "6abb5a7319ad1093f1e2d04d76215d4a127b538d"
 }