@abtnode/core 1.16.35 → 1.16.37-beta-20241224-013714-a79db7d3

package/lib/api/team.js

@@ -1517,23 +1517,48 @@ class TeamAPI extends EventEmitter {
     return this.teamManager.updateStoreList(teamDid, storeList);
   }
 
+  getNotificationReceivers(payload) {
+    return this.teamManager.getNotificationReceivers(payload);
+  }
+
   createNotification = (payload) => {
     return this.teamManager.createNotification(payload);
   };
 
-  async getNotification({ teamDid, ...rest }) {
+  async getNotification({ teamDid, ...rest }, context) {
     const notificationState = await this.getNotificationState(teamDid);
-    return notificationState.findPaginated({ teamDid, ...rest });
+    return notificationState.findPaginated({ teamDid, ...rest }, context);
   }
 
-  async readNotifications({ teamDid, ...rest }) {
+  async getNotificationById({ teamDid, id }) {
     const notificationState = await this.getNotificationState(teamDid);
-    return notificationState.read({ teamDid, ...rest });
+    const notification = await notificationState.findNotification({ id });
+    return notification;
+  }
+
+  async getBlockletNotificationsUnreadCount({ teamDid, receiver }) {
+    const notificationReceiverState = await this.getNotificationReceiverState(teamDid);
+    return notificationReceiverState.getUnreadCount({ receiver });
   }
 
-  async unreadNotifications({ teamDid, ...rest }) {
+  async markAllBlockletNotificationsAsRead({ teamDid, receiver }) {
+    const notificationReceiverState = await this.getNotificationReceiverState(teamDid);
+    return notificationReceiverState.makeAllAsRead({ receiver });
+  }
+
+  async updateBlockletNotificationStatus({ teamDid, receivers, notificationId, updates }) {
+    const notificationReceiverState = await this.getNotificationReceiverState(teamDid);
+    return notificationReceiverState.updateStatus({ receivers, notificationId, updates });
+  }
+
+  async readNotifications({ teamDid, ...rest }, context) {
+    const notificationState = await this.getNotificationState(teamDid);
+    return notificationState.read({ teamDid, ...rest }, context);
+  }
+
+  async unreadNotifications({ teamDid, ...rest }, context) {
     const notificationState = await this.getNotificationState(teamDid);
-    return notificationState.unread({ teamDid, ...rest });
+    return notificationState.unread({ teamDid, ...rest }, context);
   }
 
   // =======
@@ -1565,7 +1590,11 @@ class TeamAPI extends EventEmitter {
   }
 
   getNotificationState(did) {
-    return this.teamManager.getNotification(did);
+    return this.teamManager.getNotificationState(did);
+  }
+
+  getNotificationReceiverState(did) {
+    return this.teamManager.getNotificationReceiverState(did);
   }
 
   // =============

package/lib/blocklet/manager/disk.js

@@ -36,6 +36,7 @@ const {
   FEDERATED,
   CHECK_UPDATE,
   SESSION_CACHE_TTL,
+  ROLES,
 } = require('@abtnode/constant');
 
 const { getBlockletEngine } = require('@blocklet/meta/lib/engine');
@@ -640,7 +641,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     if (!blocklet.children) {
       return componentDids;
     }
-    const targetDid = !inputComponentDids?.length ? componentDids[0] : inputComponentDids[0];
+    const targetDid = !inputComponentDids?.length ? componentDids?.[0] : inputComponentDids[0];
 
     const canStartStatus = {
       [BlockletStatus.installed]: true,
@@ -877,6 +878,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         entityType: 'blocklet',
         entityId: did,
         severity: 'error',
+        componentDid: componentDids?.[0],
       });
 
       await this.deleteProcess({ did, componentDids });
@@ -984,6 +986,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         entityType: 'blocklet',
         entityId: did,
         severity: 'success',
+        componentDid: componentDids?.[0],
       });
 
       return res;
@@ -1080,6 +1083,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         entityType: 'blocklet',
         entityId: did,
         severity: 'error',
+        componentDid: componentDids?.[0],
       });
     });
 
@@ -1168,6 +1172,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         entityType: 'blocklet',
         entityId: doc.meta.did,
         severity: 'success',
+        componentDid: did,
       });
       return doc;
     } catch (error) {
@@ -1181,6 +1186,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         entityType: 'blocklet',
         entityId: doc.meta.did,
         severity: 'success',
+        componentDid: did,
       });
 
       return doc;
@@ -1371,6 +1377,7 @@ class DiskBlockletManager extends BaseBlockletManager {
       severity: 'success',
       action: `/blocklets/${newBlocklet.meta.did}/components`,
       blockletDashboardAction: '/.well-known/service/admin/components',
+      componentDid: child.meta.did,
     });
 
     this.emit(BlockletEvents.componentRemoved, {
@@ -2734,6 +2741,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         entityType: 'blocklet',
         entityId: did,
         severity: 'error',
+        componentDid: childrenToDownload[0]?.meta.did,
       });
 
       // rollback on download failed
@@ -2916,6 +2924,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         entityType: 'blocklet',
         entityId: did,
         severity: 'success',
+        componentDid: componentDids?.[0],
       });
 
       launcher.notifyBlockletUpdated(blocklet);
@@ -2946,6 +2955,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         entityType: 'blocklet',
         entityId: did,
         severity: 'error',
+        componentDid: componentDids?.[0],
       });
 
       this.emit(BlockletEvents.startFailed, { ...doc, componentDids, error: { message: error.message } });
@@ -3164,6 +3174,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     if (!list || !list.updateList?.length) {
       return;
     }
+    const componentDids = list.updateList.map((item) => item.meta.did);
     const updateList = list.updateList.map((item) => {
       return { title: item.meta.title, description: item.meta.description, version: item.meta.version };
     });
