@abtnode/core 1.16.45-beta-20250612-231219-481217be → 1.16.45-beta-20250618-073451-6e48fb62

package/lib/api/node.js

@@ -8,7 +8,7 @@ const isGitpod = require('@abtnode/util/lib/is-gitpod');
 const getFolderSize = require('@abtnode/util/lib/get-folder-size');
 const canPackageReadWrite = require('@abtnode/util/lib/can-pkg-rw');
 const { toDelegateAddress } = require('@arcblock/did-util');
-const { MONITOR_RECORD_INTERVAL_SEC } = require('@abtnode/constant');
+const { MONITOR_RECORD_INTERVAL_SEC, NODE_MODES } = require('@abtnode/constant');
 
 const logger = require('@abtnode/logger')('@abtnode/core:api:node');
 
@@ -70,6 +70,16 @@ class NodeAPI {
 
   async getDiskInfo() {
     let diskInfo = { app: 0, cache: 0, log: 0, data: 0, blocklets: 0 };
+    if (process.env.ABT_NODE_FAKE_DISK_INFO === '1') {
+      return diskInfo;
+    }
+
+    // Do not get real disk info for serverless mode to avoid too much resource usage
+    const info = await this.state.read();
+    if (info.mode === NODE_MODES.SERVERLESS) {
+      return diskInfo;
+    }
+
     try {
       const [app, cache, log, data, blocklets] = await Promise.all([
         getFolderSize(this.state.dataDirs.core),

package/lib/blocklet/manager/disk.js

@@ -2772,7 +2772,7 @@ class DiskBlockletManager extends BaseBlockletManager {
   }
 
   async updateBlockletSettings({ did, enableSessionHardening, invite, gateway }, context) {
-    let params = {};
+    const params = {};
     if (!isNil(enableSessionHardening)) {
       params.enableSessionHardening = enableSessionHardening;
     }
@@ -2782,7 +2782,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     }
 
     if (!isNil(gateway)) {
-      params = { ...params, ...gateway };
+      params.gateway = gateway;
     }
 
     const keys = Object.keys(params);

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

@@ -12,6 +12,8 @@ const inProgressStatuses = [BlockletStatus.stopping, BlockletStatus.restarting,
 class EnsureBlockletRunning {
   initialized = false;
 
+  firstChecked = false;
+
   // 每次任务的最小间隔时间
   checkInterval = +process.env.ABT_NODE_ENSURE_RUNNING_CHECK_INTERVAL || 60 * 1000;
 
@@ -52,12 +54,15 @@ class EnsureBlockletRunning {
 
   isBlockletPortHealthyWithRetries = async (blocklet, isDoing = false) => {
     let error;
-    for (let attempt = 0; attempt < 10; attempt++) {
+    const maxAttempts = this.firstChecked ? 10 : 2;
+    const timeout = this.firstChecked ? 6000 : 3000;
+
+    for (let attempt = 0; attempt < maxAttempts; attempt++) {
       try {
         // eslint-disable-next-line no-await-in-loop
         await this.isBlockletPortHealthy(blocklet, {
           minConsecutiveTime: 3000,
-          timeout: 6000,
+          timeout,
         });
         return true;
       } catch (e) {
@@ -141,6 +146,7 @@ class EnsureBlockletRunning {
       logger.error('ensure blocklet status failed', e);
     }
     this.runningRootBlocklets = {};
+    this.firstChecked = true;
   };
 
   getRunningBlocklets = async () => {

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

@@ -762,6 +762,7 @@ module.exports = Object.freeze({
     readNotifications: true,
     unreadNotifications: true,
     launchBlockletByLauncher: true,
+    launchBlockletWithoutWallet: true,
   },
   NOTIFICATION_SEND_STATUS: {
     PENDING: 0, // 待发送
@@ -38888,7 +38889,7 @@ module.exports = require("zlib");
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.44","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.44","@abtnode/auth":"1.16.44","@abtnode/certificate-manager":"1.16.44","@abtnode/client":"1.16.44","@abtnode/constant":"1.16.44","@abtnode/cron":"1.16.44","@abtnode/db-cache":"1.16.44","@abtnode/docker-utils":"1.16.44","@abtnode/logger":"1.16.44","@abtnode/models":"1.16.44","@abtnode/queue":"1.16.44","@abtnode/rbac":"1.16.44","@abtnode/router-provider":"1.16.44","@abtnode/static-server":"1.16.44","@abtnode/timemachine":"1.16.44","@abtnode/util":"1.16.44","@arcblock/did":"1.20.14","@arcblock/did-auth":"1.20.14","@arcblock/did-ext":"1.20.14","@arcblock/did-motif":"^1.1.13","@arcblock/did-util":"1.20.14","@arcblock/event-hub":"1.20.14","@arcblock/jwt":"1.20.14","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"1.20.14","@arcblock/vc":"1.20.14","@blocklet/constant":"1.16.44","@blocklet/did-space-js":"^1.0.60","@blocklet/env":"1.16.44","@blocklet/error":"^0.2.5","@blocklet/meta":"1.16.44","@blocklet/resolver":"1.16.44","@blocklet/sdk":"1.16.44","@blocklet/store":"1.16.44","@blocklet/theme":"^2.13.66","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.20.14","@ocap/util":"1.20.14","@ocap/wallet":"1.20.14","@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","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":"^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.44","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.44","@abtnode/auth":"1.16.44","@abtnode/certificate-manager":"1.16.44","@abtnode/client":"1.16.44","@abtnode/constant":"1.16.44","@abtnode/cron":"1.16.44","@abtnode/db-cache":"1.16.44","@abtnode/docker-utils":"1.16.44","@abtnode/logger":"1.16.44","@abtnode/models":"1.16.44","@abtnode/queue":"1.16.44","@abtnode/rbac":"1.16.44","@abtnode/router-provider":"1.16.44","@abtnode/static-server":"1.16.44","@abtnode/timemachine":"1.16.44","@abtnode/util":"1.16.44","@arcblock/did":"1.20.14","@arcblock/did-auth":"1.20.14","@arcblock/did-ext":"1.20.14","@arcblock/did-motif":"^1.1.13","@arcblock/did-util":"1.20.14","@arcblock/event-hub":"1.20.14","@arcblock/jwt":"1.20.14","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"1.20.14","@arcblock/vc":"1.20.14","@blocklet/constant":"1.16.44","@blocklet/did-space-js":"^1.0.62","@blocklet/env":"1.16.44","@blocklet/error":"^0.2.5","@blocklet/meta":"1.16.44","@blocklet/resolver":"1.16.44","@blocklet/sdk":"1.16.44","@blocklet/store":"1.16.44","@blocklet/theme":"^2.13.70","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.20.14","@ocap/util":"1.20.14","@ocap/wallet":"1.20.14","@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","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":"^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

@@ -3,7 +3,6 @@ const { EventEmitter } = require('events');
 const { wipeSensitiveData, getDisplayName } = require('@blocklet/meta/lib/util');
 const logger = require('@abtnode/logger')('@abtnode/core:event');
 const {
-  BLOCKLET_MODES,
   BlockletStatus,
   BlockletSource,
   BlockletEvents,
@@ -35,9 +34,14 @@ const states = require('../states');
 const { getBackupEndpoint, getBackupFilesUrlFromEndpoint, getDIDSpacesUrlFromEndpoint } = require('../util/spaces');
 const { autoBackupHandlerFactory, autoBackupHandler } = require('./auto-backup-handler');
 
-const routingSnapshotPrefix = (blocklet) => (blocklet.mode === BLOCKLET_MODES.DEVELOPMENT ? '[DEV] ' : '');
 const eventBusHandler = require('../blocklet/webhook/event-bus');
 const { isDevelopmentMode, deleteBlockletCache } = require('../util/blocklet');
+const {
+  backupBlockletSites,
+  cleanBlockletSitesBackup,
+  rollbackBlockletSites,
+  routingSnapshotPrefix,
+} = require('./util');
 
 /**
  *
@@ -212,7 +216,12 @@ module.exports = ({
   };
 
   const handleBlockletUpgrade = async (name, { blocklet, context }) => {
+    let sites;
+    let backupFile = null;
     try {
+      ({ sites, backupFile } = await backupBlockletSites(blocklet));
+      logger.info('sites before update blocklet routing', { event: name, did: blocklet.meta.did, sites });
+
       const changed = await ensureBlockletRoutingForUpgrade(blocklet, context);
       if (changed) {
         const hash = await takeRoutingSnapshot(
@@ -223,8 +232,21 @@ module.exports = ({
       }
 
       await teamAPI.refreshBlockletInterfacePermissions(blocklet.meta);
+
+      // clean backup sites after success
+      sites = null;
+      cleanBlockletSitesBackup(backupFile);
     } catch (error) {
       logger.error('upgrade blocklet routing rules error', { event: name, error });
+
+      rollbackBlockletSites({ blocklet, sites, backupFile, takeRoutingSnapshot, context })
+        .then(() => {
+          logger.info('rollback blocklet routing rules success', { event: name, did: blocklet.meta.did });
+        })
+        .catch((err) => {
+          logger.error('rollback blocklet routing rules error', { event: name, error: err });
+        });
+
       teamManager.createNotification({
         title: 'Blocklet URL Mapping Error',
         // eslint-disable-next-line max-len

package/lib/event/util.js

@@ -0,0 +1,71 @@
+const path = require('path');
+const fs = require('fs');
+const logger = require('@abtnode/logger')('@abtnode/core:event');
+const { BLOCKLET_MODES } = require('@blocklet/constant');
+
+const states = require('../states');
+
+const routingSnapshotPrefix = (blocklet) => (blocklet.mode === BLOCKLET_MODES.DEVELOPMENT ? '[DEV] ' : '');
+
+const backupBlockletSites = async (blocklet) => {
+  const sites = await states.site.getSitesByBlocklet(blocklet.meta.did);
+  let backupFile = null;
+  try {
+    backupFile = path.join(blocklet.env.cacheDir, `sites-backup-${Date.now()}.json`);
+    logger.info(`backup blocklet sites to ${backupFile}`, { did: blocklet.meta.did, sites });
+    fs.writeFileSync(backupFile, JSON.stringify(sites));
+    logger.info('backup blocklet sites', { did: blocklet.meta.did, backupFile });
+  } catch (error) {
+    logger.error('backup blocklet sites error', { error });
+  }
+
+  return { sites, backupFile };
+};
+
+const rollbackBlockletSites = async ({ blocklet, sites, backupFile, takeRoutingSnapshot, context }) => {
+  try {
+    let sitesToRestore = sites;
+    logger.info('rollback blocklet sites', { did: blocklet.meta.did, sites, backupFile });
+    if (!sitesToRestore && backupFile && fs.existsSync(backupFile)) {
+      sitesToRestore = JSON.parse(fs.readFileSync(backupFile, 'utf8'));
+      logger.info('rollback sites from backup file', { did: blocklet.meta.did, backupFile });
+    }
+
+    if (!sitesToRestore) {
+      logger.info('no blocklet sites to rollback', { did: blocklet.meta.did, sites, backupFile });
+    }
+
+    const promises = sitesToRestore.map((site) => states.site.update({ id: site.id }, { $set: { rules: site.rules } }));
+    await Promise.all(promises);
+    logger.info('rollback blocklet sites rules success to database', { did: blocklet.meta.did, sites, backupFile });
+
+    const hash = await takeRoutingSnapshot(
+      {
+        message: `${routingSnapshotPrefix(blocklet)}Roll back sites rules for blocklet ${blocklet.meta.name}`,
+        dryRun: false,
+      },
+      context
+    );
+
+    logger.info('rollback blocklet sites success to snapshot', { did: blocklet.meta.did, hash });
+  } catch (error) {
+    logger.error('rollback blocklet sites error', { error, blocklet, sites, backupFile });
+  }
+};
+
+const cleanBlockletSitesBackup = (backupFile) => {
+  if (!backupFile || !fs.existsSync(backupFile)) {
+    logger.info('no backup file to clean', { backupFile });
+    return;
+  }
+
+  fs.unlinkSync(backupFile);
+  logger.info('clean backup sites', { backupFile });
+};
+
+module.exports = {
+  routingSnapshotPrefix,
+  backupBlockletSites,
+  cleanBlockletSitesBackup,
+  rollbackBlockletSites,
+};

package/lib/index.js

@@ -23,6 +23,7 @@ const {
   isLauncherSessionConsumed,
   setupAppOwner,
   launchBlockletByLauncher,
+  launchBlockletWithoutWallet,
 } = require('./util/launcher');
 const WebHook = require('./webhook');
 const states = require('./states');
@@ -252,7 +253,7 @@ function ABTNode(options) {
   });
 
   // 4. init routing manager
-  const routerManager = new RouterManager({ certManager });
+  const routerManager = new RouterManager({ certManager, dataDirs });
   const routingSnapshot = new RoutingSnapshot({
     baseDir: dataDirs.core,
     getRoutingData: async () => {
@@ -503,7 +504,7 @@ function ABTNode(options) {
     getConnectedAccount: teamAPI.getConnectedAccount.bind(teamAPI),
     getOwner: teamAPI.getOwner.bind(teamAPI),
     getNodeUsers: () => teamAPI.getUsers({ teamDid: options.nodeDid }),
-    getNodeUser: (user) => teamAPI.getUser({ teamDid: options.nodeDid, user }),
+    getNodeUser: (user, _options) => teamAPI.getUser({ teamDid: options.nodeDid, user, options: _options }),
     addUser: teamAPI.addUser.bind(teamAPI),
     loginUser: teamAPI.loginUser.bind(teamAPI),
     disconnectUserAccount: teamAPI.disconnectUserAccount.bind(teamAPI),
@@ -716,6 +717,7 @@ function ABTNode(options) {
     isLauncherSessionConsumed,
     setupAppOwner,
     launchBlockletByLauncher: (params, context) => launchBlockletByLauncher(instance, params, context),
+    launchBlockletWithoutWallet: (params, context) => launchBlockletWithoutWallet(instance, params, context),
 
     // init security default data
     initializeSecurityDefaultData: securityAPI.initializeDefaultData.bind(securityAPI),

package/lib/router/helper.js

@@ -1444,7 +1444,7 @@ module.exports = function getRouterHelpers({
           entityType: 'server',
           severity: 'error',
           source: 'system',
-          sticky: true,
+          sticky: false,
         });
       });
     }
@@ -1459,7 +1459,16 @@ module.exports = function getRouterHelpers({
     if (daemon && info.routing.blockPolicy?.autoBlocking?.enabled && providers[providerName].supportsModSecurity()) {
       scanner.stopLogWatcher();
       const logs = providers[providerName].getLogFilesForToday();
-      const limiter = createLimiter(info.routing.blockPolicy.autoBlocking);
+      const limiter = createLimiter(info.routing.blockPolicy.autoBlocking, (entry) => {
+        teamManager.createNotification({
+          title: 'User IP Blocked',
+          description: `User IP blocked: ${JSON.stringify(entry, null, 2)}`,
+          entityType: 'server',
+          severity: 'error',
+          source: 'system',
+          sticky: false,
+        });
+      });
       scanner.startLogWatcher(logs.error, async (logEntries) => {
         const blocked = [];
         const grouped = countBy(logEntries, 'ip');

package/lib/router/manager.js

@@ -6,7 +6,6 @@
  */
 const https = require('https');
 const path = require('path');
-const os = require('os');
 const dns = require('dns');
 const fse = require('fs-extra');
 const get = require('lodash/get');
@@ -55,7 +54,7 @@ const {
   getDidFromDomainGroupName,
   updateNFTDomainRecord,
   revokeAndDeleteNFTDomainRecord,
-  getGatewayPorts,
+  getAvailableGatewayPorts,
 } = require('../util/router');
 const checkDNS = require('../util/check-dns.js');
 
@@ -117,8 +116,9 @@ const isMockedDidDomain = (domain) => {
 };
 
 class RouterManager extends EventEmitter {
-  constructor({ certManager }) {
+  constructor({ certManager, dataDirs }) {
     super();
+    this.dataDirs = dataDirs;
     this.certManager = certManager;
 
     // HACK: do not emit any events from CLI
@@ -818,9 +818,14 @@ class RouterManager extends EventEmitter {
     // get provider
     const providerName = getProviderFromNodeInfo(info);
     const Provider = getProvider(providerName);
-    const tmpDir = path.join(os.tmpdir(), `${providerName}-${Date.now()}`);
 
-    const { httpPort, httpsPort } = getGatewayPorts(info);
+    const tmpDir = path.join(this.dataDirs.tmp, `${providerName}-${Date.now()}`);
+    fse.ensureDirSync(tmpDir);
+    logger.info('validateRouterConfig.tmpDir', { tmpDir });
+
+    const { httpPort, httpsPort } = await getAvailableGatewayPorts();
+    logger.info('validateRouterConfig.gatewayPorts', { httpPort, httpsPort });
+
     // disable cache to reduce nginx reload time and memory consumption
     const provider = new Provider({
       configDir: tmpDir,

package/lib/router/security/limiter.js

@@ -16,9 +16,10 @@ const states = require('../../states');
  *   windowQuota: number;
  *   blockDuration: number;
  * }} options
+ * @param {(entry: { scope: string, key: string, expiresAt: number }) => void} onBlocked
  * @returns {{ check: (ip: string, points?: number) => Promise<number> }}
  */
-function createLimiter(options) {
+function createLimiter(options, onBlocked = () => {}) {
   const limiter = new RateLimiterMemory({
     points: options.windowQuota,
     duration: options.windowSize,
@@ -35,8 +36,10 @@ function createLimiter(options) {
       logger.info('Rate limit has exceeded', { ip, err });
       const expiresAt = dayjs().add(err.msBeforeNext, 'ms').unix();
       const added = await states.blacklist.addItem(BLACKLIST_SCOPE.ROUTER, ip, expiresAt);
+
       if (added) {
         logger.info('User IP blocked', { ip, expiresAt });
+        onBlocked({ scope: BLACKLIST_SCOPE.ROUTER, key: ip, expiresAt });
         return err.msBeforeNext;
       }
     }

package/lib/team/manager.js

@@ -222,15 +222,9 @@ class TeamManager extends EventEmitter {
         users = users.concat(roleUsers);
       }
       if (userDids.length > 0) {
-        const queryUsers = await userState.getUsersByDids({
-          dids: userDids,
-          query: {
-            approved: true,
-            selection,
-            includeConnectedAccounts,
-            includePassports: true,
-          },
-        });
+        const queryUsers = await Promise.all(
+          userDids.map((did) => userState.getUser(did, { includePassports: true, enableConnectedAccount: true }))
+        );
 
         const validUsers = queryUsers.filter((user) => {
           const { passports = [] } = user;

package/lib/util/blocklet.js

@@ -1577,8 +1577,8 @@ const _getBlocklet = async ({
   blocklet.settings.storeList = blocklet.settings.storeList || [];
   blocklet.settings.theme = mergeWith(
     cloneDeep({
-      light: BLOCKLET_THEME_LIGHT,
-      dark: BLOCKLET_THEME_DARK,
+      light: { palette: BLOCKLET_THEME_LIGHT.palette },
+      dark: { palette: BLOCKLET_THEME_DARK.palette },
       prefer: 'light',
     }),
     blocklet.settings.theme,

package/lib/util/cache.js

@@ -1,6 +1,7 @@
 const fs = require('fs-extra');
 const path = require('path');
 const { getAppImageCacheDir, getAppOgCacheDir } = require('@abtnode/util/lib/blocklet');
+const { DBCache, getAbtNodeRedisAndSQLiteUrl } = require('@abtnode/db-cache');
 
 const clearCacheDir = (dir) => {
   if (fs.existsSync(dir)) {
@@ -9,6 +10,15 @@ const clearCacheDir = (dir) => {
   }
 };
 
+const clearDBCache = async () => {
+  const dbCache = new DBCache(() => ({
+    prefix: '*',
+    ttl: 1000 * 60,
+    ...getAbtNodeRedisAndSQLiteUrl(),
+  }));
+  await dbCache.flushAll();
+};
+
 /**
  * The `clearCache` function is used to clear cache files based on different
  * parameters and directories.
@@ -18,6 +28,8 @@ const clearCacheDir = (dir) => {
  * @returns String[] list of files removed from the cache.
  */
 const clearCache = async (params, node, blockletManager) => {
+  await clearDBCache();
+
   const baseDir = path.dirname(node.dataDirs.core);
 
   // reset cache by pattern

package/lib/util/launcher.js

@@ -15,6 +15,7 @@ const {
   getAvatarByUrl,
   getAppAvatarUrl,
 } = require('@abtnode/util/lib/user');
+const { CustomError } = require('@blocklet/error');
 const { createLaunchBlockletHandler, createServerlessInstallGuard } = require('@abtnode/auth/lib/server');
 const { getDisplayName } = require('@blocklet/meta/lib/util');
 const { fromAppDid } = require('@arcblock/did-ext');
@@ -24,7 +25,7 @@ const { getBlockletLogos } = require('@abtnode/util/lib/blocklet');
 const { PASSPORT_SOURCE, PASSPORT_LOG_ACTION, PASSPORT_ISSUE_ACTION } = require('@abtnode/constant');
 
 const { getLauncherUser, getLauncherSession: getLauncherSessionRaw, doRequest } = require('@abtnode/auth/lib/launcher');
-const { createAuthToken, getPassportStatusEndpoint } = require('@abtnode/auth/lib/auth');
+const { createAuthToken, getPassportStatusEndpoint, messages } = require('@abtnode/auth/lib/auth');
 const { createPassportVC, createPassport, createUserPassport } = require('@abtnode/auth/lib/passport');
 
 const { LOGIN_PROVIDER, fromBlockletStatus } = require('@blocklet/constant');
@@ -245,7 +246,7 @@ const setupAppOwner = async ({ node, sessionId, justCreate = false, context, pro
     appOwnerProfile.avatar = await extractUserAvatar(avatarBase64, { dataDir });
     logger.info('Create owner from launcher for blocklet', { appDid, ownerDid, ownerPk, sessionId, appOwnerProfile });
   } else {
-    user = await node.getUser({ teamDid: info.did, user: { did: userDid } });
+    user = await node.getUser({ teamDid: info.did, user: { did: userDid }, options: { enableConnectedAccount: true } });
     if (!user) {
       throw new Error(`Owner user not found in server: ${userDid}`);
     }
@@ -537,6 +538,68 @@ const launchBlockletByLauncher = async (node, extraParams, context) => {
   return data;
 };
 
+const launchBlockletWithoutWallet = async (node, extraParams, context) => {
+  logger.debug('launchBlockletWithoutWallet', { extraParams, context });
+
+  extraParams.locale = context.locale || 'en';
+
+  const { blockletMetaUrl, title, description, locale } = extraParams;
+
+  if (!blockletMetaUrl && !title && !description) {
+    logger.error('blockletMetaUrl | title + description must be provided');
+    throw new CustomError(400, messages.missingBlockletUrl[locale]);
+  }
+
+  const blocklet = blockletMetaUrl
+    ? await node.getBlockletMetaFromUrl({ url: blockletMetaUrl, checkPrice: true })
+    : {
+        meta: {
+          title,
+          description,
+        },
+      };
+
+  if (!blocklet) {
+    throw new Error('Blocklet not found');
+  }
+
+  // generate app key pair
+  const type = (blocklet?.meta?.environments || []).find((x) => x.name === 'CHAIN_TYPE')?.default || 'default';
+  const appWallet = fromRandom(type);
+
+  // use the server user to set up the app owner, this account only allows using the passkey to login
+  const { user } = context;
+
+  let data = {};
+
+  const handler = createLaunchBlockletHandler(node, 'session');
+  await handler(
+    {
+      extraParams,
+      userDid: user.did,
+      claims: [
+        {
+          type: 'keyPair',
+          secret: appWallet.secretKey,
+          userDid: user.did,
+          userPk: user.pk,
+        },
+      ],
+      didwallet: {
+        os: 'managed',
+        version,
+      },
+      updateSession: (updates) => {
+        data = merge(data, updates);
+      },
+      provider: LOGIN_PROVIDER.EMAIL,
+    },
+    context
+  );
+
+  return data;
+};
+
 module.exports = {
   consumeServerlessNFT,
   consumeLauncherSession,
@@ -550,4 +613,5 @@ module.exports = {
   isBlockletTerminated,
   notifyBlockletUpdated,
   launchBlockletByLauncher,
+  launchBlockletWithoutWallet,
 };

package/lib/util/router.js

@@ -11,6 +11,7 @@ const uniq = require('lodash/uniq');
 const isUrl = require('is-url');
 const isIp = require('is-ip');
 const isCidr = require('is-cidr');
+const getPort = require('get-port');
 
 const logger = require('@abtnode/logger')('@abtnode/core:router:util');
 
@@ -104,6 +105,23 @@ const getGatewayPorts = (info) => {
   };
 };
 
+/**
+ * Get available gateway ports, if the preferred ports are not available, it will return a random port
+ * This is used to avoid port conflict when validating router config
+ * Preferred ports are 8080-8085, because these ports are not used by other services
+ * @returns {Promise<{httpPort: number, httpsPort: number}>}
+ */
+const getAvailableGatewayPorts = async () => {
+  const preferredPorts = [8080, 8081, 8082, 8083, 8084, 8085];
+  const httpPort = await getPort({ port: preferredPorts });
+  const httpsPort = await getPort({ port: preferredPorts });
+
+  return {
+    httpPort,
+    httpsPort,
+  };
+};
+
 const createProviderInstance = ({ nodeInfo, routerDataDir }) => {
   const providerName = nodeInfo.routing.provider;
   const Provider = getProvider(providerName);
@@ -149,6 +167,7 @@ module.exports = {
   getBlockletDomainGroupName,
   getDidFromDomainGroupName,
   getGatewayPorts,
+  getAvailableGatewayPorts,
   updateNFTDomainRecord,
   revokeAndDeleteNFTDomainRecord,
   createProviderInstance,

package/lib/validators/theme.js

@@ -59,15 +59,15 @@ const actionSchema = Joi.object({
 });
 
 const paletteSchema = Joi.object({
-  mode: Joi.string().valid('light', 'dark').required(),
-  primary: paletteColorSchema.required(),
-  secondary: paletteColorSchema.required(),
-  error: paletteColorSchema.required(),
-  warning: paletteColorSchema.required(),
-  info: paletteColorSchema.required(),
-  success: paletteColorSchema.required(),
-  grey: greySchema.required(),
-  text: textSchema.required(),
+  mode: Joi.string().valid('light', 'dark').optional(),
+  primary: paletteColorSchema.optional(),
+  secondary: paletteColorSchema.optional(),
+  error: paletteColorSchema.optional(),
+  warning: paletteColorSchema.optional(),
+  info: paletteColorSchema.optional(),
+  success: paletteColorSchema.optional(),
+  grey: greySchema.optional(),
+  text: textSchema.optional(),
   divider: colorString.optional(),
   background: backgroundSchema.optional(),
   common: commonSchema.optional(),
@@ -148,6 +148,7 @@ const muiThemeSchema = Joi.object({
 }).options({ allowUnknown: true, stripUnknown: true });
 
 const blockletThemeSchema = Joi.object({
+  common: muiThemeSchema.required(),
   light: muiThemeSchema.required(),
   dark: muiThemeSchema.required(),
   prefer: Joi.string().valid('light', 'dark', 'system').default('light'),

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.45-beta-20250612-231219-481217be",
+  "version": "1.16.45-beta-20250618-073451-6e48fb62",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,22 +19,22 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.45-beta-20250612-231219-481217be",
-    "@abtnode/auth": "1.16.45-beta-20250612-231219-481217be",
-    "@abtnode/certificate-manager": "1.16.45-beta-20250612-231219-481217be",
-    "@abtnode/client": "1.16.45-beta-20250612-231219-481217be",
-    "@abtnode/constant": "1.16.45-beta-20250612-231219-481217be",
-    "@abtnode/cron": "1.16.45-beta-20250612-231219-481217be",
-    "@abtnode/db-cache": "1.16.45-beta-20250612-231219-481217be",
-    "@abtnode/docker-utils": "1.16.45-beta-20250612-231219-481217be",
-    "@abtnode/logger": "1.16.45-beta-20250612-231219-481217be",
-    "@abtnode/models": "1.16.45-beta-20250612-231219-481217be",
-    "@abtnode/queue": "1.16.45-beta-20250612-231219-481217be",
-    "@abtnode/rbac": "1.16.45-beta-20250612-231219-481217be",
-    "@abtnode/router-provider": "1.16.45-beta-20250612-231219-481217be",
-    "@abtnode/static-server": "1.16.45-beta-20250612-231219-481217be",
-    "@abtnode/timemachine": "1.16.45-beta-20250612-231219-481217be",
-    "@abtnode/util": "1.16.45-beta-20250612-231219-481217be",
+    "@abtnode/analytics": "1.16.45-beta-20250618-073451-6e48fb62",
+    "@abtnode/auth": "1.16.45-beta-20250618-073451-6e48fb62",
+    "@abtnode/certificate-manager": "1.16.45-beta-20250618-073451-6e48fb62",
+    "@abtnode/client": "1.16.45-beta-20250618-073451-6e48fb62",
+    "@abtnode/constant": "1.16.45-beta-20250618-073451-6e48fb62",
+    "@abtnode/cron": "1.16.45-beta-20250618-073451-6e48fb62",
+    "@abtnode/db-cache": "1.16.45-beta-20250618-073451-6e48fb62",
+    "@abtnode/docker-utils": "1.16.45-beta-20250618-073451-6e48fb62",
+    "@abtnode/logger": "1.16.45-beta-20250618-073451-6e48fb62",
+    "@abtnode/models": "1.16.45-beta-20250618-073451-6e48fb62",
+    "@abtnode/queue": "1.16.45-beta-20250618-073451-6e48fb62",
+    "@abtnode/rbac": "1.16.45-beta-20250618-073451-6e48fb62",
+    "@abtnode/router-provider": "1.16.45-beta-20250618-073451-6e48fb62",
+    "@abtnode/static-server": "1.16.45-beta-20250618-073451-6e48fb62",
+    "@abtnode/timemachine": "1.16.45-beta-20250618-073451-6e48fb62",
+    "@abtnode/util": "1.16.45-beta-20250618-073451-6e48fb62",
     "@arcblock/did": "1.20.14",
     "@arcblock/did-auth": "1.20.14",
     "@arcblock/did-ext": "1.20.14",
@@ -45,15 +45,15 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "1.20.14",
     "@arcblock/vc": "1.20.14",
-    "@blocklet/constant": "1.16.45-beta-20250612-231219-481217be",
-    "@blocklet/did-space-js": "^1.0.60",
-    "@blocklet/env": "1.16.45-beta-20250612-231219-481217be",
+    "@blocklet/constant": "1.16.45-beta-20250618-073451-6e48fb62",
+    "@blocklet/did-space-js": "^1.0.62",
+    "@blocklet/env": "1.16.45-beta-20250618-073451-6e48fb62",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.45-beta-20250612-231219-481217be",
-    "@blocklet/resolver": "1.16.45-beta-20250612-231219-481217be",
-    "@blocklet/sdk": "1.16.45-beta-20250612-231219-481217be",
-    "@blocklet/store": "1.16.45-beta-20250612-231219-481217be",
-    "@blocklet/theme": "^2.13.66",
+    "@blocklet/meta": "1.16.45-beta-20250618-073451-6e48fb62",
+    "@blocklet/resolver": "1.16.45-beta-20250618-073451-6e48fb62",
+    "@blocklet/sdk": "1.16.45-beta-20250618-073451-6e48fb62",
+    "@blocklet/store": "1.16.45-beta-20250618-073451-6e48fb62",
+    "@blocklet/theme": "^2.13.70",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.20.14",
     "@ocap/util": "1.20.14",
@@ -116,5 +116,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "01a3fb21f16a515e2565d12797baeda5fdf585b0"
+  "gitHead": "afbde3291aeb63211f12b73b6c8cf5dc422cbf7f"
 }