@abtnode/core 1.17.0-beta-20251103-104515-e4795f0f → 1.17.0-beta-20251105-000053-53e6e3e9

package/lib/api/team.js

@@ -873,18 +873,6 @@ class TeamAPI extends EventEmitter {
     return updated;
   }
 
-  updateUserExtra(args) {
-    if (args.extra) {
-      try {
-        args.extra = JSON.parse(args.extra);
-      } catch (err) {
-        throw new Error('extra should be a valid json string');
-      }
-    }
-
-    return this.updateUser({ teamDid: args.teamDid, user: pick(args, ['did', 'remark', 'extra']) });
-  }
-
   updateUserAddress(args) {
     if (!args.address) {
       throw new Error('address should not be empty');

package/lib/blocklet/manager/disk.js

@@ -43,6 +43,7 @@ const {
   NOTIFICATION_SEND_CHANNEL,
   NOTIFICATION_SEND_STATUS,
   EVENTS,
+  USER_PROFILE_SYNC_FIELDS,
 } = require('@abtnode/constant');
 
 const { getBlockletEngine } = require('@blocklet/meta/lib/engine');
@@ -262,22 +263,6 @@ const statusLock = new DBCache(() => ({
   ...getAbtNodeRedisAndSQLiteUrl(),
 }));
 
-const USER_PROFILE_SYNC_FIELDS = [
-  'action', // 表示对该 user 的操作
-  'did',
-  'pk',
-  'avatar',
-  'fullName',
-  'email',
-  'connectedAccount',
-  'disconnectedAccount',
-  'sourceAppPid',
-  'inviter',
-  'generation',
-  'emailVerified',
-  'phoneVerified',
-];
-
 const pm2StatusMap = {
   online: BlockletStatus.running,
   stop: BlockletStatus.stopped,
@@ -837,7 +822,20 @@ class DiskBlockletManager extends BaseBlockletManager {
     });
 
     if (atomic || !blocklet.structVersion) {
-      return this._start({ blocklet, throwOnError, checkHealthImmediately, e2eMode, componentDids, operator }, context);
+      const nextBlocklet = await this._start(
+        { blocklet, throwOnError, checkHealthImmediately, e2eMode, componentDids, operator },
+        context
+      );
+
+      // 根据情况更新 route table， 会判断只有包含多 interfaces 的 DID 才会更新 route table
+      if (!['true', '1'].includes(process.env.ABT_NODE_DISABLE_BLUE_GREEN)) {
+        this.emit(BlockletEvents.blurOrGreenStarted, {
+          blocklet: nextBlocklet,
+          componentDids: inputComponentDids,
+          context,
+        });
+      }
+      return nextBlocklet;
     }
 
     const tasks = componentDids.map(
@@ -859,6 +857,7 @@ class DiskBlockletManager extends BaseBlockletManager {
 
     const nextBlocklet = await this.ensureBlocklet(did, { e2eMode });
 
+    // 根据情况更新 route table， 会判断只有包含多 interfaces 的 DID 才会更新 route table
     if (!['true', '1'].includes(process.env.ABT_NODE_DISABLE_BLUE_GREEN)) {
       this.emit(BlockletEvents.blurOrGreenStarted, {
         blocklet: nextBlocklet,
@@ -5988,28 +5987,14 @@ class FederatedBlockletManager extends DiskBlockletManager {
 
       const masterSite = getFederatedMaster(blocklet);
       if (shouldSyncFederated(sourceAppPid, blocklet)) {
-        const data = pick(updated, [
-          'did',
-          'pk',
-          'avatar',
-          'fullName',
-          'email',
-          'phone',
-          'url',
-          'inviter',
-          'generation',
-          'emailVerified',
-          'phoneVerified',
-          'metadata',
-          'address',
-        ]);
+        const data = pick(updated, USER_PROFILE_SYNC_FIELDS);
         if (data.avatar) {
           data.avatar = getUserAvatarUrl(data.avatar, blocklet);
         }
 
         await this.syncFederated({
           did: blocklet.appPid,
-          userFields: [...USER_PROFILE_SYNC_FIELDS, 'metadata', 'address'],
+          userFields: USER_PROFILE_SYNC_FIELDS,
           data: {
             users: [
               {
@@ -6031,6 +6016,31 @@ class FederatedBlockletManager extends DiskBlockletManager {
     }
   }
 
+  async updateUserExtra(args) {
+    try {
+      if (args.extra) {
+        try {
+          args.extra = JSON.parse(args.extra);
+        } catch (err) {
+          throw new Error('extra should be a valid json string');
+        }
+      }
+
+      const updated = await this.teamAPI.updateUser({
+        teamDid: args.teamDid,
+        user: pick(args, ['did', 'remark', 'extra']),
+      });
+
+      // 异步更新站点群其他站点的用户信息
+      this.updateUserInfoAndSyncFederated({ teamDid: args.teamDid, updated });
+
+      return updated;
+    } catch (err) {
+      logger.error('Failed to update user extra', { err });
+      throw err;
+    }
+  }
+
   /**
    * 调用来源有两种
    * 1. js-sdk:  调用时，会处理好 user.phone 与 user.metadata.phone 的同步，已经 user.metadata.location 与 user.address.city 的同步

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

@@ -892,6 +892,47 @@ module.exports = Object.freeze({
     'https://unpkg.com',
   ],
   CSP_ICONIFY_SOURCES: ['https://*.simplesvg.com', 'https://*.iconify.design', 'https://*.unisvg.com'],
+
+  USER_PROFILE_SYNC_FIELDS: [
+    'action', // 表示对该 user 的操作
+    'did',
+    'pk',
+    'avatar',
+    'fullName',
+    'locale',
+    'email',
+    'connectedAccount',
+    'disconnectedAccount',
+    'sourceAppPid',
+    'inviter',
+    'generation',
+    'emailVerified',
+    'phoneVerified',
+    'metadata',
+    'address',
+    'extra',
+  ],
+
+  SITE_SYNC_FIELDS: [
+    'action',
+    'appId',
+    'appPid',
+    'aliasDid',
+    'appName',
+    'appDescription',
+    'appUrl',
+    'aliasDomain',
+    'appLogo',
+    'appLogoRect',
+    'appliedAt',
+    'did',
+    'pk',
+    'serverId',
+    'serverVersion',
+    'version',
+    'isMaster',
+    'status',
+  ],
 });
 
 

package/lib/index.js

@@ -535,7 +535,7 @@ function ABTNode(options) {
     updateUser: teamAPI.updateUser.bind(teamAPI),
     updateUserInfoAndSync: blockletManager.updateUserInfoAndSync.bind(blockletManager),
     updateUserTags: teamAPI.updateUserTags.bind(teamAPI),
-    updateUserExtra: teamAPI.updateUserExtra.bind(teamAPI),
+    updateUserExtra: blockletManager.updateUserExtra.bind(blockletManager),
     updateUserApproval: teamAPI.updateUserApproval.bind(teamAPI),
     getUserByDid: teamAPI.getUserByDid.bind(teamAPI),
     isPassportValid: teamAPI.isPassportValid.bind(teamAPI),

package/lib/router/helper.js

@@ -2084,7 +2084,13 @@ module.exports = function getRouterHelpers({
 };
 
 const ensureBlockletHasMultipleInterfaces = (blocklet, componentDids) => {
+  if (!componentDids?.length) {
+    return false;
+  }
   for (const child of blocklet.children) {
+    if (!child?.meta) {
+      continue;
+    }
     const interfaces = (child.meta.interfaces || []).filter((x) => !!x.port);
     if (componentDids.includes(child.meta.did) && interfaces.length > 1) {
       return true;

package/lib/states/user.js

@@ -446,7 +446,9 @@ SELECT did,inviter,generation FROM UserTree`.trim();
       sorting.push(['createdAt', 'DESC']);
     }
 
-    const result = await this.paginate({ where, include, replacements }, sorting, paging);
+    const result = await this.paginate({ where, include, replacements }, sorting, paging, undefined, {
+      countInclude: true,
+    });
 
     if (includeFollowStatus && user?.did) {
       result.list = await this._enrichWithFollowStatus(result.list, user.did);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.0-beta-20251103-104515-e4795f0f",
+  "version": "1.17.0-beta-20251105-000053-53e6e3e9",
   "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.0-beta-20251103-104515-e4795f0f",
-    "@abtnode/auth": "1.17.0-beta-20251103-104515-e4795f0f",
-    "@abtnode/certificate-manager": "1.17.0-beta-20251103-104515-e4795f0f",
-    "@abtnode/constant": "1.17.0-beta-20251103-104515-e4795f0f",
-    "@abtnode/cron": "1.17.0-beta-20251103-104515-e4795f0f",
-    "@abtnode/db-cache": "1.17.0-beta-20251103-104515-e4795f0f",
-    "@abtnode/docker-utils": "1.17.0-beta-20251103-104515-e4795f0f",
-    "@abtnode/logger": "1.17.0-beta-20251103-104515-e4795f0f",
-    "@abtnode/models": "1.17.0-beta-20251103-104515-e4795f0f",
-    "@abtnode/queue": "1.17.0-beta-20251103-104515-e4795f0f",
-    "@abtnode/rbac": "1.17.0-beta-20251103-104515-e4795f0f",
-    "@abtnode/router-provider": "1.17.0-beta-20251103-104515-e4795f0f",
-    "@abtnode/static-server": "1.17.0-beta-20251103-104515-e4795f0f",
-    "@abtnode/timemachine": "1.17.0-beta-20251103-104515-e4795f0f",
-    "@abtnode/util": "1.17.0-beta-20251103-104515-e4795f0f",
+    "@abtnode/analytics": "1.17.0-beta-20251105-000053-53e6e3e9",
+    "@abtnode/auth": "1.17.0-beta-20251105-000053-53e6e3e9",
+    "@abtnode/certificate-manager": "1.17.0-beta-20251105-000053-53e6e3e9",
+    "@abtnode/constant": "1.17.0-beta-20251105-000053-53e6e3e9",
+    "@abtnode/cron": "1.17.0-beta-20251105-000053-53e6e3e9",
+    "@abtnode/db-cache": "1.17.0-beta-20251105-000053-53e6e3e9",
+    "@abtnode/docker-utils": "1.17.0-beta-20251105-000053-53e6e3e9",
+    "@abtnode/logger": "1.17.0-beta-20251105-000053-53e6e3e9",
+    "@abtnode/models": "1.17.0-beta-20251105-000053-53e6e3e9",
+    "@abtnode/queue": "1.17.0-beta-20251105-000053-53e6e3e9",
+    "@abtnode/rbac": "1.17.0-beta-20251105-000053-53e6e3e9",
+    "@abtnode/router-provider": "1.17.0-beta-20251105-000053-53e6e3e9",
+    "@abtnode/static-server": "1.17.0-beta-20251105-000053-53e6e3e9",
+    "@abtnode/timemachine": "1.17.0-beta-20251105-000053-53e6e3e9",
+    "@abtnode/util": "1.17.0-beta-20251105-000053-53e6e3e9",
     "@aigne/aigne-hub": "^0.10.4",
     "@arcblock/did": "^1.27.1",
     "@arcblock/did-connect-js": "^1.27.1",
@@ -43,15 +43,15 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.27.1",
     "@arcblock/vc": "^1.27.1",
-    "@blocklet/constant": "1.17.0-beta-20251103-104515-e4795f0f",
+    "@blocklet/constant": "1.17.0-beta-20251105-000053-53e6e3e9",
     "@blocklet/did-space-js": "^1.2.0",
-    "@blocklet/env": "1.17.0-beta-20251103-104515-e4795f0f",
+    "@blocklet/env": "1.17.0-beta-20251105-000053-53e6e3e9",
     "@blocklet/error": "^0.3.0",
-    "@blocklet/meta": "1.17.0-beta-20251103-104515-e4795f0f",
-    "@blocklet/resolver": "1.17.0-beta-20251103-104515-e4795f0f",
-    "@blocklet/sdk": "1.17.0-beta-20251103-104515-e4795f0f",
-    "@blocklet/server-js": "1.17.0-beta-20251103-104515-e4795f0f",
-    "@blocklet/store": "1.17.0-beta-20251103-104515-e4795f0f",
+    "@blocklet/meta": "1.17.0-beta-20251105-000053-53e6e3e9",
+    "@blocklet/resolver": "1.17.0-beta-20251105-000053-53e6e3e9",
+    "@blocklet/sdk": "1.17.0-beta-20251105-000053-53e6e3e9",
+    "@blocklet/server-js": "1.17.0-beta-20251105-000053-53e6e3e9",
+    "@blocklet/store": "1.17.0-beta-20251105-000053-53e6e3e9",
     "@blocklet/theme": "^3.1.54",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "^1.27.1",
@@ -116,5 +116,5 @@
     "express": "^4.18.2",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "2fb9b7f6dbf45b407a82ac676955b4ede1c6b347"
+  "gitHead": "61a1b994cca350a1c7cd12debc39416ac3af1a5d"
 }