@abtnode/core 1.16.49-beta-20250819-084933-3bcbd851 → 1.16.49-beta-20250821-102221-1b7283d6

package/lib/api/team.js

@@ -2270,7 +2270,7 @@ class TeamAPI extends EventEmitter {
     }
   }
 
-  async logoutUser({ teamDid, userDid, visitorId = '', appPid = '', status = '' }) {
+  async logoutUser({ teamDid, userDid, visitorId = '', appPid = '', status = '', remove = false }) {
     if (!userDid) {
       throw new Error('userDid is required');
     }
@@ -2290,7 +2290,12 @@ class TeamAPI extends EventEmitter {
     const blocklet = await getBlocklet({ did: teamDid, states: this.states, dataDirs: this.dataDirs, useCache: true });
     const whereStatus = getUserSessionWhere({ status, blocklet });
     Object.assign(where, whereStatus);
-    const result = await userSessionState.update(where, { $set: { status: 'offline' } });
+    let result;
+    if (remove) {
+      result = await userSessionState.remove(where);
+    } else {
+      result = await userSessionState.update(where, { $set: { status: 'offline' } });
+    }
     const { permanentWallet } = getBlockletInfo(blocklet, nodeInfo.sk);
     const masterSite = getFederatedMaster(blocklet);
     if (masterSite && masterSite.isMaster !== false && masterSite.appPid !== teamDid) {
@@ -2307,6 +2312,7 @@ class TeamAPI extends EventEmitter {
               visitorId,
               // HACK: 如果未传入 appPid，代表要注销当前用户在 master 中所有登录状态，所以传入 undefined；否则就只注销 master 中记录的当前 member 的登录状态
               appPid: appPid ? teamDid : undefined,
+              remove,
             },
           ],
         },

package/lib/blocklet/downloader/blocklet-downloader.js

@@ -190,8 +190,8 @@ class BlockletDownloader extends EventEmitter {
    *   blocklet;
    * }}
    * @returns {{
-   *   downloadList: Array<import('@abtnode/client').BlockletMeta>;
-   *   skipList: Array<import('@abtnode/client').BlockletMeta>;
+   *   downloadList: Array<import('@blocklet/server-js').BlockletMeta>;
+   *   skipList: Array<import('@blocklet/server-js').BlockletMeta>;
    *   downloadComponentIds: Array<string>; // like: "z8ia1i2yq67x39vruqQTbkVcwCnqRGx8zSPsJ/z8iZwubkNdA1BfEUwc5NJpY2Jnfm7yEbyvmKS"
    * }}
    */

package/lib/blocklet/manager/disk.js

@@ -1104,7 +1104,7 @@ class DiskBlockletManager extends BaseBlockletManager {
   }
 
   /**
-   * @param {import('@abtnode/client').RequestBackupBlockletInput} input
+   * @param {import('@blocklet/server-js').RequestBackupBlockletInput} input
    * @memberof BlockletManager
    */
   // eslint-disable-next-line no-unused-vars
@@ -1126,7 +1126,7 @@ class DiskBlockletManager extends BaseBlockletManager {
   }
 
   /**
-   * @param {import('@abtnode/client').RequestAbortBlockletBackupInput} input
+   * @param {import('@blocklet/server-js').RequestAbortBlockletBackupInput} input
    * @memberof BlockletManager
    */
   abortBlockletBackup({ appPid }) {
@@ -1134,7 +1134,7 @@ class DiskBlockletManager extends BaseBlockletManager {
   }
 
   /**
-   * @param {import('@abtnode/client').RequestRestoreBlockletInput} input
+   * @param {import('@blocklet/server-js').RequestRestoreBlockletInput} input
    * @memberof BlockletManager
    */
   async restoreBlocklet(input, context) {
@@ -1169,9 +1169,9 @@ class DiskBlockletManager extends BaseBlockletManager {
 
   /**
    *
-   * @param {import('@abtnode/client').RequestBlockletInput} param0
+   * @param {import('@blocklet/server-js').RequestBlockletInput} param0
    * @param {Record<string, any>} context
-   * @returns {import('@abtnode/client').BlockletState}
+   * @returns {import('@blocklet/server-js').BlockletState}
    */
   async restart({ did, componentDids }, context) {
     logger.info('restart blocklet', { did });
@@ -2518,8 +2518,8 @@ class DiskBlockletManager extends BaseBlockletManager {
   /**
    * @description
    * @param {{
-   *  did: import('@abtnode/client').RequestAddBlockletSpaceGatewayInput,
-   *  spaceGateway: import('@abtnode/client').SpaceGateway
+   *  did: import('@blocklet/server-js').RequestAddBlockletSpaceGatewayInput,
+   *  spaceGateway: import('@blocklet/server-js').SpaceGateway
    * }} { did, spaceGateway }
    * @return {Promise<void>}
    * @memberof BlockletManager
@@ -2544,7 +2544,7 @@ class DiskBlockletManager extends BaseBlockletManager {
 
   /**
    * @description
-   * @param {import('@abtnode/client').RequestAddBlockletSpaceGatewayInput} { did, spaceGatewayDid }
+   * @param {import('@blocklet/server-js').RequestAddBlockletSpaceGatewayInput} { did, spaceGatewayDid }
    * @return {Promise<void>}
    * @memberof BlockletManager
    */
@@ -2567,8 +2567,8 @@ class DiskBlockletManager extends BaseBlockletManager {
    * @description
    * @param {{
    *  did: string,
-   *  where: import('@abtnode/client').SpaceGateway
-   *  spaceGateway: import('@abtnode/client').SpaceGateway
+   *  where: import('@blocklet/server-js').SpaceGateway
+   *  spaceGateway: import('@blocklet/server-js').SpaceGateway
    * }} { did, spaceGateway }
    * @return {Promise<void>}
    * @memberof BlockletManager
@@ -2599,7 +2599,7 @@ class DiskBlockletManager extends BaseBlockletManager {
   /**
    * @description
    * @param {{ did: string }} { did }
-   * @return {Promise<Array<import('@abtnode/client').SpaceGateway>>}
+   * @return {Promise<Array<import('@blocklet/server-js').SpaceGateway>>}
    * @memberof BlockletManager
    */
   async getBlockletSpaceGateways({ did }) {
@@ -2642,13 +2642,13 @@ class DiskBlockletManager extends BaseBlockletManager {
    * @description
    * @param {{
    *  did: string,
-   *  autoBackup: import('@abtnode/client').AutoBackup
+   *  autoBackup: import('@blocklet/server-js').AutoBackup
    * }} { did, autoBackup }
    * @param {{}} context
    * @memberof DiskBlockletManager
    */
   async updateAutoBackup({ did, autoBackup }, context) {
-    /** @type {import('@abtnode/client').AutoBackup} */
+    /** @type {import('@blocklet/server-js').AutoBackup} */
     const value = { ...autoBackup };
 
     const jobId = getBackupJobId(did);
@@ -2704,8 +2704,8 @@ class DiskBlockletManager extends BaseBlockletManager {
 
   /**
    * @description
-   * @param {import('@abtnode/client').RequestGetAutoBackupInput} { did }
-   * @return {Promise<import('@abtnode/client').AutoBackup>}
+   * @param {import('@blocklet/server-js').RequestGetAutoBackupInput} { did }
+   * @return {Promise<import('@blocklet/server-js').AutoBackup>}
    * @memberof DiskBlockletManager
    */
   async getAutoBackup({ did }) {
@@ -2717,13 +2717,13 @@ class DiskBlockletManager extends BaseBlockletManager {
    * @description
    * @param {{
    *  did: string,
-   *  autoCheckUpdate: import('@abtnode/client').AutoCheckUpdate
+   *  autoCheckUpdate: import('@blocklet/server-js').AutoCheckUpdate
    * }} { did, autoCheckUpdate }
    * @param {{}} context
    * @memberof DiskBlockletManager
    */
   async updateAutoCheckUpdate({ did, autoCheckUpdate }, context) {
-    /** @type {import('@abtnode/client').AutoCheckUpdate} */
+    /** @type {import('@blocklet/server-js').AutoCheckUpdate} */
     const value = { ...autoCheckUpdate };
     await states.blockletExtras.setSettings(did, { autoCheckUpdate: value });
 
@@ -2752,8 +2752,8 @@ class DiskBlockletManager extends BaseBlockletManager {
 
   /**
    * @description
-   * @param {import('@abtnode/client').RequestGetAutoCheckUpdateInput} { did }
-   * @return {Promise<import('@abtnode/client').AutoCheckUpdate>}
+   * @param {import('@blocklet/server-js').RequestGetAutoCheckUpdateInput} { did }
+   * @return {Promise<import('@blocklet/server-js').AutoCheckUpdate>}
    * @memberof DiskBlockletManager
    */
   getAutoCheckUpdate({ did }) {
@@ -2762,8 +2762,8 @@ class DiskBlockletManager extends BaseBlockletManager {
 
   /**
    * @description
-   * @param {import('@abtnode/client').RequestGetBlockletBackupsInput} options
-   * @return {Promise<Array<import('@abtnode/client').Backup>>}
+   * @param {import('@blocklet/server-js').RequestGetBlockletBackupsInput} options
+   * @return {Promise<Array<import('@blocklet/server-js').Backup>>}
    * @memberof BlockletManager
    */
   async getBlockletBackups(options) {
@@ -3355,7 +3355,7 @@ class DiskBlockletManager extends BaseBlockletManager {
   /**
    * @param {{
    *  did: string,
-   *  blocklet: import('@abtnode/client').BlockletState,
+   *  blocklet: import('@blocklet/server-js').BlockletState,
    *  context: {
    *    referrer: string;
    *    user: {
@@ -3404,7 +3404,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     if (isEmpty(referrer)) {
       // fixes: https://github.com/ArcBlock/did-spaces/issues/908, referrer 在某些情况下会不存在
       /**
-       * @type {import('@abtnode/client').NodeState}
+       * @type {import('@blocklet/server-js').NodeState}
        */
       const node = await states.node.read();
       referrer = joinURL(
@@ -3516,7 +3516,7 @@ class DiskBlockletManager extends BaseBlockletManager {
 
   /**
    * @param {{
-   *  input: import('@abtnode/client').RequestRestoreBlockletInput,
+   *  input: import('@blocklet/server-js').RequestRestoreBlockletInput,
    *  context: Record<string, string>,
    * }} {input, context}
    * @memberof BlockletManager
@@ -3719,12 +3719,12 @@ class DiskBlockletManager extends BaseBlockletManager {
    * @description send notification to multiple users, and send different notifications according to the user's own language
    * @param {{
    * did: string,
-   * blocklet: import('@abtnode/client').BlockletState,
+   * blocklet: import('@blocklet/server-js').BlockletState,
    * title: {zh: string, en: string},
    * body: {zh: string, en: string},
    * button: {zh: string, en: string},
    * description: {zh: string, en: string},
-   * attachments: Array<import('@abtnode/client').NotificationAttachment>,
+   * attachments: Array<import('@blocklet/server-js').NotificationAttachment>,
    * action: string,
    * blockletDashboardAction: string,
    * sender: { appDid: string, appSk: string },
@@ -5124,7 +5124,7 @@ class DiskBlockletManager extends BaseBlockletManager {
 
   /**
    * @param {{
-   *  blocklet: import('@abtnode/client').BlockletState,
+   *  blocklet: import('@blocklet/server-js').BlockletState,
    *  context: {
    *    referrer: string;
    *    user: {
@@ -5171,7 +5171,7 @@ class DiskBlockletManager extends BaseBlockletManager {
   }
 
   /**
-   * @param {import('@abtnode/client').BlockletState} blocklet
+   * @param {import('@blocklet/server-js').BlockletState} blocklet
    */
   // eslint-disable-next-line no-unused-vars
   async _backupToDisk({ blocklet }, context) {
@@ -5191,7 +5191,7 @@ class DiskBlockletManager extends BaseBlockletManager {
 
   /**
    * FIXME: @linchen support cancel
-   * @param {import('@abtnode/client').RequestRestoreBlockletInput} input
+   * @param {import('@blocklet/server-js').RequestRestoreBlockletInput} input
    * @memberof BlockletManager
    */
   // eslint-disable-next-line no-unused-vars

package/lib/blocklet/manager/helper/install-application-from-backup.js

@@ -54,7 +54,7 @@ const installApplicationFromBackup = async ({
 
   const srcDataDir = path.join(dir, 'data');
 
-  /** @type {import('@abtnode/client').BlockletState} */
+  /** @type {import('@blocklet/server-js').BlockletState} */
   const blockletState = omit(fs.readJSONSync(path.join(dir, 'blocklet.json')), [
     '_id',
     'createdAt',
@@ -69,7 +69,7 @@ const installApplicationFromBackup = async ({
     );
   }
 
-  /** @type {import('@abtnode/client').RoutingSite} */
+  /** @type {import('@blocklet/server-js').RoutingSite} */
   const routingSite = omit(fs.readJSONSync(path.join(dir, 'routing_rule.json')));
 
   const { meta } = blockletState;

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

@@ -580,7 +580,6 @@ module.exports = Object.freeze({
   // Time and dates
   DAY_IN_MS,
   DAEMON_MAX_MEM_LIMIT_IN_MB: 800,
-  PROXY_MAX_MEM_LIMIT_IN_MB: 800,
   BLOCKLET_MAX_MEM_LIMIT_IN_MB: 800,
   CERTIFICATE_EXPIRES_OFFSET: 10 * DAY_IN_MS,
   ROUTING_RESPONSE_TYPES,
@@ -38924,7 +38923,7 @@ module.exports = require("zlib");
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.48","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.48","@abtnode/auth":"1.16.48","@abtnode/certificate-manager":"1.16.48","@abtnode/client":"1.16.48","@abtnode/constant":"1.16.48","@abtnode/cron":"1.16.48","@abtnode/db-cache":"1.16.48","@abtnode/docker-utils":"1.16.48","@abtnode/logger":"1.16.48","@abtnode/models":"1.16.48","@abtnode/queue":"1.16.48","@abtnode/rbac":"1.16.48","@abtnode/router-provider":"1.16.48","@abtnode/static-server":"1.16.48","@abtnode/timemachine":"1.16.48","@abtnode/util":"1.16.48","@aigne/aigne-hub":"^0.6.4","@arcblock/did":"1.22.2","@arcblock/did-connect-js":"1.22.2","@arcblock/did-ext":"1.22.2","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"1.22.2","@arcblock/event-hub":"1.22.2","@arcblock/jwt":"1.22.2","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"1.22.2","@arcblock/vc":"1.22.2","@blocklet/constant":"1.16.48","@blocklet/did-space-js":"^1.1.17","@blocklet/env":"1.16.48","@blocklet/error":"^0.2.5","@blocklet/meta":"1.16.48","@blocklet/resolver":"1.16.48","@blocklet/sdk":"1.16.48","@blocklet/store":"1.16.48","@blocklet/theme":"^3.1.23","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.22.2","@ocap/util":"1.22.2","@ocap/wallet":"1.22.2","@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","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","p-wait-for":"^3.2.0","private-ip":"^2.3.4","rate-limiter-flexible":"^5.0.5","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","slugify":"^1.6.6","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":"^11.1.0","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.48","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.48","@abtnode/auth":"1.16.48","@abtnode/certificate-manager":"1.16.48","@abtnode/constant":"1.16.48","@abtnode/cron":"1.16.48","@abtnode/db-cache":"1.16.48","@abtnode/docker-utils":"1.16.48","@abtnode/logger":"1.16.48","@abtnode/models":"1.16.48","@abtnode/queue":"1.16.48","@abtnode/rbac":"1.16.48","@abtnode/router-provider":"1.16.48","@abtnode/static-server":"1.16.48","@abtnode/timemachine":"1.16.48","@abtnode/util":"1.16.48","@aigne/aigne-hub":"^0.6.7","@arcblock/did":"1.22.2","@arcblock/did-connect-js":"1.22.2","@arcblock/did-ext":"1.22.2","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"1.22.2","@arcblock/event-hub":"1.22.2","@arcblock/jwt":"1.22.2","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"1.22.2","@arcblock/vc":"1.22.2","@blocklet/constant":"1.16.48","@blocklet/server-js":"1.16.48","@blocklet/did-space-js":"^1.1.18","@blocklet/env":"1.16.48","@blocklet/error":"^0.2.5","@blocklet/meta":"1.16.48","@blocklet/resolver":"1.16.48","@blocklet/sdk":"1.16.48","@blocklet/store":"1.16.48","@blocklet/theme":"^3.1.25","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.22.2","@ocap/util":"1.22.2","@ocap/wallet":"1.22.2","@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","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","p-wait-for":"^3.2.0","private-ip":"^2.3.4","rate-limiter-flexible":"^5.0.5","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","slugify":"^1.6.6","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":"^11.1.0","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/blocklet/project/publish-to-endpoint.js

@@ -46,7 +46,7 @@ function getReleaseDir(blocklet, projectId, releaseId) {
   return path.join(projectDir, PROJECT.RELEASE_DIR, `${releaseId}`);
 }
 
-const Client = require('@abtnode/client');
+const Client = require('@blocklet/server-js');
 
 const { signWithAccessKey, validateAccessKey } = Client;
 

package/lib/blocklet/project/util.js

@@ -9,7 +9,7 @@ const { expandBundle, APP_CONFIG_IMAGE_KEYS } = require('../../util');
 const COMPONENT_CONFIG_MAP_DIR = '.component_config';
 
 /**
- * @param {import('@abtnode/client').BlockletState} blocklet
+ * @param {import('@blocklet/server-js').BlockletState} blocklet
  * @param {{
  *  id: string;
  *  blockletLogo?: string;

package/lib/blocklet/storage/backup/base.js

@@ -30,7 +30,7 @@ class BaseBackup {
 
   /**
    * @description blocklet state 对象
-   * @type {import('@abtnode/client').BlockletState}
+   * @type {import('@blocklet/server-js').BlockletState}
    * @memberof BaseBackup
    */
   blocklet;

package/lib/blocklet/storage/backup/blocklet-extras.js

@@ -23,12 +23,12 @@ class BlockletExtrasBackup extends BaseBackup {
   /**
    *
    * @description
-   * @return {Promise<import('@abtnode/client').BlockletState>}
+   * @return {Promise<import('@blocklet/server-js').BlockletState>}
    * @memberof BlockletExtrasBackup
    */
   async getBlockletExtra() {
     /**
-     * @type {import('@abtnode/client').BlockletState}
+     * @type {import('@blocklet/server-js').BlockletState}
      */
     const blockletExtra = await states.blockletExtras.findOne({
       did: this.blocklet.meta.did,
@@ -43,7 +43,7 @@ class BlockletExtrasBackup extends BaseBackup {
   /**
    *
    * @description 清理数据并加密
-   * @param {import('@abtnode/client').BlockletState} raw
+   * @param {import('@blocklet/server-js').BlockletState} raw
    * @return {Promise<any>}
    * @memberof BlockletExtrasBackup
    */
@@ -75,7 +75,7 @@ class BlockletExtrasBackup extends BaseBackup {
   /**
    *
    * @description 清理数据并加密
-   * @param {import('@abtnode/client').ConfigEntry[]} configs
+   * @param {import('@blocklet/server-js').ConfigEntry[]} configs
    * @return {void}
    * @memberof BlockletExtrasBackup
    */

package/lib/blocklet/storage/backup/blocklet.js

@@ -34,13 +34,13 @@ class BlockletBackup extends BaseBackup {
   /**
    * @description 清理数据
    * @see blocklet.db 中需要删除哪些字段呢？ https://github.com/ArcBlock/blocklet-server/issues/6120#issuecomment-1383798348
-   * @return {Promise<import('@abtnode/client').BlockletState>}
+   * @return {Promise<import('@blocklet/server-js').BlockletState>}
    * @memberof BlockletBackup
    */
   cleanData() {
     const clone = cloneDeep(this.blocklet);
 
-    /** @type {import('@abtnode/client').ComponentState[]} */
+    /** @type {import('@blocklet/server-js').ComponentState[]} */
     const queue = [clone];
 
     // 广度优先遍历
@@ -71,7 +71,7 @@ class BlockletBackup extends BaseBackup {
   /**
    *
    * @description 清理数据并加密
-   * @param {import('@abtnode/client').BlockletState} info
+   * @param {import('@blocklet/server-js').BlockletState} info
    * @memberof BlockletExtrasBackup
    */
   encrypt(info) {

package/lib/blocklet/storage/backup/blocklets.js

@@ -46,7 +46,7 @@ class BlockletsBackup extends BaseBackup {
   /**
    *
    *
-   * @param {import('@abtnode/client').BlockletState} blocklet
+   * @param {import('@blocklet/server-js').BlockletState} blocklet
    * @returns {Array<{name: string, version: string, tarball: string}>}
    * @memberof BlockletsBackup
    */

package/lib/blocklet/storage/backup/disk.js

@@ -24,7 +24,7 @@ class DiskBackup extends BaseBackup {
 
   /**
    * @description blocklet state 对象
-   * @type {import('@abtnode/client').BlockletState}
+   * @type {import('@blocklet/server-js').BlockletState}
    * @memberof DiskBackup
    */
   blocklet;

package/lib/blocklet/storage/backup/spaces.js

@@ -65,7 +65,7 @@ class SpacesBackup extends BaseBackup {
 
   /**
    * @description blocklet state 对象
-   * @type {import('@abtnode/client').BlockletState}
+   * @type {import('@blocklet/server-js').BlockletState}
    * @memberof SpacesBackup
    */
   blocklet;
@@ -330,7 +330,7 @@ class SpacesBackup extends BaseBackup {
     this.throwErrorIfAborted();
 
     /**
-     * @type {import('@abtnode/client').NodeState}
+     * @type {import('@blocklet/server-js').NodeState}
      */
     const node = await states.node.read();
     const serverDid = node.did;

package/lib/blocklet/storage/restore/blocklet-extras.js

@@ -18,12 +18,12 @@ class BlockletExtrasRestore extends BaseRestore {
   /**
    *
    * @description
-   * @return {import('@abtnode/client').BlockletState}
+   * @return {import('@blocklet/server-js').BlockletState}
    * @memberof BlockletExtrasRestore
    */
   getExtras() {
     /**
-     * @type {import('@abtnode/client').BlockletState}
+     * @type {import('@blocklet/server-js').BlockletState}
      */
     return readJSONSync(join(this.restoreDir, this.filename));
   }
@@ -31,8 +31,8 @@ class BlockletExtrasRestore extends BaseRestore {
   /**
    *
    * @description 清理数据并加密
-   * @param {import('@abtnode/client').BlockletState} raw
-   * @returns {import('@abtnode/client').BlockletState}
+   * @param {import('@blocklet/server-js').BlockletState} raw
+   * @returns {import('@blocklet/server-js').BlockletState}
    * @memberof BlockletExtrasRestore
    */
   cleanExtras(raw, params) {
@@ -56,7 +56,7 @@ class BlockletExtrasRestore extends BaseRestore {
   /**
    *
    * @description 解密加密的数据
-   * @param {import('@abtnode/client').ConfigEntry[]} configs
+   * @param {import('@blocklet/server-js').ConfigEntry[]} configs
    * @param {object} params
    * @return {void}
    * @memberof BlockletExtrasRestore

package/lib/blocklet/storage/restore/blocklet.js

@@ -17,7 +17,7 @@ class BlockletRestore extends BaseRestore {
   /**
    *
    * @description
-   * @return {import('@abtnode/client').BlockletState}
+   * @return {import('@blocklet/server-js').BlockletState}
    * @memberof BlockletRestore
    */
   getBlocklet() {
@@ -27,8 +27,8 @@ class BlockletRestore extends BaseRestore {
   /**
    *
    * @description 解密加密的数据
-   * @param {import('@abtnode/client').BlockletState} blocklet
-   * @return {import('@abtnode/client').BlockletState}
+   * @param {import('@blocklet/server-js').BlockletState} blocklet
+   * @return {import('@blocklet/server-js').BlockletState}
    * @memberof BlockletRestore
    */
   decrypt(blocklet, params) {

package/lib/blocklet/storage/restore/spaces.js

@@ -104,7 +104,7 @@ class SpacesRestore extends BaseRestore {
   async syncFromSpaces() {
     const { endpoint, wallet, delegation } = this.input;
     /**
-     * @type {import('@abtnode/client').NodeState}
+     * @type {import('@blocklet/server-js').NodeState}
      */
     const node = await states.node.read();
     const serverDid = node.did;

package/lib/event/auto-backup-handler.js

@@ -6,7 +6,7 @@ const { getBackupJobId } = require('../util/spaces');
 /**
  * @description
  * @param {string} _eventName
- * @param {import('@abtnode/client').BlockletState & {context: {}} } payload
+ * @param {import('@blocklet/server-js').BlockletState & {context: {}} } payload
  * @param {import('../blocklet/manager/disk')} blockletManager
  */
 async function autoBackupHandler(_eventName, payload, blockletManager) {

package/lib/event/index.js

@@ -282,7 +282,7 @@ module.exports = ({
    */
   const handleBlockletEvent = async (eventName, payload) => {
     /**
-     * @type {import('@abtnode/client').BlockletState} payload
+     * @type {import('@blocklet/server-js').BlockletState} payload
      */
     const blocklet = payload.blocklet || payload;
 
@@ -556,7 +556,7 @@ module.exports = ({
       /**
        *
        * @param {string} eventName
-       * @param {import('@abtnode/client').BlockletState & {context: {}} } payload
+       * @param {import('@blocklet/server-js').BlockletState & {context: {}} } payload
        * @returns
        */
       (_eventName, payload, ...args) => {

package/lib/migrations/1.0.22-max-memory.js

@@ -3,11 +3,7 @@ const yaml = require('js-yaml');
 const get = require('lodash/get');
 const set = require('lodash/set');
 
-const {
-  DAEMON_MAX_MEM_LIMIT_IN_MB,
-  PROXY_MAX_MEM_LIMIT_IN_MB,
-  BLOCKLET_MAX_MEM_LIMIT_IN_MB,
-} = require('@abtnode/constant');
+const { DAEMON_MAX_MEM_LIMIT_IN_MB, BLOCKLET_MAX_MEM_LIMIT_IN_MB } = require('@abtnode/constant');
 
 module.exports = async ({ states, config, configFile, printInfo }) => {
   printInfo('Try to update node config to 1.0.22...');
@@ -18,7 +14,7 @@ module.exports = async ({ states, config, configFile, printInfo }) => {
 
   const updates = [
     { key: 'runtimeConfig.daemonMaxMemoryLimit', value: DAEMON_MAX_MEM_LIMIT_IN_MB },
-    { key: 'runtimeConfig.proxyMaxMemoryLimit', value: PROXY_MAX_MEM_LIMIT_IN_MB },
+    { key: 'runtimeConfig.proxyMaxMemoryLimit', value: BLOCKLET_MAX_MEM_LIMIT_IN_MB },
     { key: 'runtimeConfig.blockletMaxMemoryLimit', value: BLOCKLET_MAX_MEM_LIMIT_IN_MB },
   ];
   updates.forEach(({ key, value }) => {

package/lib/router/helper.js

@@ -473,7 +473,7 @@ const ensureCorsForWebWallet = async (sites) => {
 /**
  * @description
  * @param {Array<any>} [sites=[]]
- * @param {Array<import('@abtnode/client').BlockletState>} blocklets
+ * @param {Array<import('@blocklet/server-js').BlockletState>} blocklets
  * @return {Promise<any>}
  */
 const ensureCorsForDidSpace = (sites = [], blocklets) => {

package/lib/states/audit-log.js

@@ -19,7 +19,7 @@ const getServerInfo = (info) =>
   `[${info.name}](${joinURL(process.env.NODE_ENV === 'production' ? info.routing.adminPath : '', '/settings/about')})`;
 /**
  * @description
- * @param {import('@abtnode/client').BlockletState} blocklet
+ * @param {import('@blocklet/server-js').BlockletState} blocklet
  * @param {{
  *  routing: { adminPath: string }
  * }} info

package/lib/states/backup.js

@@ -198,10 +198,14 @@ class BackupState extends BaseState {
     } else {
       // SQLite：datetime + strftime
       // SQLite 的 datetime(col, '+X minutes') already returns text in UTC+offset
+      // 计算时差: 返回与 UTC 的偏移，单位：分钟
       const offset = dayjs.tz(dayjs.utc(), timezone).utcOffset();
-      const dt = sequelize.fn('datetime', sequelize.col('createdAt'), `${offset} minutes`);
-      dateExpr = sequelize.fn('strftime', '%Y-%m-%d', dt);
-      groupExpr = dt;
+      groupExpr = sequelize.fn(
+        'strftime',
+        '%Y-%m-%d', // 提取年月日
+        this.model.sequelize.fn('datetime', this.model.sequelize.col('createdAt'), `${offset} minutes`)
+      );
+      dateExpr = sequelize.fn('strftime', '%Y-%m-%d', groupExpr);
     }
 
     const options = {

package/lib/states/blocklet.js

@@ -165,7 +165,7 @@ class BlockletState extends BaseState {
    * @description
    * @param {string} did
    * @param {*} [{ decryptSk = true }={}]
-   * @return {Promise<import('@abtnode/client').BlockletState>}
+   * @return {Promise<import('@blocklet/server-js').BlockletState>}
    * @memberof BlockletState
    */
   async getBlocklet(did, { decryptSk = true } = {}) {

package/lib/states/node.js

@@ -12,9 +12,9 @@ const {
   DISK_ALERT_THRESHOLD_PERCENT,
   EVENTS,
   SERVER_STATUS,
-  PROXY_MAX_MEM_LIMIT_IN_MB,
   DEFAULT_NFT_DOMAIN_URL,
   SERVER_CACHE_TTL,
+  BLOCKLET_MAX_MEM_LIMIT_IN_MB,
 } = require('@abtnode/constant');
 const logger = require('@abtnode/logger')('@abtnode/core:states:node');
 
@@ -80,7 +80,7 @@ class NodeState extends BaseState {
   /**
    * Ensure we have an node record in the database
    *
-   * @returns {Promise<import('@abtnode/client').NodeState>} Node document json
+   * @returns {Promise<import('@blocklet/server-js').NodeState>} Node document json
    * @memberof NodeState
    */
   async _read() {
@@ -165,7 +165,7 @@ class NodeState extends BaseState {
     doc.isDockerInstalled = await checkDockerInstalled();
 
     if (doc.runtimeConfig && !doc.runtimeConfig.proxyMaxMemoryLimit) {
-      doc.runtimeConfig.proxyMaxMemoryLimit = PROXY_MAX_MEM_LIMIT_IN_MB;
+      doc.runtimeConfig.proxyMaxMemoryLimit = BLOCKLET_MAX_MEM_LIMIT_IN_MB;
     }
 
     return doc;

package/lib/util/blocklet.js

@@ -246,7 +246,7 @@ const getComponentDirs = (component, { dataDirs, ensure = false, ancestors = []
 };
 
 /**
- * @param component {import('@abtnode/client').ComponentState & { environmentObj: {[key: string]: string } } }
+ * @param component {import('@blocklet/server-js').ComponentState & { environmentObj: {[key: string]: string } } }
  * @returns {{cwd, script, args, environmentObj, interpreter, interpreterArgs}: { args: []}}
  * @return {*}
  */
@@ -815,7 +815,7 @@ const startBlockletProcess = async (
     blocklet,
     /**
      *
-     * @param {import('@abtnode/client').BlockletState} b
+     * @param {import('@blocklet/server-js').BlockletState} b
      * @param {*} param1
      * @returns
      */
@@ -2504,7 +2504,7 @@ const copyPackImages = async ({ appDataDir, packDir, packConfig = {} }) => {
 };
 
 /**
- * @param {import('@abtnode/client').BlockletState} blocklet
+ * @param {import('@blocklet/server-js').BlockletState} blocklet
  * @returns {boolean}
  */
 const isDevelopmentMode = (blocklet) => blocklet?.mode === BLOCKLET_MODES.DEVELOPMENT;

package/lib/util/spaces.js

@@ -7,7 +7,7 @@ const { joinURL, withQuery } = require('ufo');
 
 /**
  * @description
- * @param {import('@abtnode/client').ConfigEntry[]} configs
+ * @param {import('@blocklet/server-js').ConfigEntry[]} configs
  * @return {string | null}
  */
 const getBackupEndpoint = (configs) => {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.49-beta-20250819-084933-3bcbd851",
+  "version": "1.16.49-beta-20250821-102221-1b7283d6",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,23 +19,22 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@abtnode/auth": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@abtnode/certificate-manager": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@abtnode/client": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@abtnode/constant": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@abtnode/cron": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@abtnode/db-cache": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@abtnode/docker-utils": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@abtnode/logger": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@abtnode/models": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@abtnode/queue": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@abtnode/rbac": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@abtnode/router-provider": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@abtnode/static-server": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@abtnode/timemachine": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@abtnode/util": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@aigne/aigne-hub": "^0.6.4",
+    "@abtnode/analytics": "1.16.49-beta-20250821-102221-1b7283d6",
+    "@abtnode/auth": "1.16.49-beta-20250821-102221-1b7283d6",
+    "@abtnode/certificate-manager": "1.16.49-beta-20250821-102221-1b7283d6",
+    "@abtnode/constant": "1.16.49-beta-20250821-102221-1b7283d6",
+    "@abtnode/cron": "1.16.49-beta-20250821-102221-1b7283d6",
+    "@abtnode/db-cache": "1.16.49-beta-20250821-102221-1b7283d6",
+    "@abtnode/docker-utils": "1.16.49-beta-20250821-102221-1b7283d6",
+    "@abtnode/logger": "1.16.49-beta-20250821-102221-1b7283d6",
+    "@abtnode/models": "1.16.49-beta-20250821-102221-1b7283d6",
+    "@abtnode/queue": "1.16.49-beta-20250821-102221-1b7283d6",
+    "@abtnode/rbac": "1.16.49-beta-20250821-102221-1b7283d6",
+    "@abtnode/router-provider": "1.16.49-beta-20250821-102221-1b7283d6",
+    "@abtnode/static-server": "1.16.49-beta-20250821-102221-1b7283d6",
+    "@abtnode/timemachine": "1.16.49-beta-20250821-102221-1b7283d6",
+    "@abtnode/util": "1.16.49-beta-20250821-102221-1b7283d6",
+    "@aigne/aigne-hub": "^0.6.7",
     "@arcblock/did": "1.22.2",
     "@arcblock/did-connect-js": "1.22.2",
     "@arcblock/did-ext": "1.22.2",
@@ -46,15 +45,16 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "1.22.2",
     "@arcblock/vc": "1.22.2",
-    "@blocklet/constant": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@blocklet/did-space-js": "^1.1.17",
-    "@blocklet/env": "1.16.49-beta-20250819-084933-3bcbd851",
+    "@blocklet/constant": "1.16.49-beta-20250821-102221-1b7283d6",
+    "@blocklet/did-space-js": "^1.1.18",
+    "@blocklet/env": "1.16.49-beta-20250821-102221-1b7283d6",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@blocklet/resolver": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@blocklet/sdk": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@blocklet/store": "1.16.49-beta-20250819-084933-3bcbd851",
-    "@blocklet/theme": "^3.1.23",
+    "@blocklet/meta": "1.16.49-beta-20250821-102221-1b7283d6",
+    "@blocklet/resolver": "1.16.49-beta-20250821-102221-1b7283d6",
+    "@blocklet/sdk": "1.16.49-beta-20250821-102221-1b7283d6",
+    "@blocklet/server-js": "1.16.49-beta-20250821-102221-1b7283d6",
+    "@blocklet/store": "1.16.49-beta-20250821-102221-1b7283d6",
+    "@blocklet/theme": "^3.1.25",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.22.2",
     "@ocap/util": "1.22.2",
@@ -118,5 +118,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "b8bbf2279e9a29bd58eac7b66e1db16e851a183c"
+  "gitHead": "4fdd3b0cfb87b45ff8c0d539f83c3ddcbd71465b"
 }