@abtnode/core 1.17.6-beta-20251217-011553-818fcc8e → 1.17.6-beta-20251218-120326-5b44dadf

package/lib/api/node.js

@@ -69,7 +69,7 @@ class NodeAPI {
 
   async getInfo() {
     const info = await this.state.read();
-    const env = await this.state.getEnvironments();
+    const env = await this.state.getEnvironments(info);
     info.environments = Object.keys(env).map((x) => ({ key: x, value: env[x] }));
     info.uptime = process.uptime() * 1000;
     return info;

package/lib/blocklet/manager/disk.js

@@ -1184,7 +1184,7 @@ class DiskBlockletManager extends BaseBlockletManager {
 
       const nodeInfo = await states.node.read();
 
-      const nodeEnvironments = await states.node.getEnvironments();
+      const nodeEnvironments = await states.node.getEnvironments(nodeInfo);
 
       if (checkDockerRunHistory(nodeInfo)) {
         const needChownDirs = [];
@@ -1289,8 +1289,8 @@ class DiskBlockletManager extends BaseBlockletManager {
     }
 
     try {
-      const nodeEnvironments = await states.node.getEnvironments();
       const nodeInfo = await states.node.read();
+      const nodeEnvironments = await states.node.getEnvironments(nodeInfo);
       await stopBlockletProcess(blocklet, {
         preStop: async (b, { ancestors }) => {
           const nextEnv = getRuntimeEnvironments(b, nodeEnvironments, ancestors);
@@ -1534,8 +1534,8 @@ class DiskBlockletManager extends BaseBlockletManager {
         throw new Error('Blocklet is protected from accidental deletion');
       }
 
-      const nodeEnvironments = await states.node.getEnvironments();
       const nodeInfo = await states.node.read();
+      const nodeEnvironments = await states.node.getEnvironments(nodeInfo);
       await deleteBlockletProcess(blocklet, {
         preDelete: async (b, { ancestors }) => {
           const needRunDocker = await checkNeedRunDocker(
@@ -2055,9 +2055,9 @@ class DiskBlockletManager extends BaseBlockletManager {
 
     // run hook
     if (!skipHook) {
-      const nodeEnvironments = await states.node.getEnvironments();
       // FIXME: we should also call preConfig for child blocklets
       const nodeInfo = await states.node.read();
+      const nodeEnvironments = await states.node.getEnvironments(nodeInfo);
       const nextEnv = { ...getRuntimeEnvironments(blocklet, nodeEnvironments, ancestors), ...configObj };
       const needRunDocker = await checkNeedRunDocker(blocklet.meta, nextEnv, nodeInfo, isExternalBlocklet(blocklet));
       const hookArgs = getHookArgs(blocklet);
@@ -2832,7 +2832,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         {
           name: 'send-serverless-heartbeat',
           time: process.env.ABT_NODE_SERVERLESS_HEARTBEAT_INTERVAL || '*/5 * * * *', // default every 5 minutes
-          options: { runOnInit: false },
+          options: { runOnInit: true },
           fn: () => launcher.sendServerlessHeartbeat(),
         },
       ];
@@ -4655,7 +4655,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     const nodeInfo = await states.node.read();
     // 等待磁盘映射完成
 
-    const nodeEnvironments = await states.node.getEnvironments();
+    const nodeEnvironments = await states.node.getEnvironments(nodeInfo);
 
     const runMigration = async (b) => {
       if (!componentDids.includes(b.meta.did)) {
@@ -4762,8 +4762,8 @@ class DiskBlockletManager extends BaseBlockletManager {
       await this._updateBlockletEnvironment(did);
       blocklet = await this.getBlocklet(did);
 
-      const nodeEnvironments = await states.node.getEnvironments();
       const nodeInfo = await states.node.read();
+      const nodeEnvironments = await states.node.getEnvironments(nodeInfo);
       const env = getRuntimeEnvironments(blocklet, nodeEnvironments, {});
       const needRunDocker = await checkNeedRunDocker(blocklet.meta, env, nodeInfo, isExternalBlocklet(blocklet));
 
@@ -5117,9 +5117,8 @@ class DiskBlockletManager extends BaseBlockletManager {
   }
 
   async _runUserHook(name, blocklet, context) {
-    const nodeEnvironments = await states.node.getEnvironments();
-
     const nodeInfo = await states.node.read();
+    const nodeEnvironments = await states.node.getEnvironments(nodeInfo);
     const hookFn = async (b, { ancestors }) => {
       const env = getRuntimeEnvironments(b, nodeEnvironments, ancestors);
       const needRunDocker = await checkNeedRunDocker(b.meta, env, nodeInfo, isExternalBlocklet(blocklet));
@@ -5433,8 +5432,10 @@ class DiskBlockletManager extends BaseBlockletManager {
     this.emit(BlockletEvents.appDidChanged, blocklet);
 
     await updateBlockletDocument({
-      blocklet,
+      did: blocklet.appPid,
       nodeInfo,
+      states,
+      teamManager: this.teamManager,
     })
       .then(() => {
         logger.info('updated blocklet dns document', { appPid: blocklet.appPid, appDid: blocklet.appDid });

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

@@ -295,7 +295,7 @@ const blueGreenStartBlocklet = async (
       tasks.push(async () => {
         try {
           const nodeInfo = await states.node.read();
-          const nodeEnvironments = await states.node.getEnvironments();
+          const nodeEnvironments = await states.node.getEnvironments(nodeInfo);
 
           // 钩子函数设置
           const getHookFn =

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

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

package/lib/event/index.js

@@ -37,7 +37,12 @@ const { getBackupEndpoint, getBackupFilesUrlFromEndpoint, getDIDSpacesUrlFromEnd
 const { autoBackupHandlerFactory, autoBackupHandler } = require('./auto-backup-handler');
 
 const eventBusHandler = require('../blocklet/webhook/event-bus');
-const { isDevelopmentMode, deleteBlockletCache } = require('../util/blocklet');
+const {
+  isDevelopmentMode,
+  deleteBlockletCache,
+  updateDidDocument,
+  updateDidDocumentStateOnly,
+} = require('../util/blocklet');
 const {
   backupBlockletSites,
   cleanBlockletSitesBackup,
@@ -229,6 +234,14 @@ module.exports = ({
 
       await teamAPI.refreshBlockletInterfacePermissions(blocklet.meta);
       logger.info('refreshed blocklet interface permissions after installed', { did: blocklet.meta.did });
+
+      try {
+        const nodeInfo = await node.getNodeInfo();
+        await updateDidDocument({ did: blocklet.appPid, nodeInfo, teamManager, states });
+        logger.info('updated blocklet DID document after install', { did: blocklet.meta.did });
+      } catch (error) {
+        logger.error('update blocklet DID document failed after install', { did: blocklet.meta.did, error });
+      }
     } catch (error) {
       logger.error('create.url.mapping.error', { event: name, error });
       teamManager.createNotification({
@@ -261,6 +274,19 @@ module.exports = ({
       logger.error('remove blocklet routing rules error', { event: name, error });
     }
 
+    try {
+      const nodeInfo = await node.getNodeInfo();
+      await updateDidDocumentStateOnly({
+        did: blocklet.appPid,
+        blocklet,
+        state: 'deleted',
+        nodeInfo,
+      });
+      logger.info('updated blocklet DID document state to deleted', { did: blocklet.meta.did });
+    } catch (error) {
+      logger.error('update blocklet DID document failed after remove', { did: blocklet.meta.did, error });
+    }
+
     try {
       await blockletManager.prune();
     } catch (error) {
@@ -503,6 +529,23 @@ module.exports = ({
       } catch (error) {
         logger.error('monit runtime info failed', { eventName, error });
       }
+
+      if ([BlockletEvents.started, BlockletEvents.stopped].includes(eventName)) {
+        try {
+          const nodeInfo = await node.getNodeInfo();
+          await updateDidDocument({ did: blocklet.appPid, nodeInfo, teamManager, states });
+          logger.info('updated blocklet DID document after state change', {
+            did: blocklet.meta.did,
+            event: eventName,
+          });
+        } catch (error) {
+          logger.error('update blocklet DID document failed after state change', {
+            did: blocklet.meta.did,
+            event: eventName,
+            error,
+          });
+        }
+      }
     }
 
     if ([BlockletEvents.statusChange].includes(eventName) && isDevelopmentMode(blocklet)) {
@@ -704,8 +747,17 @@ module.exports = ({
     });
   });
 
-  routerManager.on(EVENTS.UPDATE_DOMAIN_ALIAS, (did) => {
+  routerManager.on(EVENTS.UPDATE_DOMAIN_ALIAS, async (did) => {
     if (did) {
+      const nodeInfo = await node.getNodeInfo();
+      updateDidDocument({ did, nodeInfo, teamManager, states })
+        .then(() => {
+          logger.info('Update did document successfully on update domain alias', { did });
+        })
+        .catch((err) => {
+          logger.error('Update did document failed on update domain alias', { did, error: err });
+        });
+
       blockletManager
         .detail({ did })
         .then((blocklet) => {

package/lib/router/helper.js

@@ -29,6 +29,7 @@ const axios = require('@abtnode/util/lib/axios');
 const { getIpDnsDomainForBlocklet } = require('@abtnode/util/lib/get-domain-for-blocklet');
 const { forEachBlockletSync } = require('@blocklet/meta/lib/util');
 const { processLogByDate } = require('@abtnode/analytics');
+const { DBCache, getAbtNodeRedisAndSQLiteUrl } = require('@abtnode/db-cache');
 const pRetry = require('p-retry');
 const { buildLauncherUrl, buildRequestHeaders } = require('@abtnode/auth/lib/launcher');
 const {
@@ -105,6 +106,13 @@ const { get: getIp } = require('../util/ip');
 
 const isServiceFeDevelopment = process.env.ABT_NODE_SERVICE_FE_PORT;
 
+// 使用 DBCache 实现分布式锁，防止同一个 blocklet 的路由操作并发执行
+const ensureBlockletRoutingLock = new DBCache(() => ({
+  prefix: 'ensure-blocklet-routing-lock',
+  ttl: 1000 * 60, // 60 seconds timeout
+  ...getAbtNodeRedisAndSQLiteUrl(),
+}));
+
 const hasRuleByPrefix = (site, value) => site.rules.find((x) => x.isProtected && get(x, 'from.pathPrefix') === value);
 
 const pingWellknownRule = {
@@ -1311,19 +1319,22 @@ module.exports = function getRouterHelpers({
 
     const existSite = await states.site.findOne({ domain: domainGroup });
     updateBlockletDocument({
-      blocklet,
+      did: blocklet.appPid,
       nodeInfo,
+      teamManager,
+      states,
     })
       .then(() => {
-        logger.info(`updated blocklet ${blocklet.appDid} dns`);
+        logger.info('updated blocklet dns document', {
+          did: blocklet.appPid,
+        });
       })
       .catch((err) => {
-        logger.error(`update blocklet ${blocklet.appDid} dns failed`, { error: err });
+        logger.error('update blocklet dns document failed', { did: blocklet.meta.did, error: err });
       });
 
     if (!existSite) {
       const domainAliases = getBlockletDidDomainList(blocklet, nodeInfo);
-
       // let didDomain in front of ipEchoDnsDomain
       domainAliases.push({ value: getIpDnsDomainForBlocklet(blocklet), isProtected: true });
 
@@ -1496,13 +1507,21 @@ module.exports = function getRouterHelpers({
    * @returns {Promise<boolean>} if routing changed
    */
   const ensureBlockletRouting = async (blocklet, context = {}) => {
-    const nodeInfo = await nodeState.read();
-    const hasWebInterface = (blocklet.meta.interfaces || []).some((x) => x.type === BLOCKLET_INTERFACE_TYPE_WEB);
-    if (!hasWebInterface) {
-      return false;
-    }
+    const lockName = `ensure-blocklet-routing-${blocklet.meta.did}`;
+
+    await ensureBlockletRoutingLock.acquire(lockName);
 
-    return _ensureBlockletSites(blocklet, nodeInfo, context);
+    try {
+      const nodeInfo = await nodeState.read();
+      const hasWebInterface = (blocklet.meta.interfaces || []).some((x) => x.type === BLOCKLET_INTERFACE_TYPE_WEB);
+      if (!hasWebInterface) {
+        return false;
+      }
+
+      return await _ensureBlockletSites(blocklet, nodeInfo, context);
+    } finally {
+      await ensureBlockletRoutingLock.releaseLock(lockName);
+    }
   };
 
   /**

package/lib/states/blocklet-child.js

@@ -56,6 +56,32 @@ class BlockletChildState extends BaseState {
     return (children || []).map(ensureDeployedFrom);
   }
 
+  /**
+   * Get children by multiple parent blocklet IDs (batch query)
+   * @param {string[]} parentBlockletIds - Array of parent blocklet IDs
+   * @returns {Promise<Map<string, Array>>} - Map of parentBlockletId -> children array
+   */
+  async getChildrenByParentIds(parentBlockletIds) {
+    if (!Array.isArray(parentBlockletIds) || parentBlockletIds.length === 0) {
+      return new Map();
+    }
+
+    const children = await this.find({ parentBlockletId: { $in: parentBlockletIds } }, {}, { createdAt: 1 });
+
+    // Group children by parentBlockletId
+    const childrenMap = new Map();
+    parentBlockletIds.forEach((id) => childrenMap.set(id, []));
+
+    (children || []).forEach((child) => {
+      const processedChild = ensureDeployedFrom(child);
+      if (childrenMap.has(child.parentBlockletId)) {
+        childrenMap.get(child.parentBlockletId).push(processedChild);
+      }
+    });
+
+    return childrenMap;
+  }
+
   /**
    * Delete children by parent blocklet ID
    * @param {string} parentBlockletId - The parent blocklet ID

package/lib/states/blocklet.js

@@ -265,13 +265,13 @@ class BlockletState extends BaseState {
    * @param {string} blockletId - The blocklet ID
    * @returns {Promise<Array>} - Array of children
    */
-  async loadChildren(blockletId) {
-    if (!this.BlockletChildState || !blockletId) {
-      return [];
-    }
-
-    const children = await this.BlockletChildState.getChildrenByParentId(blockletId);
-    // Ensure children is always an array
+  /**
+   * Process raw children records into structured format
+   * @param {Array} children - Raw children records from database
+   * @param {string} parentBlockletId - The parent blocklet ID (for logging)
+   * @returns {Array} - Processed children array
+   */
+  _processLoadedChildren(children, parentBlockletId) {
     if (!Array.isArray(children)) {
       return [];
     }
@@ -280,17 +280,17 @@ class BlockletState extends BaseState {
       // Ensure meta is an object and has required fields
       const meta = child.meta || {};
       if (!meta.did) {
-        logger.warn('loadChildren: child missing meta.did', { childId: child.id, parentBlockletId: blockletId });
+        logger.warn('loadChildren: child missing meta.did', { childId: child.id, parentBlockletId });
       }
       if (!meta.name && !meta.bundleName) {
         logger.warn('loadChildren: child missing meta.name and meta.bundleName', {
           childId: child.id,
           childDid: meta.did,
-          parentBlockletId: blockletId,
+          parentBlockletId,
         });
       }
 
-      const childObj = {
+      return {
         id: child.id,
         mountPoint: child.mountPoint,
         meta,
@@ -312,15 +312,16 @@ class BlockletState extends BaseState {
         greenStatus: child.greenStatus,
         greenPorts: child.greenPorts,
       };
+    });
+  }
 
-      // Recursively load children for this child
-      if (child.children && child.children.length > 0) {
-        // Note: children array now contains IDs, need to load them
-        // This will be handled by forEachComponentV2 or similar methods
-      }
+  async loadChildren(blockletId) {
+    if (!this.BlockletChildState || !blockletId) {
+      return [];
+    }
 
-      return childObj;
-    });
+    const children = await this.BlockletChildState.getChildrenByParentId(blockletId);
+    return this._processLoadedChildren(children, blockletId);
   }
 
   /**
@@ -525,16 +526,23 @@ class BlockletState extends BaseState {
 
   async getBlocklets(query = {}, projection = {}, sort = { createdAt: -1 }) {
     const docs = await this.find(query, projection, sort);
-    const result = [];
+    const validDocs = docs.filter(Boolean);
 
-    for (const doc of docs.filter(Boolean)) {
-      // Load children for each blocklet
-      const children = await this.loadChildren(doc.id);
-      doc.children = children;
-      result.push(formatBlocklet(doc, 'onRead', this.config.dek));
+    if (validDocs.length === 0) {
+      return [];
     }
 
-    return result;
+    // Batch load all children in a single query (instead of N+1 queries)
+    let childrenMap = new Map();
+    if (this.BlockletChildState) {
+      const blockletIds = validDocs.map((doc) => doc.id);
+      childrenMap = await this.BlockletChildState.getChildrenByParentIds(blockletIds);
+    }
+
+    return validDocs.map((doc) => {
+      doc.children = this._processLoadedChildren(childrenMap.get(doc.id) || [], doc.id);
+      return formatBlocklet(doc, 'onRead', this.config.dek);
+    });
   }
 
   async deleteBlocklet(did) {
@@ -903,12 +911,22 @@ class BlockletState extends BaseState {
   }
 
   async getServices() {
-    const blocklets = await this.getBlocklets({}, { meta: 1, ports: 1 });
+    const blocklets = await this.getBlocklets({}, { id: 1, meta: 1, ports: 1 });
     const services = [];
 
     blocklets.forEach((blocklet) => {
       const list = getBlockletServices(blocklet);
       list.forEach((x) => {
+        // 如果本地 53 端口被系统占用，调试可以配置： export ABT_NODE_REDIRECTION_SERVICE_PORTS="53:10053,553:101553" 等多个 Service 端口重定向
+        if (process.env.ABT_NODE_REDIRECTION_SERVICE_PORTS) {
+          const redirectionPorts = process.env.ABT_NODE_REDIRECTION_SERVICE_PORTS.split(',');
+          redirectionPorts.forEach((portString) => {
+            const [portA, portB] = portString.split(':');
+            if (x.port === +portA) {
+              x.port = +portB;
+            }
+          });
+        }
         if (!x.port) {
           logger.error('Missing service port', { appId: blocklet.meta.did, x });
           return;
@@ -941,7 +959,7 @@ class BlockletState extends BaseState {
    * @return {Object} { <did> : { interfaceName } }
    */
   async groupAllInterfaces() {
-    const blocklets = await this.getBlocklets({}, { meta: 1 });
+    const blocklets = await this.getBlocklets({}, { id: 1, meta: 1 });
     const result = {};
     const fillResult = (component, { id }) => {
       const { interfaces } = component.meta;
@@ -1201,7 +1219,7 @@ class BlockletState extends BaseState {
   }
 
   async _getOccupiedPorts() {
-    const blocklets = await this.getBlocklets({}, { port: 1, ports: 1, meta: 1 });
+    const blocklets = await this.getBlocklets({}, { id: 1, port: 1, ports: 1, meta: 1 });
 
     const occupiedExternalPorts = new Map();
     const occupiedInternalPorts = new Map();

package/lib/states/node.js

@@ -316,8 +316,9 @@ class NodeState extends BaseState {
     return this.updateNodeInfo({ previousMode: '', mode });
   }
 
-  getEnvironments() {
-    return this.read().then((info) => ({
+  async getEnvironments(nodeInfo) {
+    const info = nodeInfo || (await this.read());
+    return {
       ABT_NODE: info.version,
       ABT_NODE_VERSION: info.version,
       ABT_NODE_DID: info.did,
@@ -326,7 +327,7 @@ class NodeState extends BaseState {
       ABT_NODE_PORT: info.port,
       ABT_NODE_SERVICE_PORT: process.env.ABT_NODE_SERVICE_PORT,
       ABT_NODE_MODE: info.mode,
-    }));
+    };
   }
 
   async updateGateway(updates) {

package/lib/util/blocklet.js

@@ -31,6 +31,7 @@ const { isValid: isValidDid, isEthereumDid } = require('@arcblock/did');
 const logger = require('@abtnode/logger')('@abtnode/core:util:blocklet');
 const pm2 = require('@abtnode/util/lib/pm2/async-pm2');
 const sleep = require('@abtnode/util/lib/sleep');
+const { isCustomDomain } = require('@abtnode/util/lib/url-evaluation');
 const getPm2ProcessInfo = require('@abtnode/util/lib/get-pm2-process-info');
 const { formatEnv, getSecurityNodeOptions, decrypt } = require('@abtnode/util/lib/security');
 const ensureEndpointHealthy = require('@abtnode/util/lib/ensure-endpoint-healthy');
@@ -45,6 +46,7 @@ const {
   APP_STRUCT_VERSION,
   BLOCKLET_CACHE_TTL,
   AIGNE_CONFIG_ENCRYPT_SALT,
+  SLOT_FOR_IP_DNS_SITE,
 } = require('@abtnode/constant');
 const { BLOCKLET_THEME_LIGHT, BLOCKLET_THEME_DARK } = require('@blocklet/theme');
 const {
@@ -127,6 +129,7 @@ const {
   templateReplace,
   getServerDidDomain,
   APP_CONFIG_IMAGE_KEYS,
+  replaceDomainSlot,
 } = require('./index');
 const { installExternalDependencies } = require('./install-external-dependencies');
 const parseDockerOptionsFromPm2 = require('./docker/parse-docker-options-from-pm2');
@@ -135,6 +138,7 @@ const getDockerRuntimeInfo = require('./docker/get-docker-runtime-info');
 const parseDockerName = require('./docker/parse-docker-name');
 const { createDockerNetwork } = require('./docker/docker-network');
 const { ensureBun } = require('./ensure-bun');
+const { getFromCache: getAccessibleExternalNodeIp } = require('./get-accessible-external-node-ip');
 
 /**
  * Get actual listening port from Docker container or process
@@ -2402,9 +2406,16 @@ const validateStore = (nodeInfo, storeUrl) => {
     return;
   }
 
+  const storeUrlObj = new URL(storeUrl);
+  const registerUrlObj = new URL(nodeInfo.registerUrl);
+
+  // 信任 Launcher 打包的应用
+  if (registerUrlObj.host === storeUrlObj.host) {
+    return;
+  }
+
   const inStoreList = nodeInfo.blockletRegistryList.find((item) => {
     const itemURLObj = new URL(item.url);
-    const storeUrlObj = new URL(storeUrl);
 
     return itemURLObj.host === storeUrlObj.host;
   });
@@ -2736,8 +2747,10 @@ const getSlpDid = (serverDid, appPid) => {
 };
 
 // eslint-disable-next-line require-await
-const updateDidDocument = async ({ blocklet, nodeInfo }) => {
+const publishDidDocument = async ({ blocklet, ownerInfo, nodeInfo }) => {
   const alsoKnownAs = getBlockletKnownAs(blocklet);
+  logger.debug('updateDidDocument blocklet info', { blocklet });
+
   const { wallet } = getBlockletInfo(blocklet, nodeInfo.sk);
   const { mode, did: serverDid } = nodeInfo;
 
@@ -2761,6 +2774,58 @@ const updateDidDocument = async ({ blocklet, nodeInfo }) => {
     slpDomain: nodeInfo.slpDomain,
   });
 
+  const name = blocklet.meta?.title || blocklet.meta?.name;
+  const state = fromBlockletStatus(blocklet.status || BlockletStatus.stopped);
+
+  let launcher = null;
+  if (!isEmpty(blocklet.controller)) {
+    launcher = {
+      did: toDid(blocklet.controller.did || nodeInfo.registerInfo.appPid), // 目前 controller 没有 launcher 的元信息, 默认在 nodeInfo 中存储
+      name: blocklet.controller.launcherName || nodeInfo.registerInfo.appName || '',
+      url: blocklet.controller.launcherUrl || nodeInfo.registerInfo.appUrl || '',
+      userDid: toDid(blocklet.controller.nftOwner),
+    };
+  }
+
+  const isPrimaryDomain = (d) => {
+    const appUrl = blocklet.environments.find((x) => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_URL)?.value;
+    try {
+      const url = new URL(appUrl);
+      return url.hostname === d;
+    } catch (error) {
+      logger.error('failed to get primary domain', { error, domain: d, appUrl });
+      return false;
+    }
+  };
+
+  const domains = await Promise.all(
+    blocklet.site.domainAliases.map(async (item) => {
+      let type = isCustomDomain(item.value) ? 'custom' : 'internal';
+      // 如果域名是 appUrl，则设置为 primary
+      if (isPrimaryDomain(item.value)) {
+        type = 'primary';
+      }
+
+      if (item.value.includes(SLOT_FOR_IP_DNS_SITE)) {
+        const nodeIp = await getAccessibleExternalNodeIp();
+        item.value = replaceDomainSlot({ domain: item.value, nodeIp });
+      }
+
+      return {
+        type,
+        host: item.value,
+        url: `https://${item.value}`,
+        source: 'dnsRecords', // 固定为 dnsRecords
+      };
+    })
+  );
+
+  const owner = {
+    did: toDid(ownerInfo.did),
+    name: ownerInfo.fullName,
+    avatar: ownerInfo.avatar,
+  };
+
   return didDocument.updateBlockletDocument({
     blocklet,
     wallet,
@@ -2772,6 +2837,56 @@ const updateDidDocument = async ({ blocklet, nodeInfo }) => {
     slpDomain: nodeInfo.slpDomain,
     serverDid,
     blockletServerVersion: nodeInfo.version,
+    name,
+    state,
+    owner,
+    launcher,
+    domains,
+  });
+};
+
+const updateDidDocument = async ({ did, status, nodeInfo, teamManager, states }) => {
+  const blocklet = await states.blocklet.getBlocklet(did);
+  const blockletExtra = await states.blockletExtras.findOne({ did });
+
+  blocklet.site = await states.site.findOneByBlocklet(did);
+  blocklet.settings = await states.blockletExtras.getSettings(did);
+  blocklet.controller = blockletExtra.controller;
+
+  logger.debug('update did document', { blocklet });
+
+  if (isEmpty(blocklet.status)) {
+    blocklet.status = status;
+  }
+
+  const ownerDid = blocklet.settings.owner.did;
+  logger.info('get owner info', { ownerDid, teamDid: blocklet.appPid });
+  const userState = await teamManager.getUserState(blocklet.appPid);
+  const ownerInfo = await userState.getUser(ownerDid);
+
+  logger.info('got user info', {
+    owner: ownerInfo,
+    blockletDid: blocklet.meta.did,
+    ownerDid,
+    teamDid: blocklet.appPid,
+  });
+
+  return publishDidDocument({ blocklet, ownerInfo, nodeInfo });
+};
+
+// Update DID document state only (e.g., to 'deleted') without fetching from database
+// Used when blocklet is being removed and database data may not be available
+const updateDidDocumentStateOnly = ({ did, blocklet, state, nodeInfo }) => {
+  logger.debug('update did document state only', { did, state });
+
+  const { wallet } = getBlockletInfo(blocklet, nodeInfo.sk);
+
+  return didDocument.updateBlockletStateOnly({
+    did,
+    state,
+    didRegistryUrl: nodeInfo.didRegistry,
+    wallet,
+    blockletServerVersion: nodeInfo.version,
   });
 };
 
@@ -2983,7 +3098,9 @@ module.exports = {
   getBlockletURLForLauncher,
   ensureAppPortsNotOccupied,
   getComponentNamesWithVersion,
+  publishDidDocument,
   updateDidDocument,
+  updateDidDocumentStateOnly,
   getSlpDid,
   shouldEnableSlpDomain,
   getAppConfigsFromComponent,

package/lib/util/install-external-dependencies.js

@@ -33,7 +33,7 @@ async function installExternalDependencies({ appDir, forceInstall = false, nodeI
   }
 
   if (!(await isSameOs(appDir, isUseDocker))) {
-    fs.removeSync(path.join(appDir, 'node_modules'), { recursive: true });
+    fs.removeSync(path.join(appDir, 'node_modules'), { recursive: true, force: true });
   }
 
   const isNeedInstall = forceInstall || externals.some((dependency) => !isDependencyInstalled(appDir, dependency));

package/lib/util/reset-node.js

@@ -1,7 +1,10 @@
+const fs = require('fs-extra');
+const path = require('path');
 const logger = require('@abtnode/logger')('@abtnode/core:util:reset');
 
 const states = require('../states');
 const { isE2E } = require('./env');
+const { getDataDirs } = require('./index');
 
 const noop = () => true;
 
@@ -27,6 +30,36 @@ const resetOwner = async ({ teamManager }) => {
   return true;
 };
 
+/* istanbul ignore next */
+const resetDirs = () => {
+  try {
+    const dataDir = process.env.ABT_NODE_DATA_DIR;
+    if (!dataDir) {
+      logger.warn('ABT_NODE_DATA_DIR not set, skip reset bundles');
+      return false;
+    }
+    const dataDirs = getDataDirs(dataDir);
+
+    const dirs = [dataDirs.blocklets, dataDirs.cache];
+
+    for (const dir of dirs) {
+      if (fs.existsSync(dir)) {
+        // Remove all contents in blocklets directory
+        const entries = fs.readdirSync(dir);
+        for (const entry of entries) {
+          const entryPath = path.join(dir, entry);
+          fs.removeSync(entryPath, { recursive: true, force: true });
+        }
+        logger.info('reset bundles', { dir, count: entries.length });
+      }
+    }
+    return true;
+  } catch (error) {
+    logger.error('failed to reset bundles', { error });
+    return false;
+  }
+};
+
 /* istanbul ignore next */
 const resetBlocklets = async ({ context, blockletManager }) => {
   const blocklets = await blockletManager.list({ includeRuntimeInfo: false }, context);
@@ -36,6 +69,8 @@ const resetBlocklets = async ({ context, blockletManager }) => {
     await blockletManager.delete({ did: blocklet.meta.did, keepData: false }, context);
   }
   logger.info('reset blocklets', blocklets.length);
+
+  resetDirs();
   return true;
 };
 
@@ -136,6 +171,7 @@ module.exports = async ({
       webhooks: false,
       accessKeys: false,
       users: false,
+      bundles: false,
     },
     params || {}
   );

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.6-beta-20251217-011553-818fcc8e",
+  "version": "1.17.6-beta-20251218-120326-5b44dadf",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -17,21 +17,21 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.17.6-beta-20251217-011553-818fcc8e",
-    "@abtnode/auth": "1.17.6-beta-20251217-011553-818fcc8e",
-    "@abtnode/certificate-manager": "1.17.6-beta-20251217-011553-818fcc8e",
-    "@abtnode/constant": "1.17.6-beta-20251217-011553-818fcc8e",
-    "@abtnode/cron": "1.17.6-beta-20251217-011553-818fcc8e",
-    "@abtnode/db-cache": "1.17.6-beta-20251217-011553-818fcc8e",
-    "@abtnode/docker-utils": "1.17.6-beta-20251217-011553-818fcc8e",
-    "@abtnode/logger": "1.17.6-beta-20251217-011553-818fcc8e",
-    "@abtnode/models": "1.17.6-beta-20251217-011553-818fcc8e",
-    "@abtnode/queue": "1.17.6-beta-20251217-011553-818fcc8e",
-    "@abtnode/rbac": "1.17.6-beta-20251217-011553-818fcc8e",
-    "@abtnode/router-provider": "1.17.6-beta-20251217-011553-818fcc8e",
-    "@abtnode/static-server": "1.17.6-beta-20251217-011553-818fcc8e",
-    "@abtnode/timemachine": "1.17.6-beta-20251217-011553-818fcc8e",
-    "@abtnode/util": "1.17.6-beta-20251217-011553-818fcc8e",
+    "@abtnode/analytics": "1.17.6-beta-20251218-120326-5b44dadf",
+    "@abtnode/auth": "1.17.6-beta-20251218-120326-5b44dadf",
+    "@abtnode/certificate-manager": "1.17.6-beta-20251218-120326-5b44dadf",
+    "@abtnode/constant": "1.17.6-beta-20251218-120326-5b44dadf",
+    "@abtnode/cron": "1.17.6-beta-20251218-120326-5b44dadf",
+    "@abtnode/db-cache": "1.17.6-beta-20251218-120326-5b44dadf",
+    "@abtnode/docker-utils": "1.17.6-beta-20251218-120326-5b44dadf",
+    "@abtnode/logger": "1.17.6-beta-20251218-120326-5b44dadf",
+    "@abtnode/models": "1.17.6-beta-20251218-120326-5b44dadf",
+    "@abtnode/queue": "1.17.6-beta-20251218-120326-5b44dadf",
+    "@abtnode/rbac": "1.17.6-beta-20251218-120326-5b44dadf",
+    "@abtnode/router-provider": "1.17.6-beta-20251218-120326-5b44dadf",
+    "@abtnode/static-server": "1.17.6-beta-20251218-120326-5b44dadf",
+    "@abtnode/timemachine": "1.17.6-beta-20251218-120326-5b44dadf",
+    "@abtnode/util": "1.17.6-beta-20251218-120326-5b44dadf",
     "@aigne/aigne-hub": "^0.10.15",
     "@arcblock/did": "^1.27.15",
     "@arcblock/did-connect-js": "^1.27.15",
@@ -43,16 +43,16 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.27.15",
     "@arcblock/vc": "^1.27.15",
-    "@blocklet/constant": "1.17.6-beta-20251217-011553-818fcc8e",
+    "@blocklet/constant": "1.17.6-beta-20251218-120326-5b44dadf",
     "@blocklet/did-space-js": "^1.2.10",
-    "@blocklet/env": "1.17.6-beta-20251217-011553-818fcc8e",
+    "@blocklet/env": "1.17.6-beta-20251218-120326-5b44dadf",
     "@blocklet/error": "^0.3.5",
-    "@blocklet/meta": "1.17.6-beta-20251217-011553-818fcc8e",
-    "@blocklet/resolver": "1.17.6-beta-20251217-011553-818fcc8e",
-    "@blocklet/sdk": "1.17.6-beta-20251217-011553-818fcc8e",
-    "@blocklet/server-js": "1.17.6-beta-20251217-011553-818fcc8e",
-    "@blocklet/store": "1.17.6-beta-20251217-011553-818fcc8e",
-    "@blocklet/theme": "^3.2.14",
+    "@blocklet/meta": "1.17.6-beta-20251218-120326-5b44dadf",
+    "@blocklet/resolver": "1.17.6-beta-20251218-120326-5b44dadf",
+    "@blocklet/sdk": "1.17.6-beta-20251218-120326-5b44dadf",
+    "@blocklet/server-js": "1.17.6-beta-20251218-120326-5b44dadf",
+    "@blocklet/store": "1.17.6-beta-20251218-120326-5b44dadf",
+    "@blocklet/theme": "^3.2.18",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "^1.27.15",
     "@ocap/util": "^1.27.15",
@@ -116,5 +116,5 @@
     "express": "^4.18.2",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "e4291b92297d4b9abfdc5c1e5bbe262882fe34f2"
+  "gitHead": "a07b4f70aa6dddea49ed794423b47d36dc206e53"
 }