@abtnode/core 1.16.15 → 1.16.16-beta-e038cde7

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/api/team.js

@@ -533,6 +533,23 @@ class TeamAPI extends EventEmitter {
     return doc;
   }
 
+  async removeUserPassport({ passportId, userDid, teamDid }) {
+    if (!passportId) {
+      throw new Error('Revoked passport should not be empty');
+    }
+
+    const state = await this.getUserState(teamDid);
+
+    const doc = await state.removePassportById({ id: passportId });
+
+    logger.info('user passport remove successfully', { teamDid, userDid, passportId });
+
+    this.emit(EVENTS.USER_UPDATED, { teamDid, user: doc });
+    this.emit(EVENTS.USER_PERMISSION_UPDATED, { teamDid, user: doc });
+
+    return doc;
+  }
+
   async switchProfile({ teamDid, userDid, profile }) {
     const state = await this.getUserState(teamDid);
     // NOTICE: 这个 schema 没有对数据做任何 default 操作，所以没必要用 validate 之后的值

package/lib/blocklet/extras.js

@@ -65,16 +65,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/disk.js

@@ -1479,7 +1479,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 +2665,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,7 +2690,7 @@ 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 }) => {
@@ -2712,11 +2713,9 @@ class DiskBlockletManager extends BaseBlockletManager {
             throw error;
           }
         };
-        await forEachBlocklet(blocklet, runMigration, { parallel: true });
+        await forEachBlocklet(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 +2916,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;
     }
@@ -3075,7 +3074,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 +3091,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/index.js

@@ -390,6 +390,7 @@ function ABTNode(options) {
     // Passport
     revokeUserPassport: teamAPI.revokeUserPassport.bind(teamAPI),
     enableUserPassport: teamAPI.enableUserPassport.bind(teamAPI),
+    removeUserPassport: teamAPI.removeUserPassport.bind(teamAPI),
     issuePassportToUser: teamAPI.issuePassportToUser.bind(teamAPI),
 
     createPassportIssuance: teamAPI.createPassportIssuance.bind(teamAPI),

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/audit-log.js

@@ -207,6 +207,8 @@ const getLogContent = async (action, args, context, result, info, node) => {
       return `revoked **${passport}** passport of user ${user}`;
     case 'enableUserPassport':
       return `enabled **${passport}** passport of user ${user}`;
+    case 'removeUserPassport':
+      return `remove **${passport}** passport of user ${user}`;
     case 'updateUserApproval':
       return `${args.user.approved ? 'enabled' : 'disabled'} user ${user}`;
     case 'updateUserTags':
@@ -368,6 +370,7 @@ const getLogCategory = (action) => {
     case 'deletePassportIssuance':
     case 'revokeUserPassport':
     case 'enableUserPassport':
+    case 'removeUserPassport':
     case 'updateUserApproval':
     case 'updateUserTags':
     case 'createMemberInvitation':

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/states/user.js

@@ -129,6 +129,15 @@ class User extends ExtendBase {
     return this._setPassportStatusById({ did, id, status: PASSPORT_STATUS.VALID });
   }
 
+  async removePassportById({ id }) {
+    const num = await this.passport.remove({ id });
+    if (num === 0) {
+      throw new Error(`passport does not exist: ${id}`);
+    }
+
+    return num;
+  }
+
   /**
    * remove a user by user's did
    * @param {object} params

package/lib/util/blocklet.js

@@ -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 }
   );

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.15",
+  "version": "1.16.16-beta-e038cde7",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,19 +19,19 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.15",
-    "@abtnode/auth": "1.16.15",
-    "@abtnode/certificate-manager": "1.16.15",
-    "@abtnode/constant": "1.16.15",
-    "@abtnode/cron": "1.16.15",
-    "@abtnode/logger": "1.16.15",
-    "@abtnode/models": "1.16.15",
-    "@abtnode/queue": "1.16.15",
-    "@abtnode/rbac": "1.16.15",
-    "@abtnode/router-provider": "1.16.15",
-    "@abtnode/static-server": "1.16.15",
-    "@abtnode/timemachine": "1.16.15",
-    "@abtnode/util": "1.16.15",
+    "@abtnode/analytics": "1.16.16-beta-e038cde7",
+    "@abtnode/auth": "1.16.16-beta-e038cde7",
+    "@abtnode/certificate-manager": "1.16.16-beta-e038cde7",
+    "@abtnode/constant": "1.16.16-beta-e038cde7",
+    "@abtnode/cron": "1.16.16-beta-e038cde7",
+    "@abtnode/logger": "1.16.16-beta-e038cde7",
+    "@abtnode/models": "1.16.16-beta-e038cde7",
+    "@abtnode/queue": "1.16.16-beta-e038cde7",
+    "@abtnode/rbac": "1.16.16-beta-e038cde7",
+    "@abtnode/router-provider": "1.16.16-beta-e038cde7",
+    "@abtnode/static-server": "1.16.16-beta-e038cde7",
+    "@abtnode/timemachine": "1.16.16-beta-e038cde7",
+    "@abtnode/util": "1.16.16-beta-e038cde7",
     "@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.15",
-    "@blocklet/env": "1.16.15",
-    "@blocklet/meta": "1.16.15",
-    "@blocklet/resolver": "1.16.15",
-    "@blocklet/sdk": "1.16.15",
-    "@did-space/client": "^0.2.165",
+    "@blocklet/constant": "1.16.16-beta-e038cde7",
+    "@blocklet/env": "1.16.16-beta-e038cde7",
+    "@blocklet/meta": "1.16.16-beta-e038cde7",
+    "@blocklet/resolver": "1.16.16-beta-e038cde7",
+    "@blocklet/sdk": "1.16.16-beta-e038cde7",
+    "@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": "643adb67bfc0b33f4db0be1b75000324c8e5a248"
+  "gitHead": "688b1c7ae0f6652094100c101f5d218266dd86ac"
 }