@abtnode/core 1.17.4-beta-20251201-095907-eebbbbce → 1.17.4-beta-20251202-034514-637cd8e2

package/lib/api/team.js

@@ -2121,10 +2121,6 @@ class TeamAPI extends EventEmitter {
     return this.teamManager.updateStoreList(teamDid, storeList);
   }
 
-  getNotificationReceivers(payload) {
-    return this.teamManager.getNotificationReceivers(payload);
-  }
-
   createNotification = (payload) => {
     return this.teamManager.createNotification(payload);
   };

package/lib/blocklet/manager/disk.js

@@ -5148,15 +5148,6 @@ 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, { skipGetBlocklet = false } = {}) {
     if (isCLI()) {

package/lib/index.js

@@ -653,8 +653,6 @@ function ABTNode(options) {
     disconnectFromEndpoint: blockletManager.disconnectFromEndpoint.bind(blockletManager),
     publishToEndpoint: blockletManager.publishToEndpoint.bind(blockletManager),
 
-    getNotificationReceivers: teamAPI.getNotificationReceivers.bind(teamAPI),
-
     // ServerBlocklet Notifications
     createNotification: teamAPI.createNotification.bind(teamAPI),
     getNotifications: teamAPI.getNotification.bind(teamAPI),

package/lib/states/user.js

@@ -454,7 +454,7 @@ SELECT did,inviter,generation FROM UserTree`.trim();
   }
 
   // eslint-disable-next-line require-await
-  async getUsersByDids({ dids, query }, context = {}) {
+  async getUsersByDids({ dids, query, paging }, context = {}) {
     const {
       approved,
       includeTags = false,
@@ -485,6 +485,20 @@ SELECT did,inviter,generation FROM UserTree`.trim();
       include.push(this.getConnectedInclude());
     }
 
+    // 如果提供了分页参数，使用分页查询
+    if (paging) {
+      const sorting = [['createdAt', 'DESC']];
+      selection.createdAt = 1;
+      const result = await this.paginate({ where: condition, include }, sorting, paging, selection);
+
+      if (includeFollowStatus && user?.did) {
+        result.list = await this._enrichWithFollowStatus(result.list, user.did, dids);
+      }
+
+      return result;
+    }
+
+    // 否则返回所有结果
     let result = await this.find({ where: condition, include }, selection);
 
     if (includeFollowStatus && user?.did) {
@@ -540,27 +554,39 @@ SELECT did,inviter,generation FROM UserTree`.trim();
    * get user by did
    * @param {string} did user's did
    */
-  async getUser(did, { enableConnectedAccount = false, includeTags = false } = {}) {
-    let user = await this.findOne({ where: { did }, include: includeTags ? [this.getTagInclude()] : [] });
-    let connectedAccounts = [];
-    let passports = [];
+  async getUser(
+    did,
+    {
+      enableConnectedAccount = false,
+      includeTags = false,
+      includePassports = true,
+      includeConnectedAccounts = true,
+      selection = {},
+    } = {}
+  ) {
+    let user = await this.findOne({ where: { did }, include: includeTags ? [this.getTagInclude()] : [] }, selection);
 
     // search in connected accounts
     if (!user && enableConnectedAccount) {
       const connectedAccount = await this.connectedAccount.findOne({ did });
       if (connectedAccount) {
-        user = await this.findOne({ did: connectedAccount.userDid });
+        user = await this.findOne({ did: connectedAccount.userDid }, selection);
       }
     }
 
     if (user) {
-      [connectedAccounts, passports] = await Promise.all([
-        this.connectedAccount.find({ userDid: user.did }),
-        this.passport.find({ userDid: user.did }),
-      ]);
-
-      user.connectedAccounts = connectedAccounts;
-      user.passports = passports;
+      if (includeConnectedAccounts && includePassports) {
+        const [connectedAccounts, passports] = await Promise.all([
+          this.connectedAccount.find({ userDid: user.did }),
+          this.passport.find({ userDid: user.did }),
+        ]);
+        user.connectedAccounts = connectedAccounts;
+        user.passports = passports;
+      } else if (includeConnectedAccounts) {
+        user.connectedAccounts = await this.connectedAccount.find({ userDid: user.did });
+      } else if (includePassports) {
+        user.passports = await this.passport.find({ userDid: user.did });
+      }
     }
 
     return user;

package/lib/team/manager.js

@@ -224,16 +224,38 @@ class TeamManager extends EventEmitter {
   /**
    * 判断 passport 是否已经过期
    */
-  isPassportExpired(passport) {
-    return passport.status !== 'valid' || (passport.expirationDate && dayjs(passport.expirationDate).isBefore(dayjs()));
+  isPassportExpired(passport, now) {
+    return passport.status !== 'valid' || (passport.expirationDate && dayjs(passport.expirationDate).isBefore(now));
+  }
+
+  /**
+   * 验证用户是否有效（是否存在、passport是否过期）
+   * @private
+   */
+  _filterValidUsers(users) {
+    const now = dayjs();
+    return users.filter((user) => {
+      if (!user) {
+        return false;
+      }
+      const { passports = [] } = user;
+      // 如果用户没有 passport，或者 有一个 passport 没有过期，则返回 true
+      if (!passports?.length || passports.some((x) => !this.isPassportExpired(x, now))) {
+        return true;
+      }
+      logger.warn(`user's passports are all expired: ${user.did}`);
+      return false;
+    });
   }
 
   async getNotificationReceivers(payload) {
-    const { teamDid, userDids = [], roles = [], selection = {}, includeConnectedAccounts = false } = payload;
+    const { teamDid, userDids = [], roles = [], selection = {}, includeConnectedAccounts = false, paging } = payload;
     // 会根据 teamDid 返回对应 state
     const userState = await this.getUserState(teamDid);
     if (!userDids.length && !roles.length) {
-      return [];
+      return paging
+        ? { list: [], paging: { total: 0, pageSize: paging.size || 20, pageCount: 0, page: paging.page || 1 } }
+        : [];
     }
     try {
       // 这些用户信息已经是 approved 的用户，不需要再次确认
@@ -245,7 +267,7 @@ class TeamManager extends EventEmitter {
       if (userDids.length > 0) {
         let queryUsers = [];
         if (userDids.includes('*')) {
-          queryUsers = await userState.getUsersByDids({
+          const result = await userState.getUsersByDids({
             dids: userDids,
             query: {
               approved: true,
@@ -253,45 +275,57 @@ class TeamManager extends EventEmitter {
               includeConnectedAccounts,
               includePassports: true,
             },
+            paging,
           });
+
+          // 如果是分页查询，处理分页结果
+          if (paging && result.list) {
+            const validUsers = this._filterValidUsers(result.list);
+            return {
+              list: users.concat(validUsers),
+              paging: result.paging,
+            };
+          }
+
+          queryUsers = result;
         } else {
           // 使用 getUser 查询的目的是为了避免传入的 receiver 不在user表中而存在于 connected_account 表中
           queryUsers = await Promise.all(
-            userDids.map((did) => userState.getUser(did, { includePassports: true, enableConnectedAccount: true }))
+            userDids.map((did) =>
+              userState.getUser(did, {
+                enableConnectedAccount: true,
+                includeConnectedAccounts: false,
+                selection,
+              })
+            )
           );
         }
 
-        const validUsers = queryUsers.filter((user, index) => {
-          if (!user) {
-            logger.warn('receiver is not exist: ', { userDid: userDids[index] });
-            return false;
-          }
-          const { passports = [] } = user;
-          // 如果用户没有 passport，或者 有一个 passport 没有过期，则返回 true
-          if (!passports?.length || passports.some((x) => !this.isPassportExpired(x))) {
-            return true;
-          }
-          logger.warn(`user's passports are all expired: ${user.did}`);
-          return false;
-        });
-
+        const validUsers = this._filterValidUsers(queryUsers);
         users = users.concat(validUsers);
       }
 
       return users;
     } catch (error) {
       logger.error('get receivers failed: ', error);
-      return [];
+      return paging
+        ? { list: [], paging: { total: 0, pageSize: paging.size || 20, pageCount: 0, page: paging.page || 1 } }
+        : [];
     }
   }
 
   async getAdminReceivers({ teamDid }) {
-    const receivers = await this.getNotificationReceivers({
-      teamDid: teamDid ?? this.nodeDid,
-      roles: [ROLES.ADMIN, ROLES.OWNER],
-      selection: { did: 1 },
-    });
-    return receivers.map((r) => r.did);
+    try {
+      const receivers = await this.getNotificationReceivers({
+        teamDid: teamDid ?? this.nodeDid,
+        roles: [ROLES.ADMIN, ROLES.OWNER],
+        selection: { did: 1 },
+      });
+      return receivers.map((r) => r.did);
+    } catch (error) {
+      logger.error('get admin receivers failed', { error });
+      return [];
+    }
   }
 
   /**
@@ -351,30 +385,65 @@ class TeamManager extends EventEmitter {
   }
 
   /**
-   * 获取接收者列表
+   * 获取接收者列表（支持分页）
    * @private
+   * @param {string} teamDid - 团队 DID
+   * @param {string|string[]} receiver - 接收者
+   * @param {boolean} isExist - 通知是否已存在
+   * @returns {AsyncGenerator<string[]>} 异步生成器，每次返回一页接收者的 DID 列表
    */
-  async _getReceiverList(teamDid, receiver, isExist) {
+  async *_getReceiverList(teamDid, receiver, isExist) {
+    // 1. 如果通知已存在，直接返回规范化后的接收者
+    // 这种情况 receiver 一定存在。
     if (isExist) {
-      return this._normalizeReceiver(receiver);
+      yield this._normalizeReceiver(receiver);
+      return;
     }
 
     const receivers = this._normalizeReceiver(receiver);
-    if (receivers) {
+
+    // 2. 如果传入的是具体的 DID 数组（不包含 *），不需要分页查询，直接拿来用
+    if (receivers && !receivers.includes('*')) {
+      yield receivers;
+      return;
+    }
+
+    // 3. 如果传入 receiver 包含 * 需要分页查询，返回一页的数据，开始执行一页
+    if (receivers && receivers.includes('*')) {
       try {
-        const users = await this.getNotificationReceivers({
-          teamDid,
-          userDids: receivers,
-          includeConnectedAccounts: true,
-        });
-        return users.map((u) => u.did);
+        const pageSize = 100; // 每页查询 100 个用户
+        let currentPage = 1;
+        let hasMore = true;
+
+        // eslint-disable-next-line no-await-in-loop
+        while (hasMore) {
+          // eslint-disable-next-line no-await-in-loop
+          const result = await this.getNotificationReceivers({
+            teamDid,
+            userDids: receivers,
+            selection: { did: 1 },
+            paging: { page: currentPage, pageSize },
+          });
+
+          const userDids = result.list.map((u) => u.did);
+
+          if (userDids.length > 0) {
+            yield userDids;
+          }
+
+          hasMore = currentPage < result.paging.pageCount;
+          currentPage += 1;
+        }
       } catch (error) {
-        logger.error('get receivers failed', { error });
-        return [];
+        logger.error('get receivers failed with pagination', { error });
+        yield [];
       }
+      return;
     }
 
-    return this.getAdminReceivers({ teamDid });
+    // 4. 如果没有传入 receiver，需要查询站点的 admin 相关的用户
+    const adminReceivers = await this.getAdminReceivers({ teamDid });
+    yield adminReceivers;
   }
 
   /**
@@ -432,11 +501,10 @@ class TeamManager extends EventEmitter {
    * 创建通知文档
    * @private
    */
-  async _createNotificationDoc(notificationState, payload, receivers, source, isServices, teamDid) {
+  async _createNotificationDoc(notificationState, payload, source, isServices, teamDid) {
     try {
       return await notificationState.create({
         ...payload,
-        receiver: receivers,
         source,
         ...(!isServices ? {} : { teamDid }),
       });
@@ -539,18 +607,16 @@ class TeamManager extends EventEmitter {
 
       // 检查通知是否已存在
       const isExist = await this._checkExistingNotification(notificationState, id || notification?.id);
-      // 获取接收者列表
-      const receivers = await this._getReceiverList(teamDid, receiver, isExist);
 
-      if (!receivers?.length && process.env.NODE_ENV !== 'test') {
-        logger.warn('No valid receivers', {
-          teamDid,
-          receiver,
-          notification: JSON.stringify(notification || payload || {}),
-        });
-        return undefined;
+      let doc = null;
+      const source = this._determineSource(teamDid, payload);
+      const isServices = teamDid && !this.isNodeTeam(teamDid);
+      if (!isExist && !payload.pushOnly) {
+        doc = await this._createNotificationDoc(notificationState, payload, source, isServices, teamDid);
+        logger.info('notification created successfully', { teamDid, notificationId: doc.id });
       }
 
+      // 获取 actor 信息
       const notificationActor = notification?.activity?.actor || payload.activity?.actor;
       let actorInfo = null;
       if (notificationActor) {
@@ -559,32 +625,53 @@ class TeamManager extends EventEmitter {
         actorInfo = pick(user, ['did', 'fullName', 'avatar']);
       }
 
-      if (payload.pushOnly || isExist) {
-        this.emit(EVENTS.NOTIFICATION_CREATE_QUEUED, {
-          channels: payload.channels || [NOTIFICATION_SEND_CHANNEL.WALLET],
-          notification: {
-            ...(notification || payload),
-          },
-          receivers: receivers ?? receiver,
-          teamDid: teamDid || this.nodeDid,
-          sender: payload.sender,
-          pushOnly: true,
-          isExist,
-          ...(actorInfo ? { actorInfo } : {}),
-          options: typeof payload.options === 'object' && payload.options !== null ? payload.options : {},
-        });
-        return undefined;
-      }
+      // 获取接收者列表（使用异步生成器逐页处理）
+      const receiverGenerator = this._getReceiverList(teamDid, receiver, isExist);
+      let hasReceivers = false;
 
-      const source = this._determineSource(teamDid, payload);
-      const isServices = teamDid && !this.isNodeTeam(teamDid);
+      for await (const receiversPage of receiverGenerator) {
+        if (!receiversPage?.length) {
+          continue;
+        }
 
-      const doc = await this._createNotificationDoc(notificationState, payload, receivers, source, isServices, teamDid);
+        hasReceivers = true;
 
-      logger.info('notification created successfully', { teamDid, notificationId: doc.id });
+        if (payload.pushOnly || isExist) {
+          this.emit(EVENTS.NOTIFICATION_CREATE_QUEUED, {
+            channels: payload.channels || [NOTIFICATION_SEND_CHANNEL.WALLET],
+            notification: {
+              ...(notification || payload),
+            },
+            receivers: receiversPage,
+            teamDid: teamDid || this.nodeDid,
+            sender: payload.sender,
+            pushOnly: true,
+            isExist,
+            ...(actorInfo ? { actorInfo } : {}),
+            options: typeof payload.options === 'object' && payload.options !== null ? payload.options : {},
+          });
+        } else {
+          const defaultChannel = this._getDefaultChannels(isServices, source);
+          await this._emitNotificationEvents(
+            doc,
+            payload,
+            receiversPage,
+            teamDid,
+            isServices,
+            defaultChannel,
+            actorInfo
+          );
+        }
+      }
 
-      const defaultChannel = this._getDefaultChannels(isServices, source);
-      await this._emitNotificationEvents(doc, payload, receivers, teamDid, isServices, defaultChannel, actorInfo);
+      if (!hasReceivers && process.env.NODE_ENV !== 'test') {
+        logger.warn('No valid receivers', {
+          teamDid,
+          receiver,
+          notification: JSON.stringify(notification || payload || {}),
+        });
+        return undefined;
+      }
 
       return doc;
     } catch (error) {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.4-beta-20251201-095907-eebbbbce",
+  "version": "1.17.4-beta-20251202-034514-637cd8e2",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -17,21 +17,21 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.17.4-beta-20251201-095907-eebbbbce",
-    "@abtnode/auth": "1.17.4-beta-20251201-095907-eebbbbce",
-    "@abtnode/certificate-manager": "1.17.4-beta-20251201-095907-eebbbbce",
-    "@abtnode/constant": "1.17.4-beta-20251201-095907-eebbbbce",
-    "@abtnode/cron": "1.17.4-beta-20251201-095907-eebbbbce",
-    "@abtnode/db-cache": "1.17.4-beta-20251201-095907-eebbbbce",
-    "@abtnode/docker-utils": "1.17.4-beta-20251201-095907-eebbbbce",
-    "@abtnode/logger": "1.17.4-beta-20251201-095907-eebbbbce",
-    "@abtnode/models": "1.17.4-beta-20251201-095907-eebbbbce",
-    "@abtnode/queue": "1.17.4-beta-20251201-095907-eebbbbce",
-    "@abtnode/rbac": "1.17.4-beta-20251201-095907-eebbbbce",
-    "@abtnode/router-provider": "1.17.4-beta-20251201-095907-eebbbbce",
-    "@abtnode/static-server": "1.17.4-beta-20251201-095907-eebbbbce",
-    "@abtnode/timemachine": "1.17.4-beta-20251201-095907-eebbbbce",
-    "@abtnode/util": "1.17.4-beta-20251201-095907-eebbbbce",
+    "@abtnode/analytics": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@abtnode/auth": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@abtnode/certificate-manager": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@abtnode/constant": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@abtnode/cron": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@abtnode/db-cache": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@abtnode/docker-utils": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@abtnode/logger": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@abtnode/models": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@abtnode/queue": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@abtnode/rbac": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@abtnode/router-provider": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@abtnode/static-server": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@abtnode/timemachine": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@abtnode/util": "1.17.4-beta-20251202-034514-637cd8e2",
     "@aigne/aigne-hub": "^0.10.10",
     "@arcblock/did": "^1.27.12",
     "@arcblock/did-connect-js": "^1.27.12",
@@ -43,15 +43,15 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.27.12",
     "@arcblock/vc": "^1.27.12",
-    "@blocklet/constant": "1.17.4-beta-20251201-095907-eebbbbce",
+    "@blocklet/constant": "1.17.4-beta-20251202-034514-637cd8e2",
     "@blocklet/did-space-js": "^1.2.6",
-    "@blocklet/env": "1.17.4-beta-20251201-095907-eebbbbce",
+    "@blocklet/env": "1.17.4-beta-20251202-034514-637cd8e2",
     "@blocklet/error": "^0.3.3",
-    "@blocklet/meta": "1.17.4-beta-20251201-095907-eebbbbce",
-    "@blocklet/resolver": "1.17.4-beta-20251201-095907-eebbbbce",
-    "@blocklet/sdk": "1.17.4-beta-20251201-095907-eebbbbce",
-    "@blocklet/server-js": "1.17.4-beta-20251201-095907-eebbbbce",
-    "@blocklet/store": "1.17.4-beta-20251201-095907-eebbbbce",
+    "@blocklet/meta": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@blocklet/resolver": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@blocklet/sdk": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@blocklet/server-js": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@blocklet/store": "1.17.4-beta-20251202-034514-637cd8e2",
     "@blocklet/theme": "^3.2.11",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "^1.27.12",
@@ -116,5 +116,5 @@
     "express": "^4.18.2",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "a22171e333c5e1eccd03b9980bac1ae14749735e"
+  "gitHead": "d0e748c5cae1a08c63cfc5bb59a6d471c3120e7a"
 }