@abtnode/core 1.17.5-beta-20251211-104355-426d7eb6 → 1.17.5-beta-20251214-231110-497f8d27

package/lib/api/team.js

@@ -10,6 +10,7 @@ const { joinURL, withoutTrailingSlash } = require('ufo');
 const { Op } = require('sequelize');
 const dayjs = require('@abtnode/util/lib/dayjs');
 const logger = require('@abtnode/logger')('@abtnode/core:api:team');
+const pAll = require('p-all');
 const {
   ROLES,
   genPermissionName,
@@ -287,6 +288,69 @@ class TeamAPI extends EventEmitter {
     const backup = Array.isArray(backups) && backups.length > 0 ? backups[0] : null;
     const appRuntimeInfo = await this.runtimeMonitor.getBlockletRuntimeInfo(teamDid);
 
+    const [traffic, integrations, studio] = await pAll([
+      // 查询最近 30 天的 traffic insights 聚合数据
+      async () => {
+        const endDate = dayjs().format('YYYY-MM-DD');
+        const startDate = dayjs().subtract(30, 'day').format('YYYY-MM-DD');
+        const [totalRequests, failedRequests] = await Promise.all([
+          this.states.trafficInsight.sum('totalRequests', {
+            did: teamDid,
+            date: { [Op.gte]: startDate, [Op.lte]: endDate },
+          }),
+          this.states.trafficInsight.sum('failedRequests', {
+            did: teamDid,
+            date: { [Op.gte]: startDate, [Op.lte]: endDate },
+          }),
+        ]);
+        return {
+          totalRequests: Number(totalRequests || 0),
+          failedRequests: Number(failedRequests || 0),
+        };
+      },
+      // 查询集成资源的数量
+      async () => {
+        const [webhookCount, accessKeyCount, oauthAppCount] = await pAll([
+          async () => {
+            const { webhookEndpointState } = await this.teamManager.getWebhookState(teamDid);
+            return webhookEndpointState.count({});
+          },
+          async () => {
+            const accessKeyState = await this.getAccessKeyState(teamDid);
+            return accessKeyState.count({});
+          },
+          async () => {
+            const { oauthClientState } = await this.teamManager.getOAuthState(teamDid);
+            return oauthClientState.count({});
+          },
+        ]);
+
+        return {
+          webhooks: webhookCount,
+          accessKeys: accessKeyCount,
+          oauthApps: oauthAppCount,
+        };
+      },
+      // 查询 Studio 创建的 Blocklet 数量
+      async () => {
+        try {
+          const { projectState, releaseState } = await this.teamManager.getProjectState(teamDid);
+          const projects = await projectState.getProjects({});
+          const projectIds = projects.map((p) => p.id);
+          const releasesCount =
+            projectIds.length > 0 ? await releaseState.count({ projectId: { [Op.in]: projectIds } }) : 0;
+          return {
+            blocklets: projects.length,
+            releases: releasesCount,
+          };
+        } catch (error) {
+          // 如果项目状态不存在或出错，忽略错误，使用默认值
+          logger.debug('Failed to get studio stats', { error, teamDid });
+          return { blocklets: 0, releases: 0 };
+        }
+      },
+    ]);
+
     return {
       user: {
         users,
@@ -298,6 +362,9 @@ class TeamAPI extends EventEmitter {
       },
       backup,
       appRuntimeInfo,
+      traffic,
+      integrations,
+      studio,
     };
   }
 
@@ -3526,10 +3593,11 @@ class TeamAPI extends EventEmitter {
     if (since && typeof since === 'string') {
       const sinceMatch = since.match(/^(\d+)h$/);
       if (sinceMatch) {
-        const hours = parseInt(sinceMatch[1], 10);
-        if (hours >= 1 && hours <= 24) {
-          startTime = dayjs().subtract(hours, 'hours').toDate();
+        let hours = parseInt(sinceMatch[1], 10);
+        if (hours < 1 || hours > 24) {
+          hours = Math.min(Math.max(hours, 1), 24);
         }
+        startTime = dayjs().subtract(hours, 'hours').toDate();
       }
     }
 

package/lib/blocklet/manager/disk.js

@@ -186,7 +186,6 @@ const {
 const states = require('../../states');
 const BaseBlockletManager = require('./base');
 const { get: getEngine } = require('./engine');
-const blockletPm2Events = require('./pm2-events');
 const runBlockletMigrationScripts = require('../migration');
 const hooks = require('../hooks');
 const { BlockletRuntimeMonitor } = require('../../monitor/blocklet-runtime-monitor');
@@ -269,11 +268,6 @@ const startLock = new DBCache(() => ({
   ...getAbtNodeRedisAndSQLiteUrl(),
 }));
 
-const pm2StatusMap = {
-  online: BlockletStatus.running,
-  stop: BlockletStatus.stopped,
-};
-
 const getWalletAppNotification = async (blocklet, tempBlockletInfo) => {
   let blockletInfo = tempBlockletInfo;
   if (!blockletInfo) {
@@ -334,7 +328,6 @@ class DiskBlockletManager extends BaseBlockletManager {
     checkUpdateQueue,
     reportComponentUsageQueue,
     resendNotificationQueue,
-    daemon = false,
     teamManager,
     nodeAPI,
     teamAPI,
@@ -399,11 +392,6 @@ class DiskBlockletManager extends BaseBlockletManager {
 
     this.configSynchronizer = new ConfigSynchronizer({ manager: this, states });
 
-    if (daemon) {
-      blockletPm2Events.on('online', (data) => this._syncPm2Status('online', data.blockletDid, data.componentDid));
-      blockletPm2Events.on('stop', (data) => this._syncPm2Status('stop', data.blockletDid, data.componentDid));
-    }
-
     if (isFunction(this.checkUpdateQueue?.on)) {
       /**
        *
@@ -914,7 +902,8 @@ class DiskBlockletManager extends BaseBlockletManager {
         }
 
         try {
-          await states.blockletChild.updateChildStatus(parentBlockletId, componentDid, status, false, {
+          await states.blockletChild.updateChildStatus(parentBlockletId, componentDid, {
+            status,
             operator,
           });
 
@@ -3449,7 +3438,7 @@ class DiskBlockletManager extends BaseBlockletManager {
       return x;
     });
 
-    const blueGreenComponentIds = await blueGreenGetComponentIds(oldBlocklet || blocklet, componentDids);
+    const blueGreenComponentIds = blueGreenGetComponentIds(oldBlocklet || blocklet, componentDids);
 
     try {
       if (process.env.ABT_NODE_DISABLE_BLUE_GREEN === 'true' || process.env.ABT_NODE_DISABLE_BLUE_GREEN === '1') {
@@ -4962,20 +4951,6 @@ class DiskBlockletManager extends BaseBlockletManager {
     });
   }
 
-  async _syncPm2Status(pm2Status, did, componentDid) {
-    try {
-      const blocklet = await states.blocklet.getBlocklet(did);
-      const component = findComponentByIdV2(blocklet, componentDid);
-      if (component && util.shouldUpdateBlockletStatus(component.status)) {
-        const newStatus = pm2StatusMap[pm2Status];
-        await states.blocklet.setBlockletStatus(did, newStatus, { componentDids: [componentDid] });
-        logger.info('sync pm2 status to blocklet', { did, componentDid, pm2Status, newStatus });
-      }
-    } catch (error) {
-      logger.error('sync pm2 status to blocklet failed', { did, componentDid, pm2Status, error });
-    }
-  }
-
   /**
    * @param {string} action install, upgrade, installComponent, upgradeComponent
    * @param {string} did

package/lib/blocklet/manager/helper/blue-green-get-componentids.js

@@ -1,7 +1,6 @@
 const { BlockletStatus } = require('../../../states/blocklet');
-const { forEachBlocklet } = require('../../../util/blocklet');
 
-const blueGreenGetComponentIds = async (blocklet, componentDids) => {
+const blueGreenGetComponentIds = (blocklet, componentDids) => {
   if (!blocklet) {
     return {
       componentDids: componentDids || [],
@@ -29,20 +28,16 @@ const blueGreenGetComponentIds = async (blocklet, componentDids) => {
     ];
   }
 
-  await forEachBlocklet(
-    blocklet,
-    (b) => {
-      if (!componentDidsSet.has(b.meta.did)) {
-        return;
-      }
-      if (runningStatuses.has(b.greenStatus)) {
-        greenComponentIds.push(b.meta.did);
-      } else {
-        blueComponentIds.push(b.meta.did);
-      }
-    },
-    { parallel: true, concurrencyLimit: 10 }
-  );
+  for (const b of children) {
+    if (!componentDidsSet.has(b.meta.did)) {
+      continue;
+    }
+    if (runningStatuses.has(b.greenStatus)) {
+      greenComponentIds.push(b.meta.did);
+    } else {
+      blueComponentIds.push(b.meta.did);
+    }
+  }
 
   return [
     {

package/lib/blocklet/manager/helper/blue-green-start-blocklet.js

@@ -73,6 +73,8 @@ const blueGreenStartBlocklet = async (
     throw new Error('No runnable component found');
   }
 
+  blocklet1.children = await states.blocklet.loadChildren(blocklet1.id);
+
   const customerDockerUseVolumeComponentIds = [];
   const otherComponentIds = [];
   await forEachBlockletSync(blocklet1, (b) => {
@@ -86,14 +88,6 @@ const blueGreenStartBlocklet = async (
     }
   });
 
-  if (customerDockerUseVolumeComponentIds.length) {
-    await manager.stop(
-      { did, componentDids: customerDockerUseVolumeComponentIds, updateStatus: false, operator },
-      context
-    );
-    await manager.start({ did, componentDids: customerDockerUseVolumeComponentIds, operator }, context);
-  }
-
   // 分类组件 ID
   const entryComponentIds = [];
   const nonEntryComponentIds = [];
@@ -169,7 +163,7 @@ const blueGreenStartBlocklet = async (
     return;
   }
 
-  const blueGreenComponentIds = await blueGreenGetComponentIds(blocklet1, entryComponentIds);
+  const blueGreenComponentIds = blueGreenGetComponentIds(blocklet1, entryComponentIds);
 
   const startedBlockletDids = [];
   const errorBlockletDids = [];
@@ -216,16 +210,9 @@ const blueGreenStartBlocklet = async (
       };
 
       if (status === BlockletStatus.running) {
-        updates.startedAt = new Date();
-        updates.stoppedAt = null;
-      } else if (status === BlockletStatus.error || status === BlockletStatus.stopped) {
-        updates.stoppedAt = new Date();
-      }
-
-      await states.blockletChild.updateChildStatus(appId, componentDid, status, isGreen, updates);
-
-      if (status === BlockletStatus.running) {
-        await states.blockletChild.updateChildStatus(appId, componentDid, BlockletStatus.stopped, !isGreen, updates);
+        await states.blockletChild.updateChildStatusRunning(appId, componentDid, isGreen, updates);
+      } else {
+        await states.blockletChild.updateChildStatusError(appId, componentDid, isGreen, updates);
       }
 
       // Get latest children from blocklet_children table and emit events immediately
@@ -285,6 +272,14 @@ const blueGreenStartBlocklet = async (
     });
   }
 
+  if (customerDockerUseVolumeComponentIds.length) {
+    await manager.stop(
+      { did, componentDids: customerDockerUseVolumeComponentIds, updateStatus: false, operator },
+      context
+    );
+    await manager.start({ did, componentDids: customerDockerUseVolumeComponentIds, operator }, context);
+  }
+
   const nextBlocklet = await manager.ensureBlocklet(did, { e2eMode });
 
   manager.emit(BlockletEvents.statusChange, nextBlocklet);
@@ -368,7 +363,12 @@ const blueGreenStartBlocklet = async (
           // Update status immediately
           await updateChildStatusImmediately(subDid, BlockletStatus.running, item.changeToGreen);
 
-          await manager.deleteProcess({ did, componentDids: [subDid], isGreen: !item.changeToGreen });
+          await manager.deleteProcess({
+            did,
+            componentDids: [subDid],
+            isGreen: !item.changeToGreen,
+            shouldUpdateBlockletStatus: false,
+          });
 
           logger.info('Green environment started successfully', {
             did,
@@ -385,7 +385,12 @@ const blueGreenStartBlocklet = async (
           await updateChildStatusImmediately(subDid, BlockletStatus.error, item.changeToGreen);
 
           try {
-            await manager.deleteProcess({ did, componentDids: [subDid], isGreen: item.changeToGreen });
+            await manager.deleteProcess({
+              did,
+              componentDids: [subDid],
+              isGreen: item.changeToGreen,
+              shouldUpdateBlockletStatus: false,
+            });
           } catch (cleanupError) {
             logger.error('Failed to cleanup green environment', { cleanupError });
           }
@@ -396,7 +401,7 @@ const blueGreenStartBlocklet = async (
 
   await pAll(tasks, { concurrency: 6 });
 
-  const lastBlocklet = await manager.ensureBlocklet(did, { e2eMode });
+  const lastBlocklet = await manager.getBlocklet(did, { e2eMode });
   let errorDescription = '';
 
   // 处理启动失败的组件
@@ -441,8 +446,9 @@ const blueGreenStartBlocklet = async (
 
   // 根据情况更新 route table， 会判断只有包含多 interfaces 的 DID 才会更新 route table
   if (!['true', '1'].includes(process.env.ABT_NODE_DISABLE_BLUE_GREEN)) {
+    const latestBlocklet = await manager.getBlocklet(did, { e2eMode });
     manager.emit(BlockletEvents.blurOrGreenStarted, {
-      blocklet: lastBlocklet,
+      blocklet: latestBlocklet,
       componentDids,
       context,
     });

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.4","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.4","@abtnode/auth":"1.17.4","@abtnode/certificate-manager":"1.17.4","@abtnode/constant":"1.17.4","@abtnode/cron":"1.17.4","@abtnode/db-cache":"1.17.4","@abtnode/docker-utils":"1.17.4","@abtnode/logger":"1.17.4","@abtnode/models":"1.17.4","@abtnode/queue":"1.17.4","@abtnode/rbac":"1.17.4","@abtnode/router-provider":"1.17.4","@abtnode/static-server":"1.17.4","@abtnode/timemachine":"1.17.4","@abtnode/util":"1.17.4","@aigne/aigne-hub":"^0.10.10","@arcblock/did":"^1.27.12","@arcblock/did-connect-js":"^1.27.12","@arcblock/did-ext":"^1.27.12","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"^1.27.12","@arcblock/event-hub":"^1.27.12","@arcblock/jwt":"^1.27.12","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"^1.27.12","@arcblock/vc":"^1.27.12","@blocklet/constant":"1.17.4","@blocklet/did-space-js":"^1.2.6","@blocklet/env":"1.17.4","@blocklet/error":"^0.3.3","@blocklet/meta":"1.17.4","@blocklet/resolver":"1.17.4","@blocklet/sdk":"1.17.4","@blocklet/server-js":"1.17.4","@blocklet/store":"1.17.4","@blocklet/theme":"^3.2.11","@fidm/x509":"^1.2.1","@ocap/mcrypto":"^1.27.12","@ocap/util":"^1.27.12","@ocap/wallet":"^1.27.12","@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.4","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.4","@abtnode/auth":"1.17.4","@abtnode/certificate-manager":"1.17.4","@abtnode/constant":"1.17.4","@abtnode/cron":"1.17.4","@abtnode/db-cache":"1.17.4","@abtnode/docker-utils":"1.17.4","@abtnode/logger":"1.17.4","@abtnode/models":"1.17.4","@abtnode/queue":"1.17.4","@abtnode/rbac":"1.17.4","@abtnode/router-provider":"1.17.4","@abtnode/static-server":"1.17.4","@abtnode/timemachine":"1.17.4","@abtnode/util":"1.17.4","@aigne/aigne-hub":"^0.10.14","@arcblock/did":"^1.27.14","@arcblock/did-connect-js":"^1.27.14","@arcblock/did-ext":"^1.27.14","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"^1.27.14","@arcblock/event-hub":"^1.27.14","@arcblock/jwt":"^1.27.14","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"^1.27.14","@arcblock/vc":"^1.27.14","@blocklet/constant":"1.17.4","@blocklet/did-space-js":"^1.2.9","@blocklet/env":"1.17.4","@blocklet/error":"^0.3.4","@blocklet/meta":"1.17.4","@blocklet/resolver":"1.17.4","@blocklet/sdk":"1.17.4","@blocklet/server-js":"1.17.4","@blocklet/store":"1.17.4","@blocklet/theme":"^3.2.13","@fidm/x509":"^1.2.1","@ocap/mcrypto":"^1.27.14","@ocap/util":"^1.27.14","@ocap/wallet":"^1.27.14","@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/states/audit-log.js

@@ -11,6 +11,7 @@ const isString = require('lodash/isString');
 const mapValues = require('lodash/mapValues');
 const map = require('lodash/map');
 const omit = require('lodash/omit');
+const { Joi } = require('@arcblock/validator');
 const { joinURL } = require('ufo');
 const { Op } = require('sequelize');
 const { getDisplayName } = require('@blocklet/meta/lib/util');
@@ -22,6 +23,8 @@ const BaseState = require('./base');
 const { parse } = require('../util/ua');
 const { getScope } = require('../util/audit-log');
 
+const emailSchema = Joi.string().email().required();
+
 const getServerInfo = (info) =>
   `[${info.name}](${joinURL(process.env.NODE_ENV === 'production' ? info.routing.adminPath : '', '/settings/about')})`;
 /**
@@ -232,15 +235,26 @@ const getTaggingInfo = async (args, node, info) => {
 /**
  * 隐藏私密信息，主要字段有
  * 1. email
+ * 2. password
  */
-const hidePrivateInfo = (result) => {
-  const emailRegex =
-    /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/;
+const hidePrivateInfo = (result, fields = []) => {
+  // 默认需要隐藏的字段（不区分大小写匹配）
+  const defaultFields = ['email', 'password'];
+  // 合并默认字段和自定义字段
+  const sensitiveFields = [...defaultFields, ...fields].map((f) => f.toLowerCase());
+
+  // 检查字段名是否需要隐藏
+  const isSensitiveField = (key) => {
+    if (!key) return false;
+    const lowerKey = key.toLowerCase();
+    return sensitiveFields.some((field) => lowerKey.includes(field));
+  };
 
   const processValue = (value, key) => {
-    // 如果字段名包含 email 或值是邮箱格式，则隐藏
-    if ((key && /email/i.test(key)) || (isString(value) && emailRegex.test(value))) {
-      return '***';
+    // 如果字段名匹配敏感字段，则隐藏
+    // 使用反引号包裹，以代码样式显示星号，避免被 Markdown 渲染为加粗/斜体
+    if (isSensitiveField(key) || (isString(value) && !emailSchema.validate(value).error)) {
+      return '`***`';
     }
 
     // 递归处理对象
@@ -351,8 +365,19 @@ const getLogContent = async (action, args, context, result, info, node) => {
       return `blocklet ${getBlockletInfo(result, info)} audit federated login member ${args.memberPid} with status: ${
         args.status
       }`;
-    case 'configNotification':
-      return `updated following notification setting: ${args.notification}`;
+    case 'configNotification': {
+      const { notification } = args;
+      const notificationObject = JSON.parse(notification || '{}');
+      const resultObj = {};
+      if (notificationObject.email) {
+        resultObj.email = hidePrivateInfo(notificationObject.email, ['from', 'host', 'password']);
+      }
+      if (notificationObject.push) {
+        resultObj.push = hidePrivateInfo(notificationObject.push);
+      }
+
+      return `updated following notification setting: ${JSON.stringify(resultObj)}`;
+    }
     case 'updateComponentTitle':
       return `update component title to **${args.title}**`;
     case 'updateComponentMountPoint':
@@ -1031,7 +1056,7 @@ class AuditLogState extends BaseState {
           componentDid: context?.user?.componentDid || null,
         });
 
-        logger.info('create', data);
+        logger.info('create', { action, userDid: actor.did, componentDid: context?.user?.componentDid || null });
         return resolve(data);
       } catch (err) {
         logger.error('create error', { error: err, action, args, context });

package/lib/states/blocklet-child.js

@@ -35,30 +35,109 @@ class BlockletChildState extends BaseState {
     return this.remove({ parentBlockletId });
   }
 
+  async updateChildStatusRunning(parentBlockletId, childDid, isGreen, additionalUpdates = {}) {
+    const now = new Date();
+    const baseUpdates = {
+      ...additionalUpdates,
+      updatedAt: now,
+      startedAt: now,
+      stoppedAt: null,
+    };
+
+    if (isGreen) {
+      // 绿环境启动成功 -> 绿 running，蓝 stopped
+      await this.update(
+        { parentBlockletId, childDid },
+        {
+          $set: {
+            ...baseUpdates,
+            greenStatus: BlockletStatus.running,
+            status: BlockletStatus.stopped,
+          },
+        }
+      );
+    } else {
+      // 蓝环境启动成功 -> 蓝 running，绿 stopped
+      await this.update(
+        { parentBlockletId, childDid },
+        {
+          $set: {
+            ...baseUpdates,
+            greenStatus: BlockletStatus.stopped,
+            status: BlockletStatus.running,
+          },
+        }
+      );
+    }
+  }
+
+  async updateChildStatusError(parentBlockletId, childDid, isGreen, additionalUpdates = {}) {
+    const now = new Date();
+    const baseUpdates = {
+      ...additionalUpdates,
+      updatedAt: now,
+    };
+
+    if (isGreen) {
+      // 绿环境启动失败
+      await this.update(
+        { parentBlockletId, childDid },
+        {
+          $set: {
+            ...baseUpdates,
+            greenStatus: BlockletStatus.error,
+          },
+        }
+      );
+    } else {
+      // 蓝环境启动失败
+      await this.update(
+        { parentBlockletId, childDid },
+        {
+          $set: {
+            ...baseUpdates,
+            status: BlockletStatus.error,
+          },
+        }
+      );
+    }
+  }
+
   /**
-   * Update child status by parent blocklet ID and child DID
+   * Update child status only (without overwriting other fields)
+   * Used by setBlockletStatus to avoid race conditions in multi-process environments
    * @param {string} parentBlockletId - The parent blocklet ID
    * @param {string} childDid - The child DID
-   * @param {number} status - The status to set
-   * @param {Object} additionalFields - Additional fields to update
-   * @param {boolean} isGreen - Whether the child is green
+   * @param {Object} options - Update options
+   * @param {number} options.status - The blue status to set
+   * @param {number} options.greenStatus - The green status to set
+   * @param {boolean} options.isGreen - Whether to update green status
+   * @param {boolean} options.isGreenAndBlue - Whether to update both statuses
+   * @param {string} options.operator - The operator
    * @returns {Promise<Object>} - Updated child
    */
-  async updateChildStatus(parentBlockletId, childDid, status, isGreen = false, additionalFields = {}) {
-    if (!parentBlockletId) {
-      return null;
-    }
-    const children = await this.getChildrenByParentId(parentBlockletId);
-    const child = children.find((c) => c.childDid === childDid);
-
-    if (!child) {
+  async updateChildStatus(
+    parentBlockletId,
+    childDid,
+    { status, isGreen = false, isGreenAndBlue = false, operator } = {}
+  ) {
+    if (!parentBlockletId || !childDid) {
       return null;
     }
 
     const updates = {
-      ...additionalFields,
+      updatedAt: new Date(),
+      inProgressStart: Date.now(),
     };
-    if (isGreen) {
+
+    if (operator) {
+      updates.operator = operator;
+    }
+
+    if (isGreenAndBlue) {
+      updates.status = status;
+      updates.greenStatus = status;
+    } else if (isGreen) {
       updates.greenStatus = status;
     } else {
       updates.status = status;
@@ -72,47 +151,42 @@ class BlockletChildState extends BaseState {
       updates.stoppedAt = new Date();
     }
 
-    const [, [updated]] = await this.update({ id: child.id }, { $set: updates });
+    const [, [updated]] = await this.update({ parentBlockletId, childDid }, { $set: updates });
     return updated;
   }
 
   /**
-   * Batch update children status
+   * Update child ports only (without affecting status fields)
+   * Used by refreshBlockletPorts to avoid overwriting status during concurrent operations
    * @param {string} parentBlockletId - The parent blocklet ID
-   * @param {Array<string>} childDids - Array of child DIDs to update
-   * @param {number} status - The status to set
-   * @param {Object} additionalFields - Additional fields to update
-   * @returns {Promise<Array>} - Updated children
+   * @param {string} childDid - The child DID
+   * @param {Object} ports - The ports to set (for blue environment)
+   * @param {Object} greenPorts - The green ports to set (for green environment)
+   * @returns {Promise<Object>} - Updated child
    */
-  async batchUpdateChildrenStatus(parentBlockletId, childDids, status, additionalFields = {}) {
-    if (!parentBlockletId) {
-      return [];
+  async updateChildPorts(parentBlockletId, childDid, { ports, greenPorts } = {}) {
+    if (!parentBlockletId || !childDid) {
+      return null;
     }
-    const children = await this.getChildrenByParentId(parentBlockletId);
-    const updates = [];
-
-    for (const child of children) {
-      if (childDids.includes(child.childDid)) {
-        const childUpdates = {
-          status,
-          ...additionalFields,
-        };
-
-        if (status === BlockletStatus.running) {
-          childUpdates.startedAt = new Date();
-          childUpdates.stoppedAt = null;
-        } else if (status === BlockletStatus.stopped) {
-          childUpdates.startedAt = null;
-          childUpdates.stoppedAt = new Date();
-        }
 
-        // eslint-disable-next-line no-await-in-loop
-        await this.update({ id: child.id }, { $set: childUpdates });
-        updates.push({ ...child, ...childUpdates });
-      }
+    const updates = {
+      updatedAt: new Date(),
+    };
+
+    if (ports !== undefined) {
+      updates.ports = ports;
+    }
+    if (greenPorts !== undefined) {
+      updates.greenPorts = greenPorts;
     }
 
-    return updates;
+    // Only update if there's something to update
+    if (Object.keys(updates).length <= 1) {
+      return null;
+    }
+
+    const [, [updated]] = await this.update({ parentBlockletId, childDid }, { $set: updates });
+    return updated;
   }
 }
 

package/lib/states/blocklet-extras.js

@@ -5,12 +5,20 @@ const logger = require('@abtnode/logger')('@abtnode/core:states:blocklet-extras'
 const camelCase = require('lodash/camelCase');
 const get = require('lodash/get');
 const { CustomError } = require('@blocklet/error');
+const security = require('@abtnode/util/lib/security');
+const cloneDeep = require('@abtnode/util/lib/deep-clone');
 
 const BaseState = require('./base');
 
 const { mergeConfigs, parseConfigs, encryptConfigs } = require('../blocklet/extras');
 const { validateAddMeta } = require('../validators/blocklet-extra');
 
+// settings 中需要加密的字段路径
+const SETTINGS_SECURE_FIELDS = ['notification.email.password'];
+
+// 加密数据的前缀标记，用于识别数据是否已加密
+const ENCRYPTED_PREFIX = 'ENC:';
+
 const noop = (k) => (v) => v[k];
 
 /**
@@ -31,15 +39,69 @@ class BlockletExtrasState extends BaseState {
       // setting
       {
         name: 'settings',
-        beforeSet: ({ old, cur }) => {
+        beforeSet: ({ old, cur, did, dek }) => {
           const merged = { ...old, ...cur };
           Object.keys(merged).forEach((key) => {
             if (merged[key] === undefined || merged[key] === null) {
               delete merged[key];
             }
           });
+
+          // 对敏感字段进行加密
+          const enableSecurity = dek && did;
+          if (enableSecurity) {
+            SETTINGS_SECURE_FIELDS.forEach((fieldPath) => {
+              const value = get(merged, fieldPath);
+              // 只加密 cur 中传入的新值，避免重复加密已存储的旧值
+              const newValue = get(cur, fieldPath);
+              if (newValue !== undefined && value) {
+                const keys = fieldPath.split('.');
+                let target = merged;
+                for (let i = 0; i < keys.length - 1; i++) {
+                  target = target[keys[i]];
+                }
+                // 添加前缀标记，用于识别已加密的数据
+                const encrypted = ENCRYPTED_PREFIX + security.encrypt(String(value), did, dek);
+                target[keys[keys.length - 1]] = encrypted;
+              }
+            });
+          }
+
           return merged;
         },
+        afterGet: ({ data, did, dek }) => {
+          if (!data) {
+            return data;
+          }
+
+          // 对敏感字段进行解密
+          const enableSecurity = dek && did;
+          if (enableSecurity) {
+            const result = cloneDeep(data);
+            SETTINGS_SECURE_FIELDS.forEach((fieldPath) => {
+              const value = get(result, fieldPath);
+              // 只有带有加密前缀的数据才需要解密，未加密的历史数据保持原值
+              if (value && typeof value === 'string' && value.startsWith(ENCRYPTED_PREFIX)) {
+                try {
+                  const keys = fieldPath.split('.');
+                  let target = result;
+                  for (let i = 0; i < keys.length - 1; i++) {
+                    target = target[keys[i]];
+                  }
+                  // 去掉前缀后解密
+                  const encryptedValue = value.slice(ENCRYPTED_PREFIX.length);
+                  target[keys[keys.length - 1]] = security.decrypt(encryptedValue, did, dek);
+                } catch {
+                  // 解密失败，保持原值（去掉前缀）
+                  logger.warn('Failed to decrypt settings field', { fieldPath });
+                }
+              }
+            });
+            return result;
+          }
+
+          return data;
+        },
       },
     ];
 

package/lib/states/blocklet.js

@@ -300,6 +300,7 @@ class BlockletState extends BaseState {
         mode: child.mode || 'production',
         status: child.status || 0,
         ports: child.ports || {},
+        environments: child.environments || [],
         children: child.children || [],
         migratedFrom: child.migratedFrom || [],
         installedAt: child.installedAt,
@@ -384,12 +385,11 @@ class BlockletState extends BaseState {
       if (child.deployedFrom !== undefined) updates.deployedFrom = child.deployedFrom;
       if (child.mode !== undefined) updates.mode = child.mode;
       if (child.ports !== undefined) updates.ports = child.ports;
-      if (child.children !== undefined) updates.children = child.children || [];
-      if (child.migratedFrom !== undefined) updates.migratedFrom = child.migratedFrom;
+      if (child.environments !== undefined) updates.environments = child.environments;
 
       // Only update status-related fields if explicitly provided
       if (child.status !== undefined) updates.status = child.status;
-      if (child.installedAt !== undefined) updates.installedAt = child.installedAt;
+      // Note: installedAt should only be set on first install, never updated
       if (child.startedAt !== undefined) updates.startedAt = child.startedAt;
       if (child.stoppedAt !== undefined) updates.stoppedAt = child.stoppedAt;
       if (child.pausedAt !== undefined) updates.pausedAt = child.pausedAt;
@@ -418,9 +418,8 @@ class BlockletState extends BaseState {
             mode: child.mode || 'production',
             status: child.status || 0,
             ports: child.ports || {},
-            children: child.children || [],
-            migratedFrom: child.migratedFrom || [],
-            installedAt: child.installedAt,
+            environments: child.environments || [],
+            installedAt: new Date(),
             startedAt: child.startedAt,
             stoppedAt: child.stoppedAt,
             pausedAt: child.pausedAt,
@@ -865,8 +864,17 @@ class BlockletState extends BaseState {
     if (actuallyRefreshedDids.length > 0) {
       await this.updateBlocklet(did, {});
 
-      // Save updated children to BlockletChild table
-      await this.saveChildren(blocklet.id, blocklet.meta.did, blocklet.children);
+      // Only update ports/greenPorts to avoid overwriting status during concurrent operations
+      if (this.BlockletChildState) {
+        for (const component of blocklet.children) {
+          if (actuallyRefreshedDids.includes(component.meta?.did)) {
+            await this.BlockletChildState.updateChildPorts(blocklet.id, component.meta.did, {
+              ports: component.ports,
+              greenPorts: component.greenPorts,
+            });
+          }
+        }
+      }
     }
 
     return {
@@ -986,6 +994,8 @@ class BlockletState extends BaseState {
         return res;
       }
 
+      // Collect components to update
+      const componentsToUpdate = [];
       for (const component of doc.children || []) {
         if (component.meta.group === BlockletGroup.gateway) {
           continue;
@@ -995,6 +1005,9 @@ class BlockletState extends BaseState {
           continue;
         }
 
+        componentsToUpdate.push(component.meta.did);
+
+        // Update in-memory for return value
         component[isGreen ? 'greenStatus' : 'status'] = status;
         if (isGreenAndBlue) {
           component.greenStatus = status;
@@ -1020,11 +1033,26 @@ class BlockletState extends BaseState {
         updateData.status = status;
       }
 
-      updateData.children = doc.children;
-
+      // Update blocklet without children to avoid overwriting status during concurrent operations
       const res = await this.updateBlocklet(did, updateData);
 
-      res.children = doc.children;
+      // Update each component's status individually using BlockletChildState
+      if (this.BlockletChildState && componentsToUpdate.length > 0) {
+        for (const componentDid of componentsToUpdate) {
+          await this.BlockletChildState.updateChildStatus(doc.id, componentDid, {
+            status,
+            isGreen,
+            isGreenAndBlue,
+            operator,
+          });
+        }
+      }
+
+      const children = await this.loadChildren(doc.id);
+
+      res.children = children;
+      // Recalculate status after children are loaded with updated status
+      res.status = getBlockletStatus(res);
       return res;
     } finally {
       await lock.releaseLock(lockName);

package/lib/states/notification.js

@@ -965,11 +965,13 @@ class NotificationState extends BaseState {
       throw new Error('Invalid since format. Expected format: "1h", "2h", "24h", etc.');
     }
 
-    const hours = parseInt(sinceMatch[1], 10);
+    let hours = parseInt(sinceMatch[1], 10);
 
     // 验证范围：最小 1h，最大 24h
     if (hours < 1 || hours > 24) {
-      throw new Error('The since parameter must be between 1h and 24h.');
+      logger.warn('The since parameter must be between 1h and 24h.');
+      // 限制 hours 在 1-24 范围内
+      hours = Math.min(Math.max(hours, 1), 24);
     }
 
     // 计算时间范围

package/lib/util/blocklet.js

@@ -1892,6 +1892,7 @@ const formatBlockletTheme = (rawTheme) => {
       themeConfig = {
         ...concept.themeConfig,
         prefer: concept.prefer,
+        name: concept.name,
       };
     } else {
       // 兼容旧数据
@@ -1900,6 +1901,7 @@ const formatBlockletTheme = (rawTheme) => {
         dark: rawTheme.dark || {},
         common: rawTheme.common || {},
         prefer: rawTheme.prefer || 'system',
+        name: rawTheme.name || 'Default',
       };
     }
   }

package/lib/util/migration-sqlite-to-postgres.js

@@ -14,6 +14,105 @@ const notCheckPrimaryKeyTableNames = new Set(['tagging']);
 
 const needBreakErrors = [];
 
+/**
+ * Generate a unique ID for blocklet_children records
+ */
+function generateChildId() {
+  return `${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
+}
+
+/**
+ * 因为删除了表字段，所以需要单独处理，不然 migrate 有旧的 children 数据会失败
+ * @param {object} params - Parameters
+ * @param {Sequelize} params.pgDb - PostgreSQL database connection
+ * @param {string} params.blockletId - Parent blocklet ID
+ * @param {string} params.parentBlockletDid - Parent blocklet DID
+ * @param {Array} params.children - Children array to migrate
+ */
+async function migrateBlockletChildrenToTable({ pgDb, blockletId, parentBlockletDid, children }) {
+  if (!Array.isArray(children) || children.length === 0) {
+    return;
+  }
+
+  for (const child of children) {
+    const childMeta = child?.meta || {};
+    const childDid = childMeta?.did;
+
+    if (!childDid) {
+      console.warn(`   ⚠️ Child in blocklet ${blockletId} has no meta.did, skipping`);
+      continue;
+    }
+
+    try {
+      // Check if child already exists
+      const [existing] = await pgDb.query(
+        'SELECT id FROM blocklet_children WHERE "parentBlockletId" = $1 AND "childDid" = $2 LIMIT 1',
+        { bind: [blockletId, childDid], type: QueryTypes.SELECT }
+      );
+
+      if (existing) {
+        console.log(`   ℹ️ Child ${childDid} already exists for blocklet ${blockletId}, skipping`);
+        continue;
+      }
+
+      // Insert child record
+      const insertSQL = `
+        INSERT INTO blocklet_children (
+          id, "parentBlockletId", "parentBlockletDid", "childDid", "mountPoint",
+          meta, "bundleSource", source, "deployedFrom", mode, status,
+          ports, environments, "installedAt", "startedAt",
+          "stoppedAt", "pausedAt", operator, "inProgressStart", "greenStatus",
+          "greenPorts", "createdAt", "updatedAt"
+        ) VALUES (
+          $1, $2, $3, $4, $5,
+          $6::jsonb, $7::jsonb, $8, $9, $10, $11,
+          $12::jsonb, $13::jsonb, $14, $15,
+          $16, $17, $18, $19, $20,
+          $21::jsonb, $22, $23
+        )
+        ON CONFLICT DO NOTHING
+      `;
+
+      const now = new Date();
+      const bindValues = [
+        generateChildId(), // id
+        blockletId, // parentBlockletId
+        parentBlockletDid, // parentBlockletDid
+        childDid, // childDid
+        child.mountPoint || null, // mountPoint
+        JSON.stringify(child.meta || {}), // meta
+        JSON.stringify(child.bundleSource || {}), // bundleSource
+        child.source || 0, // source
+        child.deployedFrom || '', // deployedFrom
+        child.mode || 'production', // mode
+        child.status || 0, // status
+        JSON.stringify(child.ports || {}), // ports
+        JSON.stringify(child.environments || []), // environments
+        child.installedAt || null, // installedAt
+        child.startedAt || null, // startedAt
+        child.stoppedAt || null, // stoppedAt
+        child.pausedAt || null, // pausedAt
+        child.operator || null, // operator
+        child.inProgressStart || null, // inProgressStart
+        child.greenStatus || null, // greenStatus
+        child.greenPorts ? JSON.stringify(child.greenPorts) : null, // greenPorts
+        now, // createdAt
+        now, // updatedAt
+      ];
+
+      await pgDb.query(insertSQL, { bind: bindValues });
+      console.log(`   ✅ Migrated child ${childDid} to blocklet_children table`);
+    } catch (err) {
+      // Ignore unique constraint errors
+      if (err.name === 'SequelizeUniqueConstraintError' || err.message?.includes('UNIQUE constraint')) {
+        console.log(`   ℹ️ Child ${childDid} already exists (unique constraint), skipping`);
+        continue;
+      }
+      console.error(`   ❌ Failed to migrate child ${childDid}:`, err.message);
+    }
+  }
+}
+
 function sortTableNames(tableNames, sort) {
   return [...tableNames].sort((a, b) => {
     const indexA = sort.indexOf(a);
@@ -50,7 +149,8 @@ async function migrateAllTablesNoModels(dbPath) {
     .filter((name) => !/^(sqlite|sequelize)/.test(name.toLowerCase()) && name !== 'runtime_insights');
 
   // 把 tableNames 排序, 把被依赖的表放前面
-  tableNames = sortTableNames(tableNames, ['users', 'notification_receivers']);
+  // blocklet_children 需要在 blocklets 之前处理，因为 blocklets 的 children 字段需要迁移到 blocklet_children 表
+  tableNames = sortTableNames(tableNames, ['users', 'notification_receivers', 'blocklet_children', 'blocklets']);
 
   for (const tableName of tableNames) {
     console.log(`\n➡️ Starting migration for table: ${dbPath} ${tableName}`);
@@ -71,6 +171,14 @@ async function migrateAllTablesNoModels(dbPath) {
     if (dbPath.includes('server.db') && tableName === 'blocklets') {
       allCols = allCols.filter((c) => c !== 'controller');
     }
+
+    // 删除 blocklets 表中的 children 列, 因为 children 已经拆分到 blocklet_children 表
+    // children 数据会在迁移过程中单独处理
+    const hasChildrenColumn = tableName === 'blocklets' && sqliteSchema.children;
+    if (hasChildrenColumn) {
+      allCols = allCols.filter((c) => c !== 'children');
+      console.log('   ℹ️ Detected children column in blocklets table, will migrate to blocklet_children table');
+    }
     let pkCols = allCols.filter((c) => sqliteSchema[c].primaryKey);
     if (!pkCols.length) {
       pkCols = [allCols[0]];
@@ -167,6 +275,59 @@ async function migrateAllTablesNoModels(dbPath) {
       console.log(`   Migrating rows ${offset + 1}-${offset + rows.length}`);
 
       for (const row of rows) {
+        // Handle children migration for blocklets table
+        if (hasChildrenColumn && row.children) {
+          try {
+            let children = row.children;
+            if (typeof children === 'string') {
+              try {
+                children = JSON.parse(children);
+              } catch {
+                children = null;
+              }
+            } else if (Buffer.isBuffer(children)) {
+              try {
+                children = JSON.parse(children.toString('utf8'));
+              } catch {
+                children = null;
+              }
+            }
+
+            if (Array.isArray(children) && children.length > 0) {
+              // Get parent blocklet DID from meta
+              let meta = row.meta;
+              if (typeof meta === 'string') {
+                try {
+                  meta = JSON.parse(meta);
+                } catch {
+                  meta = {};
+                }
+              } else if (Buffer.isBuffer(meta)) {
+                try {
+                  meta = JSON.parse(meta.toString('utf8'));
+                } catch {
+                  meta = {};
+                }
+              }
+
+              const parentBlockletDid = meta?.did;
+              if (parentBlockletDid) {
+                console.log(`   🔄 Migrating ${children.length} children for blocklet ${row.id}`);
+                await migrateBlockletChildrenToTable({
+                  pgDb,
+                  blockletId: row.id,
+                  parentBlockletDid,
+                  children,
+                });
+              } else {
+                console.warn(`   ⚠️ Blocklet ${row.id} has no meta.did, skipping children migration`);
+              }
+            }
+          } catch (err) {
+            console.error(`   ❌ Failed to migrate children for blocklet ${row.id}:`, err.message);
+          }
+        }
+
         // Fix invalid date values for all DATE/TIMESTAMP columns
         for (const dateCol of dateCols) {
           if (row[dateCol] != null) {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.5-beta-20251211-104355-426d7eb6",
+  "version": "1.17.5-beta-20251214-231110-497f8d27",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -17,46 +17,46 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.17.5-beta-20251211-104355-426d7eb6",
-    "@abtnode/auth": "1.17.5-beta-20251211-104355-426d7eb6",
-    "@abtnode/certificate-manager": "1.17.5-beta-20251211-104355-426d7eb6",
-    "@abtnode/constant": "1.17.5-beta-20251211-104355-426d7eb6",
-    "@abtnode/cron": "1.17.5-beta-20251211-104355-426d7eb6",
-    "@abtnode/db-cache": "1.17.5-beta-20251211-104355-426d7eb6",
-    "@abtnode/docker-utils": "1.17.5-beta-20251211-104355-426d7eb6",
-    "@abtnode/logger": "1.17.5-beta-20251211-104355-426d7eb6",
-    "@abtnode/models": "1.17.5-beta-20251211-104355-426d7eb6",
-    "@abtnode/queue": "1.17.5-beta-20251211-104355-426d7eb6",
-    "@abtnode/rbac": "1.17.5-beta-20251211-104355-426d7eb6",
-    "@abtnode/router-provider": "1.17.5-beta-20251211-104355-426d7eb6",
-    "@abtnode/static-server": "1.17.5-beta-20251211-104355-426d7eb6",
-    "@abtnode/timemachine": "1.17.5-beta-20251211-104355-426d7eb6",
-    "@abtnode/util": "1.17.5-beta-20251211-104355-426d7eb6",
-    "@aigne/aigne-hub": "^0.10.10",
-    "@arcblock/did": "^1.27.12",
-    "@arcblock/did-connect-js": "^1.27.12",
-    "@arcblock/did-ext": "^1.27.12",
+    "@abtnode/analytics": "1.17.5-beta-20251214-231110-497f8d27",
+    "@abtnode/auth": "1.17.5-beta-20251214-231110-497f8d27",
+    "@abtnode/certificate-manager": "1.17.5-beta-20251214-231110-497f8d27",
+    "@abtnode/constant": "1.17.5-beta-20251214-231110-497f8d27",
+    "@abtnode/cron": "1.17.5-beta-20251214-231110-497f8d27",
+    "@abtnode/db-cache": "1.17.5-beta-20251214-231110-497f8d27",
+    "@abtnode/docker-utils": "1.17.5-beta-20251214-231110-497f8d27",
+    "@abtnode/logger": "1.17.5-beta-20251214-231110-497f8d27",
+    "@abtnode/models": "1.17.5-beta-20251214-231110-497f8d27",
+    "@abtnode/queue": "1.17.5-beta-20251214-231110-497f8d27",
+    "@abtnode/rbac": "1.17.5-beta-20251214-231110-497f8d27",
+    "@abtnode/router-provider": "1.17.5-beta-20251214-231110-497f8d27",
+    "@abtnode/static-server": "1.17.5-beta-20251214-231110-497f8d27",
+    "@abtnode/timemachine": "1.17.5-beta-20251214-231110-497f8d27",
+    "@abtnode/util": "1.17.5-beta-20251214-231110-497f8d27",
+    "@aigne/aigne-hub": "^0.10.14",
+    "@arcblock/did": "^1.27.14",
+    "@arcblock/did-connect-js": "^1.27.14",
+    "@arcblock/did-ext": "^1.27.14",
     "@arcblock/did-motif": "^1.1.14",
-    "@arcblock/did-util": "^1.27.12",
-    "@arcblock/event-hub": "^1.27.12",
-    "@arcblock/jwt": "^1.27.12",
+    "@arcblock/did-util": "^1.27.14",
+    "@arcblock/event-hub": "^1.27.14",
+    "@arcblock/jwt": "^1.27.14",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/validator": "^1.27.12",
-    "@arcblock/vc": "^1.27.12",
-    "@blocklet/constant": "1.17.5-beta-20251211-104355-426d7eb6",
-    "@blocklet/did-space-js": "^1.2.6",
-    "@blocklet/env": "1.17.5-beta-20251211-104355-426d7eb6",
-    "@blocklet/error": "^0.3.3",
-    "@blocklet/meta": "1.17.5-beta-20251211-104355-426d7eb6",
-    "@blocklet/resolver": "1.17.5-beta-20251211-104355-426d7eb6",
-    "@blocklet/sdk": "1.17.5-beta-20251211-104355-426d7eb6",
-    "@blocklet/server-js": "1.17.5-beta-20251211-104355-426d7eb6",
-    "@blocklet/store": "1.17.5-beta-20251211-104355-426d7eb6",
-    "@blocklet/theme": "^3.2.11",
+    "@arcblock/validator": "^1.27.14",
+    "@arcblock/vc": "^1.27.14",
+    "@blocklet/constant": "1.17.5-beta-20251214-231110-497f8d27",
+    "@blocklet/did-space-js": "^1.2.9",
+    "@blocklet/env": "1.17.5-beta-20251214-231110-497f8d27",
+    "@blocklet/error": "^0.3.4",
+    "@blocklet/meta": "1.17.5-beta-20251214-231110-497f8d27",
+    "@blocklet/resolver": "1.17.5-beta-20251214-231110-497f8d27",
+    "@blocklet/sdk": "1.17.5-beta-20251214-231110-497f8d27",
+    "@blocklet/server-js": "1.17.5-beta-20251214-231110-497f8d27",
+    "@blocklet/store": "1.17.5-beta-20251214-231110-497f8d27",
+    "@blocklet/theme": "^3.2.13",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "^1.27.12",
-    "@ocap/util": "^1.27.12",
-    "@ocap/wallet": "^1.27.12",
+    "@ocap/mcrypto": "^1.27.14",
+    "@ocap/util": "^1.27.14",
+    "@ocap/wallet": "^1.27.14",
     "@slack/webhook": "^7.0.6",
     "archiver": "^7.0.1",
     "axios": "^1.7.9",
@@ -116,5 +116,5 @@
     "express": "^4.18.2",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "9ea2a8077a8edbf5021281e823719758eb9fe02c"
+  "gitHead": "aa782962d97ed5d9a994268621e9a652c995c783"
 }

package/lib/blocklet/manager/helper/blue-green-update-blocklet-status.js

@@ -1,18 +0,0 @@
-const blueGreenUpdateBlockletStatus = async ({ states, did, status, blueGreenComponentIds }) => {
-  const outputBlocklet = {};
-  await Promise.all(
-    blueGreenComponentIds.map(async (item) => {
-      if (!item.componentDids.length) {
-        return;
-      }
-      const res = await states.blocklet.setBlockletStatus(did, status, {
-        componentDids: item.componentDids,
-        isGreen: item.changeToGreen,
-      });
-      Object.assign(outputBlocklet, res);
-    })
-  );
-  return outputBlocklet;
-};
-
-module.exports = { blueGreenUpdateBlockletStatus };