@abtnode/blocklet-services 1.16.39-beta-20250218-132815-6baaf20e → 1.16.39-beta-20250220-212222-627e9ea7

package/api/index.js

@@ -110,7 +110,7 @@ module.exports = function createServer(node, serverOptions = {}) {
   const kycService = initKyc({ node });
   const relayService = initRelay({ node });
   const imageService = initImageService({ node });
-  const dashboardService = initDashboard({ node, ensureWsUser });
+  const dashboardService = initDashboard({ node, ensureWsUser, options });
 
   // Proxy engine
   const proxy = httpProxy.createProxyServer({

package/api/libs/push-kit/index.js

@@ -11,14 +11,14 @@ async function sendPush(receiver, notification, { node, teamDid }) {
   const blocklet = await node.getBlocklet({ did: teamDid, useCache: true });
   if (!blocklet) {
     logger.warn(`Failed to get blocklet: ${teamDid}`);
-    return null;
+    throw new Error(`Failed to get blocklet: ${teamDid}`);
   }
 
   const config = blocklet.settings?.notification?.pushKit || {};
 
   if (!config.enabled || !config.endpoint) {
     // skip send email
-    return null;
+    throw new Error('Push Kit Service is not Enabled.');
   }
 
   const pushKitConfig = {

package/api/services/auth/index.js

@@ -285,7 +285,6 @@ const init = ({ node, options }) => {
       return;
     }
 
-    // FIXME: @zhanghan ws 如何处理 cookie 已过期的情况
     await req.ensureUser({ token });
   };
 
@@ -299,7 +298,6 @@ const init = ({ node, options }) => {
       return;
     }
 
-    // FIXME: @zhanghan ws 如何处理 cookie 已过期的情况
     await req.ensureUser({ token });
 
     setUserInfoHeaders(req);
@@ -417,4 +415,5 @@ const init = ({ node, options }) => {
 module.exports = {
   init,
   validators,
+  getTokenFromWsConnect,
 };

package/api/services/dashboard/index.js

@@ -7,6 +7,7 @@ const eventHub =
   process.env.NODE_ENV === 'test' ? require('@arcblock/event-hub/single') : require('@arcblock/event-hub');
 
 const logger = require('../../libs/logger')('ws');
+const { getTokenFromWsConnect } = require('../auth');
 
 function commonListen(wsServer, node) {
   const streamLogManager = createStreamLogManager({
@@ -49,38 +50,40 @@ function commonListen(wsServer, node) {
   return streamLogManager;
 }
 
-function createWebsocketServer(node, ensureWsUser) {
-  const wsServer = new WsServer({
-    broadcastEventName: '@abtnode/blocklet-services:dashboard',
-    heartbeatTimeout: 60 * 1000 * 10,
+function createWebsocketAuthenticator(ensureWsUser, roles, options) {
+  return async (req, cb) => {
+    const token = getTokenFromWsConnect(req, options);
+    if (!token) {
+      cb(new Error('token not found'), null);
+      return;
+    }
 
-    logger,
+    await ensureWsUser(req);
 
-    authenticate: async (req, cb) => {
-      const { searchParams } = new URL(req.url, `http://${req.headers.host || 'unknown'}`);
+    if (!req.user) {
+      cb(new Error('user not found'), null);
+      return;
+    }
 
-      const token = searchParams.get('token');
-      if (!token) {
-        cb(new Error('token not found'), null);
-        return;
-      }
+    if (roles.length && !roles.includes(req.user.role)) {
+      cb(new Error('user does not have permission'), null);
+      return;
+    }
 
-      await ensureWsUser(req);
+    const teamDid = req.getBlockletDid();
 
-      if (!req.user) {
-        cb(new Error('user not found'), null);
-        return;
-      }
+    cb(null, { did: req.user.did, teamDid });
+  };
+}
 
-      if (![ROLES.OWNER, ROLES.ADMIN].includes(req.user.role)) {
-        cb(new Error('user does not have permission'), null);
-        return;
-      }
+function createWebsocketServer(node, ensureWsUser, options) {
+  const wsServer = new WsServer({
+    broadcastEventName: '@abtnode/blocklet-services:dashboard',
+    heartbeatTimeout: 60 * 1000 * 10,
 
-      const teamDid = req.getBlockletDid();
+    logger,
 
-      cb(null, { did: req.user.did, teamDid });
-    },
+    authenticate: createWebsocketAuthenticator(ensureWsUser, [ROLES.OWNER, ROLES.ADMIN], options),
 
     hooks: {
       authenticateJoinChannel: ({ topic: channel, socket }) => {
@@ -148,33 +151,14 @@ function createWebsocketServer(node, ensureWsUser) {
   return wsServer;
 }
 
-function createNotificationWebsocketServer(node, ensureWsUser) {
+function createNotificationWebsocketServer(node, ensureWsUser, options) {
   const wsServer = new WsServer({
     broadcastEventName: '@abtnode/blocklet-services:dashboard',
     heartbeatTimeout: 60 * 1000 * 10,
 
     logger,
 
-    authenticate: async (req, cb) => {
-      const { searchParams } = new URL(req.url, `http://${req.headers.host || 'unknown'}`);
-
-      const token = searchParams.get('token');
-      if (!token) {
-        cb(new Error('token not found'), null);
-        return;
-      }
-
-      await ensureWsUser(req);
-
-      if (!req.user) {
-        cb(new Error('user not found'), null);
-        return;
-      }
-
-      const teamDid = req.getBlockletDid();
-
-      cb(null, { did: req.user.did, teamDid });
-    },
+    authenticate: createWebsocketAuthenticator(ensureWsUser, [], options),
 
     hooks: {
       authenticateJoinChannel: ({ topic: channel, socket }) => {
@@ -207,9 +191,9 @@ function createNotificationWebsocketServer(node, ensureWsUser) {
   return wsServer;
 }
 
-const init = ({ node, ensureWsUser }) => {
-  const dashboardWsServer = createWebsocketServer(node, ensureWsUser);
-  const notificationWsServer = createNotificationWebsocketServer(node, ensureWsUser);
+const init = ({ node, ensureWsUser, options }) => {
+  const dashboardWsServer = createWebsocketServer(node, ensureWsUser, options);
+  const notificationWsServer = createNotificationWebsocketServer(node, ensureWsUser, options);
 
   return {
     attachWsServer: (wsRouter) => {

package/api/services/notification/notification-queue.js

@@ -60,26 +60,14 @@ const init = ({ node, notificationService }) => {
       retryDelay: 0,
     },
     async (job) => {
-      const { receiver, notification, sender, options } = job;
+      const { receiver, notification, sender, options, isResend } = job;
 
       if (!receiver) {
         logger.error('Invalid receiver', { did: receiver });
         throw new Error('Invalid receiver');
       }
 
-      const nodeInfo = await node.getNodeInfo({ useCache: true });
-
-      if (nodeInfo.mode !== NODE_MODES.DEBUG) {
-        try {
-          await validateNotification(notification);
-        } catch (error) {
-          logger.error('Failed to validate notification', { error });
-          // 抛出错误，阻止后续执行
-          throw error;
-        }
-      }
-
-      if (sender.type === 'server' && !sender.token) {
+      if ((sender.type === 'server' || isResend) && !sender.token) {
         sender.token = JWT.sign(sender.appDid, sender.appSk);
       }
 
@@ -97,26 +85,14 @@ const init = ({ node, notificationService }) => {
    * Push Kit 推送队列
    */
   const pushKitPushQueue = createNotificationQueue('send-notification-push', {}, async (job) => {
-    const { notification, receiver, sender } = job;
+    const { notification, receiver, sender, isResend } = job;
 
     if (!receiver) {
       logger.error('Invalid receiver', { did: receiver });
       throw new Error('Invalid receiver');
     }
 
-    const nodeInfo = await node.getNodeInfo({ useCache: true });
-
-    if (nodeInfo.mode !== NODE_MODES.DEBUG) {
-      try {
-        await validateNotification(notification);
-      } catch (error) {
-        logger.error('Failed to validate notification', { error });
-        // 抛出错误，阻止后续执行
-        throw error;
-      }
-    }
-
-    if (sender.type === 'server' && !sender.token) {
+    if ((sender.type === 'server' || isResend) && !sender.token) {
       sender.token = JWT.sign(sender.appDid, sender.appSk);
     }
 
@@ -154,26 +130,14 @@ const init = ({ node, notificationService }) => {
         throw new Error('Email address is missing. Unable to send email notification');
       }
 
-      const { notification, sender, teamDid, receivers = [], userInfo } = input;
+      const { notification, sender, teamDid, receivers = [], userInfo, isResend } = input;
 
       if (!userInfo) {
         logger.error('Invalid receiver', { dids: userInfo.did });
         throw new Error('Invalid receiver');
       }
 
-      const nodeInfo = await node.getNodeInfo({ useCache: true });
-
-      if (nodeInfo.mode !== NODE_MODES.DEBUG) {
-        try {
-          await validateNotification(notification);
-        } catch (error) {
-          logger.error('Failed to validate notification', { error });
-          // 抛出错误，阻止后续执行
-          throw error;
-        }
-      }
-
-      if (sender.type === 'server' && !sender.token) {
+      if ((sender.type === 'server' || isResend) && !sender.token) {
         sender.token = JWT.sign(sender.appDid, sender.appSk);
       }
 
@@ -227,35 +191,23 @@ const init = ({ node, notificationService }) => {
         throw new Error('Invalid job');
       }
 
-      const { notification, webhook, sender, receivers = [] } = input;
+      const { notification, webhook, sender, receivers = [], isResend } = input;
 
       if (!receivers.length) {
         logger.error('Invalid receiver', { dids: receivers });
         throw new Error('Invalid receiver');
       }
 
-      const nodeInfo = await node.getNodeInfo({ useCache: true });
-
-      if (nodeInfo.mode !== NODE_MODES.DEBUG) {
-        try {
-          await validateNotification(notification);
-        } catch (error) {
-          logger.error('Failed to validate notification', { error });
-          // 抛出错误，阻止后续执行
-          throw error;
-        }
-      }
-
       if (!webhook || !webhook.url) {
         logger.error('Invalid webhook', { webhook });
         throw new Error('Invalid webhook');
       }
 
-      if (sender.type === 'server' && !sender.token) {
+      if ((sender.type === 'server' || isResend) && !sender.token) {
         sender.token = JWT.sign(sender.appDid, sender.appSk);
       }
 
-      notificationService.sendToWebhook.exec({
+      await notificationService.sendToWebhook.exec({
         sender,
         receiver: receivers,
         notification: {
@@ -269,7 +221,7 @@ const init = ({ node, notificationService }) => {
     }
   );
 
-  const insertToEmailPushQueue = (props, nodeInfo, emailMap) => {
+  const insertToEmailPushQueue = (props, nodeInfo, isResend) => {
     const { channels, notification, sender, userInfo, teamDid } = props;
 
     const commonParams = {
@@ -286,14 +238,14 @@ const init = ({ node, notificationService }) => {
 
     const channelEnabled = emailEnabled && channels.includes(NOTIFICATION_SEND_CHANNEL.EMAIL);
 
-    const { receivers, pushUser } = emailMap.get(email) || { receivers: [], pushUser: {} };
+    // const { receivers, pushUser } = emailMap.get(email) || { receivers: [], pushUser: {} };
 
-    const pushUserDid = getWalletDid(pushUser) || pushUser.did;
+    // const pushUserDid = getWalletDid(pushUser) || pushUser.did;
 
-    // 如果 receivers 中已经存在 receiverDid，并且 pushUserDid 和 receiverDid 不一致，则不发送
-    if (receivers.includes(receiverDid) && pushUserDid !== receiverDid) {
-      return;
-    }
+    // // 如果 receivers 中已经存在 receiverDid，并且 pushUserDid 和 receiverDid 不一致，则不发送
+    // if (receivers.includes(receiverDid) && pushUserDid !== receiverDid) {
+    //   return;
+    // }
 
     if (channelEnabled && email) {
       const _userInfo = {
@@ -309,27 +261,32 @@ const init = ({ node, notificationService }) => {
             notification,
             sender,
             teamDid,
-            receivers,
+            receivers: [receiverDid],
             userInfo: _userInfo,
+            isResend,
           },
         },
         delay: 5,
       });
     } else {
-      updateNotificationSendStatus({
-        ...commonParams,
-        receivers: receivers.length > 0 ? receivers : [receiverDid],
-        channel: NOTIFICATION_SEND_CHANNEL.EMAIL,
-        status: NOTIFICATION_SEND_STATUS.FAILED,
-        failedReason:
-          !emailEnabled || !email
-            ? NOTIFICATION_SEND_FAILED_REASON.USER_DISABLED
-            : NOTIFICATION_SEND_FAILED_REASON.CHANNEL_DISABLED,
-      });
+      // eslint-disable-next-line no-lonely-if
+      if (!isResend) {
+        updateNotificationSendStatus({
+          ...commonParams,
+          email,
+          receivers: [receiverDid],
+          channel: NOTIFICATION_SEND_CHANNEL.EMAIL,
+          status: NOTIFICATION_SEND_STATUS.FAILED,
+          failedReason:
+            !emailEnabled || !email
+              ? NOTIFICATION_SEND_FAILED_REASON.USER_DISABLED
+              : NOTIFICATION_SEND_FAILED_REASON.CHANNEL_DISABLED,
+        });
+      }
     }
   };
 
-  const insertToWebhookPushQueue = async (props, nodeInfo, webhookMap) => {
+  const insertToWebhookPushQueue = async (props, nodeInfo, isResend) => {
     const { channels, notification, sender, userInfo, teamDid } = props;
 
     const receiverDid = getWalletDid(userInfo) || userInfo.did;
@@ -347,30 +304,11 @@ const init = ({ node, notificationService }) => {
       webhooks = await getServerWebhooks();
     }
 
-    const webhookList = uniqBy(webhooks, 'url')
-      .map((webhook) => {
-        const { url, type } = webhook;
-        const { receivers, pushUser } = webhookMap.get(url) || {
-          type: type ?? 'api',
-          receivers: [],
-          pushUser: {},
-        };
-        const pushUserDid = getWalletDid(pushUser) || pushUser.did;
-        if (receivers.includes(receiverDid) && pushUserDid !== receiverDid) {
-          return false;
-        }
-        return {
-          url,
-          type,
-          receivers,
-          pushUser,
-        };
-      })
-      .filter(Boolean);
+    const webhookList = uniqBy(webhooks, 'url');
 
     if (webhookList.length > 0 && channels.includes(NOTIFICATION_SEND_CHANNEL.WEBHOOK)) {
       for (const webhook of webhookList) {
-        const { url, type, receivers } = webhook;
+        const { url, type } = webhook;
         webhookQueue.push({
           job: {
             url,
@@ -378,7 +316,8 @@ const init = ({ node, notificationService }) => {
             input: {
               notification,
               sender,
-              receivers: receivers.length > 0 ? receivers : [receiverDid],
+              receivers: [receiverDid],
+              isResend,
               webhook: {
                 url,
                 type,
@@ -390,10 +329,10 @@ const init = ({ node, notificationService }) => {
       }
     } else {
       // eslint-disable-next-line no-lonely-if
-      if (webhookList.length > 0) {
+      if (webhookList.length > 0 && !isResend) {
         const webhookParams = {};
 
-        for (const { url, type, receivers } of webhookList) {
+        for (const { url, type } of webhookList) {
           webhookParams[url] = {
             type,
             sendAt: new Date(),
@@ -404,7 +343,7 @@ const init = ({ node, notificationService }) => {
           // eslint-disable-next-line no-await-in-loop
           await updateNotificationSendStatus({
             ...commonParams,
-            receivers: receivers.length > 0 ? receivers : [receiverDid],
+            receivers: [receiverDid],
             channel: NOTIFICATION_SEND_CHANNEL.WEBHOOK,
             status: NOTIFICATION_SEND_STATUS.FAILED,
             webhookParams: { [url]: webhookParams[url] },
@@ -414,7 +353,7 @@ const init = ({ node, notificationService }) => {
     }
   };
 
-  const insertToPushKitPushQueue = (props, nodeInfo) => {
+  const insertToPushKitPushQueue = (props, nodeInfo, isResend) => {
     const { channels, notification, sender, userInfo, teamDid, options = {} } = props;
 
     const receiverDid = getWalletDid(userInfo) || userInfo.did;
@@ -431,21 +370,25 @@ const init = ({ node, notificationService }) => {
         sender,
         options,
         receiver: receiverDid,
+        isResend,
       });
     } else {
-      updateNotificationSendStatus({
-        ...commonParams,
-        receivers: [receiverDid],
-        channel: NOTIFICATION_SEND_CHANNEL.PUSH,
-        status: NOTIFICATION_SEND_STATUS.FAILED,
-        failedReason: !pushEnabled
-          ? NOTIFICATION_SEND_FAILED_REASON.CHANNEL_DISABLED
-          : NOTIFICATION_SEND_FAILED_REASON.USER_DISABLED,
-      });
+      // eslint-disable-next-line no-lonely-if
+      if (!isResend) {
+        updateNotificationSendStatus({
+          ...commonParams,
+          receivers: [receiverDid],
+          channel: NOTIFICATION_SEND_CHANNEL.PUSH,
+          status: NOTIFICATION_SEND_STATUS.FAILED,
+          failedReason: !pushEnabled
+            ? NOTIFICATION_SEND_FAILED_REASON.CHANNEL_DISABLED
+            : NOTIFICATION_SEND_FAILED_REASON.USER_DISABLED,
+        });
+      }
     }
   };
 
-  const insertToWalletPushQueue = (props, nodeInfo) => {
+  const insertToWalletPushQueue = (props, nodeInfo, isResend) => {
     const { channels, notification, sender, userInfo, teamDid, options = {} } = props;
 
     const receiverDid = getWalletDid(userInfo) || userInfo.did;
@@ -463,21 +406,26 @@ const init = ({ node, notificationService }) => {
         sender,
         options,
         receiver: receiverDid,
+        isResend,
       });
     } else {
-      updateNotificationSendStatus({
-        ...commonParams,
-        receivers: [receiverDid],
-        channel: NOTIFICATION_SEND_CHANNEL.WALLET,
-        status: NOTIFICATION_SEND_STATUS.FAILED,
-        failedReason: !walletEnabled
-          ? NOTIFICATION_SEND_FAILED_REASON.CHANNEL_DISABLED
-          : NOTIFICATION_SEND_FAILED_REASON.USER_DISABLED,
-      });
+      // 如果是重发的消息，只需要更新推送状态，不需要更新 channel状态
+      // eslint-disable-next-line no-lonely-if
+      if (!isResend) {
+        updateNotificationSendStatus({
+          ...commonParams,
+          receivers: [receiverDid],
+          channel: NOTIFICATION_SEND_CHANNEL.WALLET,
+          status: NOTIFICATION_SEND_STATUS.FAILED,
+          failedReason: !walletEnabled
+            ? NOTIFICATION_SEND_FAILED_REASON.CHANNEL_DISABLED
+            : NOTIFICATION_SEND_FAILED_REASON.USER_DISABLED,
+        });
+      }
     }
   };
 
-  const insertToNotificationReceiver = async (nodeInfo, userInfo, teamDid, notificationId, channels) => {
+  const insertToNotificationReceiver = async (nodeInfo, userInfo, teamDid, notificationId) => {
     const receiverDid = getWalletDid(userInfo) || userInfo.did;
 
     const receiverInstance = {
@@ -488,7 +436,7 @@ const init = ({ node, notificationService }) => {
     const emailEnabled = get(userInfo, 'extra.notifications.email', true);
     const email = userInfo?.email;
 
-    if (emailEnabled && email && channels.includes(NOTIFICATION_SEND_CHANNEL.EMAIL)) {
+    if (emailEnabled && email) {
       receiverInstance.email = email;
     }
     const isServer = teamDid === nodeInfo.did;
@@ -504,7 +452,7 @@ const init = ({ node, notificationService }) => {
       }
     });
 
-    if (webhookMap.size > 0 && channels.includes(NOTIFICATION_SEND_CHANNEL.WEBHOOK)) {
+    if (webhookMap.size > 0) {
       receiverInstance.webhookUrls = Array.from(webhookMap.keys()).join('#');
     }
 
@@ -523,8 +471,7 @@ const init = ({ node, notificationService }) => {
    * }
    */
   const queue = createNotificationQueue('notification-receivers', {}, async (job) => {
-    const { teamDid, channels, receiver, sender, notification, nodeInfo, userInfo, emailMap, webhookMap, ...rest } =
-      job;
+    const { teamDid, channels, receiver, sender, notification, nodeInfo, userInfo, ...rest } = job;
 
     try {
       if (!userInfo) {
@@ -550,27 +497,27 @@ const init = ({ node, notificationService }) => {
       // 每个渠道之间的推送不会影响
       // 添加到 wallet 推送队列
       try {
-        insertToWalletPushQueue(baseParams, nodeInfo);
+        insertToWalletPushQueue(baseParams, nodeInfo, job.isExist);
       } catch (error) {
         logger.error('Failed to insert to wallet push queue', { error });
       }
       // 添加到 push 推送队列
       try {
-        insertToPushKitPushQueue(baseParams, nodeInfo);
+        insertToPushKitPushQueue(baseParams, nodeInfo, job.isExist);
       } catch (error) {
         logger.error('Failed to insert to push kit push queue', { error });
       }
 
       // 添加到 email 推送队列
       try {
-        insertToEmailPushQueue(baseParams, nodeInfo, emailMap);
+        insertToEmailPushQueue(baseParams, nodeInfo, job.isExist);
       } catch (error) {
         logger.error('Failed to insert to email push queue', { error });
       }
 
       //
       try {
-        insertToWebhookPushQueue(baseParams, nodeInfo, webhookMap);
+        insertToWebhookPushQueue(baseParams, nodeInfo, job.isExist);
       } catch (error) {
         logger.error('Failed to insert to webhook push queue', { error });
       }
@@ -609,45 +556,12 @@ const init = ({ node, notificationService }) => {
         type: 'server',
       };
 
-      const isServer = teamDid === nodeInfo.did;
-
       const users = await node.getNotificationReceivers({
         teamDid,
         userDids: receivers,
         enableConnectedAccounts: true,
       });
 
-      const webhookMap = new Map();
-      const emailMap = new Map();
-      const serverWebhooks = await getServerWebhooks();
-
-      users.forEach((userInfo) => {
-        const receiverDid = getWalletDid(userInfo) || userInfo.did;
-
-        // 获取 email 列表
-        const { email } = userInfo;
-        const enabledEmail = get(userInfo, 'extra.notifications.email', true);
-        if (enabledEmail && email) {
-          const emailEntry = emailMap.get(email) || { receivers: [], pushUser: userInfo };
-          emailEntry.receivers = [...emailEntry.receivers, receiverDid];
-          emailEntry.pushUser = userInfo;
-          emailMap.set(email, emailEntry);
-        }
-
-        // 获取 webhook 列表
-        const webhooks = isServer ? serverWebhooks : get(userInfo, 'extra.webhooks', []);
-        webhooks.forEach((webhook) => {
-          const webhookEntry = webhookMap.get(webhook.url) || {
-            type: webhook.type ?? 'api',
-            receivers: [],
-            pushUser: userInfo,
-          };
-          webhookEntry.receivers = [...webhookEntry.receivers, receiverDid];
-          webhookEntry.pushUser = userInfo;
-          webhookMap.set(webhook.url, webhookEntry);
-        });
-      });
-
       users.forEach((userInfo) => {
         const receiverDid = getWalletDid(userInfo) || userInfo.did;
         queue.push({
@@ -658,8 +572,6 @@ const init = ({ node, notificationService }) => {
           sender,
           nodeInfo,
           userInfo,
-          emailMap,
-          webhookMap,
         });
       });
     } catch (error) {