@abtnode/core 1.16.18-beta-aa01bd8e → 1.16.18-beta-bb4ebacc

package/lib/event/index.js

@@ -1,7 +1,7 @@
 const get = require('lodash/get');
 const cloneDeep = require('lodash/cloneDeep');
 const { EventEmitter } = require('events');
-const { wipeSensitiveData } = require('@blocklet/meta/lib/util');
+const { wipeSensitiveData, getDisplayName } = require('@blocklet/meta/lib/util');
 const logger = require('@abtnode/logger')('@abtnode/core:event');
 const {
   BLOCKLET_MODES,
@@ -308,20 +308,32 @@ module.exports = ({
     } else if (BlockletEvents.backupProgress === eventName && payload?.completed) {
       try {
         const backupEndpoint = getBackupEndpoint(blocklet?.environments);
+        const args = {
+          did: blocklet.meta.did,
+          url: getDIDSpacesUrlFromEndpoint(backupEndpoint),
+          backupUrl: getBackupFilesUrlFromEndpoint(backupEndpoint),
+          success: payload?.progress === 100,
+          errorMessage: payload?.message,
+          strategy: payload.backup.strategy,
+        };
 
         await node.createAuditLog({
           action: 'backupToSpaces',
-          args: {
-            did: blocklet.meta.did,
-            url: getDIDSpacesUrlFromEndpoint(backupEndpoint),
-            backupUrl: getBackupFilesUrlFromEndpoint(backupEndpoint),
-            success: payload?.progress === 100,
-            errorMessage: payload?.message,
-            strategy: payload.backup.strategy,
-          },
+          args,
           context: payload?.context ?? {},
           result: cloneDeep(blocklet),
         });
+
+        if (payload?.progress !== 100) {
+          await node.createNotification({
+            title: 'App Backup Failed',
+            description: `Failed to backup ${getDisplayName(blocklet)} to ${args.url}, due to: ${args.errorMessage}`,
+            entityType: 'blocklet',
+            entityId: args.did,
+            severity: 'error',
+            sticky: true,
+          });
+        }
       } catch (error) {
         logger.error('Failed to createAuditLog for backupToSpaces failed', { error });
       }

package/lib/index.js

@@ -436,6 +436,7 @@ function ABTNode(options) {
     deleteBlockletStore: teamAPI.deleteStore.bind(teamAPI),
 
     // Notifications
+    createNotification: states.notification.create.bind(states.notification),
     getNotifications: states.notification.findPaginated.bind(states.notification),
     readNotifications: states.notification.read.bind(states.notification),
     unreadNotifications: states.notification.unread.bind(states.notification),
@@ -635,6 +636,7 @@ function ABTNode(options) {
     createWebHook: webhook.create.bind(webhook),
     deleteWebHook: webhook.delete.bind(webhook),
     getWebhookSenders: webhook.listSenders.bind(webhook),
+    getMessageSender: webhook.getMessageSender.bind(webhook),
     sendTestMessage: webhook.sendTestMessage.bind(webhook),
   });
 }

package/lib/processes/updater.js

@@ -4,6 +4,7 @@ const axon = require('axon');
 const path = require('path');
 const shell = require('shelljs');
 const semver = require('semver');
+const { getInstaller, getInstallCommands } = require('@abtnode/util/lib/get-installer');
 
 const VERBOSE = '';
 // const VERBOSE = '--verbose';
@@ -26,30 +27,8 @@ const runAsync = (command, options) =>
     });
   });
 
