@blocklet/cli 1.16.49-beta-20250815-032308-7bcf0b85 → 1.16.49-beta-20250819-084933-3bcbd851

package/lib/commands/blocklet/deploy.js

@@ -451,7 +451,7 @@ const verifyEndpoint = async (opts) => {
   opts.connectEndpoint = opts.endpoint;
   opts.endpoint = endpoint;
 
-  if (appPid) {
+  if (appPid && !opts.appDid) {
     opts.appDid = appPid;
   }
 

package/lib/commands/server/start.js

@@ -12,7 +12,7 @@ const get = require('lodash/get');
 const isEqual = require('lodash/isEqual');
 const isObject = require('lodash/isObject');
 const readLastLines = require('read-last-lines');
-const pm2 = require('@abtnode/util/lib/async-pm2');
+const pm2 = require('@abtnode/util/lib/pm2/async-pm2');
 const { isInServerlessMode } = require('@abtnode/util/lib/serverless');
 const ensureEndpointHealthy = require('@abtnode/util/lib/ensure-endpoint-healthy');
 const { runMigrationScripts, runSchemaMigrations } = require('@abtnode/core/lib/migrations');
@@ -41,11 +41,12 @@ const {
 const { canUseFileSystemIsolateApi, SAFE_NODE_VERSION } = require('@abtnode/util/lib/security');
 const { ensureDockerRedis } = require('@abtnode/core/lib/util/docker/ensure-docker-redis');
 const { ensureDockerPostgres } = require('@abtnode/core/lib/util/docker/ensure-docker-postgres');
+const { getDaemonInstanceCount, getServiceInstanceCount } = require('@abtnode/util/lib/pm2/get-instance-number');
+const { pm2StartOrReload } = require('@abtnode/util/lib/pm2/pm2-start-or-reload');
 
 const { version } = require('../../../package.json');
 const debug = require('../../debug')('start');
 const util = require('../../util');
-const getServiceInstanceNumber = require('../../util/get-service-instance-number');
 const {
   getConfigFileFromAncestors,
   getRunningConfigFile,
@@ -246,7 +247,7 @@ const startService = async (logDir, maxMemoryRestart, environments) => {
 
   try {
     await wrapSpinner('Starting blocklet service...', async () => {
-      await pm2.startAsync({
+      await pm2StartOrReload({
         namespace: 'daemon',
         name: PROCESS_NAME_SERVICE,
         script: './lib/process/service.js',
@@ -254,18 +255,20 @@ const startService = async (logDir, maxMemoryRestart, environments) => {
         output: path.join(logDir, 'service.stdout.log'),
         error: path.join(logDir, 'service.stderr.log'),
         cwd: getCliCwd(),
-        wait_ready: true,
         max_restarts: 3,
-        listen_timeout: 3000,
-        pmx: false,
+        wait_ready: true,
+        listen_timeout: 40_000,
+        kill_timeout: 10_000,
+        execMode: 'cluster',
+        shutdown_with_message: true,
+        instances: getServiceInstanceCount(),
         time: true,
+        pmx: false,
         env: {
           ...environments,
           ABT_NODE_SERVICE_PORT: servicePort,
         },
-        execMode: 'cluster',
         mergeLogs: true,
-        instances: getServiceInstanceNumber(),
         interpreter_args: environments.ABT_NODE_KERNEL_MODE  === ABT_NODE_KERNEL_OR_BLOCKLET_MODE.PERFORMANT ? [] : ['--optimize_for_size'],
       });
 
@@ -410,6 +413,10 @@ const exec = async ({ workingDir, config, dataDir, mode, updateDb, forceIntranet
     process.env.ABT_NODE_CACHE_SQLITE_PATH = path.join(dataDir, 'core', 'db-cache.db');
   }
 
+  if (!process.env.ABT_NODE_DATA_DIR) {
+    process.env.ABT_NODE_DATA_DIR = dataDir;
+  }
+
   const redisUrl = await ensureDockerRedis();
   if (redisUrl) {
     process.env.ABT_NODE_CACHE_REDIS_URL = redisUrl;
@@ -437,7 +444,7 @@ const exec = async ({ workingDir, config, dataDir, mode, updateDb, forceIntranet
   const { node, getBaseUrls, publishEvent, wallet } = await nodeLib.getNode({ dir: workingDir });
 
   // start event-hub
-  const eventHubPort = await startEventHub(logDir, proxyMaxMemoryLimit);
+  const [eventHubPort, pm2EventHubPort] = await startEventHub(logDir, proxyMaxMemoryLimit, config.node.sk);
 
   return new Promise((resolve) => {
     node.onReady(async () => {
@@ -600,6 +607,7 @@ const exec = async ({ workingDir, config, dataDir, mode, updateDb, forceIntranet
           ABT_NODE_JOB_NAME: process.env.ABT_NODE_JOB_NAME || '', // used to trigger log analyzing
           ABT_NODE_BINARY_NAME,
           ABT_NODE_COMMAND_NAME,
+          ABT_NODE_EVENT_HTTP_PORT: pm2EventHubPort,
           BLOCKLET_SERVER_RUNNING_BEFORE: isRunning ? '1' : '',
           ABT_NODE_ENSURE_RUNNING_CHECK_INTERVAL: process.env.ABT_NODE_ENSURE_RUNNING_CHECK_INTERVAL,
           ABT_NODE_ENSURE_RUNNING_DEFERRED_TIME: process.env.ABT_NODE_ENSURE_RUNNING_DEFERRED_TIME,
@@ -628,7 +636,7 @@ const exec = async ({ workingDir, config, dataDir, mode, updateDb, forceIntranet
         // check localhost listening
         await wrapSpinner('Starting server daemon...', async () => {
           // start daemon
-          await pm2.startAsync({
+          await pm2StartOrReload({
             namespace: 'daemon',
             name: PROCESS_NAME_DAEMON,
             script: './lib/process/daemon.js',
@@ -638,10 +646,15 @@ const exec = async ({ workingDir, config, dataDir, mode, updateDb, forceIntranet
             cwd: getCliCwd(),
             max_restarts: 3,
             wait_ready: true,
-            listen_timeout: 3000,
-            env: environments,
+            min_uptime: 15_000,
+            listen_timeout: 40_000,
+            kill_timeout: 10_000,
+            execMode: 'cluster',
+            shutdown_with_message: true,
+            instances: getDaemonInstanceCount(),
             time: true,
             pmx: false,
+            env: environments,
             interpreter_args:
               environments.ABT_NODE_KERNEL_MODE === ABT_NODE_KERNEL_OR_BLOCKLET_MODE.PERFORMANT
                 ? []

package/lib/commands/server/stop.js

@@ -4,7 +4,7 @@ const capitalize = require('lodash/capitalize');
 const { clearRouterByConfigKeyword, clearDockerContainer, checkDockerInstalled } = require('@abtnode/router-provider');
 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 pm2 = require('@abtnode/util/lib/pm2/async-pm2');
 const pAll = require('p-all');
 
 const {

package/lib/manager/process.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const pm2 = require('@abtnode/util/lib/async-pm2');
+const pm2 = require('@abtnode/util/lib/pm2/async-pm2');
 
 const { PROCESS_NAME_DAEMON } = require('@abtnode/constant');
 

package/lib/port.js

@@ -3,6 +3,7 @@ const {
   PROCESS_NAME_UPDATER,
   PROCESS_NAME_SERVICE,
   PROCESS_NAME_EVENT_HUB,
+  PROCESS_NAME_PM2_EVENT_HUB,
 } = require('@abtnode/constant');
 
 const ports = {
@@ -10,6 +11,7 @@ const ports = {
   [PROCESS_NAME_UPDATER]: 40405,
   [PROCESS_NAME_SERVICE]: 40406,
   [PROCESS_NAME_EVENT_HUB]: 40407,
+  [PROCESS_NAME_PM2_EVENT_HUB]: 40411,
 };
 
 const getInternalPort = (processName) => {

package/lib/process/daemon.js

@@ -1,6 +1,10 @@
 /* eslint-disable no-console */
 /* eslint-disable no-await-in-loop */
 
+const { loadReloadEnv } = require('@abtnode/util/lib/pm2/pm2-start-or-reload');
+
+loadReloadEnv();
+
 if (!process.env.NODE_ENV) {
   process.env.NODE_ENV = 'production';
 }
@@ -25,12 +29,13 @@ 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 { setupGracefulShutdown } = require('@abtnode/util/lib/pm2/setup-graceful-shutdown');
+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;
 
@@ -47,18 +52,6 @@ const node = ABTNode({
 node.collectorPath = path.dirname(require.resolve('@blocklet/form-collector'));
 node.themeBuilderPath = path.dirname(require.resolve('@blocklet/theme-builder'));
 
-const syncComponentStatus = async () => {
-  const apps = await node.getBlocklets({ includeRuntimeInfo: false });
-  for (let i = 0; i < apps.length; i++) {
-    const app = apps[i];
-    try {
-      await node.syncBlockletStatus(app.meta.did, { forceSync: true });
-    } catch (err) {
-      logger.error(`Blocklet ${getDisplayName(app)} status sync failed: ${err.message}`);
-    }
-  }
-};
-
 logger.info('Waiting for Blocklet Server Daemon instance created');
 node.onReady(async () => {
   logger.info('Blocklet Server Daemon instance was created');
@@ -74,8 +67,11 @@ node.onReady(async () => {
   logger.info('Service gateway was restarted');
 
   const server = createServer(node);
+  setupGracefulShutdown(server);
+
   server.listen(process.env.ABT_NODE_PORT, '0.0.0.0', async (err) => {
     if (err) throw err;
+    process.send?.('ready');
     console.info(`> Blocklet Server Daemon ready on ${process.env.ABT_NODE_PORT}`);
 
     // Should resume upgrading if we are in process
@@ -98,12 +94,16 @@ node.onReady(async () => {
         await node.updateNodeStatus(SERVER_STATUS.RUNNING);
         if (runningBefore) {
           logger.info('> Blocklet Server is restarted from running before');
+          // 如果之前是运行中, 直接跳过快速重启检查
+          ensureBlockletRunning.whenCycleCheck = true;
+        } else {
+          logger.info('> Blocklet Server is stopped from running before');
         }
-
-        await syncComponentStatus();
       }
     } catch (e) {
       console.error('> Blocklet Server failed to restart running blocklets', e);
+    } finally {
+      ensureBlockletRunning.canRunEnsureBlockletRunning = true;
     }
 
     try {

package/lib/process/event-hub.js

@@ -0,0 +1,24 @@
+/* eslint-disable no-console */
+const { setupGracefulShutdown } = require('@abtnode/util/lib/pm2/setup-graceful-shutdown');
+const server = require('@arcblock/event-hub/lib/server-abtnode.js');
+const pm2 = require('@abtnode/util/lib/pm2/async-pm2');
+const md5 = require('@abtnode/util/lib/md5');
+
+setupGracefulShutdown(server);
+
+const pm2Pwd = md5(`${process.env.ABT_NODE_SK}-fetch-pm2`);
+
+server.register(
+  'pm2/start',
+  async (payload) => {
+    const { pm2Config, pwd } = payload || {};
+    if (!pwd || pwd !== pm2Pwd) {
+      return { ok: false, error: 'unauthorized start the blocklet' };
+    }
+    await pm2.startAsync(pm2Config);
+    return { ok: true, data: 'ok' };
+  },
+  { authRequired: false }
+);
+
+module.exports = server;

package/lib/process/service.js

@@ -1,6 +1,10 @@
 const fs = require('fs');
 const path = require('path');
 
+const { loadReloadEnv } = require('@abtnode/util/lib/pm2/pm2-start-or-reload');
+
+loadReloadEnv();
+
 if (!process.env.NODE_ENV) {
   process.env.NODE_ENV = 'production';
 }
@@ -20,6 +24,7 @@ const ABTNode = require('@abtnode/core');
 const getNodeWallet = require('@abtnode/util/lib/get-app-wallet');
 
 const createServer = require('@abtnode/blocklet-services');
+const { setupGracefulShutdown } = require('@abtnode/util/lib/pm2/setup-graceful-shutdown');
 
 const { version } = require('../../package.json');
 
@@ -60,12 +65,15 @@ const notifyServerVersionToApps = async (server) => {
 
 node.onReady(() => {
   const server = createServer(node);
+  setupGracefulShutdown(server);
 
   server.listen(port, '0.0.0.0', async (err) => {
     if (err) throw err;
     // eslint-disable-next-line
     console.log(`> Blocklet Service ready on ${port}`);
 
+    process.send?.('ready');
+
     try {
       if (dataDir && fs.existsSync(path.join(dataDir, 'start.lock')) === false) {
         const nodeInfo = await node.getNodeInfo();

package/lib/util/exit-when-server-stopped.js

@@ -1,4 +1,4 @@
-const pm2 = require('@abtnode/util/lib/async-pm2');
+const pm2 = require('@abtnode/util/lib/pm2/async-pm2');
 const { PROCESS_NAME_DAEMON } = require('@abtnode/constant');
 
 const exitWhenServerStopped = () => {

package/lib/util/index.js

@@ -9,14 +9,12 @@ const { filesize } = require('filesize');
 const fs = require('fs-extra');
 const git = require('git-rev-sync');
 const uniq = require('lodash/uniq');
-const portUsed = require('port-used');
 const pRetry = require('p-retry');
 const { joinURL } = require('ufo');
 const getNodeWallet = require('@abtnode/util/lib/get-app-wallet');
 const isDocker = require('@abtnode/util/lib/is-docker');
 const isGitpod = require('@abtnode/util/lib/is-gitpod');
-const ensureListening = require('@abtnode/util/lib/ensure-listening');
-const pm2 = require('@abtnode/util/lib/async-pm2');
+const pm2 = require('@abtnode/util/lib/pm2/async-pm2');
 const getIP = require('@abtnode/util/lib/get-ip');
 const sleep = require('@abtnode/util/lib/sleep');
 const axios = require('@abtnode/util/lib/axios');
@@ -24,9 +22,12 @@ const cloud = require('@abtnode/util/lib/cloud');
 const { formatError } = require('@blocklet/error');
 const { updateServerDocument } = require('@abtnode/util/lib/did-document');
 const { getProvider } = require('@abtnode/router-provider');
+const portUsed = require('port-used');
 const { decideHttpPort, decideHttpsPort } = require('@abtnode/router-provider/lib/util');
-const tryWithTimeout = require('@abtnode/util/lib/try-with-timeout');
 const codespaces = require('@abtnode/util/lib/codespaces');
+const ensureEndpointHealthy = require('@abtnode/util/lib/ensure-endpoint-healthy');
+const { isProcessRunningByPm2 } = require('@abtnode/util/lib/pm2/pm2-start-or-reload');
+
 const {
   PROCESS_NAME_EVENT_HUB,
   PROXY_MAX_MEM_LIMIT_IN_MB,
@@ -34,12 +35,13 @@ const {
   DEFAULT_HTTP_PORT,
   NODE_MODES,
   DEFAULT_HTTPS_PORT,
+  PROCESS_NAME_PM2_EVENT_HUB,
 } = require('@abtnode/constant');
 const gitUserName = require('git-user-name');
 
 const pkg = require('../../package.json');
 const { symbols, wrapSpinner } = require('../ui');
-const { getInternalPort: getPort } = require('../port');
+const { getInternalPort } = require('../port');
 const debug = require('../debug')('util');
 const getCLIBinaryName = require('./get-cli-binary-name');
 const printError = require('./print-error');
@@ -115,6 +117,11 @@ const checkRoutingProvider = async (info, { configDir } = {}) => {
     return true;
   }
 
+  const isHasRunning = await isProcessRunningByPm2(PROCESS_NAME_EVENT_HUB);
+  if (isHasRunning) {
+    return true;
+  }
+
   const result = await Provider.check({ configDir });
   if (!result.available) {
     printError(result.error);
@@ -221,31 +228,41 @@ const getGitHash = (dir) => git.long(dir);
 
 const getCliCwd = () => path.dirname(path.dirname(__dirname));
 
-const startEventHub = async (logDir, maxMemoryRestart = PROXY_MAX_MEM_LIMIT_IN_MB) => {
-  const port = getPort(PROCESS_NAME_EVENT_HUB);
+const startEventHub = async (logDir, maxMemoryRestart = PROXY_MAX_MEM_LIMIT_IN_MB, ABT_NODE_SK = '') => {
+  const port = getInternalPort(PROCESS_NAME_EVENT_HUB);
+  const pm2EventHubPort = getInternalPort(PROCESS_NAME_PM2_EVENT_HUB);
   debug('start event hub', { port });
 
   const tryStartEventHub = async () => {
     try {
       await wrapSpinner('Starting event hub...', async () => {
         await pm2.startAsync({
-          namespace: 'daemon',
+          // 因为 pm2 的 bug, 子进程会继承 namespace 和众多参数, 所以这里的 namespace 会给 blocklets 用
+          namespace: 'blocklets',
           name: PROCESS_NAME_EVENT_HUB,
-          script: require.resolve('@arcblock/event-hub/lib/server-abtnode.js'),
+          script: './lib/process/event-hub.js',
           max_memory_restart: `${maxMemoryRestart}M`,
           output: path.join(logDir, 'event.output.log'),
           error: path.join(logDir, 'event.error.log'),
-          cwd: getCliCwd(),
-          wait_ready: true,
-          max_restarts: 3,
+          wait_ready: false,
           listen_timeout: 3000,
+          exec_mode: 'cluster',
+          max_restarts: 3,
+          cwd: getCliCwd(),
           time: true,
           pmx: false,
           env: {
             ABT_NODE_EVENT_PORT: port,
+            ABT_NODE_EVENT_HTTP_PORT: pm2EventHubPort,
+            ABT_NODE_SK,
           },
         });
-        await tryWithTimeout(() => ensureListening(port), 10000);
+        await ensureEndpointHealthy({
+          protocol: 'tcp',
+          port,
+          timeout: 5 * 60 * 1000, // wait up to 5 minutes
+          minConsecutiveTime: 2000,
+        });
       });
 
       process.env.ABT_NODE_EVENT_PORT = port;
@@ -257,7 +274,7 @@ const startEventHub = async (logDir, maxMemoryRestart = PROXY_MAX_MEM_LIMIT_IN_M
 
   await tryStartEventHub();
 
-  return port;
+  return [port, pm2EventHubPort];
 };
 
 const killPm2Process = async (name) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/cli",
-  "version": "1.16.49-beta-20250815-032308-7bcf0b85",
+  "version": "1.16.49-beta-20250819-084933-3bcbd851",
   "description": "Command line tools to manage Blocklet Server",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
   "bin": {
@@ -35,33 +35,33 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/blocklet-services": "1.16.49-beta-20250815-032308-7bcf0b85",
-    "@abtnode/client": "1.16.49-beta-20250815-032308-7bcf0b85",
-    "@abtnode/constant": "1.16.49-beta-20250815-032308-7bcf0b85",
-    "@abtnode/core": "1.16.49-beta-20250815-032308-7bcf0b85",
-    "@abtnode/db-cache": "1.16.49-beta-20250815-032308-7bcf0b85",
-    "@abtnode/logger": "1.16.49-beta-20250815-032308-7bcf0b85",
-    "@abtnode/models": "1.16.49-beta-20250815-032308-7bcf0b85",
-    "@abtnode/router-provider": "1.16.49-beta-20250815-032308-7bcf0b85",
-    "@abtnode/util": "1.16.49-beta-20250815-032308-7bcf0b85",
-    "@abtnode/webapp": "1.16.49-beta-20250815-032308-7bcf0b85",
-    "@arcblock/did": "1.21.2",
-    "@arcblock/event-hub": "1.21.2",
+    "@abtnode/blocklet-services": "1.16.49-beta-20250819-084933-3bcbd851",
+    "@abtnode/client": "1.16.49-beta-20250819-084933-3bcbd851",
+    "@abtnode/constant": "1.16.49-beta-20250819-084933-3bcbd851",
+    "@abtnode/core": "1.16.49-beta-20250819-084933-3bcbd851",
+    "@abtnode/db-cache": "1.16.49-beta-20250819-084933-3bcbd851",
+    "@abtnode/logger": "1.16.49-beta-20250819-084933-3bcbd851",
+    "@abtnode/models": "1.16.49-beta-20250819-084933-3bcbd851",
+    "@abtnode/router-provider": "1.16.49-beta-20250819-084933-3bcbd851",
+    "@abtnode/util": "1.16.49-beta-20250819-084933-3bcbd851",
+    "@abtnode/webapp": "1.16.49-beta-20250819-084933-3bcbd851",
+    "@arcblock/did": "1.22.2",
+    "@arcblock/event-hub": "1.22.2",
     "@arcblock/ipfs-only-hash": "^0.0.2",
-    "@arcblock/jwt": "1.21.2",
-    "@arcblock/ws": "1.21.3",
-    "@blocklet/constant": "1.16.49-beta-20250815-032308-7bcf0b85",
+    "@arcblock/jwt": "1.22.2",
+    "@arcblock/ws": "1.22.2",
+    "@blocklet/constant": "1.16.49-beta-20250819-084933-3bcbd851",
     "@blocklet/error": "^0.2.5",
     "@blocklet/form-collector": "^0.1.8",
-    "@blocklet/images": "1.16.49-beta-20250815-032308-7bcf0b85",
-    "@blocklet/meta": "1.16.49-beta-20250815-032308-7bcf0b85",
-    "@blocklet/resolver": "1.16.49-beta-20250815-032308-7bcf0b85",
-    "@blocklet/store": "1.16.49-beta-20250815-032308-7bcf0b85",
+    "@blocklet/images": "1.16.49-beta-20250819-084933-3bcbd851",
+    "@blocklet/meta": "1.16.49-beta-20250819-084933-3bcbd851",
+    "@blocklet/resolver": "1.16.49-beta-20250819-084933-3bcbd851",
+    "@blocklet/store": "1.16.49-beta-20250819-084933-3bcbd851",
     "@blocklet/theme-builder": "^0.4.6",
-    "@ocap/client": "1.21.2",
-    "@ocap/mcrypto": "1.21.2",
-    "@ocap/util": "1.21.2",
-    "@ocap/wallet": "1.21.2",
+    "@ocap/client": "1.22.2",
+    "@ocap/mcrypto": "1.22.2",
+    "@ocap/util": "1.22.2",
+    "@ocap/wallet": "1.22.2",
     "@vercel/ncc": "^0.38.3",
     "archiver": "^7.0.1",
     "async": "^3.2.4",
@@ -154,7 +154,7 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "75dd236eb42d14a5093c1364e51625412aa91790",
+  "gitHead": "b8bbf2279e9a29bd58eac7b66e1db16e851a183c",
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^29.5.13"

package/lib/util/get-service-instance-number.js

@@ -1,12 +0,0 @@
-const os = require('os');
-
-module.exports = () => {
-  // unit: GB
-  const memorySize = Math.floor(os.totalmem() / 1024 / 1024 / 1024) || 1;
-
-  const cpuLength = os.cpus().length || 1;
-
-  const customConfig = +process.env.ABT_NODE_MAX_CLUSTER_SIZE || Number.MAX_SAFE_INTEGER;
-
-  return Math.max(Math.min(memorySize, cpuLength, customConfig), 1);
-};