@abtnode/blocklet-services 1.17.4-beta-20251201-225048-b1682a09 → 1.17.4-beta-20251202-034514-637cd8e2

package/api/services/notification/queue.js

@@ -17,9 +17,11 @@ const {
   NOTIFICATION_SEND_STATUS,
   NOTIFICATION_SEND_FAILED_REASON,
 } = require('@abtnode/constant');
+const sleep = require('@abtnode/util/lib/sleep');
 const { nanoid } = require('@blocklet/meta/lib/util');
 const get = require('lodash/get');
 const uniqBy = require('lodash/uniqBy');
+const { getQueueConcurrencyByMem } = require('@abtnode/core/lib/util');
 const { getBlockletInfo } = require('../../cache');
 const { updateNotificationSendStatus } = require('../../socket/channel/did');
 const eventHub =
@@ -29,6 +31,8 @@ const logger = require('../../libs/logger')('blocklet-services:notification-queu
 
 const emailSchema = Joi.string().email().required();
 
+const concurrency = getQueueConcurrencyByMem();
+
 /**
  *
  * 校验是否是有效的 passthrough 消息
@@ -58,10 +62,14 @@ const createNotificationQueue = (name, options, handler) => {
       maxRetries: 3,
       retryDelay: 10 * 1000,
       maxTimeout: 60 * 1000, // throw timeout error after 1 minutes
+      concurrency,
       ...(options ?? {}),
     },
     onJob: async (job) => {
       await handler(job);
+      if (options.delay) {
+        await sleep(options.delay * 1000);
+      }
     },
   });
 };
@@ -85,6 +93,7 @@ const init = ({ node, notificationService }) => {
     {
       maxRetries: 1,
       retryDelay: 0,
+      enableScheduledJob: true,
     },
     async (job) => {
       try {
@@ -111,28 +120,42 @@ const init = ({ node, notificationService }) => {
   /**
    * Push Kit 推送队列
    */
-  const pushKitPushQueue = createNotificationQueue('send-notification-push', {}, async (job) => {
-    try {
-      const { notification, receiver, sender } = job;
+  const pushKitPushQueue = createNotificationQueue(
+    'send-notification-push',
+    {
+      enableScheduledJob: true,
+    },
+    async (job) => {
+      try {
+        const { notification, receiver, sender } = job;
 
-      if (!receiver) {
-        throw new Error('Invalid receiver');
-      }
+        if (!receiver) {
+          throw new Error('Invalid receiver');
+        }
 
-      await notificationService.sendToPush.exec({
-        sender,
-        receiver,
-        notification,
-        pushOnly: job.pushOnly,
-      });
-    } catch (error) {
-      if (error.logLevel === 'debug') {
-        logger.debug('Failed to send to push', { notificationId: job.notification.id, receiver: job.receiver, error });
-      } else {
-        logger.error('Failed to send to push', { notificationId: job.notification.id, receiver: job.receiver, error });
+        await notificationService.sendToPush.exec({
+          sender,
+          receiver,
+          notification,
+          pushOnly: job.pushOnly,
+        });
+      } catch (error) {
+        if (error.logLevel === 'debug') {
+          logger.debug('Failed to send to push', {
+            notificationId: job.notification.id,
+            receiver: job.receiver,
+            error,
+          });
+        } else {
+          logger.error('Failed to send to push', {
+            notificationId: job.notification.id,
+            receiver: job.receiver,
+            error,
+          });
+        }
       }
     }
-  });
+  );
 
   /**
    * email 推送队列
@@ -184,7 +207,6 @@ const init = ({ node, notificationService }) => {
             : null;
 
         logger.info('Start send to email', {
-          email,
           notificationId: job.notificationId,
         });
         await notificationService.sendToMail.exec({
@@ -206,7 +228,6 @@ const init = ({ node, notificationService }) => {
           options,
         });
         logger.info('End send to email', {
-          email,
           notificationId: job.notificationId,
         });
       } catch (error) {
@@ -381,7 +402,7 @@ const init = ({ node, notificationService }) => {
             options,
           },
         },
-        delay: 5,
+        delay: 8,
       });
     } else {
       // eslint-disable-next-line no-lonely-if
@@ -516,12 +537,15 @@ const init = ({ node, notificationService }) => {
         receiver: receiverDid,
       });
       pushKitPushQueue.push({
-        notification,
-        sender,
-        options,
-        receiver: receiverDid,
-        isResend,
-        pushOnly: props.pushOnly && !isResend,
+        job: {
+          notification,
+          sender,
+          options,
+          receiver: receiverDid,
+          isResend,
+          pushOnly: props.pushOnly && !isResend,
+        },
+        delay: 10,
       });
     } else {
       // eslint-disable-next-line no-lonely-if
@@ -557,13 +581,16 @@ const init = ({ node, notificationService }) => {
         receiver: receiverDid,
       });
       walletPushQueue.push({
-        notification,
-        sender,
-        options,
-        receiver: receiverDid,
-        isResend,
-        pushOnly: props.pushOnly && !isResend,
-        source,
+        job: {
+          notification,
+          sender,
+          options,
+          receiver: receiverDid,
+          isResend,
+          pushOnly: props.pushOnly && !isResend,
+          source,
+        },
+        delay: 5,
       });
     } else {
       // 如果是重发的消息，只需要更新推送状态，不需要更新 channel状态
@@ -628,7 +655,7 @@ const init = ({ node, notificationService }) => {
    * }
    */
   const queue = createNotificationQueue('notification-receivers', {}, async (job) => {
-    const { teamDid, channels, receiver, sender, notification, nodeInfo, userInfo, ...rest } = job;
+    const { teamDid, channels, receiver, sender, notification, nodeInfo, ...rest } = job;
 
     logger.info('notification start insert to queue', {
       teamDid,
@@ -636,6 +663,17 @@ const init = ({ node, notificationService }) => {
       receiver,
     });
     try {
+      const selection = {
+        did: 1,
+        fullName: 1,
+        email: 1,
+        extra: 1,
+      };
+      const userInfo = await node.getUser({
+        teamDid,
+        user: { did: receiver },
+        options: { enableConnectedAccount: true, selection, includePassports: false, includeConnectedAccounts: false },
+      });
       if (!userInfo) {
         throw new Error(`Invalid receiver user: ${receiver}`);
       }
@@ -654,26 +692,22 @@ const init = ({ node, notificationService }) => {
         });
         // websocket 通知
         const receiverDid = userInfo.did;
-        try {
-          websocketQueue.push({
-            input: {
-              notification: {
-                ...notification,
-                entityType: rest.entityType,
-                entityId: rest.entityId,
-                componentDid: rest.componentDid,
-                source: rest.source,
-                createdAt: rest.createdAt,
-                ...(rest.actorInfo ? { actorInfo: rest.actorInfo } : {}),
-              },
-              receiver: receiverDid,
-              teamDid,
-              isServices: rest.isServices,
+        websocketQueue.push({
+          input: {
+            notification: {
+              ...notification,
+              entityType: rest.entityType,
+              entityId: rest.entityId,
+              componentDid: rest.componentDid,
+              source: rest.source,
+              createdAt: rest.createdAt,
+              ...(rest.actorInfo ? { actorInfo: rest.actorInfo } : {}),
             },
-          });
-        } catch (error) {
-          logger.error('Failed to insert to websocket push queue', { error });
-        }
+            receiver: receiverDid,
+            teamDid,
+            isServices: rest.isServices,
+          },
+        });
       }
 
       notification.type = notification.type || 'notification';
@@ -727,7 +761,6 @@ const init = ({ node, notificationService }) => {
       logger.info('notification start insert to queue:', {
         teamDid: data?.teamDid,
         notificationId: data?.notification?.id,
-        receivers: data?.receivers?.join(','),
       });
       if (isInstanceWorker()) {
         return;
@@ -753,13 +786,7 @@ const init = ({ node, notificationService }) => {
           type: 'server',
         });
 
-      const users = await node.getNotificationReceivers({
-        teamDid,
-        userDids: receivers,
-        includeConnectedAccounts: true,
-      });
-
-      if (users.length === 0) {
+      if (receivers.length === 0) {
         throw new Error('No users found');
       }
       // 如果 notification 没有 id，则生成一个, wallet 要基于这唯一个ID进行处理
@@ -771,8 +798,7 @@ const init = ({ node, notificationService }) => {
         notification.id = `NOTIF-${nanoid()}`;
       }
 
-      users.forEach((userInfo) => {
-        const receiverDid = userInfo.did;
+      receivers.forEach((receiverDid) => {
         queue.push({
           ...rest,
           notification,
@@ -781,7 +807,6 @@ const init = ({ node, notificationService }) => {
           receiver: receiverDid,
           sender,
           nodeInfo,
-          userInfo,
         });
       });
     } catch (error) {

package/api/socket/channel/did.js

@@ -164,40 +164,38 @@ const sendToUserDid = async ({ sender, receiver: rawDid, notification, options,
 
   const isServer = !teamDid || teamDid === nodeInfo.did;
 
-  try {
-    const result = await Promise.all(
-      notifications.map((_notification) => {
-        // 如果类型不存在或者是 notification 类型是才进行保存数据库，其他类型只需要通知到用户即可
-        // eg: type = 'passthrough', 'hi', 'connect', 'feed', 默认只需要通知 wallet
-        const pushOnly = _notification.type && _notification.type.toLowerCase() !== NOTIFICATION_TYPES.NOTIFICATION;
-
-        // 通知渠道的确定有两种方式 1. 用户传入的 channels 2. 根据 notification 类型确定
-        // 如果是 hi connect, 只需要通知 wallet
-        // passthrough 类型，用于 discuss kit 的 chat channel
-        // 1. push kit: native 通知快速跳转到 chat channel
-        // 2. app: 钱包消息，可以查看到接收到消息
-
-        return node.createNotification({
-          teamDid,
-          ...(pushOnly ? { notification: _notification } : { ..._notification }),
-          receiver: rawDid,
-          componentDid: sender.componentDid,
-          // 这两个字段用于 socket 通知
-          entityType: _notification.entityType || 'blocklet',
-          entityId: _notification.entityId || sender.appDid,
-          source: isServer ? 'system' : _notification.source || 'component',
-          channels: CHANNEL_MAP[_notification.type] || channels,
-          sender,
-          options: { ...rest },
-          pushOnly,
-        });
-      })
-    );
-    return result;
-  } catch (error) {
-    logger.error('Failed to create notification', { error });
-    return undefined;
-  }
+  // 开始执行 service 消息的推送，不需要同步执行
+  Promise.all(
+    notifications.map((_notification) => {
+      // 如果类型不存在或者是 notification 类型是才进行保存数据库，其他类型只需要通知到用户即可
+      // eg: type = 'passthrough', 'hi', 'connect', 'feed', 默认只需要通知 wallet
+      const pushOnly = _notification.type && _notification.type.toLowerCase() !== NOTIFICATION_TYPES.NOTIFICATION;
+
+      // 通知渠道的确定有两种方式 1. 用户传入的 channels 2. 根据 notification 类型确定
+      // 如果是 hi connect, 只需要通知 wallet
+      // passthrough 类型，用于 discuss kit 的 chat channel
+      // 1. push kit: native 通知快速跳转到 chat channel
+      // 2. app: 钱包消息，可以查看到接收到消息
+
+      return node.createNotification({
+        teamDid,
+        ...(pushOnly ? { notification: _notification } : { ..._notification }),
+        receiver: rawDid,
+        componentDid: sender.componentDid,
+        // 这两个字段用于 socket 通知
+        entityType: _notification.entityType || 'blocklet',
+        entityId: _notification.entityId || sender.appDid,
+        source: isServer ? 'system' : _notification.source || 'component',
+        channels: CHANNEL_MAP[_notification.type] || channels,
+        sender,
+        options: { ...rest },
+        pushOnly,
+      });
+    })
+  ).catch((error) => {
+    logger.error('Failed to send notification', { error });
+  });
+  return true;
 };
 
 // server send notification to app

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.4-beta-20251201-225048-b1682a09",
+  "version": "1.17.4-beta-20251202-034514-637cd8e2",
   "description": "Provide unified services for every blocklet",
   "main": "api/index.js",
   "files": [
@@ -32,17 +32,17 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.17.4-beta-20251201-225048-b1682a09",
-    "@abtnode/auth": "1.17.4-beta-20251201-225048-b1682a09",
-    "@abtnode/connect-storage": "1.17.4-beta-20251201-225048-b1682a09",
-    "@abtnode/constant": "1.17.4-beta-20251201-225048-b1682a09",
-    "@abtnode/core": "1.17.4-beta-20251201-225048-b1682a09",
-    "@abtnode/cron": "1.17.4-beta-20251201-225048-b1682a09",
-    "@abtnode/db-cache": "1.17.4-beta-20251201-225048-b1682a09",
-    "@abtnode/logger": "1.17.4-beta-20251201-225048-b1682a09",
-    "@abtnode/models": "1.17.4-beta-20251201-225048-b1682a09",
-    "@abtnode/router-templates": "1.17.4-beta-20251201-225048-b1682a09",
-    "@abtnode/util": "1.17.4-beta-20251201-225048-b1682a09",
+    "@abtnode/analytics": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@abtnode/auth": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@abtnode/connect-storage": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@abtnode/constant": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@abtnode/core": "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/logger": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@abtnode/models": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@abtnode/router-templates": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@abtnode/util": "1.17.4-beta-20251202-034514-637cd8e2",
     "@arcblock/did": "^1.27.12",
     "@arcblock/did-connect-js": "^1.27.12",
     "@arcblock/did-ext": "^1.27.12",
@@ -52,18 +52,18 @@
     "@arcblock/jwt": "^1.27.12",
     "@arcblock/validator": "^1.27.12",
     "@arcblock/ws": "^1.27.12",
-    "@blocklet/constant": "1.17.4-beta-20251201-225048-b1682a09",
+    "@blocklet/constant": "1.17.4-beta-20251202-034514-637cd8e2",
     "@blocklet/dbhub": "^0.2.9",
-    "@blocklet/env": "1.17.4-beta-20251201-225048-b1682a09",
+    "@blocklet/env": "1.17.4-beta-20251202-034514-637cd8e2",
     "@blocklet/error": "^0.3.3",
     "@blocklet/form-builder": "^0.1.12",
     "@blocklet/form-collector": "^0.1.8",
-    "@blocklet/images": "1.17.4-beta-20251201-225048-b1682a09",
-    "@blocklet/js-sdk": "1.17.4-beta-20251201-225048-b1682a09",
-    "@blocklet/meta": "1.17.4-beta-20251201-225048-b1682a09",
-    "@blocklet/rate-limit": "1.17.4-beta-20251201-225048-b1682a09",
-    "@blocklet/sdk": "1.17.4-beta-20251201-225048-b1682a09",
-    "@blocklet/server-js": "1.17.4-beta-20251201-225048-b1682a09",
+    "@blocklet/images": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@blocklet/js-sdk": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@blocklet/meta": "1.17.4-beta-20251202-034514-637cd8e2",
+    "@blocklet/rate-limit": "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/theme": "^3.2.11",
     "@blocklet/theme-builder": "0.4.8",
     "@blocklet/uploader-server": "^0.3.12",
@@ -123,7 +123,7 @@
     "whatwg-url": "14.0.0"
   },
   "devDependencies": {
-    "@abtnode/ux": "1.17.4-beta-20251201-225048-b1682a09",
+    "@abtnode/ux": "1.17.4-beta-20251202-034514-637cd8e2",
     "@arcblock/bridge": "^3.2.11",
     "@arcblock/did-connect-react": "^3.2.11",
     "@arcblock/icons": "^3.2.11",
@@ -133,7 +133,7 @@
     "@blocklet/did-space-react": "^1.2.6",
     "@blocklet/launcher-layout": "^3.2.11",
     "@blocklet/payment-react": "^1.22.24",
-    "@blocklet/tracker": "1.17.4-beta-20251201-225048-b1682a09",
+    "@blocklet/tracker": "1.17.4-beta-20251202-034514-637cd8e2",
     "@blocklet/ui-react": "^3.2.11",
     "@blocklet/uploader": "^0.3.12",
     "@emotion/react": "^11.14.0",
@@ -213,5 +213,5 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues",
     "email": "shijun@arcblock.io"
   },
-  "gitHead": "150c52d552b8b2d8c3a5bae57818aabf90dfd115"
+  "gitHead": "d0e748c5cae1a08c63cfc5bb59a6d471c3120e7a"
 }