@abtnode/core 1.16.1 → 1.16.2-beta-992f57fb

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

@@ -3,11 +3,13 @@ const fs = require('fs-extra');
 const pick = require('lodash/pick');
 const pRetry = require('p-retry');
 const Client = require('@ocap/client');
+const urlFriendly = require('@blocklet/meta/lib/url-friendly').default;
+const { slugify } = require('transliteration');
 
 const logger = require('@abtnode/logger')('@abtnode/core:migrate-application-to-struct-v2');
 
 const { forEachBlockletSync, getSharedConfigObj, getBlockletChainInfo } = require('@blocklet/meta/lib/util');
-const { SLOT_FOR_IP_DNS_SITE } = require('@abtnode/constant');
+const { SLOT_FOR_IP_DNS_SITE, MAIN_CHAIN_ENDPOINT } = require('@abtnode/constant');
 
 const {
   BlockletStatus,
@@ -95,65 +97,89 @@ const getChainHost = (blocklet) => {
   return getBlockletChainInfo(blocklet).host;
 };
 
+const ensureAccountOnMainChain = async (blocklet, newWallet) => {
+  // ensure new account on main chain
+  const mainChainClient = new Client(MAIN_CHAIN_ENDPOINT);
+  const newResultOnMainChain = await mainChainClient.getAccountState({ address: newWallet.address });
+  if (!newResultOnMainChain.state) {
+    logger.info('declare account on main chain', { address: newWallet.address, did: blocklet.meta.did });
+    const hash = await mainChainClient.declare({
+      moniker: (urlFriendly(slugify(blocklet.meta.title || blocklet.meta.name)) || 'application').toLowerCase(),
+      wallet: newWallet,
+    });
+    logger.info('declare account on main chain done', { did: blocklet.meta.did, hash });
+  }
+};
+
 const migrateAppOnChain = async (blocklet, oldSk, newSk) => {
+  if (process.env.NODE_ENV === 'test') {
+    return;
+  }
+
   logger.info('Preparing for on-chain migration', { did: blocklet.meta.did });
   if (!oldSk) {
+    // should not be here
     logger.info('on-chain migration aborted because oldSk is empty', { did: blocklet.meta.did });
     return;
   }
 
   if (!newSk) {
+    // should not be here
     logger.info('on-chain migration aborted because newSk is empty', { did: blocklet.meta.did });
     return;
   }
 
-  // ensure chain host
-  const chainHost = getChainHost(blocklet);
-  if (!chainHost || chainHost === 'none') {
-    logger.info('on-chain migration aborted because CHAIN_HOST is empty', { did: blocklet.meta.did });
-    return;
-  }
-
-  logger.info('on-chain migration for chain ', { did: blocklet.meta.did, host: chainHost });
-
   // ensure account changed
-  const type = blocklet.configObj.BLOCKLET_WALLET_TYPE;
+  const type = blocklet.configObj?.BLOCKLET_WALLET_TYPE;
   const oldWallet = getBlockletWallet(oldSk, undefined, type);
   const newWallet = getBlockletWallet(newSk, undefined, type);
   if (oldWallet.address === newWallet.address) {
+    // should not be here
     logger.info('on-chain migration aborted because newSk same with oldSk', { did: blocklet.meta.did });
+    await ensureAccountOnMainChain(blocklet, newWallet);
     return;
   }
 
-  // ensure old account exist on chain
-  const client = new Client(chainHost);
-  const oldResult = await client.getAccountState({ address: oldWallet.address });
-  if (!oldResult.state) {
-    logger.info('on-chain migration aborted because oldSk not declared on chain', { did: blocklet.meta.did });
+  // ensure chain host
+  const chainHost = getChainHost(blocklet);
+  if (!chainHost || chainHost === 'none') {
+    logger.info('on-chain migration aborted because CHAIN_HOST is empty', { did: blocklet.meta.did });
+    await ensureAccountOnMainChain(blocklet, newWallet);
     return;
   }
 
-  // ensure new account not exist on chain
+  // migrate on chain
+  logger.info('on-chain migration for chain ', { did: blocklet.meta.did, host: chainHost });
+  const client = new Client(chainHost);
+  const oldResult = await client.getAccountState({ address: oldWallet.address });
   const newResult = await client.getAccountState({ address: newWallet.address });
-  if (newResult.state) {
-    logger.info('on-chain migration aborted because newSk declared on chain', { did: blocklet.meta.did });
-    return;
-  }
 
-  logger.info('on-chain migration for wallets', { oldAddress: oldWallet.address, newAddress: newWallet.address });
+  if (oldResult.state && !newResult.state) {
+    logger.info('on-chain migration for wallets', { oldAddress: oldWallet.address, newAddress: newWallet.address });
 
-  // migrate old account to new account
-  const tx = await client.signAccountMigrateTx({
-    tx: {
-      itx: {
-        address: newWallet.address,
-        pk: newWallet.publicKey,
+    // migrate old account to new account
+    const tx = await client.signAccountMigrateTx({
+      tx: {
+        itx: {
+          address: newWallet.address,
+          pk: newWallet.publicKey,
+        },
       },
-    },
-    wallet: oldWallet,
-  });
-  const hash = await client.sendAccountMigrateTx({ tx, wallet: oldWallet });
-  logger.info('on-chain migration done', { did: blocklet.meta.did, hash });
+      wallet: oldWallet,
+    });
+    const hash = await client.sendAccountMigrateTx({ tx, wallet: oldWallet });
+    logger.info('on-chain migration done', { did: blocklet.meta.did, hash });
+  } else {
+    if (!oldResult.state) {
+      logger.info('on-chain migration aborted because oldSk not declared on chain', { did: blocklet.meta.did });
+    }
+
+    if (newResult.state) {
+      logger.info('on-chain migration aborted because newSk declared on chain', { did: blocklet.meta.did });
+    }
+  }
+
+  await ensureAccountOnMainChain(blocklet, newWallet);
 };
 
 const migrateApplicationToStructV2 = async ({ did, appSk: newAppSk, context = {}, manager, states }) => {

package/lib/event.js

@@ -5,6 +5,7 @@ const { wipeSensitiveData } = require('@blocklet/meta/lib/util');
 const logger = require('@abtnode/logger')('@abtnode/core:event');
 const { BLOCKLET_MODES, BlockletStatus, BlockletSource, BlockletEvents } = require('@blocklet/constant');
 const { EVENTS } = require('@abtnode/constant');
+const { NodeMonitSender } = require('./monitor/node-monit-sender');
 const handleInstanceInStore = require('./util/public-to-store');
 
 const eventHub =
@@ -33,6 +34,7 @@ module.exports = ({
 }) => {
   const notificationState = states.notification;
   const nodeState = states.node;
+  const nodeMonitSender = new NodeMonitSender({ node });
 
   const events = new EventEmitter();
   events.setMaxListeners(0);
@@ -79,6 +81,10 @@ module.exports = ({
     if (typeof eventHandler === 'function') {
       eventHandler({ name, data });
     }
+
+    if (name === EVENTS.NODE_RUNTIME_INFO) {
+      nodeMonitSender.sendToWallet(data);
+    }
   };
 
   const handleBlockletInstall = async (name, { blocklet, context }) => {

package/lib/monitor/node-monit-sender.js

@@ -0,0 +1,99 @@
+const filesize = require('filesize');
+const { sendToAppChannel } = require('@blocklet/sdk/lib/util/send-notification');
+const { getAppPublicChannel } = require('@blocklet/meta/lib/channel');
+
+const logger = require('@abtnode/logger')('@abtnode/core:monitor');
+
+class NodeMonitSender {
+  constructor({ node, interval }) {
+    this.node = node;
+    this.nodeInfo = null;
+    this.interval = interval || 1000 * 60;
+    this.lastTime = 0;
+  }
+
+  async getNodeInfo() {
+    if (!this.nodeInfo) {
+      this.nodeInfo = await this.node.getNodeInfo();
+    }
+
+    return this.nodeInfo;
+  }
+
+  async getSender() {
+    const nodeInfo = await this.getNodeInfo();
+    return {
+      appDid: nodeInfo.did,
+      appSk: nodeInfo.sk,
+    };
+  }
+
+  /**
+   * @param {{
+   *  cpu?: {
+   *    currentLoad?: number
+   *  };
+   *  mem?: {
+   *    total?: number;
+   *    available?: number;
+   *  };
+   * }} data
+   */
+  async sendToWallet(data) {
+    if (Date.now() - this.lastTime < this.interval) {
+      return;
+    }
+
+    if (!data || !data.cpu || !data.mem) {
+      return;
+    }
+
+    try {
+      const cpuPercent = data.cpu.currentLoad || 0;
+      const totalMem = data.mem.total || 0;
+      const freeMem = data.mem.available || 0;
+      const usedMem = totalMem - freeMem;
+      const cpuWanning = cpuPercent > 90;
+      const cpuContent = `${Math.floor(cpuPercent)}%`;
+      const memoryPercent = (usedMem / totalMem) * 100;
+      const memoryWanning = memoryPercent > 90;
+      const memContent = `${filesize(Math.floor(usedMem))} (${Math.floor(memoryPercent)}%)`;
+
+      const sender = await this.getSender();
+      const channel = getAppPublicChannel(sender.appDid);
+
+      const notification = {
+        type: 'feed',
+        feedType: 'data-tracker',
+        data: {
+          cardTitle: 'Server Usage',
+          items: [
+            {
+              title: 'CPU',
+              content: cpuContent,
+              content_color: cpuWanning ? '#FF1111' : '#222222',
+            },
+            {
+              title: 'MEM',
+              content: memContent,
+              content_color: memoryWanning ? '#FF1111' : '#222222',
+            },
+          ],
+        },
+      };
+
+      await sendToAppChannel(channel, 'message', notification, sender, process.env.ABT_NODE_SERVICE_PORT);
+
+      this.lastTime = Date.now();
+    } catch (error) {
+      delete error.request;
+      delete error.response;
+      delete error.config;
+      logger.error('failed to push notification to wallet', { error });
+    }
+  }
+}
+
+module.exports = {
+  NodeMonitSender,
+};

package/lib/util/blocklet.js

@@ -1215,7 +1215,7 @@ const getUpdateMetaList = (oldBlocklet = {}, newBlocklet = {}) => {
   const res = [];
 
   forEachChildSync(newBlocklet, (b, { id }) => {
-    if (b.bundleSource && b.meta.version !== oldMap[id]) {
+    if (b.bundleSource && semver.gt(b.meta.version, oldMap[id])) {
       res.push({ id, meta: b.meta });
     }
   });

package/lib/util/request.js

@@ -4,4 +4,7 @@ const { version } = require('../../package.json');
 module.exports =
   process.env.NODE_ENV === 'test'
     ? axios
-    : axios.create({ timeout: 10 * 1000, headers: { 'User-Agent': `ABTNode/${version}` } });
+    : axios.create({
+        timeout: 10 * 1000,
+        headers: { 'User-Agent': `ABTNode/${version}`, 'x-blocklet-server-version': version },
+      });

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.1",
+  "version": "1.16.2-beta-992f57fb",
   "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.16.1",
-    "@abtnode/certificate-manager": "1.16.1",
-    "@abtnode/constant": "1.16.1",
-    "@abtnode/cron": "1.16.1",
-    "@abtnode/db": "1.16.1",
-    "@abtnode/logger": "1.16.1",
-    "@abtnode/queue": "1.16.1",
-    "@abtnode/rbac": "1.16.1",
-    "@abtnode/router-provider": "1.16.1",
-    "@abtnode/static-server": "1.16.1",
-    "@abtnode/timemachine": "1.16.1",
-    "@abtnode/util": "1.16.1",
+    "@abtnode/auth": "1.16.2-beta-992f57fb",
+    "@abtnode/certificate-manager": "1.16.2-beta-992f57fb",
+    "@abtnode/constant": "1.16.2-beta-992f57fb",
+    "@abtnode/cron": "1.16.2-beta-992f57fb",
+    "@abtnode/db": "1.16.2-beta-992f57fb",
+    "@abtnode/logger": "1.16.2-beta-992f57fb",
+    "@abtnode/queue": "1.16.2-beta-992f57fb",
+    "@abtnode/rbac": "1.16.2-beta-992f57fb",
+    "@abtnode/router-provider": "1.16.2-beta-992f57fb",
+    "@abtnode/static-server": "1.16.2-beta-992f57fb",
+    "@abtnode/timemachine": "1.16.2-beta-992f57fb",
+    "@abtnode/util": "1.16.2-beta-992f57fb",
     "@arcblock/did": "1.18.65",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/did-util": "1.18.65",
@@ -38,9 +38,9 @@
     "@arcblock/jwt": "^1.18.65",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "1.18.65",
-    "@blocklet/constant": "1.16.1",
-    "@blocklet/meta": "1.16.1",
-    "@blocklet/sdk": "1.16.1",
+    "@blocklet/constant": "1.16.2-beta-992f57fb",
+    "@blocklet/meta": "1.16.2-beta-992f57fb",
+    "@blocklet/sdk": "1.16.2-beta-992f57fb",
     "@did-space/client": "^0.2.45",
     "@fidm/x509": "^1.2.1",
     "@ocap/client": "1.18.65",
@@ -57,6 +57,7 @@
     "detect-port": "^1.5.1",
     "escape-string-regexp": "^4.0.0",
     "fast-glob": "^3.2.12",
+    "filesize": "^6.4.0",
     "flat": "^5.0.2",
     "fs-extra": "^11.1.0",
     "get-port": "^5.1.1",
@@ -79,6 +80,7 @@
     "stream-to-promise": "^3.0.0",
     "systeminformation": "^5.12.6",
     "tar": "^6.1.11",
+    "transliteration": "^2.3.5",
     "ua-parser-js": "^1.0.2",
     "unzipper": "^0.10.11",
     "url-join": "^4.0.1",
@@ -91,5 +93,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "5912cfbd3b7573850727b05a808b1f798686267f"
+  "gitHead": "c2bbe98efb7ec70476263319053aa648a45c5a6a"
 }