@abtnode/core 1.16.15-beta-12f50442 → 1.16.15-beta-d649cecc

package/lib/api/team.js

@@ -112,6 +112,49 @@ class TeamAPI extends EventEmitter {
     this.dataDirs = dataDirs;
   }
 
+  // Tags
+  async createTag({ teamDid, tag }) {
+    if (!tag.title) {
+      throw new Error('Must specify tag.title to create');
+    }
+    if (!tag.color || !tag.color.match(/^#[0-9a-f]{6}$/i)) {
+      throw new Error('Must specify hex encoded tag.color to create');
+    }
+
+    const state = await this.getTagState(teamDid);
+    const doc = await state.insert(pick(tag, ['title', 'color', 'description']));
+    logger.info('tags created successfully', { teamDid, tag });
+    return doc;
+  }
+
+  async updateTag({ teamDid, tag }) {
+    if (!tag.id) {
+      throw new Error('Must specify tag.id to update');
+    }
+
+    const state = await this.getTagState(teamDid);
+    const result = await state.updateById(tag.id, pick(tag, ['title', 'color', 'description']));
+    logger.info('tags updated successfully', { teamDid, tag, result });
+    return state.findOne({ id: tag.id });
+  }
+
+  async deleteTag({ teamDid, tag }) {
+    if (!tag.id) {
+      throw new Error('Must specify tag.id to delete');
+    }
+
+    const state = await this.getTagState(teamDid);
+    const doc = await state.remove({ id: tag.id });
+    logger.info('tags deleted successfully', { teamDid, tag });
+    return doc;
+  }
+
+  async getTags({ teamDid, paging }) {
+    const state = await this.getTagState(teamDid);
+    const result = await state.paginate({}, { createdAt: -1 }, { pageSize: 20, ...paging });
+    return { tags: result.list, paging: result.paging };
+  }
+
   // User && Invitation
 
   async loginUser({ teamDid, user }) {
@@ -232,6 +275,7 @@ class TeamAPI extends EventEmitter {
             'remark',
             'avatar',
             'locale',
+            'tags',
             // oauth relate fields
             'sourceProvider',
             'connectedAccounts',
@@ -306,6 +350,26 @@ class TeamAPI extends EventEmitter {
     return doc;
   }
 
+  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']) });
+  }
+
+  async updateUserTags({ teamDid, did, tags }) {
+    const state = await this.getUserState(teamDid);
+    const doc = await state.updateTags(did, tags);
+    logger.info('user tags updated successfully', { teamDid, userDid: did, tags });
+    this.emit(EVENTS.USER_UPDATED, { teamDid, user: doc });
+    return doc;
+  }
+
   async removeUser({ teamDid, user }) {
     const { did } = user;
 
@@ -1232,6 +1296,10 @@ class TeamAPI extends EventEmitter {
     return this.teamManager.getUserState(did);
   }
 
+  getTagState(did) {
+    return this.teamManager.getTagState(did);
+  }
+
   getSessionState(did) {
     return this.teamManager.getSessionState(did);
   }

package/lib/blocklet/manager/disk.js

@@ -3598,10 +3598,14 @@ class FederatedBlockletManager extends DiskBlockletManager {
 
     let data;
     try {
-      const result = await request.post(url.href, {
-        // 初次申请时，member 不在站点群中，不需要对数据进行加密
-        site: memberSite,
-      });
+      const result = await pRetry(
+        () =>
+          request.post(url.href, {
+            // 初次申请时，member 不在站点群中，不需要对数据进行加密
+            site: memberSite,
+          }),
+        { retries: 3 }
+      );
       data = result.data;
     } catch (error) {
       logger.error('Failed to join federated login', { error, did, url: url.href });
@@ -3621,7 +3625,7 @@ class FederatedBlockletManager extends DiskBlockletManager {
 
     const newState = await this.getBlocklet(did);
     this.emit(BlockletInternalEvents.appSettingChanged, { appDid: did });
-    this.emit(BlockletEvents.updated, { masterAppUrl: appUrl });
+    this.emit(BlockletEvents.updated, newState);
     return newState;
   }
 
@@ -3649,15 +3653,18 @@ class FederatedBlockletManager extends DiskBlockletManager {
       const url = new URL(masterSite.appUrl);
       url.pathname = `${WELLKNOWN_SERVICE_PATH_PREFIX}/api/federated/quit`;
       try {
-        await request.post(url.href, {
-          signer: permanentWallet.address,
-          data: signV2(permanentWallet.address, permanentWallet.secretKey, {
-            memberPid: blocklet.appPid,
-          }),
-        });
+        await pRetry(
+          () =>
+            request.post(url.href, {
+              signer: permanentWallet.address,
+              data: signV2(permanentWallet.address, permanentWallet.secretKey, {
+                memberPid: blocklet.appPid,
+              }),
+            }),
+          { retries: 3 }
+        );
       } catch (error) {
-        logger.error('Failed to quit blocklet', { error, did, url: url.href });
-        throw error;
+        logger.error('Failed to quit blocklet, will still quit federated by itself', { error, did, url: url.href });
       }
     }
 
@@ -3670,6 +3677,64 @@ class FederatedBlockletManager extends DiskBlockletManager {
     return newState;
   }
 
+  async disbandFederatedLogin({ did }) {
+    const blocklet = await this.getBlocklet(did);
+    const federated = defaults(cloneDeep(blocklet.settings.federated || {}), {
+      config: {},
+      sites: [],
+    });
+    const masterSite = federated.sites[0];
+    // 只有 Master 可以调用这个逻辑
+    if (masterSite && masterSite.isMaster !== false && masterSite.appPid === did) {
+      const nodeInfo = await states.node.read();
+      const blockletInfo = getBlockletInfo(blocklet, nodeInfo.sk);
+      const { permanentWallet } = blockletInfo;
+      logger.info('Disband federated login', {
+        memberSite: {
+          appId: blocklet.appDid,
+          appPid: blocklet.appPid,
+          appName: blockletInfo.name,
+          appDescription: blockletInfo.description,
+          appUrl: blockletInfo.appUrl,
+        },
+        masterAppUrl: masterSite.appUrl,
+      });
+
+      const disbandQueue = federated.sites
+        .filter((item) => item.appPid !== did)
+        .map((item) => {
+          return limitSync(async () => {
+            const url = new URL(item.appUrl);
+            url.pathname = `${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 }
+              );
+            } catch (error) {
+              logger.error('Failed to disband blocklet, will still disband federated by itself', {
+                error,
+                did,
+                url: url.href,
+              });
+            }
+          });
+        });
+      await Promise.all(disbandQueue);
+      await states.blockletExtras.setSettings(blocklet.appPid, {
+        federated: null,
+      });
+    }
+    const newState = await this.getBlocklet(did);
+    this.emit(BlockletInternalEvents.appSettingChanged, { appDid: did });
+    this.emit(BlockletEvents.updated, newState);
+    return newState;
+  }
+
   /**
    * 更改 federated 配置
    * @param {object} param
@@ -3776,15 +3841,21 @@ class FederatedBlockletManager extends DiskBlockletManager {
     });
     try {
       const roleList = roles.map((item) => pick(item, ['name', 'title', 'description']));
-      await request.post(postUrl, {
-        signer: permanentWallet.address,
-        data: signV2(permanentWallet.address, permanentWallet.secretKey, {
-          masterPid: blocklet.appPid,
-          status,
-          delegation,
-          roles: roleList,
-        }),
-      });
+      await pRetry(
+        () =>
+          request.post(postUrl, {
+            signer: permanentWallet.address,
+            data: signV2(permanentWallet.address, permanentWallet.secretKey, {
+              masterPid: blocklet.appPid,
+              status,
+              delegation,
+              roles: roleList,
+            }),
+          }),
+        {
+          retries: 3,
+        }
+      );
     } catch (error) {
       logger.error('Failed to post audit res to member-site', { error, did, url: postUrl });
       throw error;

package/lib/index.js

@@ -263,6 +263,7 @@ function ABTNode(options) {
     configOAuth: blockletManager.configOAuth.bind(blockletManager),
     joinFederatedLogin: blockletManager.joinFederatedLogin.bind(blockletManager),
     quitFederatedLogin: blockletManager.quitFederatedLogin.bind(blockletManager),
+    disbandFederatedLogin: blockletManager.disbandFederatedLogin.bind(blockletManager),
     auditFederatedLogin: blockletManager.auditFederatedLogin.bind(blockletManager),
     configFederated: blockletManager.configFederated.bind(blockletManager),
     setFederated: blockletManager.setFederated.bind(blockletManager),
@@ -352,6 +353,8 @@ function ABTNode(options) {
     loginUser: teamAPI.loginUser.bind(teamAPI),
     removeUser: teamAPI.removeUser.bind(teamAPI),
     updateUser: teamAPI.updateUser.bind(teamAPI),
+    updateUserTags: teamAPI.updateUserTags.bind(teamAPI),
+    updateUserExtra: teamAPI.updateUserExtra.bind(teamAPI),
     updateUserApproval: teamAPI.updateUserApproval.bind(teamAPI),
     updateUserRole: teamAPI.updateUserRole.bind(teamAPI),
     getUserByDid: teamAPI.getUserByDid.bind(teamAPI),
@@ -359,6 +362,12 @@ function ABTNode(options) {
     isConnectedAccount: teamAPI.isConnectedAccount.bind(teamAPI),
     switchProfile: teamAPI.switchProfile.bind(teamAPI),
 
+    // Tagging
+    createTag: teamAPI.createTag.bind(teamAPI),
+    updateTag: teamAPI.updateTag.bind(teamAPI),
+    deleteTag: teamAPI.deleteTag.bind(teamAPI),
+    getTags: teamAPI.getTags.bind(teamAPI),
+
     // Access Control
     getRBAC: (did = options.nodeDid) => teamManager.getRBAC(did),
 

package/lib/states/audit-log.js

@@ -132,7 +132,7 @@ const getLogContent = async (action, args, context, result, info, node) => {
       }
       return `${actionName} component: **${getComponentNamesWithVersion(result, result.componentDids)}**`;
     case 'deleteComponent':
-      return `removed ${result.deletedComponent.meta.title}@${result.deletedComponent.meta.version} ${ args.keepData !== false ? 'but kept its data and config' : 'and its data and config' }`; // prettier-ignore
+      return `removed ${result.deletedComponent.meta.title}@${result.deletedComponent.meta.version} ${args.keepData !== false ? 'but kept its data and config' : 'and its data and config'}`; // prettier-ignore
     case 'configBlocklet':
       return `updated following config for ${args.did?.length > 1 ? componentOrApplicationInfo(result, [args.did[1]]) : 'application'}: ${args.configs.map(x => `*${x.key}*`).join(', ')}`; // prettier-ignore
     case 'backupToSpaces':
@@ -151,6 +151,8 @@ const getLogContent = async (action, args, context, result, info, node) => {
       return `blocklet ${getBlockletInfo(result, info)} join federated login to ${args.appUrl}`;
     case 'quitFederatedLogin':
       return `blocklet ${getBlockletInfo(result, info)} quit federated login`;
+    case 'disbandFederatedLogin':
+      return `blocklet ${getBlockletInfo(result, info)} disband federated login`;
     case 'auditFederatedLogin':
       return `blocklet ${getBlockletInfo(result, info)} audit federated login member ${args.memberPid} with status: ${
         args.status
@@ -207,6 +209,8 @@ const getLogContent = async (action, args, context, result, info, node) => {
       return `enabled **${passport}** passport of user ${user}`;
     case 'updateUserApproval':
       return `${args.user.approved ? 'enabled' : 'disabled'} user ${user}`;
+    case 'updateUserTags':
+      return `set tags to ${args.tags} for user ${user}`;
     case 'deletePassportIssuance':
       return `removed passport issuance ${args.sessionId}`;
     case 'createMemberInvitation':
@@ -237,6 +241,12 @@ const getLogContent = async (action, args, context, result, info, node) => {
       return `issued **${args.role}** passport to ${user}`;
     case 'downloadLog':
       return `download log for ${args.days} day${args.days > 1 ? 's' : ''}`;
+    case 'createTag':
+      return `create tag ${args.tag.title}`;
+    case 'updateTag':
+      return `updated tag ${args.tag.id}`;
+    case 'deleteTag':
+      return `deleted tag ${args.tag.id}`;
 
     // accessKeys
     case 'createAccessKey':
@@ -334,6 +344,7 @@ const getLogCategory = (action) => {
     case 'backupToSpaces':
     case 'joinFederatedLogin':
     case 'quitFederatedLogin':
+    case 'disbandFederatedLogin':
     case 'auditFederatedLogin':
     case 'configFederated':
       return 'blocklet';
@@ -358,6 +369,7 @@ const getLogCategory = (action) => {
     case 'revokeUserPassport':
     case 'enableUserPassport':
     case 'updateUserApproval':
+    case 'updateUserTags':
     case 'createMemberInvitation':
     case 'deleteInvitation':
     case 'createRole':
@@ -368,6 +380,9 @@ const getLogCategory = (action) => {
     case 'delegateTransferNFT':
     case 'createTransferInvitation':
     case 'connectAccount':
+    case 'createTag':
+    case 'updateTag':
+    case 'deleteTag':
       return 'team';
 
     // accessKeys

package/lib/states/tag.js

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

package/lib/states/user.js

@@ -1,6 +1,7 @@
 const pickBy = require('lodash/pickBy');
 const get = require('lodash/get');
 const pick = require('lodash/pick');
+const uniq = require('lodash/uniq');
 const { isValid } = require('@arcblock/did');
 const { PASSPORT_STATUS } = require('@abtnode/constant');
 const { BaseState } = require('@abtnode/models');
@@ -178,7 +179,8 @@ class User extends ExtendBase {
   // eslint-disable-next-line require-await
   async getUsers({ query, sort, paging } = {}) {
     const where = {};
-    const { approved, role, search } = query || {};
+    const { approved, role, search, tags, includeTags } = query || {};
+    const shouldIncludeTag = (tags && tags.length) || includeTags;
 
     if (isNullOrUndefined(approved) === false) {
       where.approved = approved;
@@ -214,18 +216,18 @@ class User extends ExtendBase {
       sorting.createdAt = -1;
     }
 
-    return this.paginate({ where }, sorting, paging);
+    return this.paginate({ where, include: shouldIncludeTag ? [this.getTagInclude(tags)] : [] }, sorting, paging);
   }
 
   // eslint-disable-next-line require-await
   async getUsersByDids({ dids, query }) {
-    const { approved } = query || {};
+    const { approved, includeTags } = query || {};
     const condition = { did: dids };
     if (isNullOrUndefined(approved) === false) {
       condition.approved = !!approved;
     }
 
-    return this.find({ where: condition });
+    return this.find({ where: condition, include: includeTags ? [this.getTagInclude()] : [] });
   }
 
   // eslint-disable-next-line require-await
@@ -261,8 +263,8 @@ class User extends ExtendBase {
    * get user by did
    * @param {string} did user's did
    */
-  async getUser(did, { enableConnectedAccount = false } = {}) {
-    let user = await this.findOne({ did });
+  async getUser(did, { enableConnectedAccount = false, includeTags = false } = {}) {
+    let user = await this.findOne({ where: { did }, include: includeTags ? [this.getTagInclude()] : [] });
     let connectedAccounts = [];
     let passports = [];
 
@@ -375,6 +377,33 @@ class User extends ExtendBase {
     const count = await this.passport.count({ id: passportId, status: PASSPORT_STATUS.VALID });
     return count > 0;
   }
+
+  async updateTags(did, tags) {
+    const user = await this.getUserByDid(did);
+    if (user) {
+      const instance = this.build(user);
+      await instance.setTags(uniq(tags));
+      return this.getUser(did, { includeTags: true });
+    }
+
+    return null;
+  }
+
+  getTagInclude(tags = []) {
+    const result = {
+      model: this.models.Tag,
+      as: 'tags',
+      through: {
+        attributes: [],
+      },
+    };
+
+    if (tags.length) {
+      result.where = { id: { [Op.in]: tags.filter(Boolean) } };
+    }
+
+    return result;
+  }
 }
 
 module.exports = User;

package/lib/team/manager.js

@@ -31,6 +31,7 @@ const States = {
   Passport: require('../states/passport'),
   ConnectedAccount: require('../states/connect-account'),
   Session: require('../states/session'),
+  Tag: require('../states/tag'),
 };
 
 const getDefaultTeamState = () => ({
@@ -39,6 +40,7 @@ const getDefaultTeamState = () => ({
   passport: null,
   connectedAccount: null,
   session: null,
+  tag: null,
 });
 
 class TeamManager extends EventEmitter {
@@ -90,6 +92,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'),
+      tag: await this.createState(this.nodeDid, 'Tag'),
       passport: await this.createState(this.nodeDid, 'Passport'),
       connectedAccount: await this.createState(this.nodeDid, 'ConnectedAccount'),
       session: await this.createState(this.nodeDid, 'Session'),
@@ -100,6 +103,10 @@ class TeamManager extends EventEmitter {
     return this.getState(teamDid, 'user');
   }
 
+  getTagState(teamDid) {
+    return this.getState(teamDid, 'tag');
+  }
+
   getPassportState(teamDid) {
     return this.getState(teamDid, 'passport');
   }
@@ -317,6 +324,7 @@ class TeamManager extends EventEmitter {
 
     const rbac = await this.getRBAC(did);
     const user = await this.createState(did, 'User');
+    const tag = await this.createState(did, 'Tag');
     const passport = await this.createState(did, 'Passport');
     const connectedAccount = await this.createState(did, 'ConnectedAccount');
     const session = await this.createState(did, 'Session');
@@ -324,6 +332,7 @@ class TeamManager extends EventEmitter {
     this.cache[did] = {
       rbac,
       user,
+      tag,
       session,
       passport,
       connectedAccount,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.15-beta-12f50442",
+  "version": "1.16.15-beta-d649cecc",
   "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.15-beta-12f50442",
-    "@abtnode/auth": "1.16.15-beta-12f50442",
-    "@abtnode/certificate-manager": "1.16.15-beta-12f50442",
-    "@abtnode/constant": "1.16.15-beta-12f50442",
-    "@abtnode/cron": "1.16.15-beta-12f50442",
-    "@abtnode/logger": "1.16.15-beta-12f50442",
-    "@abtnode/models": "1.16.15-beta-12f50442",
-    "@abtnode/queue": "1.16.15-beta-12f50442",
-    "@abtnode/rbac": "1.16.15-beta-12f50442",
-    "@abtnode/router-provider": "1.16.15-beta-12f50442",
-    "@abtnode/static-server": "1.16.15-beta-12f50442",
-    "@abtnode/timemachine": "1.16.15-beta-12f50442",
-    "@abtnode/util": "1.16.15-beta-12f50442",
+    "@abtnode/analytics": "1.16.15-beta-d649cecc",
+    "@abtnode/auth": "1.16.15-beta-d649cecc",
+    "@abtnode/certificate-manager": "1.16.15-beta-d649cecc",
+    "@abtnode/constant": "1.16.15-beta-d649cecc",
+    "@abtnode/cron": "1.16.15-beta-d649cecc",
+    "@abtnode/logger": "1.16.15-beta-d649cecc",
+    "@abtnode/models": "1.16.15-beta-d649cecc",
+    "@abtnode/queue": "1.16.15-beta-d649cecc",
+    "@abtnode/rbac": "1.16.15-beta-d649cecc",
+    "@abtnode/router-provider": "1.16.15-beta-d649cecc",
+    "@abtnode/static-server": "1.16.15-beta-d649cecc",
+    "@abtnode/timemachine": "1.16.15-beta-d649cecc",
+    "@abtnode/util": "1.16.15-beta-d649cecc",
     "@arcblock/did": "1.18.89",
     "@arcblock/did-auth": "1.18.89",
     "@arcblock/did-ext": "^1.18.89",
@@ -42,11 +42,11 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.89",
     "@arcblock/vc": "1.18.89",
-    "@blocklet/constant": "1.16.15-beta-12f50442",
-    "@blocklet/env": "1.16.15-beta-12f50442",
-    "@blocklet/meta": "1.16.15-beta-12f50442",
-    "@blocklet/resolver": "1.16.15-beta-12f50442",
-    "@blocklet/sdk": "1.16.15-beta-12f50442",
+    "@blocklet/constant": "1.16.15-beta-d649cecc",
+    "@blocklet/env": "1.16.15-beta-d649cecc",
+    "@blocklet/meta": "1.16.15-beta-d649cecc",
+    "@blocklet/resolver": "1.16.15-beta-d649cecc",
+    "@blocklet/sdk": "1.16.15-beta-d649cecc",
     "@did-space/client": "^0.2.165",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.89",
@@ -100,5 +100,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "48bda4b29eb31a70e0eb9cab0bce6e544960c7fd"
+  "gitHead": "56941d1056a9e5f189992ace6e93971aa4226d07"
 }