@abtnode/core 1.16.49-beta-20250823-082650-626c1473 → 1.16.49-beta-20250827-025603-2bb1a7ee

package/lib/api/team.js

@@ -188,9 +188,8 @@ const getUserSessionWhere = ({ status, blocklet }) => {
 
 // 关注取消关注相关接口
 const USER_RELATION_ACTIONS = {
-  follow: (state, followerDid, userDid) => state.followUser(followerDid, userDid),
-  unfollow: (state, followerDid, userDid) => state.unfollowUser(followerDid, userDid),
-  isFollowing: (state, followerDid, userDid) => state.isFollowing(followerDid, userDid),
+  follow: (state, followerDid, userDid, options) => state.followUser(followerDid, userDid, options),
+  unfollow: (state, followerDid, userDid, options) => state.unfollowUser(followerDid, userDid, options),
 };
 
 // 获取用户相关接口
@@ -400,7 +399,7 @@ class TeamAPI extends EventEmitter {
     return doc;
   }
 
-  async getUsers({ teamDid, query, paging: inputPaging, sort, dids }) {
+  async getUsers({ teamDid, query, paging: inputPaging, sort, dids }, context = {}) {
     const state = await this.getUserState(teamDid);
     const nodeInfo = await this.node.read();
 
@@ -423,7 +422,7 @@ class TeamAPI extends EventEmitter {
     let paging;
 
     if (dids) {
-      list = await state.getUsersByDids({ query, dids });
+      list = await state.getUsersByDids({ query, dids }, context);
       paging = {
         total: list.length,
         pageSize: dids.length,
@@ -431,7 +430,7 @@ class TeamAPI extends EventEmitter {
         page: 1,
       };
     } else {
-      const doc = await state.getUsers({ query, sort, paging: { pageSize: 20, ...inputPaging } });
+      const doc = await state.getUsers({ query, sort, paging: { pageSize: 20, ...inputPaging } }, context);
       list = doc.list;
       paging = doc.paging;
     }
@@ -484,6 +483,7 @@ class TeamAPI extends EventEmitter {
           'connectedAccounts',
 
           'metadata',
+          'isFollowing',
         ]);
 
         return {
@@ -590,8 +590,8 @@ class TeamAPI extends EventEmitter {
     return full || owner;
   }
 
-  async userFollowAction({ teamDid, userDid, action = 'follow' }, context = {}) {
-    const { userDid: followerDid } = context;
+  async userFollowAction({ teamDid, userDid, followerDid, action = 'follow', options = {} }, context = {}) {
+    const targetDid = followerDid || context.userDid;
 
     if (!USER_RELATION_ACTIONS[action]) {
       throw new CustomError(
@@ -599,12 +599,49 @@ class TeamAPI extends EventEmitter {
         `Invalid action: ${action}. Supported: ${Object.keys(USER_RELATION_ACTIONS).join(', ')}`
       );
     }
+    let result;
+    try {
+      const state = await this.getUserState(teamDid);
+      result = await USER_RELATION_ACTIONS[action](state, targetDid, userDid, options);
+    } catch (error) {
+      logger.error(`Failed to ${action} user`, {
+        followerDid: targetDid,
+        userDid,
+        error,
+      });
+      throw error;
+    }
 
-    const state = await this.getUserState(teamDid);
-    return USER_RELATION_ACTIONS[action](state, followerDid, userDid);
+    try {
+      if (action === 'follow' && !options.skipNotification) {
+        const currentUser = await this.getUser({ teamDid, user: { did: targetDid } });
+        await this.createNotification({
+          teamDid,
+          receiver: userDid,
+          title: 'Followed',
+          description: `<${currentUser.fullName}(did:abt:${currentUser.did})> followed you`,
+          activity: {
+            type: 'follow',
+            actor: followerDid,
+            target: {
+              type: 'user',
+              id: followerDid,
+            },
+          },
+          entityId: teamDid,
+          source: 'system',
+          severity: 'success',
+        });
+      }
+    } catch (error) {
+      // 消息创建失败，不影响 follow 操作
+      logger.error('Failed to create notification', { error });
+    }
+
+    return result;
   }
 
-  async getUserFollows({ teamDid, userDid, type = 'following', paging, sort }, context = {}) {
+  async getUserFollows({ teamDid, userDid, type = 'following', paging, sort, options = {} }, context = {}) {
     const state = await this.getUserState(teamDid);
 
     const blocklet = await getBlocklet({ did: teamDid, states: this.states, dataDirs: this.dataDirs });
@@ -624,13 +661,14 @@ class TeamAPI extends EventEmitter {
         {
           paging,
           sort,
+          ...options,
         },
         context
       );
 
       list.forEach((item) => {
         const { user } = item;
-        if (user?.avatar && user?.avatar?.startsWith(USER_AVATAR_URL_PREFIX)) {
+        if (user && user?.avatar && user?.avatar?.startsWith(USER_AVATAR_URL_PREFIX)) {
           user.avatar = `${getFederatedUserAvatarUrl(user.avatar, blocklet)}?imageFilter=resize&w=48&h=48`;
         }
       });
@@ -645,14 +683,17 @@ class TeamAPI extends EventEmitter {
     }
   }
 
-  async getUserFollowStats({ teamDid, userDid }) {
+  async getUserFollowStats({ teamDid, userDids }) {
     const state = await this.getUserState(teamDid);
-    try {
-      return state.getFollowStats(userDid);
-    } catch (error) {
-      logger.error('Failed to get follow stats', { error });
-      throw error;
+    return state.getFollowStats(userDids);
+  }
+
+  async checkFollowing({ teamDid, userDids = [], followerDid }) {
+    if (!followerDid) {
+      throw new CustomError(400, 'Follower DID is required');
     }
+    const state = await this.getUserState(teamDid);
+    return state.isFollowing(followerDid, userDids);
   }
 
   async updateUser({ teamDid, user }) {

package/lib/blocklet/manager/disk.js

@@ -439,9 +439,6 @@ class DiskBlockletManager extends BaseBlockletManager {
       restart: async (params) => {
         await this.restart(params);
       },
-      stop: async (params) => {
-        await this.stop(params);
-      },
       createAuditLog: (params) => this.createAuditLog(params),
       notification: (did, title, description, severity) => {
         try {
@@ -793,7 +790,15 @@ class DiskBlockletManager extends BaseBlockletManager {
   }
 
   async start(
-    { did, throwOnError, checkHealthImmediately = false, e2eMode = false, componentDids: inputComponentDids, atomic },
+    {
+      did,
+      throwOnError,
+      checkHealthImmediately = false,
+      e2eMode = false,
+      componentDids: inputComponentDids,
+      atomic,
+      operator,
+    },
     context
   ) {
     const blocklet = await this.ensureBlocklet(did, { e2eMode });
@@ -823,29 +828,50 @@ class DiskBlockletManager extends BaseBlockletManager {
     });
 
     if (atomic || !blocklet.structVersion) {
-      return this._start({ blocklet, throwOnError, checkHealthImmediately, e2eMode, componentDids }, context);
+      return this._start({ blocklet, throwOnError, checkHealthImmediately, e2eMode, componentDids, operator }, context);
     }
 
     const tasks = componentDids.map(
       (componentDid) => () =>
-        this._start({ blocklet, throwOnError, checkHealthImmediately, e2eMode, componentDids: [componentDid] }, context)
+        this._start(
+          {
+            blocklet,
+            throwOnError,
+            checkHealthImmediately,
+            e2eMode,
+            componentDids: [componentDid],
+            operator,
+          },
+          context
+        )
     );
 
-    const rest = await pAll(tasks, { concurrency: 4 });
+    const rest = await pAll(tasks, { concurrency: 6 });
 
     return rest[0];
   }
 
   async _start(
-    { blocklet: inputBlocklet, did, throwOnError, checkHealthImmediately = false, e2eMode = false, componentDids },
+    {
+      blocklet: inputBlocklet,
+      did,
+      throwOnError,
+      checkHealthImmediately = false,
+      e2eMode = false,
+      componentDids,
+      operator: _operator,
+    },
     context
   ) {
+    const operator = _operator || context?.user?.did;
+
     logger.info('start blocklet', {
       did: did || inputBlocklet.meta.did,
       componentDids,
       throwOnError,
       checkHealthImmediately,
       e2eMode,
+      operator,
     });
     // should check blocklet integrity
     const blocklet1 = inputBlocklet || (await this.ensureBlocklet(did, { e2eMode }));
@@ -875,11 +901,9 @@ class DiskBlockletManager extends BaseBlockletManager {
         }
       }
 
-      // blocklet may be manually stopped durning starting
-      // so error message would not be sent if blocklet is stopped
-      // so we need update status first
       const doc1 = await states.blocklet.setBlockletStatus(did, BlockletStatus.starting, {
         componentDids,
+        operator,
       });
       blocklet1.status = BlockletStatus.starting;
       this.emit(BlockletEvents.statusChange, doc1);
@@ -990,7 +1014,7 @@ class DiskBlockletManager extends BaseBlockletManager {
       });
 
       await this.deleteProcess({ did, componentDids });
-      const res = await states.blocklet.setBlockletStatus(did, BlockletStatus.error, { componentDids });
+      const res = await states.blocklet.setBlockletStatus(did, BlockletStatus.error, { componentDids, operator });
       this.emit(BlockletEvents.startFailed, { ...res, componentDids, error: { message: error.message } });
       this.emit(BlockletEvents.statusChange, { ...res, error: { message: error.message } });
 
@@ -1002,14 +1026,15 @@ class DiskBlockletManager extends BaseBlockletManager {
     }
   }
 
-  async stop({ did, updateStatus = true, silent = false, componentDids, reason }, context) {
-    logger.info('stop blocklet', { did, componentDids, updateStatus, silent });
+  async stop({ did, updateStatus = true, silent = false, componentDids, reason, operator: _operator }, context) {
+    const operator = _operator || context?.user?.did;
+    logger.info('stop blocklet', { did, componentDids, updateStatus, silent, operator });
 
     const blocklet = await this.getBlocklet(did);
     const { processId } = blocklet.env;
 
     if (updateStatus) {
-      const doc = await states.blocklet.setBlockletStatus(did, BlockletStatus.stopping, { componentDids });
+      const doc = await states.blocklet.setBlockletStatus(did, BlockletStatus.stopping, { componentDids, operator });
       blocklet.status = BlockletStatus.stopping;
       this.emit(BlockletEvents.statusChange, doc);
     }
@@ -1055,7 +1080,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     } catch (error) {
       logger.error('Failed to stop blocklet', { error, did });
       if (updateStatus) {
-        const res = await states.blocklet.setBlockletStatus(did, BlockletStatus.error, { componentDids });
+        const res = await states.blocklet.setBlockletStatus(did, BlockletStatus.error, { componentDids, operator });
         this.emit(BlockletEvents.statusChange, res);
       }
       throw error;
@@ -1066,7 +1091,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     launcher.notifyBlockletUpdated(blocklet);
 
     if (updateStatus) {
-      const res = await states.blocklet.setBlockletStatus(did, BlockletStatus.stopped, { componentDids });
+      const res = await states.blocklet.setBlockletStatus(did, BlockletStatus.stopped, { componentDids, operator });
       // send notification to websocket channel
       this.emit(BlockletEvents.statusChange, res);
 
@@ -1173,11 +1198,15 @@ class DiskBlockletManager extends BaseBlockletManager {
    * @param {Record<string, any>} context
    * @returns {import('@blocklet/server-js').BlockletState}
    */
-  async restart({ did, componentDids }, context) {
-    logger.info('restart blocklet', { did });
+  async restart({ did, componentDids, operator: _operator }, context) {
+    const operator = _operator || context?.user?.did;
+    logger.info('restart blocklet', { did, operator });
     const blocklet = await this.getBlocklet(did);
     await this.checkControllerStatus(blocklet, 'restart');
-    await states.blocklet.setBlockletStatus(did, BlockletStatus.stopping, { componentDids });
+    await states.blocklet.setBlockletStatus(did, BlockletStatus.stopping, {
+      componentDids,
+      operator,
+    });
     const result = await states.blocklet.getBlocklet(did);
     this.emit(BlockletEvents.statusChange, result);
 
@@ -1187,12 +1216,13 @@ class DiskBlockletManager extends BaseBlockletManager {
       id: `${did}/${(componentDids || []).join(',')}`,
       did,
       componentDids,
+      operator,
       context,
     });
     ticket.on('failed', async (err) => {
       logger.error('failed to restart blocklet', { did, error: err });
 
-      const state = await states.blocklet.setBlockletStatus(did, BlockletStatus.stopped, { componentDids });
+      const state = await states.blocklet.setBlockletStatus(did, BlockletStatus.stopped, { componentDids, operator });
       this.emit(BlockletEvents.statusChange, state);
 
       const description = `${getComponentNamesWithVersion(result, componentDids)} restart failed for ${getDisplayName(
@@ -3276,9 +3306,9 @@ class DiskBlockletManager extends BaseBlockletManager {
     }
   }
 
-  async _onRestart({ did, componentDids, context }) {
-    await this.stop({ did, componentDids, updateStatus: false }, context);
-    await this.start({ did, componentDids }, context);
+  async _onRestart({ did, componentDids, context, operator }) {
+    await this.stop({ did, componentDids, updateStatus: false, operator }, context);
+    await this.start({ did, componentDids, operator }, context);
   }
 
   async _onCheckIfStarted(jobInfo, { throwOnError } = {}) {

package/lib/blocklet/manager/ensure-blocklet-running.js

@@ -3,6 +3,7 @@ const pAll = require('p-all');
 const { BlockletStatus } = require('@blocklet/constant');
 const sleep = require('@abtnode/util/lib/sleep');
 const { getDisplayName } = require('@blocklet/meta/lib/util');
+const { isValid } = require('@arcblock/did');
 
 const states = require('../../states');
 const { isBlockletPortHealthy, shouldCheckHealthy } = require('../../util/blocklet');
@@ -31,6 +32,9 @@ class EnsureBlockletRunning {
 
   highLoadDisk = +process.env.ABT_NODE_ENSURE_RUNNING_HIGH_LOAD_DISK || 0.95;
 
+  // 进行中状态超时时间（毫秒）
+  inProgressTimeout = +process.env.ABT_NODE_ENSURE_RUNNING_IN_PROGRESS_TIMEOUT || 5 * 60 * 1000;
+
   runningBlocklets = {};
 
   runningRootBlocklets = {};
@@ -211,6 +215,43 @@ class EnsureBlockletRunning {
                   return;
                 }
 
+                // Skip health check if blocklet is in progress status
+                if (inProgressStatuses.includes(blocklet.status)) {
+                  // Check if it's user-initiated operation
+                  // 如果 operator 是 z 开头的字符串，表示是 did, 跳过健康检查
+                  if (blocklet.operator && isValid(blocklet.operator)) {
+                    logger.info('Skip ensure running check for user-initiated operation', {
+                      did,
+                      componentDid: blocklet.meta.did,
+                      status: blocklet.status,
+                      operator: blocklet.operator,
+                    });
+                    return;
+                  }
+
+                  // Check timeout for daemon-initiated or no operator recorded operations
+                  if (blocklet.inProgressStart) {
+                    const elapsedTime = Date.now() - new Date(blocklet.inProgressStart).getTime();
+                    if (elapsedTime < this.inProgressTimeout) {
+                      logger.info('Skip ensure running check due to timeout not reached', {
+                        did,
+                        componentDid: blocklet.meta.did,
+                        status: blocklet.status,
+                        elapsedTime,
+                        timeout: this.inProgressTimeout,
+                      });
+                      return;
+                    }
+                    logger.warn('InProgress timeout reached, proceeding with health check', {
+                      did,
+                      componentDid: blocklet.meta.did,
+                      status: blocklet.status,
+                      elapsedTime,
+                      timeout: this.inProgressTimeout,
+                    });
+                  }
+                }
+
                 const health = await this.isBlockletPortHealthyWithRetries(
                   blocklet,
                   inProgressStatuses.includes(blocklet.status)
@@ -266,7 +307,13 @@ class EnsureBlockletRunning {
 
             try {
               logger.info('restart blocklet:', did, componentDids);
-              await this.restart({ did, componentDids, checkHealthImmediately: true });
+              await this.restart({
+                did,
+                componentDids,
+                checkHealthImmediately: true,
+                atomic: true,
+                operator: 'ensure-blocklet-running',
+              });
               if (this.whenCycleCheck) {
                 this.createAuditLog({
                   action: 'ensureBlockletRunning',

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

@@ -38923,7 +38923,7 @@ module.exports = require("zlib");
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.48","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","coverage":"npm run test -- --coverage"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.48","@abtnode/auth":"1.16.48","@abtnode/certificate-manager":"1.16.48","@abtnode/constant":"1.16.48","@abtnode/cron":"1.16.48","@abtnode/db-cache":"1.16.48","@abtnode/docker-utils":"1.16.48","@abtnode/logger":"1.16.48","@abtnode/models":"1.16.48","@abtnode/queue":"1.16.48","@abtnode/rbac":"1.16.48","@abtnode/router-provider":"1.16.48","@abtnode/static-server":"1.16.48","@abtnode/timemachine":"1.16.48","@abtnode/util":"1.16.48","@aigne/aigne-hub":"^0.6.8","@arcblock/did":"1.22.2","@arcblock/did-connect-js":"1.22.2","@arcblock/did-ext":"1.22.2","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"1.22.2","@arcblock/event-hub":"1.22.2","@arcblock/jwt":"1.22.2","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"1.22.2","@arcblock/vc":"1.22.2","@blocklet/constant":"1.16.48","@blocklet/did-space-js":"^1.1.18","@blocklet/env":"1.16.48","@blocklet/error":"^0.2.5","@blocklet/meta":"1.16.48","@blocklet/resolver":"1.16.48","@blocklet/sdk":"1.16.48","@blocklet/server-js":"1.16.48","@blocklet/store":"1.16.48","@blocklet/theme":"^3.1.27","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.22.2","@ocap/util":"1.22.2","@ocap/wallet":"1.22.2","@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.48","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","coverage":"npm run test -- --coverage"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.48","@abtnode/auth":"1.16.48","@abtnode/certificate-manager":"1.16.48","@abtnode/constant":"1.16.48","@abtnode/cron":"1.16.48","@abtnode/db-cache":"1.16.48","@abtnode/docker-utils":"1.16.48","@abtnode/logger":"1.16.48","@abtnode/models":"1.16.48","@abtnode/queue":"1.16.48","@abtnode/rbac":"1.16.48","@abtnode/router-provider":"1.16.48","@abtnode/static-server":"1.16.48","@abtnode/timemachine":"1.16.48","@abtnode/util":"1.16.48","@aigne/aigne-hub":"^0.6.9","@arcblock/did":"1.22.2","@arcblock/did-connect-js":"1.22.2","@arcblock/did-ext":"1.22.2","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"1.22.2","@arcblock/event-hub":"1.22.2","@arcblock/jwt":"1.22.2","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"1.22.2","@arcblock/vc":"1.22.2","@blocklet/constant":"1.16.48","@blocklet/did-space-js":"^1.1.18","@blocklet/env":"1.16.48","@blocklet/error":"^0.2.5","@blocklet/meta":"1.16.48","@blocklet/resolver":"1.16.48","@blocklet/sdk":"1.16.48","@blocklet/server-js":"1.16.48","@blocklet/store":"1.16.48","@blocklet/theme":"^3.1.30","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.22.2","@ocap/util":"1.22.2","@ocap/wallet":"1.22.2","@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

@@ -536,11 +536,11 @@ function ABTNode(options) {
     // user follow
     followUser: (params, context) => teamAPI.userFollowAction({ ...params, action: 'follow' }, context),
     unfollowUser: (params, context) => teamAPI.userFollowAction({ ...params, action: 'unfollow' }, context),
-    isFollowing: (params, context) => teamAPI.userFollowAction({ ...params, action: 'isFollowing' }, context),
 
     getUserFollowers: (params, context) => teamAPI.getUserFollows({ ...params, type: 'followers' }, context),
     getUserFollowing: (params, context) => teamAPI.getUserFollows({ ...params, type: 'following' }, context),
     getUserFollowStats: teamAPI.getUserFollowStats.bind(teamAPI),
+    checkFollowing: teamAPI.checkFollowing.bind(teamAPI),
 
     // Tagging
     createTag: teamAPI.createTag.bind(teamAPI),

package/lib/router/index.js

@@ -311,7 +311,7 @@ Router.formatSites = (sites = []) => {
     const rules = Array.isArray(site.rules) ? cloneDeep(site.rules) : [];
     const grouped = {};
 
-    // 0. serve robots.txt/sitemap.xml from root and proxy to daemon
+    // 0. serve robots.txt/sitemap.xml and favicon.ico from root and proxy to daemon
     if (isBlockletSite(site.domain) && !site.rules.find((x) => x.from.pathPrefix === '/robots.txt')) {
       site.rules.push({
         dynamic: true,
@@ -329,6 +329,14 @@ Router.formatSites = (sites = []) => {
       });
     }
 
+    if (isBlockletSite(site.domain) && !site.rules.find((x) => x.from.pathPrefix === '/favicon.ico')) {
+      site.rules.push({
+        dynamic: true,
+        from: { root: true, pathPrefix: '/', groupPathPrefix: '/', pathSuffix: '/favicon.ico' },
+        to: { type: ROUTING_RULE_TYPES.SERVICE, port: process.env.ABT_NODE_SERVICE_PORT, did: site.blockletDid },
+      });
+    }
+
     // 1. serve blocklet.js for each component: both prefix and suffix do not contain trailing slash
     rules.forEach((rule) => {
       if ([ROUTING_RULE_TYPES.BLOCKLET].includes(rule.to.type) === false) {

package/lib/states/blocklet.js

@@ -555,8 +555,8 @@ class BlockletState extends BaseState {
    *   componentDids?: Array<Did>
    * }}
    */
-  async setBlockletStatus(did, status, { componentDids } = {}) {
-    logger.info('setBlockletStatus', { did, status, componentDids });
+  async setBlockletStatus(did, status, { componentDids, operator = 'daemon' } = {}) {
+    logger.info('setBlockletStatus', { did, status, componentDids, operator });
     if (typeof status === 'undefined') {
       throw new Error('Unsupported blocklet status');
     }
@@ -568,14 +568,16 @@ class BlockletState extends BaseState {
       const doc = await this.getBlocklet(did);
 
       if (doc.meta?.group === BlockletGroup.gateway && !doc.children?.length) {
-        const res = await this.updateBlocklet(did, { status });
+        const updateData = { status, operator };
+        const res = await this.updateBlocklet(did, updateData);
         statusLock.release();
         return res;
       }
 
       // for backward compatibility
       if (!doc.structVersion && !doc.children?.length) {
-        const res = await this.updateBlocklet(did, { status });
+        const updateData = { status, operator };
+        const res = await this.updateBlocklet(did, updateData);
         statusLock.release();
         return res;
       }
@@ -599,9 +601,14 @@ class BlockletState extends BaseState {
           component.startedAt = null;
           component.stoppedAt = new Date();
         }
+        component.operator = operator;
+        component.inProgressStart = Date.now();
       });
 
-      const res = await this.updateBlocklet(did, pick(doc, ['status', 'children']));
+      const updateData = pick(doc, ['status', 'children']);
+      updateData.operator = operator;
+
+      const res = await this.updateBlocklet(did, updateData);
       statusLock.release();
       return res;
     } catch (error) {

package/lib/states/user.js

@@ -253,7 +253,7 @@ class User extends ExtendBase {
   /**
    * Get blocklet service user list
    */
-  async getUsers({ query, sort, paging } = {}) {
+  async getUsers({ query, sort, paging } = {}, context = {}) {
     const where = {};
     const replacements = {};
 
@@ -268,7 +268,11 @@ class User extends ExtendBase {
       includeTags = false,
       includePassports = false,
       includeConnectedAccounts = false,
+      includeFollowStatus = false,
     } = query || {};
+
+    const { user } = context || {};
+
     const shouldIncludeTag = (tags && tags.length) || includeTags;
 
     if (isNullOrUndefined(approved) === false) {
@@ -417,18 +421,27 @@ SELECT did,inviter,generation FROM UserTree`.trim();
     }
 
     const result = await this.paginate({ where, include, replacements }, sorting, paging);
+
+    if (includeFollowStatus && user?.did) {
+      result.list = await this._enrichWithFollowStatus(result.list, user.did);
+    }
+
     return { list: result.list, paging: { ...result.paging, total: total || result.paging.total } };
   }
 
   // eslint-disable-next-line require-await
-  async getUsersByDids({ dids, query }) {
+  async getUsersByDids({ dids, query }, context = {}) {
     const {
       approved,
       includeTags = false,
       includePassports = false,
       includeConnectedAccounts = false,
+      includeFollowStatus = false,
       selection = {},
     } = query || {};
+
+    const { user } = context || {};
+
     // 如果 dids 包含 *，则查询全部
     const condition = dids.includes('*') ? {} : { did: dids };
     if (isNullOrUndefined(approved) === false) {
@@ -448,7 +461,12 @@ SELECT did,inviter,generation FROM UserTree`.trim();
       include.push(this.getConnectedInclude());
     }
 
-    const result = await this.find({ where: condition, include }, selection);
+    let result = await this.find({ where: condition, include }, selection);
+
+    if (includeFollowStatus && user?.did) {
+      result = await this._enrichWithFollowStatus(result, user.did, dids);
+    }
+
     return result;
   }
 
@@ -837,18 +855,40 @@ SELECT did,inviter,generation FROM UserTree`.trim();
     dids.forEach((did) => {
       const { error } = Joi.DID().validate(did);
       if (error) {
-        throw new CustomError(400, `Invalid did: ${did}`);
+        throw new CustomError(400, JSON.stringify({ code: 'INVALID_USER', message: `Invalid did: ${did}` }));
       }
     });
 
     const users = await Promise.all(dids.map((did) => this.getUserByDid(did)));
     dids.forEach((did, index) => {
       if (!users[index]) {
-        throw new CustomError(404, `User does not exist: ${did}`);
+        throw new CustomError(400, JSON.stringify({ code: 'USER_NOT_FOUND', message: `User does not exist: ${did}` }));
       }
     });
   }
 
+  /**
+   * 为用户列表添加关注状态
+   * @private
+   * @param {Array} users - 用户列表
+   * @param {string} currentUserDid - 当前用户的 DID
+   * @param {Array} userDids - 用户DID列表，如果未提供则从 users 中提取
+   * @returns {Promise<Array>} - 添加了 isFollowing 字段的用户列表
+   */
+  async _enrichWithFollowStatus(users, currentUserDid, userDids = null) {
+    if (!currentUserDid || !users || users.length === 0) {
+      return users;
+    }
+
+    const targetDids = userDids || users.map((item) => item.did);
+    const followerMap = await this.isFollowing(currentUserDid, targetDids);
+
+    return users.map((item) => ({
+      ...item,
+      isFollowing: followerMap[item.did],
+    }));
+  }
+
   /**
    * 关注用户
    * @param {string} followerDid - 关注者的 DID
@@ -858,7 +898,7 @@ SELECT did,inviter,generation FROM UserTree`.trim();
     checkUserFollowers(this.userFollowers);
 
     if (followerDid === userDid) {
-      throw new CustomError(400, 'Cannot follow yourself');
+      throw new CustomError(400, JSON.stringify({ code: 'SELF_FOLLOW', message: 'Cannot follow yourself' }));
     }
 
     // 检查两个用户是否存在 + 检查是否已经关注（并行执行）
@@ -868,7 +908,7 @@ SELECT did,inviter,generation FROM UserTree`.trim();
     ]);
 
     if (existingFollow) {
-      throw new CustomError(400, 'Already following this user');
+      throw new CustomError(400, JSON.stringify({ code: 'ALREADY_FOLLOWING', message: 'Already following this user' }));
     }
 
     // 创建关注关系
@@ -895,9 +935,22 @@ SELECT did,inviter,generation FROM UserTree`.trim();
 
   /**
    * 通用的关注关系查询函数
+   * @param {string} targetDid - 目标用户DID
+   * @param {string} type - 查询类型 'followers' 或 'following'
+   * @param {object} options - 选项
+   * @param {object} options.paging - 分页参数
+   * @param {object} options.sort - 排序参数
+   * @param {boolean} options.includeUserInfo - 是否包含用户详细信息，默认true
+   * @param {boolean} options.includeFollowStatus - 是否包含当前用户的关注状态，默认 true
+   * @param {object} context - 上下文，包含当前用户信息
    * @private
    */
-  async _getFollowRelations(targetDid, type, { paging, sort, includeUserInfo = true } = {}, context = {}) {
+  async _getFollowRelations(
+    targetDid,
+    type,
+    { paging, sort, includeUserInfo = true, includeFollowStatus = true } = {},
+    context = {}
+  ) {
     checkUserFollowers(this.userFollowers);
 
     const { user: contextUser } = context;
@@ -911,44 +964,63 @@ SELECT did,inviter,generation FROM UserTree`.trim();
     const sorting = [['createdAt', sort?.createdAt ? order : 'DESC']];
     const result = await this.userFollowers.paginate({ where }, sorting, paging);
 
-    // 如果需要包含用户信息，手动查询用户数据
+    // 准备用户信息映射
+    let userMap = new Map();
     if (includeUserInfo && this.models.User) {
       const userDids = [...new Set(result.list.map((follow) => (isFollowers ? follow.followerDid : follow.userDid)))];
       const users = await this.find({
         where: { did: { [Op.in]: userDids } },
         attributes: ['did', 'fullName', 'avatar', 'email'],
       });
-      const userMap = new Map(users.map((user) => [user.did, user]));
-
-      const enrichedList = await Promise.all(
-        result.list.map(async (follow) => {
-          const userDid = isFollowers ? follow.followerDid : follow.userDid;
-          const user = userMap.get(userDid);
-          const enrichedFollow = {
-            ...follow,
-            user: user ? { ...user } : null,
-          };
+      userMap = new Map(users.map((user) => [user.did, user]));
+    }
 
-          if (contextUser?.did && contextUser.did !== targetDid) {
-            // 如果查看的是别人的关注列表，需要添加是否已关注的信息
-            const isFollowing = await this.isFollowing(contextUser.did, user.did);
-            enrichedFollow.isFollowing = isFollowing;
-          } else if (isFollowers) {
-            // 如果是查询粉丝，需要添加是否已关注的信息
-            const isFollowing = await this.isFollowing(targetDid, follow.followerDid);
-            enrichedFollow.isFollowing = isFollowing;
-          } else {
-            enrichedFollow.isFollowing = true;
-          }
+    // 准备关注状态映射
+    let followingStatusMap = {};
+    if (includeFollowStatus && contextUser?.did) {
+      if (contextUser.did !== targetDid) {
+        // 查询当前用户对列表中所有用户的关注状态
+        const targetUserDids = result.list.map((follow) => (isFollowers ? follow.followerDid : follow.userDid));
+        followingStatusMap = await this.isFollowing(contextUser.did, targetUserDids);
+      } else if (isFollowers && targetDid) {
+        // 查询目标用户对所有粉丝的关注状态
+        const followerDids = result.list.map((follow) => follow.followerDid);
+        followingStatusMap = await this.isFollowing(targetDid, followerDids);
+      }
+    }
 
-          return enrichedFollow;
-        })
-      );
+    // 构建增强的列表
+    const enrichedList = result.list.map((follow) => {
+      const userDid = isFollowers ? follow.followerDid : follow.userDid;
+      const enrichedFollow = { ...follow };
 
-      result.list = enrichedList;
-    }
+      // 添加用户信息
+      if (includeUserInfo && userMap.size > 0) {
+        const user = userMap.get(userDid);
+        enrichedFollow.user = user ? { ...user } : null;
+      }
 
-    if (!includeUserInfo) {
+      // 添加关注状态
+      if (includeFollowStatus && contextUser?.did) {
+        if (contextUser.did !== targetDid) {
+          // 如果查看的是别人的关注列表，需要添加是否已关注的信息
+          enrichedFollow.isFollowing = followingStatusMap[userDid] || false;
+        } else if (isFollowers) {
+          // 如果是查询粉丝，需要添加是否已关注的信息
+          enrichedFollow.isFollowing = followingStatusMap[follow.followerDid] || false;
+        } else {
+          // 查看自己的关注列表，默认都是已关注状态
+          enrichedFollow.isFollowing = true;
+        }
+      }
+
+      return enrichedFollow;
+    });
+
+    result.list = enrichedList;
+
+    // 如果不需要用户信息且不需要关注状态，只返回用户DID
+    if (!includeUserInfo && !includeFollowStatus) {
       result.list = result.list.map((follow) => (isFollowers ? follow.followerDid : follow.userDid));
     }
 
@@ -970,53 +1042,102 @@ SELECT did,inviter,generation FROM UserTree`.trim();
   }
 
   /**
-   * 检查用户A是否关注了用户B
+   * 批量检查用户A是否关注了多个用户
    * @param {string} followerDid - 关注者的 DID
-   * @param {string} userDid - 被关注用户的 DID
+   * @param {string[]} userDids - 被关注用户的 DID 数组
+   * @returns {Promise<{[userDid: string]: boolean}>} - 返回一个对象，键为用户DID，值为是否关注的布尔值
    */
-  async isFollowing(followerDid, userDid) {
-    if (!this.userFollowers) {
-      return false;
+  async isFollowing(followerDid, userDids) {
+    if (!this.userFollowers || !followerDid || !Array.isArray(userDids) || userDids.length === 0) {
+      return userDids.reduce((acc, userDid) => ({ ...acc, [userDid]: false }), {});
     }
 
     try {
-      const follow = await this.userFollowers.findOne({
-        userDid,
+      // 一次性查询所有关注关系
+      const follows = await this.userFollowers.find({
         followerDid,
+        userDid: { [Op.in]: userDids },
+      });
+      // 构建已关注用户的 Set，提高查找效率
+      const followingSet = new Set(follows.map((follow) => follow.userDid));
+
+      // 构建结果对象
+      const result = {};
+      userDids.forEach((userDid) => {
+        result[userDid] = followingSet.has(userDid);
       });
 
-      return !!follow;
+      return result;
     } catch (error) {
-      logger.error('Failed to check following status:', error);
-      return false;
+      logger.error('Failed to check multiple following status:', error);
+      // 出错时返回全部为 false 的结果
+      return userDids.reduce((acc, userDid) => ({ ...acc, [userDid]: false }), {});
     }
   }
 
   /**
-   * 获取用户的关注统计信息
-   * @param {string} userDid - 用户的 DID
+   * 批量获取多个用户的关注统计信息
+   * @param {string[]} userDids - 用户的 DID 数组
+   * @returns {Promise<{[userDid: string]: {followers: number, following: number}}>} - 返回对象，键为用户DID，值为统计信息
    */
-  async getFollowStats(userDid) {
-    if (!this.userFollowers) {
-      return {
-        followers: 0,
-        following: 0,
-      };
+  async getFollowStats(userDids = []) {
+    if (!this.userFollowers || !Array.isArray(userDids) || userDids.length === 0) {
+      return userDids.reduce(
+        (acc, userDid) => ({
+          ...acc,
+          [userDid]: { followers: 0, following: 0 },
+        }),
+        {}
+      );
     }
 
     try {
-      const [followers, following] = await Promise.all([
-        this.userFollowers.count({ userDid }), // 粉丝数
-        this.userFollowers.count({ followerDid: userDid }), // 关注数
+      // 使用原生 SQL 查询进行批量统计，提高性能
+      const followersQuery = `
+        SELECT "userDid", COUNT(*) as count
+        FROM user_followers
+        WHERE "userDid" IN (:userDids)
+        GROUP BY "userDid"
+      `;
+
+      const followingQuery = `
+        SELECT "followerDid", COUNT(*) as count
+        FROM user_followers
+        WHERE "followerDid" IN (:userDids)
+        GROUP BY "followerDid"
+      `;
+
+      const [followersResults, followingResults] = await Promise.all([
+        this.model.sequelize.query(followersQuery, { replacements: { userDids }, type: Sequelize.QueryTypes.SELECT }),
+        this.model.sequelize.query(followingQuery, { replacements: { userDids }, type: Sequelize.QueryTypes.SELECT }),
       ]);
 
-      return {
-        followers,
-        following,
-      };
+      // 使用 Map 构造函数和数组映射优化数据结构构建
+      const followersMap = new Map(followersResults.map((row) => [row.userDid, Number(row.count)]));
+      const followingMap = new Map(followingResults.map((row) => [row.followerDid, Number(row.count)]));
+
+      // 使用 Object.fromEntries 优化结果对象构建
+      const result = Object.fromEntries(
+        userDids.map((userDid) => [
+          userDid,
+          {
+            followers: followersMap.get(userDid) || 0,
+            following: followingMap.get(userDid) || 0,
+          },
+        ])
+      );
+
+      return result;
     } catch (error) {
-      logger.error('Failed to get follow stats:', error);
-      return { followers: 0, following: 0 };
+      logger.error('Failed to get multiple follow stats:', error);
+      // 出错时返回全部为 0 的结果
+      return userDids.reduce(
+        (acc, userDid) => ({
+          ...acc,
+          [userDid]: { followers: 0, following: 0 },
+        }),
+        {}
+      );
     }
   }
 }

package/lib/util/blocklet.js

@@ -925,8 +925,8 @@ const getProcessState = async (processId) => {
   return statusMap[info.pm2_env.status];
 };
 
-const getProcessInfo = (processId, { throwOnNotExist = true } = {}) =>
-  getPm2ProcessInfo(processId, { printError: logger.error.bind(logger), throwOnNotExist });
+const getProcessInfo = (processId, { throwOnNotExist = true, timeout = 10_000 } = {}) =>
+  getPm2ProcessInfo(processId, { printError: logger.error.bind(logger), throwOnNotExist, timeout });
 
 const deleteProcess = (processId) => {
   return new Promise((resolve, reject) => {
@@ -1027,7 +1027,7 @@ const _checkProcessHealthy = async (blocklet, { minConsecutiveTime, timeout, log
     // ensure pm2 status is 'online'
     const getStatus = async () => {
       try {
-        const info = await getProcessInfo(processId);
+        const info = await getProcessInfo(processId, { timeout: 3_000 });
         return info.pm2_env.status;
       } catch (err) {
         logger.error('blocklet checkStart error', { error: err, processId, name });

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.49-beta-20250823-082650-626c1473",
+  "version": "1.16.49-beta-20250827-025603-2bb1a7ee",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,22 +19,22 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.49-beta-20250823-082650-626c1473",
-    "@abtnode/auth": "1.16.49-beta-20250823-082650-626c1473",
-    "@abtnode/certificate-manager": "1.16.49-beta-20250823-082650-626c1473",
-    "@abtnode/constant": "1.16.49-beta-20250823-082650-626c1473",
-    "@abtnode/cron": "1.16.49-beta-20250823-082650-626c1473",
-    "@abtnode/db-cache": "1.16.49-beta-20250823-082650-626c1473",
-    "@abtnode/docker-utils": "1.16.49-beta-20250823-082650-626c1473",
-    "@abtnode/logger": "1.16.49-beta-20250823-082650-626c1473",
-    "@abtnode/models": "1.16.49-beta-20250823-082650-626c1473",
-    "@abtnode/queue": "1.16.49-beta-20250823-082650-626c1473",
-    "@abtnode/rbac": "1.16.49-beta-20250823-082650-626c1473",
-    "@abtnode/router-provider": "1.16.49-beta-20250823-082650-626c1473",
-    "@abtnode/static-server": "1.16.49-beta-20250823-082650-626c1473",
-    "@abtnode/timemachine": "1.16.49-beta-20250823-082650-626c1473",
-    "@abtnode/util": "1.16.49-beta-20250823-082650-626c1473",
-    "@aigne/aigne-hub": "^0.6.8",
+    "@abtnode/analytics": "1.16.49-beta-20250827-025603-2bb1a7ee",
+    "@abtnode/auth": "1.16.49-beta-20250827-025603-2bb1a7ee",
+    "@abtnode/certificate-manager": "1.16.49-beta-20250827-025603-2bb1a7ee",
+    "@abtnode/constant": "1.16.49-beta-20250827-025603-2bb1a7ee",
+    "@abtnode/cron": "1.16.49-beta-20250827-025603-2bb1a7ee",
+    "@abtnode/db-cache": "1.16.49-beta-20250827-025603-2bb1a7ee",
+    "@abtnode/docker-utils": "1.16.49-beta-20250827-025603-2bb1a7ee",
+    "@abtnode/logger": "1.16.49-beta-20250827-025603-2bb1a7ee",
+    "@abtnode/models": "1.16.49-beta-20250827-025603-2bb1a7ee",
+    "@abtnode/queue": "1.16.49-beta-20250827-025603-2bb1a7ee",
+    "@abtnode/rbac": "1.16.49-beta-20250827-025603-2bb1a7ee",
+    "@abtnode/router-provider": "1.16.49-beta-20250827-025603-2bb1a7ee",
+    "@abtnode/static-server": "1.16.49-beta-20250827-025603-2bb1a7ee",
+    "@abtnode/timemachine": "1.16.49-beta-20250827-025603-2bb1a7ee",
+    "@abtnode/util": "1.16.49-beta-20250827-025603-2bb1a7ee",
+    "@aigne/aigne-hub": "^0.6.9",
     "@arcblock/did": "1.22.2",
     "@arcblock/did-connect-js": "1.22.2",
     "@arcblock/did-ext": "1.22.2",
@@ -45,16 +45,16 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "1.22.2",
     "@arcblock/vc": "1.22.2",
-    "@blocklet/constant": "1.16.49-beta-20250823-082650-626c1473",
+    "@blocklet/constant": "1.16.49-beta-20250827-025603-2bb1a7ee",
     "@blocklet/did-space-js": "^1.1.18",
-    "@blocklet/env": "1.16.49-beta-20250823-082650-626c1473",
+    "@blocklet/env": "1.16.49-beta-20250827-025603-2bb1a7ee",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.49-beta-20250823-082650-626c1473",
-    "@blocklet/resolver": "1.16.49-beta-20250823-082650-626c1473",
-    "@blocklet/sdk": "1.16.49-beta-20250823-082650-626c1473",
-    "@blocklet/server-js": "1.16.49-beta-20250823-082650-626c1473",
-    "@blocklet/store": "1.16.49-beta-20250823-082650-626c1473",
-    "@blocklet/theme": "^3.1.27",
+    "@blocklet/meta": "1.16.49-beta-20250827-025603-2bb1a7ee",
+    "@blocklet/resolver": "1.16.49-beta-20250827-025603-2bb1a7ee",
+    "@blocklet/sdk": "1.16.49-beta-20250827-025603-2bb1a7ee",
+    "@blocklet/server-js": "1.16.49-beta-20250827-025603-2bb1a7ee",
+    "@blocklet/store": "1.16.49-beta-20250827-025603-2bb1a7ee",
+    "@blocklet/theme": "^3.1.30",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.22.2",
     "@ocap/util": "1.22.2",
@@ -118,5 +118,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "54d2281fc6f72dadd12ed86b38d5a4e150bcaba8"
+  "gitHead": "2b70eea34e8bc8546abb09d38935e8906d9586fd"
 }