@abtnode/core 1.16.50 → 1.16.51-beta-20250905-023351-70af144b

package/lib/api/team.js

@@ -59,6 +59,7 @@ const { getBlocklet } = require('../util/blocklet');
 const StoreUtil = require('../util/store');
 const { profileSchema } = require('../validators/user');
 const { passportDisplaySchema } = require('../validators/util');
+const { validateUserRolePassport } = require('../util/validate-user-role-passport');
 
 const sanitizeUrl = (url) => {
   if (!url) {
@@ -683,9 +684,11 @@ class TeamAPI extends EventEmitter {
     }
   }
 
-  async getUserFollowStats({ teamDid, userDids }) {
+  async getUserFollowStats({ teamDid, userDids }, context = {}) {
     const state = await this.getUserState(teamDid);
-    return state.getFollowStats(userDids);
+    const info = await this.node.read();
+    const prefix = process.env.NODE_ENV === 'production' ? info.routing.adminPath : '';
+    return state.getFollowStats({ userDids, teamDid, prefix }, context);
   }
 
   async checkFollowing({ teamDid, userDids = [], followerDid }) {
@@ -1094,6 +1097,14 @@ class TeamAPI extends EventEmitter {
       throw new Error('Inviter does not exist');
     }
 
+    if ((user?.role || '').startsWith('blocklet-')) {
+      const userInfo = await this.getUser({ teamDid, user });
+      validateUserRolePassport({
+        role: (user?.role || '').replace('blocklet-', ''),
+        passports: userInfo?.passports || [],
+      });
+    }
+
     const expireDate = Date.now() + (expireTime || this.memberInviteExpireTime);
     const state = await this.getSessionState(teamDid);
     const { id: inviteId } = await state.start({

package/lib/blocklet/manager/disk.js

@@ -924,10 +924,14 @@ class DiskBlockletManager extends BaseBlockletManager {
         { parallel: true, concurrencyLimit: 4 }
       );
       if (nonEntryComponentIds.length) {
-        nonEntryComponentRes = await states.blocklet.setBlockletStatus(did, BlockletStatus.running, {
+        const params = {
+          did,
+          context,
+          minConsecutiveTime: 3000,
+          timeout: 5000,
           componentDids: nonEntryComponentIds,
-          operator,
-        });
+        };
+        nonEntryComponentRes = await this._onCheckIfStarted(params, { throwOnError, skipRunningCheck: true });
       }
     } catch (err) {
       logger.error('Failed to categorize components into entry and non-entry types', { error: err.message });
@@ -1156,7 +1160,7 @@ class DiskBlockletManager extends BaseBlockletManager {
 
     logger.info('blocklet stopped successfully', { processId, did });
 
-    launcher.notifyBlockletUpdated(blocklet);
+    launcher.notifyBlockletStopped(blocklet);
 
     if (updateStatus) {
       const res = await states.blocklet.setBlockletStatus(did, BlockletStatus.stopped, { componentDids, operator });
@@ -3379,7 +3383,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     await this.start({ did, componentDids, operator }, context);
   }
 
-  async _onCheckIfStarted(jobInfo, { throwOnError } = {}) {
+  async _onCheckIfStarted(jobInfo, { throwOnError, skipRunningCheck = false } = {}) {
     const startedAt = Date.now();
     const { did, context, minConsecutiveTime = 2000, timeout, componentDids } = jobInfo;
     const blocklet = await this.getBlocklet(did);
@@ -3389,18 +3393,19 @@ class DiskBlockletManager extends BaseBlockletManager {
 
     const nodeInfo = await states.node.read();
     try {
-      // healthy check
-      await checkBlockletProcessHealthy(blocklet, {
-        minConsecutiveTime,
-        timeout,
-        componentDids,
-        enableDocker: nodeInfo.enableDocker,
-        setBlockletRunning: async (componentDid) => {
-          await states.blocklet.setBlockletStatus(did, BlockletStatus.running, { componentDids: [componentDid] });
-        },
-      });
+      if (!skipRunningCheck) {
+        await checkBlockletProcessHealthy(blocklet, {
+          minConsecutiveTime,
+          timeout,
+          componentDids,
+          enableDocker: nodeInfo.enableDocker,
+          setBlockletRunning: async (componentDid) => {
+            await states.blocklet.setBlockletStatus(did, BlockletStatus.running, { componentDids: [componentDid] });
+          },
+        });
+      }
 
-      await states.blocklet.setBlockletStatus(did, BlockletStatus.running, { componentDids });
+      const runningRes = await states.blocklet.setBlockletStatus(did, BlockletStatus.running, { componentDids });
 
       const res = await this.getBlocklet(did);
 
@@ -3413,14 +3418,16 @@ class DiskBlockletManager extends BaseBlockletManager {
       this.emit(BlockletEvents.statusChange, res);
       this.emit(BlockletEvents.started, { ...res, componentDids });
 
-      launcher.notifyBlockletUpdated(blocklet);
+      launcher.notifyBlockletStarted(blocklet);
 
       logger.info('blocklet healthy', { did, name, time: Date.now() - startedAt });
+
+      return runningRes;
     } catch (error) {
       const status = await states.blocklet.getBlockletStatus(did);
       if ([BlockletStatus.stopping, BlockletStatus.stopped].includes(status)) {
         logger.info(`Check blocklet healthy failing because blocklet is ${fromBlockletStatus(status)}`);
-        return;
+        return {};
       }
 
       logger.error('check blocklet if started failed', { did, name, context, timeout, error });
@@ -3449,6 +3456,8 @@ class DiskBlockletManager extends BaseBlockletManager {
       if (throwOnError) {
         throw error;
       }
+
+      return doc;
     }
   }