@abtnode/core 1.17.6 → 1.17.7-beta-20251224-045844-3c7f459a

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/blocklet-extras.js

@@ -150,21 +150,37 @@ class BlockletExtrasState extends BaseState {
     }
   }
 
-  generateGetFn(extra) {
-    return async (dids, path, defaultValue) => {
-      // eslint-disable-next-line no-param-reassign
-      dids = [].concat(dids);
-      const [rootDid, ...childDids] = dids;
-      const { dek } = this.config;
-      const { name, afterGet = noop('data') } = extra;
+  getExtraByDid(did, { selection = {} } = {}) {
+    return this.findOne({ did }, selection);
+  }
 
-      let item = await this.findOne({ did: rootDid });
-      while (item && childDids.length) {
-        const did = childDids.shift();
-        item = (item.children || []).find((x) => x.did === did);
-      }
+  /**
+   * 从文档中提取指定字段的数据
+   * @private
+   */
+  _extractFromDoc(doc, dids, extra) {
+    // eslint-disable-next-line no-param-reassign
+    dids = [].concat(dids);
+    const [rootDid, ...childDids] = dids;
+    const { dek } = this.config;
+    const { name, afterGet = noop('data') } = extra;
+
+    // 遍历 children 查找目标组件
+    let item = doc;
+    const didsToTraverse = [...childDids];
+    while (item && didsToTraverse.length) {
+      const did = didsToTraverse.shift();
+      item = (item.children || []).find((x) => x.did === did);
+    }
+
+    return afterGet({ data: item ? item[name] : null, did: rootDid, dek });
+  }
 
-      const data = afterGet({ data: item ? item[name] : item, did: rootDid, dek });
+  generateGetFn(extra) {
+    return async (dids, path, defaultValue) => {
+      const [rootDid] = [].concat(dids);
+      const doc = await this.findOne({ did: rootDid });
+      const data = this._extractFromDoc(doc, dids, extra);
       if (!path) {
         return data;
       }
@@ -172,6 +188,22 @@ class BlockletExtrasState extends BaseState {
     };
   }
 
+  /**
+   * 从已查询的文档中获取指定类型的数据，避免重复查询数据库
+   * @param {object} doc - 已查询的 blockletExtras 文档
+   * @param {string|string[]} dids - did 数组，第一个是 rootDid，后续是 childDids
+   * @param {string} type - 数据类型，如 'configs' 或 'settings'
+   * @returns {any} 对应类型的数据
+   */
+  getFromDoc({ doc = null, dids = [], name = '' }) {
+    if (!doc || !name || !dids.length) {
+      return null;
+    }
+
+    const extra = this.extras.find((x) => x.name === name);
+    return this._extractFromDoc(doc, dids, extra);
+  }
+
   // CAUTION: setConfig() 方法中非必要 **不要** 传入 [{ name: xxx }], 要传入 [{ key: xxx }]. 前者会导致某些配置被自动删掉
   generateSetFn(extra) {
     return async (dids, data) => {
@@ -271,7 +303,7 @@ class BlockletExtrasState extends BaseState {
   }
 
   getMeta(did) {
-    return super.findOne({ did }, { did: 1, controller: 1, meta: 1 });
+    return this.getExtraByDid(did, { selection: { did: 1, controller: 1, meta: 1 } });
   }
 
   async isLauncherSessionConsumed(sessionId) {

package/lib/states/blocklet.js

@@ -254,6 +254,8 @@ class BlockletState extends BaseState {
     this.defaultPort = config.blockletPort || 5555;
     // @didMap: { [did: string]: metaDid: string }
     this.didMap = new Map();
+    // @didToIdMap: { [did: string]: id: string } - 缓存 did 到 doc.id 的映射，避免重复 $or 查询
+    this.didToIdMap = new Map();
     this.statusLocks = new Map();
 
     // BlockletChildState instance passed from outside
@@ -481,11 +483,23 @@ class BlockletState extends BaseState {
       return null;
     }
 
-    const doc = await this.findOne({ $or: getConditions(did) });
+    // 优先使用缓存的 id 直接查询，避免 $or 查询
+    const cachedId = process.env.NODE_ENV === 'test' ? null : this.didToIdMap.get(did);
+    const doc = await this.findOne(cachedId ? { id: cachedId } : { $or: getConditions(did) });
     if (!doc) {
+      // 如果缓存的 id 查不到，可能是缓存失效，清除并重试
+      if (cachedId) {
+        this.didToIdMap.delete(did);
+        return this.getBlocklet(did, { decryptSk });
+      }
       return null;
     }
 
+    // 缓存 did -> id 映射
+    if (!cachedId && process.env.NODE_ENV !== 'test') {
+      this.didToIdMap.set(did, doc.id);
+    }
+
     // Load children from BlockletChild table
     const children = await this.loadChildren(doc.id);
     doc.children = children;
@@ -560,6 +574,10 @@ class BlockletState extends BaseState {
 
     this.didMap.delete(doc.meta?.did);
     this.didMap.delete(doc.appDid);
+    this.didToIdMap.delete(did);
+    this.didToIdMap.delete(doc.meta?.did);
+    this.didToIdMap.delete(doc.appDid);
+    this.didToIdMap.delete(doc.appPid);
     this.statusLocks.delete(doc.meta?.did);
     this.statusLocks.delete(doc.appDid);
 
@@ -1016,7 +1034,9 @@ class BlockletState extends BaseState {
     await lock.acquire(lockName);
     try {
       const doc = await this.getBlocklet(did);
-
+      if (!doc) {
+        throw new Error(`Blocklet not found: ${did}`);
+      }
       if (doc.meta?.group === BlockletGroup.gateway && !doc.children?.length) {
         const updateData = { status, operator };
         const res = await this.updateBlocklet(did, updateData);
@@ -1090,6 +1110,9 @@ class BlockletState extends BaseState {
       // Recalculate status after children are loaded with updated status
       res.status = getBlockletStatus(res);
       return res;
+    } catch (error) {
+      logger.error('setBlockletStatus failed', { did, status, componentDids, operator, error });
+      throw error;
     } finally {
       await lock.releaseLock(lockName);
     }

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/util/blocklet.js

@@ -14,6 +14,7 @@ const mergeWith = require('lodash/mergeWith');
 const toLower = require('lodash/toLower');
 const isEmpty = require('lodash/isEmpty');
 const omit = require('lodash/omit');
+const pick = require('lodash/pick');
 const streamToPromise = require('stream-to-promise');
 const { Throttle } = require('stream-throttle');
 const { slugify } = require('transliteration');
@@ -1972,9 +1973,19 @@ const _getBlocklet = async ({
     return null;
   }
 
+  // 优化：并行查询独立数据（只查询一次 extraDoc，然后从内存中同步提取）
+  const [extraDoc, nodeInfo, site] = await Promise.all([
+    states.blockletExtras.getExtraByDid(blocklet.meta.did),
+    states.node.read(),
+    states.site.findOneByBlocklet(blocklet.meta.did),
+  ]);
+
+  // 从 extraDoc 中同步提取 settings（不需要再次查询数据库）
+  const extrasMeta = extraDoc ? pick(extraDoc, ['did', 'meta', 'controller']) : null;
+  const settings = states.blockletExtras.getFromDoc({ doc: extraDoc, dids: [blocklet.meta.did], name: 'settings' });
+
   // app settings
   // FIXME: @zhanghan 在 server 开发模式下，使用 `node /workspace/arcblock/blocklet-server/core/cli/tools/dev.js` 运行的 blocklet，blocklet.meta.did 和 blocklet.appPid 是不一致的
-  const settings = await states.blockletExtras.getSettings(blocklet.meta.did);
   blocklet.trustedPassports = get(settings, 'trustedPassports') || [];
   blocklet.trustedFactories = (get(settings, 'trustedFactories') || []).map((x) => {
     if (!x.passport.ttlPolicy) {
@@ -1989,7 +2000,6 @@ const _getBlocklet = async ({
   blocklet.enablePassportIssuance = get(settings, 'enablePassportIssuance', true);
   blocklet.settings = settings || {};
 
-  const extrasMeta = await states.blockletExtras.getMeta(blocklet.meta.did);
   if (extrasMeta) {
     blocklet.controller = extrasMeta.controller;
   }
@@ -2005,8 +2015,6 @@ const _getBlocklet = async ({
     );
   }
 
-  const nodeInfo = await states.node.read();
-
   (nodeInfo?.blockletRegistryList || []).forEach((store) => {
     if (!blocklet.settings.storeList.find((x) => x.url === store.url)) {
       blocklet.settings.storeList.push({
@@ -2016,11 +2024,29 @@ const _getBlocklet = async ({
     }
   });
 
-  blocklet.site = await states.site.findOneByBlocklet(blocklet.meta.did);
+  blocklet.site = site;
   blocklet.enableDocker = nodeInfo.enableDocker;
   blocklet.enableDockerNetwork = nodeInfo.enableDockerNetwork;
 
-  await forEachBlocklet(blocklet, async (component, { id, level, ancestors }) => {
+  // 第一次 forEachBlockletSync：收集所有组件的 dids
+  const componentConfigRequests = [];
+  forEachBlockletSync(blocklet, (component, { ancestors }) => {
+    const dids = [...ancestors.map((x) => x.meta.did), component.meta.did];
+    componentConfigRequests.push({
+      componentDid: component.meta.did,
+      dids,
+    });
+  });
+
+  // 基于缓存文档，为每个组件提取 configs（同步操作，不需要再次查询数据库）
+  const configsMap = new Map();
+  componentConfigRequests.forEach(({ componentDid, dids }) => {
+    const configs = states.blockletExtras.getFromDoc({ doc: extraDoc, dids, name: 'configs' });
+    configsMap.set(componentDid, configs);
+  });
+
+  // 第二次 forEachBlockletSync：填充组件
+  forEachBlockletSync(blocklet, (component, { id, level, ancestors }) => {
     // component env
     try {
       // Validate component has required meta fields for getComponentDirs
@@ -2056,8 +2082,8 @@ const _getBlocklet = async ({
       throw error;
     }
 
-    // component config
-    const configs = await states.blockletExtras.getConfigs([...ancestors.map((x) => x.meta.did), component.meta.did]);
+    // component config - 从预取的 configsMap 中获取
+    const configs = configsMap.get(component.meta.did) || [];
     const rootBlocklet = ancestors.length > 0 ? ancestors[0] : blocklet;
     fillBlockletConfigs(component, configs, { rootBlocklet, nodeInfo, dataDirs });
   });

package/lib/util/docker/create-docker-image.js

@@ -74,10 +74,17 @@ async function buildImage({ image, dockerfile }) {
 const building = {};
 
 async function createDockerImage(data) {
+  const metaDockerInfo = data?.meta?.docker || {};
+  const keys = Object.keys(metaDockerInfo);
+  for (const key of keys) {
+    if (metaDockerInfo[key] === '') {
+      delete metaDockerInfo[key];
+    }
+  }
   const customInfo = getBlockletCustomDockerfile(data);
   if (building[customInfo.image]) {
     await building[customInfo.image];
-    return customInfo;
+    return Object.assign(customInfo, metaDockerInfo);
   }
 
   if (
@@ -94,7 +101,8 @@ async function createDockerImage(data) {
     building[customInfo.image] = buildImage(customInfo);
     await building[customInfo.image];
   }
-  return customInfo;
+
+  return Object.assign(customInfo, metaDockerInfo);
 }
 
 module.exports = {

package/lib/util/docker/parse-docker-options-from-pm2.js

@@ -22,6 +22,7 @@ const checkNeedRunDocker = require('./check-need-run-docker');
 const replaceEnvValue = require('./replace-env-value');
 const parseDockerCpVolume = require('./parse-docker-cp-volume');
 const generateClusterNodeScript = require('./generate-cluster-node-script');
+const { parseTmpfs } = require('./parse-tmpfs');
 
 const getSystemResources = (() => {
   let cachedResources = null;
@@ -86,6 +87,9 @@ async function parseDockerOptionsFromPm2({
     dockerInfo.command = nextOptions.env.DOCKER_CMD;
   }
 
+  const { tmpfs } = dockerInfo;
+  delete dockerInfo.tmpfs;
+
   try {
     dockerCmdValidator(dockerInfo.image);
   } catch (error) {
@@ -102,6 +106,7 @@ async function parseDockerOptionsFromPm2({
   const defaultCpus = '2';
   const defaultMemory = '1.5g';
   const defaultDiskSize = '0g';
+  const defaultTmpfsSize = '4g';
 
   const cpus = isServerless
     ? process.env.ABT_NODE_DOCKER_CPUS
@@ -115,6 +120,12 @@ async function parseDockerOptionsFromPm2({
     ? process.env.ABT_NODE_DOCKER_DISK_SIZE
     : options.env.DOCKER_DISK_SIZE || process.env.ABT_NODE_DOCKER_DISK_SIZE;
 
+  const tmpfsSize = isServerless
+    ? process.env.ABT_NODE_DOCKER_TMPFS_SIZE
+    : options.env.DOCKER_TMPFS_SIZE || process.env.ABT_NODE_DOCKER_TMPFS_SIZE;
+
+  const tmpfsOption = parseTmpfs(tmpfs, tmpfsSize || defaultTmpfsSize);
+
   // Ensure environment variables are properly set within the Docker container
   const envDefaults = {
     BLOCKLET_DOCKER_CPUS: cpus || defaultCpus,
@@ -138,6 +149,7 @@ async function parseDockerOptionsFromPm2({
   dockerEnv.BLOCKLET_DOCKER_CPUS = `${Math.min(Number(dockerEnv.BLOCKLET_DOCKER_CPUS), maxCPUs)}`;
   dockerEnv.BLOCKLET_DOCKER_MEMORY = `${Math.min(Number(dockerEnv.BLOCKLET_DOCKER_MEMORY.replace('g', '')), maxMemory)}g`;
   dockerEnv.BLOCKLET_DOCKER_DISK_SIZE = `${Math.min(Number(dockerEnv.BLOCKLET_DOCKER_DISK_SIZE.replace('g', '')), 20)}g`;
+  dockerEnv.BLOCKLET_DOCKER_TMPFS_SIZE = tmpfsOption.size;
 
   const { baseDir } = dockerInfo;
   const serverDir = process.env.ABT_NODE_DATA_DIR;
@@ -152,6 +164,7 @@ async function parseDockerOptionsFromPm2({
   dockerEnv.BLOCKLET_DATA_DIR = replaceDir(nextOptions.env.BLOCKLET_DATA_DIR);
   dockerEnv.BLOCKLET_LOG_DIR = path.join(baseDir, 'logs');
   dockerEnv.BLOCKLET_CACHE_DIR = path.join(baseDir, 'cache');
+  dockerEnv.BLOCKLET_TMPFS_DIR = tmpfsOption.fullDir;
   dockerEnv.BLOCKLET_APP_SHARE_DIR = replaceDir(nextOptions.env.BLOCKLET_APP_SHARE_DIR);
   dockerEnv.BLOCKLET_SHARE_DIR = replaceDir(nextOptions.env.BLOCKLET_SHARE_DIR);
   dockerEnv.BLOCKLET_HOST = getLocalIPAddress();
@@ -361,6 +374,7 @@ async function parseDockerOptionsFromPm2({
   --memory-swap="${dockerEnv.BLOCKLET_DOCKER_MEMORY}" \
   --oom-kill-disable=false \
   --env-file ${dockerEnvFile} \
+  ${tmpfsOption.tmpfs} \
   ${dockerInfo.network} \
   ${dockerInfo.runParamString || ''} \
   ${dockerInfo.image} ${dockerInfo.command || ''} \

package/lib/util/docker/parse-tmpfs.js

@@ -0,0 +1,92 @@
+const { join } = require('path');
+
+const DEFAULT_MAX_TMPFS_SIZE = '4g';
+
+function parseSize(sizeStr) {
+  if (typeof sizeStr === 'string') {
+    if (sizeStr.endsWith('m')) {
+      return Number(sizeStr.replace('m', ''));
+    }
+    if (sizeStr.endsWith('g')) {
+      return Number(sizeStr.replace('g', '')) * 1024;
+    }
+    // Try to parse as number (assume GB if no unit)
+    return Number(sizeStr) * 1024;
+  }
+  return Number(sizeStr) * 1024;
+}
+
+function parseTmpfs(tmpfs, maxTmpfsSize = DEFAULT_MAX_TMPFS_SIZE, prefixDir = '/') {
+  if (!tmpfs) {
+    return {
+      tmpfs: '',
+      size: '0m',
+      fullDir: '',
+    };
+  }
+  const [fsPath, size] = tmpfs.split(':');
+  if (!fsPath || !size) {
+    return {
+      tmpfs: '',
+      size: '0m',
+      fullDir: '',
+    };
+  }
+
+  const fullDir = join(prefixDir, fsPath);
+  const defaultMaxSizeMb = parseSize(DEFAULT_MAX_TMPFS_SIZE);
+
+  // Parse maxTmpfsSize to a number in MB
+  let maxSizeMb = parseSize(maxTmpfsSize);
+  // Fallback to default if parsing failed (NaN), invalid value, or zero/empty
+  if (Number.isNaN(maxSizeMb) || maxSizeMb <= 0) {
+    maxSizeMb = defaultMaxSizeMb;
+  }
+
+  // Extract size value from various formats:
+  // - "1g" or "512m" (simple size)
+  // - "1g,rw" or "rw,1g" (size with options)
+  // - "size=512m" or "size=1g" (Docker style with size= prefix)
+  // - "size=512m,rw" (Docker style with options)
+  const sizeParts = size.split(',');
+  let sizeValue = '';
+  for (const part of sizeParts) {
+    let trimmed = part.trim();
+    // Handle "size=512m" format - extract the value after "size="
+    if (trimmed.startsWith('size=')) {
+      trimmed = trimmed.slice(5); // Remove "size=" prefix
+    }
+    if (trimmed.endsWith('g') || trimmed.endsWith('m')) {
+      sizeValue = trimmed;
+      break;
+    }
+  }
+
+  let sizeMb = 0;
+  if (sizeValue.endsWith('g')) {
+    const parsed = Number(sizeValue.replace('g', ''));
+    sizeMb = Number.isNaN(parsed) ? 0 : parsed * 1024;
+    sizeMb = Math.min(sizeMb, maxSizeMb);
+  }
+  if (sizeValue.endsWith('m')) {
+    const parsed = Number(sizeValue.replace('m', ''));
+    sizeMb = Number.isNaN(parsed) ? 0 : parsed;
+    sizeMb = Math.min(sizeMb, maxSizeMb);
+  }
+  // Ensure sizeMb is valid
+  if (Number.isNaN(sizeMb) || sizeMb < 0) {
+    sizeMb = 0;
+  }
+  sizeMb = Math.min(sizeMb, maxSizeMb);
+
+  return {
+    tmpfs: `--tmpfs ${fullDir}:size=${sizeMb}m`,
+    size: `${sizeMb}m`,
+    fullDir,
+  };
+}
+
+module.exports = {
+  parseTmpfs,
+  DEFAULT_MAX_TMPFS_SIZE,
+};

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",
+  "version": "1.17.7-beta-20251224-045844-3c7f459a",
   "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",
-    "@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",
+    "@abtnode/analytics": "1.17.7-beta-20251224-045844-3c7f459a",
+    "@abtnode/auth": "1.17.7-beta-20251224-045844-3c7f459a",
+    "@abtnode/certificate-manager": "1.17.7-beta-20251224-045844-3c7f459a",
+    "@abtnode/constant": "1.17.7-beta-20251224-045844-3c7f459a",
+    "@abtnode/cron": "1.17.7-beta-20251224-045844-3c7f459a",
+    "@abtnode/db-cache": "1.17.7-beta-20251224-045844-3c7f459a",
+    "@abtnode/docker-utils": "1.17.7-beta-20251224-045844-3c7f459a",
+    "@abtnode/logger": "1.17.7-beta-20251224-045844-3c7f459a",
+    "@abtnode/models": "1.17.7-beta-20251224-045844-3c7f459a",
+    "@abtnode/queue": "1.17.7-beta-20251224-045844-3c7f459a",
+    "@abtnode/rbac": "1.17.7-beta-20251224-045844-3c7f459a",
+    "@abtnode/router-provider": "1.17.7-beta-20251224-045844-3c7f459a",
+    "@abtnode/static-server": "1.17.7-beta-20251224-045844-3c7f459a",
+    "@abtnode/timemachine": "1.17.7-beta-20251224-045844-3c7f459a",
+    "@abtnode/util": "1.17.7-beta-20251224-045844-3c7f459a",
     "@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",
+    "@blocklet/constant": "1.17.7-beta-20251224-045844-3c7f459a",
     "@blocklet/did-space-js": "^1.2.11",
-    "@blocklet/env": "1.17.6",
+    "@blocklet/env": "1.17.7-beta-20251224-045844-3c7f459a",
     "@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/meta": "1.17.7-beta-20251224-045844-3c7f459a",
+    "@blocklet/resolver": "1.17.7-beta-20251224-045844-3c7f459a",
+    "@blocklet/sdk": "1.17.7-beta-20251224-045844-3c7f459a",
+    "@blocklet/server-js": "1.17.7-beta-20251224-045844-3c7f459a",
+    "@blocklet/store": "1.17.7-beta-20251224-045844-3c7f459a",
     "@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": "3366c1dcc98d15a6ceff0502f65bf809d7880fb4"
+  "gitHead": "e30dc1736187fc9d8136f146badfd5b521af16f2"
 }