@blocklet/cli 1.16.53 → 1.16.54-beta-20251017-133309-7d40faa6

package/README.md

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

package/lib/commands/server/cleanup.js

@@ -1,7 +1,32 @@
-const { printSuccess, printError } = require('../../util');
+const { checkAndKillOrphanProcesses } = require('@abtnode/util/lib/pm2/check-orphan-processes');
+const { DAEMON_SCRIPT_PATH, SERVICE_SCRIPT_PATH } = require('@abtnode/constant');
+
+const { printSuccess, printError, printInfo, printWarning } = require('../../util');
 const { getNode } = require('../../node');
 
 exports.run = async ({ target }) => {
+  // Handle orphan-process cleanup without requiring node instance
+  if (target === 'orphan-process') {
+    printInfo('Checking for orphan daemon/service processes...');
+
+    const logger = {
+      info: (msg) => printInfo(msg),
+      warn: (msg) => printWarning(msg),
+      error: (msg) => printError(msg),
+    };
+
+    try {
+      await checkAndKillOrphanProcesses({ scriptName: DAEMON_SCRIPT_PATH, logger, force: true });
+      await checkAndKillOrphanProcesses({ scriptName: SERVICE_SCRIPT_PATH, logger, force: true });
+      printSuccess('Orphan process cleanup completed');
+    } catch (err) {
+      printError(`Failed to cleanup orphan processes: ${err.message}`);
+      process.exit(1);
+    }
+
+    process.exit(0);
+  }
+
   const { node } = await getNode({ dir: process.cwd() });
 
   node.onReady(async () => {

package/lib/commands/server/command.js

@@ -117,7 +117,7 @@ module.exports = (parentCommand = '') => {
     .command('cleanup')
     .option(
       '--target <target>',
-      'Which target to cleanup, available options: cache, maintenance-status, blacklist, blacklist-expired'
+      'Which target to cleanup, available options: cache, maintenance-status, blacklist, blacklist-expired, orphan-process'
     )
     .description('Do some server level cleanup work')
     .action(parseOptions(cleanup.run));

package/lib/commands/server/start.js

@@ -35,6 +35,8 @@ const {
   NODE_MODES,
   MAX_NGINX_WORKER_CONNECTIONS,
   SERVER_STATUS,
+  ORPHAN_CHECK_DELAY,
+  PROCESS_NAME_ORPHAN_CLEANUP,
 } = require('@abtnode/constant');
 
 const { canUseFileSystemIsolateApi, SAFE_NODE_VERSION } = require('@abtnode/util/lib/security');
@@ -694,6 +696,41 @@ const exec = async ({ workingDir, config, dataDir, mode, updateDb, forceIntranet
 
         printAccessUrls(accessUrls);
 
+        // Schedule orphan process cleanup via PM2 (non-blocking)
+        try {
+          await pm2.connectAsync();
+
+          // Remove any existing cleanup process first
+          try {
+            await pm2.deleteAsync(PROCESS_NAME_ORPHAN_CLEANUP);
+            debug('Removed existing orphan cleanup process');
+          } catch (err) {
+            // Ignore if not exists
+          }
+
+          await pm2.startAsync({
+            name: PROCESS_NAME_ORPHAN_CLEANUP,
+            script: './lib/process/orphan-cleanup-worker.js',
+            cwd: getCliCwd(),
+            autorestart: false, // Don't restart after exit
+            max_restarts: 0, // Never restart
+            instances: 1,
+            env: {
+              ...process.env,
+              ORPHAN_CHECK_DELAY: ORPHAN_CHECK_DELAY.toString(),
+              ABT_NODE_LOG_DIR: logDir,
+            },
+          });
+
+          pm2.disconnect();
+          printInfo('Orphan cleanup worker started');
+        } catch (err) {
+          // Cleanup failure should not block server start
+          pm2.disconnect();
+          debug('Failed to start orphan cleanup worker:', err);
+          printWarning('Failed to start orphan cleanup worker');
+        }
+
         return resolve(0);
       } catch (err) {
         debug('start error', err);

package/lib/process/daemon.js

@@ -125,5 +125,8 @@ node.onReady(async () => {
     } catch {
       // Do nothing
     }
+    if (process.env.NODE_ENV !== 'test') {
+      node.migrateAuditLog(dataDir);
+    }
   });
 });

package/lib/process/orphan-cleanup-worker.js

@@ -0,0 +1,71 @@
+#!/usr/bin/env node
+/* eslint-disable no-console */
+
+/**
+ * Orphan process cleanup worker (PM2 managed)
+ *
+ * This script runs as a PM2 process after server starts to clean up orphan daemon/service processes.
+ * It will automatically remove itself from PM2 after completion.
+ */
+
+const { checkAndKillOrphanProcesses } = require('@abtnode/util/lib/pm2/check-orphan-processes');
+const pm2 = require('@abtnode/util/lib/pm2/async-pm2');
+const Logger = require('@abtnode/logger');
+const {
+  PROCESS_NAME_ORPHAN_CLEANUP,
+  DAEMON_SCRIPT_PATH,
+  SERVICE_SCRIPT_PATH,
+  ORPHAN_CHECK_DELAY: DEFAULT_ORPHAN_CHECK_DELAY,
+} = require('@abtnode/constant');
+
+const logger = Logger('orphan-cleanup-worker', { filename: 'orphan-cleanup-worker' });
+
+const ORPHAN_CHECK_DELAY = parseInt(process.env.ORPHAN_CHECK_DELAY || DEFAULT_ORPHAN_CHECK_DELAY, 10);
+
+logger.info(`Orphan cleanup worker started, will check after ${ORPHAN_CHECK_DELAY}ms`);
+
+setTimeout(async () => {
+  try {
+    // Cleanup daemon.js orphans
+    await checkAndKillOrphanProcesses({
+      scriptName: DAEMON_SCRIPT_PATH,
+      logger,
+      force: true, // Force mode to work from any PM2 context
+    });
+
+    // Cleanup service.js orphans
+    await checkAndKillOrphanProcesses({
+      scriptName: SERVICE_SCRIPT_PATH,
+      logger,
+      force: true,
+    });
+
+    logger.info('Orphan cleanup completed successfully');
+  } catch (error) {
+    logger.error(`Orphan cleanup failed: ${error.message}`);
+  } finally {
+    // Remove self from PM2 after cleanup to avoid record clutter
+    try {
+      await pm2.connectAsync();
+      logger.info('Removing cleanup process from PM2...');
+      await pm2.deleteAsync(PROCESS_NAME_ORPHAN_CLEANUP);
+      logger.info('Cleanup process removed from PM2 successfully');
+    } catch (err) {
+      logger.warn(`Failed to remove cleanup process from PM2: ${err.message}`);
+    } finally {
+      pm2.disconnect();
+      process.exit(0);
+    }
+  }
+}, ORPHAN_CHECK_DELAY);
+
+// Handle termination signals gracefully
+process.on('SIGINT', () => {
+  logger.info('Orphan cleanup worker received SIGINT, exiting');
+  process.exit(0);
+});
+
+process.on('SIGTERM', () => {
+  logger.info('Orphan cleanup worker received SIGTERM, exiting');
+  process.exit(0);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/cli",
-  "version": "1.16.53",
+  "version": "1.16.54-beta-20251017-133309-7d40faa6",
   "description": "Command line tools to manage Blocklet Server",
   "homepage": "https://www.arcblock.io/docs/blocklet-cli",
   "bin": {
@@ -35,28 +35,28 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/blocklet-services": "1.16.53",
-    "@abtnode/constant": "1.16.53",
-    "@abtnode/core": "1.16.53",
-    "@abtnode/db-cache": "1.16.53",
-    "@abtnode/logger": "1.16.53",
-    "@abtnode/models": "1.16.53",
-    "@abtnode/router-provider": "1.16.53",
-    "@abtnode/util": "1.16.53",
-    "@abtnode/webapp": "1.16.53",
+    "@abtnode/blocklet-services": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@abtnode/constant": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@abtnode/core": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@abtnode/db-cache": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@abtnode/logger": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@abtnode/models": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@abtnode/router-provider": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@abtnode/util": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@abtnode/webapp": "1.16.54-beta-20251017-133309-7d40faa6",
     "@arcblock/did": "1.25.6",
     "@arcblock/event-hub": "1.25.6",
     "@arcblock/ipfs-only-hash": "^0.0.2",
     "@arcblock/jwt": "1.25.6",
     "@arcblock/ws": "1.25.6",
-    "@blocklet/constant": "1.16.53",
+    "@blocklet/constant": "1.16.54-beta-20251017-133309-7d40faa6",
     "@blocklet/error": "^0.2.5",
     "@blocklet/form-collector": "^0.1.8",
-    "@blocklet/images": "1.16.53",
-    "@blocklet/meta": "1.16.53",
-    "@blocklet/resolver": "1.16.53",
-    "@blocklet/server-js": "1.16.53",
-    "@blocklet/store": "1.16.53",
+    "@blocklet/images": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@blocklet/meta": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@blocklet/resolver": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@blocklet/server-js": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@blocklet/store": "1.16.54-beta-20251017-133309-7d40faa6",
     "@blocklet/theme-builder": "^0.4.7",
     "@ocap/client": "1.25.6",
     "@ocap/mcrypto": "1.25.6",
@@ -154,7 +154,7 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "7c37a9bd063192fb0a14921b9d0317de953016ff",
+  "gitHead": "78c11632ed47a75502a20c257568fc9e1655ca05",
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^29.5.13"