@abtnode/core 1.16.30-beta-00e8bdd1 → 1.16.30-beta-b7f31b10

package/lib/api/team.js

@@ -296,6 +296,7 @@ class TeamAPI extends EventEmitter {
             'pk',
             'role',
             'email',
+            'phone',
             'fullName',
             'approved',
             'createdAt',
@@ -308,6 +309,7 @@ class TeamAPI extends EventEmitter {
             'avatar',
             'locale',
             'tags',
+            'url',
             'userSessions',
             // oauth relate fields
             'sourceProvider',

package/lib/blocklet/manager/disk.js

@@ -4247,8 +4247,6 @@ class DiskBlockletManager extends BaseBlockletManager {
             nftId: data.controller.nftId,
           });
 
-          // TODO: 如果绑定了 DID Space 备份到 DID Space
-
           await this.delete({ did, keepData: false, keepConfigs: false, keepLogsDir: false });
           logger.info('the exceed redemption blocklet already deleted', {
             blockletDid: did,

package/lib/states/user.js

@@ -391,10 +391,10 @@ class User extends ExtendBase {
       ...pick(user, [
         'fullName',
         'email',
+        'phone',
         'avatar',
         'url',
         'role',
-
         'locale',
         'extra',
         'lastLoginIp',

package/lib/util/launcher.js

@@ -28,6 +28,7 @@ const {
   USER_AVATAR_URL_PREFIX,
   ROLES,
   LAUNCH_SESSION_STATUS,
+  SERVERLESS_BLOCKLET_DATA_RETENTION_DAYS,
 } = require('@abtnode/constant');
 
 const logger = require('@abtnode/logger')('@abtnode/core:util:launcher');
@@ -230,7 +231,7 @@ const setupAppOwner = async ({ node, sessionId, justCreate = false, context }) =
     if (!user) {
       throw new Error(`Owner user not found from launcher: ${launcherUrl}`);
     }
-    appOwnerProfile = pick(user, ['fullName', 'email', 'avatar']);
+    appOwnerProfile = pick(user, ['fullName', 'email', 'avatar', 'phone']);
     const avatarBase64 = await getAvatarByUrl(joinURL(launcherUrl, user.avatar));
     appOwnerProfile.avatar = await extractUserAvatar(avatarBase64, { dataDir });
     logger.info('Create owner from launcher for blocklet', { appDid, ownerDid, ownerPk, sessionId, appOwnerProfile });
@@ -239,7 +240,7 @@ const setupAppOwner = async ({ node, sessionId, justCreate = false, context }) =
     if (!user) {
       throw new Error(`Owner user not found in server: ${userDid}`);
     }
-    appOwnerProfile = pick(user, ['fullName', 'email', 'avatar']);
+    appOwnerProfile = pick(user, ['fullName', 'email', 'avatar', 'phone']);
     if (user.avatar && user.avatar.startsWith(USER_AVATAR_URL_PREFIX)) {
       const filename = user.avatar.split('/').pop();
       const srcFile = getAvatarFile(serverDataDir, filename);
@@ -313,6 +314,7 @@ const setupAppOwner = async ({ node, sessionId, justCreate = false, context }) =
     did: ownerDid,
     passport,
     role,
+    fullName: appOwnerProfile?.fullName,
     secret: appSecret,
     expiresIn: '1d',
   });
@@ -409,13 +411,15 @@ const getLaunchSessionStatus = async (blockletDid, controller) => {
     throw new Error(error);
   }
 
-  logger.info('get launcher session success', { launcherSessionId, launcherSession });
+  logger.info('get launcher session success', { blockletDid, launcherSessionId, launcherSession });
   return launcherSession.status;
 };
 
 const isBlockletExpired = async (blockletDid, controller) => {
   const status = await getLaunchSessionStatus(blockletDid, controller);
-  return [LAUNCH_SESSION_STATUS.expired, LAUNCH_SESSION_STATUS.terminated].includes(status);
+  return [LAUNCH_SESSION_STATUS.overdue, LAUNCH_SESSION_STATUS.canceled, LAUNCH_SESSION_STATUS.terminated].includes(
+    status
+  );
 };
 
 const isLaunchSessionTerminated = (session) => session.status === LAUNCH_SESSION_STATUS.terminated;
@@ -425,9 +429,8 @@ const isBlockletTerminated = async (blockletDid, controller) => {
   return status === LAUNCH_SESSION_STATUS.terminated;
 };
 
-const DATA_RETENTION_DAYS = 30;
 const isDataRetentionExceeded = (terminatedAt) =>
-  !!terminatedAt && dayjs().diff(dayjs(terminatedAt), 'days') > DATA_RETENTION_DAYS;
+  !!terminatedAt && dayjs().diff(dayjs(terminatedAt), 'days') > SERVERLESS_BLOCKLET_DATA_RETENTION_DAYS;
 
 module.exports = {
   consumeServerlessNFT,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.30-beta-00e8bdd1",
+  "version": "1.16.30-beta-b7f31b10",
   "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.30-beta-00e8bdd1",
-    "@abtnode/auth": "1.16.30-beta-00e8bdd1",
-    "@abtnode/certificate-manager": "1.16.30-beta-00e8bdd1",
-    "@abtnode/constant": "1.16.30-beta-00e8bdd1",
-    "@abtnode/cron": "1.16.30-beta-00e8bdd1",
-    "@abtnode/logger": "1.16.30-beta-00e8bdd1",
-    "@abtnode/models": "1.16.30-beta-00e8bdd1",
-    "@abtnode/queue": "1.16.30-beta-00e8bdd1",
-    "@abtnode/rbac": "1.16.30-beta-00e8bdd1",
-    "@abtnode/router-provider": "1.16.30-beta-00e8bdd1",
-    "@abtnode/static-server": "1.16.30-beta-00e8bdd1",
-    "@abtnode/timemachine": "1.16.30-beta-00e8bdd1",
-    "@abtnode/util": "1.16.30-beta-00e8bdd1",
+    "@abtnode/analytics": "1.16.30-beta-b7f31b10",
+    "@abtnode/auth": "1.16.30-beta-b7f31b10",
+    "@abtnode/certificate-manager": "1.16.30-beta-b7f31b10",
+    "@abtnode/constant": "1.16.30-beta-b7f31b10",
+    "@abtnode/cron": "1.16.30-beta-b7f31b10",
+    "@abtnode/logger": "1.16.30-beta-b7f31b10",
+    "@abtnode/models": "1.16.30-beta-b7f31b10",
+    "@abtnode/queue": "1.16.30-beta-b7f31b10",
+    "@abtnode/rbac": "1.16.30-beta-b7f31b10",
+    "@abtnode/router-provider": "1.16.30-beta-b7f31b10",
+    "@abtnode/static-server": "1.16.30-beta-b7f31b10",
+    "@abtnode/timemachine": "1.16.30-beta-b7f31b10",
+    "@abtnode/util": "1.16.30-beta-b7f31b10",
     "@arcblock/did": "1.18.128",
     "@arcblock/did-auth": "1.18.128",
     "@arcblock/did-ext": "^1.18.128",
@@ -42,12 +42,12 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.128",
     "@arcblock/vc": "1.18.128",
-    "@blocklet/constant": "1.16.30-beta-00e8bdd1",
-    "@blocklet/env": "1.16.30-beta-00e8bdd1",
-    "@blocklet/meta": "1.16.30-beta-00e8bdd1",
-    "@blocklet/resolver": "1.16.30-beta-00e8bdd1",
-    "@blocklet/sdk": "1.16.30-beta-00e8bdd1",
-    "@blocklet/store": "1.16.30-beta-00e8bdd1",
+    "@blocklet/constant": "1.16.30-beta-b7f31b10",
+    "@blocklet/env": "1.16.30-beta-b7f31b10",
+    "@blocklet/meta": "1.16.30-beta-b7f31b10",
+    "@blocklet/resolver": "1.16.30-beta-b7f31b10",
+    "@blocklet/sdk": "1.16.30-beta-b7f31b10",
+    "@blocklet/store": "1.16.30-beta-b7f31b10",
     "@did-space/client": "^0.5.17",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.128",
@@ -103,5 +103,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "e165c7e64a2900b4c390b7435c0bb71abbf9b625"
+  "gitHead": "2d429b619b7b54b5603fb05761d3acd9ff674c2c"
 }