@@ -3240,6 +3251,7 @@ class DiskBlockletManager extends BaseBlockletManager {
           appSk: wallet.secretKey,
         },
         users,
+        componentDids,
       });
       await states.blockletExtras.setSettings(did, { checkUpdateMd5 });
     } catch (err) {
@@ -3280,20 +3292,10 @@ class DiskBlockletManager extends BaseBlockletManager {
    * blockletDashboardAction: string,
    * sender: { appDid: string, appSk: string },
    * users: Array<{ did: string, locale: string }>
+   * componentDids: Array<string>
    * */
-  async _sendAllMessageToUser({
-    did,
-    blocklet,
-    title,
-    body,
-    button,
-    description,
-    attachments,
-    action,
-    blockletDashboardAction,
-    sender,
-    users,
-  }) {
+  _sendAllMessageToUser({ did, title, description, action, blockletDashboardAction, componentDids }) {
+    // 这个方法会向用户发送消息
     this._createNotification(did, {
       title: title.en,
       description: description.en,
@@ -3302,50 +3304,52 @@ class DiskBlockletManager extends BaseBlockletManager {
       severity: 'success',
       action,
       blockletDashboardAction,
+      componentDid: componentDids?.[0],
     });
 
-    const zhUsers = users.filter((x) => x.locale === 'zh');
-    const enUsers = users.filter((x) => x.locale !== 'zh');
-    const url = `http://${getDidDomainForBlocklet({
-      did: blocklet.appPid,
-    })}`;
-    const link = `${url}${blockletDashboardAction}`;
+    // _createNotification 会将消息通过 sendToUser 发送
+    // const zhUsers = users.filter((x) => x.locale === 'zh');
+    // const enUsers = users.filter((x) => x.locale !== 'zh');
+    // const url = `http://${getDidDomainForBlocklet({
+    //   did: blocklet.appPid,
+    // })}`;
+    // const link = `${url}${blockletDashboardAction}`;
 
     // send in batches by language
-    if (zhUsers.length) {
-      await sendToUser(
-        zhUsers.map((x) => x.did),
-        {
-          title: title.zh,
-          body: body.zh,
-          attachments,
-          actions: [
-            {
-              name: button.zh,
-              link,
-            },
-          ],
-        },
-        sender
-      );
-    }
-    if (enUsers.length) {
-      await sendToUser(
-        enUsers.map((x) => x.did),
-        {
-          title: title.en,
-          body: body.en,
-          attachments,
-          actions: [
-            {
-              name: button.en,
-              link,
-            },
-          ],
-        },
-        sender
-      );
-    }
+    // if (zhUsers.length) {
+    //   await sendToUser(
+    //     zhUsers.map((x) => x.did),
+    //     {
+    //       title: title.zh,
+    //       body: body.zh,
+    //       attachments,
+    //       actions: [
+    //         {
+    //           name: button.zh,
+    //           link,
+    //         },
+    //       ],
+    //     },
+    //     sender
+    //   );
+    // }
+    // if (enUsers.length) {
+    //   await sendToUser(
+    //     enUsers.map((x) => x.did),
+    //     {
+    //       title: title.en,
+    //       body: body.en,
+    //       attachments,
+    //       actions: [
+    //         {
+    //           name: button.en,
+    //           link,
+    //         },
+    //       ],
+    //     },
+    //     sender
+    //   );
+    // }
   }
 
   async getBlockletEnvironments(did) {
@@ -3757,6 +3761,7 @@ class DiskBlockletManager extends BaseBlockletManager {
             entityId: did,
             severity: 'success',
             extra: { wallet: walletExtra },
+            componentDid: meta.did,
           });
         } catch (error) {
           logger.error('create installed notification failed', { error, did });
@@ -3784,6 +3789,7 @@ class DiskBlockletManager extends BaseBlockletManager {
           entityType: 'blocklet',
           entityId: did,
           severity: 'error',
+          componentDid: meta.did,
         });
       } catch (e) {
         logger.error('failed to remove blocklet on install error', { did: meta.did, error: e });
@@ -3997,6 +4003,7 @@ class DiskBlockletManager extends BaseBlockletManager {
           entityType: 'blocklet',
           entityId: did,
           severity: 'success',
+          componentDid: componentDids?.[0],
         });
       } catch (error) {
         logger.error('emit upgrade notification failed', { name, version, error });
@@ -4046,6 +4053,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         entityType: 'blocklet',
         entityId: did,
         severity: 'error',
+        componentDid: componentDids?.[0],
       });
       throw err;
     }
@@ -4342,15 +4350,26 @@ class DiskBlockletManager extends BaseBlockletManager {
     await forEachBlocklet(blocklet, hookFn, { parallel: true, concurrencyLimit: 4 });
   }
 
