@abtnode/blocklet-services 1.17.3-beta-20251121-135300-8e451e6e → 1.17.3-beta-20251123-232619-53258789

package/api/libs/email.js

@@ -43,14 +43,15 @@ async function sendEmail(
 
   const blocklet = await node.getBlocklet({ did: teamDid, useCache: true });
   if (!blocklet) {
-    logger.warn(`Failed to get blocklet: ${teamDid}`);
     throw new Error(`Failed to get blocklet: ${teamDid}`);
   }
 
   const provider = getEmailServiceProvider(blocklet);
   logger.debug('service.sendEmail', { teamDid, provider, raw, launcher });
   if (!provider || (provider === 'launcher' && !launcher)) {
-    throw new Error('Email Service is not available.');
+    const error = new Error('Email Service is not available.');
+    error.logLevel = 'debug';
+    throw error;
   }
 
   // eslint-disable-next-line no-param-reassign

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

@@ -10,16 +10,15 @@ const logger = require('../logger')('blocklet-services:notification');
 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}`);
     throw new Error(`Failed to get blocklet: ${teamDid}`);
   }
 
   const config = blocklet.settings?.notification?.pushKit || {};
 
   if (!config.enabled || !config.endpoint) {
-    // skip send email
-    logger.warn(`Push Kit Service is not Enabled: ${teamDid}`);
-    throw new Error('Push Kit Service is not Enabled.');
+    const error = new Error(`Push Kit Service is not Enabled, teamDid: ${teamDid}`);
+    error.logLevel = 'debug';
+    throw error;
   }
 
   const pushKitConfig = {

package/api/services/notification/queue.js

@@ -22,7 +22,7 @@ const { updateNotificationSendStatus } = require('../../socket/channel/did');
 const eventHub =
   process.env.NODE_ENV === 'test' ? require('@arcblock/event-hub/single') : require('@arcblock/event-hub');
 
-const logger = require('../../libs/logger')('notification');
+const logger = require('../../libs/logger')('blocklet-services:notification-queue');
 
 /**
  *
@@ -83,10 +83,9 @@ const init = ({ node, notificationService }) => {
     },
     async (job) => {
       try {
-        const { receiver, notification, sender, options } = job;
+        const { receiver, notification, sender, options, source } = job;
 
         if (!receiver) {
-          logger.error('Invalid receiver', { did: receiver });
           throw new Error('Invalid receiver');
         }
 
@@ -96,9 +95,10 @@ const init = ({ node, notificationService }) => {
           notification,
           options,
           pushOnly: job.pushOnly,
+          source,
         });
       } catch (error) {
-        logger.warning('Failed to send to app', { notificationId: job.notification.id, error });
+        logger.error('Failed to send to app', { notificationId: job.notification.id, receiver: job.receiver, error });
       }
     }
   );
@@ -111,7 +111,6 @@ const init = ({ node, notificationService }) => {
       const { notification, receiver, sender } = job;
 
       if (!receiver) {
-        logger.error('Invalid receiver', { did: receiver });
         throw new Error('Invalid receiver');
       }
 
@@ -122,7 +121,11 @@ const init = ({ node, notificationService }) => {
         pushOnly: job.pushOnly,
       });
     } catch (error) {
-      logger.warn('Failed to send to push', { notificationId: job.notification.id, 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 });
+      }
     }
   });
 
@@ -142,14 +145,10 @@ const init = ({ node, notificationService }) => {
       try {
         const { input, email } = job;
         if (!input) {
-          logger.error('Job input is missing or invalid', { notificationId: job.notificationId });
           throw new Error('Job input is missing or invalid');
         }
 
         if (!email) {
-          logger.error('Email address is missing. Unable to send email notification', {
-            notificationId: job.notificationId,
-          });
           throw new Error('Email address is missing. Unable to send email notification');
         }
 
@@ -206,7 +205,21 @@ const init = ({ node, notificationService }) => {
           notificationId: job.notificationId,
         });
       } catch (error) {
-        logger.warn('Failed to send to email', { notificationId: job.notificationId, error });
+        if (error.logLevel === 'debug') {
+          logger.debug('Failed to send to email', {
+            notificationId: job.notificationId,
+            receivers: job.input.receivers.join(','),
+            email: job.email,
+            error,
+          });
+        } else {
+          logger.error('Failed to send to email', {
+            notificationId: job.notificationId,
+            receivers: job.input.receivers.join(','),
+            email: job.email,
+            error,
+          });
+        }
       }
     }
   );
@@ -227,19 +240,16 @@ const init = ({ node, notificationService }) => {
       try {
         const { input } = job;
         if (!input) {
-          logger.error('Invalid job', { url: job.url });
           throw new Error('Invalid job');
         }
 
         const { notification, webhook, sender, receivers = [] } = input;
 
         if (!receivers.length) {
-          logger.error('Invalid receiver', { dids: receivers });
           throw new Error('Invalid receiver');
         }
 
         if (!webhook || !webhook.url) {
-          logger.error('Invalid webhook', { webhook });
           throw new Error('Invalid webhook');
         }
 
@@ -264,7 +274,12 @@ const init = ({ node, notificationService }) => {
           notificationId: job.notificationId,
         });
       } catch (error) {
-        logger.warn('Failed to send to webhook', { url: job.url, notificationId: job.notificationId, error });
+        logger.error('Failed to send to webhook', {
+          url: job?.webhook?.url,
+          notificationId: job.notificationId,
+          receivers: job.input.receivers.join(','),
+          error,
+        });
       }
     }
   );
@@ -498,7 +513,7 @@ const init = ({ node, notificationService }) => {
   };
 
   const insertToWalletPushQueue = (props, nodeInfo, isResend) => {
-    const { channels, notification, sender, userInfo, teamDid, options = {} } = props;
+    const { channels, notification, sender, userInfo, teamDid, options = {}, source } = props;
 
     const receiverDid = userInfo.did;
 
@@ -521,6 +536,7 @@ const init = ({ node, notificationService }) => {
         receiver: receiverDid,
         isResend,
         pushOnly: props.pushOnly && !isResend,
+        source,
       });
     } else {
       // 如果是重发的消息，只需要更新推送状态，不需要更新 channel状态
@@ -587,10 +603,14 @@ const init = ({ node, notificationService }) => {
   const queue = createNotificationQueue('notification-receivers', {}, async (job) => {
     const { teamDid, channels, receiver, sender, notification, nodeInfo, userInfo, ...rest } = job;
 
+    logger.info('notification start insert to queue', {
+      teamDid,
+      notificationId: notification.id,
+      receiver,
+    });
     try {
       if (!userInfo) {
-        logger.error('Invalid receiver user', { receiver });
-        throw new Error('Invalid receiver user');
+        throw new Error(`Invalid receiver user: ${receiver}`);
       }
 
       // FIXME: @liushuang: notification.id.startsWith('NOTIF-') HACK 的处理方式，是一个兜底行为。
@@ -669,7 +689,7 @@ const init = ({ node, notificationService }) => {
         logger.error('Failed to insert to webhook push queue', { error });
       }
     } catch (error) {
-      logger.error('Failed to create notification receiver', { error });
+      logger.error('Failed to create notification receiver', { error, notificationId: notification.id });
     }
   });
 
@@ -677,33 +697,21 @@ const init = ({ node, notificationService }) => {
   eventHub.on(EVENTS.NOTIFICATION_CREATE_QUEUED, async (data) => {
     // Only first worker process handle blocklet event
     try {
-      logger.info('notification start insert to queue :', {
+      logger.info('notification start insert to queue:', {
         teamDid: data?.teamDid,
         notificationId: data?.notification?.id,
         receivers: data?.receivers?.join(','),
       });
       if (isInstanceWorker()) {
-        logger.warn('notification is instance worker, skip insert to queue', {
-          teamDid: data?.teamDid,
-          notificationId: data?.notification?.id,
-          receivers: data?.receivers?.join(','),
-        });
         return;
       }
       if (!data.notification) {
-        logger.error('Invalid notification', { data });
-        return;
+        throw new Error('Invalid notification: notification is required');
       }
       const nodeInfo = await node.getNodeInfo({ useCache: true });
 
       if (nodeInfo.mode !== NODE_MODES.DEBUG) {
-        try {
-          await validateNotification(data.notification);
-        } catch (error) {
-          logger.error('Failed to validate notification', { error });
-          // 抛出错误，阻止后续执行
-          throw error;
-        }
+        await validateNotification(data.notification);
       }
 
       // 按照 receiver 添加到推送队列
@@ -725,11 +733,6 @@ const init = ({ node, notificationService }) => {
       });
 
       if (users.length === 0) {
-        logger.warn('no users found, skip insert to queue', {
-          notificationId: notification?.id,
-          receivers: receivers?.join(','),
-          teamDid,
-        });
         throw new Error('No users found');
       }
       // 如果 notification 没有 id，则生成一个, wallet 要基于这唯一个ID进行处理
@@ -755,7 +758,11 @@ const init = ({ node, notificationService }) => {
         });
       });
     } catch (error) {
-      logger.error('Failed to create notification receiver', { error });
+      logger.error('Failed to create notification receiver', {
+        error,
+        notificationId: data?.notification?.id,
+        teamDid: data?.teamDid,
+      });
     }
   });
 };

package/api/socket/channel/did.js

@@ -13,7 +13,7 @@ const {
 const JWT = require('@arcblock/jwt');
 const uniq = require('lodash/uniq');
 
-const logger = require('../../libs/logger')('notification');
+const logger = require('../../libs/logger')('blocklet-services:socket-channel:did');
 const { ensureSenderApp, getSenderServer, parseNotification, EVENTS } = require('../util');
 const states = require('../../state');
 const { sendEmail } = require('../../libs/email');
@@ -162,6 +162,8 @@ const sendToUserDid = async ({ sender, receiver: rawDid, notification, options,
 
   const notifications = Array.isArray(notification) ? notification : [notification];
 
+  const isServer = !teamDid || teamDid === nodeInfo.did;
+
   try {
     const result = await Promise.all(
       notifications.map((_notification) => {
@@ -183,7 +185,7 @@ const sendToUserDid = async ({ sender, receiver: rawDid, notification, options,
           // 这两个字段用于 socket 通知
           entityType: _notification.entityType || 'blocklet',
           entityId: _notification.entityId || sender.appDid,
-          source: _notification.source || 'component',
+          source: isServer ? 'system' : _notification.source || 'component',
           channels: CHANNEL_MAP[_notification.type] || channels,
           sender,
           options: { ...rest },
@@ -210,11 +212,12 @@ const sendToAppDid = async ({
   options,
   pushOnly,
   wsServer,
+  source,
 }) => {
   if (notification && sender) {
     const { keepForOfflineUser = true, ttl } = options || {};
     const teamDid = sender.appDid;
-    const { id, source } = notification;
+    const { id } = notification;
     if (Array.isArray(receiver)) {
       throw new Error('Invalid receiver: 1 receiver each time');
     }
@@ -242,7 +245,7 @@ const sendToAppDid = async ({
 
       if (count <= 0 && keepForOfflineUser && source !== 'system') {
         // 系统发出的消息不进行缓存
-        logger.warn('Online client was not found', { userDid: receiver });
+        logger.debug('Online client was not found', { userDid: receiver });
         await states.message.insert({
           did: receiver,
           event: EVENTS.MESSAGE,
@@ -393,7 +396,7 @@ const sendToWebhook = async ({ sender, receiver, notification, node, pushOnly })
           status: res ? NOTIFICATION_SEND_STATUS.SENT : NOTIFICATION_SEND_STATUS.FAILED,
           failedReason: res ? '' : NOTIFICATION_SEND_FAILED_REASON.CHANNEL_UNAVAILABLE,
         };
-        await updateNotificationSendStatus({
+        updateNotificationSendStatus({
           node,
           teamDid,
           notificationId: id,
@@ -404,14 +407,15 @@ const sendToWebhook = async ({ sender, receiver, notification, node, pushOnly })
       }
       return res;
     } catch (error) {
-      logger.error('Failed to send webhook', { error });
+      // 使用 debug 级别记录详细执行信息，避免与上层业务日志重复
+      logger.debug('Webhook send failed', { error, webhook: webhook.url, notificationId: id });
       if (!pushOnly) {
         webhookParams[webhook.url] = {
           ...webhookParams[webhook.url],
           status: NOTIFICATION_SEND_STATUS.FAILED,
           failedReason: error.message,
         };
-        await updateNotificationSendStatus({
+        updateNotificationSendStatus({
           node,
           teamDid,
           notificationId: id,
@@ -445,7 +449,7 @@ const sendToMail = async ({ sender, receiver, notification, options, node, pushO
     throw new Error('Invalid receiver: empty');
   }
   if (receivers.some((x) => emailSchema.validate(x).error)) {
-    throw new Error('Invalid receiver: invalid email');
+    throw new Error(`Invalid receiver: invalid email: ${receivers.join(', ')}`);
   }
   if (receivers.length > 10) {
     throw new Error('Invalid receiver: too many, should be less than 10');
@@ -566,7 +570,8 @@ const sendToPush = async ({ sender, receiver, notification, options, node, pushO
       return res;
     })
     .catch((err) => {
-      logger.warn('Failed to send pushKit', { error: err });
+      // 使用 debug 级别记录详细执行信息，避免与上层业务日志重复
+      logger.debug('PushKit send failed', { error: err, receivers, notificationId: id });
       if (!pushOnly) {
         updateNotificationSendStatus({
           node,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.3-beta-20251121-135300-8e451e6e",
+  "version": "1.17.3-beta-20251123-232619-53258789",
   "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.3-beta-20251121-135300-8e451e6e",
-    "@abtnode/auth": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@abtnode/connect-storage": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@abtnode/constant": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@abtnode/core": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@abtnode/cron": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@abtnode/db-cache": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@abtnode/logger": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@abtnode/models": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@abtnode/router-templates": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@abtnode/util": "1.17.3-beta-20251121-135300-8e451e6e",
+    "@abtnode/analytics": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/auth": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/connect-storage": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/constant": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/core": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/cron": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/db-cache": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/logger": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/models": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/router-templates": "1.17.3-beta-20251123-232619-53258789",
+    "@abtnode/util": "1.17.3-beta-20251123-232619-53258789",
     "@arcblock/did": "^1.27.7",
     "@arcblock/did-connect-js": "^1.27.7",
     "@arcblock/did-ext": "^1.27.7",
@@ -52,18 +52,18 @@
     "@arcblock/jwt": "^1.27.7",
     "@arcblock/validator": "^1.27.7",
     "@arcblock/ws": "^1.27.7",
-    "@blocklet/constant": "1.17.3-beta-20251121-135300-8e451e6e",
+    "@blocklet/constant": "1.17.3-beta-20251123-232619-53258789",
     "@blocklet/dbhub": "^0.2.9",
-    "@blocklet/env": "1.17.3-beta-20251121-135300-8e451e6e",
+    "@blocklet/env": "1.17.3-beta-20251123-232619-53258789",
     "@blocklet/error": "^0.3.3",
     "@blocklet/form-builder": "^0.1.12",
     "@blocklet/form-collector": "^0.1.8",
-    "@blocklet/images": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@blocklet/js-sdk": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@blocklet/meta": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@blocklet/rate-limit": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@blocklet/sdk": "1.17.3-beta-20251121-135300-8e451e6e",
-    "@blocklet/server-js": "1.17.3-beta-20251121-135300-8e451e6e",
+    "@blocklet/images": "1.17.3-beta-20251123-232619-53258789",
+    "@blocklet/js-sdk": "1.17.3-beta-20251123-232619-53258789",
+    "@blocklet/meta": "1.17.3-beta-20251123-232619-53258789",
+    "@blocklet/rate-limit": "1.17.3-beta-20251123-232619-53258789",
+    "@blocklet/sdk": "1.17.3-beta-20251123-232619-53258789",
+    "@blocklet/server-js": "1.17.3-beta-20251123-232619-53258789",
     "@blocklet/theme": "^3.2.6",
     "@blocklet/theme-builder": "0.4.8",
     "@blocklet/uploader-server": "^0.3.11",
@@ -123,7 +123,7 @@
     "whatwg-url": "14.0.0"
   },
   "devDependencies": {
-    "@abtnode/ux": "1.17.3-beta-20251121-135300-8e451e6e",
+    "@abtnode/ux": "1.17.3-beta-20251123-232619-53258789",
     "@arcblock/bridge": "^3.2.6",
     "@arcblock/did-connect-react": "^3.2.6",
     "@arcblock/icons": "^3.2.6",
@@ -133,7 +133,7 @@
     "@blocklet/did-space-react": "^1.2.4",
     "@blocklet/launcher-layout": "^3.2.6",
     "@blocklet/payment-react": "^1.22.14",
-    "@blocklet/tracker": "1.17.3-beta-20251121-135300-8e451e6e",
+    "@blocklet/tracker": "1.17.3-beta-20251123-232619-53258789",
     "@blocklet/ui-react": "^3.2.6",
     "@blocklet/uploader": "^0.3.11",
     "@emotion/react": "^11.14.0",
@@ -213,5 +213,5 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues",
     "email": "shijun@arcblock.io"
   },
-  "gitHead": "e34d7abbe02a8b6eb754b7e2590a9e3d9d663c7d"
+  "gitHead": "d37497a49c982e82ba60249ed06c1b73f340b893"
 }