@abtnode/core 1.16.31-beta-4246ab25 → 1.16.31-beta-a0cc72cf

package/lib/blocklet/hooks.js

@@ -32,7 +32,6 @@ const runUserHook = async (label, hookName, args) => {
     logger.info(`run hook:${hookName}:`, { label, hook });
 
     const nodeInfo = await states.node.read();
-    // FIXME @linchen timeout 应该动态设置或不设置
     await runScript(hook, [label, hookName].join(':'), {
       cwd: appDir,
       env: {

package/lib/states/user.js

@@ -1,3 +1,4 @@
+const cloneDeep = require('lodash/cloneDeep');
 const pickBy = require('lodash/pickBy');
 const get = require('lodash/get');
 const pick = require('lodash/pick');
@@ -73,7 +74,7 @@ class User extends ExtendBase {
     // create user
     await this.insert({
       ...user,
-      ...(await this._prepareInviteInfo(user)),
+      ...(await this._extractInviteInfo(user)),
       sourceProvider: user.sourceProvider || LOGIN_PROVIDER.WALLET,
       approved: !!user.approved,
     });
@@ -96,12 +97,20 @@ class User extends ExtendBase {
 
   // FIXME: @wangshijun wrap these in a transaction
   async updateUser(did, updates) {
-    const exist = await super.count({ did });
+    const exist = await super.findOne({ did });
     if (!exist) {
       throw new Error(`user does not exist: ${did}`);
     }
 
-    await super.update({ did }, { $set: updates });
+    // Allow to update inviter only when inviter is not set
+    const pending = cloneDeep(updates);
+    if (exist.inviter) {
+      delete pending.inviter;
+    } else {
+      Object.assign(pending, await this._extractInviteInfo({ did, ...pending }));
+    }
+
+    await super.update({ did }, { $set: pending });
     await Promise.all(
       (get(updates, 'passports') || [])
         .filter((x) => x.id)
@@ -187,9 +196,10 @@ class User extends ExtendBase {
   /**
    * Get blocklet service user list
    */
-  // eslint-disable-next-line require-await
   async getUsers({ query, sort, paging } = {}) {
     const where = {};
+    const replacements = {};
+
     const {
       approved,
       role,
@@ -208,6 +218,11 @@ class User extends ExtendBase {
       where.approved = approved;
     }
 
+    const sorting = pickBy(sort, (x) => !isNullOrUndefined(x));
+    if (!Object.keys(sorting).length) {
+      sorting.createdAt = -1;
+    }
+
     if (search) {
       if (search.length > 50) {
         throw new Error('the length of search text should not more than 50');
@@ -223,44 +238,51 @@ class User extends ExtendBase {
       throw new Error('You can not query by inviter and invitee at the same time');
     }
 
-    // handle descendant query
-    if (inviter) {
-      if (isValid(inviter) === false) {
-        throw new Error('inviter did invalid');
-      }
-      const exist = await this.model.findByPk(toAddress(inviter), { attributes: ['did', 'generation'] });
-      if (!exist) {
-        throw new Error(`inviter not found: ${inviter}`);
-      }
+    let total = 0;
+    if (!where.did) {
+      // handle descendant query
+      if (inviter) {
+        if (isValid(inviter) === false) {
+          throw new Error('inviter did invalid');
+        }
+        const exist = await this.model.findByPk(toAddress(inviter), { attributes: ['did', 'generation'] });
+        if (!exist) {
+          throw new Error(`inviter not found: ${inviter}`);
+        }
 
-      try {
-        const subQuery = `
-WITH RECURSIVE UserTree(did,inviter,generation) AS (
-  SELECT did,inviter,generation FROM users WHERE inviter="${exist.did}"
+        try {
+          const { pageSize: size = 20, page = 1 } = paging || {};
+          const pageSize = Math.min(100, size);
+          const offset = (page - 1) * pageSize;
+          //   LIMIT ${pageSize} OFFSET ${offset}
+          const subQuery = `
+WITH RECURSIVE UserTree(did,inviter,generation,createdAt) AS (
+  SELECT did,inviter,generation,createdAt FROM users WHERE inviter="${exist.did}"
   UNION ALL
-	SELECT child.did,child.inviter,child.generation FROM users AS child INNER JOIN UserTree AS parent ON (child.inviter=parent.did)
+	SELECT child.did,child.inviter,child.generation,child.createdAt FROM users AS child INNER JOIN UserTree AS parent ON (child.inviter=parent.did) ORDER BY child.createdAt DESC
 )
-SELECT did,inviter,generation FROM UserTree ${generation > 0 ? `WHERE generation=${(exist.generation > 0 ? exist.generation : 0) + generation}` : ''} LIMIT ${USER_MAX_INVITE_DEPTH}`.trim();
-        const children = await this.query(subQuery);
-        where.did = children.map((x) => x.did);
-      } catch (err) {
-        console.error('Failed to get descendants', err);
-        where.did = [];
+SELECT did,inviter,generation FROM UserTree ${generation > 0 ? `WHERE generation=${(exist.generation > 0 ? exist.generation : 0) + generation}` : ''}`.trim();
+          const children = await this.query(subQuery);
+          total = children.length;
+          where.did = children.slice(offset, offset + pageSize).map((x) => x.did);
+        } catch (err) {
+          console.error('Failed to get descendants', err);
+          where.did = [];
+        }
       }
-    }
 
-    // handle ancestor query
-    if (invitee) {
-      if (isValid(invitee) === false) {
-        throw new Error('invitee did invalid');
-      }
-      const exist = await this.model.findByPk(toAddress(invitee), { attributes: ['did', 'generation'] });
-      if (!exist) {
-        throw new Error(`invitee not found: ${invitee}`);
-      }
+      // handle ancestor query
+      if (invitee) {
+        if (isValid(invitee) === false) {
+          throw new Error('invitee did invalid');
+        }
+        const exist = await this.model.findByPk(toAddress(invitee), { attributes: ['did', 'generation'] });
+        if (!exist) {
+          throw new Error(`invitee not found: ${invitee}`);
+        }
 
-      try {
-        const subQuery = `
+        try {
+          const subQuery = `
 WITH RECURSIVE UserTree(did,inviter,generation) AS (
   SELECT did,inviter,generation FROM users WHERE did="${exist.did}"
   UNION ALL
@@ -270,39 +292,34 @@ WITH RECURSIVE UserTree(did,inviter,generation) AS (
     (SELECT generation FROM users AS parent WHERE parent.did=child.inviter)
     FROM UserTree AS child
     WHERE inviter IS NOT NULL
-    LIMIT ${USER_MAX_INVITE_DEPTH}
 )
 SELECT did,inviter,generation FROM UserTree`.trim();
-        const children = await this.query(subQuery);
-        where.did = children.map((x) => x.did).filter((x) => x !== exist.did);
-      } catch (err) {
-        console.error('Failed to get ancestors', err);
-        where.did = [];
+          const children = await this.query(subQuery);
+          where.did = children.map((x) => x.did).filter((x) => x !== exist.did);
+        } catch (err) {
+          console.error('Failed to get ancestors', err);
+          where.did = [];
+        }
       }
-    }
-
-    const replacements = {};
 
-    if (role && role !== '$all' && !where.did) {
-      replacements.status = PASSPORT_STATUS.VALID;
-      if (role === '$none') {
-        where.did = {
-          [Op.notIn]: Sequelize.literal('(SELECT DISTINCT userDid FROM passports WHERE status = :status)'),
-        };
-      } else {
-        replacements.role = role;
-        where.did = {
-          [Op.in]: Sequelize.literal(
-            '(SELECT DISTINCT userDid FROM passports WHERE name = :role AND status = :status)'
-          ),
-        };
+      // handle role/status query
+      if (role && role !== '$all') {
+        replacements.status = PASSPORT_STATUS.VALID;
+        if (role === '$none') {
+          where.did = {
+            [Op.notIn]: Sequelize.literal('(SELECT DISTINCT userDid FROM passports WHERE status = :status)'),
+          };
+        } else {
+          replacements.role = role;
+          where.did = {
+            [Op.in]: Sequelize.literal(
+              '(SELECT DISTINCT userDid FROM passports WHERE name = :role AND status = :status)'
+            ),
+          };
+        }
       }
     }
 
-    const sorting = pickBy(sort, (x) => !isNullOrUndefined(x));
-    if (!Object.keys(sorting).length) {
-      sorting.createdAt = -1;
-    }
     const include = [];
     if (shouldIncludeTag) {
       include.push(this.getTagInclude(tags));
@@ -325,7 +342,7 @@ SELECT did,inviter,generation FROM UserTree`.trim();
     }
 
     const result = await this.paginate({ where, include, replacements }, sorting, paging);
-    return result;
+    return { list: result.list, paging: { ...result.paging, total: total || result.paging.total } };
   }
 
   // eslint-disable-next-line require-await
@@ -490,19 +507,15 @@ SELECT did,inviter,generation FROM UserTree`.trim();
       updates.sourceAppPid = null;
     }
 
-    Object.assign(updates, await this._prepareInviteInfo(raw));
+    Object.assign(updates, await this._extractInviteInfo(raw));
 
     if (exist) {
-      // immutable
-      if (updates.sourceAppPid) {
-        delete updates.sourceAppPid;
-      }
-      if (updates.inviter) {
-        delete updates.inviter;
-        delete updates.generation;
-      }
-      // 登录不再更新 locale
+      // immutable fields
       delete updates.locale;
+      delete updates.sourceAppPid;
+      delete updates.inviter;
+      delete updates.generation;
+
       // update user, connectedAccount, passport
       updates.connectedAccounts = updateConnectedAccount(exist.connectedAccounts, user.connectedAccount);
       updated = await this.updateUser(exist.did, updates);
@@ -520,18 +533,25 @@ SELECT did,inviter,generation FROM UserTree`.trim();
     return { ...updated, _action: exist ? 'update' : 'add' };
   }
 
-  async _prepareInviteInfo(raw) {
+  async _extractInviteInfo(raw) {
     const info = {};
 
-    // set inviter and generation
     if (raw.inviter) {
       // sybil-attack
       if (isValid(raw.inviter)) {
         const inviterId = toAddress(raw.inviter);
         const inviter = await this.model.findByPk(inviterId, { attributes: ['did', 'generation'] });
         if (inviter) {
-          info.inviter = inviterId;
-          info.generation = inviter.generation + 1;
+          // circle preventing
+          const { list: ancestors } = await this.getUsers({ query: { invitee: inviterId } });
+          const hasCircle = ancestors.some((x) => x.did === raw.did);
+          if (hasCircle) {
+            logger.warn('Set inviter result in cycle is not allowed', raw);
+            info.inviter = null;
+          } else {
+            info.inviter = inviterId;
+            info.generation = inviter.generation + 1;
+          }
         } else {
           logger.warn('Set inviter to non-exist user is not allowed', raw);
         }

package/lib/util/launcher.js

@@ -357,9 +357,13 @@ const setupAppOwner = async ({ node, sessionId, justCreate = false, context }) =
   };
 };
 
-const getLauncherSession = async ({ launcherUrl, launcherSessionId, external = true }) => {
+const getLauncherSession = async ({ launcherUrl, launcherSessionId, external = true }, context) => {
   const info = await states.node.read();
-  const result = await getLauncherSessionRaw(info.sk, { launcherUrl, launcherSessionId });
+  const result = await getLauncherSessionRaw(info.sk, {
+    launcherUrl,
+    launcherSessionId,
+    locale: context?.query?.locale,
+  });
 
   // strip sensitive data if call from external
   if (external && result.launcherSession) {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.31-beta-4246ab25",
+  "version": "1.16.31-beta-a0cc72cf",
   "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.31-beta-4246ab25",
-    "@abtnode/auth": "1.16.31-beta-4246ab25",
-    "@abtnode/certificate-manager": "1.16.31-beta-4246ab25",
-    "@abtnode/constant": "1.16.31-beta-4246ab25",
-    "@abtnode/cron": "1.16.31-beta-4246ab25",
-    "@abtnode/logger": "1.16.31-beta-4246ab25",
-    "@abtnode/models": "1.16.31-beta-4246ab25",
-    "@abtnode/queue": "1.16.31-beta-4246ab25",
-    "@abtnode/rbac": "1.16.31-beta-4246ab25",
-    "@abtnode/router-provider": "1.16.31-beta-4246ab25",
-    "@abtnode/static-server": "1.16.31-beta-4246ab25",
-    "@abtnode/timemachine": "1.16.31-beta-4246ab25",
-    "@abtnode/util": "1.16.31-beta-4246ab25",
+    "@abtnode/analytics": "1.16.31-beta-a0cc72cf",
+    "@abtnode/auth": "1.16.31-beta-a0cc72cf",
+    "@abtnode/certificate-manager": "1.16.31-beta-a0cc72cf",
+    "@abtnode/constant": "1.16.31-beta-a0cc72cf",
+    "@abtnode/cron": "1.16.31-beta-a0cc72cf",
+    "@abtnode/logger": "1.16.31-beta-a0cc72cf",
+    "@abtnode/models": "1.16.31-beta-a0cc72cf",
+    "@abtnode/queue": "1.16.31-beta-a0cc72cf",
+    "@abtnode/rbac": "1.16.31-beta-a0cc72cf",
+    "@abtnode/router-provider": "1.16.31-beta-a0cc72cf",
+    "@abtnode/static-server": "1.16.31-beta-a0cc72cf",
+    "@abtnode/timemachine": "1.16.31-beta-a0cc72cf",
+    "@abtnode/util": "1.16.31-beta-a0cc72cf",
     "@arcblock/did": "1.18.135",
     "@arcblock/did-auth": "1.18.135",
     "@arcblock/did-ext": "^1.18.135",
@@ -42,12 +42,12 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.135",
     "@arcblock/vc": "1.18.135",
-    "@blocklet/constant": "1.16.31-beta-4246ab25",
-    "@blocklet/env": "1.16.31-beta-4246ab25",
-    "@blocklet/meta": "1.16.31-beta-4246ab25",
-    "@blocklet/resolver": "1.16.31-beta-4246ab25",
-    "@blocklet/sdk": "1.16.31-beta-4246ab25",
-    "@blocklet/store": "1.16.31-beta-4246ab25",
+    "@blocklet/constant": "1.16.31-beta-a0cc72cf",
+    "@blocklet/env": "1.16.31-beta-a0cc72cf",
+    "@blocklet/meta": "1.16.31-beta-a0cc72cf",
+    "@blocklet/resolver": "1.16.31-beta-a0cc72cf",
+    "@blocklet/sdk": "1.16.31-beta-a0cc72cf",
+    "@blocklet/store": "1.16.31-beta-a0cc72cf",
     "@did-space/client": "^0.5.31",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.135",
@@ -103,5 +103,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "ef93705b89033e4cd5fed458b64521d0a994a1d0"
+  "gitHead": "d1eec814979a4086fc5efd7c719687b76c972ec6"
 }