-const getInstaller = () => {
-  const { stdout: pnpmPath } = shell.which('pnpm') || {};
-  if (pnpmPath) {
-    const { stdout: expectedDir } = shell.exec('pnpm bin -g', { silent: true });
-    const { stdout: binPath } = shell.which(BINARY_NAME);
-    if (expectedDir && binPath && expectedDir.trim() === path.dirname(binPath)) {
-      return 'pnpm';
-    }
-  }
-
-  const { stdout: yarnPath } = shell.which('yarn') || {};
-  if (yarnPath) {
-    const { stdout: binaryDir } = shell.exec(`yarn global bin ${BINARY_NAME}`, { silent: true });
-    const binaryPath = path.join(binaryDir, BINARY_NAME);
-    if (fs.existsSync(binaryPath)) {
-      return 'yarn';
-    }
-  }
-
-  return 'npm';
-};
-
 const getBinaryDir = () => {
-  const installer = getInstaller();
+  const installer = getInstaller(BINARY_NAME);
   if (installer === 'pnpm') {
     const { stdout: binaryDir, code } = shell.exec('pnpm bin -g', { silent: true });
     if (code === 0) {
@@ -77,12 +56,8 @@ const installBlockletServer = async (version) => {
     return { code: 1, stderr: 'Abort because you are not using a standard @blocklet/cli setup' };
   }
 
-  const installer = getInstaller();
-  const commands = {
-    pnpm: `pnpm add -g ${PACKAGE_NAME}@${version} ${VERBOSE}`,
-    npm: `npm install -g ${PACKAGE_NAME}@${version} ${VERBOSE}`,
-    yarn: `yarn global add ${PACKAGE_NAME}@${version} ${VERBOSE}`,
-  };
+  const installer = getInstaller(BINARY_NAME);
+  const commands = getInstallCommands({ packageName: PACKAGE_NAME, version, params: VERBOSE });
   const command = commands[installer];
   console.info('Installing blocklet server', { version, installer, command });
   const result = await runAsync(command, {

package/lib/states/audit-log.js

@@ -145,7 +145,7 @@ const getLogContent = async (action, args, context, result, info, node) => {
         }
         return `Automatic backup application to ${args.url} successfully:\n- Backup files have been stored [here](${args.backupUrl})`;
       }
-      return `Backup application to ${args.url} failed:\n- The reason for the error is: <span style='color:red'>${args.errorMessage}</span>`;
+      return `Backup application to ${args.url} failed:\n- Reason: <span style='color:red'>${args.errorMessage}</span>`;
     case 'configPublicToStore':
       return `set publicToStore to ${args.publicToStore ? 'true' : 'false'}`;
     case 'configNavigations':

package/lib/states/node.js

@@ -4,7 +4,13 @@ const omit = require('lodash/omit');
 const isEmpty = require('lodash/isEmpty');
 const security = require('@abtnode/util/lib/security');
 const { isFromPublicKey } = require('@arcblock/did');
-const { NODE_MODES, DISK_ALERT_THRESHOLD_PERCENT, EVENTS, SERVER_STATUS } = require('@abtnode/constant');
+const {
+  NODE_MODES,
+  DISK_ALERT_THRESHOLD_PERCENT,
+  EVENTS,
+  SERVER_STATUS,
+  PROXY_MAX_MEM_LIMIT_IN_MB,
+} = require('@abtnode/constant');
 // const logger = require('@abtnode/logger')('@abtnode/core:states:node');
 
 const BaseState = require('./base');
@@ -132,6 +138,10 @@ class NodeState extends BaseState {
       doc.sk = security.decrypt(doc.sk, doc.did, dek);
     }
 
+    if (doc.runtimeConfig && !doc.runtimeConfig.proxyMaxMemoryLimit) {
+      doc.runtimeConfig.proxyMaxMemoryLimit = PROXY_MAX_MEM_LIMIT_IN_MB;
+    }
+
     return doc;
   }
 

package/lib/util/log.js

@@ -117,6 +117,7 @@ const getLogFiles = async ({ name, node }) => {
     const access = path.join(logDir, 'access.log');
     const stdout = path.join(logDir, 'daemon.stdout.log');
     const stderr = path.join(logDir, 'daemon.stderr.log');
+    const pm2 = path.join(process.env.PM2_HOME, 'pm2.log');
 
     createFile({
       info,
@@ -124,6 +125,7 @@ const getLogFiles = async ({ name, node }) => {
       access,
       stdout,
       stderr,
+      pm2,
     });
 
     return {
@@ -132,6 +134,7 @@ const getLogFiles = async ({ name, node }) => {
       access,
       stdout,
       stderr,
+      pm2,
     };
   }
 

package/lib/validators/node.js

@@ -30,7 +30,7 @@ const nodeInfoSchema = Joi.object({
     }),
   nftDomainUrl: Joi.string()
     .uri({ scheme: [/https?/] })
-    .label('web wallet url')
+    .label('nft domain url')
     .allow('')
     .optional()
     .messages({

package/lib/webhook/index.js

@@ -173,7 +173,7 @@ module.exports = ({ events, dataDirs, instance }) => {
   const sendTestMessage = async (msg) => {
     const { webhookId, message } = msg;
     try {
-      const webhook = await webhookState.findOne(webhookId);
+      const webhook = webhookId ? await webhookState.findOne(webhookId) : msg.webhook;
       await sentTextMessage(webhook, message);
 
       notification.create({
@@ -195,6 +195,7 @@ module.exports = ({ events, dataDirs, instance }) => {
 
   return {
     listSenders: WebHookSender.listSenders,
+    getMessageSender: WebHookSender.getMessageSender,
     create: createWebhook,
     delete: deleteWebhook,
     sendTestMessage,

package/lib/webhook/sender/api/index.js

@@ -9,12 +9,16 @@ class APISender extends BaseSender {
     const { status, name, title, description } = message;
 
     try {
-      await axios.post(url, {
-        status,
-        name,
-        title,
-        description,
-      });
+      await axios.post(
+        url,
+        {
+          status,
+          name,
+          title,
+          description,
+        },
+        { timeout: 10000 }
+      );
     } catch (error) {
       logger.error('failed to push notification to api', { url, message: JSON.stringify(message), error });
     }
@@ -28,6 +32,14 @@ class APISender extends BaseSender {
       title: 'Test Message',
     });
   }
+
+  async sendNotification(url, notification) {
+    try {
+      await axios.post(url, notification, { timeout: 10000 });
+    } catch (error) {
+      logger.error('failed to push notification to api', { url, error });
+    }
+  }
 }
 
 APISender.type = 'api';

package/lib/webhook/sender/slack/index.js

@@ -59,8 +59,9 @@ class SlackSender extends BaseSender {
         username: 'Blocklet Server',
         icon_url: 'https://releases.arcblockio.cn/arcblock.png',
       });
-    } catch (error) {
-      logger.error('failed to push notification to slack', { api: url, message: JSON.stringify(message), error });
+    } catch (err) {
+      console.error(err);
+      logger.error('failed to push notification to slack', { api: url, message: JSON.stringify(message), error: err });
     }
   }
 
@@ -73,6 +74,66 @@ class SlackSender extends BaseSender {
       'text'
     );
   }
+
+  async sendNotification(url, message) {
+    const { title, body, sender, attachments, actions = [] } = message;
+    try {
+      const blocks = [];
+      if (title) {
+        blocks.push({
+          type: 'header',
+          text: {
+            type: 'plain_text',
+            text: title,
+          },
+        });
+      }
+      if (body) {
+        blocks.push({
+          type: 'section',
+          text: {
+            type: 'plain_text',
+            text: body,
+          },
+        });
+      }
+
+      // FIXME: support more attachment types: nft, image, token, vc
+      (attachments || [])
+        .filter((x) => x.type === 'section')
+        .forEach((x) => {
+          blocks.push({
+            type: x.type,
+            fields: x.fields.map((f) => ({ type: 'plain_text', text: f.data.text })),
+          });
+        });
+      if (actions.length) {
+        blocks.push({
+          type: 'actions',
+          elements: actions.map((x) => ({
+            type: 'button',
+            text: {
+              type: 'plain_text',
+              text: x.name,
+            },
+            style: 'primary',
+            value: x.name,
+            url: x.link,
+          })),
+        });
+      }
+
+      const webhook = new IncomingWebhook(url);
+      await webhook.send({
+        blocks,
+        username: sender.name,
+        icon_url: sender.logo,
+      });
+    } catch (err) {
+      console.error(err);
+      logger.error('failed to push notification to slack', { api: url, error: err });
+    }
+  }
 }
 
 SlackSender.type = 'slack';

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.18-beta-aa01bd8e",
+  "version": "1.16.18-beta-bb4ebacc",
   "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.18-beta-aa01bd8e",
-    "@abtnode/auth": "1.16.18-beta-aa01bd8e",
-    "@abtnode/certificate-manager": "1.16.18-beta-aa01bd8e",
-    "@abtnode/constant": "1.16.18-beta-aa01bd8e",
-    "@abtnode/cron": "1.16.18-beta-aa01bd8e",
-    "@abtnode/logger": "1.16.18-beta-aa01bd8e",
-    "@abtnode/models": "1.16.18-beta-aa01bd8e",
-    "@abtnode/queue": "1.16.18-beta-aa01bd8e",
-    "@abtnode/rbac": "1.16.18-beta-aa01bd8e",
-    "@abtnode/router-provider": "1.16.18-beta-aa01bd8e",
-    "@abtnode/static-server": "1.16.18-beta-aa01bd8e",
-    "@abtnode/timemachine": "1.16.18-beta-aa01bd8e",
-    "@abtnode/util": "1.16.18-beta-aa01bd8e",
+    "@abtnode/analytics": "1.16.18-beta-bb4ebacc",
+    "@abtnode/auth": "1.16.18-beta-bb4ebacc",
+    "@abtnode/certificate-manager": "1.16.18-beta-bb4ebacc",
+    "@abtnode/constant": "1.16.18-beta-bb4ebacc",
+    "@abtnode/cron": "1.16.18-beta-bb4ebacc",
+    "@abtnode/logger": "1.16.18-beta-bb4ebacc",
+    "@abtnode/models": "1.16.18-beta-bb4ebacc",
+    "@abtnode/queue": "1.16.18-beta-bb4ebacc",
+    "@abtnode/rbac": "1.16.18-beta-bb4ebacc",
+    "@abtnode/router-provider": "1.16.18-beta-bb4ebacc",
+    "@abtnode/static-server": "1.16.18-beta-bb4ebacc",
+    "@abtnode/timemachine": "1.16.18-beta-bb4ebacc",
+    "@abtnode/util": "1.16.18-beta-bb4ebacc",
     "@arcblock/did": "1.18.95",
     "@arcblock/did-auth": "1.18.95",
     "@arcblock/did-ext": "^1.18.95",
@@ -42,12 +42,12 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.95",
     "@arcblock/vc": "1.18.95",
-    "@blocklet/constant": "1.16.18-beta-aa01bd8e",
-    "@blocklet/env": "1.16.18-beta-aa01bd8e",
-    "@blocklet/meta": "1.16.18-beta-aa01bd8e",
-    "@blocklet/resolver": "1.16.18-beta-aa01bd8e",
-    "@blocklet/sdk": "1.16.18-beta-aa01bd8e",
-    "@did-space/client": "^0.3.20",
+    "@blocklet/constant": "1.16.18-beta-bb4ebacc",
+    "@blocklet/env": "1.16.18-beta-bb4ebacc",
+    "@blocklet/meta": "1.16.18-beta-bb4ebacc",
+    "@blocklet/resolver": "1.16.18-beta-bb4ebacc",
+    "@blocklet/sdk": "1.16.18-beta-bb4ebacc",
+    "@did-space/client": "^0.3.22",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.95",
     "@ocap/util": "1.18.95",
@@ -69,7 +69,7 @@
     "hasha": "^5.2.2",
     "is-base64": "^1.1.0",
     "is-url": "^1.2.4",
-    "joi": "17.7.0",
+    "joi": "17.11.0",
     "joi-extension-semver": "^5.0.0",
     "js-yaml": "^4.1.0",
     "kill-port": "^2.0.1",
@@ -101,5 +101,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "2bfa63d05ad290f13eee359661e4175b857d9f9d"
+  "gitHead": "aca7ff8eb508ecf586108b99a9e07ceab2a62430"
 }