@abtnode/core 1.16.29 → 1.16.30-beta-958ae719

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

@@ -1368,7 +1368,10 @@ class DiskBlockletManager extends BaseBlockletManager {
   }
 
   // Get blocklet by blockletDid or appDid
-  async detail({ did, attachConfig = true, attachRuntimeInfo, useCache, getOptionalComponents }, context) {
+  async detail(
+    { did, attachConfig = true, attachRuntimeInfo, attachDiskInfo = false, useCache, getOptionalComponents },
+    context
+  ) {
     if (!did) {
       throw new Error('did should not be empty');
     }
@@ -1378,7 +1381,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     }
 
     if (attachRuntimeInfo) {
-      return this._attachRuntimeInfo({ did, diskInfo: true, context, getOptionalComponents });
+      return this._attachRuntimeInfo({ did, diskInfo: !!attachDiskInfo, context, getOptionalComponents });
     }
 
     if (useCache && this.cachedBlocklets.has(did)) {
@@ -3243,7 +3246,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     return [];
   }
 
-  async _attachRuntimeInfo({ did, diskInfo = true, context, getOptionalComponents }) {
+  async _attachRuntimeInfo({ did, diskInfo = false, context, getOptionalComponents }) {
     if (!did) {
       throw new Error('did should not be empty');
     }
@@ -4204,14 +4207,15 @@ class DiskBlockletManager extends BaseBlockletManager {
       for (const data of blockletExtras) {
         try {
           const { did } = data;
-          const launcherSession = await launcher.getLauncherSession({
+          const { launcherSession } = await launcher.getLauncherSession({
             launcherUrl: data.controller.launcherUrl,
             launcherSessionId: data.controller.launcherSessionId,
           });
+
           const isTerminated = launcher.isLaunchSessionTerminated(launcherSession);
 
           if (!isTerminated) {
-            logger.info('skip cleaning the non-exceed redemption blocklet', {
+            logger.info('skip cleaning the non-terminated blocklet', {
               blockletDid: did,
               controller: data.controller,
               launcherSession,

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/blocklet.js

@@ -639,7 +639,13 @@ const startBlockletProcess = async (
         const clusterSize = Number(blocklet.configObj.BLOCKLET_CLUSTER_SIZE) || +process.env.ABT_NODE_MAX_CLUSTER_SIZE;
         options.execMode = 'cluster';
         options.mergeLogs = true;
-        options.instances = Math.min(os.cpus().length, clusterSize);
+        options.instances = Math.max(Math.min(os.cpus().length, clusterSize), 1);
+        options.env.BLOCKLET_CLUSTER_SIZE = options.instances;
+        if (options.instances !== clusterSize) {
+          logger.warn(`Fallback cluster size to ${options.instances} for ${processId}, ignore custom ${clusterSize}`);
+        }
+      } else {
+        delete options.env.BLOCKLET_CLUSTER_SIZE;
       }
 
       if (b.mode === BLOCKLET_MODES.DEVELOPMENT) {
@@ -1069,11 +1075,8 @@ const pruneBlockletBundle = async ({ blocklets, installDir, blockletSettings })
   logger.info('Blocklet source folder has been pruned');
 };
 
-const getDiskInfo = async (blocklet, { useFakeDiskInfo } = {}) => {
-  if (useFakeDiskInfo) {
-    return { app: 0, cache: 0, log: 0, data: 0 };
-  }
-
+const _diskInfoTasks = {};
+const _getDiskInfo = async (blocklet) => {
   try {
     const { env } = blocklet;
     const [app, cache, log, data] = await Promise.all([
@@ -1084,9 +1087,30 @@ const getDiskInfo = async (blocklet, { useFakeDiskInfo } = {}) => {
     ]);
     return { app, cache, log, data };
   } catch (error) {
-    logger.error('Get disk info failed', { name: blocklet.meta.name, error });
+    logger.error('Get disk info failed', { name: getDisplayName(blocklet), error });
+    return { app: 0, cache: 0, log: 0, data: 0 };
+  }
+};
+
+const getDiskInfo = (blocklet, { useFakeDiskInfo } = {}) => {
+  if (useFakeDiskInfo) {
     return { app: 0, cache: 0, log: 0, data: 0 };
   }
+
+  const { appDid } = blocklet;
+
+  // Cache disk info results for 1 minute
+  _diskInfoTasks[appDid] ??= _getDiskInfo(blocklet).finally(() => {
+    setTimeout(() => {
+      delete _diskInfoTasks[appDid];
+    }, 120 * 1000);
+  });
+
+  return new Promise((resolve) => {
+    _diskInfoTasks[appDid].then(resolve).catch(() => {
+      resolve({ app: 0, cache: 0, log: 0, data: 0 });
+    });
+  });
 };
 
 const getRuntimeInfo = async (processId) => {
@@ -1579,6 +1603,20 @@ const validateAppConfig = async (config, states) => {
       throw new Error(`${x.key}(${x.value}) is not a valid URL`);
     }
   }
+
+  if (x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_CLUSTER_SIZE) {
+    if (isEmpty(x.value)) {
+      x.value = '';
+    }
+
+    const v = Number(x.value);
+    if (Number.isNaN(v)) {
+      throw new Error(`${x.key} must be number`);
+    }
+    if (!Number.isInteger(v)) {
+      throw new Error(`${x.key} must be integer`);
+    }
+  }
 };
 
 const checkDuplicateAppSk = async ({ sk, did, states }) => {

package/lib/util/launcher.js

@@ -230,7 +230,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 +239,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 +313,7 @@ const setupAppOwner = async ({ node, sessionId, justCreate = false, context }) =
     did: ownerDid,
     passport,
     role,
+    fullName: appOwnerProfile?.fullName,
     secret: appSecret,
     expiresIn: '1d',
   });

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.29",
+  "version": "1.16.30-beta-958ae719",
   "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.29",
-    "@abtnode/auth": "1.16.29",
-    "@abtnode/certificate-manager": "1.16.29",
-    "@abtnode/constant": "1.16.29",
-    "@abtnode/cron": "1.16.29",
-    "@abtnode/logger": "1.16.29",
-    "@abtnode/models": "1.16.29",
-    "@abtnode/queue": "1.16.29",
-    "@abtnode/rbac": "1.16.29",
-    "@abtnode/router-provider": "1.16.29",
-    "@abtnode/static-server": "1.16.29",
-    "@abtnode/timemachine": "1.16.29",
-    "@abtnode/util": "1.16.29",
+    "@abtnode/analytics": "1.16.30-beta-958ae719",
+    "@abtnode/auth": "1.16.30-beta-958ae719",
+    "@abtnode/certificate-manager": "1.16.30-beta-958ae719",
+    "@abtnode/constant": "1.16.30-beta-958ae719",
+    "@abtnode/cron": "1.16.30-beta-958ae719",
+    "@abtnode/logger": "1.16.30-beta-958ae719",
+    "@abtnode/models": "1.16.30-beta-958ae719",
+    "@abtnode/queue": "1.16.30-beta-958ae719",
+    "@abtnode/rbac": "1.16.30-beta-958ae719",
+    "@abtnode/router-provider": "1.16.30-beta-958ae719",
+    "@abtnode/static-server": "1.16.30-beta-958ae719",
+    "@abtnode/timemachine": "1.16.30-beta-958ae719",
+    "@abtnode/util": "1.16.30-beta-958ae719",
     "@arcblock/did": "1.18.128",
     "@arcblock/did-auth": "1.18.128",
     "@arcblock/did-ext": "^1.18.128",
@@ -42,13 +42,13 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.128",
     "@arcblock/vc": "1.18.128",
-    "@blocklet/constant": "1.16.29",
-    "@blocklet/env": "1.16.29",
-    "@blocklet/meta": "1.16.29",
-    "@blocklet/resolver": "1.16.29",
-    "@blocklet/sdk": "1.16.29",
-    "@blocklet/store": "1.16.29",
-    "@did-space/client": "^0.5.16",
+    "@blocklet/constant": "1.16.30-beta-958ae719",
+    "@blocklet/env": "1.16.30-beta-958ae719",
+    "@blocklet/meta": "1.16.30-beta-958ae719",
+    "@blocklet/resolver": "1.16.30-beta-958ae719",
+    "@blocklet/sdk": "1.16.30-beta-958ae719",
+    "@blocklet/store": "1.16.30-beta-958ae719",
+    "@did-space/client": "^0.5.17",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.128",
     "@ocap/util": "1.18.128",
@@ -87,7 +87,7 @@
     "ssri": "^8.0.1",
     "stream-throttle": "^0.1.3",
     "stream-to-promise": "^3.0.0",
-    "systeminformation": "^5.17.12",
+    "systeminformation": "^5.23.3",
     "tail": "^2.2.4",
     "tar": "^6.1.11",
     "transliteration": "^2.3.5",
@@ -103,5 +103,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "6c49cffcab4fd0dffc6bed261a5eddf733280ae7"
+  "gitHead": "75590ff3be51e7fe2a070124541aebc203ed16dc"
 }