@blocklet/cli 1.17.3-beta-20251126-121502-d0926972 → 1.17.3-beta-20251128-095123-a76cb6bc

package/lib/commands/server/cleanup.js

@@ -1,10 +1,12 @@
 const { checkAndKillOrphanProcesses } = require('@abtnode/util/lib/pm2/check-orphan-processes');
 const { DAEMON_SCRIPT_PATH, SERVICE_SCRIPT_PATH } = require('@abtnode/constant');
+const { forEachComponentV2Sync, isInProgress } = require('@blocklet/meta/lib/util');
+const { BlockletStatus } = require('@blocklet/constant');
 
 const { printSuccess, printError, printInfo, printWarning } = require('../../util');
 const { getNode } = require('../../node');
 
-exports.run = async ({ target }) => {
+exports.run = async ({ target, appId }) => {
   // Handle orphan-process cleanup without requiring node instance
   if (target === 'orphan-process') {
     printInfo('Checking for orphan daemon/service processes...');
@@ -65,6 +67,34 @@ exports.run = async ({ target }) => {
       process.exit(0);
     }
 
+    if (target === 'stuck-components') {
+      if (!appId) {
+        printError('Please provide `--app-id` when cleanup stuck components');
+        process.exit(1);
+      }
+      const blocklet = await node.getBlocklet({ did: appId });
+      if (!blocklet) {
+        printError(`Blocklet ${appId} not found`);
+        process.exit(1);
+      }
+
+      const componentDids = [];
+      forEachComponentV2Sync(blocklet, (x) => {
+        if (isInProgress(x.status) || isInProgress(x.greenStatus)) {
+          componentDids.push(x.meta.did);
+        }
+      });
+
+      if (componentDids.length > 0) {
+        await node.states.blocklet.setBlockletStatus(blocklet.meta.did, BlockletStatus.error, { componentDids });
+        await node.stopBlocklet({ did: blocklet.meta.did, componentDids });
+        printSuccess(`Stuck components for blocklet ${appId} cleared`);
+      } else {
+        printWarning(`No stuck components found for blocklet ${appId}`);
+      }
+      process.exit(0);
+    }
+
     printError(`Unknown cleanup target: ${target}`);
     process.exit(1);
   });

package/lib/commands/server/command.js

@@ -126,8 +126,9 @@ module.exports = (parentCommand = '') => {
     .command('cleanup')
     .option(
       '--target <target>',
-      'Which target to cleanup, available options: cache, maintenance-status, blacklist, blacklist-expired, orphan-process'
+      'Which target to cleanup, available options: cache, maintenance-status, blacklist, blacklist-expired, orphan-process, stuck-components'
     )
+    .option('--app-id <did>', 'Which blocklet to cleanup stuck components')
     .description('Do some server level cleanup work')
     .action(parseOptions(cleanup.run));
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/cli",
-  "version": "1.17.3-beta-20251126-121502-d0926972",
+  "version": "1.17.3-beta-20251128-095123-a76cb6bc",
   "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.3-beta-20251126-121502-d0926972",
-    "@abtnode/constant": "1.17.3-beta-20251126-121502-d0926972",
-    "@abtnode/core": "1.17.3-beta-20251126-121502-d0926972",
-    "@abtnode/db-cache": "1.17.3-beta-20251126-121502-d0926972",
-    "@abtnode/logger": "1.17.3-beta-20251126-121502-d0926972",
-    "@abtnode/models": "1.17.3-beta-20251126-121502-d0926972",
-    "@abtnode/router-provider": "1.17.3-beta-20251126-121502-d0926972",
-    "@abtnode/util": "1.17.3-beta-20251126-121502-d0926972",
-    "@abtnode/webapp": "1.17.3-beta-20251126-121502-d0926972",
+    "@abtnode/blocklet-services": "1.17.3-beta-20251128-095123-a76cb6bc",
+    "@abtnode/constant": "1.17.3-beta-20251128-095123-a76cb6bc",
+    "@abtnode/core": "1.17.3-beta-20251128-095123-a76cb6bc",
+    "@abtnode/db-cache": "1.17.3-beta-20251128-095123-a76cb6bc",
+    "@abtnode/logger": "1.17.3-beta-20251128-095123-a76cb6bc",
+    "@abtnode/models": "1.17.3-beta-20251128-095123-a76cb6bc",
+    "@abtnode/router-provider": "1.17.3-beta-20251128-095123-a76cb6bc",
+    "@abtnode/util": "1.17.3-beta-20251128-095123-a76cb6bc",
+    "@abtnode/webapp": "1.17.3-beta-20251128-095123-a76cb6bc",
     "@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.3-beta-20251126-121502-d0926972",
+    "@blocklet/constant": "1.17.3-beta-20251128-095123-a76cb6bc",
     "@blocklet/error": "^0.3.3",
     "@blocklet/form-collector": "^0.1.8",
-    "@blocklet/images": "1.17.3-beta-20251126-121502-d0926972",
-    "@blocklet/meta": "1.17.3-beta-20251126-121502-d0926972",
-    "@blocklet/resolver": "1.17.3-beta-20251126-121502-d0926972",
-    "@blocklet/server-js": "1.17.3-beta-20251126-121502-d0926972",
-    "@blocklet/store": "1.17.3-beta-20251126-121502-d0926972",
+    "@blocklet/images": "1.17.3-beta-20251128-095123-a76cb6bc",
+    "@blocklet/meta": "1.17.3-beta-20251128-095123-a76cb6bc",
+    "@blocklet/resolver": "1.17.3-beta-20251128-095123-a76cb6bc",
+    "@blocklet/server-js": "1.17.3-beta-20251128-095123-a76cb6bc",
+    "@blocklet/store": "1.17.3-beta-20251128-095123-a76cb6bc",
     "@blocklet/theme-builder": "^0.4.8",
     "@ocap/client": "^1.27.12",
     "@ocap/mcrypto": "^1.27.12",
@@ -153,7 +153,7 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "7039cacaad2a14a9573371e24e57cbbd6b6525c8",
+  "gitHead": "8d279ee5bfc3d025f164664bc43a16ff60860297",
   "devDependencies": {
     "@types/fs-extra": "^11.0.4"
   }