@abtnode/core 1.16.17-beta-3232a7af → 1.16.17-beta-703fb879

package/lib/api/team.js

@@ -1,5 +1,7 @@
 const { EventEmitter } = require('events');
 const pick = require('lodash/pick');
+const defaults = require('lodash/defaults');
+const cloneDeep = require('lodash/cloneDeep');
 const joinUrl = require('url-join');
 
 const logger = require('@abtnode/logger')('@abtnode/core:api:team');
@@ -40,6 +42,7 @@ const { validateCreatePermission, validateUpdatePermission } = require('../valid
 const { getBlocklet } = require('../util/blocklet');
 const StoreUtil = require('../util/store');
 const { profileSchema } = require('../validators/user');
+const { callFederated } = require('../util/federated');
 
 const sanitizeUrl = (url) => {
   if (!url) {
@@ -1000,6 +1003,7 @@ class TeamAPI extends EventEmitter {
   async getPassportIssuance({ teamDid, sessionId }) {
     const state = await this.getSessionState(teamDid);
     const doc = await state.read(sessionId);
+    // FIXME: @zhanghan 指定被邀请者的邀请需要查询被邀请者的详细信息
     return doc;
   }
 
@@ -1096,10 +1100,28 @@ class TeamAPI extends EventEmitter {
     return this.teamManager.getRoles(teamDid);
   }
 
-  async createRole({ teamDid, name, description, title, childName, permissions = [] }) {
-    logger.info('create role', { teamDid, name, description, childName, permissions });
+  async getRole({ teamDid, role: { name } = {} }) {
+    if (!name) {
+      throw new Error('role name is invalid');
+    }
+    const rbac = await this.getRBAC(teamDid);
+    const role = await rbac.getRole(name);
+    return role ? pick(role, ['name', 'grants', 'title', 'description', 'extra']) : null;
+  }
 
-    await validateCreateRole({ name, title, description });
+  async createRole({ teamDid, name, description, title, childName, permissions = [], extra: raw }) {
+    logger.info('create role', { teamDid, name, description, childName, permissions, raw });
+    const attrs = { name, title, description, childName, permissions };
+
+    if (raw) {
+      try {
+        attrs.extra = JSON.parse(raw);
+      } catch (err) {
+        throw new Error('extra should be a valid json string');
+      }
+    }
+
+    await validateCreateRole(pick(attrs, ['name', 'title', 'description', 'extra']));
 
     validateReservedRole(name);
 
@@ -1107,8 +1129,8 @@ class TeamAPI extends EventEmitter {
 
     let role;
     try {
-      role = await rbac.createRole({ name, title, description, childName, permissions });
-      return pick(role, ['name', 'grants', 'title', 'description']);
+      role = await rbac.createRole(attrs);
+      return pick(role, ['name', 'title', 'grants', 'description', 'extra']);
     } catch (err) {
       if (new RegExp(`Item ${name} already exists`).test(err.message)) {
         throw new Error(`Id ${name} already exists`);
@@ -1117,16 +1139,23 @@ class TeamAPI extends EventEmitter {
     }
   }
 
-  async updateRole({ teamDid, role: { name, title, description } = {} }) {
-    logger.info('update role', { teamDid, name, title, description });
+  async updateRole({ teamDid, role: { name, title, description, extra: raw } = {} }) {
+    logger.info('update role', { teamDid, name, title, description, raw });
 
-    await validateUpdateRole({ name, title, description });
-
-    const rbac = await this.getRBAC(teamDid);
+    const attrs = { name, title, description };
 
-    const state = await rbac.updateRole({ name, title, description });
+    if (raw) {
+      try {
+        attrs.extra = JSON.parse(raw);
+      } catch (err) {
+        throw new Error('extra should be a valid json string');
+      }
+    }
 
-    return pick(state, ['name', 'title', 'grants', 'description']);
+    await validateUpdateRole(attrs);
+    const rbac = await this.getRBAC(teamDid);
+    const state = await rbac.updateRole(attrs);
+    return pick(state, ['name', 'title', 'grants', 'description', 'extra']);
   }
 
   async getPermissions({ teamDid }) {
@@ -1315,6 +1344,10 @@ class TeamAPI extends EventEmitter {
     return this.teamManager.getUserState(did);
   }
 
+  getUserSessionState(did) {
+    return this.teamManager.getUserSessionState(did);
+  }
+
   getTagState(did) {
     return this.teamManager.getTagState(did);
   }
@@ -1329,6 +1362,148 @@ class TeamAPI extends EventEmitter {
   setInviteExpireTime(ms) {
     this.memberInviteExpireTime = ms;
   }
+
+  // user-session management
+  async getUserSession({ teamDid, userDid, visitorId }) {
+    const state = await this.getUserSessionState(teamDid);
+    const userState = await this.getUserState(teamDid);
+
+    const where = {
+      status: 'online',
+    };
+    if (userDid) where.userDid = userDid;
+    if (visitorId) where.visitorId = visitorId;
+
+    const userSessions = await state.model.findAll({
+      where,
+      attributes: ['id', 'appPid', 'userDid', 'visitorId', 'passportId'],
+      include: {
+        model: userState.model,
+        as: 'user',
+        attributes: ['did', 'sourceProvider', 'fullName', 'email', 'avatar', 'remark', 'sourceAppPid'],
+      },
+    });
+    return userSessions.map((x) => x.toJSON());
+  }
+
+  async getPassportById({ teamDid, passportId }) {
+    const userState = await this.getUserState(teamDid);
+    const passport = await userState.getPassportById(passportId);
+    return passport;
+  }
+
+  async getPassportFromFederated({ site, passportId, teamDid }) {
+    const blocklet = await getBlocklet({ did: teamDid, states: this.states, dataDirs: this.dataDirs });
+    const nodeInfo = await this.node.read();
+    const { permanentWallet } = getBlockletInfo(blocklet, nodeInfo.sk);
+
+    const result = await callFederated({
+      action: 'getPassport',
+      data: {
+        passportId,
+      },
+      permanentWallet,
+      site,
+    });
+
+    return result;
+  }
+
+  async upsertUserSession({ teamDid, appPid, userDid, visitorId, ua, lastLoginIp, sourceAppPid, passportId, status }) {
+    if (!userDid) {
+      throw new Error('userDid are required');
+    }
+
+    const state = await this.getUserSessionState(teamDid);
+    let data;
+    if (!visitorId) {
+      data = await state.insert({
+        userDid,
+        ua,
+        lastLoginIp,
+        appPid,
+        passportId,
+      });
+    } else {
+      const exist = await state.findOne({ userDid, visitorId, appPid });
+      if (exist) {
+        [, [data]] = await state.update(exist.id, { ua, lastLoginIp, passportId, status });
+      } else {
+        data = await state.insert({
+          visitorId,
+          userDid,
+          ua,
+          lastLoginIp,
+          appPid,
+          passportId,
+        });
+      }
+    }
+
+    if (sourceAppPid) {
+      const blocklet = await getBlocklet({ did: teamDid, states: this.states, dataDirs: this.dataDirs });
+      const nodeInfo = await this.node.read();
+      const { permanentWallet } = getBlockletInfo(blocklet, nodeInfo.sk);
+      const federated = defaults(cloneDeep(blocklet.settings.federated || {}), {
+        config: {},
+        sites: [],
+      });
+      const masterSite = federated.sites[0];
+      if (masterSite && masterSite.isMaster !== false && masterSite.appPid === sourceAppPid) {
+        await callFederated({
+          action: 'sync',
+          permanentWallet,
+          site: masterSite,
+          data: {
+            userSessions: [
+              {
+                action: 'login',
+                userDid,
+                visitorId: data.visitorId,
+                ua,
+                lastLoginIp,
+                appPid: teamDid,
+                passportId,
+              },
+            ],
+          },
+        });
+      }
+    }
+
+    return data;
+  }
+
+  async logoutUser({ teamDid, userDid, visitorId, appPid }) {
+    const state = await this.getUserSessionState(teamDid);
+    const data = await state.update({ userDid, visitorId, appPid }, { status: 'offline' });
+    const nodeInfo = await this.node.read();
+    const blocklet = await getBlocklet({ did: teamDid, states: this.states, dataDirs: this.dataDirs });
+    const { permanentWallet } = getBlockletInfo(blocklet, nodeInfo.sk);
+    const federated = defaults(cloneDeep(blocklet.settings.federated || {}), {
+      config: {},
+      sites: [],
+    });
+    const masterSite = federated.sites[0];
+    if (masterSite && masterSite.isMaster !== false && masterSite.appPid !== teamDid) {
+      callFederated({
+        action: 'sync',
+        permanentWallet,
+        site: masterSite,
+        data: {
+          userSessions: [
+            {
+              action: 'logout',
+              userDid,
+              visitorId,
+              appPid: teamDid,
+            },
+          ],
+        },
+      });
+    }
+    return data;
+  }
 }
 
 module.exports = TeamAPI;

package/lib/blocklet/manager/disk.js

@@ -1,5 +1,4 @@
 /* eslint-disable max-classes-per-file */
-/* eslint-disable no-underscore-dangle */
 /* eslint-disable no-await-in-loop */
 const fs = require('fs-extra');
 const path = require('path');
@@ -163,7 +162,12 @@ const UpgradeComponents = require('./helper/upgrade-components');
 const BlockletDownloader = require('../downloader/blocklet-downloader');
 const RollbackCache = require('./helper/rollback-cache');
 const { migrateApplicationToStructV2 } = require('./helper/migrate-application-to-struct-v2');
-const { getBackupFilesUrlFromEndpoint, getBackupEndpoint, getSpaceNameByEndpoint } = require('../../util/spaces');
+const {
+  getBackupFilesUrlFromEndpoint,
+  getBackupEndpoint,
+  getSpaceNameByEndpoint,
+  getBackupJobId,
+} = require('../../util/spaces');
 const { validateAddSpaceGateway, validateUpdateSpaceGateway } = require('../../validators/space-gateway');
 const { sessionConfigSchema } = require('../../validators/util');
 
@@ -182,6 +186,7 @@ const {
   getSelectedResources,
   updateSelectedResources,
 } = require('../project');
+const { callFederated } = require('../../util/federated');
 
 const { formatEnvironments, getBlockletMeta, validateOwner, isCLI } = util;
 
@@ -221,12 +226,19 @@ class DiskBlockletManager extends BaseBlockletManager {
     this.teamManager = teamManager;
 
     if (isFunction(this.backupQueue.on)) {
-      const handleBackupComplete = async ({ id, job }) => {
-        await this.backupQueue.delete(id);
-
-        const autoBackup = await this.getAutoBackup({ did: id });
+      /**
+       *
+       * @param {{
+       *  id: string,
+       *  job: { blocklet: import('@abtnode/client').BlockletState }
+       * }} param0
+       */
+      const handleBackupComplete = async ({ id: jobId, job }) => {
+        await this.backupQueue.delete(jobId);
+
+        const autoBackup = await this.getAutoBackup({ did: job.blocklet.meta.did });
         if (autoBackup?.enabled) {
-          this.backupQueue.push(job, id, true, BACKUPS.JOB.INTERVAL);
+          this.backupQueue.push(job, jobId, true, BACKUPS.JOB.INTERVAL);
         }
       };
       this.backupQueue.on('finished', handleBackupComplete).on('failed', handleBackupComplete);
@@ -1898,12 +1910,14 @@ class DiskBlockletManager extends BaseBlockletManager {
     const value = { ...autoBackup };
     await states.blockletExtras.setSettings(did, { autoBackup: value });
 
-    await this.backupQueue.delete(did);
+    const jobId = getBackupJobId(did);
+    await this.backupQueue.delete(jobId);
 
     logger.info('updateAutoBackup.$value', value);
 
     if (value.enabled) {
       const blocklet = await states.blocklet.getBlocklet(did);
+
       this.backupQueue.push(
         {
           entity: 'blocklet',
@@ -1911,7 +1925,7 @@ class DiskBlockletManager extends BaseBlockletManager {
           blocklet,
           context,
         },
-        did,
+        jobId,
         true,
         BACKUPS.JOB.INTERVAL
       );
@@ -3568,7 +3582,8 @@ class DiskBlockletManager extends BaseBlockletManager {
     try {
       const { did } = blocklet.meta;
 
-      await this.backupQueue.delete(did);
+      const jobId = getBackupJobId(did);
+      await this.backupQueue.delete(jobId);
 
       this.backupQueue.push(
         {
@@ -3580,7 +3595,7 @@ class DiskBlockletManager extends BaseBlockletManager {
             strategy: BACKUPS.STRATEGY.MANUAL,
           },
         },
-        did
+        jobId
       );
 
       return blocklet;
@@ -3744,7 +3759,7 @@ class FederatedBlockletManager extends DiskBlockletManager {
    * @param {string} options.appUrl - 申请加入统一登录的 master appUrl
    * @returns {Promise<any>} 更新后的 blocklet 数据
    */
-  async joinFederatedLogin({ appUrl, did }) {
+  async joinFederatedLogin({ appUrl, did }, context) {
     const url = new URL(appUrl);
     // master service api 的地址
     url.pathname = joinUrl(WELLKNOWN_SERVICE_PATH_PREFIX, '/api/federated/join');
@@ -3818,7 +3833,7 @@ class FederatedBlockletManager extends DiskBlockletManager {
    * @param {string} options.did - blocklet pid
    * @returns {Promise<any>} 更新后的 blocklet 数据
    */
-  async quitFederatedLogin({ did }) {
+  async quitFederatedLogin({ did }, context) {
     const blocklet = await this.getBlocklet(did);
     const federated = defaults(cloneDeep(blocklet.settings.federated || {}), {
       config: {},
@@ -3839,21 +3854,17 @@ class FederatedBlockletManager extends DiskBlockletManager {
         },
         masterAppUrl: masterSite.appUrl,
       });
-      const url = new URL(masterSite.appUrl);
-      url.pathname = joinUrl(WELLKNOWN_SERVICE_PATH_PREFIX, '/api/federated/quit');
       try {
-        await pRetry(
-          () =>
-            request.post(url.href, {
-              signer: permanentWallet.address,
-              data: signV2(permanentWallet.address, permanentWallet.secretKey, {
-                memberPid: blocklet.appPid,
-              }),
-            }),
-          { retries: 3 }
-        );
+        await callFederated({
+          action: 'quit',
+          site: masterSite,
+          permanentWallet,
+          data: {
+            memberPid: blocklet.appPid,
+          },
+        });
       } catch (error) {
-        logger.error('Failed to quit blocklet, will still quit federated by itself', { error, did, url: url.href });
+        logger.error('Failed to quit blocklet, will still quit federated by itself', { error, did });
       }
     }
 
@@ -3872,7 +3883,7 @@ class FederatedBlockletManager extends DiskBlockletManager {
    * @param {string} options.did - blocklet pid
    * @returns {Promise<any>} 更新后的 blocklet 数据
    */
-  async disbandFederatedLogin({ did }) {
+  async disbandFederatedLogin({ did }, context) {
     const blocklet = await this.getBlocklet(did);
     const federated = defaults(cloneDeep(blocklet.settings.federated || {}), {
       config: {},
@@ -3899,22 +3910,17 @@ class FederatedBlockletManager extends DiskBlockletManager {
         .filter((item) => item.appPid !== did)
         .map((item) => {
           return limitSync(async () => {
-            const url = new URL(item.appUrl);
-            url.pathname = joinUrl(WELLKNOWN_SERVICE_PATH_PREFIX, '/api/federated/disband');
             try {
-              await pRetry(
-                () =>
-                  request.post(url.href, {
-                    signer: permanentWallet.address,
-                    data: signV2(permanentWallet.address, permanentWallet.secretKey, {}),
-                  }),
-                { retries: 1 }
-              );
+              await callFederated({
+                action: 'disband',
+                permanentWallet,
+                site: item,
+                data: {},
+              });
             } catch (error) {
               logger.error('Failed to disband blocklet, will still disband federated by itself', {
                 error,
                 did,
-                url: url.href,
               });
             }
           });
@@ -3937,7 +3943,7 @@ class FederatedBlockletManager extends DiskBlockletManager {
    * @param {object} param.config federated 配置内容
    * @returns {Promise<any>} 更新后的 blocklet 数据
    */
-  async setFederated({ did, config }) {
+  async setFederated({ did, config }, context) {
     await states.blockletExtras.setSettings(did, { federated: config });
 
     const newState = await this.getBlocklet(did);
@@ -3953,7 +3959,8 @@ class FederatedBlockletManager extends DiskBlockletManager {
    * @param {boolean} param.autoLogin 是否自动登录
    * @returns {Promise<any>} 更新后的 blocklet 数据
    */
-  async configFederated({ did, autoLogin = false }) {
+  // FIXME: @zhanghan deprecated 不再需要配置自动登录
+  async configFederated({ did, autoLogin = false }, context) {
     const blocklet = await this.getBlocklet(did);
     const federated = cloneDeep(blocklet.settings.federated || {});
     federated.config.autoLogin = autoLogin;
@@ -3970,7 +3977,6 @@ class FederatedBlockletManager extends DiskBlockletManager {
    * @param {object} param
    * @param {string} param.did master blocklet pid
    * @param {string} param.memberPid member blocklet pid
-   * @param {boolean} param.autoLogin 是否自动登录
    * @returns {Promise<any>} 更新后的 blocklet 数据
    */
   async auditFederatedLogin({ memberPid, did, status }) {
@@ -4028,31 +4034,24 @@ class FederatedBlockletManager extends DiskBlockletManager {
       roles = await this.teamManager.getRoles(blocklet.appPid);
     }
 
-    const postUrl = joinUrl(memberSite.appUrl, WELLKNOWN_SERVICE_PATH_PREFIX, '/api/federated/audit-res');
-
     logger.info('Audit member join federated login', {
       status,
-      postUrl,
     });
     try {
       const roleList = roles.map((item) => pick(item, ['name', 'title', 'description']));
-      await pRetry(
-        () =>
-          request.post(postUrl, {
-            signer: permanentWallet.address,
-            data: signV2(permanentWallet.address, permanentWallet.secretKey, {
-              masterPid: blocklet.appPid,
-              status,
-              delegation,
-              roles: roleList,
-            }),
-          }),
-        {
-          retries: 3,
-        }
-      );
+      await callFederated({
+        action: 'audit-res',
+        permanentWallet,
+        site: memberSite,
+        data: {
+          masterPid: blocklet.appPid,
+          status,
+          delegation,
+          roles: roleList,
+        },
+      });
     } catch (error) {
-      logger.error('Failed to post audit res to member-site', { error, did, url: postUrl });
+      logger.error('Failed to post audit res to member-site', { error, did });
       throw error;
     }
     await this.syncFederated({
@@ -4119,24 +4118,34 @@ class FederatedBlockletManager extends DiskBlockletManager {
       .filter((item) => item.appId !== federated.config.appId)
       .map((item) => {
         return limitSync(async () => {
-          const url = joinUrl(item.appUrl, WELLKNOWN_SERVICE_PATH_PREFIX, '/api/federated/sync');
           try {
             // NOTICE: 即使通知某个站点失败了，也不影响其他站点接收同步结果
-            await pRetry(
-              () =>
-                request.post(url, {
-                  signer: permanentWallet.address,
-                  data: signV2(permanentWallet.address, permanentWallet.secretKey, safeData),
-                }),
-              { retries: 3 }
-            );
+            await callFederated({
+              action: 'sync',
+              permanentWallet,
+              site: item,
+              data: safeData,
+            });
           } catch (error) {
-            logger.warn('Failed to sync federated sites', { error, did, url, action: 'sync' });
+            logger.warn('Failed to sync federated sites', { error, did, action: 'sync' });
           }
         });
       });
     await Promise.all(waitingList);
   }
+
+  async loginFederated({ did, site, data }) {
+    const blocklet = await this.getBlocklet(did);
+    const nodeInfo = await states.node.read();
+    const { permanentWallet } = getBlockletInfo(blocklet, nodeInfo.sk);
+    const result = await callFederated({
+      action: 'loginByMaster',
+      data,
+      permanentWallet,
+      site,
+    });
+    return result;
+  }
 }
 
 class BlockletManager extends FederatedBlockletManager {}

package/lib/event/auto-backup-handler.js

@@ -1,5 +1,6 @@
 const debounce = require('lodash/debounce');
 const logger = require('@abtnode/logger')('@abtnode/core:event/auto-backup-handler');
+const { getBackupJobId } = require('../util/spaces');
 
 /**
  * @description
@@ -15,7 +16,8 @@ async function autoBackupHandler(eventName, payload, blockletManager) {
   logger.info('autoBackupHandler.$Boolean(payload.context)', Boolean(payload.context));
 
   if (autoBackup.enabled && payload.context) {
-    await blockletManager.backupQueue.delete(did);
+    const jobId = getBackupJobId(did);
+    await blockletManager.backupQueue.delete(jobId);
 
     blockletManager.backupQueue.push(
       {
@@ -24,7 +26,7 @@ async function autoBackupHandler(eventName, payload, blockletManager) {
         blocklet: payload,
         context: payload.context,
       },
-      did
+      jobId
     );
   }
 }

package/lib/index.js

@@ -269,6 +269,7 @@ function ABTNode(options) {
     configFederated: blockletManager.configFederated.bind(blockletManager),
     setFederated: blockletManager.setFederated.bind(blockletManager),
     syncFederated: blockletManager.syncFederated.bind(blockletManager),
+    loginFederated: blockletManager.loginFederated.bind(blockletManager),
     configNotification: blockletManager.configNotification.bind(blockletManager),
     updateWhoCanAccess: blockletManager.updateWhoCanAccess.bind(blockletManager),
     updateAppSessionConfig: blockletManager.updateAppSessionConfig.bind(blockletManager),
@@ -381,6 +382,13 @@ function ABTNode(options) {
     isConnectedAccount: teamAPI.isConnectedAccount.bind(teamAPI),
     switchProfile: teamAPI.switchProfile.bind(teamAPI),
 
+    // user-session
+    getUserSession: teamAPI.getUserSession.bind(teamAPI),
+    upsertUserSession: teamAPI.upsertUserSession.bind(teamAPI),
+    logoutUser: teamAPI.logoutUser.bind(teamAPI),
+    getPassportById: teamAPI.getPassportById.bind(teamAPI),
+    getPassportFromFederated: teamAPI.getPassportFromFederated.bind(teamAPI),
+
     // Tagging
     createTag: teamAPI.createTag.bind(teamAPI),
     updateTag: teamAPI.updateTag.bind(teamAPI),
@@ -391,6 +399,7 @@ function ABTNode(options) {
     getRBAC: (did = options.nodeDid) => teamManager.getRBAC(did),
 
     getRoles: teamAPI.getRoles.bind(teamAPI),
+    getRole: teamAPI.getRole.bind(teamAPI),
     createRole: teamAPI.createRole.bind(teamAPI),
     updateRole: teamAPI.updateRole.bind(teamAPI),
     deleteRole: teamAPI.deleteRole.bind(teamAPI),

package/lib/states/blocklet.js

@@ -234,7 +234,7 @@ class BlockletState extends BaseState {
   } = {}) {
     let doc = await this.getBlocklet(meta.did);
     if (doc) {
-      throw new Error('Blocklet already added');
+      throw new Error(`Blocklet already added: ${meta.did}`);
     }
 
     try {
@@ -288,7 +288,7 @@ class BlockletState extends BaseState {
   async updateBlocklet(did, updates) {
     const doc = await this.getBlocklet(did);
     if (!doc) {
-      throw new Error('Blocklet does not exist');
+      throw new Error(`Blocklet does not exist on update: ${did}`);
     }
 
     const formatted = formatBlocklet(cloneDeep(updates), 'onUpdate', this.config.dek);
@@ -302,7 +302,7 @@ class BlockletState extends BaseState {
   async upgradeBlocklet({ meta, source, deployedFrom = '', children } = {}) {
     const doc = await this.getBlocklet(meta.did);
     if (!doc) {
-      throw new Error('Blocklet does not exist');
+      throw new Error(`Blocklet does not exist on upgrade: ${meta.did}`);
     }
 
     try {
@@ -427,7 +427,7 @@ class BlockletState extends BaseState {
   async refreshBlockletPorts(did, componentDids = []) {
     const blocklet = await this.getBlocklet(did);
     if (!blocklet) {
-      throw new Error('Blocklet does not exist');
+      throw new Error(`Blocklet does not exist on refresh: ${did}`);
     }
 
     const { occupiedExternalPorts, occupiedInternalPorts } = await this._getOccupiedPorts();
@@ -626,7 +626,7 @@ class BlockletState extends BaseState {
   async addChildren(did, children) {
     const parent = await this.getBlocklet(did);
     if (!parent) {
-      throw new Error('Blocklet does not exist');
+      throw new Error(`Blocklet does not exist on addChildren: ${did}`);
     }
 
     const oldChildren = parent.children || [];

package/lib/states/user-session.js

@@ -0,0 +1,8 @@
+const ExtendBase = require('./base');
+
+/**
+ * @extends BaseState<import('@abtnode/models').UserSession>
+ */
+class UserSession extends ExtendBase {}
+
+module.exports = UserSession;

package/lib/states/user.js

@@ -423,6 +423,16 @@ class User extends ExtendBase {
 
     return result;
   }
+
+  async getPassports(did) {
+    const passports = await this.passport.find({ userDid: did });
+    return passports;
+  }
+
+  async getPassportById(passportId) {
+    const passport = await this.passport.findOne({ id: passportId });
+    return passport;
+  }
 }
 
 module.exports = User;

package/lib/team/manager.js

@@ -28,6 +28,7 @@ const rbacCreationLock = new Lock('rbac-creation-lock');
 
 const States = {
   User: require('../states/user'),
+  UserSession: require('../states/user-session'),
   Passport: require('../states/passport'),
   ConnectedAccount: require('../states/connect-account'),
   Session: require('../states/session'),
@@ -96,6 +97,7 @@ class TeamManager extends EventEmitter {
     this.cache[this.nodeDid] = {
       rbac: await createRBAC({ storage: new MemoryStorage(), data: RBAC_CONFIG }),
       user: await this.createState(this.nodeDid, 'User'),
+      userSession: await this.createState(this.nodeDid, 'UserSession'),
       tag: await this.createState(this.nodeDid, 'Tag'),
       passport: await this.createState(this.nodeDid, 'Passport'),
       connectedAccount: await this.createState(this.nodeDid, 'ConnectedAccount'),
@@ -107,6 +109,10 @@ class TeamManager extends EventEmitter {
     return this.getState(teamDid, 'user');
   }
 
+  getUserSessionState(teamDid) {
+    return this.getState(teamDid, 'userSession');
+  }
+
   getTagState(teamDid) {
     return this.getState(teamDid, 'tag');
   }
@@ -320,7 +326,7 @@ class TeamManager extends EventEmitter {
   async getRoles(did) {
     const rbac = await this.getRBAC(did);
     const roles = await rbac.getRoles();
-    return roles.map((d) => pick(d, ['name', 'grants', 'title', 'description']));
+    return roles.map((d) => pick(d, ['name', 'grants', 'title', 'description', 'extra']));
   }
 
   async initTeam(did) {
@@ -339,10 +345,12 @@ class TeamManager extends EventEmitter {
     const passport = await this.createState(did, 'Passport');
     const connectedAccount = await this.createState(did, 'ConnectedAccount');
     const session = await this.createState(did, 'Session');
+    const userSession = await this.createState(did, 'UserSession');
 
     this.cache[did] = {
       rbac,
       user,
+      userSession,
       tag,
       session,
       passport,

package/lib/util/blocklet.js

@@ -12,6 +12,7 @@ const toLower = require('lodash/toLower');
 const isEmpty = require('lodash/isEmpty');
 const streamToPromise = require('stream-to-promise');
 const { Throttle } = require('stream-throttle');
+const { slugify } = require('transliteration');
 const ssri = require('ssri');
 const diff = require('deep-diff');
 const createArchive = require('archiver');
@@ -19,6 +20,7 @@ const isUrl = require('is-url');
 const semver = require('semver');
 const { chainInfo: chainInfoSchema } = require('@arcblock/did-auth/lib/schema');
 
+const urlPathFriendly = require('@blocklet/meta/lib/url-path-friendly').default;
 const { fromSecretKey, fromPublicKey } = require('@ocap/wallet');
 const { toHex, isHex, toDid, toAddress, toBuffer } = require('@ocap/util');
 const { isValid: isValidDid, isEthereumDid } = require('@arcblock/did');
@@ -309,6 +311,7 @@ const getAppSystemEnvironments = (blocklet, nodeInfo, dataDirs) => {
     BLOCKLET_APP_PSK: appPsk, // permanent sk even the blocklet has been migrated
     BLOCKLET_APP_PID: appPid, // permanent did even the blocklet has been migrated
     BLOCKLET_APP_NAME: appName,
+    BLOCKLET_APP_NAME_SLUG: urlPathFriendly(slugify(appName)),
     BLOCKLET_APP_DESCRIPTION: appDescription,
     BLOCKLET_APP_URL: appUrl,
     BLOCKLET_APP_DATA_DIR: path.join(dataDirs.data, blocklet.meta.name),

package/lib/util/federated.js

@@ -0,0 +1,24 @@
+const { WELLKNOWN_SERVICE_PATH_PREFIX } = require('@abtnode/constant');
+const pRetry = require('p-retry');
+const { signV2 } = require('@arcblock/jwt');
+const joinUrl = require('url-join');
+
+const request = require('./request');
+
+async function callFederated({ site, permanentWallet, data, action }) {
+  const url = new URL(site.appUrl);
+  url.pathname = joinUrl(WELLKNOWN_SERVICE_PATH_PREFIX, `/api/federated/${action}`);
+  const result = await pRetry(
+    () =>
+      request.post(url.href, {
+        signer: permanentWallet.address,
+        data: signV2(permanentWallet.address, permanentWallet.secretKey, data),
+      }),
+    { retries: 3 }
+  );
+  return result.data;
+}
+
+module.exports = {
+  callFederated,
+};

package/lib/util/router.js

@@ -21,7 +21,7 @@ const updateNFTDomainRecord = async ({ name, value, blocklet, nodeInfo }) => {
   const { wallet } = getBlockletInfo(blocklet, nodeInfo.sk);
 
   const payload = {
-    delegatee: wallet.address,
+    delegatee: blocklet.appPid,
     domain: name,
     record: {
       name,
@@ -43,7 +43,7 @@ const updateNFTDomainRecord = async ({ name, value, blocklet, nodeInfo }) => {
       error,
       name,
       value,
-      delegatee: wallet.address,
+      delegatee: blocklet.appPid,
       appPid: blocklet.appPid,
       resp: error.response?.data,
     });

package/lib/util/spaces.js

@@ -72,9 +72,19 @@ async function getSpaceNameByEndpoint(endpoint, defaultValue = '') {
   }
 }
 
+/**
+ * @description
+ * @param {string} did
+ * @return {string}
+ */
+function getBackupJobId(did) {
+  return `${did}.backupToSpaces`;
+}
+
 module.exports = {
   getBackupEndpoint,
   getBackupFilesUrlFromEndpoint,
   getDIDSpacesUrlFromEndpoint,
   getSpaceNameByEndpoint,
+  getBackupJobId,
 };

package/lib/validators/role.js

@@ -1,8 +1,8 @@
 /* eslint-disable newline-per-chained-call */
-const JOI = require('joi');
+const Joi = require('joi');
 const { getMultipleLangParams } = require('./util');
 
-const roleNameSchema = JOI.string()
+const roleNameSchema = Joi.string()
   .trim()
   .max(64)
   .custom((value) => {
@@ -17,19 +17,41 @@ const roleNameSchema = JOI.string()
     return value;
   });
 
-const titleSchema = JOI.string().trim().max(25);
-const descriptionSchema = JOI.string().trim().max(600);
+const roleAcquireSchema = Joi.object({
+  pay: Joi.string().optional().allow(''),
+  exchange: Joi.string().optional().allow(''),
+  invite: Joi.boolean().optional(),
+  transfer: Joi.boolean().optional(),
+  request: Joi.boolean().optional(),
+}).default({
+  pay: '',
+  exchange: '',
+  invite: true,
+  transfer: false,
+  request: false,
+});
+
+const titleSchema = Joi.string().trim().max(25);
+const descriptionSchema = Joi.string().trim().max(600);
 
-const createRoleSchema = JOI.object({
+const createRoleSchema = Joi.object({
   name: roleNameSchema.required(),
   title: titleSchema.required(),
   description: descriptionSchema.required(),
+  extra: Joi.object({
+    acquire: roleAcquireSchema,
+    payment: Joi.any().optional(),
+  }).optional(),
 });
 
-const updateRoleSchema = JOI.object({
+const updateRoleSchema = Joi.object({
   name: roleNameSchema.required(),
   title: titleSchema,
   description: descriptionSchema,
+  extra: Joi.object({
+    acquire: roleAcquireSchema,
+    payment: Joi.any().optional(),
+  }).optional(),
 });
 
 module.exports = {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.17-beta-3232a7af",
+  "version": "1.16.17-beta-703fb879",
   "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.17-beta-3232a7af",
-    "@abtnode/auth": "1.16.17-beta-3232a7af",
-    "@abtnode/certificate-manager": "1.16.17-beta-3232a7af",
-    "@abtnode/constant": "1.16.17-beta-3232a7af",
-    "@abtnode/cron": "1.16.17-beta-3232a7af",
-    "@abtnode/logger": "1.16.17-beta-3232a7af",
-    "@abtnode/models": "1.16.17-beta-3232a7af",
-    "@abtnode/queue": "1.16.17-beta-3232a7af",
-    "@abtnode/rbac": "1.16.17-beta-3232a7af",
-    "@abtnode/router-provider": "1.16.17-beta-3232a7af",
-    "@abtnode/static-server": "1.16.17-beta-3232a7af",
-    "@abtnode/timemachine": "1.16.17-beta-3232a7af",
-    "@abtnode/util": "1.16.17-beta-3232a7af",
+    "@abtnode/analytics": "1.16.17-beta-703fb879",
+    "@abtnode/auth": "1.16.17-beta-703fb879",
+    "@abtnode/certificate-manager": "1.16.17-beta-703fb879",
+    "@abtnode/constant": "1.16.17-beta-703fb879",
+    "@abtnode/cron": "1.16.17-beta-703fb879",
+    "@abtnode/logger": "1.16.17-beta-703fb879",
+    "@abtnode/models": "1.16.17-beta-703fb879",
+    "@abtnode/queue": "1.16.17-beta-703fb879",
+    "@abtnode/rbac": "1.16.17-beta-703fb879",
+    "@abtnode/router-provider": "1.16.17-beta-703fb879",
+    "@abtnode/static-server": "1.16.17-beta-703fb879",
+    "@abtnode/timemachine": "1.16.17-beta-703fb879",
+    "@abtnode/util": "1.16.17-beta-703fb879",
     "@arcblock/did": "1.18.92",
     "@arcblock/did-auth": "1.18.92",
     "@arcblock/did-ext": "^1.18.92",
@@ -42,11 +42,11 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.92",
     "@arcblock/vc": "1.18.92",
-    "@blocklet/constant": "1.16.17-beta-3232a7af",
-    "@blocklet/env": "1.16.17-beta-3232a7af",
-    "@blocklet/meta": "1.16.17-beta-3232a7af",
-    "@blocklet/resolver": "1.16.17-beta-3232a7af",
-    "@blocklet/sdk": "1.16.17-beta-3232a7af",
+    "@blocklet/constant": "1.16.17-beta-703fb879",
+    "@blocklet/env": "1.16.17-beta-703fb879",
+    "@blocklet/meta": "1.16.17-beta-703fb879",
+    "@blocklet/resolver": "1.16.17-beta-703fb879",
+    "@blocklet/sdk": "1.16.17-beta-703fb879",
     "@did-space/client": "^0.3.11",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.92",
@@ -101,5 +101,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "af4067dd2e418c51a0ed96b1ee242ca812904056"
+  "gitHead": "97d63c671d823076e58b994107e10866367edd5d"
 }