+  async getReceiverDids(teamDid) {
+    const receivers = await this.teamAPI.getNotificationReceivers({
+      teamDid,
+      roles: [ROLES.ADMIN, ROLES.OWNER],
+      selection: { did: 1 },
+    });
+    return receivers.map((r) => r.did);
+  }
+
+  // 目前：Blocklet 的安装消息都会聚合在这里。
   async _createNotification(did, notification) {
     if (isCLI()) {
-      return;
+      return undefined;
     }
 
     try {
       let blockletUrl;
+      let blocklet;
       try {
-        const blocklet = await this.getBlocklet(did);
+        blocklet = await this.getBlocklet(did);
         if (blocklet) {
           const urls = blocklet.site?.domainAliases || [];
           const customUrl = urls.find((x) => !x.isProtected)?.value;
@@ -4367,16 +4386,34 @@ class DiskBlockletManager extends BaseBlockletManager {
       const isExternal = !!extra?.controller;
 
       if (!isExternal) {
-        await states.notification.create({ ...notification, blockletUrl });
+        // 将 notification 信息保存在 server 中
+        const serverReceivers = await this.getReceiverDids(this.teamManager.nodeDid);
+        await states.notification.create({
+          ...notification,
+          blockletUrl,
+          receiver: serverReceivers,
+          sender: did,
+          source: 'system',
+        });
       }
-      await this.teamManager.createNotification({
-        teamDid: did,
-        ...notification,
-        action: notification.blockletDashboardAction || notification.action,
-        blockletUrl,
-      });
+
+      if (blocklet) {
+        const blockletReceivers = await this.getReceiverDids(did);
+        const doc = await this.teamManager.createNotification({
+          teamDid: did,
+          ...notification,
+          action: notification.blockletDashboardAction || notification.action,
+          blockletUrl,
+          sender: did,
+          source: 'system',
+          receiver: blockletReceivers,
+        });
+        return doc;
+      }
+      return undefined;
     } catch (error) {
       logger.error('create notification failed', { did, error });
+      return undefined;
     }
   }
 

package/lib/blocklet/manager/helper/install-application-from-backup.js

@@ -272,6 +272,7 @@ const installApplicationFromBackup = async ({
         entityType: 'blocklet',
         entityId: did,
         severity: 'error',
+        componentDid: blockletState?.meta?.did,
       });
     });
 

package/lib/blocklet/manager/helper/install-application-from-general.js

@@ -132,6 +132,7 @@ const installApplicationFromGeneral = async ({
       entityType: 'blocklet',
       entityId: did,
       severity: 'error',
+      componentDid,
     });
 
     throw err;
@@ -187,6 +188,7 @@ const installApplicationFromGeneral = async ({
           entityType: 'blocklet',
           entityId: did,
           severity: 'error',
+          componentDid,
         });
       });
     }, delay || 0);

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

@@ -206,6 +206,7 @@ const installComponentFromUrl = async ({
       entityType: 'blocklet',
       entityId: rootDid,
       severity: 'error',
+      componentDid: componentDids[0],
     });
   });
   return newBlocklet;

package/lib/blocklet/manager/helper/upgrade-components.js

@@ -167,6 +167,7 @@ const upgrade = async ({ updateId, componentDids, context, states, manager }) =>
       entityType: 'blocklet',
       entityId: did,
       severity: 'error',
+      componentDid: componentDids[0],
     });
   });
 

package/lib/blocklet/migration-dist/migration.cjs

