@abtnode/core 1.16.16-beta-2e5e3db7 → 1.16.16-beta-cfa95fa6

package/lib/blocklet/manager/disk.js

@@ -3588,8 +3588,8 @@ class FederatedBlockletManager extends DiskBlockletManager {
   /**
    * Joins federated login.
    * @param {object} options
-   * @param {{string}} options.did - blocklet pid
-   * @param {{string}} options.appUrl - 申请加入统一登录的 master appUrl
+   * @param {string} options.did - blocklet pid
+   * @param {string} options.appUrl - 申请加入统一登录的 master appUrl
    * @returns {Promise<any>} 更新后的 blocklet 数据
    */
   async joinFederatedLogin({ appUrl, did }) {
@@ -3660,6 +3660,12 @@ class FederatedBlockletManager extends DiskBlockletManager {
     return newState;
   }
 
+  /**
+   * member 退出统一登录站点群
+   * @param {object} options
+   * @param {string} options.did - blocklet pid
+   * @returns {Promise<any>} 更新后的 blocklet 数据
+   */
   async quitFederatedLogin({ did }) {
     const blocklet = await this.getBlocklet(did);
     const federated = defaults(cloneDeep(blocklet.settings.federated || {}), {
@@ -3708,6 +3714,12 @@ class FederatedBlockletManager extends DiskBlockletManager {
     return newState;
   }
 
+  /**
+   * master 解散统一登录站点群
+   * @param {object} options
+   * @param {string} options.did - blocklet pid
+   * @returns {Promise<any>} 更新后的 blocklet 数据
+   */
   async disbandFederatedLogin({ did }) {
     const blocklet = await this.getBlocklet(did);
     const federated = defaults(cloneDeep(blocklet.settings.federated || {}), {
@@ -3900,6 +3912,14 @@ class FederatedBlockletManager extends DiskBlockletManager {
     return newState;
   }
 
+  /**
+   * 同步统一登录站点群信息
+   * 可同步的信息包括：站点成员列表（全量）、站点成员信息（增量）
+   * @param {object} options
+   * @param {string} options.did - 当前 blocklet pid
+   * @param {{users?:Array; sites?:Array}} options.data - 需要同步的数据
+   * @returns
+   */
   async syncFederated({ did, data = {} } = {}) {
     const blocklet = await this.getBlocklet(did);
 

package/lib/blocklet/storage/backup/spaces.js

@@ -241,7 +241,7 @@ class SpacesBackup extends BaseBackup {
 
         source: join(this.backupDir, '/'),
         debug: true,
-        concurrency: 32,
+        concurrency: 8,
         retryCount: 10,
         filter: (object) => {
           // FIXME: @yejianchao 这里需要更完整的黑名单

package/lib/blocklet/storage/restore/spaces.js

@@ -123,7 +123,7 @@ class SpacesRestore extends BaseRestore {
         appDid: this.input.appDid,
         target: join(this.restoreDir, '/'),
         debug: true,
-        concurrency: 32,
+        concurrency: 8,
         retryCount: 10,
         onAfterUpload: (data) => {
           logger.info('restore progress', { appDid: this.input.appDid, data });

package/lib/states/audit-log.js

@@ -35,6 +35,8 @@ const getComponentNamesWithVersion = (blocklet, componentDids) => getComponentNa
 const componentOrApplicationInfo = (app, componentDids) =>
   `${componentOrApplication(componentDids)} ${getComponentNamesWithVersion(app, componentDids)}`;
 
+const getSiteInfo = (site) => `[${site.appName}](${site.appUrl})(${site.appPid})`;
+
 const expandSite = async (siteId, info, node) => {
   if (!siteId) {
     return '';
@@ -177,6 +179,53 @@ const getLogContent = async (action, args, context, result, info, node) => {
     case 'updateAppSessionConfig':
       return `updated session config: ${JSON.stringify(args.config)}`;
 
+    // blocklet federated config
+    case 'requestJoinFederated':
+      return `request join in federated: member site ${getSiteInfo(
+        args.site
+      )} applied to join master site ${getBlockletInfo(result, info)}`;
+    case 'quitFederated':
+      return `quit federated: member site ${getSiteInfo(args.memberSite)} quit ${getBlockletInfo(result, info)}`;
+    case 'disbandFederated':
+      return `disband federated: master site ${getSiteInfo(args.masterSite)} disband federated site`;
+    case 'auditFederated':
+      return `audit federated: master site ${getSiteInfo(
+        args.masterSite
+      )} audit federated login member site ${getBlockletInfo(result, info)} with status: ${args.status}`;
+    case 'syncFederated':
+      const syncData = {
+        users: args.users,
+        sites: args.sites,
+      };
+      return `sync federated: site ${getSiteInfo(args.callerSite)} sync data:
+\`\`\`json
+${JSON.stringify(syncData, null, 2)}
+\`\`\``;
+
+    // federated user relate
+    case 'loginFederated':
+      return `auto login federated member: ${user} with master site ${getBlockletInfo(
+        args.blocklet,
+        info
+      )} try to login into member site ${getSiteInfo(args.memberSite)}`;
+    case 'loginFederatedMaster':
+      return `user login federated master: user ${user} with member site ${getBlockletInfo(
+        args.blocklet,
+        info
+      )} login state try to login master site ${getSiteInfo(args.masterSite)}`;
+    case 'loginByMember':
+      return `user login: user ${user} with ${getSiteInfo(
+        args.memberSite
+      )} login state auto login into master site ${getBlockletInfo(args.blocklet, info)}`;
+    case 'loginByMaster':
+      return `user login: user ${user} with master site ${getSiteInfo(
+        args.masterSite
+      )} login state auto login into member site ${getBlockletInfo(args.blocklet, info)}`;
+    case 'migrateFederatedAuth0':
+      return `migrate federated auth0 account: member site ${getSiteInfo(args.callerSite)} ask account ${
+        args.fromUserDid
+      } bind account ${args.toUserDid}`;
+
     // teams: members/passports
     case 'addUser':
       if (args.passport) {
@@ -349,6 +398,11 @@ const getLogCategory = (action) => {
     case 'disbandFederatedLogin':
     case 'auditFederatedLogin':
     case 'configFederated':
+    case 'requestJoinFederated':
+    case 'requestQuitFederated':
+    case 'disbandFederated':
+    case 'auditFederated':
+    case 'syncFederated':
       return 'blocklet';
 
     // store，此处应该返回 server
@@ -386,6 +440,11 @@ const getLogCategory = (action) => {
     case 'createTag':
     case 'updateTag':
     case 'deleteTag':
+    case 'loginFederated':
+    case 'loginByMember':
+    case 'loginByMaster':
+    case 'loginFederatedMaster':
+    case 'migrateFederatedAuth0':
       return 'team';
 
     // accessKeys

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.16-beta-2e5e3db7",
+  "version": "1.16.16-beta-cfa95fa6",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,19 +19,19 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.16-beta-2e5e3db7",
-    "@abtnode/auth": "1.16.16-beta-2e5e3db7",
-    "@abtnode/certificate-manager": "1.16.16-beta-2e5e3db7",
-    "@abtnode/constant": "1.16.16-beta-2e5e3db7",
-    "@abtnode/cron": "1.16.16-beta-2e5e3db7",
-    "@abtnode/logger": "1.16.16-beta-2e5e3db7",
-    "@abtnode/models": "1.16.16-beta-2e5e3db7",
-    "@abtnode/queue": "1.16.16-beta-2e5e3db7",
-    "@abtnode/rbac": "1.16.16-beta-2e5e3db7",
-    "@abtnode/router-provider": "1.16.16-beta-2e5e3db7",
-    "@abtnode/static-server": "1.16.16-beta-2e5e3db7",
-    "@abtnode/timemachine": "1.16.16-beta-2e5e3db7",
-    "@abtnode/util": "1.16.16-beta-2e5e3db7",
+    "@abtnode/analytics": "1.16.16-beta-cfa95fa6",
+    "@abtnode/auth": "1.16.16-beta-cfa95fa6",
+    "@abtnode/certificate-manager": "1.16.16-beta-cfa95fa6",
+    "@abtnode/constant": "1.16.16-beta-cfa95fa6",
+    "@abtnode/cron": "1.16.16-beta-cfa95fa6",
+    "@abtnode/logger": "1.16.16-beta-cfa95fa6",
+    "@abtnode/models": "1.16.16-beta-cfa95fa6",
+    "@abtnode/queue": "1.16.16-beta-cfa95fa6",
+    "@abtnode/rbac": "1.16.16-beta-cfa95fa6",
+    "@abtnode/router-provider": "1.16.16-beta-cfa95fa6",
+    "@abtnode/static-server": "1.16.16-beta-cfa95fa6",
+    "@abtnode/timemachine": "1.16.16-beta-cfa95fa6",
+    "@abtnode/util": "1.16.16-beta-cfa95fa6",
     "@arcblock/did": "1.18.90",
     "@arcblock/did-auth": "1.18.90",
     "@arcblock/did-ext": "^1.18.90",
@@ -42,12 +42,12 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.90",
     "@arcblock/vc": "1.18.90",
-    "@blocklet/constant": "1.16.16-beta-2e5e3db7",
-    "@blocklet/env": "1.16.16-beta-2e5e3db7",
-    "@blocklet/meta": "1.16.16-beta-2e5e3db7",
-    "@blocklet/resolver": "1.16.16-beta-2e5e3db7",
-    "@blocklet/sdk": "1.16.16-beta-2e5e3db7",
-    "@did-space/client": "^0.3.4",
+    "@blocklet/constant": "1.16.16-beta-cfa95fa6",
+    "@blocklet/env": "1.16.16-beta-cfa95fa6",
+    "@blocklet/meta": "1.16.16-beta-cfa95fa6",
+    "@blocklet/resolver": "1.16.16-beta-cfa95fa6",
+    "@blocklet/sdk": "1.16.16-beta-cfa95fa6",
+    "@did-space/client": "^0.3.8",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.90",
     "@ocap/util": "1.18.90",
@@ -100,5 +100,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "e0e3da338d7d35b994dd49015f4fae8ddf2410e0"
+  "gitHead": "7c554d38470156df47f8bc5bc6da1e359b007552"
 }