@abtnode/core 1.16.42 → 1.16.43-beta-20250419-231352-c78ac93d

package/lib/api/team.js

@@ -2022,7 +2022,10 @@ class TeamAPI extends EventEmitter {
    * @returns
    */
 
-  async upsertUserSession({ teamDid, appPid, userDid, visitorId, ua, lastLoginIp, passportId, status, extra }) {
+  async upsertUserSession(
+    { teamDid, appPid, userDid, visitorId, ua, lastLoginIp, passportId, status, extra, locale, origin },
+    { skipNotification = false } = {}
+  ) {
     if (!userDid) {
       throw new Error('userDid is required');
     }
@@ -2039,6 +2042,17 @@ class TeamAPI extends EventEmitter {
         extra,
       });
       logger.info('insert userSession successfully', { userDid, ua, lastLoginIp, appPid, passportId, extra });
+      // HACK: 某些地方，首次新增 userSession 时不会，携带 ua 信息，这个时候不能发通知
+      if (ua) {
+        this.emit(BlockletEvents.addUserSession, {
+          userSession: data,
+          teamDid,
+          userDid,
+          locale,
+          skipNotification,
+          origin,
+        });
+      }
     } else {
       const exist = await state.findOne({ userDid, visitorId, appPid });
       if (exist) {
@@ -2052,6 +2066,25 @@ class TeamAPI extends EventEmitter {
           extra: mergeExtra,
         });
         logger.info('update userSession successfully', { id: exist.id, ua, lastLoginIp, passportId, status, extra });
+        if (Date.now() - new Date(exist.createdAt).getTime() < 1000 * 10) {
+          // HACK: 此处是为了矫正首次创建 userSession 没有 ua 的情况，会通过 /api/did/session 接口来更新 ua 信息，这个时候才能当成新增 userSession 来发送通知
+          this.emit(BlockletEvents.addUserSession, {
+            userSession: data,
+            teamDid,
+            userDid,
+            locale,
+            skipNotification,
+            origin,
+          });
+        } else {
+          this.emit(BlockletEvents.updateUserSession, {
+            userSession: data,
+            teamDid,
+            userDid,
+            skipNotification,
+            origin,
+          });
+        }
       } else {
         data = await state.insert({
           visitorId,
@@ -2071,6 +2104,16 @@ class TeamAPI extends EventEmitter {
           passportId,
           extra,
         });
+        if (ua) {
+          this.emit(BlockletEvents.addUserSession, {
+            userSession: data,
+            teamDid,
+            userDid,
+            locale,
+            skipNotification,
+            origin,
+          });
+        }
       }
     }
 
@@ -2185,11 +2228,7 @@ class TeamAPI extends EventEmitter {
     // HACK: 使用 state.remove 并不能按预期工作，先改为使用 state.model.destroy 来实现
     const result = await state.model.destroy({ where });
     const { permanentWallet } = getBlockletInfo(blocklet, nodeInfo.sk);
-    const federated = defaults(cloneDeep(blocklet.settings.federated || {}), {
-      config: {},
-      sites: [],
-    });
-    const masterSite = federated.sites[0];
+    const masterSite = getFederatedMaster(blocklet);
     if (masterSite && masterSite.isMaster !== false && masterSite.appPid !== teamDid) {
       callFederated({
         action: 'sync',

package/lib/blocklet/manager/disk.js

@@ -123,7 +123,7 @@ const {
 } = require('@abtnode/auth/lib/util/federated');
 const toBlockletDid = require('@blocklet/meta/lib/did');
 
-const { groupBy } = require('lodash');
+const groupBy = require('lodash/groupBy');
 const launcher = require('../../util/launcher');
 const util = require('../../util');
 const {
@@ -229,10 +229,11 @@ const { dockerExec } = require('../../util/docker/docker-exec');
 const { installExternalDependencies } = require('../../util/install-external-dependencies');
 const { dockerExecChown } = require('../../util/docker/docker-exec-chown');
 const checkDockerRunHistory = require('../../util/docker/check-docker-run-history');
-const { abtNodeStartBackupDelaySeconds } = require('../../util/env');
+const { shouldJobBackoff } = require('../../util/env');
 const ensureBlockletRunning = require('./ensure-blocklet-running');
 
 const { transformNotification } = require('../../util/notification');
+const { generateUserUpdateData } = require('../../util/user');
 
 const { formatEnvironments, getBlockletMeta, validateOwner, isCLI } = util;
 
@@ -433,6 +434,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         stop: async (params) => {
           await this.stop(params);
         },
+        createAuditLog: (params) => this.createAuditLog(params),
         notification: (did, title, description, severity) => {
           try {
             this._createNotification(did, {
@@ -448,6 +450,7 @@ class DiskBlockletManager extends BaseBlockletManager {
             logger.error('create notification failed', { err });
           }
         },
+        checkSystemHighLoad: (...args) => this.nodeAPI.runtimeMonitor.checkSystemHighLoad(...args),
       });
     }
   }
@@ -515,6 +518,11 @@ class DiskBlockletManager extends BaseBlockletManager {
     });
   }
 
+  // This property will be injected after the node instance is instantiated.
+  createAuditLog = (params) => {
+    console.warn('createAuditLog not initialized', params);
+  };
+
   // ============================================================================================
   // Public API for Installing/Upgrading Application or Components
   // ============================================================================================
@@ -3160,6 +3168,11 @@ class DiskBlockletManager extends BaseBlockletManager {
       strategy: BACKUPS.STRATEGY.AUTO,
     },
   }) {
+    if (shouldJobBackoff()) {
+      logger.warn('Backup to spaces is not available when blocklet server is starting.');
+      return;
+    }
+
     const blocklet = await states.blocklet.getBlocklet(did);
     const {
       appDid,
@@ -3206,10 +3219,9 @@ class DiskBlockletManager extends BaseBlockletManager {
         return message;
       }
 
-      const uptime = process.uptime();
-      if (backupState?.strategy === BACKUPS.STRATEGY.AUTO && uptime < abtNodeStartBackupDelaySeconds) {
+      if (backupState?.strategy === BACKUPS.STRATEGY.AUTO && shouldJobBackoff()) {
         const message = 'Automatic backup is not available when blocklet server is starting.';
-        logger.error(message, { appPid, uptime, abtNodeStartBackupDelaySeconds });
+        logger.error(message, { appPid });
 
         return message;
       }
@@ -3379,6 +3391,17 @@ class DiskBlockletManager extends BaseBlockletManager {
   }
 
   async _onCheckForComponentUpdate({ did }) {
+    if (shouldJobBackoff()) {
+      logger.warn('Check for component update is not available when blocklet server is starting.');
+      return;
+    }
+
+    const blocklet = await this.getBlocklet(did);
+    if (blocklet.status === BlockletStatus.stopped) {
+      logger.warn('Check for component update is not available when blocklet is stopped.');
+      return;
+    }
+
     const list = await UpgradeComponents.check({ did, states });
     if (!list || !list.updateList?.length) {
       return;
@@ -3394,7 +3417,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     if (checkUpdateMd5 === oldMd5) {
       return;
     }
-    const blocklet = await this.getBlocklet(did);
+
     const firstComponent = updateList[0];
     const blockletTitle = getDisplayName(blocklet);
 
@@ -5358,9 +5381,21 @@ class FederatedBlockletManager extends DiskBlockletManager {
     return newState;
   }
 
+  /**
+   * 调用来源有两种
+   * 1. js-sdk:  调用时，会处理好 user.phone 与 user.metadata.phone 的同步，已经 user.metadata.location 与 user.address.city 的同步
+   * 2. node-sdk: 需要处理 node-sdk 的调用时的数据同步
+   * @param {*} param0
+   * @returns
+   */
   async updateUserInfoAndSync({ teamDid, user }) {
     try {
-      const updated = await this.teamAPI.updateUser({ teamDid, user });
+      const existingUser = await this.teamAPI.getUser({ teamDid, user: { did: user.did } });
+      if (!existingUser) {
+        throw new Error('User not found');
+      }
+      const updateData = generateUserUpdateData(user, existingUser);
+      const updated = await this.teamAPI.updateUser({ teamDid, user: updateData });
       const { sourceAppPid } = updated;
 
       const blocklet = await this.getBlocklet(teamDid);

package/lib/blocklet/manager/ensure-blocklet-running.js

@@ -4,34 +4,36 @@ const { BlockletStatus } = require('@blocklet/constant');
 const sleep = require('@abtnode/util/lib/sleep');
 const { getDisplayName } = require('@blocklet/meta/lib/util');
 
-const inProgressStatuses = [BlockletStatus.stopping, BlockletStatus.restarting, BlockletStatus.waiting];
-
 const states = require('../../states');
 const { isBlockletPortHealthy, shouldCheckHealthy } = require('../../util/blocklet');
+const { shouldJobBackoff } = require('../../util/env');
+
+const inProgressStatuses = [BlockletStatus.stopping, BlockletStatus.restarting, BlockletStatus.waiting];
 
 class EnsureBlockletRunning {
   initialized = false;
 
   // 每次任务的最小间隔时间
-  checkInterval = process.env.ABT_NODE_ENSURE_RUNNING_CHECK_INTERVAL
-    ? Number(process.env.ABT_NODE_ENSURE_RUNNING_CHECK_INTERVAL)
-    : 60 * 1000;
+  checkInterval = +process.env.ABT_NODE_ENSURE_RUNNING_CHECK_INTERVAL || 60 * 1000;
 
   // 首次任务的延迟时间
-  deferredTime = process.env.ABT_NODE_ENSURE_RUNNING_DEFERRED_TIME
-    ? Number(process.env.ABT_NODE_ENSURE_RUNNING_DEFERRED_TIME)
-    : 30 * 1000;
+  deferredTime = +process.env.ABT_NODE_ENSURE_RUNNING_DEFERRED_TIME || 30 * 1000;
 
   // 每个重启任务（did + componentDids）的重启间隔为 2 min，如果 2 min 内重启过，就不会再重启
   restartInterval = 1000 * 60 * 2;
 
-  // 如果长时间在某个 doing 状态，则认为该 blocklet 有问题，会进行重启
-  maxLongtimeDoing = 1000 * 60 * 5;
+  everyBlockletCheckInterval = 2000;
 
-  everyBlockletCheckInterval = 1000;
+  everyBlockletDoingInterval = 5000;
 
   fakeRunningToWaitingOnce = false;
 
+  highLoadCpu = +process.env.ABT_NODE_ENSURE_RUNNING_HIGH_LOAD_CPU || 0.7;
+
+  highLoadMemory = +process.env.ABT_NODE_ENSURE_RUNNING_HIGH_LOAD_MEMORY || 0.8;
+
+  highLoadDisk = +process.env.ABT_NODE_ENSURE_RUNNING_HIGH_LOAD_DISK || 0.8;
+
   runningBlocklets = {};
 
   runningRootBlocklets = {};
@@ -49,17 +51,26 @@ class EnsureBlockletRunning {
   // Ease to mock
   isBlockletPortHealthy = isBlockletPortHealthy;
 
-  isBlockletPortHealthyWithRetries = async (blocklet) => {
+  // Ease to mock
+  shouldJobBackoff = shouldJobBackoff;
+
+  isBlockletPortHealthyWithRetries = async (blocklet, isDoing = false) => {
+    let error;
     for (let attempt = 0; attempt < 10; attempt++) {
-      // eslint-disable-next-line no-await-in-loop
-      const healthy = await this.isBlockletPortHealthy(blocklet, {
-        minConsecutiveTime: 3000,
-        timeout: 6000,
-      });
-      if (healthy) return true;
-      // eslint-disable-next-line no-await-in-loop
-      await sleep(this.everyBlockletCheckInterval);
+      try {
+        // eslint-disable-next-line no-await-in-loop
+        await this.isBlockletPortHealthy(blocklet, {
+          minConsecutiveTime: 3000,
+          timeout: 6000,
+        });
+        return true;
+      } catch (e) {
+        error = e;
+        // eslint-disable-next-line no-await-in-loop
+        await sleep(isDoing ? this.everyBlockletDoingInterval : this.everyBlockletCheckInterval);
+      }
     }
+    logger.error('blocklet port is not healthy', error);
     return false;
   };
 
@@ -67,7 +78,7 @@ class EnsureBlockletRunning {
     this.states = states;
   }
 
-  initialize = ({ restart, stop, notification }) => {
+  initialize = ({ restart, stop, notification, checkSystemHighLoad, createAuditLog }) => {
     if (this.initialized) {
       return;
     }
@@ -75,13 +86,13 @@ class EnsureBlockletRunning {
     this.restart = restart;
     this.stop = stop;
     this.notification = notification;
-
+    this.createAuditLog = createAuditLog;
+    this.checkSystemHighLoad = checkSystemHighLoad;
     const task = async () => {
       if (this.stopped) {
         return;
       }
       await this.checkAndFix();
-
       await sleep(this.checkInterval);
       task();
     };
@@ -104,6 +115,21 @@ class EnsureBlockletRunning {
     if (process.env.ABT_NODE_RESTART_RUNNING_COMPONENT === '1') {
       return;
     }
+
+    if (!this.shouldJobBackoff()) {
+      return;
+    }
+    const systemHighLoad = this.checkSystemHighLoad({
+      maxCpus: this.highLoadCpu,
+      maxMem: this.highLoadMemory,
+      maxDisk: this.highLoadDisk,
+    });
+
+    logger.info('Check ensure blocklet running', systemHighLoad);
+    if (systemHighLoad.isHighLoad) {
+      logger.warn('Skip once ensure blocklet running because system high load', systemHighLoad);
+      return;
+    }
     this.runningBlocklets = {};
     this.fakeRunningBlocklets = {};
     this.fakeRunningBlockletsTimes = {};
@@ -186,24 +212,23 @@ class EnsureBlockletRunning {
               }
               return;
             }
-            const health = await this.isBlockletPortHealthyWithRetries(blocklet);
+
+            const health = await this.isBlockletPortHealthyWithRetries(
+              blocklet,
+              inProgressStatuses.includes(blocklet.status)
+            );
 
             if (health) {
-              // 如果 blocklet 健康，但处于 doing 状态，则设置为 running 状态
-              if (blocklet.status !== BlockletStatus.running && inProgressStatuses.includes(blocklet.status)) {
-                await this.states.blocklet.setBlockletStatus(did, BlockletStatus.running, {
-                  componentDids: [blocklet.meta.did],
-                });
-              }
-            } else {
-              if (!this.fakeRunningBlocklets[did]) {
-                this.fakeRunningBlocklets[did] = [];
-              }
-              if (this.fakeRunningBlocklets[did].find((b) => b.meta.did === blocklet.meta.did)) {
-                return;
-              }
-              this.fakeRunningBlocklets[did].push(blocklet);
+              return;
+            }
+
+            if (!this.fakeRunningBlocklets[did]) {
+              this.fakeRunningBlocklets[did] = [];
             }
+            if (this.fakeRunningBlocklets[did].find((b) => b.meta.did === blocklet.meta.did)) {
+              return;
+            }
+            this.fakeRunningBlocklets[did].push(blocklet);
           };
         }),
         { concurrency: 10 }
@@ -255,15 +280,34 @@ class EnsureBlockletRunning {
             }
             this.restartingBlocklets[key] = Date.now();
 
-            this.notification(
-              did,
-              'Blocklet health check failed',
-              `Blocklet ${this.getDisplayNameByRootDid(did)} with components ${componentDids.map((v) => this.getDisplayName(blocklets.find((b) => b.meta.did === v))).join(', ')} health check failed, restarting...`,
-              'warning'
-            );
+            const blockletDisplayName = this.getDisplayNameByRootDid(did);
+            const restartTitle = 'Blocklet health check failed';
+            const restartDescription = `Blocklet ${blockletDisplayName} with components ${componentDids.map((v) => this.getDisplayName(blocklets.find((b) => b.meta.did === v))).join(', ')} health check failed, restarting...`;
+            this.notification(did, restartTitle, restartDescription, 'warning');
+
             try {
               logger.info('restart blocklet:', did, componentDids);
               await this.restart({ did, componentDids, checkHealthImmediately: true });
+              this.createAuditLog({
+                action: 'ensureBlockletRunning',
+                args: {
+                  teamDid: did,
+                  componentDids,
+                },
+                context: {
+                  user: {
+                    did,
+                    role: 'daemon',
+                    blockletDid: did,
+                    fullName: blockletDisplayName,
+                    elevated: false,
+                  },
+                },
+                result: {
+                  title: restartTitle,
+                  description: restartDescription,
+                },
+              });
               delete this.restartingBlocklets[key];
             } catch (e) {
               logger.error('restart blocklet failed', did, componentDids, e);
@@ -274,16 +318,34 @@ class EnsureBlockletRunning {
 
               // 如果重启失败次数超过 3 次，则设置为 stopped
               if (this.errorStartBlocklets[key] >= 3) {
-                this.notification(
-                  did,
-                  'Restart blocklet failed when health check failed',
-                  `Restart blocklet ${this.getDisplayNameByRootDid(did)} with components ${componentDids.map((v) => this.getDisplayName(blocklets.find((b) => b.meta.did === v))).join(', ')} failed`,
-                  'error'
-                );
+                const title = 'Restart blocklet failed when health check failed';
+                const description = `Restart blocklet ${blockletDisplayName} with components ${componentDids.map((v) => this.getDisplayName(blocklets.find((b) => b.meta.did === v))).join(', ')} failed`;
+                this.notification(did, title, description, 'error');
                 delete this.errorStartBlocklets[key];
                 logger.error('restart many times blocklet failed, set stopped', did, componentDids, e);
                 try {
                   await this.stop({ did, componentDids });
+                  this.createAuditLog({
+                    action: 'ensureBlockletRunning',
+                    args: {
+                      blockletDisplayName,
+                      teamDid: did,
+                      componentDids,
+                    },
+                    context: {
+                      user: {
+                        did,
+                        role: 'daemon',
+                        blockletDid: did,
+                        fullName: blockletDisplayName,
+                        elevated: false,
+                      },
+                    },
+                    result: {
+                      title,
+                      description,
+                    },
+                  });
                 } catch (err) {
                   logger.error('set blocklet stopped failed', did, componentDids, err);
                 }

package/lib/blocklet/migration-dist/migration.cjs

@@ -100,7 +100,6 @@ const RBAC_CONFIG = {
       name: SERVER_ROLES.CERTIFICATE,
       title: 'Certificate',
       description: 'Manage https certificates for blocklets on the Blocklet Server',
-      passport: true,
       noHuman: true,
     },
     {
@@ -127,7 +126,6 @@ const RBAC_CONFIG = {
       name: SERVER_ROLES.EXTERNAL_BLOCKLETS_MANAGER,
       title: 'External Blocklets Manager',
       description: 'Manage external blocklets in the Blocklet Server',
-      passport: true,
       noHuman: true,
     },
   ]),
@@ -38737,7 +38735,7 @@ module.exports = require("zlib");
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.41","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib","test":"node tools/jest.js","coverage":"npm run test -- --coverage"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.41","@abtnode/auth":"1.16.41","@abtnode/certificate-manager":"1.16.41","@abtnode/constant":"1.16.41","@abtnode/cron":"1.16.41","@abtnode/docker-utils":"1.16.41","@abtnode/logger":"1.16.41","@abtnode/models":"1.16.41","@abtnode/queue":"1.16.41","@abtnode/rbac":"1.16.41","@abtnode/router-provider":"1.16.41","@abtnode/static-server":"1.16.41","@abtnode/timemachine":"1.16.41","@abtnode/util":"1.16.41","@arcblock/did":"1.20.0","@arcblock/did-auth":"1.20.0","@arcblock/did-ext":"^1.20.0","@arcblock/did-motif":"^1.1.13","@arcblock/did-util":"1.20.0","@arcblock/event-hub":"1.20.0","@arcblock/jwt":"^1.20.0","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"^1.20.0","@arcblock/vc":"1.20.0","@blocklet/constant":"1.16.41","@blocklet/did-space-js":"^1.0.47","@blocklet/env":"1.16.41","@blocklet/meta":"1.16.41","@blocklet/resolver":"1.16.41","@blocklet/sdk":"1.16.41","@blocklet/store":"1.16.41","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.20.0","@ocap/util":"1.20.0","@ocap/wallet":"1.20.0","@slack/webhook":"^5.0.4","archiver":"^7.0.1","axios":"^1.7.9","axon":"^2.0.3","chalk":"^4.1.2","cross-spawn":"^7.0.3","dayjs":"^1.11.13","deep-diff":"^1.0.2","detect-port":"^1.5.1","envfile":"^7.1.0","escape-string-regexp":"^4.0.0","fast-glob":"^3.3.2","filesize":"^10.1.1","flat":"^5.0.2","fs-extra":"^11.2.0","get-port":"^5.1.1","hasha":"^5.2.2","is-base64":"^1.1.0","is-cidr":"4","is-ip":"3","is-url":"^1.2.4","joi":"17.12.2","joi-extension-semver":"^5.0.0","js-yaml":"^4.1.0","kill-port":"^2.0.1","lodash":"^4.17.21","lru-cache":"^11.0.2","node-stream-zip":"^1.15.0","p-all":"^3.0.0","p-limit":"^3.1.0","p-map":"^4.0.0","p-retry":"^4.6.2","rate-limiter-flexible":"^5.0.5","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","ssri":"^8.0.1","stream-throttle":"^0.1.3","stream-to-promise":"^3.0.0","systeminformation":"^5.23.3","tail":"^2.2.4","tar":"^6.1.11","transliteration":"^2.3.5","ua-parser-js":"^1.0.2","ufo":"^1.5.3","uuid":"^9.0.1","valid-url":"^1.0.9","which":"^2.0.2","xbytes":"^1.8.0"},"devDependencies":{"expand-tilde":"^2.0.2","express":"^4.18.2","jest":"^29.7.0","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.42","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib","test":"node tools/jest.js","coverage":"npm run test -- --coverage"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.42","@abtnode/auth":"1.16.42","@abtnode/certificate-manager":"1.16.42","@abtnode/constant":"1.16.42","@abtnode/cron":"1.16.42","@abtnode/docker-utils":"1.16.42","@abtnode/logger":"1.16.42","@abtnode/models":"1.16.42","@abtnode/queue":"1.16.42","@abtnode/rbac":"1.16.42","@abtnode/router-provider":"1.16.42","@abtnode/static-server":"1.16.42","@abtnode/timemachine":"1.16.42","@abtnode/util":"1.16.42","@arcblock/did":"1.20.1","@arcblock/did-auth":"1.20.1","@arcblock/did-ext":"^1.20.1","@arcblock/did-motif":"^1.1.13","@arcblock/did-util":"1.20.1","@arcblock/event-hub":"1.20.1","@arcblock/jwt":"^1.20.1","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"^1.20.1","@arcblock/vc":"1.20.1","@blocklet/constant":"1.16.42","@blocklet/did-space-js":"^1.0.48","@blocklet/env":"1.16.42","@blocklet/meta":"1.16.42","@blocklet/resolver":"1.16.42","@blocklet/sdk":"1.16.42","@blocklet/store":"1.16.42","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.20.1","@ocap/util":"1.20.1","@ocap/wallet":"1.20.1","@slack/webhook":"^5.0.4","archiver":"^7.0.1","axios":"^1.7.9","axon":"^2.0.3","chalk":"^4.1.2","cross-spawn":"^7.0.3","dayjs":"^1.11.13","deep-diff":"^1.0.2","detect-port":"^1.5.1","envfile":"^7.1.0","escape-string-regexp":"^4.0.0","fast-glob":"^3.3.2","filesize":"^10.1.1","flat":"^5.0.2","fs-extra":"^11.2.0","get-port":"^5.1.1","hasha":"^5.2.2","is-base64":"^1.1.0","is-cidr":"4","is-ip":"3","is-url":"^1.2.4","joi":"17.12.2","joi-extension-semver":"^5.0.0","js-yaml":"^4.1.0","kill-port":"^2.0.1","lodash":"^4.17.21","lru-cache":"^11.0.2","node-stream-zip":"^1.15.0","p-all":"^3.0.0","p-limit":"^3.1.0","p-map":"^4.0.0","p-retry":"^4.6.2","rate-limiter-flexible":"^5.0.5","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","ssri":"^8.0.1","stream-throttle":"^0.1.3","stream-to-promise":"^3.0.0","systeminformation":"^5.23.3","tail":"^2.2.4","tar":"^6.1.11","transliteration":"^2.3.5","ua-parser-js":"^1.0.2","ufo":"^1.5.3","uuid":"^9.0.1","valid-url":"^1.0.9","which":"^2.0.2","xbytes":"^1.8.0"},"devDependencies":{"expand-tilde":"^2.0.2","express":"^4.18.2","jest":"^29.7.0","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
 
 /***/ }),
 

package/lib/event/index.js

@@ -22,6 +22,7 @@ const {
 } = require('@abtnode/constant');
 const { joinURL } = require('ufo');
 const { encode } = require('@abtnode/util/lib/base32');
+
 const { NodeMonitSender } = require('../monitor/node-monit-sender');
 const { isCLI } = require('../util');
 
@@ -626,5 +627,81 @@ module.exports = ({
     eventHub.on(EVENT_BUS_EVENT, (data) => handleEventBusEvent(data));
   }
 
+  // 更新会话时，暂不做任何操作
+  // listen(teamAPI, BlockletEvents.updateUserSession, noop);
+  listen(teamAPI, BlockletEvents.addUserSession, (eventName, eventData) => {
+    const { teamDid, userDid, userSession, locale = 'en', skipNotification = false, origin } = eventData;
+    if (skipNotification) {
+      return;
+    }
+    const translations = {
+      en: {
+        title: 'You are logged in a new device',
+        body: `You are logged in a new device: ${userSession.ua}. \n\nIf this is not you, please click "View Your Account" button to view details`,
+        loginIp: 'Login IP',
+        loginAt: 'Login At',
+        viewYourAccount: 'View Your Account',
+      },
+      zh: {
+        title: '你在一个新的设备上登录了',
+        loginIp: '登录 IP',
+        loginAt: '登录时间',
+        body: `你在一个新的设备上登录了: ${userSession.ua}。\n\n如果这不是你本人在登录，请点击“查看您的账户”按钮查看详情`,
+        viewYourAccount: '查看您的账户',
+      },
+    };
+
+    const translation = translations[locale] || translations.en;
+    const localeMap = {
+      en: 'en-US',
+      zh: 'zh-CN',
+    };
+    const targetLocale = localeMap[locale] || localeMap.en;
+    const notification = {
+      title: translation.title,
+      body: translation.body,
+      severity: 'warning',
+      attachments: [
+        {
+          type: 'section',
+          fields: [
+            {
+              type: 'text',
+              data: { type: 'plain', color: '#9397A1', text: translation.loginIp },
+            },
+            {
+              type: 'text',
+              data: { type: 'plain', text: userSession.lastLoginIp },
+            },
+            {
+              type: 'text',
+              data: { type: 'plain', color: '#9397A1', text: translation.loginAt },
+            },
+            {
+              type: 'text',
+              data: { type: 'plain', text: userSession.updatedAt.toLocaleString(targetLocale) },
+            },
+          ],
+        },
+      ],
+      actions: [
+        {
+          name: translation.viewYourAccount,
+          link: `${origin}/.well-known/service/user/settings`,
+        },
+      ],
+    };
+    logger.info(`create notification on ${eventName}`, { teamDid, receiver: userDid, notification });
+    teamManager.createNotification({
+      teamDid,
+      receiver: userDid,
+      // NOTICE: createNotification 如果传递 notification 对象，就必须加上 pushOnly 选项，否则会调用失败
+      // 目前先改为使用 payload 的形式传递通知内容
+      // notification,
+      ...notification,
+      source: 'component',
+    });
+  });
+
   return events;
 };

package/lib/index.js

@@ -755,6 +755,8 @@ function ABTNode(options) {
     getBlockletBaseInfo: teamAPI.getBlockletBaseInfo.bind(teamAPI),
   };
 
+  blockletManager.createAuditLog = (params) => states.auditLog.create(params, instance);
+
   const events = createEvents({
     blockletManager,
     ensureBlockletRouting,

package/lib/monitor/node-runtime-monitor.js

@@ -193,6 +193,63 @@ class NodeRuntimeMonitor extends EventEmitter {
       });
   }
 
+  calculateUtilization() {
+    if (!this.data.realtime || !this.data.realtime.cpu || !this.data.realtime.mem || !this.data.realtime.disks) {
+      return {
+        cpus: [0],
+        disks: [0],
+        memory: 0,
+      };
+    }
+    try {
+      const { cpu, mem, disks } = this.data.realtime;
+      // 计算每个 CPU 的占用率：load字段为百分比，除以 100 得到 0 到 1 的值
+      const cpuUtilizations = cpu.cpus.filter((v) => v.load > 0).map((v) => v.load / 100);
+
+      // 计算内存占用率：used / total
+      const memoryUtilization = mem.total > 0 && mem.available > 0 ? (mem.total - mem.available) / mem.total : 0;
+
+      // 计算每个硬盘占用率：used / total
+      const diskUtilizations = disks.filter((v) => v.used > 0).map((v) => v.used / v.total);
+
+      // 返回包含所需值的对象
+      return {
+        cpus: cpuUtilizations,
+        disks: diskUtilizations,
+        memory: memoryUtilization,
+      };
+    } catch (error) {
+      this.logger.error('failed to calculate utilization', error);
+      return {
+        cpus: [0],
+        disks: [0],
+        memory: 0,
+      };
+    }
+  }
+
+  checkSystemHighLoad({ maxCpus, maxMem, maxDisk }) {
+    const { cpus, memory, disks } = this.calculateUtilization();
+    let highType = '';
+    if (cpus.some((v) => v > maxCpus)) {
+      highType = 'cpu';
+    } else if (memory > maxMem) {
+      highType = 'memory';
+    } else if (disks.some((v) => v > maxDisk)) {
+      highType = 'disk';
+    }
+    if (highType) {
+      this.logger.info('system high load', { cpus, memory, disks });
+    }
+    return {
+      isHighLoad: !!highType,
+      highType,
+      cpus,
+      memory,
+      disks,
+    };
+  }
+
   cleanup() {
     return this.state.remove({ date: { $lt: Date.now() - 1000 * 60 * 60 * 24 } });
   }

package/lib/states/audit-log.js

@@ -513,6 +513,8 @@ const getLogContent = async (action, args, context, result, info, node) => {
       return `Update Blocklet Webhook(${result.id})`;
     case 'deleteWebhookEndpoint':
       return `Delete Blocklet Webhook(${result.id})`;
+    case 'ensureBlockletRunning':
+      return `${result.title}:\n* ${result.description}`;
 
     default:
       return action;
@@ -557,6 +559,7 @@ const getLogCategory = (action) => {
     case 'auditFederated':
     case 'syncMasterAuthorization':
     case 'syncFederatedConfig':
+    case 'ensureBlockletRunning':
       return 'blocklet';
 
     // store，此处应该返回 server
@@ -732,11 +735,9 @@ class AuditLogState extends BaseState {
         const [info, uaInfo] = await Promise.all([node.states.node.read(), parse(ua)]);
 
         fixActor(user);
-
         const content = (await getLogContent(action, args, context, result, info, node)).trim();
         const actor = pick(user.actual || user, ['did', 'fullName', 'role']);
         actor.source = '';
-
         const teamDid =
           user.blockletDid || args.teamDid || (typeof args?.did === 'string' ? args.did : get(args, 'did.0'));
         const userDid = user.did || args.userDid || get(args, 'user.did') || args.ownerDid;
@@ -770,6 +771,7 @@ class AuditLogState extends BaseState {
           }
         } else {
           actor.avatar = '';
+          // actor.did = teamDid || info.did;
         }
 
         const data = await this.insert({

package/lib/states/user.js

@@ -757,6 +757,13 @@ SELECT did,inviter,generation FROM UserTree`.trim();
     if (user.phone) {
       user.phone = String(user.phone).trim().toLowerCase().replace(/\s+/g, '').replace(/[()-]/g, '');
     }
+    if (user.metadata?.phone?.phoneNumber) {
+      user.metadata.phone.phoneNumber = String(user.metadata.phone.phoneNumber)
+        .trim()
+        .toLowerCase()
+        .replace(/\s+/g, '')
+        .replace(/[()-]/g, '');
+    }
     return user;
   }
 

package/lib/util/blocklet.js

@@ -1028,7 +1028,7 @@ const shouldCheckHealthy = (blocklet) => {
 
 const isBlockletPortHealthy = async (blocklet, { minConsecutiveTime = 3000, timeout = 10 * 1000 } = {}) => {
   if (!blocklet) {
-    return true;
+    return;
   }
   const { environments } = blocklet;
   const webInterface = (blocklet.meta?.interfaces || []).find((x) => x.type === BLOCKLET_INTERFACE_TYPE_WEB);
@@ -1042,22 +1042,16 @@ const isBlockletPortHealthy = async (blocklet, { minConsecutiveTime = 3000, time
   }
 
   if (!port) {
-    return true;
+    return;
   }
 
-  try {
-    await ensureEndpointHealthy({
-      port,
-      protocol: webInterface ? 'http' : 'tcp',
-      minConsecutiveTime,
-      timeout,
-      doConsecutiveCheck: false,
-    });
-    return true;
-  } catch (error) {
-    logger.error('blocklet port is not healthy', error);
-    return false;
-  }
+  await ensureEndpointHealthy({
+    port,
+    protocol: webInterface ? 'http' : 'tcp',
+    minConsecutiveTime,
+    timeout,
+    doConsecutiveCheck: false,
+  });
 };
 
 const expandTarball = async ({ source, dest, strip = 1 }) => {

package/lib/util/env.js

@@ -1,7 +1,13 @@
-const abtNodeStartBackupDelaySeconds = process.env.ABT_NODE_START_BACKUP_DELAY_SECONDS
-  ? +process.env.ABT_NODE_START_BACKUP_DELAY_SECONDS
-  : 300;
+const serverJobBackoffSeconds = process.env.ABT_NODE_JOB_BACKOFF_SECONDS
+  ? +process.env.ABT_NODE_JOB_BACKOFF_SECONDS
+  : 600;
+
+const shouldJobBackoff = () => {
+  const uptime = process.uptime();
+  return uptime <= serverJobBackoffSeconds;
+};
 
 module.exports = {
-  abtNodeStartBackupDelaySeconds,
+  serverJobBackoffSeconds,
+  shouldJobBackoff,
 };

package/lib/util/launcher.js

@@ -367,6 +367,8 @@ const setupAppOwner = async ({ node, sessionId, justCreate = false, context, pro
           clientName: context?.device?.clientName,
         },
       },
+      locale,
+      origin: context?.origin,
     })
     .catch((error) => {
       logger.error('upsertUserSession failed', { error, appDid, ownerDid, context });

package/lib/util/user.js

@@ -0,0 +1,73 @@
+const omitBy = require('lodash/omitBy');
+const omit = require('lodash/omit');
+
+/**
+ * 生成用户要更新的数据
+ * @param {*} user 要更新的用户对象
+ * @param {*} existingUser 已存在的用户对象
+ */
+const generateUserUpdateData = (user, existingUser) => {
+  // 如果用户不存在，需要抛出错误
+  if (!existingUser) {
+    throw new Error('User not found');
+  }
+
+  const { emailVerified, phoneVerified, metadata = {} } = existingUser;
+
+  // 创建基础更新对象，只包含非空值
+  let updateData = {
+    did: user.did,
+    ...omitBy(user, (x) => !x),
+    metadata: { ...metadata, ...user.metadata },
+  };
+
+  // 处理地址
+  if (user.address) {
+    updateData.address = {
+      ...existingUser.address,
+      ...(user.address ?? {}),
+    };
+    updateData.metadata = {
+      ...updateData.metadata,
+      ...(user.metadata ?? {}),
+      location: user.address?.city || '',
+    };
+  }
+
+  // 处理电话信息
+  if (phoneVerified && updateData.metadata?.phone?.phoneNumber !== existingUser.phone) {
+    // 保持原号码相同
+    updateData.metadata.phone = {
+      country: '',
+      phoneNumber: existingUser.phone,
+    };
+  } else if (!phoneVerified && user.phone) {
+    // 从user.phone更新
+    updateData.metadata.phone = {
+      country: '',
+      phoneNumber: user.phone,
+    };
+  } else if (!phoneVerified && !user.phone && user.metadata?.phone) {
+    // 从user.metadata.phone更新
+    updateData.phone = user.metadata?.phone?.phoneNumber || '';
+  }
+
+  // 处理邮件
+  if (user.metadata?.email) {
+    updateData.metadata = omit(updateData.metadata, ['email']);
+    if (!emailVerified) {
+      updateData.email = user.metadata.email;
+    }
+  }
+
+  // 邮箱已验证，保持服务器上已验证的邮箱
+  if (emailVerified && updateData.email) {
+    updateData = omit(updateData, ['email']);
+  }
+  if (phoneVerified && updateData.phone) {
+    updateData = omit(updateData, ['phone']);
+  }
+  return updateData;
+};
+
+module.exports = { generateUserUpdateData };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.42",
+  "version": "1.16.43-beta-20250419-231352-c78ac93d",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,41 +19,41 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.42",
-    "@abtnode/auth": "1.16.42",
-    "@abtnode/certificate-manager": "1.16.42",
-    "@abtnode/constant": "1.16.42",
-    "@abtnode/cron": "1.16.42",
-    "@abtnode/docker-utils": "1.16.42",
-    "@abtnode/logger": "1.16.42",
-    "@abtnode/models": "1.16.42",
-    "@abtnode/queue": "1.16.42",
-    "@abtnode/rbac": "1.16.42",
-    "@abtnode/router-provider": "1.16.42",
-    "@abtnode/static-server": "1.16.42",
-    "@abtnode/timemachine": "1.16.42",
-    "@abtnode/util": "1.16.42",
-    "@arcblock/did": "1.20.0",
-    "@arcblock/did-auth": "1.20.0",
-    "@arcblock/did-ext": "^1.20.0",
+    "@abtnode/analytics": "1.16.43-beta-20250419-231352-c78ac93d",
+    "@abtnode/auth": "1.16.43-beta-20250419-231352-c78ac93d",
+    "@abtnode/certificate-manager": "1.16.43-beta-20250419-231352-c78ac93d",
+    "@abtnode/constant": "1.16.43-beta-20250419-231352-c78ac93d",
+    "@abtnode/cron": "1.16.43-beta-20250419-231352-c78ac93d",
+    "@abtnode/docker-utils": "1.16.43-beta-20250419-231352-c78ac93d",
+    "@abtnode/logger": "1.16.43-beta-20250419-231352-c78ac93d",
+    "@abtnode/models": "1.16.43-beta-20250419-231352-c78ac93d",
+    "@abtnode/queue": "1.16.43-beta-20250419-231352-c78ac93d",
+    "@abtnode/rbac": "1.16.43-beta-20250419-231352-c78ac93d",
+    "@abtnode/router-provider": "1.16.43-beta-20250419-231352-c78ac93d",
+    "@abtnode/static-server": "1.16.43-beta-20250419-231352-c78ac93d",
+    "@abtnode/timemachine": "1.16.43-beta-20250419-231352-c78ac93d",
+    "@abtnode/util": "1.16.43-beta-20250419-231352-c78ac93d",
+    "@arcblock/did": "1.20.1",
+    "@arcblock/did-auth": "1.20.1",
+    "@arcblock/did-ext": "^1.20.1",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/did-util": "1.20.0",
-    "@arcblock/event-hub": "1.20.0",
-    "@arcblock/jwt": "^1.20.0",
+    "@arcblock/did-util": "1.20.1",
+    "@arcblock/event-hub": "1.20.1",
+    "@arcblock/jwt": "^1.20.1",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/validator": "^1.20.0",
-    "@arcblock/vc": "1.20.0",
-    "@blocklet/constant": "1.16.42",
-    "@blocklet/did-space-js": "^1.0.47",
-    "@blocklet/env": "1.16.42",
-    "@blocklet/meta": "1.16.42",
-    "@blocklet/resolver": "1.16.42",
-    "@blocklet/sdk": "1.16.42",
-    "@blocklet/store": "1.16.42",
+    "@arcblock/validator": "^1.20.1",
+    "@arcblock/vc": "1.20.1",
+    "@blocklet/constant": "1.16.43-beta-20250419-231352-c78ac93d",
+    "@blocklet/did-space-js": "^1.0.48",
+    "@blocklet/env": "1.16.43-beta-20250419-231352-c78ac93d",
+    "@blocklet/meta": "1.16.43-beta-20250419-231352-c78ac93d",
+    "@blocklet/resolver": "1.16.43-beta-20250419-231352-c78ac93d",
+    "@blocklet/sdk": "1.16.43-beta-20250419-231352-c78ac93d",
+    "@blocklet/store": "1.16.43-beta-20250419-231352-c78ac93d",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.20.0",
-    "@ocap/util": "1.20.0",
-    "@ocap/wallet": "1.20.0",
+    "@ocap/mcrypto": "1.20.1",
+    "@ocap/util": "1.20.1",
+    "@ocap/wallet": "1.20.1",
     "@slack/webhook": "^5.0.4",
     "archiver": "^7.0.1",
     "axios": "^1.7.9",
@@ -111,5 +111,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "04e4adf8f2c1d6289850c66159c0a68ea946d5e6"
+  "gitHead": "207acad34e8ccf318cd7539c1ac717cee7951b53"
 }