@blocklet/cli 1.16.45-beta-20250609-082716-b6b0592b → 1.16.45-beta-20250610-112229-2eb0face

package/lib/commands/index.js

@@ -22,7 +22,6 @@ 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');
@@ -55,7 +54,6 @@ 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();
 
@@ -101,10 +99,6 @@ 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);
   };
 
@@ -118,10 +112,6 @@ 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/stop.js

@@ -5,6 +5,7 @@ const { clearRouterByConfigKeyword, clearDockerContainer, checkDockerInstalled }
 const tryWithTimeout = require('@abtnode/util/lib/try-with-timeout');
 const sleep = require('@abtnode/util/lib/sleep');
 const pm2 = require('@abtnode/util/lib/async-pm2');
+const pAll = require('p-all');
 
 const {
   PROCESS_NAME_DAEMON,
@@ -47,8 +48,24 @@ const forceStopServer = async () => {
         printSuccess(`${capitalize(clearedProvider)} router is stopped successfully`);
       }
 
+      // Kill all blocklet processes
+      try {
+        const list = await pm2.listAsync();
+        const blockletProcesses = list.filter(
+          (process) => !!process.pm2_env['abt-node-daemon'] || !!process.pm2_env.blocklet
+        );
+        await pAll(
+          blockletProcesses.map((process) => () => pm2.deleteAsync(process.name)),
+          { concurrency: 6 }
+        );
+        printSuccess('All blocklet processes stopped successfully');
+      } catch (error) {
+        printError(`Failed to stop blocklet processes: ${error.message}`);
+      }
+
+      // Kill PM2 daemon last
       await pm2.killDaemonAsync();
-      printSuccess('Blocklet Server related processes stopped successfully');
+
       const isDockerInstalled = await checkDockerInstalled();
       if (isDockerInstalled) {
         await clearDockerContainer();
@@ -164,6 +181,12 @@ exports.run = async ({ force = false }) => {
           }
         }
 
+        const isDockerInstalled = await checkDockerInstalled();
+        if (isDockerInstalled) {
+          await clearDockerContainer();
+          printSuccess('Docker containers managed by blocklet server are stopped');
+        }
+
         printSuccess('Done!');
         resolve(true);
         process.exit(0);

package/lib/node.js

@@ -1,6 +1,7 @@
 const fs = require('fs');
 const chalk = require('chalk');
 const yaml = require('js-yaml');
+const path = require('path');
 const ABTNode = require('@abtnode/core');
 const security = require('@abtnode/util/lib/security');
 const { WsClient } = require('@arcblock/ws');
@@ -95,6 +96,9 @@ const readNodeConfigWithValidate = async (dir) => {
 
 async function getNode({ dir = process.cwd() } = {}) {
   const { config, configFile, dataDir } = await readNodeConfigWithValidate(dir);
+  if (!process.env.ABT_NODE_CACHE_SQLITE_PATH) {
+    process.env.ABT_NODE_CACHE_SQLITE_PATH = path.join(dataDir, 'core', 'db-cache.db');
+  }
 
   util.ensurePermission(dataDir);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/cli",
-  "version": "1.16.45-beta-20250609-082716-b6b0592b",
+  "version": "1.16.45-beta-20250610-112229-2eb0face",
   "description": "Command line tools to manage Blocklet Server",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
   "bin": {
@@ -35,27 +35,27 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@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",
+    "@abtnode/blocklet-services": "1.16.45-beta-20250610-112229-2eb0face",
+    "@abtnode/client": "1.16.45-beta-20250610-112229-2eb0face",
+    "@abtnode/constant": "1.16.45-beta-20250610-112229-2eb0face",
+    "@abtnode/core": "1.16.45-beta-20250610-112229-2eb0face",
+    "@abtnode/db-cache": "1.16.45-beta-20250610-112229-2eb0face",
+    "@abtnode/logger": "1.16.45-beta-20250610-112229-2eb0face",
+    "@abtnode/router-provider": "1.16.45-beta-20250610-112229-2eb0face",
+    "@abtnode/util": "1.16.45-beta-20250610-112229-2eb0face",
+    "@abtnode/webapp": "1.16.45-beta-20250610-112229-2eb0face",
     "@arcblock/did": "1.20.14",
     "@arcblock/event-hub": "1.20.14",
     "@arcblock/ipfs-only-hash": "^0.0.2",
     "@arcblock/jwt": "1.20.14",
     "@arcblock/ws": "1.20.14",
-    "@blocklet/constant": "1.16.45-beta-20250609-082716-b6b0592b",
+    "@blocklet/constant": "1.16.45-beta-20250610-112229-2eb0face",
     "@blocklet/error": "^0.2.5",
     "@blocklet/form-collector": "^0.1.8",
-    "@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/images": "1.16.45-beta-20250610-112229-2eb0face",
+    "@blocklet/meta": "1.16.45-beta-20250610-112229-2eb0face",
+    "@blocklet/resolver": "1.16.45-beta-20250610-112229-2eb0face",
+    "@blocklet/store": "1.16.45-beta-20250610-112229-2eb0face",
     "@blocklet/theme-builder": "^0.1.19",
     "@ocap/client": "1.20.14",
     "@ocap/mcrypto": "1.20.14",
@@ -154,7 +154,7 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "adeceb28a9b5c91d2eb35d33880782048ae629cc",
+  "gitHead": "d35fb6c907c29f4466fa965c079e1662dc77e582",
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^29.5.13"