@abtnode/core 1.16.8-beta-186fd5aa → 1.16.8-next-c66e39c7

package/lib/api/team.js

@@ -25,7 +25,7 @@ const {
 } = require('@abtnode/auth/lib/passport');
 const { getPassportStatusEndpoint } = require('@abtnode/auth/lib/auth');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
-const { parseUserAvatar } = require('@abtnode/util/lib/user-avatar');
+const { parseUserAvatar } = require('@abtnode/util/lib/user');
 const { getChainClient } = require('@abtnode/util/lib/get-chain-client');
 const { getWalletDid } = require('@blocklet/meta/lib/did-utils');
 
@@ -85,7 +85,7 @@ const sendPassportVcNotification = ({ userDid, appWallet: wallet, locale, vc })
 };
 
 const formatTransferData = (data) => ({
-  transferId: data._id,
+  transferId: data.id,
   remark: data.remark || '',
   expireDate: new Date(data.expireDate).toString(),
   appDid: data.appDid,
@@ -119,13 +119,12 @@ class TeamAPI extends EventEmitter {
       if (teamDid !== nodeInfo.did) {
         throw new Error('Cannot add user of owner role');
       }
-
       if (await state.count({ role: ROLES.OWNER })) {
         throw new Error('The owner already exists');
       }
     }
 
-    const { _action, ...doc } = await state.login(user);
+    const { _action, ...doc } = await state.loginUser(user);
     if (_action === 'update') {
       logger.info('user updated successfully', { teamDid, userDid: user.did });
       this.emit(EVENTS.USER_UPDATED, { teamDid, user: doc });
@@ -162,7 +161,7 @@ class TeamAPI extends EventEmitter {
       }
     }
 
-    const doc = await state.add(user);
+    const doc = await state.addUser(user);
 
     logger.info('user added successfully', { teamDid, userDid: user.did, userPk: user.pk, userName: user.fullName });
 
@@ -183,7 +182,7 @@ class TeamAPI extends EventEmitter {
     return doc;
   }
 
-  async getUsers({ teamDid, query, paging: inputPaging, sort, dids, sourceIds }) {
+  async getUsers({ teamDid, query, paging: inputPaging, sort, dids }) {
     const state = await this.getUserState(teamDid);
 
     if (inputPaging?.pageSize > MAX_USER_PAGE_SIZE) {
@@ -205,14 +204,6 @@ class TeamAPI extends EventEmitter {
         pageCount: 1,
         page: 1,
       };
-    } else if (sourceIds) {
-      list = await state.getUsersBySourceIds({ query, sourceIds });
-      paging = {
-        total: list.length,
-        pageSize: sourceIds.length,
-        pageCount: 1,
-        page: 1,
-      };
     } else {
       const doc = await state.getUsers({ query, sort, paging: { pageSize: 20, ...inputPaging } });
       list = doc.list;
@@ -239,8 +230,8 @@ class TeamAPI extends EventEmitter {
             'avatar',
             'locale',
             // oauth relate fields
-            'source',
-            'extraConfigs',
+            'sourceProvider',
+            'connectedAccounts',
           ])
         // eslint-disable-next-line function-paren-newline
       ),
@@ -250,36 +241,44 @@ class TeamAPI extends EventEmitter {
 
   async getUsersCount({ teamDid }) {
     const state = await this.getUserState(teamDid);
-
     return state.count();
   }
 
   async getUsersCountPerRole({ teamDid }) {
     const roles = await this.getRoles({ teamDid });
-
     const state = await this.getUserState(teamDid);
+    const names = ['$all', ...roles.map((x) => x.name), '$none'];
+    return Promise.all(
+      names.map(async (name) => {
+        const count = await state.countByPassport({ name, status: PASSPORT_STATUS.VALID });
+        return { key: name, value: count };
+      })
+    );
+  }
 
-    const res = [];
-
-    const all = await state.count();
-    res.push({ key: '$all', value: all });
-
-    for (const { name } of roles) {
-      // eslint-disable-next-line no-await-in-loop
-      const count = await state.count({ passports: { $elemMatch: { name, status: PASSPORT_STATUS.VALID } } });
-      res.push({ key: name, value: count });
-    }
+  async getUser({ teamDid, user, options = {} }) {
+    const state = await this.getUserState(teamDid);
+    return state.getUser(user.did, options);
+  }
 
-    const none = await state.count({ passports: { $size: 0 } });
-    res.push({ key: '$none', value: none });
+  async getUserByDid({ teamDid, userDid }) {
+    const state = await this.getUserState(teamDid);
+    return state.getUserByDid(userDid);
+  }
 
-    return res;
+  async isUserValid({ teamDid, userDid }) {
+    const state = await this.getUserState(teamDid);
+    return state.isUserValid(userDid);
   }
 
-  async getUser({ teamDid, user, options = {} }) {
+  async isPassportValid({ teamDid, passportId }) {
     const state = await this.getUserState(teamDid);
+    return state.isPassportValid(passportId);
+  }
 
-    return state.getUser(user.did, options);
+  async isConnectedAccount({ teamDid, did }) {
+    const state = await this.getUserState(teamDid);
+    return state.isConnectedAccount(did);
   }
 
   async getOwner({ teamDid }) {
@@ -298,12 +297,9 @@ class TeamAPI extends EventEmitter {
 
   async updateUser({ teamDid, user }) {
     const state = await this.getUserState(teamDid);
-
-    const doc = await state.update(user);
-
+    const doc = await state.updateUser(user.did, user);
     logger.info('user updated successfully', { teamDid, userDid: user.did });
     this.emit(EVENTS.USER_UPDATED, { teamDid, user: doc });
-
     return doc;
   }
 
@@ -321,9 +317,7 @@ class TeamAPI extends EventEmitter {
     const state = await this.getUserState(teamDid);
 
     await state.remove({ did });
-
     logger.info('user removed successfully', { teamDid, userDid: did });
-
     this.emit(EVENTS.USER_REMOVED, { teamDid, user: { did } });
 
     return { did };
@@ -545,15 +539,14 @@ class TeamAPI extends EventEmitter {
     }
 
     const state = await this.getSessionState(teamDid);
-
-    const invitation = await state.findOne({ _id: inviteId, type: 'invite' });
+    const invitation = await state.read(inviteId);
     if (!invitation) {
       return null;
     }
 
     return {
       // eslint-disable-next-line no-underscore-dangle
-      inviteId: invitation._id,
+      inviteId: invitation.id,
       role: invitation.role,
       remark: invitation.remark,
       expireDate: new Date(invitation.expireDate).toString(),
@@ -571,7 +564,7 @@ class TeamAPI extends EventEmitter {
 
     return invitations.filter(filter || ((x) => x.status !== 'success')).map((d) => ({
       // eslint-disable-next-line no-underscore-dangle
-      inviteId: d._id,
+      inviteId: d.id,
       role: d.role,
       remark: d.remark,
       expireDate: new Date(d.expireDate).toString(),
@@ -695,7 +688,7 @@ class TeamAPI extends EventEmitter {
 
     const state = await this.getSessionState(appDid);
 
-    const transfer = await state.findOne({ _id: transferId, type: 'transfer-app-owner' });
+    const transfer = await state.read(transferId);
     if (!transfer) {
       return null;
     }
@@ -826,6 +819,7 @@ class TeamAPI extends EventEmitter {
     }
     const { id } = await state.start({
       type: 'passport-issuance',
+      key: userDid,
       expireDate, // session expireDate
       name: role.name,
       title: role.title,
@@ -851,14 +845,14 @@ class TeamAPI extends EventEmitter {
     const query = { type: 'passport-issuance' };
 
     if (ownerDid) {
-      query.ownerDid = ownerDid;
+      query.key = ownerDid;
     }
 
     const list = await state.find(query);
 
     return list.map((d) => ({
       // eslint-disable-next-line no-underscore-dangle
-      id: d._id,
+      id: d.id,
       name: d.name,
       title: d.title,
       expireDate: new Date(d.expireDate).toString(),
@@ -869,13 +863,7 @@ class TeamAPI extends EventEmitter {
 
   async getPassportIssuance({ teamDid, sessionId }) {
     const state = await this.getSessionState(teamDid);
-
-    const doc = await state.findOne({ _id: sessionId });
-
-    if (doc) {
-      doc.id = doc._id;
-    }
-
+    const doc = await state.read(sessionId);
     return doc;
   }
 
@@ -1007,11 +995,9 @@ class TeamAPI extends EventEmitter {
 
   async getPermissions({ teamDid }) {
     const rbac = await this.getRBAC(teamDid);
-
     const permissions = await rbac.getPermissions();
-
     return permissions.map((d) => {
-      d.isProtected = d.extra && d.extra.isProtected;
+      d.isProtected = !!(d.extra && d.extra.isProtected);
       return pick(d, ['name', 'description', 'isProtected']);
     });
   }
@@ -1022,7 +1008,6 @@ class TeamAPI extends EventEmitter {
     await validateCreatePermission({ name, description });
 
     const rbac = await this.getRBAC(teamDid);
-
     const added = await rbac.createPermission({ name, description });
 
     return pick(added, ['name', 'description']);
@@ -1034,7 +1019,6 @@ class TeamAPI extends EventEmitter {
     await validateUpdatePermission({ name, description });
 
     const rbac = await this.getRBAC(teamDid);
-
     const state = await rbac.updatePermission({ name, description });
 
     return pick(state, ['name', 'description']);
@@ -1044,7 +1028,6 @@ class TeamAPI extends EventEmitter {
     logger.info('grant', { teamDid, roleName, grantName });
 
     const rbac = await this.getRBAC(teamDid);
-
     await rbac.grant(roleName, grantName);
 
     return true;
@@ -1054,7 +1037,6 @@ class TeamAPI extends EventEmitter {
     logger.info('revoke', { teamDid, roleName, grantName });
 
     const rbac = await this.getRBAC(teamDid);
-
     await rbac.revoke(roleName, grantName);
 
     return true;
@@ -1064,7 +1046,6 @@ class TeamAPI extends EventEmitter {
     logger.info('update grants', { teamDid, roleName, grantNames });
 
     const rbac = await this.getRBAC(teamDid);
-
     const role = await rbac.updateGrants(roleName, grantNames);
 
     return pick(role, ['name', 'grants', 'title', 'description']);
@@ -1076,7 +1057,6 @@ class TeamAPI extends EventEmitter {
     validateReservedRole(name);
 
     const rbac = await this.getRBAC(teamDid);
-
     await rbac.removeRole(name);
 
     return true;

package/lib/blocklet/manager/disk.js

@@ -636,7 +636,6 @@ class BlockletManager extends BaseBlockletManager {
 
   /**
    * FIXME: @linchen support cancel
-   * FIXME: @wangshijun create audit log for this
    * @param {import('@abtnode/client').RequestRestoreBlockletInput} input
    * @memberof BlockletManager
    */
@@ -1883,7 +1882,6 @@ class BlockletManager extends BaseBlockletManager {
   }
 
   /**
-   * FIXME: @wangshijun create audit log for this
    * @param {{
    *  blocklet: import('@abtnode/client').BlockletState,
    *  context: {
@@ -1916,7 +1914,7 @@ class BlockletManager extends BaseBlockletManager {
       });
       await spacesBackup.backup();
 
-      await states.backup.success(backup._id, {
+      await states.backup.success(backup.id, {
         targetUrl: getBackupFilesUrlFromEndpoint(getBackupEndpoint(blocklet?.environments)),
       });
 
@@ -1930,7 +1928,7 @@ class BlockletManager extends BaseBlockletManager {
         blocklet,
       });
     } catch (error) {
-      await states.backup.fail(backup._id, {
+      await states.backup.fail(backup.id, {
         message: error?.message,
       });
       this.emit(BlockletEvents.backupProgress, {
@@ -1947,8 +1945,6 @@ class BlockletManager extends BaseBlockletManager {
   }
 
   /**
-   * FIXME: @linchen support cancel
-   * FIXME: @wangshijun create audit log for this
    * @param {{
    *  input: import('@abtnode/client').RequestRestoreBlockletInput,
    *  context: Record<string, string>,
@@ -2937,7 +2933,6 @@ class BlockletManager extends BaseBlockletManager {
   }
 
   /**
-   * FIXME: @wangshijun create audit log for this
    * @param {{
    *  blocklet: import('@abtnode/client').BlockletState,
    *  context: {
@@ -2992,7 +2987,6 @@ class BlockletManager extends BaseBlockletManager {
 
   /**
    * FIXME: @linchen support cancel
-   * FIXME: @wangshijun create audit log for this
    * @param {import('@abtnode/client').RequestRestoreBlockletInput} input
    * @memberof BlockletManager
    */

package/lib/blocklet/manager/helper/migrate-application-to-struct-v2.js

@@ -216,7 +216,7 @@ const migrateApplicationToStructV2 = async ({ did, appSk: newAppSk, context = {}
 
   const backupBlocklet = await states.blocklet.findOne({ 'meta.did': oldBlocklet.meta.did });
   const backupExtra = cloneDeep(extraData);
-  const backupSite = await states.site.findOne({ _id: siteData.id });
+  const backupSite = await states.site.findOne({ id: siteData.id });
 
   const { appPid } = oldBlocklet;
 
@@ -447,7 +447,7 @@ const migrateApplicationToStructV2 = async ({ did, appSk: newAppSk, context = {}
 
     // update routing
     await states.site.update(
-      { _id: siteData.id },
+      { id: siteData.id },
       { $set: { domain: siteData.domain, domainAliases: siteData.domainAliases, rules: siteData.rules } }
     );
 
@@ -473,12 +473,12 @@ const migrateApplicationToStructV2 = async ({ did, appSk: newAppSk, context = {}
     logger.error('Migrate application state failed: ', { did, error });
 
     try {
-      await states.blocklet.remove({ _id: backupBlocklet._id });
+      await states.blocklet.remove({ id: backupBlocklet.id });
       await states.blocklet.remove({ 'meta.did': blockletData.meta.did });
       await states.blocklet.insert(backupBlocklet);
-      await states.blockletExtras.remove({ _id: backupExtra._id });
+      await states.blockletExtras.remove({ id: backupExtra.id });
       await states.blockletExtras.insert(backupExtra);
-      await states.site.remove({ _id: backupSite._id });
+      await states.site.remove({ id: backupSite.id });
       await states.site.insert(backupSite);
 
       logger.info('Rollback application state');

package/lib/blocklet/storage/backup/blocklet-extras.js

@@ -50,8 +50,8 @@ class BlockletExtrasBackup extends BaseBackup {
       const current = queue.pop();
 
       // 删除父 blocklet 的某些数据
-      if (current._id) {
-        delete current._id;
+      if (current.id) {
+        delete current.id;
         delete current.createdAt;
         delete current.updatedAt;
       }

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

@@ -39,8 +39,8 @@ class BlockletBackup extends BaseBackup {
       const current = queue.pop();
 
       // 父组件才需要删除的属性
-      if (current._id) {
-        delete current._id;
+      if (current.id) {
+        delete current.id;
         delete current.createdAt;
         delete current.startedAt;
         delete current.installedAt;

package/lib/index.js

@@ -66,17 +66,21 @@ function ABTNode(options) {
     options.daemon = false;
   }
 
+  // 0. ensure data dirs
   const dataDirs = ensureDataDirs(options.dataDir);
 
-  const concurrency = getQueueConcurrencyByMem();
+  // 1. initialize storage
+  states.init(dataDirs, options);
 
+  // 2. initialize queues
+  const concurrency = getQueueConcurrencyByMem();
   logger.info('startup and installation queue currency', { concurrency });
 
-  // Initialize the start queue
+  // 2.1 initialize the start queue
   const startQueue = createQueue({
     daemon: options.daemon,
+    model: states.job,
     name: 'jobs',
-    dataDir: dataDirs.core,
     onJob: async (job) => {
       if (typeof blockletManager.onJob === 'function') {
         await blockletManager.onJob(job);
@@ -88,11 +92,11 @@ function ABTNode(options) {
     },
   });
 
-  // Initialize the install queue
+  // 2.2 initialize the install queue
   const installQueue = createQueue({
     daemon: options.daemon,
+    model: states.job,
     name: 'install_queue',
-    dataDir: dataDirs.core,
     onJob: async (job) => {
       if (typeof blockletManager.onJob === 'function') {
         await blockletManager.onJob(job);
@@ -109,8 +113,8 @@ function ABTNode(options) {
 
   const backupQueue = createQueue({
     daemon: options.daemon,
+    model: states.job,
     name: 'backup_queue',
-    dataDir: dataDirs.core,
     onJob: async (job) => {
       if (typeof blockletManager.onJob === 'function') {
         await blockletManager.onJob(job);
@@ -129,7 +133,7 @@ function ABTNode(options) {
   const restoreQueue = createQueue({
     daemon: options.daemon,
     name: 'restore_queue',
-    dataDir: dataDirs.core,
+    model: states.job,
     onJob: async (job) => {
       if (typeof blockletManager.onJob === 'function') {
         await blockletManager.onJob(job);
@@ -145,27 +149,26 @@ function ABTNode(options) {
     },
   });
 
-  // Initialize storage
-  states.init(dataDirs, options);
-
   const certManager = new Cert({
     maintainerEmail: DEFAULT_CERTIFICATE_EMAIL,
     dataDir: dataDirs.certManagerModule,
     states,
   });
 
+  // 3. init routing manager
   const routerManager = new RouterManager({ certManager });
   const routingSnapshot = new RoutingSnapshot({
     baseDir: dataDirs.core,
     getRoutingData: async () => {
       const sites = await states.site.getSites();
-
       return { sites };
     },
   });
 
+  // 4. init team manager
   const teamManager = new TeamManager({ nodeDid: options.nodeDid, dataDirs, states });
 
+  // 5. init blocklet manager
   const blockletManager = new BlockletManager({
     dataDirs,
     startQueue,
@@ -339,6 +342,9 @@ function ABTNode(options) {
     updateUser: teamAPI.updateUser.bind(teamAPI),
     updateUserApproval: teamAPI.updateUserApproval.bind(teamAPI),
     updateUserRole: teamAPI.updateUserRole.bind(teamAPI),
+    getUserByDid: teamAPI.getUserByDid.bind(teamAPI),
+    isPassportValid: teamAPI.isPassportValid.bind(teamAPI),
+    isConnectedAccount: teamAPI.isConnectedAccount.bind(teamAPI),
 
     // Access Control
     getRBAC: (did = options.nodeDid) => teamManager.getRBAC(did),
@@ -377,10 +383,6 @@ function ABTNode(options) {
     addBlockletStore: teamAPI.addStore.bind(teamAPI),
     deleteBlockletStore: teamAPI.deleteStore.bind(teamAPI),
 
-    // Challenge
-    generateChallenge: states.challenge.generate.bind(states.challenge),
-    verifyChallenge: states.challenge.verify.bind(states.challenge),
-
     // Notifications
     getNotifications: states.notification.findPaginated.bind(states.notification),
     readNotifications: states.notification.read.bind(states.notification),
@@ -425,7 +427,6 @@ function ABTNode(options) {
     // Access Key
     getAccessKeys: states.accessKey.list.bind(states.accessKey),
     getAccessKey: states.accessKey.detail.bind(states.accessKey),
-    getAccessKeyByTag: states.accessKey.getAccessKeyByTag.bind(states.accessKey),
     createAccessKey: states.accessKey.create.bind(states.accessKey),
     updateAccessKey: states.accessKey.update.bind(states.accessKey),
     deleteAccessKey: states.accessKey.remove.bind(states.accessKey),

package/lib/migrations/1.16.8-component-title.js

@@ -59,7 +59,7 @@ module.exports = async ({ states, printInfo }) => {
     }
 
     if (shouldUpdate) {
-      await states.blocklet.update({ _id: app._id }, { $set: { children: app.children } });
+      await states.blocklet.update({ id: app.id }, { $set: { children: app.children } });
       printInfo(`Blocklet in blocklet.db updated: ${app.meta?.title}`);
     }
   }

package/lib/migrations/1.6.9-update-node-info-and-certificate.js

@@ -16,7 +16,7 @@ const updateNodeInfo = async ({ printInfo, states }) => {
   }
 
   if (!isEmpty(data)) {
-    await states.node.update({ _id: info._id }, { $set: data });
+    await states.node.update({ did: info.did }, { $set: data });
   }
 
   printInfo('update did registry and did domain successfully');