@abtnode/core 1.16.13-beta-0086a35d → 1.16.13-beta-714bec78

package/lib/api/node.js

@@ -8,7 +8,7 @@ const isGitpod = require('@abtnode/util/lib/is-gitpod');
 const getFolderSize = require('@abtnode/util/lib/get-folder-size');
 const canPackageReadWrite = require('@abtnode/util/lib/can-pkg-rw');
 const { toDelegateAddress } = require('@arcblock/did-util');
-const { SERVER_CACHE_TTL } = require('@abtnode/constant');
+const { SERVER_CACHE_TTL, MONITOR_RECORD_INTERVAL_SEC } = require('@abtnode/constant');
 
 const logger = require('@abtnode/logger')('@abtnode/core:api:node');
 
@@ -19,23 +19,18 @@ const { getDelegateState } = require('../util');
 const { NodeRuntimeMonitor } = require('../monitor/node-runtime-monitor');
 const getHistoryList = require('../monitor/get-history-list');
 
-// 10s 上报统计一次
-const MONITOR_RECORD_INTERVAL_SEC = 10;
-
-// 保存当天数据, 每天上报 8640 次
-const MONITOR_HISTORY_LENGTH = 86400 / MONITOR_RECORD_INTERVAL_SEC;
-
 class NodeAPI {
   /**
-   *
-   * @param {object} state Node StateDB
+   * @param {object} states StateDB
+   * @param {string} nodeDid
    */
-  constructor(state) {
-    assert.notStrictEqual(state, undefined, 'argument state can not be undefined');
-    assert.notStrictEqual(state, null, 'argument state can not be null');
+  constructor(states, nodeDid) {
+    assert.notStrictEqual(states, undefined, 'argument states can not be undefined');
+    assert.notStrictEqual(states, null, 'argument states can not be null');
 
     this.runtimeMonitor = new NodeRuntimeMonitor({
-      historyLength: MONITOR_HISTORY_LENGTH,
+      state: states.runtimeInsight,
+      did: nodeDid,
     });
 
     this.cache = new LRU({
@@ -43,7 +38,7 @@ class NodeAPI {
       maxAge: SERVER_CACHE_TTL,
     });
 
-    this.state = state;
+    this.state = states.node;
   }
 
   async updateNodeInfo(entity = {}, context) {
@@ -147,14 +142,13 @@ class NodeAPI {
   }
 
   // eslint-disable-next-line no-unused-vars
-  getHistory({ hours = 1 } = {}, context) {
-    const history = this.runtimeMonitor.getHistory();
-
+  async getHistory({ hours = 1 } = {}, context) {
+    const history = await this.runtimeMonitor.getHistory();
     return getHistoryList({
       history,
       hours,
       recordIntervalSec: MONITOR_RECORD_INTERVAL_SEC,
-      props: ['date', 'cpu', 'mem', 'daemonMem', 'serviceMem', 'dbMem'],
+      props: ['date', 'cpu', 'mem', 'daemonMem', 'serviceMem', 'hubMem'],
     });
   }
 
@@ -169,6 +163,11 @@ class NodeAPI {
         time: `*/${MONITOR_RECORD_INTERVAL_SEC} * * * * *`,
         fn: () => this.runtimeMonitor.monit(),
       },
+      {
+        name: 'cleanup-runtime-info',
+        time: '0 5 */2 * * *', // every 2 hours, eg: 00:05, 02:05, 04:05, 06:05
+        fn: () => this.runtimeMonitor.cleanup(),
+      },
     ];
   }
 }

package/lib/blocklet/manager/disk.js

@@ -24,6 +24,7 @@ const {
   NODE_MODES,
   APP_STRUCT_VERSION,
   BLOCKLET_CACHE_TTL,
+  MONITOR_RECORD_INTERVAL_SEC,
 } = require('@abtnode/constant');
 
 const getBlockletEngine = require('@blocklet/meta/lib/engine');
@@ -204,12 +205,6 @@ const getComponentChangedInfoForUpgrade = ({ newBlocklet, oldBlocklet, context =
   return { skippedProcessIds, installedComponentNames };
 };
 
-// 10s 上报统计一次
-const MONITOR_RECORD_INTERVAL_SEC = 10;
-
-// 保存当天数据, 每天上报 8640 次
-const MONITOR_HISTORY_LENGTH = 86400 / MONITOR_RECORD_INTERVAL_SEC;
-
 class BlockletManager extends BaseBlockletManager {
   /**
    * Creates an instance of BlockletManager.
@@ -241,7 +236,7 @@ class BlockletManager extends BaseBlockletManager {
       maxAge: BLOCKLET_CACHE_TTL,
     });
 
-    this.runtimeMonitor = new BlockletRuntimeMonitor({ historyLength: MONITOR_HISTORY_LENGTH, states });
+    this.runtimeMonitor = new BlockletRuntimeMonitor({ states });
 
     this.blockletDownloader = new BlockletDownloader({
       installDir: this.installDir,
@@ -1445,8 +1440,7 @@ class BlockletManager extends BaseBlockletManager {
   // eslint-disable-next-line no-unused-vars
   async getRuntimeHistory({ did, hours }, context) {
     const metaDid = await states.blocklet.getBlockletMetaDid(did);
-
-    const history = this.runtimeMonitor.getHistory(metaDid);
+    const history = await this.runtimeMonitor.getHistory(metaDid);
 
     return getHistoryList({
       history,

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

@@ -1,6 +1,7 @@
 const logger = require('@abtnode/logger')('@abtnode/core:install-component-dev');
 
 const { BlockletStatus, BlockletSource, BLOCKLET_MODES, fromBlockletStatus } = require('@blocklet/constant');
+const { isInProgress } = require('@blocklet/meta/lib/util');
 const {
   parseComponents,
   filterDuplicateComponents,
@@ -20,13 +21,9 @@ const installComponentFromDev = async ({ folder, meta, rootDid, mountPoint, mana
 
   const exist = existRoot.children.find((x) => x.meta.did === meta.did);
   if (exist) {
-    if (exist.mode === BLOCKLET_MODES.PRODUCTION) {
-      throw new Error('The blocklet component of production mode already exists, please remove it before developing');
-    }
-
     const status = fromBlockletStatus(exist.status);
-    if (['starting', 'running'].includes(status)) {
-      throw new Error(`The blocklet component is already on ${status}, please stop it before developing`);
+    if (isInProgress(status)) {
+      throw new Error(`The blocklet component is on ${status}, please stop it before developing`);
     }
 
     logger.info('remove blocklet component for dev', { did, version });
@@ -49,7 +46,10 @@ const installComponentFromDev = async ({ folder, meta, rootDid, mountPoint, mana
   };
   const { dynamicComponents } = await parseComponents(component);
   dynamicComponents.unshift(component);
-  const children = filterDuplicateComponents(dynamicComponents, existRoot.children);
+  const children = filterDuplicateComponents(
+    dynamicComponents,
+    existRoot.children.filter((x) => x.meta.did !== component.meta.did)
+  );
   checkVersionCompatibility([...children, ...existRoot.children]);
   await states.blocklet.addChildren(rootDid, children);
 

package/lib/index.js

@@ -208,7 +208,7 @@ function ABTNode(options) {
     deleteDomainAlias,
   } = getRouterHelpers({ dataDirs, routingSnapshot, routerManager, blockletManager, certManager });
 
-  const nodeAPI = new NodeAPI(states.node);
+  const nodeAPI = new NodeAPI(states, options.nodeDid);
   const teamAPI = new TeamAPI({ states, teamManager, dataDirs });
 
   blockletManager.resetSiteByDid = resetSiteByDid;

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

@@ -44,25 +44,18 @@ const { getRuntimeInfo } = require('../util/blocklet');
 // }
 
 class BlockletRuntimeMonitor extends EventEmitter {
-  constructor({ historyLength = 100, states, logger = defaultLogger } = {}) {
+  constructor({ states, logger = defaultLogger } = {}) {
     super();
 
-    /**
-     * private
-     */
-    this.historyLength = historyLength;
     this.states = states;
     this.data = {};
     this.logger = logger;
     this.inProgress = false;
   }
 
-  getHistory(blockletDid) {
-    if (!this.data[blockletDid]) {
-      return [];
-    }
-
-    return this.data[blockletDid].app.history || [];
+  async getHistory(blockletDid) {
+    const result = await this.states.runtimeInsight.findPaginated({ did: blockletDid });
+    return (result.list || []).reverse();
   }
 
   getRuntimeInfo(blockletDid, componentId = 'app') {
@@ -142,6 +135,8 @@ class BlockletRuntimeMonitor extends EventEmitter {
       { parallel: true }
     );
 
+    appCpu = Number(appCpu.toFixed(2));
+
     this.data[blockletDid].app.runtimeInfo.cpuUsage = appCpu;
     this.data[blockletDid].app.runtimeInfo.memoryUsage = appMem;
 
@@ -194,11 +189,7 @@ class BlockletRuntimeMonitor extends EventEmitter {
   }
 
   _push(blockletDid, value) {
-    const arr = this.data[blockletDid].app.history;
-    arr.push(value);
-    if (arr.length > this.historyLength) {
-      arr.shift();
-    }
+    return this.states.runtimeInsight.insert({ did: blockletDid, ...value });
   }
 }
 

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

@@ -59,7 +59,7 @@ const getProcessInfo = (processId, { returnList } = {}) =>
 
 // type MonitorData = {
 //   realtime: Realtime;
-//   history: History;
+//   history: History; // saved in sqlite database
 // }
 
 const DEFAULT_DATA = {
@@ -75,16 +75,14 @@ const DEFAULT_DATA = {
 };
 
 class NodeRuntimeMonitor extends EventEmitter {
-  constructor({ historyLength = 100, logger = defaultLogger } = {}) {
+  constructor({ did, state, logger = defaultLogger } = {}) {
     super();
 
-    /**
-     * private
-     */
-    this.historyLength = historyLength;
     this.logger = logger;
     this.data = cloneDeep(DEFAULT_DATA);
     this.inProgress = false;
+    this.did = did;
+    this.state = state;
   }
 
   emitRealtimeData() {
@@ -95,8 +93,9 @@ class NodeRuntimeMonitor extends EventEmitter {
     return this.data.realtime;
   }
 
-  getHistory() {
-    return this.data.history;
+  async getHistory() {
+    const result = await this.state.findPaginated({ did: this.did });
+    return (result.list || []).reverse();
   }
 
   async monit() {
@@ -189,12 +188,12 @@ class NodeRuntimeMonitor extends EventEmitter {
       });
   }
 
+  cleanup() {
+    return this.state.remove({ date: { $lt: Date.now() - 1000 * 60 * 60 * 24 } });
+  }
+
   _push(value) {
-    const arr = this.data.history;
-    arr.push(value);
-    if (arr.length > this.historyLength) {
-      arr.shift();
-    }
+    return this.state.insert({ did: this.did, ...value });
   }
 }
 

package/lib/states/index.js

@@ -16,6 +16,7 @@ const AuditLogState = require('./audit-log');
 const JobState = require('./job');
 const BackupState = require('./backup');
 const TrafficInsightState = require('./traffic-insight');
+const RuntimeInsightState = require('./runtime-insight');
 
 const { getDbFilePath } = require('../util');
 
@@ -41,6 +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);
 
   return {
     node: nodeState,
@@ -57,6 +59,7 @@ const init = (dataDirs, config = {}) => {
     job: jobState,
     backup: backupState,
     trafficInsight,
+    runtimeInsight,
   };
 };
 

package/lib/states/runtime-insight.js

@@ -0,0 +1,26 @@
+const { Op } = require('sequelize');
+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) {
+      where.did = did;
+    }
+    if (startDate) {
+      where.date = { [Op.gte]: startDate };
+    }
+    if (endDate) {
+      where.date = where.date || {};
+      where.date[Op.lte] = endDate;
+    }
+
+    return super.paginate({ where }, { date: -1 }, paging);
+  }
+}
+
+module.exports = RuntimeInsight;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.13-beta-0086a35d",
+  "version": "1.16.13-beta-714bec78",
   "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.13-beta-0086a35d",
-    "@abtnode/auth": "1.16.13-beta-0086a35d",
-    "@abtnode/certificate-manager": "1.16.13-beta-0086a35d",
-    "@abtnode/constant": "1.16.13-beta-0086a35d",
-    "@abtnode/cron": "1.16.13-beta-0086a35d",
-    "@abtnode/logger": "1.16.13-beta-0086a35d",
-    "@abtnode/models": "1.16.13-beta-0086a35d",
-    "@abtnode/queue": "1.16.13-beta-0086a35d",
-    "@abtnode/rbac": "1.16.13-beta-0086a35d",
-    "@abtnode/router-provider": "1.16.13-beta-0086a35d",
-    "@abtnode/static-server": "1.16.13-beta-0086a35d",
-    "@abtnode/timemachine": "1.16.13-beta-0086a35d",
-    "@abtnode/util": "1.16.13-beta-0086a35d",
+    "@abtnode/analytics": "1.16.13-beta-714bec78",
+    "@abtnode/auth": "1.16.13-beta-714bec78",
+    "@abtnode/certificate-manager": "1.16.13-beta-714bec78",
+    "@abtnode/constant": "1.16.13-beta-714bec78",
+    "@abtnode/cron": "1.16.13-beta-714bec78",
+    "@abtnode/logger": "1.16.13-beta-714bec78",
+    "@abtnode/models": "1.16.13-beta-714bec78",
+    "@abtnode/queue": "1.16.13-beta-714bec78",
+    "@abtnode/rbac": "1.16.13-beta-714bec78",
+    "@abtnode/router-provider": "1.16.13-beta-714bec78",
+    "@abtnode/static-server": "1.16.13-beta-714bec78",
+    "@abtnode/timemachine": "1.16.13-beta-714bec78",
+    "@abtnode/util": "1.16.13-beta-714bec78",
     "@arcblock/did": "1.18.84",
     "@arcblock/did-auth": "1.18.84",
     "@arcblock/did-ext": "^1.18.84",
@@ -42,10 +42,10 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.84",
     "@arcblock/vc": "1.18.84",
-    "@blocklet/constant": "1.16.13-beta-0086a35d",
-    "@blocklet/meta": "1.16.13-beta-0086a35d",
-    "@blocklet/resolver": "1.16.13-beta-0086a35d",
-    "@blocklet/sdk": "1.16.13-beta-0086a35d",
+    "@blocklet/constant": "1.16.13-beta-714bec78",
+    "@blocklet/meta": "1.16.13-beta-714bec78",
+    "@blocklet/resolver": "1.16.13-beta-714bec78",
+    "@blocklet/sdk": "1.16.13-beta-714bec78",
     "@did-space/client": "^0.2.124",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.84",
@@ -96,5 +96,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "cbf5c99e7cadf9fef4d77673cb45b44ef26436cf"
+  "gitHead": "6f447ce64c37e20b871c4b2cbb81085bd509b84f"
 }