@abtnode/core 1.16.21-beta-93c6e42b → 1.16.21-beta-2e75c75c

package/lib/api/team.js

@@ -1399,7 +1399,7 @@ class TeamAPI extends EventEmitter {
 
     const userSessions = await state.model.findAll({
       where,
-      attributes: ['id', 'appPid', 'userDid', 'visitorId', 'passportId', 'updatedAt'],
+      attributes: ['id', 'appPid', 'userDid', 'visitorId', 'passportId', 'updatedAt', 'extra'],
       include: {
         model: userState.model,
         as: 'user',
@@ -1442,10 +1442,11 @@ class TeamAPI extends EventEmitter {
    * @param {string} params.lastLoginIp - 记录的 userSession 中当前用户的最后登录 ip
    * @param {string} params.passportId - 记录的 userSession 中当前用户登录所使用的 passportId
    * @param {string} params.status - 记录的 userSession 的状态
+   * @param {Object} params.extra - 记录的 userSession 额外的数据
    * @returns
    */
 
-  async upsertUserSession({ teamDid, appPid, userDid, visitorId, ua, lastLoginIp, passportId, status }) {
+  async upsertUserSession({ teamDid, appPid, userDid, visitorId, ua, lastLoginIp, passportId, status, extra }) {
     if (!userDid) {
       throw new Error('userDid are required');
     }
@@ -1459,13 +1460,14 @@ class TeamAPI extends EventEmitter {
         lastLoginIp,
         appPid,
         passportId,
+        extra,
       });
-      logger.info('insert userSession successfully', { userDid, ua, lastLoginIp, appPid, passportId });
+      logger.info('insert userSession successfully', { userDid, ua, lastLoginIp, appPid, passportId, extra });
     } else {
       const exist = await state.findOne({ userDid, visitorId, appPid });
       if (exist) {
-        [, [data]] = await state.update(exist.id, { ua, lastLoginIp, passportId, status });
-        logger.info('update userSession successfully', { id: exist.id, ua, lastLoginIp, passportId, status });
+        [, [data]] = await state.update(exist.id, { ua, lastLoginIp, passportId, status, extra });
+        logger.info('update userSession successfully', { id: exist.id, ua, lastLoginIp, passportId, status, extra });
       } else {
         data = await state.insert({
           visitorId,
@@ -1474,8 +1476,17 @@ class TeamAPI extends EventEmitter {
           lastLoginIp,
           appPid,
           passportId,
+          extra,
+        });
+        logger.info('insert userSession successfully', {
+          visitorId,
+          userDid,
+          ua,
+          lastLoginIp,
+          appPid,
+          passportId,
+          extra,
         });
-        logger.info('insert userSession successfully', { visitorId, userDid, ua, lastLoginIp, appPid, passportId });
       }
     }
 
@@ -1491,9 +1502,10 @@ class TeamAPI extends EventEmitter {
    * @param {string} params.ua - 同步的 userSession 中当前用户所使用设备的 ua
    * @param {string} params.lastLoginIp - 同步的 userSession 中当前用户的最后登录 ip
    * @param {string} params.passportId - 同步的 userSession 中当前用户登录所使用的 passportId
+   * @param {object} params.extra - 同步的 userSession 中当前用户登录额外的数据
    * @returns
    */
-  async syncUserSession({ teamDid, targetAppPid, userDid, visitorId, ua, lastLoginIp, passportId }) {
+  async syncUserSession({ teamDid, targetAppPid, userDid, visitorId, ua, lastLoginIp, passportId, extra }) {
     if (!targetAppPid) return;
 
     const blocklet = await getBlocklet({ did: teamDid, states: this.states, dataDirs: this.dataDirs });
@@ -1526,6 +1538,7 @@ class TeamAPI extends EventEmitter {
             lastLoginIp,
             appPid,
             passportId,
+            extra,
           };
           await callFederated({
             action: 'sync',
@@ -1543,6 +1556,7 @@ class TeamAPI extends EventEmitter {
             appPid,
             passportId,
             targetSite,
+            extra,
           });
         } catch (err) {
           logger.info(
@@ -1555,6 +1569,7 @@ class TeamAPI extends EventEmitter {
               appPid,
               passportId,
               targetSite,
+              extra,
             },
             err
           );

package/lib/blocklet/manager/disk.js

@@ -2712,7 +2712,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     };
 
     const action = `/blocklets/${did}/components?checkUpdate=1`;
-    const blockletDashboardAction = `/blocklets/${did}/components?checkUpdate=1`;
+    const blockletDashboardAction = '/.well-known/service/admin/components?checkUpdate=1';
     const users = await this.teamManager.getOwnerAndAdminUsers(did, 1);
     const nodeInfo = await states.node.read();
     const { wallet } = getBlockletInfo(blocklet, nodeInfo.sk);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.21-beta-93c6e42b",
+  "version": "1.16.21-beta-2e75c75c",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,39 +19,39 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.21-beta-93c6e42b",
-    "@abtnode/auth": "1.16.21-beta-93c6e42b",
-    "@abtnode/certificate-manager": "1.16.21-beta-93c6e42b",
-    "@abtnode/constant": "1.16.21-beta-93c6e42b",
-    "@abtnode/cron": "1.16.21-beta-93c6e42b",
-    "@abtnode/logger": "1.16.21-beta-93c6e42b",
-    "@abtnode/models": "1.16.21-beta-93c6e42b",
-    "@abtnode/queue": "1.16.21-beta-93c6e42b",
-    "@abtnode/rbac": "1.16.21-beta-93c6e42b",
-    "@abtnode/router-provider": "1.16.21-beta-93c6e42b",
-    "@abtnode/static-server": "1.16.21-beta-93c6e42b",
-    "@abtnode/timemachine": "1.16.21-beta-93c6e42b",
-    "@abtnode/util": "1.16.21-beta-93c6e42b",
-    "@arcblock/did": "1.18.107",
-    "@arcblock/did-auth": "1.18.107",
-    "@arcblock/did-ext": "^1.18.107",
+    "@abtnode/analytics": "1.16.21-beta-2e75c75c",
+    "@abtnode/auth": "1.16.21-beta-2e75c75c",
+    "@abtnode/certificate-manager": "1.16.21-beta-2e75c75c",
+    "@abtnode/constant": "1.16.21-beta-2e75c75c",
+    "@abtnode/cron": "1.16.21-beta-2e75c75c",
+    "@abtnode/logger": "1.16.21-beta-2e75c75c",
+    "@abtnode/models": "1.16.21-beta-2e75c75c",
+    "@abtnode/queue": "1.16.21-beta-2e75c75c",
+    "@abtnode/rbac": "1.16.21-beta-2e75c75c",
+    "@abtnode/router-provider": "1.16.21-beta-2e75c75c",
+    "@abtnode/static-server": "1.16.21-beta-2e75c75c",
+    "@abtnode/timemachine": "1.16.21-beta-2e75c75c",
+    "@abtnode/util": "1.16.21-beta-2e75c75c",
+    "@arcblock/did": "1.18.108",
+    "@arcblock/did-auth": "1.18.108",
+    "@arcblock/did-ext": "^1.18.108",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/did-util": "1.18.107",
-    "@arcblock/event-hub": "1.18.107",
-    "@arcblock/jwt": "^1.18.107",
+    "@arcblock/did-util": "1.18.108",
+    "@arcblock/event-hub": "1.18.108",
+    "@arcblock/jwt": "^1.18.108",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/validator": "^1.18.107",
-    "@arcblock/vc": "1.18.107",
-    "@blocklet/constant": "1.16.21-beta-93c6e42b",
-    "@blocklet/env": "1.16.21-beta-93c6e42b",
-    "@blocklet/meta": "1.16.21-beta-93c6e42b",
-    "@blocklet/resolver": "1.16.21-beta-93c6e42b",
-    "@blocklet/sdk": "1.16.21-beta-93c6e42b",
-    "@did-space/client": "^0.3.45",
+    "@arcblock/validator": "^1.18.108",
+    "@arcblock/vc": "1.18.108",
+    "@blocklet/constant": "1.16.21-beta-2e75c75c",
+    "@blocklet/env": "1.16.21-beta-2e75c75c",
+    "@blocklet/meta": "1.16.21-beta-2e75c75c",
+    "@blocklet/resolver": "1.16.21-beta-2e75c75c",
+    "@blocklet/sdk": "1.16.21-beta-2e75c75c",
+    "@did-space/client": "^0.3.49",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.18.107",
-    "@ocap/util": "1.18.107",
-    "@ocap/wallet": "1.18.107",
+    "@ocap/mcrypto": "1.18.108",
+    "@ocap/util": "1.18.108",
+    "@ocap/wallet": "1.18.108",
     "@slack/webhook": "^5.0.4",
     "archiver": "^5.3.1",
     "axios": "^0.27.2",
@@ -102,5 +102,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "80619ce49f5a9224d3d817e5faea4422072b0553"
+  "gitHead": "1fca0b58e1ed4f7a9bb268829a7c84290a01c89d"
 }