@abtnode/core 1.16.53 → 1.16.54-beta-20251017-133309-7d40faa6

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

@@ -485,6 +485,15 @@ module.exports = Object.freeze({
   PROCESS_NAME_LOG_ROTATE: 'abt-node-log-rotate',
   PROCESS_NAME_EVENT_HUB: 'abt-node-event-hub',
   PROCESS_NAME_PM2_EVENT_HUB: 'abt-node-pm2-event-hub',
+  PROCESS_NAME_ORPHAN_CLEANUP: 'abt-node-orphan-cleanup',
+
+  // Process script paths for orphan detection
+  DAEMON_SCRIPT_PATH: 'cli/lib/process/daemon.js',
+  SERVICE_SCRIPT_PATH: 'cli/lib/process/service.js',
+
+  // Orphan process cleanup settings
+  ORPHAN_CHECK_DELAY: 60 * 1000, // 60 seconds - delay before checking for orphan processes
+  ORPHAN_MIN_UPTIME: 60, // 60 seconds - minimum process uptime to be considered orphan
 
   BLOCKLET_LAUNCHER_URL: 'https://launcher.arcblock.io/',
   WEB_WALLET_URL: 'https://web.abtwallet.io',
@@ -38954,7 +38963,7 @@ module.exports = require("zlib");
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.52","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib","test":"node tools/jest.js","test:disk":"CI=true npm run test tests/blocklet/manager/disk.spec.js","test:blue":"CI=true npm run test tests/blocklet/manager/disk-blue-green.spec.js","coverage":"npm run test -- --coverage"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.52","@abtnode/auth":"1.16.52","@abtnode/certificate-manager":"1.16.52","@abtnode/constant":"1.16.52","@abtnode/cron":"1.16.52","@abtnode/db-cache":"1.16.52","@abtnode/docker-utils":"1.16.52","@abtnode/logger":"1.16.52","@abtnode/models":"1.16.52","@abtnode/queue":"1.16.52","@abtnode/rbac":"1.16.52","@abtnode/router-provider":"1.16.52","@abtnode/static-server":"1.16.52","@abtnode/timemachine":"1.16.52","@abtnode/util":"1.16.52","@aigne/aigne-hub":"^0.10.1","@arcblock/did":"1.25.6","@arcblock/did-connect-js":"1.25.6","@arcblock/did-ext":"1.25.6","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"1.25.6","@arcblock/event-hub":"1.25.6","@arcblock/jwt":"1.25.6","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"1.25.6","@arcblock/vc":"1.25.6","@blocklet/constant":"1.16.52","@blocklet/did-space-js":"^1.1.33","@blocklet/env":"1.16.52","@blocklet/error":"^0.2.5","@blocklet/meta":"1.16.52","@blocklet/resolver":"1.16.52","@blocklet/sdk":"1.16.52","@blocklet/server-js":"1.16.52","@blocklet/store":"1.16.52","@blocklet/theme":"^3.1.49","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.25.6","@ocap/util":"1.25.6","@ocap/wallet":"1.25.6","@slack/webhook":"^5.0.4","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":{"expand-tilde":"^2.0.2","express":"^4.18.2","jest":"^29.7.0","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.53","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib","test":"node tools/jest.js","test:disk":"CI=true npm run test tests/blocklet/manager/disk.spec.js","test:blue":"CI=true npm run test tests/blocklet/manager/disk-blue-green.spec.js","coverage":"npm run test -- --coverage"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.53","@abtnode/auth":"1.16.53","@abtnode/certificate-manager":"1.16.53","@abtnode/constant":"1.16.53","@abtnode/cron":"1.16.53","@abtnode/db-cache":"1.16.53","@abtnode/docker-utils":"1.16.53","@abtnode/logger":"1.16.53","@abtnode/models":"1.16.53","@abtnode/queue":"1.16.53","@abtnode/rbac":"1.16.53","@abtnode/router-provider":"1.16.53","@abtnode/static-server":"1.16.53","@abtnode/timemachine":"1.16.53","@abtnode/util":"1.16.53","@aigne/aigne-hub":"^0.10.1","@arcblock/did":"1.25.6","@arcblock/did-connect-js":"1.25.6","@arcblock/did-ext":"1.25.6","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"1.25.6","@arcblock/event-hub":"1.25.6","@arcblock/jwt":"1.25.6","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"1.25.6","@arcblock/vc":"1.25.6","@blocklet/constant":"1.16.53","@blocklet/did-space-js":"^1.1.34","@blocklet/env":"1.16.53","@blocklet/error":"^0.2.5","@blocklet/meta":"1.16.53","@blocklet/resolver":"1.16.53","@blocklet/sdk":"1.16.53","@blocklet/server-js":"1.16.53","@blocklet/store":"1.16.53","@blocklet/theme":"^3.1.51","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.25.6","@ocap/util":"1.25.6","@ocap/wallet":"1.25.6","@slack/webhook":"^5.0.4","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":{"expand-tilde":"^2.0.2","express":"^4.18.2","jest":"^29.7.0","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
 
 /***/ }),
 

package/lib/index.js

@@ -10,6 +10,7 @@ const logger = require('@abtnode/logger')('@abtnode/core');
 const { fromBlockletStatus, toBlockletStatus, fromBlockletSource, toBlockletSource } = require('@blocklet/constant');
 const { listProviders } = require('@abtnode/router-provider');
 const { DEFAULT_CERTIFICATE_EMAIL, EVENTS } = require('@abtnode/constant');
+const { CustomError } = require('@blocklet/error');
 
 const { isInstanceWorker } = require('@abtnode/util/lib/pm2/is-instence-worker');
 const RoutingSnapshot = require('./states/routing-snapshot');
@@ -54,6 +55,9 @@ const dockerRestartAllContainers = require('./util/docker/docker-restart-all-con
 const RouterBlocker = require('./router/security/blocker');
 const BlockletVault = require('./blocklet/security/vault');
 
+const { getScope } = require('./util/audit-log');
+const { migrateAuditLog } = require('./util/post-start-tasks/migrate-audit-log');
+
 /**
  * @typedef {{} & import('./api/team')}} TNode
  */
@@ -667,8 +671,27 @@ function ABTNode(options) {
     getReceivers: teamAPI.getReceivers.bind(teamAPI),
 
     // AuditLog
-    createAuditLog: (params) => states.auditLog.create(params, instance),
+    createAuditLog: async (params) => {
+      if (!params || !params.args) {
+        throw new CustomError(400, 'Invalid audit log parameters');
+      }
+      const teamDid = getScope(params.args) || options.nodeDid;
+      if (!teamDid) {
+        throw new CustomError(400, 'teamDid is required for audit log creation.');
+      }
+      // 特殊情况处理：deleteBlocklet/installBlocklet 或 server 自身操作
+      if (['deleteBlocklet', 'installBlocklet'].includes(params.action) || teamDid === options.nodeDid) {
+        const result = await states.auditLog.create(params, instance);
+        // 如果是 installBlocklet, 不需要提前返回， 要将 log 记录在 service 中
+        if (params.action !== 'installBlocklet') {
+          return result;
+        }
+      }
+      const state = await teamManager.getAuditLogState(teamDid);
+      return state.create(params, instance);
+    },
     getAuditLogs: async (params) => {
+      const auditLogState = await teamManager.getAuditLogState(params.scope || options.nodeDid);
       if (params.scope) {
         const blocklet = await states.blocklet.getBlocklet(params.scope);
         if (blocklet) {
@@ -684,7 +707,7 @@ function ABTNode(options) {
         }
       }
 
-      return states.auditLog.findPaginated.call(states.auditLog, params);
+      return auditLogState.findPaginated.call(auditLogState, params);
     },
 
     // Insights
@@ -833,9 +856,14 @@ function ABTNode(options) {
     updateOAuthClient: teamAPI.updateOAuthClient.bind(teamAPI),
 
     updateBlockletSettings: blockletManager.updateBlockletSettings.bind(blockletManager),
+
+    // migrate audit log
+    migrateAuditLog: (dataDir) => {
+      migrateAuditLog(dataDir, states, options.nodeDid, teamManager.getAuditLogState.bind(teamManager));
+    },
   };
 
-  blockletManager.createAuditLog = (params) => states.auditLog.create(params, instance);
+  blockletManager.createAuditLog = (params) => instance.createAuditLog(params);
 
   const events = createEvents({
     blockletManager,

package/lib/states/audit-log.js

@@ -20,6 +20,7 @@ const logger = require('@abtnode/logger')('@abtnode/core:states:audit-log');
 const BaseState = require('./base');
 
 const { parse } = require('../util/ua');
+const { getScope } = require('../util/audit-log');
 
 const getServerInfo = (info) =>
   `[${info.name}](${joinURL(process.env.NODE_ENV === 'production' ? info.routing.adminPath : '', '/settings/about')})`;
@@ -898,30 +899,6 @@ const getLogCategory = (action) => {
   }
 };
 
-const getScope = (args = {}) => {
-  // this param usually means mutating an application (server or blocklet)
-  if (args.teamDid) {
-    return args.teamDid;
-  }
-
-  // this param usually means mutating a child component
-  if (args.rootDid) {
-    return args.rootDid;
-  }
-
-  // this param usually means mutating an blockle application
-  if (args.did) {
-    // this param usually means mutating a nested child component
-    if (Array.isArray(args.did)) {
-      return args.did[0];
-    }
-
-    return args.did;
-  }
-
-  return null;
-};
-
 const fixActor = (actor) => {
   if ([NODE_SERVICES.AUTH, 'blocklet'].includes(actor?.role)) {
     actor.role = '';
@@ -1068,6 +1045,75 @@ class AuditLogState extends BaseState {
 
     return super.paginate(conditions, { createdAt: -1 }, { pageSize: 20, ...paging });
   }
+
+  /* 数据迁移使用到的方法  */
+  async insertBlockletAuditLogs(data) {
+    if (!Array.isArray(data) || data.length === 0) {
+      return { successIds: [], failedIds: [] };
+    }
+
+    // 清除计数缓存，确保后续 count() 查询准确
+    await this.clearCountCache();
+
+    // 记录所有待插入的 ID
+    const allIds = data.map((x) => x.id);
+
+    /**
+     * bulkCreate 参数说明：
+     *
+     * 1. ignoreDuplicates: true
+     *    - 生成 INSERT IGNORE (MySQL) 或 ON CONFLICT DO NOTHING (PostgreSQL)
+     *    - 遇到唯一键冲突时跳过该条记录，继续插入其他记录
+     *    - 核心参数：实现"部分失败不影响其他记录"
+     *
+     * 2. validate: false
+     *    - 跳过 Sequelize 模型层的验证逻辑
+     *    - 直接交给数据库处理约束检查
+     *    - 提升批量插入性能（无需逐条验证）
+     *
+     * 3. returning: true
+     *    - 插入后返回完整的记录数据（包含自动生成的字段）
+     *    - 用于获取成功插入的记录 ID
+     *    - PostgreSQL 原生支持，MySQL 通过额外查询实现
+     */
+    const result = await this.model.bulkCreate(data, {
+      ignoreDuplicates: true,
+      validate: false,
+      returning: true,
+    });
+
+    const insertedIds = result.map((x) => x.id).filter(Boolean);
+
+    // 全部插入成功，无需额外查询
+    if (insertedIds.length === allIds.length) {
+      return { successIds: allIds, failedIds: [] };
+    }
+
+    // 计算未成功插入的 ID
+    const notInsertedIds = allIds.filter((id) => !insertedIds.includes(id));
+
+    // 批量查询未插入的 ID，判断是否已存在（已存在的也算成功）
+    const existingRecords = await this.find({
+      where: { id: { [Op.in]: notInsertedIds } },
+      attributes: ['id'],
+    });
+
+    const existingIds = existingRecords.map((x) => x.id);
+    const failedIds = notInsertedIds.filter((id) => !existingIds.includes(id));
+
+    // successIds = 本次插入成功的 + 已存在的（都算成功）
+    const successIds = [...insertedIds, ...existingIds];
+
+    if (failedIds.length > 0) {
+      logger.error(`Found ${failedIds.length} truly failed records`, { failedIds });
+    }
+
+    return { successIds, failedIds };
+  }
+
+  removeBlockletAuditLogs(ids) {
+    return this.remove({ where: { id: { [Op.in]: ids } } });
+  }
 }
 
 module.exports = AuditLogState;

package/lib/team/manager.js

@@ -59,6 +59,7 @@ const States = {
 
   AccessKey: require('../states/access-key'),
   Org: require('../states/org'),
+  AuditLog: require('../states/audit-log'),
 };
 
 const getDefaultTeamState = () => ({
@@ -85,6 +86,7 @@ const getDefaultTeamState = () => ({
 
   accessKey: null,
   org: null,
+  auditLog: null,
 });
 
 class TeamManager extends EventEmitter {
@@ -161,6 +163,7 @@ class TeamManager extends EventEmitter {
 
       accessKey: await this.createState(this.nodeDid, 'AccessKey'),
       Org: await this.createState(this.nodeDid, 'Org'),
+      AuditLog: await this.createState(this.nodeDid, 'AuditLog'),
     };
   }
 
@@ -204,6 +207,10 @@ class TeamManager extends EventEmitter {
     return this.getState(teamDid, 'org');
   }
 
+  getAuditLogState(teamDid) {
+    return this.getState(teamDid, 'auditLog');
+  }
+
   async getNotificationState(teamDid) {
     const state = await this.getState(teamDid ?? this.nodeDid, 'notification');
     state.setDefaultSender(this.nodeDid);

package/lib/util/audit-log.js

@@ -0,0 +1,27 @@
+const getScope = (args = {}) => {
+  // this param usually means mutating an application (server or blocklet)
+  if (args.teamDid) {
+    return args.teamDid;
+  }
+
+  // this param usually means mutating a child component
+  if (args.rootDid) {
+    return args.rootDid;
+  }
+
+  // this param usually means mutating a blockle application
+  if (args.did) {
+    // this param usually means mutating a nested child component
+    if (Array.isArray(args.did)) {
+      return args.did[0];
+    }
+
+    return args.did;
+  }
+
+  return null;
+};
+
+module.exports = {
+  getScope,
+};

package/lib/util/post-start-tasks/migrate-audit-log.js

@@ -0,0 +1,322 @@
+/**
+ * 这个文件是为了将 audit log 数据从 server 的表迁移至各自的 services 表中.
+ * 迁移流程：
+ *  1. 读取存在的 blocklet
+ *  2. 基于 blocklet 在 server 的 audit log 表中查询自己数据
+ *  3. 将数据插入到 blocklet 的 audit log 表中
+ *  4. 将迁移记录写入 .audit-log-migration.lock 文件中（JSON 格式，gzip 压缩）
+ *  5. 删除 server 的 audit log 表中的数据 只删除迁移成功的数据
+ */
+
+const fs = require('fs');
+const path = require('path');
+const zlib = require('zlib');
+const uniq = require('lodash/uniq');
+
+const logger = require('@abtnode/logger')('migrate-audit-log');
+
+const PAGE_SIZE = 100;
+const INSERT_BATCH_SIZE = 100;
+const MIGRATION_CONCURRENCY = 5;
+
+function getMigrationRecordFile(dataDir) {
+  const folderPath = dataDir || process.env.ABT_NODE_DATA_DIR;
+  if (!folderPath) {
+    return null;
+  }
+  return path.join(folderPath, 'core', 'audit-log-migration.lock');
+}
+
+/**
+ * 创建迁移上下文，包含所有需要访问文件路径的方法
+ * @param {string} migrationRecordFile - 迁移记录文件的完整路径
+ * @returns {object} 包含 writeMigrationRecord, readMigrationRecord, auditLogIsMigrated 方法的对象
+ */
+function createMigrationContext(migrationRecordFile) {
+  function writeMigrationRecord(data) {
+    try {
+      const jsonString = JSON.stringify(data);
+      const compressed = zlib.gzipSync(jsonString);
+      fs.writeFileSync(migrationRecordFile, compressed);
+    } catch (error) {
+      logger.error('Failed to write migration record:', error);
+      throw error;
+    }
+  }
+
+  function readMigrationRecord() {
+    if (!fs.existsSync(migrationRecordFile)) {
+      return null;
+    }
+    const compressed = fs.readFileSync(migrationRecordFile);
+    const decompressed = zlib.gunzipSync(compressed);
+    const result = JSON.parse(decompressed.toString('utf8'));
+    return result;
+  }
+
+  function auditLogIsMigrated() {
+    const migrationRecord = readMigrationRecord();
+    if (!migrationRecord) {
+      return false;
+    }
+    const { summary = {} } = migrationRecord || {};
+    const { total = 0, success = 0, skipped = 0, failed = 0 } = summary;
+    if (failed > 0) {
+      return false;
+    }
+    if (total === 0) {
+      return true;
+    }
+
+    return total === success + skipped;
+  }
+
+  return {
+    writeMigrationRecord,
+    readMigrationRecord,
+    auditLogIsMigrated,
+  };
+}
+
+async function getAllBlocklets(states) {
+  const result = await states.blocklet.find({ where: {}, attributes: ['appDid'] });
+  return result.map((x) => x.appDid);
+}
+
+async function getBlockletAuditLogs(states, appDid, page = 1, pageSize = PAGE_SIZE) {
+  const blocklet = await states.blocklet.getBlocklet(appDid);
+  if (!blocklet) {
+    return {
+      list: [],
+      paging: {
+        total: 0,
+        pageSize,
+        pageCount: 0,
+        page,
+      },
+    };
+  }
+
+  const params = {
+    scope: uniq(
+      [
+        blocklet.appDid,
+        blocklet.appPid,
+        blocklet.structV1Did,
+        ...(blocklet.migratedFrom || []).map((x) => x.appDid),
+      ].filter(Boolean)
+    ),
+    paging: { page, pageSize },
+  };
+
+  return states.auditLog.findPaginated.call(states.auditLog, params);
+}
+
+async function insertBlockletAuditLogs(blockletState, data) {
+  if (!data || data.length === 0) {
+    return { successIds: [], failedIds: [] };
+  }
+
+  // 如果数据量小于等于批次大小，直接一次性插入
+  if (data.length <= INSERT_BATCH_SIZE) {
+    const result = await blockletState.insertBlockletAuditLogs(data);
+    return result;
+  }
+
+  // 数据量大于批次大小，需要分批插入
+  const totalSuccessIds = [];
+  const totalFailedIds = [];
+
+  for (let i = 0; i < data.length; i += INSERT_BATCH_SIZE) {
+    const batch = data.slice(i, i + INSERT_BATCH_SIZE);
+    const batchNum = Math.floor(i / INSERT_BATCH_SIZE) + 1;
+
+    // eslint-disable-next-line no-await-in-loop
+    const result = await blockletState.insertBlockletAuditLogs(batch);
+
+    totalSuccessIds.push(...result.successIds);
+    totalFailedIds.push(...result.failedIds);
+
+    logger.info(
+      `Insert batch ${batchNum}: total: ${batch.length}, success: ${result.successIds.length}, failed: ${result.failedIds.length}`
+    );
+  }
+
+  return { successIds: totalSuccessIds, failedIds: totalFailedIds };
+}
+
+async function removeBlockletAuditLogs(states, ids = []) {
+  if (!ids || ids.length === 0) return 0;
+
+  // 如果 ID 数量小于等于批次大小，直接一次性删除
+  if (ids.length <= INSERT_BATCH_SIZE) {
+    const removed = await states.auditLog.removeBlockletAuditLogs(ids);
+    return removed;
+  }
+
+  // 数据量大于批次大小，需要分批删除
+  let totalRemoved = 0;
+
+  for (let i = 0; i < ids.length; i += INSERT_BATCH_SIZE) {
+    const batch = ids.slice(i, i + INSERT_BATCH_SIZE);
+    const batchNum = Math.floor(i / INSERT_BATCH_SIZE) + 1;
+
+    // eslint-disable-next-line no-await-in-loop
+    const removed = await states.auditLog.removeBlockletAuditLogs(batch);
+    totalRemoved += removed;
+
+    logger.info(`Remove batch ${batchNum}: removed ${removed} audit logs`);
+  }
+
+  return totalRemoved;
+}
+
+async function migrateBlocklet(states, appDid, nodeDid, blockletState) {
+  const startTime = Date.now();
+
+  if (appDid === nodeDid) {
+    return { status: 'skipped', auditLogsTotal: 0, successMigrated: 0, skipped: 0, duration: '0.00s' };
+  }
+
+  let page = 1;
+  let totalFound = 0;
+  let totalMigrated = 0;
+  let hasNextPage = true;
+
+  while (hasNextPage) {
+    // eslint-disable-next-line no-await-in-loop
+    const result = await getBlockletAuditLogs(states, appDid, page);
+    const { list: auditLogs, paging } = result;
+
+    logger.info(`Found ${auditLogs.length}/${paging.total} audit logs for blocklet ${appDid}, page: ${page}`);
+
+    if (!auditLogs || auditLogs.length === 0) {
+      hasNextPage = false;
+      break;
+    }
+
+    totalFound += auditLogs.length;
+
+    // eslint-disable-next-line no-await-in-loop
+    const insertResult = await insertBlockletAuditLogs(blockletState, auditLogs);
+    const { successIds } = insertResult;
+
+    // eslint-disable-next-line no-await-in-loop
+    const removeRows = await removeBlockletAuditLogs(states, successIds);
+
+    totalMigrated += successIds.length;
+
+    // 根据删除结果决定下一页查询策略
+    const allDeleted = removeRows === successIds.length;
+    if (allDeleted) {
+      // 删除成功，继续查询第一页（因为数据已被删除，第一页会有新数据）
+      page = 1;
+    } else {
+      // 删除失败，查询下一页（避免重复处理）
+      page++;
+      logger.warn(
+        `Delete incomplete for blocklet ${appDid}: migrated ${successIds.length}, deleted ${removeRows} - move to page ${page}`
+      );
+    }
+
+    hasNextPage = paging && paging.page < paging.pageCount;
+  }
+
+  const durationMs = Date.now() - startTime;
+  const duration = `${(durationMs / 1000).toFixed(2)}s`;
+  const skipped = totalFound - totalMigrated;
+
+  if (totalFound > 0) {
+    logger.info(`Blocklet ${appDid} migration completed: ${totalMigrated}/${totalFound} migrated in ${duration}`);
+  }
+
+  return totalFound === 0
+    ? { status: 'skipped', auditLogsTotal: 0, successMigrated: 0, skipped: 0, duration }
+    : { status: 'success', auditLogsTotal: totalFound, successMigrated: totalMigrated, skipped, duration };
+}
+
+async function runWithConcurrency(tasks, concurrency = MIGRATION_CONCURRENCY) {
+  const results = [];
+  for (let i = 0; i < tasks.length; i += concurrency) {
+    const batch = tasks.slice(i, i + concurrency);
+    // eslint-disable-next-line no-await-in-loop
+    const batchResults = await Promise.allSettled(batch.map((task) => task()));
+    results.push(...batchResults);
+  }
+  return results;
+}
+
+async function migrateAuditLog(dataDir, states, nodeDid, getBlockletStates) {
+  const totalStartTime = Date.now();
+
+  try {
+    const migrationRecordFile = getMigrationRecordFile(dataDir);
+    if (!migrationRecordFile) {
+      logger.info('The file path does not exist, skipping...');
+      return;
+    }
+    const ctx = createMigrationContext(migrationRecordFile);
+
+    const isMigrated = ctx.auditLogIsMigrated();
+    if (isMigrated) {
+      logger.info('Audit log migration has already been completed, skipping...');
+      return;
+    }
+
+    const blocklets = await getAllBlocklets(states);
+    const record = { summary: { total: blocklets.length, success: 0, skipped: 0, failed: 0, totalDuration: '0.00s' } };
+
+    logger.info(`Starting migration for ${blocklets.length} blocklets with concurrency of ${MIGRATION_CONCURRENCY}`);
+
+    const tasks = blocklets.map((appDid) => async () => {
+      // eslint-disable-next-line no-useless-catch
+      try {
+        const blockletState = await getBlockletStates(appDid);
+        const result = await migrateBlocklet(states, appDid, nodeDid, blockletState);
+        return { appDid, ...result };
+      } catch (error) {
+        logger.error(`Failed to migrate audit log for blocklet ${appDid}`, error);
+        throw error;
+      }
+    });
+
+    const results = await runWithConcurrency(tasks, MIGRATION_CONCURRENCY);
+
+    results.forEach((result) => {
+      if (result.status === 'fulfilled') {
+        const { appDid, status, duration, ...data } = result.value;
+        if (status === 'skipped') {
+          record.summary.skipped++;
+        } else {
+          record.summary.success++;
+        }
+        record[appDid] = { ...data, duration, migratedAt: new Date().toISOString() };
+      } else {
+        const { appDid, error } = result.reason;
+        record.summary.failed++;
+        record[appDid] = {
+          auditLogsTotal: 0,
+          successMigrated: 0,
+          skipped: 0,
+          duration: '0.00s',
+          migratedAt: new Date().toISOString(),
+        };
+        logger.error(`Failed to migrate audit log for blocklet ${appDid}`, error);
+      }
+    });
+
+    const totalDurationMs = Date.now() - totalStartTime;
+    const totalDuration = `${(totalDurationMs / 1000).toFixed(2)}s`;
+    record.summary.totalDuration = totalDuration;
+    record.summary.updatedAt = new Date().toISOString();
+
+    ctx.writeMigrationRecord(record);
+    logger.info(`Audit log migration completed, total time: ${totalDuration}`);
+  } catch (error) {
+    logger.error('Failed to migrate audit log', error);
+  }
+}
+
+module.exports = {
+  migrateAuditLog,
+};

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.53",
+  "version": "1.16.54-beta-20251017-133309-7d40faa6",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -21,21 +21,21 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.53",
-    "@abtnode/auth": "1.16.53",
-    "@abtnode/certificate-manager": "1.16.53",
-    "@abtnode/constant": "1.16.53",
-    "@abtnode/cron": "1.16.53",
-    "@abtnode/db-cache": "1.16.53",
-    "@abtnode/docker-utils": "1.16.53",
-    "@abtnode/logger": "1.16.53",
-    "@abtnode/models": "1.16.53",
-    "@abtnode/queue": "1.16.53",
-    "@abtnode/rbac": "1.16.53",
-    "@abtnode/router-provider": "1.16.53",
-    "@abtnode/static-server": "1.16.53",
-    "@abtnode/timemachine": "1.16.53",
-    "@abtnode/util": "1.16.53",
+    "@abtnode/analytics": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@abtnode/auth": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@abtnode/certificate-manager": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@abtnode/constant": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@abtnode/cron": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@abtnode/db-cache": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@abtnode/docker-utils": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@abtnode/logger": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@abtnode/models": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@abtnode/queue": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@abtnode/rbac": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@abtnode/router-provider": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@abtnode/static-server": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@abtnode/timemachine": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@abtnode/util": "1.16.54-beta-20251017-133309-7d40faa6",
     "@aigne/aigne-hub": "^0.10.1",
     "@arcblock/did": "1.25.6",
     "@arcblock/did-connect-js": "1.25.6",
@@ -47,16 +47,16 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "1.25.6",
     "@arcblock/vc": "1.25.6",
-    "@blocklet/constant": "1.16.53",
-    "@blocklet/did-space-js": "^1.1.33",
-    "@blocklet/env": "1.16.53",
+    "@blocklet/constant": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@blocklet/did-space-js": "^1.1.34",
+    "@blocklet/env": "1.16.54-beta-20251017-133309-7d40faa6",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.53",
-    "@blocklet/resolver": "1.16.53",
-    "@blocklet/sdk": "1.16.53",
-    "@blocklet/server-js": "1.16.53",
-    "@blocklet/store": "1.16.53",
-    "@blocklet/theme": "^3.1.49",
+    "@blocklet/meta": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@blocklet/resolver": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@blocklet/sdk": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@blocklet/server-js": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@blocklet/store": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@blocklet/theme": "^3.1.51",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.25.6",
     "@ocap/util": "1.25.6",
@@ -120,5 +120,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "7c37a9bd063192fb0a14921b9d0317de953016ff"
+  "gitHead": "78c11632ed47a75502a20c257568fc9e1655ca05"
 }