@abtnode/core 1.16.54-beta-20251021-070951-25e3083c → 1.16.54-beta-20251024-030947-6f2889bf

package/lib/api/team.js

@@ -37,6 +37,7 @@ const {
   getFederatedMaster,
   findFederatedSite,
   getUserAvatarUrl: getFederatedUserAvatarUrl,
+  syncFederated,
 } = require('@abtnode/auth/lib/util/federated');
 const { hasActiveOwnerPassport } = require('@abtnode/util/lib/passport');
 const { getBlockletInfo } = require('@blocklet/meta/lib/info');
@@ -919,15 +920,15 @@ class TeamAPI extends EventEmitter {
     return { did };
   }
 
-  async updateUserApproval({ teamDid, user }) {
+  async updateUserApproval({ teamDid, user, options: { includeFederated = true } = {} }) {
     const state = await this.getUserState(teamDid);
-    const doc = await state.getUser(user.did);
+    const userDoc = await state.getUser(user.did);
 
-    if (!doc) {
+    if (!userDoc) {
       throw new Error('User does not exist');
     }
 
-    if (hasActiveOwnerPassport(doc)) {
+    if (hasActiveOwnerPassport(userDoc)) {
       throw new Error('Cannot update owner\'s approval'); // prettier-ignore
     }
 
@@ -944,6 +945,28 @@ class TeamAPI extends EventEmitter {
       // 需要禁用用户的所有 passport
       await state.revokePassportByUserDid({ did: user.did });
     }
+    if (includeFederated) {
+      const nodeInfo = await this.node.read();
+      const blocklet = await getBlocklet({
+        did: teamDid,
+        states: this.states,
+        dataDirs: this.dataDirs,
+        useCache: true,
+      });
+      syncFederated({
+        nodeInfo,
+        blocklet,
+        data: {
+          users: [
+            {
+              action: user.approved ? 'unban' : 'ban',
+              did: user.did,
+              sourceAppPid: userDoc.sourceAppPid,
+            },
+          ],
+        },
+      });
+    }
     this.emit(TeamEvents.userUpdated, { teamDid, user: result });
     this.emit(TeamEvents.userPermissionUpdated, { teamDid, user: result });
 

package/lib/blocklet/manager/disk.js

@@ -115,6 +115,7 @@ const formatContext = require('@abtnode/util/lib/format-context');
 const md5 = require('@abtnode/util/lib/md5');
 const {
   callFederated,
+  syncFederated: _syncFederated,
   getFederatedMaster,
   generateSiteInfo,
   findFederatedSite,
@@ -5962,7 +5963,7 @@ class FederatedBlockletManager extends DiskBlockletManager {
 
         await this.syncFederated({
           did: blocklet.appPid,
-          fields: [...USER_PROFILE_SYNC_FIELDS, 'metadata', 'address'],
+          userFields: [...USER_PROFILE_SYNC_FIELDS, 'metadata', 'address'],
           data: {
             users: [
               {
@@ -6020,99 +6021,28 @@ class FederatedBlockletManager extends DiskBlockletManager {
    * @param {Array} [options.data.sites] - 需要同步的数据(站点)
    * @returns
    */
-  async syncFederated({
-    did,
-    data = {},
-    syncSites,
-    allowStatus = ['approved', 'revoked'],
-    fields = USER_PROFILE_SYNC_FIELDS,
-  } = {}) {
+  async syncFederated({ did, data, syncSites, allowStatus, userFields, siteFields } = {}) {
+    if (!did) {
+      logger.error('SyncFederated failed: did is required');
+      return [];
+    }
     const blocklet = await this.getBlocklet(did);
-
-    const federated = safeGetFederated(blocklet);
-
-    const safeData = {};
-    const { users, sites } = data;
-    if (users && Array.isArray(users)) {
-      safeData.users = users.map((item) => pick(item, fields));
-    }
-
-    if (sites && Array.isArray(sites)) {
-      safeData.sites = sites.map((item) =>
-        pick(item, [
-          'action',
-          'appId',
-          'appPid',
-          'aliasDid',
-          'appName',
-          'appDescription',
-          'appUrl',
-          'aliasDomain',
-          'appLogo',
-          'appLogoRect',
-          'appliedAt',
-          'did',
-          'pk',
-          'serverId',
-          'serverVersion',
-          'version',
-          'isMaster',
-          'status',
-        ])
-      );
+    if (!blocklet) {
+      logger.error(`SyncFederated failed: Blocklet not found for did: ${did}`);
+      return [];
     }
 
     const nodeInfo = await states.node.read();
-    const { permanentWallet } = getBlockletInfo(blocklet, nodeInfo.sk);
-    const limitSync = pLimit(FEDERATED.SYNC_LIMIT);
-
-    const waitingList = federated.sites
-      .filter((item) => !item.status || allowStatus.includes(item.status))
-      .filter((item) => {
-        // 未指定 syncSites 向全员通知（除了自己）
-        if (isUndefined(syncSites)) {
-          // 排除通知自己
-          return item.appPid !== blocklet.appPid;
-        }
-        // 如果指定了要通知的站点，则按指定的站点来过滤
-        if (Array.isArray(syncSites)) {
-          return syncSites.some((x) => x.appPid === item.appPid);
-        }
-        return false;
-      })
-      .map(async (item) => {
-        const resultItem = await limitSync(async () => {
-          try {
-            // NOTICE: 即使通知某个站点失败了，也不影响其他站点接收同步结果
-            const result = await callFederated({
-              action: 'sync',
-              permanentWallet,
-              site: item,
-              data: safeData,
-            });
-            logger.info('Sync federated sites successfully', {
-              action: 'sync',
-              site: item,
-              data: safeData,
-            });
-            return result;
-          } catch (error) {
-            logger.error('Failed to sync federated sites', {
-              error,
-              action: 'sync',
-              site: item,
-              data: safeData,
-            });
-            return null;
-          }
-        });
-        return {
-          site: item,
-          result: resultItem,
-        };
-      });
-    const resultList = await Promise.all(waitingList);
-    return resultList;
+    const result = await _syncFederated({
+      blocklet,
+      data,
+      syncSites,
+      allowStatus,
+      userFields,
+      siteFields,
+      nodeInfo,
+    });
+    return result;
   }
 
   async loginFederated({ did, site, data }) {

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

@@ -38963,7 +38963,7 @@ module.exports = require("zlib");
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.53","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib","test":"bun test","coverage":"bun test --coverage"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.53","@abtnode/auth":"1.16.53","@abtnode/certificate-manager":"1.16.53","@abtnode/constant":"1.16.53","@abtnode/cron":"1.16.53","@abtnode/db-cache":"1.16.53","@abtnode/docker-utils":"1.16.53","@abtnode/logger":"1.16.53","@abtnode/models":"1.16.53","@abtnode/queue":"1.16.53","@abtnode/rbac":"1.16.53","@abtnode/router-provider":"1.16.53","@abtnode/static-server":"1.16.53","@abtnode/timemachine":"1.16.53","@abtnode/util":"1.16.53","@aigne/aigne-hub":"^0.10.1","@arcblock/did":"^1.26.2","@arcblock/did-connect-js":"^1.26.2","@arcblock/did-ext":"^1.26.2","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"^1.26.2","@arcblock/event-hub":"^1.26.2","@arcblock/jwt":"^1.26.2","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"^1.26.2","@arcblock/vc":"^1.26.2","@blocklet/constant":"1.16.53","@blocklet/did-space-js":"^1.1.34","@blocklet/env":"1.16.53","@blocklet/error":"^0.2.5","@blocklet/meta":"1.16.53","@blocklet/resolver":"1.16.53","@blocklet/sdk":"1.16.53","@blocklet/server-js":"1.16.53","@blocklet/store":"1.16.53","@blocklet/theme":"^3.1.51","@fidm/x509":"^1.2.1","@ocap/mcrypto":"^1.26.2","@ocap/util":"^1.26.2","@ocap/wallet":"^1.26.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":{"axios-mock-adapter":"^2.1.0","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.53","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib","test":"bun test","coverage":"bun test --coverage"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.53","@abtnode/auth":"1.16.53","@abtnode/certificate-manager":"1.16.53","@abtnode/constant":"1.16.53","@abtnode/cron":"1.16.53","@abtnode/db-cache":"1.16.53","@abtnode/docker-utils":"1.16.53","@abtnode/logger":"1.16.53","@abtnode/models":"1.16.53","@abtnode/queue":"1.16.53","@abtnode/rbac":"1.16.53","@abtnode/router-provider":"1.16.53","@abtnode/static-server":"1.16.53","@abtnode/timemachine":"1.16.53","@abtnode/util":"1.16.53","@aigne/aigne-hub":"^0.10.3","@arcblock/did":"^1.26.3","@arcblock/did-connect-js":"^1.26.3","@arcblock/did-ext":"^1.26.3","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"^1.26.3","@arcblock/event-hub":"^1.26.3","@arcblock/jwt":"^1.26.3","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"^1.26.3","@arcblock/vc":"^1.26.3","@blocklet/constant":"1.16.53","@blocklet/did-space-js":"^1.1.34","@blocklet/env":"1.16.53","@blocklet/error":"^0.2.5","@blocklet/meta":"1.16.53","@blocklet/resolver":"1.16.53","@blocklet/sdk":"1.16.53","@blocklet/server-js":"1.16.53","@blocklet/store":"1.16.53","@blocklet/theme":"^3.1.51","@fidm/x509":"^1.2.1","@ocap/mcrypto":"^1.26.3","@ocap/util":"^1.26.3","@ocap/wallet":"^1.26.3","@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":{"axios-mock-adapter":"^2.1.0","expand-tilde":"^2.0.2","express":"^4.18.2","jest":"^29.7.0","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
 
 /***/ }),
 

package/lib/util/blocklet.js

@@ -376,6 +376,9 @@ const getAppSystemEnvironments = (blocklet, nodeInfo, dataDirs) => {
   const appPid = blocklet.appPid || appId;
   const appPsk = isMigrated ? blocklet.migratedFrom[0].appSk : appSk;
 
+  // Calculate permanent public key (PPK)
+  const appPpk = isMigrated ? toHex(fromSecretKey(appPsk, wallet.type).publicKey) : appPk;
+
   /* 获取 did domain 方式:
    * 1. 先从 site 里读
    * 2. 如果没有，再拼接
@@ -400,6 +403,7 @@ const getAppSystemEnvironments = (blocklet, nodeInfo, dataDirs) => {
     BLOCKLET_APP_SK: appSk,
     BLOCKLET_APP_ID: appId,
     BLOCKLET_APP_PSK: appPsk, // permanent sk even the blocklet has been migrated
+    BLOCKLET_APP_PPK: appPpk, // permanent pk corresponding to PSK
     BLOCKLET_APP_PID: appPid, // permanent did even the blocklet has been migrated
     BLOCKLET_APP_NAME: appName,
     BLOCKLET_APP_NAME_SLUG: urlPathFriendly(slugify(appName)),

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.54-beta-20251021-070951-25e3083c",
+  "version": "1.16.54-beta-20251024-030947-6f2889bf",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,46 +19,46 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.54-beta-20251021-070951-25e3083c",
-    "@abtnode/auth": "1.16.54-beta-20251021-070951-25e3083c",
-    "@abtnode/certificate-manager": "1.16.54-beta-20251021-070951-25e3083c",
-    "@abtnode/constant": "1.16.54-beta-20251021-070951-25e3083c",
-    "@abtnode/cron": "1.16.54-beta-20251021-070951-25e3083c",
-    "@abtnode/db-cache": "1.16.54-beta-20251021-070951-25e3083c",
-    "@abtnode/docker-utils": "1.16.54-beta-20251021-070951-25e3083c",
-    "@abtnode/logger": "1.16.54-beta-20251021-070951-25e3083c",
-    "@abtnode/models": "1.16.54-beta-20251021-070951-25e3083c",
-    "@abtnode/queue": "1.16.54-beta-20251021-070951-25e3083c",
-    "@abtnode/rbac": "1.16.54-beta-20251021-070951-25e3083c",
-    "@abtnode/router-provider": "1.16.54-beta-20251021-070951-25e3083c",
-    "@abtnode/static-server": "1.16.54-beta-20251021-070951-25e3083c",
-    "@abtnode/timemachine": "1.16.54-beta-20251021-070951-25e3083c",
-    "@abtnode/util": "1.16.54-beta-20251021-070951-25e3083c",
-    "@aigne/aigne-hub": "^0.10.1",
-    "@arcblock/did": "^1.26.2",
-    "@arcblock/did-connect-js": "^1.26.2",
-    "@arcblock/did-ext": "^1.26.2",
+    "@abtnode/analytics": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@abtnode/auth": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@abtnode/certificate-manager": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@abtnode/constant": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@abtnode/cron": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@abtnode/db-cache": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@abtnode/docker-utils": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@abtnode/logger": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@abtnode/models": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@abtnode/queue": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@abtnode/rbac": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@abtnode/router-provider": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@abtnode/static-server": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@abtnode/timemachine": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@abtnode/util": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@aigne/aigne-hub": "^0.10.3",
+    "@arcblock/did": "^1.26.3",
+    "@arcblock/did-connect-js": "^1.26.3",
+    "@arcblock/did-ext": "^1.26.3",
     "@arcblock/did-motif": "^1.1.14",
-    "@arcblock/did-util": "^1.26.2",
-    "@arcblock/event-hub": "^1.26.2",
-    "@arcblock/jwt": "^1.26.2",
+    "@arcblock/did-util": "^1.26.3",
+    "@arcblock/event-hub": "^1.26.3",
+    "@arcblock/jwt": "^1.26.3",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/validator": "^1.26.2",
-    "@arcblock/vc": "^1.26.2",
-    "@blocklet/constant": "1.16.54-beta-20251021-070951-25e3083c",
+    "@arcblock/validator": "^1.26.3",
+    "@arcblock/vc": "^1.26.3",
+    "@blocklet/constant": "1.16.54-beta-20251024-030947-6f2889bf",
     "@blocklet/did-space-js": "^1.1.34",
-    "@blocklet/env": "1.16.54-beta-20251021-070951-25e3083c",
+    "@blocklet/env": "1.16.54-beta-20251024-030947-6f2889bf",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.54-beta-20251021-070951-25e3083c",
-    "@blocklet/resolver": "1.16.54-beta-20251021-070951-25e3083c",
-    "@blocklet/sdk": "1.16.54-beta-20251021-070951-25e3083c",
-    "@blocklet/server-js": "1.16.54-beta-20251021-070951-25e3083c",
-    "@blocklet/store": "1.16.54-beta-20251021-070951-25e3083c",
+    "@blocklet/meta": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@blocklet/resolver": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@blocklet/sdk": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@blocklet/server-js": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@blocklet/store": "1.16.54-beta-20251024-030947-6f2889bf",
     "@blocklet/theme": "^3.1.51",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "^1.26.2",
-    "@ocap/util": "^1.26.2",
-    "@ocap/wallet": "^1.26.2",
+    "@ocap/mcrypto": "^1.26.3",
+    "@ocap/util": "^1.26.3",
+    "@ocap/wallet": "^1.26.3",
     "@slack/webhook": "^5.0.4",
     "archiver": "^7.0.1",
     "axios": "^1.7.9",
@@ -119,5 +119,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "db517e9013dbad744e38883f56e4eba1fa1615c1"
+  "gitHead": "73e5a3a80b82a2a7c62d42fdc08207b28e67633e"
 }