@abtnode/core 1.16.25-next-1e779575 → 1.16.25-next-3d78a4cb

package/lib/api/team.js

@@ -15,6 +15,7 @@ const {
   STORE_DETAIL_PAGE_PATH_PREFIX,
   MAIN_CHAIN_ENDPOINT,
   USER_AVATAR_URL_PREFIX,
+  SESSION_TTL,
 } = require('@abtnode/constant');
 const { isValid: isValidDid } = require('@arcblock/did');
 const { BlockletEvents, TeamEvents } = require('@blocklet/constant');
@@ -266,12 +267,18 @@ class TeamAPI extends EventEmitter {
       list = doc.list;
       paging = doc.paging;
     }
+    const now = Date.now();
+    let sessionTtl = SESSION_TTL;
+    if (teamDid !== nodeInfo.did) {
+      const blocklet = await getBlocklet({ did: teamDid, states: this.states, dataDirs: this.dataDirs });
+      sessionTtl = blocklet.settings?.session?.ttl || SESSION_TTL;
+    }
 
     return {
       // FIXME: @zhanghan 这里做字段过滤的目的是？gql 本身已经对字段做了过滤了
       users: list.map(
-        (d) =>
-          pick(d, [
+        (d) => {
+          const pickData = pick(d, [
             'did',
             'pk',
             'role',
@@ -293,7 +300,16 @@ class TeamAPI extends EventEmitter {
             'sourceProvider',
             'sourceAppPid',
             'connectedAccounts',
-          ])
+          ]);
+          if (pickData?.userSessions) {
+            pickData.userSessions = pickData.userSessions.map((x) => {
+              const status = now - new Date(x.updatedAt).getTime() > sessionTtl * 1000 ? 'expired' : x.status;
+              return { ...x, status };
+            });
+          }
+          return pickData;
+        }
+
         // eslint-disable-next-line function-paren-newline
       ),
       paging,
@@ -1403,7 +1419,19 @@ class TeamAPI extends EventEmitter {
 
     const userSessions = await state.model.findAll({
       where,
-      attributes: ['id', 'appPid', 'userDid', 'visitorId', 'passportId', 'updatedAt', 'extra', 'ua', 'lastLoginIp'],
+      attributes: [
+        'id',
+        'appPid',
+        'userDid',
+        'visitorId',
+        'passportId',
+        'createdAt',
+        'updatedAt',
+        'extra',
+        'ua',
+        'lastLoginIp',
+        'status',
+      ],
       include: {
         model: userState.model,
         as: 'user',

package/lib/blocklet/manager/disk.js

@@ -30,6 +30,7 @@ const {
   DEFAULT_DID_DOMAIN,
   FEDERATED,
   CHECK_UPDATE,
+  SESSION_CACHE_TTL,
 } = require('@abtnode/constant');
 
 const getBlockletEngine = require('@blocklet/meta/lib/engine');
@@ -1828,7 +1829,7 @@ class DiskBlockletManager extends BaseBlockletManager {
       sessionConfig.cacheTtl = validateConfig.cacheTtl;
     } else {
       // NOTE: 将 cacheTtl 默认值设置为 3600s
-      sessionConfig.cacheTtl = 60 * 60; // seconds
+      sessionConfig.cacheTtl = SESSION_CACHE_TTL; // seconds
     }
     if (validateConfig.ttl) {
       sessionConfig.ttl = validateConfig.ttl;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.25-next-1e779575",
+  "version": "1.16.25-next-3d78a4cb",
   "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.25-next-1e779575",
-    "@abtnode/auth": "1.16.25-next-1e779575",
-    "@abtnode/certificate-manager": "1.16.25-next-1e779575",
-    "@abtnode/constant": "1.16.25-next-1e779575",
-    "@abtnode/cron": "1.16.25-next-1e779575",
-    "@abtnode/logger": "1.16.25-next-1e779575",
-    "@abtnode/models": "1.16.25-next-1e779575",
-    "@abtnode/queue": "1.16.25-next-1e779575",
-    "@abtnode/rbac": "1.16.25-next-1e779575",
-    "@abtnode/router-provider": "1.16.25-next-1e779575",
-    "@abtnode/static-server": "1.16.25-next-1e779575",
-    "@abtnode/timemachine": "1.16.25-next-1e779575",
-    "@abtnode/util": "1.16.25-next-1e779575",
+    "@abtnode/analytics": "1.16.25-next-3d78a4cb",
+    "@abtnode/auth": "1.16.25-next-3d78a4cb",
+    "@abtnode/certificate-manager": "1.16.25-next-3d78a4cb",
+    "@abtnode/constant": "1.16.25-next-3d78a4cb",
+    "@abtnode/cron": "1.16.25-next-3d78a4cb",
+    "@abtnode/logger": "1.16.25-next-3d78a4cb",
+    "@abtnode/models": "1.16.25-next-3d78a4cb",
+    "@abtnode/queue": "1.16.25-next-3d78a4cb",
+    "@abtnode/rbac": "1.16.25-next-3d78a4cb",
+    "@abtnode/router-provider": "1.16.25-next-3d78a4cb",
+    "@abtnode/static-server": "1.16.25-next-3d78a4cb",
+    "@abtnode/timemachine": "1.16.25-next-3d78a4cb",
+    "@abtnode/util": "1.16.25-next-3d78a4cb",
     "@arcblock/did": "1.18.113",
     "@arcblock/did-auth": "1.18.113",
     "@arcblock/did-ext": "^1.18.113",
@@ -42,12 +42,12 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.113",
     "@arcblock/vc": "1.18.113",
-    "@blocklet/constant": "1.16.25-next-1e779575",
-    "@blocklet/env": "1.16.25-next-1e779575",
-    "@blocklet/meta": "1.16.25-next-1e779575",
-    "@blocklet/resolver": "1.16.25-next-1e779575",
-    "@blocklet/sdk": "1.16.25-next-1e779575",
-    "@did-space/client": "^0.3.69",
+    "@blocklet/constant": "1.16.25-next-3d78a4cb",
+    "@blocklet/env": "1.16.25-next-3d78a4cb",
+    "@blocklet/meta": "1.16.25-next-3d78a4cb",
+    "@blocklet/resolver": "1.16.25-next-3d78a4cb",
+    "@blocklet/sdk": "1.16.25-next-3d78a4cb",
+    "@did-space/client": "^0.3.71",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.113",
     "@ocap/util": "1.18.113",
@@ -102,5 +102,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "a850cb40b003798c7bf6dbbf7546e2feabd85243"
+  "gitHead": "26b43891e46756b142bcd6b62c57357c7c23cf2f"
 }