@abtnode/core 1.17.5-beta-20251209-090953-3a59e7ac → 1.17.5-beta-20251214-122206-29056e8c

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)) {
       /**
        *
@@ -905,6 +893,45 @@ class DiskBlockletManager extends BaseBlockletManager {
       this.emit(BlockletEvents.statusChange, doc1);
       const startedBlockletDids = [];
       const errorBlockletDids = [];
+      const parentBlockletId = blocklet.id;
+
+      // Helper function to update child status immediately and emit events
+      const updateChildStatusImmediately = async (componentDid, status) => {
+        if (!states.blockletChild || !parentBlockletId) {
+          return;
+        }
+
+        try {
+          await states.blockletChild.updateChildStatus(parentBlockletId, componentDid, {
+            status,
+            operator,
+          });
+
+          // Get updated blocklet to emit events
+          const updatedBlocklet = await this.getBlocklet(did);
+          const componentsInfo = getComponentsInternalInfo(updatedBlocklet);
+
+          this.emit(BlockletInternalEvents.componentUpdated, {
+            appDid: blocklet.appDid,
+            components: componentsInfo.filter((c) => c.did === componentDid),
+          });
+
+          if (status === BlockletStatus.running) {
+            this.emit(BlockletInternalEvents.componentStarted, {
+              appDid: blocklet.appDid,
+              components: [{ did: componentDid }],
+            });
+          }
+
+          this.emit(BlockletEvents.statusChange, updatedBlocklet);
+        } catch (err) {
+          logger.error('Failed to update child status immediately', {
+            componentDid,
+            status,
+            error: err.message,
+          });
+        }
+      };
 
       const notStartedComponentDids = await this.startRequiredComponents({
         componentDids,
@@ -915,11 +942,13 @@ class DiskBlockletManager extends BaseBlockletManager {
         e2eMode,
         context,
         atomic,
-        onStarted: (subDid) => {
+        onStarted: async (subDid) => {
           startedBlockletDids.push({ did: subDid });
+          await updateChildStatusImmediately(subDid, BlockletStatus.running);
         },
-        onError: (subDid, error) => {
+        onError: async (subDid, error) => {
           errorBlockletDids.push({ did: subDid, error });
+          await updateChildStatusImmediately(subDid, BlockletStatus.error);
         },
       });
 
@@ -933,11 +962,13 @@ class DiskBlockletManager extends BaseBlockletManager {
               e2eMode,
               componentDids: [componentDid],
               operator,
-              onStarted: (subDid) => {
+              onStarted: async (subDid) => {
                 startedBlockletDids.push({ did: subDid });
+                await updateChildStatusImmediately(subDid, BlockletStatus.running);
               },
-              onError: (subDid, error) => {
+              onError: async (subDid, error) => {
                 errorBlockletDids.push({ did: subDid, error });
+                await updateChildStatusImmediately(subDid, BlockletStatus.error);
               },
             },
             context
@@ -950,15 +981,12 @@ class DiskBlockletManager extends BaseBlockletManager {
       let errorDescription = '';
       let resultBlocklet = nextBlocklet;
 
+      // Status updates are now done immediately in callbacks, so we only need to handle final events and cleanup
       if (startedBlockletDids.length) {
-        await states.blocklet.setBlockletStatus(did, BlockletStatus.running, {
-          componentDids: startedBlockletDids.map((x) => x.did),
-          operator,
-        });
-
         const finalBlocklet = await this.getBlocklet(did);
         resultBlocklet = finalBlocklet;
 
+        // Sync app config after all components started
         await this.configSynchronizer.throttledSyncAppConfig(finalBlocklet, { wait: 200 });
         const componentsInfo = getComponentsInternalInfo(finalBlocklet);
         this.emit(BlockletInternalEvents.componentUpdated, {
@@ -1009,10 +1037,7 @@ class DiskBlockletManager extends BaseBlockletManager {
           componentDids: errorBlockletDids.map((x) => x.did),
           shouldUpdateBlockletStatus: false,
         });
-        await states.blocklet.setBlockletStatus(did, BlockletStatus.error, {
-          componentDids: errorBlockletDids.map((x) => x.did),
-          operator,
-        });
+
         const finalBlocklet = await this.getBlocklet(did);
         resultBlocklet = finalBlocklet;
         this.emit(BlockletEvents.startFailed, {
@@ -3413,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') {
@@ -4926,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,10 +163,94 @@ const blueGreenStartBlocklet = async (
     return;
   }
 
-  const blueGreenComponentIds = await blueGreenGetComponentIds(blocklet1, entryComponentIds);
+  const blueGreenComponentIds = blueGreenGetComponentIds(blocklet1, entryComponentIds);
 
   const startedBlockletDids = [];
   const errorBlockletDids = [];
+  const appId = blocklet1.id;
+
+  const notificationChange = async () => {
+    // Get latest children from blocklet_children table instead of reloading entire blocklet
+    const latestChildren = await states.blocklet.loadChildren(appId);
+
+    // Merge latest children into blocklet1 for event emission
+    const finalBlocklet = {
+      ...blocklet1,
+      children: latestChildren,
+    };
+
+    await manager.configSynchronizer.throttledSyncAppConfig(finalBlocklet);
+    const componentsInfo = getComponentsInternalInfo(finalBlocklet);
+    manager.emit(BlockletInternalEvents.componentUpdated, {
+      appDid: blocklet1.appDid,
+      components: componentsInfo,
+    });
+
+    manager.emit(BlockletInternalEvents.componentStarted, {
+      appDid: blocklet1.appDid,
+      components: startedBlockletDids.map((x) => ({ did: x.did })),
+    });
+
+    // Emit statusChange event so UI can see the status change
+    manager.emit(BlockletEvents.statusChange, finalBlocklet);
+
+    manager.emit(BlockletEvents.started, { ...finalBlocklet, componentDids: startedBlockletDids.map((x) => x.did) });
+  };
+
+  // Helper function to update child status immediately and emit events
+  const updateChildStatusImmediately = async (componentDid, status, isGreen = false) => {
+    if (!states.blockletChild || !appId) {
+      return;
+    }
+
+    try {
+      const updates = {
+        operator,
+        inProgressStart: Date.now(),
+      };
+
+      if (status === BlockletStatus.running) {
+        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
+      const latestChildren = await states.blocklet.loadChildren(appId);
+      const updatedBlocklet = {
+        ...blocklet1,
+        children: latestChildren,
+      };
+      const componentsInfo = getComponentsInternalInfo(updatedBlocklet);
+
+      manager.emit(BlockletInternalEvents.componentUpdated, {
+        appDid: blocklet1.appDid,
+        components: componentsInfo.filter((c) => c.did === componentDid),
+      });
+
+      if (status === BlockletStatus.running) {
+        manager.emit(BlockletInternalEvents.componentStarted, {
+          appDid: blocklet1.appDid,
+          components: [{ did: componentDid }],
+        });
+      }
+
+      manager.emit(BlockletEvents.statusChange, updatedBlocklet);
+
+      // Emit statusChange event immediately so UI can see each component's status change
+      manager.emit(BlockletEvents.started, {
+        ...updatedBlocklet,
+        componentDids: startedBlockletDids.map((x) => x.did),
+      });
+    } catch (err) {
+      logger.error('Failed to update child status immediately', {
+        componentDid,
+        status,
+        isGreen,
+        error: err.message,
+      });
+    }
+  };
 
   for (const item of blueGreenComponentIds) {
     if (!item.componentDids.length) {
@@ -194,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);
@@ -274,6 +360,16 @@ const blueGreenStartBlocklet = async (
           // 收集成功的组件（排除已经在 errorBlockletDids 中的组件）
           startedBlockletDids.push({ did: subDid, isGreen: item.changeToGreen });
 
+          // Update status immediately
+          await updateChildStatusImmediately(subDid, BlockletStatus.running, item.changeToGreen);
+
+          await manager.deleteProcess({
+            did,
+            componentDids: [subDid],
+            isGreen: !item.changeToGreen,
+            shouldUpdateBlockletStatus: false,
+          });
+
           logger.info('Green environment started successfully', {
             did,
             componentDids: [subDid],
@@ -285,8 +381,16 @@ const blueGreenStartBlocklet = async (
           // 收集失败的组件
           errorBlockletDids.push({ did: subDid, error, isGreen: item.changeToGreen });
 
+          // Update status immediately
+          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 });
           }
@@ -297,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 = '';
 
   // 处理启动失败的组件
@@ -326,37 +430,6 @@ const blueGreenStartBlocklet = async (
       });
     }
 
-    const greenBlockletDids = errorBlockletDids.filter((x) => x.isGreen).map((x) => x.did);
-    const blueBlockletDids = errorBlockletDids.filter((x) => !x.isGreen).map((x) => x.did);
-
-    if (greenBlockletDids.length) {
-      await manager.deleteProcess({
-        did,
-        componentDids: greenBlockletDids,
-        shouldUpdateBlockletStatus: false,
-        isGreen: true,
-      });
-      await states.blocklet.setBlockletStatus(did, BlockletStatus.error, {
-        componentDids: greenBlockletDids,
-        operator,
-        isGreen: true,
-      });
-    }
-
-    if (blueBlockletDids.length) {
-      await manager.deleteProcess({
-        did,
-        componentDids: blueBlockletDids,
-        shouldUpdateBlockletStatus: false,
-        isGreen: false,
-      });
-      await states.blocklet.setBlockletStatus(did, BlockletStatus.error, {
-        componentDids: blueBlockletDids,
-        operator,
-        isGreen: false,
-      });
-    }
-
     const finalBlocklet = await manager.getBlocklet(did);
     manager.emit(BlockletEvents.startFailed, {
       ...finalBlocklet,
@@ -368,51 +441,14 @@ const blueGreenStartBlocklet = async (
 
   // 处理成功启动的组件
   if (startedBlockletDids.length) {
-    const startedGreenBlockletDids = startedBlockletDids.filter((x) => x.isGreen).map((x) => x.did);
-    const startedBlueBlockletDids = startedBlockletDids.filter((x) => !x.isGreen).map((x) => x.did);
-
-    if (startedGreenBlockletDids.length) {
-      await states.blocklet.setBlockletStatus(did, BlockletStatus.running, {
-        componentDids: startedGreenBlockletDids,
-        operator,
-        isGreen: true,
-      });
-      await manager.deleteProcess({ did, componentDids: startedGreenBlockletDids, isGreen: false });
-    }
-
-    if (startedBlueBlockletDids.length) {
-      await states.blocklet.setBlockletStatus(did, BlockletStatus.running, {
-        componentDids: startedBlueBlockletDids,
-        operator,
-        isGreen: false,
-      });
-      await manager.deleteProcess({ did, componentDids: startedBlueBlockletDids, isGreen: true });
-    }
-
-    const finalBlocklet = await manager.getBlocklet(did);
-
-    await manager.configSynchronizer.throttledSyncAppConfig(finalBlocklet);
-    const componentsInfo = getComponentsInternalInfo(finalBlocklet);
-    manager.emit(BlockletInternalEvents.componentUpdated, {
-      appDid: blocklet1.appDid,
-      components: componentsInfo,
-    });
-    manager.emit(BlockletInternalEvents.componentStarted, {
-      appDid: blocklet1.appDid,
-      components: startedBlockletDids.map((x) => ({ did: x.did })),
-    });
-
-    manager.emit(BlockletEvents.statusChange, finalBlocklet);
-    manager.emit(BlockletEvents.started, {
-      ...finalBlocklet,
-      componentDids: startedBlockletDids.map((x) => x.did),
-    });
+    await notificationChange();
   }
 
   // 根据情况更新 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/migrations/index.js

@@ -169,11 +169,11 @@ const runSchemaMigrations = async ({
 
   // migrate server schema
   dbPaths.server = getDbFilePath(path.join(dataDir, 'core/server.db'));
-  await doSchemaMigration(dbPaths.server, 'server');
+  await doSchemaMigration(dbPaths.server, 'server', true);
   printSuccess(`Server schema successfully migrated: ${dbPaths.server}`);
   // migrate service schema
   dbPaths.service = getDbFilePath(path.join(dataDir, 'services/service.db'));
-  await doSchemaMigration(dbPaths.service, 'service');
+  await doSchemaMigration(dbPaths.service, 'service', true);
   printSuccess(`Service schema successfully migrated: ${dbPaths.service}`);
 
   // migrate blocklet schema
@@ -183,7 +183,7 @@ const runSchemaMigrations = async ({
     if (env) {
       const filePath = getDbFilePath(path.join(env.value, 'blocklet.db'));
       dbPaths.blocklets.push(filePath);
-      await doSchemaMigration(filePath, 'blocklet');
+      await doSchemaMigration(filePath, 'blocklet', true);
       printSuccess(`Blocklet schema successfully migrated: ${blocklet.appPid}: ${filePath}`);
     } else {
       printInfo(`Skip migrate schema for blocklet: ${blocklet.appPid}`);
@@ -193,7 +193,7 @@ const runSchemaMigrations = async ({
   // migrate certificate manager schema
   for (let i = 0; i < MODULES.length; i++) {
     const filePath = getDbFilePath(path.join(dataDir, `modules/${MODULES[i]}/module.db`));
-    await doSchemaMigration(filePath, MODULES[i]);
+    await doSchemaMigration(filePath, MODULES[i], true);
     dbPaths.certificateManagers.push(filePath);
     printSuccess(`${MODULES[i]} schema successfully migrated: ${filePath}`);
   }

package/lib/monitor/blocklet-runtime-monitor.js

@@ -230,16 +230,14 @@ class BlockletRuntimeMonitor extends EventEmitter {
 
     insertThrottleMap.set(blockletDid, now);
 
-    return this.states.runtimeInsight.insert({ did: blockletDid, ...value }).catch((err) => {
+    return this.states.runtimeInsight.insert({ did: blockletDid, ...value }).catch((error) => {
+      const err = typeof error === 'string' ? error : error.message;
       if (err.includes('duplicate key value violates unique constraint ')) {
         console.error('RuntimeInsight insert error duplicate key value violates unique constraint');
         return;
       }
       if (err.name === 'SequelizeValidationError') {
-        console.error(
-          'RuntimeInsight validation error',
-          err.errors.map((e) => e.message)
-        );
+        console.error('RuntimeInsight validation error:', err);
       } else {
         console.error('RuntimeInsight insert error', err);
       }