@@ -610,6 +610,8 @@ module.exports = Object.freeze({
   STORE_DETAIL_PAGE_PATH_PREFIX: '/blocklets',
 
   MAX_USER_PAGE_SIZE: 100,
+  // 默认最大 page size
+  MAX_PAGE_SIZE: 100,
 
   SERVER_STATUS: {
     RUNNING: 1,
@@ -38551,7 +38553,7 @@ module.exports = require("zlib");
 /***/ ((module) => {
 
 "use strict";
-module.exports = JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.33","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib","test":"node tools/jest.js","coverage":"npm run test -- --coverage"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.33","@abtnode/auth":"1.16.33","@abtnode/certificate-manager":"1.16.33","@abtnode/constant":"1.16.33","@abtnode/cron":"1.16.33","@abtnode/logger":"1.16.33","@abtnode/models":"1.16.33","@abtnode/queue":"1.16.33","@abtnode/rbac":"1.16.33","@abtnode/router-provider":"1.16.33","@abtnode/static-server":"1.16.33","@abtnode/timemachine":"1.16.33","@abtnode/util":"1.16.33","@arcblock/did":"1.18.162","@arcblock/did-auth":"1.18.162","@arcblock/did-ext":"^1.18.162","@arcblock/did-motif":"^1.1.13","@arcblock/did-util":"1.18.162","@arcblock/event-hub":"1.18.162","@arcblock/jwt":"^1.18.162","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"^1.18.162","@arcblock/vc":"1.18.162","@blocklet/constant":"1.16.33","@blocklet/did-space-js":"^0.5.82","@blocklet/env":"1.16.33","@blocklet/meta":"1.16.33","@blocklet/resolver":"1.16.33","@blocklet/sdk":"1.16.33","@blocklet/store":"1.16.33","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.18.162","@ocap/util":"1.18.162","@ocap/wallet":"1.18.162","@slack/webhook":"^5.0.4","archiver":"^7.0.1","axios":"^1.7.5","axon":"^2.0.3","chalk":"^4.1.2","cross-spawn":"^7.0.3","deep-diff":"^1.0.2","detect-port":"^1.5.1","envfile":"^7.1.0","escape-string-regexp":"^4.0.0","fast-glob":"^3.3.2","filesize":"^10.1.1","flat":"^5.0.2","fs-extra":"^11.2.0","get-port":"^5.1.1","hasha":"^5.2.2","is-base64":"^1.1.0","is-url":"^1.2.4","is-ip":"3","is-cidr":"4","joi":"17.12.2","joi-extension-semver":"^5.0.0","js-yaml":"^4.1.0","kill-port":"^2.0.1","lodash":"^4.17.21","lru-cache":"^11.0.2","node-stream-zip":"^1.15.0","p-all":"^3.0.0","p-limit":"^3.1.0","p-map":"^4.0.0","p-retry":"^4.6.2","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","ssri":"^8.0.1","stream-throttle":"^0.1.3","stream-to-promise":"^3.0.0","systeminformation":"^5.23.3","tail":"^2.2.4","tar":"^6.1.11","transliteration":"^2.3.5","ua-parser-js":"^1.0.2","ufo":"^1.5.3","uuid":"^9.0.1","valid-url":"^1.0.9","which":"^2.0.2","xbytes":"^1.8.0"},"devDependencies":{"expand-tilde":"^2.0.2","express":"^4.18.2","jest":"^29.7.0","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
+module.exports = JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.36","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib","test":"node tools/jest.js","coverage":"npm run test -- --coverage"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.36","@abtnode/auth":"1.16.36","@abtnode/certificate-manager":"1.16.36","@abtnode/constant":"1.16.36","@abtnode/cron":"1.16.36","@abtnode/logger":"1.16.36","@abtnode/models":"1.16.36","@abtnode/queue":"1.16.36","@abtnode/rbac":"1.16.36","@abtnode/router-provider":"1.16.36","@abtnode/static-server":"1.16.36","@abtnode/timemachine":"1.16.36","@abtnode/util":"1.16.36","@arcblock/did":"1.18.162","@arcblock/did-auth":"1.18.162","@arcblock/did-ext":"^1.18.162","@arcblock/did-motif":"^1.1.13","@arcblock/did-util":"1.18.162","@arcblock/event-hub":"1.18.162","@arcblock/jwt":"^1.18.162","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"^1.18.162","@arcblock/vc":"1.18.162","@blocklet/constant":"1.16.36","@blocklet/did-space-js":"^0.6.0","@blocklet/env":"1.16.36","@blocklet/meta":"1.16.36","@blocklet/resolver":"1.16.36","@blocklet/sdk":"1.16.36","@blocklet/store":"1.16.36","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.18.162","@ocap/util":"1.18.162","@ocap/wallet":"1.18.162","@slack/webhook":"^5.0.4","archiver":"^7.0.1","axios":"^1.7.5","axon":"^2.0.3","chalk":"^4.1.2","cross-spawn":"^7.0.3","deep-diff":"^1.0.2","detect-port":"^1.5.1","envfile":"^7.1.0","escape-string-regexp":"^4.0.0","fast-glob":"^3.3.2","filesize":"^10.1.1","flat":"^5.0.2","fs-extra":"^11.2.0","get-port":"^5.1.1","hasha":"^5.2.2","is-base64":"^1.1.0","is-cidr":"4","is-ip":"3","is-url":"^1.2.4","joi":"17.12.2","joi-extension-semver":"^5.0.0","js-yaml":"^4.1.0","kill-port":"^2.0.1","lodash":"^4.17.21","lru-cache":"^11.0.2","node-stream-zip":"^1.15.0","p-all":"^3.0.0","p-limit":"^3.1.0","p-map":"^4.0.0","p-retry":"^4.6.2","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","ssri":"^8.0.1","stream-throttle":"^0.1.3","stream-to-promise":"^3.0.0","systeminformation":"^5.23.3","tail":"^2.2.4","tar":"^6.1.11","transliteration":"^2.3.5","ua-parser-js":"^1.0.2","ufo":"^1.5.3","uuid":"^9.0.1","valid-url":"^1.0.9","which":"^2.0.2","xbytes":"^1.8.0"},"devDependencies":{"expand-tilde":"^2.0.2","express":"^4.18.2","jest":"^29.7.0","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
 
 /***/ }),
 

package/lib/index.js

@@ -537,17 +537,27 @@ function ABTNode(options) {
     addBlockletStore: teamAPI.addStore.bind(teamAPI),
     deleteBlockletStore: teamAPI.deleteStore.bind(teamAPI),
 
+    getNotificationReceivers: teamAPI.getNotificationReceivers.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),
+    getNotificationById: states.notification.findNotification.bind(states.notification),
+    getNotificationsUnreadCount: states.notificationReceiver.getUnreadCount.bind(states.notificationReceiver),
+    makeAllAsRead: states.notificationReceiver.makeAllAsRead.bind(states.notificationReceiver),
+    updateNotificationStatus: states.notificationReceiver.updateStatus.bind(states.notificationReceiver),
 
     // Blocklet Notifications
     createBlockletNotification: teamAPI.createNotification.bind(teamAPI),
     getBlockletNotifications: teamAPI.getNotification.bind(teamAPI),
     readBlockletNotifications: teamAPI.readNotifications.bind(teamAPI),
     unreadBlockletNotifications: teamAPI.unreadNotifications.bind(teamAPI),
+    getBlockletNotificationById: teamAPI.getNotificationById.bind(teamAPI),
+    getBlockletNotificationsUnreadCount: teamAPI.getBlockletNotificationsUnreadCount.bind(teamAPI),
+    makeAllBlockletNotificationsAsRead: teamAPI.markAllBlockletNotificationsAsRead.bind(teamAPI),
+    updateBlockletNotificationStatus: teamAPI.updateBlockletNotificationStatus.bind(teamAPI),
 
     // AuditLog
     createAuditLog: (params) => states.auditLog.create(params, instance),

package/lib/states/index.js

@@ -5,6 +5,7 @@ const logger = require('@abtnode/logger')('@abtnode/core:states');
 const NodeState = require('./node');
 const BlockletState = require('./blocklet');
 const NotificationState = require('./notification');
+const NotificationReceiverState = require('./notification-receiver');
 const SiteState = require('./site');
 const AccessKeyState = require('./access-key');
 const WebhookState = require('./webhook');
@@ -29,6 +30,12 @@ const init = (dataDirs, config = {}) => {
   logger.info(`Init server states in ${dbPath}`);
 
   const notificationState = new NotificationState(models.Notification, config);
+  const notificationReceiverState = new NotificationReceiverState(models.NotificationReceivers, config);
+
+  // bind notification model
+  notificationState.setNotificationReceiversState(notificationReceiverState);
+  notificationReceiverState.setNotificationState(notificationState);
+
   const nodeState = new NodeState(models.Server, config, dataDirs, notificationState);
   const blockletState = new BlockletState(models.Blocklet, config);
   const siteState = new SiteState(models.Site, config);
@@ -48,6 +55,7 @@ const init = (dataDirs, config = {}) => {
     node: nodeState,
     blocklet: blockletState,
     notification: notificationState,
+    notificationReceiver: notificationReceiverState,
     site: siteState,
     accessKey: accessKeyState,
     webhook: webhookState,
@@ -68,6 +76,7 @@ const init = (dataDirs, config = {}) => {
  *  blocklet: import('./blocklet'),
  *  blockletExtras: import('./blocklet-extras'),
  *  notification: import('./notification'),
+ *  notificationReceiver: import('./notification-receiver'),
  *  job: import('./job'),
  *  node: import('./node'),
  *  [key: string]: any

package/lib/states/notification-receiver.js

@@ -0,0 +1,59 @@
+const logger = require('@abtnode/logger')('@abtnode/core:states:notification');
+const BaseState = require('./base');
+
+/**
+ * @extends BaseState<import('@abtnode/models').NotificationReceiverState>
+ */
+class NotificationReceiverState extends BaseState {
+  constructor(baseDir, config = {}) {
+    super(baseDir, { ...config });
+
+    this.defaultReceiver = config.defaultReceiver || '';
+    this.notificationState = config.notificationState;
+  }
+
+  setNotificationState(state) {
+    this.notificationState = state;
+  }
+
+  getNotificationState() {
+    return this.notificationState;
+  }
+
+  // 更新消息状态
+  async updateStatus({ notificationId, receivers, updates }) {
+    if (!notificationId || !receivers.length) {
+      logger.error('notification is not exist', notificationId, receivers);
+    }
+    const [numAffected] = await this.update({ receiver: { $in: receivers }, notificationId }, { $set: { ...updates } });
+    return numAffected;
+  }
+
+  /**
+   * 获取当前用户未读消息数量
+   */
+  async getUnreadCount({ receiver }) {
+    if (!receiver) {
+      logger.error('receiver is not as empty');
+    }
+
+    const count = await this.count({
+      receiver,
+      read: false,
+    });
+    return count;
+  }
+
+  /**
+   * 将当前用户所有消息标记为已读
+   */
+  async makeAllAsRead({ receiver }) {
+    if (!receiver) {
+      logger.error('receiver is not as empty');
+    }
+    const [numAffected] = await this.update({ receiver }, { $set: { read: true } });
+    return numAffected;
+  }
+}
+
+module.exports = NotificationReceiverState;

package/lib/states/notification.js

@@ -1,8 +1,29 @@
 const logger = require('@abtnode/logger')('@abtnode/core:states:notification');
 const { EVENTS } = require('@abtnode/constant');
+const { MAX_PAGE_SIZE } = require('@abtnode/constant');
+const { Sequelize, Op } = require('sequelize');
+const { isValid } = require('@arcblock/did');
 
 const BaseState = require('./base');
 
+const receiverDidValidation = (receiver, context) => {
+  const { did } = context?.user ?? {};
+  if (!receiver || did !== receiver) {
+    return "You are not allowed to mark other user's notification as read";
+  }
+  if (!isValid(receiver)) {
+    return 'Please provide a valid receiver DID.';
+  }
+  return '';
+};
+
+const readUnreadInputValidation = ({ notificationIds, receiver }, context) => {
+  if (!notificationIds.length) {
+    return 'Please provide the notificationId(s) to mark as read.';
+  }
+  return receiverDidValidation(receiver, context);
+};
+
 /**
  * @extends BaseState<import('@abtnode/models').NotificationState>
  */
@@ -12,6 +33,7 @@ class NotificationState extends BaseState {
 
     this.defaultSender = config.defaultSender || '';
     this.defaultReceiver = config.defaultReceiver || '';
+    this.notificationReceiverState = config.notificationReceiverState;
   }
 
   setDefaultSender(sender) {
@@ -22,58 +44,165 @@ class NotificationState extends BaseState {
     this.defaultReceiver = receiver;
   }
 
+  setNotificationReceiversState(state) {
+    this.notificationReceiverState = state;
+  }
+
+  getNotificationReceiversState() {
+    return this.notificationReceiverState;
+  }
+
   async create(payload) {
-    ['description'].forEach((x) => {
-      if (!payload[x]) {
-        throw new Error(`Invalid notification payload: ${x} is required`);
-      }
-    });
-
-    const doc = await this.insert({
-      sender: payload.sender || this.defaultSender,
-      receiver: payload.receiver || this.defaultReceiver,
-      title: payload.title,
-      description: payload.description,
-      action: payload.action || '',
+    if (!this.notificationReceiverState) {
+      throw new Error('Invalid database: missing notification_receivers tables');
+    }
+
+    const title = payload.title || '';
+    const description = payload.description || payload.body;
+
+    // 校验必填字段
+    if (!title) {
+      throw new Error('Invalid notification payload: title is required');
+    }
+
+    if (!description) {
+      throw new Error('Invalid notification payload: description is required');
+    }
+
+    const sender = payload?.sender?.did || this.defaultSender;
+    const receiverRaws = payload.receiver || this.defaultReceiver;
+
+    const actions = payload.actions ?? [];
+    if (payload.action) {
+      actions.push({
+        name: 'Visit',
+        link: payload.action,
+      });
+    }
+
+    let { severity } = payload;
+    if (severity === 'normal') {
+      severity = 'info';
+    }
+
+    const notificationData = {
+      sender,
+      receiver: '',
       entityType: payload.entityType || '',
       entityId: payload.entityId || '',
-      severity: payload.severity || 'info',
+      action: payload.action || '',
+      title,
       read: false,
-    });
+      description,
+      severity: severity || 'info',
+      attachments: payload.attachments ? payload.attachments : [],
+      actions,
+      blocks: payload.blocks ? payload.blocks : [],
+      type: payload.type || 'notification',
+      source: payload.source || (sender === payload.teamDid ? 'system' : 'component'),
+      componentDid: payload.componentDid || sender,
+    };
+    const receivers = Array.isArray(receiverRaws) ? receiverRaws : [receiverRaws];
+    const doc = await this.insert(notificationData);
+
+    const receiverEntries = receivers.map((receiverId) => ({
+      receiver: receiverId,
+      notificationId: doc.id,
+    }));
 
+    const receiverDoc = await this.notificationReceiverState.insertMany(receiverEntries);
+    if (receiverDoc) {
+      doc.receivers = receiverDoc;
+    }
     if (!payload.teamDid) {
       this.emit(EVENTS.NOTIFICATION_CREATE, {
         ...payload,
         ...doc,
+        receiver: receiverDoc.map((item) => item.receiver),
       });
     }
-
     return doc;
   }
 
-  findPaginated({ read, paging, teamDid } = {}) {
-    const conditions = {};
+  findPaginated({ read, paging, receiver, severity, componentDid, entityId, pageSize = 10 } = {}, context) {
+    const errorMsg = receiverDidValidation(receiver, context);
+    if (errorMsg) {
+      throw new Error(errorMsg);
+    }
+
+    const where = {};
+    const includeConditions = {};
     if (typeof read === 'boolean') {
-      conditions.read = read;
+      includeConditions.read = read;
+    }
+    if (receiver) {
+      includeConditions.receiver = receiver;
     }
-    if (teamDid) {
-      conditions.entityId = teamDid;
+    where.id = {
+      [Op.in]: Sequelize.literal(`
+        (SELECT DISTINCT notificationId FROM notification_receivers WHERE receiver = '${receiver}')
+      `),
+    };
+
+    if (componentDid) {
+      where.componentDid = componentDid;
+    }
+
+    if (severity) {
+      where.severity = severity;
     }
-    return this.paginate(conditions, { createdAt: -1 }, { ...paging, pageSize: 10 });
+    if (entityId) {
+      where.entityId = entityId;
+    }
+
+    const include = [
+      {
+        model: this.notificationReceiverState.model,
+        as: 'receivers', // 关联的别名
+        where: includeConditions,
+        required: true,
+        separate: true, // 会对主查询和关联查询分开执行，而不是通过单个 SQL 查询一次性完成
+      },
+    ];
+
+    const curPageSize = pageSize > MAX_PAGE_SIZE ? MAX_PAGE_SIZE : pageSize;
+
+    return this.paginate({ where, include }, { createdAt: -1 }, { ...paging, pageSize: curPageSize });
+  }
+
+  async findNotification({ id }) {
+    if (!id) {
+      throw new Error('notification id is not allow empty');
+    }
+    const doc = await this.findOne({ id });
+    return doc;
   }
 
-  // eslint-disable-next-line no-unused-vars
-  async read({ id }, context) {
-    const idList = id.split(',').map((x) => x.trim());
-    logger.info('mark notification as read', { idList });
-    const [numAffected] = await this.update({ id: { $in: idList } }, { $set: { read: true } });
+  async read({ notificationIds, receiver }, context) {
+    const errorMsg = readUnreadInputValidation({ notificationIds, receiver }, context);
+    if (errorMsg) {
+      throw new Error(errorMsg);
+    }
+    logger.info('mark notification as read', { notificationIds });
+    const conditions = {
+      notificationId: { $in: notificationIds },
+      receiver,
+    };
+    const [numAffected] = await this.notificationReceiverState.update(conditions, { $set: { read: true } });
     return numAffected;
   }
 
-  // eslint-disable-next-line no-unused-vars
-  async unread({ id }, context) {
-    const idList = Array.isArray(id) ? id : [id];
-    const [numAffected] = await this.update({ id: { $in: idList } }, { $set: { read: false } });
+  async unread({ notificationIds, receiver }, context) {
+    const errorMsg = readUnreadInputValidation({ notificationIds, receiver }, context);
+    if (errorMsg) {
+      throw new Error(errorMsg);
+    }
+    logger.info('mark notification as unread', { notificationIds });
+    const conditions = {
+      notificationId: { $in: notificationIds },
+      receiver,
+    };
+    const [numAffected] = await this.notificationReceiverState.update(conditions, { $set: { read: false } });
     return numAffected;
   }
 }

package/lib/states/user.js

@@ -367,7 +367,14 @@ SELECT did,inviter,generation FROM UserTree`.trim();
 
   // eslint-disable-next-line require-await
   async getUsersByDids({ dids, query }) {
-    const { approved, includeTags, includePassports, includeUserSessions } = query || {};
+    const {
+      approved,
+      includeTags,
+      includePassports,
+      includeUserSessions,
+      enableConnectedAccounts = false,
+      selection = {},
+    } = query || {};
     const condition = { did: dids };
     if (isNullOrUndefined(approved) === false) {
       condition.approved = !!approved;
@@ -392,8 +399,12 @@ SELECT did,inviter,generation FROM UserTree`.trim();
         required: false,
       });
     }
+    if (enableConnectedAccounts) {
+      include.push(this.getConnectedInclude());
+    }
 
-    return this.find({ where: condition, include });
+    const result = await this.find({ where: condition, include }, selection);
+    return result;
   }
 
   // eslint-disable-next-line require-await
@@ -681,6 +692,14 @@ SELECT did,inviter,generation FROM UserTree`.trim();
     return result;
   }
 
+  getConnectedInclude() {
+    return {
+      model: this.models.ConnectedAccount,
+      as: 'connectedAccounts',
+      required: false,
+    };
+  }
+
   async getPassports(did) {
     const passports = await this.passport.find({ userDid: did });
     return passports;
@@ -726,6 +745,34 @@ SELECT did,inviter,generation FROM UserTree`.trim();
     }
     return user;
   }
+
+  /**
+   * 查询一个 Role 下的所有用户
+   * @returns
+   */
+  async getUsersByRoles({ roles = [], enableConnectedAccounts = false, selection = {} }) {
+    if (!roles.length) {
+      return [];
+    }
+    const replacements = {
+      status: PASSPORT_STATUS.VALID,
+      roles,
+    };
+    const condition = {
+      approved: true,
+      did: {
+        [Op.in]: Sequelize.literal(
+          '(SELECT DISTINCT userDid FROM passports WHERE name IN (:roles) AND status = :status)'
+        ),
+      },
+    };
+    const include = [];
+    if (enableConnectedAccounts) {
+      include.push(this.getConnectedInclude());
+    }
+    const result = await this.find({ where: condition, replacements, include }, selection);
+    return result;
+  }
 }
 
 module.exports = User;

package/lib/team/manager.js

@@ -38,6 +38,7 @@ const States = {
   Project: require('../states/project'),
   Release: require('../states/release'),
   Notification: require('../states/notification'),
+  NotificationReceivers: require('../states/notification-receiver'),
   VerifyCode: require('../states/verify-code'),
   SecurityRule: SecurityRuleState,
   AccessPolicy: AccessPolicyState,
@@ -54,6 +55,7 @@ const getDefaultTeamState = () => ({
   project: null,
   release: null,
   notification: null,
+  notificationReceivers: null,
   verifyCode: null,
   securityRule: null,
   accessPolicy: null,
@@ -115,6 +117,7 @@ class TeamManager extends EventEmitter {
       connectedAccount: await this.createState(this.nodeDid, 'ConnectedAccount'),
       session: await this.createState(this.nodeDid, 'Session'),
       notification: await this.createState(this.nodeDid, 'Notification'),
+      NotificationReceivers: await this.createState(this.nodeDid, 'NotificationReceivers'),
       verifyCode: await this.createState(this.nodeDid, 'VerifyCode'),
       securityRule: await this.createState(this.nodeDid, 'SecurityRule'),
       accessPolicy: await this.createState(this.nodeDid, 'AccessPolicy'),
@@ -146,19 +149,77 @@ class TeamManager extends EventEmitter {
     return this.getState(teamDid, 'session');
   }
 
-  getNotification(teamDid) {
-    return this.getState(teamDid, 'notification');
+  async getNotificationState(teamDid) {
+    const state = await this.getState(teamDid, 'notification');
+    const receiverState = await this.getState(teamDid, 'notificationReceivers');
+    state.setNotificationReceiversState(receiverState);
+    return state;
+  }
+
+  async getNotificationReceiverState(teamDid) {
+    const state = await this.getState(teamDid, 'notificationReceivers');
+    const notificationState = await this.getState(teamDid, 'notification');
+    state.setNotificationState(notificationState);
+    return state;
   }
 
   getVerifyCodeState(teamDid) {
     return this.getState(teamDid, 'verifyCode');
   }
 
+  async getNotificationReceivers(payload) {
+    const { teamDid, userDids = [], roles = [], selection = {}, enableConnectedAccounts = false } = payload;
+    // 会根据 teamDid 返回对应 state
+    const userState = await this.getUserState(teamDid);
+    if (!userDids.length && !roles.length) {
+      return [];
+    }
+    try {
+      // 这些用户信息已经是 approved 的用户，不需要再次确认
+      let users = [];
+      if (roles.length > 0) {
+        const roleUsers = await userState.getUsersByRoles({ roles, selection, enableConnectedAccounts });
+        users = users.concat(roleUsers);
+      }
+      if (userDids.length > 0) {
+        const queryUsers = await userState.getUsersByDids({
+          dids: userDids,
+          query: {
+            approved: true,
+            selection,
+            enableConnectedAccounts,
+          },
+        });
+        users = users.concat(queryUsers);
+      }
+
+      return users;
+    } catch (error) {
+      logger.error('get receivers failed: ', error);
+      return [];
+    }
+  }
+
   async createNotification({ teamDid, receiver, ...payload }) {
-    const notification = await this.getState(teamDid, 'notification');
-    const doc = await notification.create({ ...payload, teamDid });
+    // const notification = await this.getState(teamDid, 'notification');
+    const notification = await this.getNotificationState(teamDid);
+    const doc = await notification.create({ ...payload, receiver, teamDid });
     const metaDid = await this.states.blocklet.getBlockletMetaDid(teamDid);
-    this.emit(EVENTS.NOTIFICATION_BLOCKLET_CREATE, { meta: { did: metaDid }, ...payload, ...doc, teamDid, receiver });
+    if (!payload.ignoreBroadcast) {
+      // 是否需要广播到页面
+      this.emit(EVENTS.NOTIFICATION_BLOCKLET_CREATE, {
+        meta: { did: metaDid },
+        ...payload,
+        ...doc,
+        teamDid,
+        appInfo: {
+          did: teamDid,
+        },
+        receiver: doc?.receivers?.map((item) => item.receiver),
+      });
+    }
+
+    return doc;
   }
 
   async getProjectState(teamDid) {

package/lib/webhook/index.js

@@ -4,6 +4,8 @@ const checkURLAccessible = require('@abtnode/util/lib/url-evaluation/check-acces
 const { EVENTS } = require('@abtnode/constant');
 const isEmpty = require('lodash/isEmpty');
 
+const { joinURL } = require('ufo');
+const isUrl = require('is-url');
 const WebHookSender = require('./sender');
 const WalletSender = require('./sender/wallet');
 const createQueue = require('../util/queue');
@@ -108,6 +110,24 @@ module.exports = ({ events, dataDirs, instance }) => {
               serverUrls: baseUrls,
             });
           } else if (item.type === WalletSender.type && !isEmpty(extra?.wallet)) {
+            // 要将 logo 的 URL 拼接为完整的地址
+            const { attachments } = extra.wallet ?? {};
+            if (Array.isArray(attachments)) {
+              const newAttachments = attachments.map((attachment) => {
+                if (attachment.data.url && attachment.data.logo && !isUrl(attachment.data.log)) {
+                  attachment.data.logo = joinURL(attachment.data.url, attachment.data.logo);
+                  return attachment;
+                }
+                return attachment;
+              });
+              options = {
+                ...options,
+                ...{
+                  ...extra.wallet,
+                  attachments: newAttachments,
+                },
+              };
+            }
             options = { ...options, ...extra.wallet };
           }
 
@@ -139,9 +159,22 @@ 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, extra, receiver } = data;
-      if (!reduceQueue({ title, description, entityType, entityId, severity, extra })) {
-        queue.push({ title, description, status: severity, action, entityType, blockletUrl, extra, receiver });
+      const { id, title, description, severity, action, entityType, blockletUrl, entityId, extra, receiver, appInfo } =
+        data;
+      if (!reduceQueue({ id, title, description, entityType, entityId, severity, extra })) {
+        queue.push({
+          title,
+          description,
+          status: severity,
+          action,
+          entityType,
+          blockletUrl,
+          extra,
+          receiver,
+          id,
+          appInfo,
+          teamDid: data.teamDid,
+        });
       }
     });
   });

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, receiver, actions, attachments } = data;
+    const { id, title, description, nodeInfo, node, receiver, actions, attachments, appInfo } = data;
 
     try {
       const sender = {
@@ -15,10 +15,12 @@ class WalletSender extends BaseSender {
       };
 
       const message = {
+        id,
         title,
         body: description,
         actions,
         attachments,
+        appInfo,
       };
 
       let to = [];

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.35",
+  "version": "1.16.37-beta-20241224-013714-a79db7d3",
   "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.35",
-    "@abtnode/auth": "1.16.35",
-    "@abtnode/certificate-manager": "1.16.35",
-    "@abtnode/constant": "1.16.35",
-    "@abtnode/cron": "1.16.35",
-    "@abtnode/logger": "1.16.35",
-    "@abtnode/models": "1.16.35",
-    "@abtnode/queue": "1.16.35",
-    "@abtnode/rbac": "1.16.35",
-    "@abtnode/router-provider": "1.16.35",
-    "@abtnode/static-server": "1.16.35",
-    "@abtnode/timemachine": "1.16.35",
-    "@abtnode/util": "1.16.35",
+    "@abtnode/analytics": "1.16.37-beta-20241224-013714-a79db7d3",
+    "@abtnode/auth": "1.16.37-beta-20241224-013714-a79db7d3",
+    "@abtnode/certificate-manager": "1.16.37-beta-20241224-013714-a79db7d3",
+    "@abtnode/constant": "1.16.37-beta-20241224-013714-a79db7d3",
+    "@abtnode/cron": "1.16.37-beta-20241224-013714-a79db7d3",
+    "@abtnode/logger": "1.16.37-beta-20241224-013714-a79db7d3",
+    "@abtnode/models": "1.16.37-beta-20241224-013714-a79db7d3",
+    "@abtnode/queue": "1.16.37-beta-20241224-013714-a79db7d3",
+    "@abtnode/rbac": "1.16.37-beta-20241224-013714-a79db7d3",
+    "@abtnode/router-provider": "1.16.37-beta-20241224-013714-a79db7d3",
+    "@abtnode/static-server": "1.16.37-beta-20241224-013714-a79db7d3",
+    "@abtnode/timemachine": "1.16.37-beta-20241224-013714-a79db7d3",
+    "@abtnode/util": "1.16.37-beta-20241224-013714-a79db7d3",
     "@arcblock/did": "1.18.162",
     "@arcblock/did-auth": "1.18.162",
     "@arcblock/did-ext": "^1.18.162",
@@ -42,13 +42,13 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.162",
     "@arcblock/vc": "1.18.162",
-    "@blocklet/constant": "1.16.35",
-    "@blocklet/did-space-js": "^0.5.82",
-    "@blocklet/env": "1.16.35",
-    "@blocklet/meta": "1.16.35",
-    "@blocklet/resolver": "1.16.35",
-    "@blocklet/sdk": "1.16.35",
-    "@blocklet/store": "1.16.35",
+    "@blocklet/constant": "1.16.37-beta-20241224-013714-a79db7d3",
+    "@blocklet/did-space-js": "^0.6.0",
+    "@blocklet/env": "1.16.37-beta-20241224-013714-a79db7d3",
+    "@blocklet/meta": "1.16.37-beta-20241224-013714-a79db7d3",
+    "@blocklet/resolver": "1.16.37-beta-20241224-013714-a79db7d3",
+    "@blocklet/sdk": "1.16.37-beta-20241224-013714-a79db7d3",
+    "@blocklet/store": "1.16.37-beta-20241224-013714-a79db7d3",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.162",
     "@ocap/util": "1.18.162",
@@ -108,5 +108,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "a1888a5814c97a1cf6adfcee4e4d0721eabba7c3"
+  "gitHead": "040363d1ac077f7d4b4ee29e6c3bfc3e61c3ce3f"
 }