@abtnode/core 1.16.24-beta-30f58f8d → 1.16.24-beta-c8847287

package/lib/blocklet/manager/disk.js

@@ -220,6 +220,40 @@ const pm2StatusMap = {
  */
 const getBlockletEngineNameByPlatform = (blockletMeta) => getBlockletEngine(blockletMeta).interpreter;
 
+const getWalletAppNotification = async (blocklet, tempBlockletInfo) => {
+  let blockletInfo = tempBlockletInfo;
+  if (!blockletInfo) {
+    const nodeInfo = await states.node.read();
+    blockletInfo = getBlockletInfo(blocklet, nodeInfo.sk);
+  }
+
+  return {
+    actions: [
+      {
+        name: 'Visit',
+        link: blockletInfo.appUrl,
+      },
+    ],
+    attachments: [
+      {
+        type: 'dapp',
+        data: {
+          url: blockletInfo.appUrl,
+          appDID: blocklet.appPid,
+          logo:
+            blocklet.environmentObj.BLOCKLET_APP_LOGO ||
+            joinUrl(
+              blockletInfo.appUrl,
+              normalizePathPrefix(joinUrl(WELLKNOWN_SERVICE_PATH_PREFIX, '/blocklet/logo')) || '/'
+            ),
+          title: blockletInfo.name,
+          desc: blockletInfo.description,
+        },
+      },
+    ],
+  };
+};
+
 class DiskBlockletManager extends BaseBlockletManager {
   constructor({
     dataDirs,
@@ -1434,6 +1468,45 @@ class DiskBlockletManager extends BaseBlockletManager {
 
         this.configSynchronizer.syncComponentConfig(childDid, rootDid, { serverSk });
       }
+
+      try {
+        const observableConfigs = [
+          BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_URL,
+          BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_NAME,
+          BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_DESCRIPTION,
+          BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO,
+          BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_SQUARE,
+          BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_RECT,
+          BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_FAVICON,
+        ];
+
+        const shouldSendWalletNotification = observableConfigs.some((x) => newConfigs.some((y) => y.key === x));
+        const receiverUsers = await this.teamManager.getOwnerAndAdminUsers(newState.appPid, 1);
+        const receiver = receiverUsers.map((x) => x.did);
+
+        if (shouldSendWalletNotification && receiver) {
+          const nodeInfo = await states.node.read();
+          const blockletInfo = getBlockletInfo(newState, nodeInfo.sk);
+          const walletExtra = await getWalletAppNotification(newState, blockletInfo);
+
+          const notification = {
+            receiver,
+            teamDid: newState.appPid,
+            title: 'Blocklet Config Changed',
+            description: `Blocklet ${blockletInfo.name} config changed`,
+            action: `/blocklets/${did}/overview`,
+            entityType: 'blocklet',
+            entityId: newState.appPid,
+            severity: 'success',
+            blockletUrl: blockletInfo.appUrl,
+            extra: { wallet: walletExtra },
+          };
+
+          await this.teamManager.createNotification(notification);
+        }
+      } catch (error) {
+        logger.error('Failed to send wallet notification after updated config', { did, error });
+      }
     }
 
     return newState;
@@ -3221,16 +3294,25 @@ class DiskBlockletManager extends BaseBlockletManager {
       }
 
       if (createNotification) {
-        this._createNotification(did, {
-          title: 'Blocklet Installed',
-          description: `Blocklet ${meta.title} is installed successfully. (Source: ${
-            deployedFrom || fromBlockletSource(source)
-          })`,
-          action: `/blocklets/${did}/overview`,
-          entityType: 'blocklet',
-          entityId: did,
-          severity: 'success',
-        });
+        // 发送通知不阻塞后续安装流程
+        try {
+          const walletExtra = await getWalletAppNotification(blocklet);
+
+          this._createNotification(did, {
+            title: 'Blocklet Installed',
+            description: `Blocklet ${meta.title} is installed successfully. (Source: ${
+              deployedFrom || fromBlockletSource(source)
+            })`,
+            action: `/blocklets/${did}/overview`,
+            entityType: 'blocklet',
+            entityId: did,
+            severity: 'success',
+            receiver: blocklet?.controller?.nftOwner,
+            extra: { wallet: walletExtra },
+          });
+        } catch (error) {
+          logger.error('create installed notification failed', { error, did });
+        }
       }
 
       await this._rollbackCache.remove({ did: blocklet.meta.did });
@@ -3730,13 +3812,15 @@ class DiskBlockletManager extends BaseBlockletManager {
           }${WELLKNOWN_BLOCKLET_ADMIN_PATH}`;
         }
       } catch (error) {
-        logger.error('[_createNotification] get blocklet url failed', { error });
+        logger.error('[_createNotification] get blocklet url failed', { did, error });
       }
 
       // if blocklet is external, no need to create notification in server
       const extra = await states.blockletExtras.getMeta(did);
       const isExternal = !!extra?.controller;
-      if (!isExternal) {
+
+      // 如果指定了 receiver, 或者是内部 blocklet, 则创建 notification
+      if (notification.receiver || !isExternal) {
         await states.notification.create({ ...notification, blockletUrl });
       }
       await this.teamManager.createNotification({
@@ -3746,7 +3830,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         blockletUrl,
       });
     } catch (error) {
-      logger.error('create notification failed', { error });
+      logger.error('create notification failed', { did, error });
     }
   }
 

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

@@ -113,7 +113,6 @@ const installComponentFromUrl = async ({
   if (onlyRequired) {
     newChildren = filterRequiredComponents(newChild, newChildren);
   }
-
   blocklet.children.push(...newChildren);
 
   checkVersionCompatibility(blocklet.children);

package/lib/event/index.js

@@ -13,6 +13,7 @@ const {
   BLOCKLET_CONFIGURABLE_KEY,
 } = require('@blocklet/constant');
 const { EVENTS, BACKUPS } = require('@abtnode/constant');
+
 const { NodeMonitSender } = require('../monitor/node-monit-sender');
 const handleInstanceInStore = require('../util/public-to-store');
 const { isCLI } = require('../util');
@@ -145,6 +146,7 @@ module.exports = ({
       }
 
       await teamAPI.refreshBlockletInterfacePermissions(blocklet.meta);
+      logger.info('refreshed blocklet interface permissions after installed', { did: blocklet.meta.did });
     } catch (error) {
       logger.error('create.url.mapping.error', { event: name, error });
       notificationState.create({

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

@@ -154,7 +154,7 @@ class BlockletRuntimeMonitor extends EventEmitter {
 
   async monitAll() {
     if (this.inProgress) {
-      this.logger.error('monitoring is in progress');
+      this.logger.debug('monitoring is in progress');
       return;
     }
 

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

@@ -105,7 +105,7 @@ class NodeRuntimeMonitor extends EventEmitter {
 
   async monit() {
     if (this.inProgress) {
-      this.logger.error('monitoring is in progress');
+      this.logger.debug('monitoring is in progress');
       return;
     }
 

package/lib/team/manager.js

@@ -137,11 +137,11 @@ class TeamManager extends EventEmitter {
     return this.getState(teamDid, 'notification');
   }
 
-  async createNotification({ teamDid, ...payload }) {
+  async createNotification({ teamDid, receiver, ...payload }) {
     const notification = await this.getState(teamDid, 'notification');
     const doc = await notification.create({ ...payload, teamDid });
     const metaDid = await this.states.blocklet.getBlockletMetaDid(teamDid);
-    this.emit(EVENTS.NOTIFICATION_BLOCKLET_CREATE, { meta: { did: metaDid }, ...payload, ...doc, teamDid });
+    this.emit(EVENTS.NOTIFICATION_BLOCKLET_CREATE, { meta: { did: metaDid }, ...payload, ...doc, teamDid, receiver });
   }
 
   async getProjectState(teamDid) {

package/lib/util/get-dynamic-components.js

@@ -8,7 +8,40 @@ const { filterDuplicateComponents, parseComponents } = require('./blocklet');
 async function getDynamicComponents({ url }) {
   const rawMeta = await axios.get(url).then((res) => res.data);
   const { dynamicComponents } = await parseComponents({ meta: rawMeta });
-  return filterDuplicateComponents(dynamicComponents);
+
+  const components = filterDuplicateComponents(dynamicComponents);
+
+  const requiredComponents = {};
+  rawMeta.components?.forEach((component) => {
+    if (component.required) {
+      requiredComponents[component.source?.name || component.name] = true;
+    }
+  });
+
+  const subRequiredComponents = {};
+  components.forEach((component) => {
+    component.required = !!requiredComponents[component.meta?.name || component.meta?.did];
+    if (component.required && component.meta?.components) {
+      component.meta.components.forEach((subComponent) => {
+        if (subComponent.required) {
+          if (subComponent.source?.name) {
+            subRequiredComponents[subComponent.source?.name] = true;
+          }
+          subRequiredComponents[subComponent.name] = true;
+        }
+      });
+    }
+  });
+  components.forEach((component) => {
+    if (subRequiredComponents[component.meta?.name || component.meta?.did]) {
+      component.required = true;
+    }
+  });
+
+  // eslint-disable-next-line no-nested-ternary
+  components.sort((a, b) => (a.required === b.required ? 0 : a.required ? -1 : 1));
+
+  return components;
 }
 
 module.exports = getDynamicComponents;

package/lib/webhook/index.js

@@ -1,8 +1,9 @@
 const logger = require('@abtnode/logger')('@abtnode/core:webhook:index');
-
 const { evaluateURLs } = require('@abtnode/util/lib/url-evaluation');
 const checkURLAccessible = require('@abtnode/util/lib/url-evaluation/check-accessible-node');
 const { EVENTS } = require('@abtnode/constant');
+const isEmpty = require('lodash/isEmpty');
+
 const WebHookSender = require('./sender');
 const WalletSender = require('./sender/wallet');
 const createQueue = require('../util/queue');
@@ -78,7 +79,7 @@ module.exports = ({ events, dataDirs, instance }) => {
   const webhookState = states.webhook;
   const notification = states.notification; // eslint-disable-line
 
-  const sendMessage = async (message) => {
+  const sendMessage = async ({ extra, ...message } = {}) => {
     try {
       const webhookList = await webhookState.list();
       const nodeInfo = await nodeState.read();
@@ -98,7 +99,7 @@ module.exports = ({ events, dataDirs, instance }) => {
             const senderInstance = WebHookSender.getMessageSender(item.type);
             senderFns[item.type] = senderInstance.send.bind(senderInstance);
           }
-          const options = { ...message, nodeInfo, node: instance };
+          let options = { ...message, nodeInfo, node: instance };
           if (item.type === 'slack') {
             // eslint-disable-next-line
             options.urlInfo = await getSlackUrlInfo({
@@ -106,7 +107,10 @@ module.exports = ({ events, dataDirs, instance }) => {
               path: message.action,
               serverUrls: baseUrls,
             });
+          } else if (item.type === WalletSender.type && !isEmpty(extra?.wallet)) {
+            options = { ...options, ...extra.wallet };
           }
+
           try {
             // eslint-disable-next-line
             await senderFns[item.type](item.params, options);
@@ -135,9 +139,9 @@ module.exports = ({ events, dataDirs, instance }) => {
 
   [EVENTS.NOTIFICATION_CREATE, EVENTS.NOTIFICATION_BLOCKLET_CREATE].forEach((event) => {
     events.on(event, (data) => {
-      const { title, description, severity, action, entityType, blockletUrl, entityId } = data;
-      if (!reduceQueue({ title, description, entityType, entityId, severity })) {
-        queue.push({ title, description, status: severity, action, entityType, blockletUrl });
+      const { title, description, severity, action, entityType, blockletUrl, entityId, extra, receiver } = data;
+      if (!reduceQueue({ title, description, entityType, entityId, severity, extra })) {
+        queue.push({ title, description, status: severity, action, entityType, blockletUrl, extra, receiver });
       }
     });
   });

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

@@ -5,7 +5,7 @@ const BaseSender = require('../base');
 
 class WalletSender extends BaseSender {
   async send(params, data = {}) {
-    const { title, description, nodeInfo, node } = data;
+    const { title, description, nodeInfo, node, receiver, actions, attachments } = data;
 
     try {
       const sender = {
@@ -17,28 +17,37 @@ class WalletSender extends BaseSender {
       const message = {
         title,
         body: description,
+        actions,
+        attachments,
       };
 
-      const { users } = await node.getUsers({
-        teamDid: nodeInfo.did,
-        paging: { pageSize: 100 },
-        query: { includePassports: true },
-      });
-      const adminUsers = users
-        .filter(
-          (x) =>
-            x.approved &&
-            (x.passports || []).some(
-              (y) => [ROLES.OWNER, ROLES.ADMIN].includes(y.name) && y.status === PASSPORT_STATUS.VALID
-            )
-        )
-        .map((x) => x.did);
-
-      if (!adminUsers.length) {
+      let to = [];
+
+      if (receiver) {
+        to = Array.isArray(receiver) ? receiver : [receiver];
+      } else {
+        const { users } = await node.getUsers({
+          teamDid: nodeInfo.did,
+          paging: { pageSize: 100 },
+          query: { includePassports: true },
+        });
+
+        to = users
+          .filter(
+            (x) =>
+              x.approved &&
+              (x.passports || []).some(
+                (y) => [ROLES.OWNER, ROLES.ADMIN].includes(y.name) && y.status === PASSPORT_STATUS.VALID
+              )
+          )
+          .map((x) => x.did);
+      }
+
+      if (!to.length) {
         return;
       }
 
-      await sendToUser(adminUsers, message, sender, process.env.ABT_NODE_SERVICE_PORT);
+      await sendToUser(to, message, sender, process.env.ABT_NODE_SERVICE_PORT);
     } catch (error) {
       delete error.request;
       delete error.response;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.24-beta-30f58f8d",
+  "version": "1.16.24-beta-c8847287",
   "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.24-beta-30f58f8d",
-    "@abtnode/auth": "1.16.24-beta-30f58f8d",
-    "@abtnode/certificate-manager": "1.16.24-beta-30f58f8d",
-    "@abtnode/constant": "1.16.24-beta-30f58f8d",
-    "@abtnode/cron": "1.16.24-beta-30f58f8d",
-    "@abtnode/logger": "1.16.24-beta-30f58f8d",
-    "@abtnode/models": "1.16.24-beta-30f58f8d",
-    "@abtnode/queue": "1.16.24-beta-30f58f8d",
-    "@abtnode/rbac": "1.16.24-beta-30f58f8d",
-    "@abtnode/router-provider": "1.16.24-beta-30f58f8d",
-    "@abtnode/static-server": "1.16.24-beta-30f58f8d",
-    "@abtnode/timemachine": "1.16.24-beta-30f58f8d",
-    "@abtnode/util": "1.16.24-beta-30f58f8d",
+    "@abtnode/analytics": "1.16.24-beta-c8847287",
+    "@abtnode/auth": "1.16.24-beta-c8847287",
+    "@abtnode/certificate-manager": "1.16.24-beta-c8847287",
+    "@abtnode/constant": "1.16.24-beta-c8847287",
+    "@abtnode/cron": "1.16.24-beta-c8847287",
+    "@abtnode/logger": "1.16.24-beta-c8847287",
+    "@abtnode/models": "1.16.24-beta-c8847287",
+    "@abtnode/queue": "1.16.24-beta-c8847287",
+    "@abtnode/rbac": "1.16.24-beta-c8847287",
+    "@abtnode/router-provider": "1.16.24-beta-c8847287",
+    "@abtnode/static-server": "1.16.24-beta-c8847287",
+    "@abtnode/timemachine": "1.16.24-beta-c8847287",
+    "@abtnode/util": "1.16.24-beta-c8847287",
     "@arcblock/did": "1.18.110",
     "@arcblock/did-auth": "1.18.110",
     "@arcblock/did-ext": "^1.18.110",
@@ -42,11 +42,11 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.110",
     "@arcblock/vc": "1.18.110",
-    "@blocklet/constant": "1.16.24-beta-30f58f8d",
-    "@blocklet/env": "1.16.24-beta-30f58f8d",
-    "@blocklet/meta": "1.16.24-beta-30f58f8d",
-    "@blocklet/resolver": "1.16.24-beta-30f58f8d",
-    "@blocklet/sdk": "1.16.24-beta-30f58f8d",
+    "@blocklet/constant": "1.16.24-beta-c8847287",
+    "@blocklet/env": "1.16.24-beta-c8847287",
+    "@blocklet/meta": "1.16.24-beta-c8847287",
+    "@blocklet/resolver": "1.16.24-beta-c8847287",
+    "@blocklet/sdk": "1.16.24-beta-c8847287",
     "@did-space/client": "^0.3.64",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.110",
@@ -102,5 +102,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "95f8e79898d7901f0665f3883e3c014c36f16668"
+  "gitHead": "463311bdbd2cf425eb5c1fcf94e821053de1f7b1"
 }