@abtnode/core 1.17.6-beta-20251221-021146-1a145a92 → 1.17.7-beta-20251223-090654-55d57623

package/lib/api/team.js

@@ -58,6 +58,7 @@ const { getEmailServiceProvider } = require('@abtnode/auth/lib/email');
 const md5 = require('@abtnode/util/lib/md5');
 const { sanitizeTag } = require('@abtnode/util/lib/sanitize');
 const { Joi } = require('@arcblock/validator');
+const { getBlockletAppIdList } = require('@blocklet/meta/lib/util');
 
 const { validateTrustedPassportIssuers } = require('../validators/trusted-passport');
 const { validateTrustedFactories } = require('../validators/trusted-factory');
@@ -3119,6 +3120,7 @@ class TeamAPI extends EventEmitter {
           {
             action: 'issueOrgOwnerPassport',
             entity: 'blocklet',
+            entityId: teamDid,
             params: {
               teamDid,
               org: result,
@@ -3623,10 +3625,43 @@ class TeamAPI extends EventEmitter {
 
       const pushState = getNotificationPushState(results, channelsAvailable, isServer);
 
+      let teamDids = [teamDid];
+      if (isServer) {
+        const nodeInfo = await this.node.read();
+        teamDids = [nodeInfo.did];
+      } else {
+        teamDids = getBlockletAppIdList(blocklet);
+      }
+
+      const pendingResult = await this.states.job.getPendingNotifications({
+        teamDids,
+        isServer,
+        channels: Object.keys(channelsAvailable),
+        createdAt: startTime,
+      });
+
+      // pushState 的 key 与 pendingResult 的 key 映射关系
+      const channelKeyMap = {
+        pushKit: NOTIFICATION_SEND_CHANNEL.PUSH,
+        wallet: NOTIFICATION_SEND_CHANNEL.WALLET,
+        email: NOTIFICATION_SEND_CHANNEL.EMAIL,
+        webhook: NOTIFICATION_SEND_CHANNEL.WEBHOOK,
+      };
+
+      // 合并 pending 数量到对应的 channel
+      const channels = Object.entries(pushState).reduce((acc, [key, value]) => {
+        const pendingKey = channelKeyMap[key] || key;
+        acc[key] = {
+          ...value,
+          pending: pendingResult[pendingKey] || 0,
+        };
+        return acc;
+      }, {});
+
       return {
         healthy: true,
         since: startTime,
-        channels: pushState,
+        channels,
       };
     } catch (err) {
       logger.error('Get notification service health failed', err, { teamDid });

package/lib/blocklet/manager/disk.js

@@ -367,6 +367,7 @@ class DiskBlockletManager extends BaseBlockletManager {
        */
       const handleBackupComplete = async ({ id: jobId, job }) => {
         await this.backupQueue.delete(jobId);
+        SpacesBackup.abort(job.did);
 
         const autoBackup = await this.getAutoBackup({ did: job.did });
         if (autoBackup?.enabled) {
@@ -3009,17 +3010,19 @@ class DiskBlockletManager extends BaseBlockletManager {
       await spacesBackup.initialize();
       await spacesBackup.verifySpace();
 
-      this.backupQueue.push(
-        {
-          entity: 'blocklet',
-          action: 'backupToSpaces',
-          did,
-          context,
-        },
-        jobId,
-        true,
-        BACKUPS.JOB.INTERVAL
-      );
+      if (!SpacesBackup.isRunning(did)) {
+        this.backupQueue.push(
+          {
+            entity: 'blocklet',
+            action: 'backupToSpaces',
+            did,
+            context,
+          },
+          jobId,
+          true,
+          BACKUPS.JOB.INTERVAL
+        );
+      }
     }
 
     await states.blockletExtras.setSettings(did, { autoBackup: value });
@@ -3748,17 +3751,37 @@ class DiskBlockletManager extends BaseBlockletManager {
       strategy: BACKUPS.STRATEGY.AUTO,
     },
   }) {
-    if (shouldJobBackoff()) {
-      logger.warn('Backup to spaces is not available when blocklet server is starting.');
-      return;
-    }
-
     const blocklet = await states.blocklet.getBlocklet(did);
     const {
       appDid,
       meta: { did: appPid },
     } = blocklet;
 
+    if (shouldJobBackoff()) {
+      const backup = await states.backup.findOne({ appPid }, {}, { createdAt: -1 });
+      const message = 'Backup to spaces is not available when blocklet server is starting.';
+
+      if (backup.status === BACKUPS.STATUS.PROGRESS) {
+        await states.backup.fail(backup.id, {
+          message,
+        });
+      }
+
+      this.emit(BlockletEvents.backupProgress, {
+        appDid,
+        meta: { did: appPid },
+        completed: true,
+        progress: -1,
+        message,
+        backup,
+        context,
+        blocklet,
+      });
+
+      logger.warn(message);
+      return;
+    }
+
     const spaceGateways = await this.getBlockletSpaceGateways({ did });
     const backupEndpoint = getBackupEndpoint(blocklet.environments);
     if (isEmpty(spaceGateways) || isEmpty(backupEndpoint)) {
@@ -5488,28 +5511,33 @@ class DiskBlockletManager extends BaseBlockletManager {
       const { did } = blocklet.meta;
       const jobId = getBackupJobId(did);
       const { job, willRunAt } = (await this.backupQueue.get(jobId, { full: true })) ?? {};
-      if (job) {
-        if (job.backupState?.strategy === BACKUPS.STRATEGY.MANUAL || willRunAt <= Date.now()) {
-          logger.warn(`This app(${did})'s manual backup is already running, skip it`, { job });
-          await this.backupQueue.restoreCancelled(jobId);
-          return blocklet;
-        }
-        await this.backupQueue.delete(jobId);
-        logger.warn(`This app(${did})'s auto backup is already removed from backup queue`, { job });
-      }
 
-      this.backupQueue.push(
-        {
-          entity: 'blocklet',
-          action: 'backupToSpaces',
-          did,
-          context,
-          backupState: {
-            strategy: BACKUPS.STRATEGY.MANUAL,
+      // 任务正在运行或者将要在 1s 内运行，或者任务可能已过期，都是表示任务可用
+      const waitBackupDone = (job && willRunAt - Date.now() <= 1_000) || SpacesBackup.isRunning(did);
+
+      if (waitBackupDone) {
+        logger.warn(`This app(${did})'s manual or auto backup is already running, skip manual backup`, {
+          job,
+          willRunAt,
+          now: Date.now(),
+          isRunning: SpacesBackup.isRunning(did),
+        });
+        await this.backupQueue.restoreCancelled(jobId);
+      } else {
+        await this.backupQueue.delete(jobId);
+        this.backupQueue.push(
+          {
+            entity: 'blocklet',
+            action: 'backupToSpaces',
+            did,
+            context,
+            backupState: {
+              strategy: BACKUPS.STRATEGY.MANUAL,
+            },
           },
-        },
-        jobId
-      );
+          jobId
+        );
+      }
 
       return blocklet;
     } catch (error) {

package/lib/blocklet/manager/ensure-blocklet-running.js

@@ -366,6 +366,7 @@ class EnsureBlockletRunning {
 
     this.restartQueue.push({
       rootDid,
+      entityId: rootDid,
       componentDids: dids,
       firstCycle: !this.whenCycleCheck,
     });

package/lib/blocklet/manager/helper/install-application-from-backup.js

@@ -269,6 +269,7 @@ const installApplicationFromBackup = async ({
         entity: 'blocklet',
         action: 'download',
         id: did,
+        entityId: did,
         ...downloadParams,
       },
       did

package/lib/blocklet/manager/helper/install-application-from-general.js

@@ -201,6 +201,7 @@ const installApplicationFromGeneral = async ({
           entity: 'blocklet',
           action: 'download',
           id: did,
+          entityId: did,
           ...downloadParams,
         },
         did

package/lib/blocklet/manager/helper/install-component-from-url.js

@@ -187,6 +187,7 @@ const installComponentFromUrl = async ({
       entity: 'blocklet',
       action: 'download',
       id: rootDid,
+      entityId: rootDid,
       ...downloadParams,
     },
     rootDid

package/lib/blocklet/manager/helper/upgrade-components.js

@@ -145,6 +145,7 @@ const upgrade = async ({ updateId, componentDids, context, states, manager }) =>
       componentDids: componentDids || [],
       context,
       postAction: action,
+      entityId: did,
     },
     did
   );

package/lib/blocklet/migration-dist/migration.cjs

@@ -39044,7 +39044,7 @@ module.exports = require("zlib");
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.17.5","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.17.5","@abtnode/auth":"1.17.5","@abtnode/certificate-manager":"1.17.5","@abtnode/constant":"1.17.5","@abtnode/cron":"1.17.5","@abtnode/db-cache":"1.17.5","@abtnode/docker-utils":"1.17.5","@abtnode/logger":"1.17.5","@abtnode/models":"1.17.5","@abtnode/queue":"1.17.5","@abtnode/rbac":"1.17.5","@abtnode/router-provider":"1.17.5","@abtnode/static-server":"1.17.5","@abtnode/timemachine":"1.17.5","@abtnode/util":"1.17.5","@aigne/aigne-hub":"^0.10.15","@arcblock/did":"^1.27.15","@arcblock/did-connect-js":"^1.27.15","@arcblock/did-ext":"^1.27.15","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"^1.27.15","@arcblock/event-hub":"^1.27.15","@arcblock/jwt":"^1.27.15","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"^1.27.15","@arcblock/vc":"^1.27.15","@blocklet/constant":"1.17.5","@blocklet/did-space-js":"^1.2.11","@blocklet/env":"1.17.5","@blocklet/error":"^0.3.5","@blocklet/meta":"1.17.5","@blocklet/resolver":"1.17.5","@blocklet/sdk":"1.17.5","@blocklet/server-js":"1.17.5","@blocklet/store":"1.17.5","@blocklet/theme":"^3.2.19","@fidm/x509":"^1.2.1","@ocap/mcrypto":"^1.27.15","@ocap/util":"^1.27.15","@ocap/wallet":"^1.27.15","@slack/webhook":"^7.0.6","archiver":"^7.0.1","axios":"^1.7.9","axon":"^2.0.3","chalk":"^4.1.2","cross-spawn":"^7.0.3","dayjs":"^1.11.13","deep-diff":"^1.0.2","detect-port":"^1.5.1","envfile":"^7.1.0","escape-string-regexp":"^4.0.0","fast-glob":"^3.3.2","filesize":"^10.1.1","flat":"^5.0.2","fs-extra":"^11.2.0","get-port":"^5.1.1","hasha":"^5.2.2","is-base64":"^1.1.0","is-cidr":"4","is-ip":"3","is-url":"^1.2.4","joi":"17.12.2","joi-extension-semver":"^5.0.0","js-yaml":"^4.1.0","kill-port":"^2.0.1","lodash":"^4.17.21","node-stream-zip":"^1.15.0","p-all":"^3.0.0","p-limit":"^3.1.0","p-map":"^4.0.0","p-retry":"^4.6.2","p-wait-for":"^3.2.0","private-ip":"^2.3.4","rate-limiter-flexible":"^5.0.5","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","slugify":"^1.6.6","ssri":"^8.0.1","stream-throttle":"^0.1.3","stream-to-promise":"^3.0.0","systeminformation":"^5.23.3","tail":"^2.2.4","tar":"^6.1.11","transliteration":"2.3.5","ua-parser-js":"^1.0.2","ufo":"^1.5.3","uuid":"^11.1.0","valid-url":"^1.0.9","which":"^2.0.2","xbytes":"^1.8.0"},"devDependencies":{"axios-mock-adapter":"^2.1.0","expand-tilde":"^2.0.2","express":"^4.18.2","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.17.6","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.17.6","@abtnode/auth":"1.17.6","@abtnode/certificate-manager":"1.17.6","@abtnode/constant":"1.17.6","@abtnode/cron":"1.17.6","@abtnode/db-cache":"1.17.6","@abtnode/docker-utils":"1.17.6","@abtnode/logger":"1.17.6","@abtnode/models":"1.17.6","@abtnode/queue":"1.17.6","@abtnode/rbac":"1.17.6","@abtnode/router-provider":"1.17.6","@abtnode/static-server":"1.17.6","@abtnode/timemachine":"1.17.6","@abtnode/util":"1.17.6","@aigne/aigne-hub":"^0.10.15","@arcblock/did":"^1.27.15","@arcblock/did-connect-js":"^1.27.15","@arcblock/did-ext":"^1.27.15","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"^1.27.15","@arcblock/event-hub":"^1.27.15","@arcblock/jwt":"^1.27.15","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"^1.27.15","@arcblock/vc":"^1.27.15","@blocklet/constant":"1.17.6","@blocklet/did-space-js":"^1.2.11","@blocklet/env":"1.17.6","@blocklet/error":"^0.3.5","@blocklet/meta":"1.17.6","@blocklet/resolver":"1.17.6","@blocklet/sdk":"1.17.6","@blocklet/server-js":"1.17.6","@blocklet/store":"1.17.6","@blocklet/theme":"^3.2.19","@fidm/x509":"^1.2.1","@ocap/mcrypto":"^1.27.15","@ocap/util":"^1.27.15","@ocap/wallet":"^1.27.15","@slack/webhook":"^7.0.6","archiver":"^7.0.1","axios":"^1.7.9","axon":"^2.0.3","chalk":"^4.1.2","cross-spawn":"^7.0.3","dayjs":"^1.11.13","deep-diff":"^1.0.2","detect-port":"^1.5.1","envfile":"^7.1.0","escape-string-regexp":"^4.0.0","fast-glob":"^3.3.2","filesize":"^10.1.1","flat":"^5.0.2","fs-extra":"^11.2.0","get-port":"^5.1.1","hasha":"^5.2.2","is-base64":"^1.1.0","is-cidr":"4","is-ip":"3","is-url":"^1.2.4","joi":"17.12.2","joi-extension-semver":"^5.0.0","js-yaml":"^4.1.0","kill-port":"^2.0.1","lodash":"^4.17.21","node-stream-zip":"^1.15.0","p-all":"^3.0.0","p-limit":"^3.1.0","p-map":"^4.0.0","p-retry":"^4.6.2","p-wait-for":"^3.2.0","private-ip":"^2.3.4","rate-limiter-flexible":"^5.0.5","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","slugify":"^1.6.6","ssri":"^8.0.1","stream-throttle":"^0.1.3","stream-to-promise":"^3.0.0","systeminformation":"^5.23.3","tail":"^2.2.4","tar":"^6.1.11","transliteration":"2.3.5","ua-parser-js":"^1.0.2","ufo":"^1.5.3","uuid":"^11.1.0","valid-url":"^1.0.9","which":"^2.0.2","xbytes":"^1.8.0"},"devDependencies":{"axios-mock-adapter":"^2.1.0","expand-tilde":"^2.0.2","express":"^4.18.2","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
 
 /***/ }),
 

package/lib/blocklet/storage/backup/spaces.js

@@ -406,6 +406,17 @@ class SpacesBackup extends BaseBackup {
     }
   }
 
+  /**
+   *
+   *
+   * @static
+   * @param {string} appPid
+   * @memberof SpacesBackup
+   */
+  static isRunning(appPid) {
+    return SpacesBackup.instanceMap.has(appPid);
+  }
+
   /**
    *
    *

package/lib/blocklet/storage/utils/disk.js

@@ -104,6 +104,8 @@ function getFolderSize(folderPath) {
  */
 // eslint-disable-next-line require-await
 async function getFolderObjects(path, prefix = '') {
+  // @note: 我尝试动手解析 .gitignore 文件，但是发现 fast-glob 不支持解析它的规则，并找到了对应的 issue: https://github.com/mrmlnc/fast-glob/issues/265#issue-579211456
+  const ignore = ['**/node_modules/**', '**/.next/**', '**/.DS_Store'];
   const stream = FastGlob.stream('**', {
     cwd: path,
     objectMode: true,
@@ -112,6 +114,7 @@ async function getFolderObjects(path, prefix = '') {
     absolute: true,
     dot: true,
     concurrency: 2,
+    ignore,
   });
 
   const objects = [];

package/lib/event/auto-backup-handler.js

@@ -2,6 +2,7 @@ const debounce = require('lodash/debounce');
 const logger = require('@abtnode/logger')('@abtnode/core:event:auto-backup-handler');
 const { BACKUPS } = require('@abtnode/constant');
 const { getBackupJobId } = require('../util/spaces');
+const { SpacesBackup } = require('../blocklet/storage/backup/spaces');
 
 /**
  * @description
@@ -16,19 +17,22 @@ async function autoBackupHandler(_eventName, payload, blockletManager) {
   if (autoBackup.enabled && payload.context) {
     const jobId = getBackupJobId(did);
     const { job, willRunAt } = (await blockletManager.backupQueue.get(jobId, { full: true })) ?? {};
-    if (job) {
-      // 如果手动备份正在运行，或者自动备份正在运行，则跳过
-      if (job.backupState?.strategy === BACKUPS.STRATEGY.MANUAL || willRunAt <= Date.now()) {
-        logger.warn(`This app(${did})'s manual or auto backup is already running, skip it`, {
-          job,
-        });
-        await blockletManager.backupQueue.restoreCancelled(jobId);
-        return;
-      }
-      await blockletManager.backupQueue.delete(jobId);
-      logger.warn(`This app(${did})'s auto backup is already removed from backup queue`, { job });
+
+    // 任务正在运行或者将要在 3s 内运行，或者任务可能已过期，都是表示任务可用
+    const waitBackupDone = (job && willRunAt - Date.now() <= 3_000) || SpacesBackup.isRunning(did);
+
+    if (waitBackupDone) {
+      logger.warn(`This app(${did})'s manual or auto backup is already running, skip auto backup`, {
+        job,
+        willRunAt,
+        now: Date.now(),
+        isRunning: SpacesBackup.isRunning(did),
+      });
+      await blockletManager.backupQueue.restoreCancelled(jobId);
+      return;
     }
 
+    await blockletManager.backupQueue.delete(jobId);
     blockletManager.backupQueue.push(
       {
         entity: 'blocklet',

package/lib/event/index.js

@@ -695,8 +695,10 @@ module.exports = ({
        * @returns
        */
       (_eventName, payload, ...args) => {
-        const id = payload.meta.did;
-        return autoBackupHandlerFactory(id, autoBackupHandler)(eventName, payload, blockletManager, ...args);
+        if (payload.context) {
+          const id = payload.meta.did;
+          autoBackupHandlerFactory(id, autoBackupHandler)(eventName, payload, blockletManager, ...args);
+        }
       }
     );
   });

package/lib/states/job.js

@@ -1,8 +1,62 @@
+const { NOTIFICATION_SEND_CHANNEL } = require('@abtnode/constant');
+const dayjs = require('@abtnode/util/lib/dayjs');
+const { Op, Sequelize } = require('sequelize');
+const { CustomError } = require('@blocklet/error');
+
 const BaseState = require('./base');
 
+// 根据 channel 映射对于的查询类别
+const CHANNEL_MAP = {
+  [NOTIFICATION_SEND_CHANNEL.WALLET]: 'send-notification-wallet',
+  [NOTIFICATION_SEND_CHANNEL.PUSH]: 'send-notification-push',
+  [NOTIFICATION_SEND_CHANNEL.EMAIL]: 'send-notification-email',
+  [NOTIFICATION_SEND_CHANNEL.WEBHOOK]: 'send-notification-webhook',
+};
+
 /**
  * @extends BaseState<import('@abtnode/models').JobState>
  */
-class Job extends BaseState {}
+class Job extends BaseState {
+  async getPendingNotifications({ teamDids = [], channels = [], createdAt = '', isServer = false }) {
+    if (!teamDids.length || !channels.length) {
+      throw new CustomError(400, 'teamDids and channels are required');
+    }
+    let startTime = createdAt;
+    if (!startTime) {
+      startTime = dayjs().subtract(1, 'hours').toDate();
+    }
+
+    // 过滤有效 channel，获取对应的 queue 名称
+    const validChannels = channels.filter((channel) => CHANNEL_MAP[channel]);
+    const queueNames = validChannels.map((channel) => CHANNEL_MAP[channel]);
+
+    // 构建 entityId 查询条件
+    // isServer 为 true 时，使用 COALESCE 查询 entityId 在 teamDids 中或为空（null/''）的记录
+    // isServer 为 false 时，直接查询 entityId 在 teamDids 中的记录，索引利用率最高
+    const entityIdCondition = isServer
+      ? Sequelize.where(Sequelize.fn('COALESCE', Sequelize.col('entityId'), ''), { [Op.in]: [...teamDids, ''] })
+      : { entityId: { [Op.in]: teamDids } };
+
+    // 单次查询，使用 GROUP BY 获取所有 channel 的统计
+    const results = await this.model.findAll({
+      attributes: ['queue', [Sequelize.fn('COUNT', Sequelize.col('id')), 'count']],
+      where: {
+        queue: { [Op.in]: queueNames },
+        ...(isServer ? { [Op.and]: entityIdCondition } : entityIdCondition),
+        createdAt: { [Op.gte]: startTime },
+      },
+      group: ['queue'],
+      raw: true,
+    });
+
+    // 将结果映射回 channel 名称，确保所有请求的 channel 都有返回值
+    return validChannels.reduce((acc, channel) => {
+      const queueName = CHANNEL_MAP[channel];
+      const row = results.find((r) => r.queue === queueName);
+      acc[channel] = row ? Number(row.count) : 0;
+      return acc;
+    }, {});
+  }
+}
 
 module.exports = Job;

package/lib/states/notification.js

@@ -1035,32 +1035,32 @@ class NotificationState extends BaseState {
     // 计算时间范围
     const startTime = dayjs().subtract(hours, 'hours').toDate();
 
-    // 第一步：在 notifications 表中查询符合时间范围的通知 ID
-    const notifications = await this.model.findAll({
-      where: {
-        createdAt: {
-          [Op.gte]: startTime,
-        },
-      },
-      attributes: ['id'],
-    });
-
-    // 如果没有找到符合条件的通知，直接返回空数组
-    if (notifications.length === 0) {
-      return [];
-    }
-
-    // 提取通知 ID 列表
-    const notificationIds = notifications.map((n) => n.id);
+    // 只查询统计所需字段，排除大的 JSON 字段 (walletSendRecord, pushKitSendRecord, emailSendRecord)
+    // 这样可以大幅减少数据传输量
+    const results = await this.model.sequelize.query(
+      `SELECT 
+        "walletSendAt", "walletSendStatus", "walletSendFailedReason",
+        "pushKitSendAt", "pushKitSendStatus", "pushKitSendFailedReason",
+        "emailSendAt", "emailSendStatus", "emailSendFailedReason",
+        "webhook", "createdAt"
+      FROM notification_receivers 
+      WHERE "createdAt" >= :startTime`,
+      {
+        replacements: { startTime },
+        type: Sequelize.QueryTypes.SELECT,
+      }
+    );
 
-    // 第二步：根据通知 ID 在 notification_receivers 表中查询数据
-    return this.notificationReceivers.model.findAll({
-      where: {
-        notificationId: {
-          [Op.in]: notificationIds,
-        },
-      },
-      order: [['createdAt', 'DESC']],
+    // 只需要解析 webhook JSON 字段
+    return results.map((item) => {
+      if (typeof item.webhook === 'string') {
+        try {
+          item.webhook = JSON.parse(item.webhook);
+        } catch {
+          item.webhook = {};
+        }
+      }
+      return item;
     });
   }
 }

package/lib/webhook/index.js

@@ -251,6 +251,7 @@ module.exports = ({ events, dataDirs, instance }) => {
           status: severity,
           action,
           entityType,
+          entityId,
           blockletUrl,
           extra,
           receiver,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.6-beta-20251221-021146-1a145a92",
+  "version": "1.17.7-beta-20251223-090654-55d57623",
   "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.6-beta-20251221-021146-1a145a92",
-    "@abtnode/auth": "1.17.6-beta-20251221-021146-1a145a92",
-    "@abtnode/certificate-manager": "1.17.6-beta-20251221-021146-1a145a92",
-    "@abtnode/constant": "1.17.6-beta-20251221-021146-1a145a92",
-    "@abtnode/cron": "1.17.6-beta-20251221-021146-1a145a92",
-    "@abtnode/db-cache": "1.17.6-beta-20251221-021146-1a145a92",
-    "@abtnode/docker-utils": "1.17.6-beta-20251221-021146-1a145a92",
-    "@abtnode/logger": "1.17.6-beta-20251221-021146-1a145a92",
-    "@abtnode/models": "1.17.6-beta-20251221-021146-1a145a92",
-    "@abtnode/queue": "1.17.6-beta-20251221-021146-1a145a92",
-    "@abtnode/rbac": "1.17.6-beta-20251221-021146-1a145a92",
-    "@abtnode/router-provider": "1.17.6-beta-20251221-021146-1a145a92",
-    "@abtnode/static-server": "1.17.6-beta-20251221-021146-1a145a92",
-    "@abtnode/timemachine": "1.17.6-beta-20251221-021146-1a145a92",
-    "@abtnode/util": "1.17.6-beta-20251221-021146-1a145a92",
+    "@abtnode/analytics": "1.17.7-beta-20251223-090654-55d57623",
+    "@abtnode/auth": "1.17.7-beta-20251223-090654-55d57623",
+    "@abtnode/certificate-manager": "1.17.7-beta-20251223-090654-55d57623",
+    "@abtnode/constant": "1.17.7-beta-20251223-090654-55d57623",
+    "@abtnode/cron": "1.17.7-beta-20251223-090654-55d57623",
+    "@abtnode/db-cache": "1.17.7-beta-20251223-090654-55d57623",
+    "@abtnode/docker-utils": "1.17.7-beta-20251223-090654-55d57623",
+    "@abtnode/logger": "1.17.7-beta-20251223-090654-55d57623",
+    "@abtnode/models": "1.17.7-beta-20251223-090654-55d57623",
+    "@abtnode/queue": "1.17.7-beta-20251223-090654-55d57623",
+    "@abtnode/rbac": "1.17.7-beta-20251223-090654-55d57623",
+    "@abtnode/router-provider": "1.17.7-beta-20251223-090654-55d57623",
+    "@abtnode/static-server": "1.17.7-beta-20251223-090654-55d57623",
+    "@abtnode/timemachine": "1.17.7-beta-20251223-090654-55d57623",
+    "@abtnode/util": "1.17.7-beta-20251223-090654-55d57623",
     "@aigne/aigne-hub": "^0.10.15",
     "@arcblock/did": "^1.27.15",
     "@arcblock/did-connect-js": "^1.27.15",
@@ -43,15 +43,15 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.27.15",
     "@arcblock/vc": "^1.27.15",
-    "@blocklet/constant": "1.17.6-beta-20251221-021146-1a145a92",
+    "@blocklet/constant": "1.17.7-beta-20251223-090654-55d57623",
     "@blocklet/did-space-js": "^1.2.11",
-    "@blocklet/env": "1.17.6-beta-20251221-021146-1a145a92",
+    "@blocklet/env": "1.17.7-beta-20251223-090654-55d57623",
     "@blocklet/error": "^0.3.5",
-    "@blocklet/meta": "1.17.6-beta-20251221-021146-1a145a92",
-    "@blocklet/resolver": "1.17.6-beta-20251221-021146-1a145a92",
-    "@blocklet/sdk": "1.17.6-beta-20251221-021146-1a145a92",
-    "@blocklet/server-js": "1.17.6-beta-20251221-021146-1a145a92",
-    "@blocklet/store": "1.17.6-beta-20251221-021146-1a145a92",
+    "@blocklet/meta": "1.17.7-beta-20251223-090654-55d57623",
+    "@blocklet/resolver": "1.17.7-beta-20251223-090654-55d57623",
+    "@blocklet/sdk": "1.17.7-beta-20251223-090654-55d57623",
+    "@blocklet/server-js": "1.17.7-beta-20251223-090654-55d57623",
+    "@blocklet/store": "1.17.7-beta-20251223-090654-55d57623",
     "@blocklet/theme": "^3.2.19",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "^1.27.15",
@@ -116,5 +116,5 @@
     "express": "^4.18.2",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "6922b56b5f282ba14c864f6a7969d218e4065104"
+  "gitHead": "00a82b6f4ef5818d6ec37d74be404031c693247c"
 }