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

package/lib/blocklet/webhook/event-bus.js

@@ -51,7 +51,7 @@ const init = ({ states, teamManager }) => {
     const { event } = data;
     const { type, source, object_id: objectId, object_type: objectType } = event;
 
-    const request = event.data;
+    const request = { ...event.data, $eventName: type };
     logger.info('create webhook event', { type, source, request });
 
     const { webhookEventState } = await teamManager.getWebhookState(appDid);

package/lib/states/user.js

@@ -11,12 +11,12 @@ const { updateConnectedAccount } = require('@abtnode/util/lib/user');
 const { LOGIN_PROVIDER } = require('@blocklet/constant');
 const { CustomError } = require('@blocklet/error');
 const { Joi } = require('@arcblock/validator');
-
 const logger = require('@abtnode/logger')('@abtnode/core:states:user');
 
 const { validateOwner } = require('../util');
 const { loginSchema, disconnectAccountSchema } = require('../validators/user');
 const ExtendBase = require('./base');
+const { isInDashboard, isUserPrivacyEnabled, isAdminUser } = require('../util/verify-user-private');
 
 const isNullOrUndefined = (x) => x === undefined || x === null;
 
@@ -962,6 +962,8 @@ SELECT did,inviter,generation FROM UserTree`.trim();
 
     const { user: contextUser } = context;
 
+    const contextUserDid = contextUser?.userInfo?.did || contextUser?.did;
+
     await this._validateUsersExist([targetDid]);
 
     const isFollowers = type === 'followers';
@@ -977,15 +979,15 @@ SELECT did,inviter,generation FROM UserTree`.trim();
       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'],
+        attributes: ['did', 'fullName', 'avatar'],
       });
       userMap = new Map(users.map((user) => [user.did, user]));
     }
 
     // 准备关注状态映射
     let followingStatusMap = {};
