@abtnode/blocklet-services 1.17.2-beta-20251112-085154-0103b877 → 1.17.2-beta-20251113-212234-9e640edd

package/api/middlewares/check-federated.js

@@ -83,7 +83,7 @@ function checkFederatedCallLegacy({ mode = 'all', allowStatus = ['approved', 're
       return;
     }
 
-    const { signer, data } = req.body;
+    const { signer, data } = req.body || {};
 
     if (!signer || !data) {
       res.status(400).send('missing signer or signed data');

package/api/routes/user-session.js

@@ -4,6 +4,7 @@ const {
   PASSPORT_LOG_ACTION,
   PASSPORT_STATUS,
   SESSION_TTL,
+  FEDERATED,
 } = require('@abtnode/constant');
 const { LOGIN_PROVIDER } = require('@blocklet/constant');
 const pick = require('lodash/pick');
@@ -29,7 +30,7 @@ const { createTokenFn, getDidConnectVersion } = require('../util');
 const checkUser = require('../middlewares/check-user');
 
 const prefix = `${WELLKNOWN_SERVICE_PATH_PREFIX}/api/user-session`;
-const limit = pLimit(5);
+const limit = pLimit(FEDERATED.SYNC_LIMIT);
 
 const userInfoBlackList = ['extra.walletDeviceId', 'extra.walletDeviceMessageToken', 'extra.device'];
 

package/api/services/notification/queue.js

@@ -134,7 +134,7 @@ const init = ({ node, notificationService }) => {
     {
       maxRetries: 1,
       retryDelay: 0,
-      maxTimeout: 60 * 1000,
+      maxTimeout: 10 * 60 * 1000, // throw timeout error after 10 minutes
       id: (job) => (job ? md5(`${job.email}_${job.notificationId}`) : ''),
       enableScheduledJob: true,
     },
@@ -179,6 +179,10 @@ const init = ({ node, notificationService }) => {
               })
             : null;
 
+        logger.info('Start send to email', {
+          email,
+          notificationId: job.notificationId,
+        });
         await notificationService.sendToMail.exec({
           sender,
           receiver: email,
@@ -197,6 +201,10 @@ const init = ({ node, notificationService }) => {
           pushOnly: input.pushOnly,
           options,
         });
+        logger.info('End send to email', {
+          email,
+          notificationId: job.notificationId,
+        });
       } catch (error) {
         logger.warn('Failed to send to email', { notificationId: job.notificationId, error });
       }
@@ -211,7 +219,7 @@ const init = ({ node, notificationService }) => {
     {
       maxRetries: 3,
       retryDelay: 10 * 1000,
-      maxTimeout: 5 * 60 * 1000, // throw timeout error after 5 minutes
+      maxTimeout: 10 * 60 * 1000, // throw timeout error after 10 minutes
       id: (job) => (job ? md5(`${job.url}_${job.notificationId}`) : ''),
       enableScheduledJob: true,
     },
@@ -235,6 +243,10 @@ const init = ({ node, notificationService }) => {
           throw new Error('Invalid webhook');
         }
 
+        logger.info('Start send to webhook', {
+          url: webhook.url,
+          notificationId: job.notificationId,
+        });
         await notificationService.sendToWebhook.exec({
           sender,
           receiver: receivers,
@@ -247,8 +259,12 @@ const init = ({ node, notificationService }) => {
           },
           pushOnly: input.pushOnly,
         });
+        logger.info('End send to webhook', {
+          url: webhook.url,
+          notificationId: job.notificationId,
+        });
       } catch (error) {
-        logger.warn('Failed to send to webhook', { url: job.url, notificationId: job.notification.id, error });
+        logger.warn('Failed to send to webhook', { url: job.url, notificationId: job.notificationId, error });
       }
     }
   );
@@ -577,7 +593,12 @@ const init = ({ node, notificationService }) => {
         throw new Error('Invalid receiver user');
       }
 
-      if (!job.pushOnly && !!notification.id) {
+      // FIXME: @liushuang: notification.id.startsWith('NOTIF-') HACK 的处理方式，是一个兜底行为。
+      // notificationId：存在为空的情况，比如 connect, hi，passthrough 消息时，是没有 id, 此时 pushOnly 为 true
+      // 为了避免在这里非 db 生成的ID进入插入操作，这里使用一个标识，避免插入脏数据
+
+      // 不在队列内生成 notificationId 的原因是避免队列重复执行导致相同消息生成不同ID
+      if (!job.pushOnly && !notification.id.startsWith('NOTIF-')) {
         // 如果添加失败，那么需要终止执行推送
         await insertToNotificationReceiver(nodeInfo, userInfo, teamDid, notification.id, channels);
         logger.info('notification receiver created successfully', {
@@ -608,11 +629,6 @@ const init = ({ node, notificationService }) => {
         }
       }
 
-      // 如果 notification 没有 id，则生成一个, wallet 要基于这唯一个ID进行处理
-      if (!notification.id) {
-        notification.id = nanoid();
-      }
-
       notification.type = notification.type || 'notification';
 
       const baseParams = {
@@ -716,6 +732,14 @@ const init = ({ node, notificationService }) => {
         });
         throw new Error('No users found');
       }
+      // 如果 notification 没有 id，则生成一个, wallet 要基于这唯一个ID进行处理
+      // 同时避免 queue 重复导致的 id 重复问题
+      // 需要在 queue 中区分这个 notificationId 是否存在数据库中，如果不存在，则不进行插入
+      // 不存在 notificationId 的情况，是发送 connect, hi，passthrough 消息时，没有 id 的情况
+      if (!notification.id) {
+        // 按照逻辑，如果ID不存在的时候，pushOnly 一定为 true，为了避免出现问题，这里使用一个标识，避免插入脏数据
+        notification.id = `NOTIF-${nanoid()}`;
+      }
 
       users.forEach((userInfo) => {
         const receiverDid = userInfo.did;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.2-beta-20251112-085154-0103b877",
+  "version": "1.17.2-beta-20251113-212234-9e640edd",
   "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.2-beta-20251112-085154-0103b877",
-    "@abtnode/auth": "1.17.2-beta-20251112-085154-0103b877",
-    "@abtnode/connect-storage": "1.17.2-beta-20251112-085154-0103b877",
-    "@abtnode/constant": "1.17.2-beta-20251112-085154-0103b877",
-    "@abtnode/core": "1.17.2-beta-20251112-085154-0103b877",
-    "@abtnode/cron": "1.17.2-beta-20251112-085154-0103b877",
-    "@abtnode/db-cache": "1.17.2-beta-20251112-085154-0103b877",
-    "@abtnode/logger": "1.17.2-beta-20251112-085154-0103b877",
-    "@abtnode/models": "1.17.2-beta-20251112-085154-0103b877",
-    "@abtnode/router-templates": "1.17.2-beta-20251112-085154-0103b877",
-    "@abtnode/util": "1.17.2-beta-20251112-085154-0103b877",
+    "@abtnode/analytics": "1.17.2-beta-20251113-212234-9e640edd",
+    "@abtnode/auth": "1.17.2-beta-20251113-212234-9e640edd",
+    "@abtnode/connect-storage": "1.17.2-beta-20251113-212234-9e640edd",
+    "@abtnode/constant": "1.17.2-beta-20251113-212234-9e640edd",
+    "@abtnode/core": "1.17.2-beta-20251113-212234-9e640edd",
+    "@abtnode/cron": "1.17.2-beta-20251113-212234-9e640edd",
+    "@abtnode/db-cache": "1.17.2-beta-20251113-212234-9e640edd",
+    "@abtnode/logger": "1.17.2-beta-20251113-212234-9e640edd",
+    "@abtnode/models": "1.17.2-beta-20251113-212234-9e640edd",
+    "@abtnode/router-templates": "1.17.2-beta-20251113-212234-9e640edd",
+    "@abtnode/util": "1.17.2-beta-20251113-212234-9e640edd",
     "@arcblock/did": "^1.27.4",
     "@arcblock/did-connect-js": "^1.27.4",
     "@arcblock/did-ext": "^1.27.4",
@@ -52,18 +52,18 @@
     "@arcblock/jwt": "^1.27.4",
     "@arcblock/validator": "^1.27.4",
     "@arcblock/ws": "^1.27.4",
-    "@blocklet/constant": "1.17.2-beta-20251112-085154-0103b877",
+    "@blocklet/constant": "1.17.2-beta-20251113-212234-9e640edd",
     "@blocklet/dbhub": "^0.2.9",
-    "@blocklet/env": "1.17.2-beta-20251112-085154-0103b877",
+    "@blocklet/env": "1.17.2-beta-20251113-212234-9e640edd",
     "@blocklet/error": "^0.3.2",
     "@blocklet/form-builder": "^0.1.12",
     "@blocklet/form-collector": "^0.1.8",
-    "@blocklet/images": "1.17.2-beta-20251112-085154-0103b877",
-    "@blocklet/js-sdk": "1.17.2-beta-20251112-085154-0103b877",
-    "@blocklet/meta": "1.17.2-beta-20251112-085154-0103b877",
-    "@blocklet/rate-limit": "1.17.2-beta-20251112-085154-0103b877",
-    "@blocklet/sdk": "1.17.2-beta-20251112-085154-0103b877",
-    "@blocklet/server-js": "1.17.2-beta-20251112-085154-0103b877",
+    "@blocklet/images": "1.17.2-beta-20251113-212234-9e640edd",
+    "@blocklet/js-sdk": "1.17.2-beta-20251113-212234-9e640edd",
+    "@blocklet/meta": "1.17.2-beta-20251113-212234-9e640edd",
+    "@blocklet/rate-limit": "1.17.2-beta-20251113-212234-9e640edd",
+    "@blocklet/sdk": "1.17.2-beta-20251113-212234-9e640edd",
+    "@blocklet/server-js": "1.17.2-beta-20251113-212234-9e640edd",
     "@blocklet/theme": "^3.2.3",
     "@blocklet/theme-builder": "0.4.8",
     "@blocklet/uploader-server": "^0.3.9",
@@ -123,7 +123,7 @@
     "whatwg-url": "14.0.0"
   },
   "devDependencies": {
-    "@abtnode/ux": "1.17.2-beta-20251112-085154-0103b877",
+    "@abtnode/ux": "1.17.2-beta-20251113-212234-9e640edd",
     "@arcblock/bridge": "^3.2.3",
     "@arcblock/did-connect-react": "^3.2.3",
     "@arcblock/icons": "^3.2.3",
@@ -133,7 +133,7 @@
     "@blocklet/did-space-react": "^1.2.2",
     "@blocklet/launcher-layout": "^3.2.3",
     "@blocklet/payment-react": "^1.22.10",
-    "@blocklet/tracker": "1.17.2-beta-20251112-085154-0103b877",
+    "@blocklet/tracker": "1.17.2-beta-20251113-212234-9e640edd",
     "@blocklet/ui-react": "^3.2.3",
     "@blocklet/uploader": "^0.3.9",
     "@emotion/react": "^11.14.0",
@@ -213,5 +213,5 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues",
     "email": "shijun@arcblock.io"
   },
-  "gitHead": "78509a648488c741e93d33b743ea2f6d65535c34"
+  "gitHead": "ee25481c457076c9c7aa7f094dc1771301065f5a"
 }