@blocklet/cli 1.16.44 → 1.16.45-beta-20250609-082716-b6b0592b

package/README.md

@@ -28,7 +28,7 @@ Powered By
   / ___ \| | | (__| |_) | | (_) | (__|   < 
  /_/   \_\_|  \___|____/|_|\___/ \___|_|\_\
                                            
-            Blocklet CLI v1.16.43
+            Blocklet CLI v1.16.44
 
 Usage: blocklet server [options] [command]
 

package/lib/commands/index.js

@@ -22,6 +22,7 @@ require('please-upgrade-node')(require('../../package.json'));
 
 const { Command } = require('commander');
 const last = require('lodash/last');
+const path = require('path');
 
 const { PROCESS_NAME_UPDATER, PROCESS_NAME_SERVICE, PROCESS_NAME_EVENT_HUB } = require('@abtnode/constant');
 const debug = require('debug')('@blocklet/cli:blocklet');
@@ -54,6 +55,7 @@ const cleanup = require('./blocklet/cleanup');
 const document = require('./blocklet/document');
 const component = require('./blocklet/component');
 const ServerCommand = require('./server/command');
+const { getNode } = require('../node');
 
 const program = new Command();
 
@@ -99,6 +101,10 @@ const parseOptions =
   (handler) =>
   async (...args) => {
     const allOptions = getOptions(...args);
+    const { node } = await getNode({ dir: process.cwd() });
+    if (!process.env.ABT_NODE_CACHE_SQLITE_PATH) {
+      process.env.ABT_NODE_CACHE_SQLITE_PATH = path.join(node.dataDirs.core, 'db-cache.db');
+    }
     await handler(allOptions);
   };
 
@@ -112,6 +118,10 @@ const parseArgsAndOptions =
     const options = last(args);
     const allOptions = { ...commonOptions, ...options };
     debug('parse options', allOptions);
+    const { node } = await getNode({ dir: process.cwd() });
+    if (!process.env.ABT_NODE_CACHE_SQLITE_PATH) {
+      process.env.ABT_NODE_CACHE_SQLITE_PATH = path.join(node.dataDirs.core, 'db-cache.db');
+    }
     await handler(...args.slice(0, args.length - 1), allOptions);
   };
 

package/lib/commands/server/start.js