-    if (includeFollowStatus && contextUser?.did) {
-      if (contextUser.did !== targetDid) {
+    if (includeFollowStatus && contextUserDid) {
+      if (contextUserDid !== targetDid) {
         // 查询当前用户对列表中所有用户的关注状态
         const targetUserDids = result.list.map((follow) => (isFollowers ? follow.followerDid : follow.userDid));
         followingStatusMap = await this.isFollowing(contextUser.did, targetUserDids);
@@ -1008,8 +1010,8 @@ SELECT did,inviter,generation FROM UserTree`.trim();
       }
 
       // 添加关注状态
-      if (includeFollowStatus && contextUser?.did) {
-        if (contextUser.did !== targetDid) {
+      if (includeFollowStatus && contextUserDid) {
+        if (contextUserDid !== targetDid) {
           // 如果查看的是别人的关注列表，需要添加是否已关注的信息
           enrichedFollow.isFollowing = followingStatusMap[userDid] || false;
         } else if (isFollowers) {
@@ -1087,7 +1089,7 @@ SELECT did,inviter,generation FROM UserTree`.trim();
    * @param {string[]} userDids - 用户的 DID 数组
    * @returns {Promise<{[userDid: string]: {followers: number, following: number}}>} - 返回对象，键为用户DID，值为统计信息
    */
-  async getFollowStats(userDids = []) {
+  async getFollowStats({ userDids = [], teamDid, prefix }, context = {}) {
     if (!this.userFollowers || !Array.isArray(userDids) || userDids.length === 0) {
       return userDids.reduce(
         (acc, userDid) => ({
@@ -1099,6 +1101,20 @@ SELECT did,inviter,generation FROM UserTree`.trim();
     }
 
     try {
+      const { user: contextUser } = context;
+      const contextUserDid = contextUser?.userInfo?.did || contextUser?.did;
+
+      const privacyMap = new Map();
+      if (!(isInDashboard(teamDid, prefix, context) && isAdminUser(context))) {
+        // 批量获取用户隐私设置
+        const usersInfo = await this.find({ did: { $in: userDids } }, { did: 1, extra: 1 });
+
+        usersInfo.forEach((userInfo) => {
+          const isPrivate = isUserPrivacyEnabled(userInfo);
+          privacyMap.set(userInfo.did, isPrivate);
+        });
+      }
+
       // 使用原生 SQL 查询进行批量统计，提高性能
       const followersQuery = `
         SELECT "userDid", COUNT(*) as count
@@ -1123,15 +1139,25 @@ SELECT did,inviter,generation FROM UserTree`.trim();
       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 优化结果对象构建
+      // 使用 Object.fromEntries 优化结果对象构建，并进行隐私判断
       const result = Object.fromEntries(
-        userDids.map((userDid) => [
-          userDid,
-          {
-            followers: followersMap.get(userDid) || 0,
-            following: followingMap.get(userDid) || 0,
-          },
-        ])
+        userDids.map((userDid) => {
+          const isPrivate = privacyMap.get(userDid) || false;
+          const isOwner = contextUserDid === userDid;
+
+          // 如果用户设置了隐私且查看者不是用户本人，返回 0
+          if (isPrivate && !isOwner) {
+            return [userDid, { followers: 0, following: 0 }];
+          }
+
+          return [
+            userDid,
+            {
+              followers: followersMap.get(userDid) || 0,
+              following: followingMap.get(userDid) || 0,
+            },
+          ];
+        })
       );
 
       return result;

package/lib/team/manager.js

@@ -226,10 +226,14 @@ class TeamManager extends EventEmitter {
           userDids.map((did) => userState.getUser(did, { includePassports: true, enableConnectedAccount: true }))
         );
 
-        const validUsers = queryUsers.filter((user) => {
+        const validUsers = queryUsers.filter((user, index) => {
+          if (!user) {
+            logger.warn('receiver is not exist: ', { userDid: userDids[index] });
+            return false;
+          }
           const { passports = [] } = user;
           // 如果用户没有 passport，或者 有一个 passport 没有过期，则返回 true
-          if (!passports.length || passports.some((x) => !this.isPassportExpired(x))) {
+          if (!passports?.length || passports.some((x) => !this.isPassportExpired(x))) {
             return true;
           }
           logger.warn(`user's passports are all expired: ${user.did}`);
@@ -480,7 +484,7 @@ class TeamManager extends EventEmitter {
         ...(actorInfo ? { actorInfo } : {}),
         options: typeof payload.options === 'object' && payload.options !== null ? payload.options : {},
       });
-      logger.info('notification has been added to the push queue', { notificationId: doc.id });
+      logger.info('notification has been added to the push queue', { teamDid, notificationId: doc.id });
     } catch (error) {
       logger.error('Failed to emit notification events', { error });
       throw new Error(`Failed to emit notification events: ${error.message}`);
@@ -538,14 +542,14 @@ class TeamManager extends EventEmitter {
 
       const doc = await this._createNotificationDoc(notificationState, payload, receivers, source, isServices, teamDid);
 
-      logger.info('notification created successfully', { notificationId: doc.id });
+      logger.info('notification created successfully', { teamDid, notificationId: doc.id });
 
       const defaultChannel = this._getDefaultChannels(isServices, source);
       await this._emitNotificationEvents(doc, payload, receivers, teamDid, isServices, defaultChannel, actorInfo);
 
       return doc;
     } catch (error) {
-      logger.error('notification create failed', { error });
+      logger.error('notification create failed', { teamDid, error });
       throw error;
     }
   }

package/lib/util/launcher.js

@@ -104,7 +104,7 @@ const reportComponentsEvent = async ({ blocklet, dids, type, time }) => {
   }
 };
 
-const notifyBlockletUpdated = async (blocklet) => {
+const notifyLauncher = async (type, blocklet) => {
   try {
     const { controller } = blocklet;
 
@@ -120,7 +120,7 @@ const notifyBlockletUpdated = async (blocklet) => {
     const { appLogo, appLogoRect } = getBlockletLogos(blocklet);
 
     const payload = {
-      type: 'serverless.blocklet.updated',
+      type,
       payload: {
         did: blocklet.appDid,
         appId: blocklet.appDid,
@@ -152,6 +152,10 @@ const notifyBlockletUpdated = async (blocklet) => {
   }
 };
 
+const notifyBlockletUpdated = (blocklet) => notifyLauncher('serverless.blocklet.updated', blocklet);
+const notifyBlockletStarted = (blocklet) => notifyLauncher('serverless.blocklet.started', blocklet);
+const notifyBlockletStopped = (blocklet) => notifyLauncher('serverless.blocklet.stopped', blocklet);
+
 const consumeLauncherSession = async ({ params, blocklet }) => {
   try {
     const info = await states.node.read();
@@ -634,6 +638,8 @@ module.exports = {
   isBlockletExpired,
   isBlockletTerminated,
   notifyBlockletUpdated,
+  notifyBlockletStarted,
+  notifyBlockletStopped,
   launchBlockletByLauncher,
   launchBlockletWithoutWallet,
 };

package/lib/util/validate-user-role-passport.js

@@ -0,0 +1,27 @@
+const { CustomError } = require('@blocklet/error');
+
+const validateUserRolePassport = ({ role, passports }) => {
+  if (!Array.isArray(passports)) {
+    throw new CustomError(400, 'Invalid passports: must be an array');
+  }
+
+  if (!role || typeof role !== 'string') {
+    throw new CustomError(400, 'Invalid role: must be a non-empty string');
+  }
+
+  const filterPassports = passports.filter((x) => x.status === 'valid' && x.role === role);
+
+  if (filterPassports.length === 0) {
+    throw new CustomError(400, `No valid passport found: you don't have the required role "${role}".`);
+  }
+
+  const isValid = filterPassports.every((x) => x.expirationDate);
+  if (isValid) {
+    throw new CustomError(
+      400,
+      `The passport for role "${role}" is only temporary and cannot be used to invite new members.`
+    );
+  }
+};
+
+module.exports = { validateUserRolePassport };

package/lib/util/verify-access-key-user.js

@@ -6,10 +6,12 @@ const {
   WELLKNOWN_BLOCKLET_USER_PATH,
 } = require('@abtnode/constant');
 
-const { parseURL } = require('ufo');
+const { parseURL, joinURL } = require('ufo');
 
 const isAdminPath = (pathname) => pathname.startsWith(WELLKNOWN_BLOCKLET_ADMIN_PATH);
 const isUserCenterPath = (pathname) => pathname.startsWith(WELLKNOWN_BLOCKLET_USER_PATH);
+const isServerDashboardPath = (pathname, prefix, teamDid) =>
+  !teamDid ? false : pathname.startsWith(joinURL(prefix, 'blocklets', teamDid));
 
 const getEndpoint = (context) => {
   const { pathname } = parseURL(context.referrer);
@@ -54,4 +56,4 @@ const validateOperator = (context, operatorDid) => {
   }
 };
 
-module.exports = { validateOperator, getEndpoint, isUserCenterPath, isAdminPath };
+module.exports = { validateOperator, getEndpoint, isUserCenterPath, isAdminPath, isServerDashboardPath };

package/lib/util/verify-user-private.js

@@ -0,0 +1,42 @@
+const { ROLES, SERVER_ROLES, WELLKNOWN_BLOCKLET_USER_PATH } = require('@abtnode/constant');
+const get = require('lodash/get');
+const { joinURL } = require('ufo');
+const logger = require('@abtnode/logger')('@abtnode/core:util:verify-user-private');
+
+const { getEndpoint, isServerDashboardPath, isAdminPath } = require('./verify-access-key-user');
+
+const USER_FOLLOWERS_PATH = joinURL(WELLKNOWN_BLOCKLET_USER_PATH, 'user-followers');
+
+const isAdminUser = (context) => {
+  const { user = {} } = context || {};
+  const role = user.userInfo?.role || user.role;
+  return [ROLES.ADMIN, ROLES.OWNER, SERVER_ROLES.BLOCKLET_ADMIN, SERVER_ROLES.BLOCKLET_OWNER].includes(role);
+};
+
+const isUserPrivacyEnabled = (userInfo) => {
+  // 在 server 的dashboard 和 service 的 dashboard 中，不需要判断
+  const privacyInfo = get(userInfo, 'extra.privacy', {});
+  return get(privacyInfo, USER_FOLLOWERS_PATH, false);
+};
+
+const isInDashboard = (teamDid, prefix, context = {}) => {
+  const { user = {}, hostname, referrer } = context || {};
+  if (user.role === SERVER_ROLES.BLOCKLET_SDK || !teamDid) {
+    return false;
+  }
+
+  if (!hostname || !referrer) {
+    logger.warn('Missing hostname or referrer context');
+    return false;
+  }
+
+  try {
+    const pathname = getEndpoint(context);
+    return isAdminPath(pathname) || isServerDashboardPath(pathname, prefix, teamDid);
+  } catch (error) {
+    logger.warn('Failed to check if in dashboard', { error });
+    return false;
+  }
+};
+
+module.exports = { isInDashboard, isUserPrivacyEnabled, isAdminUser };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.50",
+  "version": "1.16.51-beta-20250905-023351-70af144b",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,21 +19,21 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.50",
-    "@abtnode/auth": "1.16.50",
-    "@abtnode/certificate-manager": "1.16.50",
-    "@abtnode/constant": "1.16.50",
-    "@abtnode/cron": "1.16.50",
-    "@abtnode/db-cache": "1.16.50",
-    "@abtnode/docker-utils": "1.16.50",
-    "@abtnode/logger": "1.16.50",
-    "@abtnode/models": "1.16.50",
-    "@abtnode/queue": "1.16.50",
-    "@abtnode/rbac": "1.16.50",
-    "@abtnode/router-provider": "1.16.50",
-    "@abtnode/static-server": "1.16.50",
-    "@abtnode/timemachine": "1.16.50",
-    "@abtnode/util": "1.16.50",
+    "@abtnode/analytics": "1.16.51-beta-20250905-023351-70af144b",
+    "@abtnode/auth": "1.16.51-beta-20250905-023351-70af144b",
+    "@abtnode/certificate-manager": "1.16.51-beta-20250905-023351-70af144b",
+    "@abtnode/constant": "1.16.51-beta-20250905-023351-70af144b",
+    "@abtnode/cron": "1.16.51-beta-20250905-023351-70af144b",
+    "@abtnode/db-cache": "1.16.51-beta-20250905-023351-70af144b",
+    "@abtnode/docker-utils": "1.16.51-beta-20250905-023351-70af144b",
+    "@abtnode/logger": "1.16.51-beta-20250905-023351-70af144b",
+    "@abtnode/models": "1.16.51-beta-20250905-023351-70af144b",
+    "@abtnode/queue": "1.16.51-beta-20250905-023351-70af144b",
+    "@abtnode/rbac": "1.16.51-beta-20250905-023351-70af144b",
+    "@abtnode/router-provider": "1.16.51-beta-20250905-023351-70af144b",
+    "@abtnode/static-server": "1.16.51-beta-20250905-023351-70af144b",
+    "@abtnode/timemachine": "1.16.51-beta-20250905-023351-70af144b",
+    "@abtnode/util": "1.16.51-beta-20250905-023351-70af144b",
     "@aigne/aigne-hub": "^0.8.6",
     "@arcblock/did": "1.24.0",
     "@arcblock/did-connect-js": "1.24.0",
@@ -45,16 +45,16 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "1.24.0",
     "@arcblock/vc": "1.24.0",
-    "@blocklet/constant": "1.16.50",
-    "@blocklet/did-space-js": "^1.1.19",
-    "@blocklet/env": "1.16.50",
+    "@blocklet/constant": "1.16.51-beta-20250905-023351-70af144b",
+    "@blocklet/did-space-js": "^1.1.22",
+    "@blocklet/env": "1.16.51-beta-20250905-023351-70af144b",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.50",
-    "@blocklet/resolver": "1.16.50",
-    "@blocklet/sdk": "1.16.50",
-    "@blocklet/server-js": "1.16.50",
-    "@blocklet/store": "1.16.50",
-    "@blocklet/theme": "^3.1.33",
+    "@blocklet/meta": "1.16.51-beta-20250905-023351-70af144b",
+    "@blocklet/resolver": "1.16.51-beta-20250905-023351-70af144b",
+    "@blocklet/sdk": "1.16.51-beta-20250905-023351-70af144b",
+    "@blocklet/server-js": "1.16.51-beta-20250905-023351-70af144b",
+    "@blocklet/store": "1.16.51-beta-20250905-023351-70af144b",
+    "@blocklet/theme": "^3.1.34",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.24.0",
     "@ocap/util": "1.24.0",
@@ -118,5 +118,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "142ced081f92724f0abe11b093b6313b0a1cef2b"
+  "gitHead": "d19892df7ce4f08a4a7a3ce96dff3bc6b01925ad"
 }