@blocklet/cli 1.17.4-beta-20251203-225234-75da41dd → 1.17.4-beta-20251204-152224-243ff54f

package/lib/commands/server/stop.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-await-in-loop */
 const chalk = require('chalk');
 const capitalize = require('lodash/capitalize');
 
@@ -34,6 +35,60 @@ const { checkRunning } = require('../../manager');
 const { wrapSpinner } = require('../../ui');
 const clearAllCache = require('../../util/clear-all-cache');
 
+/**
+ * Update all running/starting blocklets status to waiting
+ * @param {Object} node - The node instance
+ */
+const updateRunningBlockletsToWaiting = async (node) => {
+  try {
+    const blocklets = await node.getBlocklets({ includeRuntimeInfo: false });
+
+    for (const blocklet of blocklets) {
+      const { did } = blocklet.meta;
+      const componentDids = [];
+
+      const needChangeToWaiting = [
+        BlockletStatus.running,
+        BlockletStatus.waiting,
+        BlockletStatus.starting,
+        BlockletStatus.restarting,
+        BlockletStatus.downloading,
+        BlockletStatus.starting,
+      ];
+      // Check children components
+      if (blocklet.children && blocklet.children.length > 0) {
+        for (const child of blocklet.children) {
+          if (needChangeToWaiting.includes(child.status) || needChangeToWaiting.includes(child.greenStatus)) {
+            componentDids.push(child.meta.did);
+          }
+        }
+      }
+
+      // Update status to waiting if needed
+      if (componentDids.length > 0) {
+        try {
+          await node.setBlockletStatus(did, BlockletStatus.waiting, {
+            componentDids,
+            operator: 'daemon',
+          });
+          await node.setBlockletStatus(did, BlockletStatus.stopped, {
+            componentDids,
+            operator: 'daemon',
+            isGreen: true,
+          });
+        } catch (err) {
+          printError(`Failed to update blocklet status to waiting for ${did}:`, err.message);
+          // 错误被忽略，不阻止其他 blocklet 的处理
+        }
+      }
+    }
+  } catch (err) {
+    // 即使获取 blocklets 失败，也不应该阻止 stop 流程
+    // 错误被忽略，让 stop 流程继续
+    printError('Failed to update blocklet statuses to waiting:', err.message);
+  }
+};
+
 const forceStopServer = async () => {
   const stop = async () => {
     try {
@@ -48,6 +103,14 @@ const forceStopServer = async () => {
         printSuccess(`${capitalize(clearedProvider)} router is stopped successfully`);
       }
 
+      try {
+        const { node } = await getNode({ dir: process.cwd() });
+        await updateRunningBlockletsToWaiting(node);
+        printSuccess('All blocklet processes stopped successfully');
+      } catch (error) {
+        printError(`Failed to update blocklet statuses to waiting: ${error.message}`);
+      }
+
       // Kill all blocklet processes
       try {
         const list = await pm2.listAsync();
@@ -58,7 +121,6 @@ const forceStopServer = async () => {
           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}`);
       }
@@ -157,6 +219,14 @@ exports.run = async ({ force = false }) => {
           }
         }
 
+        // Update all running/starting blocklets status to waiting
+        // Re-fetch blocklets to get current state after stopping
+        try {
+          await updateRunningBlockletsToWaiting(node);
+        } catch (err) {
+          printError('Failed to update blocklet statuses to waiting:', err.message);
+        }
+
         const actions = [
           { action: 'kill', processName: PROCESS_NAME_DAEMON },
           { action: 'kill', processName: PROCESS_NAME_SERVICE },

package/lib/constant.js

@@ -1,11 +1,17 @@
 const os = require('os');
 const path = require('path');
 
+// Support custom data directory via ABT_NODE_CUSTOM_DATA_DIR environment variable
+// Default to ~/.arcblock if not specified
+const ABT_NODE_HOME = process.env.ABT_NODE_CUSTOM_DATA_DIR
+  ? path.resolve(process.env.ABT_NODE_CUSTOM_DATA_DIR)
+  : path.join(os.homedir(), '.arcblock');
+
 const ABT_NODE_MAX_CLUSTER_SIZE = Math.min(Math.max(Number(process.env.ABT_NODE_MAX_CLUSTER_SIZE) || 1, 1), 32);
 
 const CLI_MODE = 'blocklet';
 const NODE_ENV = process.env.NODE_ENV || 'production';
-const ABT_NODE_HOME = path.join(os.homedir(), '.arcblock');
+
 const PM2_HOME = path.join(ABT_NODE_HOME, 'abtnode');
 const ABT_NODE_CONFIG_FILE = path.join(ABT_NODE_HOME, 'blocklet.ini');
 const INSTALL_FILE_PATH = path.join(ABT_NODE_HOME, '.is-new-server-install');

package/lib/process/daemon.js

@@ -34,7 +34,7 @@ const { SERVER_STATUS } = require('@abtnode/constant');
 const createServer = require('@abtnode/webapp/blocklet'); // eslint-disable-line
 
 const { setupGracefulShutdown } = require('@abtnode/util/lib/pm2/setup-graceful-shutdown');
-const ensureBlockletRunning = require('@abtnode/core/lib/blocklet/manager/ensure-blocklet-running');
+const { ensureBlockletRunning } = require('@abtnode/core/lib/blocklet/manager/ensure-blocklet-running');
 
 const wallet = getNodeWallet(process.env.ABT_NODE_SK);
 const dataDir = process.env.ABT_NODE_DATA_DIR;

package/lib/util/index.js

@@ -333,8 +333,6 @@ const getDevUrl = async ({
   return url || '';
 };
 
-const getDataDir = () => path.join(os.homedir(), '.arcblock');
-
 const readInitInfoFromEc2 = () => {
   try {
     const info = fs.readFileSync(path.join(os.homedir(), '.arcblock/abtnode/user-data')).toString().trim();
@@ -639,7 +637,6 @@ const lib = {
   getUserName,
   fixFiles,
   getDevUrl,
-  getDataDir,
   getWallet: getNodeWallet,
   readInitInfoFromEc2,
   getVersionInfo,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/cli",
-  "version": "1.17.4-beta-20251203-225234-75da41dd",
+  "version": "1.17.4-beta-20251204-152224-243ff54f",
   "description": "Command line tools to manage Blocklet Server",
   "homepage": "https://www.arcblock.io/docs/blocklet-cli",
   "bin": {
@@ -33,28 +33,28 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/blocklet-services": "1.17.4-beta-20251203-225234-75da41dd",
-    "@abtnode/constant": "1.17.4-beta-20251203-225234-75da41dd",
-    "@abtnode/core": "1.17.4-beta-20251203-225234-75da41dd",
-    "@abtnode/db-cache": "1.17.4-beta-20251203-225234-75da41dd",
-    "@abtnode/logger": "1.17.4-beta-20251203-225234-75da41dd",
-    "@abtnode/models": "1.17.4-beta-20251203-225234-75da41dd",
-    "@abtnode/router-provider": "1.17.4-beta-20251203-225234-75da41dd",
-    "@abtnode/util": "1.17.4-beta-20251203-225234-75da41dd",
-    "@abtnode/webapp": "1.17.4-beta-20251203-225234-75da41dd",
+    "@abtnode/blocklet-services": "1.17.4-beta-20251204-152224-243ff54f",
+    "@abtnode/constant": "1.17.4-beta-20251204-152224-243ff54f",
+    "@abtnode/core": "1.17.4-beta-20251204-152224-243ff54f",
+    "@abtnode/db-cache": "1.17.4-beta-20251204-152224-243ff54f",
+    "@abtnode/logger": "1.17.4-beta-20251204-152224-243ff54f",
+    "@abtnode/models": "1.17.4-beta-20251204-152224-243ff54f",
+    "@abtnode/router-provider": "1.17.4-beta-20251204-152224-243ff54f",
+    "@abtnode/util": "1.17.4-beta-20251204-152224-243ff54f",
+    "@abtnode/webapp": "1.17.4-beta-20251204-152224-243ff54f",
     "@arcblock/did": "^1.27.12",
     "@arcblock/event-hub": "^1.27.12",
     "@arcblock/ipfs-only-hash": "^0.0.2",
     "@arcblock/jwt": "^1.27.12",
     "@arcblock/ws": "^1.27.12",
-    "@blocklet/constant": "1.17.4-beta-20251203-225234-75da41dd",
+    "@blocklet/constant": "1.17.4-beta-20251204-152224-243ff54f",
     "@blocklet/error": "^0.3.3",
     "@blocklet/form-collector": "^0.1.8",
-    "@blocklet/images": "1.17.4-beta-20251203-225234-75da41dd",
-    "@blocklet/meta": "1.17.4-beta-20251203-225234-75da41dd",
-    "@blocklet/resolver": "1.17.4-beta-20251203-225234-75da41dd",
-    "@blocklet/server-js": "1.17.4-beta-20251203-225234-75da41dd",
-    "@blocklet/store": "1.17.4-beta-20251203-225234-75da41dd",
+    "@blocklet/images": "1.17.4-beta-20251204-152224-243ff54f",
+    "@blocklet/meta": "1.17.4-beta-20251204-152224-243ff54f",
+    "@blocklet/resolver": "1.17.4-beta-20251204-152224-243ff54f",
+    "@blocklet/server-js": "1.17.4-beta-20251204-152224-243ff54f",
+    "@blocklet/store": "1.17.4-beta-20251204-152224-243ff54f",
     "@blocklet/theme-builder": "^0.4.8",
     "@ocap/client": "^1.27.12",
     "@ocap/mcrypto": "^1.27.12",
@@ -153,7 +153,7 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "d9c14c9b2763e632d2cc8d818dcd288ab08046e7",
+  "gitHead": "090b2f960b834168dfa12b2a559b9256a98be312",
   "devDependencies": {
     "@types/fs-extra": "^11.0.4"
   }