@@ -19,7 +19,7 @@ const { runMigrationScripts, runSchemaMigrations } = require('@abtnode/core/lib/
 const { clearRouterByConfigKeyword } = require('@abtnode/router-provider');
 const yaml = require('js-yaml');
 const semver = require('semver');
-const { BlockletEvents } = require('@blocklet/constant');
+const { BlockletEvents, ABT_NODE_KERNEL_OR_BLOCKLET_MODE } = require('@blocklet/constant');
 const {
   PROCESS_NAME_PROXY,
   PROCESS_NAME_DAEMON,
@@ -39,6 +39,7 @@ const {
 } = require('@abtnode/constant');
 
 const { canUseFileSystemIsolateApi, SAFE_NODE_VERSION } = require('@abtnode/util/lib/security');
+const { ensureDockerRedis } = require('@abtnode/core/lib/util/docker/ensure-docker-redis');
 
 const { version } = require('../../../package.json');
 const debug = require('../../debug')('start');
@@ -247,6 +248,7 @@ const startService = async (logDir, maxMemoryRestart, environments) => {
         wait_ready: true,
         max_restarts: 3,
         listen_timeout: 3000,
+        pmx: false,
         time: true,
         env: {
           ...environments,
@@ -255,6 +257,7 @@ const startService = async (logDir, maxMemoryRestart, environments) => {
         execMode: 'cluster',
         mergeLogs: true,
         instances: getServiceInstanceNumber(),
+        interpreter_args: environments.ABT_NODE_KERNEL_MODE  === ABT_NODE_KERNEL_OR_BLOCKLET_MODE.PERFORMANT ? [] : ['--optimize_for_size'],
       });
 
       await ensureEndpointHealthy({
@@ -394,6 +397,16 @@ const prepareInitialData = async (node, config, dataDir) => {
 };
 
 const exec = async ({ workingDir, config, dataDir, mode, updateDb, forceIntranet }) => {
+  if (!process.env.ABT_NODE_CACHE_SQLITE_PATH) {
+    process.env.ABT_NODE_CACHE_SQLITE_PATH = path.join(dataDir, 'core', 'db-cache.db');
+  }
+
+  const redisUrl = await ensureDockerRedis();
+  if (redisUrl) {
+    process.env.ABT_NODE_CACHE_REDIS_URL = redisUrl;
+    printSuccess(`Using Redis Cache: ${process.env.ABT_NODE_CACHE_REDIS_URL}`);
+  }
+
   const configFile = await getConfigFile(workingDir);
 
   const proxyMaxMemoryLimit = get(config, 'node.runtimeConfig.proxyMaxMemoryLimit', PROXY_MAX_MEM_LIMIT_IN_MB);
@@ -556,6 +569,9 @@ const exec = async ({ workingDir, config, dataDir, mode, updateDb, forceIntranet
           ABT_NODE_PORT: config.node.port,
           ABT_NODE_SESSION_SECRET: config.node.secret,
           ABT_NODE_DATA_DIR: dataDir,
+          ABT_NODE_CACHE_REDIS_URL: process.env.ABT_NODE_CACHE_REDIS_URL,
+          ABT_NODE_KERNEL_MODE: process.env.ABT_NODE_KERNEL_MODE,
+          ABT_NODE_BLOCKLET_MODE: process.env.ABT_NODE_BLOCKLET_MODE,
           ABT_NODE_CONFIG_FILE: configFile,
           ABT_NODE_BLOCKLET_PORT: config.blocklet.port,
           ABT_NODE_UPDATER_PORT: getPort(PROCESS_NAME_UPDATER),
@@ -610,8 +626,12 @@ const exec = async ({ workingDir, config, dataDir, mode, updateDb, forceIntranet
             listen_timeout: 3000,
             env: environments,
             time: true,
+            pmx: false,
+            interpreter_args:
+              environments.ABT_NODE_KERNEL_MODE === ABT_NODE_KERNEL_OR_BLOCKLET_MODE.PERFORMANT
+                ? []
+                : ['--optimize_for_size'],
           });
-
           // check daemon
           await ensureEndpointHealthy({
             protocol: 'tcp',

package/lib/commands/server/stop.js

@@ -31,10 +31,12 @@ const {
 const { getNode } = require('../../node');
 const { checkRunning } = require('../../manager');
 const { wrapSpinner } = require('../../ui');
+const clearAllCache = require('../../util/clear-all-cache');
 
 const forceStopServer = async () => {
   const stop = async () => {
     try {
+      await clearAllCache(printSuccess, printError);
       const results = await Promise.all([
         clearRouterByConfigKeyword(CONFIG_FOLDER_NAME),
         clearRouterByConfigKeyword(CONFIG_FOLDER_NAME_OLD),
@@ -56,9 +58,9 @@ const forceStopServer = async () => {
       printError(`Blocklet Server related processes stop failed: ${error.message}`);
     }
   };
-  const timeout = 10; // 10 seconds
+  const timeout = 20; // 20 seconds
   try {
-    await tryWithTimeout(stop, timeout * 1000);
+    await tryWithTimeout(stop, timeout * 2000);
   } catch (err) {
     printError(`Blocklet server failed to stop within ${timeout} seconds`);
     printInfo(`You can stop blocklet server with ${chalk.cyan(`${getCLICommandName()} stop --force`)} again.`);

package/lib/process/daemon.js

@@ -1,11 +1,17 @@
 /* eslint-disable no-console */
 /* eslint-disable no-await-in-loop */
+
 if (!process.env.NODE_ENV) {
   process.env.NODE_ENV = 'production';
 }
 
 const fs = require('fs');
 const path = require('path');
+
+if (!process.env.ABT_NODE_CACHE_SQLITE_PATH) {
+  process.env.ABT_NODE_CACHE_SQLITE_PATH = path.join(process.env.ABT_NODE_DATA_DIR, 'core', 'db-cache.db');
+}
+
 const { joinURL } = require('ufo');
 
 process.env.ABT_NODE_LOG_NAME = 'daemon';
@@ -14,10 +20,15 @@ process.env.ABT_NODE_LOG_DIR = path.join(process.env.ABT_NODE_DATA_DIR, 'logs',
 const runningBefore = !!process.env.BLOCKLET_SERVER_RUNNING_BEFORE;
 
 const logger = require('@abtnode/logger')('daemon');
+
 const ABTNode = require('@abtnode/core');
+
 const getNodeWallet = require('@abtnode/util/lib/get-app-wallet');
+
 const { getDisplayName } = require('@blocklet/meta/lib/util');
+
 const { SERVER_STATUS } = require('@abtnode/constant');
+
 const createServer = require('@abtnode/webapp/blocklet'); // eslint-disable-line
 
 const restartRunningComponent = require('../util/restart-running-component');

package/lib/process/service.js

@@ -1,9 +1,14 @@
+const fs = require('fs');
+const path = require('path');
+
 if (!process.env.NODE_ENV) {
   process.env.NODE_ENV = 'production';
 }
 
-const fs = require('fs');
-const path = require('path');
+if (!process.env.ABT_NODE_CACHE_SQLITE_PATH) {
+  process.env.ABT_NODE_CACHE_SQLITE_PATH = path.join(process.env.ABT_NODE_DATA_DIR, 'core', 'db-cache.db');
+}
+
 const { joinURL } = require('ufo');
 const { BlockletStatus, BlockletInternalEvents } = require('@blocklet/constant');
 const { filterComponentsV2 } = require('@blocklet/meta/lib/util');

package/lib/util/clear-all-cache.js

@@ -0,0 +1,39 @@
+const fs = require('fs');
+const path = require('path');
+
+const { DBCache, getAbtNodeRedisAndSQLiteUrl } = require('@abtnode/db-cache');
+const { stopDockerRedis } = require('@abtnode/core/lib/util/docker/ensure-docker-redis');
+const { CONFIG_FOLDER_NAME, CONFIG_FOLDER_NAME_OLD } = require('@abtnode/constant');
+
+const clearAllCache = async (printSuccess, printError) => {
+  // 停止 docker 中的 redis 容器
+  await stopDockerRedis();
+  try {
+    let nowConfigFolder = '';
+    if (fs.existsSync(CONFIG_FOLDER_NAME)) {
+      nowConfigFolder = CONFIG_FOLDER_NAME;
+    } else if (fs.existsSync(CONFIG_FOLDER_NAME_OLD)) {
+      nowConfigFolder = CONFIG_FOLDER_NAME_OLD;
+    }
+    if (nowConfigFolder) {
+      if (!process.env.ABT_NODE_CACHE_SQLITE_PATH) {
+        process.env.ABT_NODE_CACHE_SQLITE_PATH = path.join(nowConfigFolder, 'core', 'db-cache.db');
+      }
+
+      const cache = new DBCache(() => ({
+        ...getAbtNodeRedisAndSQLiteUrl(),
+        prefix: 'all',
+        ttl: 1000 * 60,
+        forceType: 'sqlite',
+      }));
+
+      // 清理 sqlite adapter 的缓存
+      await cache.flushAll();
+    }
+  } catch (error) {
+    printError(`Clear all db cache failed: ${error.message}`);
+  }
+  printSuccess('Clear all db cache success');
+};
+
+module.exports = clearAllCache;

package/lib/util/index.js

@@ -239,6 +239,7 @@ const startEventHub = async (logDir, maxMemoryRestart = PROXY_MAX_MEM_LIMIT_IN_M
           max_restarts: 3,
           listen_timeout: 3000,
           time: true,
+          pmx: false,
           env: {
             ABT_NODE_EVENT_PORT: port,
           },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/cli",
-  "version": "1.16.44",
+  "version": "1.16.45-beta-20250609-082716-b6b0592b",
   "description": "Command line tools to manage Blocklet Server",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
   "bin": {
@@ -35,31 +35,32 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/blocklet-services": "1.16.44",
-    "@abtnode/client": "1.16.44",
-    "@abtnode/constant": "1.16.44",
-    "@abtnode/core": "1.16.44",
-    "@abtnode/logger": "1.16.44",
-    "@abtnode/router-provider": "1.16.44",
-    "@abtnode/util": "1.16.44",
-    "@abtnode/webapp": "1.16.44",
-    "@arcblock/did": "1.20.13",
-    "@arcblock/event-hub": "1.20.13",
+    "@abtnode/blocklet-services": "1.16.45-beta-20250609-082716-b6b0592b",
+    "@abtnode/client": "1.16.45-beta-20250609-082716-b6b0592b",
+    "@abtnode/constant": "1.16.45-beta-20250609-082716-b6b0592b",
+    "@abtnode/core": "1.16.45-beta-20250609-082716-b6b0592b",
+    "@abtnode/db-cache": "1.16.45-beta-20250609-082716-b6b0592b",
+    "@abtnode/logger": "1.16.45-beta-20250609-082716-b6b0592b",
+    "@abtnode/router-provider": "1.16.45-beta-20250609-082716-b6b0592b",
+    "@abtnode/util": "1.16.45-beta-20250609-082716-b6b0592b",
+    "@abtnode/webapp": "1.16.45-beta-20250609-082716-b6b0592b",
+    "@arcblock/did": "1.20.14",
+    "@arcblock/event-hub": "1.20.14",
     "@arcblock/ipfs-only-hash": "^0.0.2",
-    "@arcblock/jwt": "1.20.13",
-    "@arcblock/ws": "1.20.13",
-    "@blocklet/constant": "1.16.44",
+    "@arcblock/jwt": "1.20.14",
+    "@arcblock/ws": "1.20.14",
+    "@blocklet/constant": "1.16.45-beta-20250609-082716-b6b0592b",
     "@blocklet/error": "^0.2.5",
     "@blocklet/form-collector": "^0.1.8",
-    "@blocklet/images": "1.16.44",
-    "@blocklet/meta": "1.16.44",
-    "@blocklet/resolver": "1.16.44",
-    "@blocklet/store": "1.16.44",
+    "@blocklet/images": "1.16.45-beta-20250609-082716-b6b0592b",
+    "@blocklet/meta": "1.16.45-beta-20250609-082716-b6b0592b",
+    "@blocklet/resolver": "1.16.45-beta-20250609-082716-b6b0592b",
+    "@blocklet/store": "1.16.45-beta-20250609-082716-b6b0592b",
     "@blocklet/theme-builder": "^0.1.19",
-    "@ocap/client": "1.20.13",
-    "@ocap/mcrypto": "1.20.13",
-    "@ocap/util": "1.20.13",
-    "@ocap/wallet": "1.20.13",
+    "@ocap/client": "1.20.14",
+    "@ocap/mcrypto": "1.20.14",
+    "@ocap/util": "1.20.14",
+    "@ocap/wallet": "1.20.14",
     "@vercel/ncc": "^0.38.3",
     "archiver": "^7.0.1",
     "async": "^3.2.4",
@@ -153,7 +154,7 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "a177f040e3e8da94311cec1395c8e8defae2da9e",
+  "gitHead": "adeceb28a9b5c91d2eb35d33880782048ae629cc",
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^29.5.13"