@abtnode/core 1.8.30 → 1.8.32

package/lib/api/node.js

@@ -13,8 +13,8 @@ const logger = require('@abtnode/logger')('@abtnode/core:api:node');
 
 const IP = require('../util/ip');
 const { validateNodeInfo, validateUpdateGateway } = require('../validators/node');
-const BlockletRegistry = require('../blocklet/registry');
 const { getAll } = require('../blocklet/manager/engine');
+const StoreUtil = require('../util/store');
 const { getDelegateState } = require('../util');
 
 const sanitizeUrl = (url) => {
@@ -59,9 +59,9 @@ class NodeAPI {
       throw new Error(`Blocklet registry already exist: ${sanitized}`);
     }
 
-    await BlockletRegistry.validateRegistryURL(sanitized);
+    await StoreUtil.validateRegistryURL(sanitized);
 
-    const newBlockletRegistry = await BlockletRegistry.getRegistryMeta(sanitized);
+    const newBlockletRegistry = await StoreUtil.getRegistryMeta(sanitized);
     const newBlockletRegistryList = info.blockletRegistryList.map((x) => ({ ...x, selected: false }));
     newBlockletRegistryList.push({ ...newBlockletRegistry, url: sanitized, selected: true, protected: false });
 

package/lib/api/team.js

@@ -10,6 +10,7 @@ const {
   WHO_CAN_ACCESS,
   PASSPORT_STATUS,
   WELLKNOWN_SERVICE_PATH_PREFIX,
+  MAX_USER_PAGE_SIZE,
 } = require('@abtnode/constant');
 const { isValid: isValidDid } = require('@arcblock/did');
 const { BlockletEvents } = require('@blocklet/constant');
@@ -30,8 +31,6 @@ const { validateCreatePermission, validateUpdatePermission } = require('../valid
 
 const { getBlocklet } = require('../util/blocklet');
 
-const MAX_USER_PAGE_SIZE = 100;
-
 const validateReservedRole = (role) => {
   if (Object.values(ROLES).includes(role)) {
     throw new Error(`The role ${role} is reserved`);
@@ -126,14 +125,33 @@ class TeamAPI extends EventEmitter {
     return doc;
   }
 
-  async getUsers({ teamDid, query, paging: inputPaging, sort }) {
+  async getUsers({ teamDid, query, paging: inputPaging, sort, dids }) {
     const state = await this.getUserState(teamDid);
 
     if (inputPaging?.pageSize > MAX_USER_PAGE_SIZE) {
       throw new Error(`Length of users should not exceed ${MAX_USER_PAGE_SIZE} per page`);
     }
 
-    const { list, paging } = await state.getUsers({ query, sort, paging: { pageSize: 20, ...inputPaging } });
+    if (dids && dids.length > MAX_USER_PAGE_SIZE) {
+      throw new Error(`Length of users should not exceed ${MAX_USER_PAGE_SIZE}`);
+    }
+
+    let list;
+    let paging;
+
+    if (dids) {
+      list = await state.getUsersByDids({ query, dids });
+      paging = {
+        total: list.length,
+        pageSize: dids.length,
+        pageCount: 1,
+        page: 1,
+      };
+    } else {
+      const doc = await state.getUsers({ query, sort, paging: { pageSize: 20, ...inputPaging } });
+      list = doc.list;
+      paging = doc.paging;
+    }
 
     return {
       users: list.map(