@abtnode/util 1.16.49-beta-20250823-082650-626c1473 → 1.16.49-beta-20250827-025603-2bb1a7ee

package/lib/get-pm2-process-info.js

@@ -4,20 +4,42 @@ const pm2 = require('./pm2/async-pm2');
 
 const noop = () => {};
 
-const getPm2ProcessInfo = (processId, { printError = noop, throwOnNotExist = true } = {}) =>
-  new Promise((resolve, reject) => {
-    pm2.describe(processId, (err, [info]) => {
+// 新增 10_000 ms 的超时时间，避免 pm2 遇到什么问题一直不返回
+const getPm2ProcessInfo = (processId, { printError = noop, throwOnNotExist = true, timeout = 10_000 } = {}) => {
+  return new Promise((resolve, reject) => {
+    let settled = false;
+
+    let timer;
+    const onSettle = (fn, arg) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      fn(arg);
+    };
+
+    timer = setTimeout(() => {
+      printError('pm2.describe timeout', { processId, timeout });
+      onSettle(reject, new CustomError('PM2_RPC_TIMEOUT', `pm2.describe(${processId}) timed out after ${timeout}ms`));
+    }, timeout);
+
+    pm2.describe(processId, (err, list) => {
       if (err) {
         printError('Failed to get blocklet status from pm2', { error: err });
-        return reject(err);
+        return onSettle(reject, err);
       }
 
+      const info = Array.isArray(list) ? list[0] : undefined;
+
       if (!info && throwOnNotExist) {
-        return reject(new CustomError('BLOCKLET_PROCESS_404', `Blocklet process info is not available: ${processId}`));
+        return onSettle(
+          reject,
+          new CustomError('BLOCKLET_PROCESS_404', `Blocklet process info is not available: ${processId}`)
+        );
       }
 
-      return resolve(info);
+      return onSettle(resolve, info || null);
     });
   });
+};
 
 module.exports = getPm2ProcessInfo;

package/lib/pm2/pm2-start-or-reload.js

@@ -53,23 +53,6 @@ function waitProcOnlineById(id, timeout = 20_000) {
   });
 }
 
-/** 等待该 app 的 cluster 全 online */
-function waitSomeInstancesOnline(name, instances, timeoutMs = 20_000) {
-  const start = Date.now();
-  return new Promise((resolve, reject) => {
-    (function poll() {
-      pm2.list((err, list) => {
-        if (err) return reject(err);
-        const procs = list.filter((p) => p.name === name);
-        const online = procs.filter((p) => p.pm2_env?.status === 'online').length;
-        if (online >= instances) return resolve();
-        if (Date.now() - start > timeoutMs) return reject(new Error('instances not online in time'));
-        setTimeout(poll, 120);
-      });
-    })();
-  });
-}
-
 async function rollingRestartWithEnv(config) {
   // eslint-disable-next-line camelcase
   const { name, listen_timeout = 20_000 } = config;
@@ -126,12 +109,10 @@ async function pm2StartOrReload(config = {}) {
   } else {
     await pm2.startAsync(config);
   }
-  await waitSomeInstancesOnline(name, config.instances);
 }
 
 module.exports = {
   loadReloadEnv,
   isProcessRunningByPm2,
-  waitSomeInstancesOnline,
   pm2StartOrReload,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.49-beta-20250823-082650-626c1473",
+  "version": "1.16.49-beta-20250827-025603-2bb1a7ee",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,14 +18,14 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.49-beta-20250823-082650-626c1473",
-    "@abtnode/db-cache": "1.16.49-beta-20250823-082650-626c1473",
+    "@abtnode/constant": "1.16.49-beta-20250827-025603-2bb1a7ee",
+    "@abtnode/db-cache": "1.16.49-beta-20250827-025603-2bb1a7ee",
     "@arcblock/did": "1.22.2",
     "@arcblock/event-hub": "1.22.2",
     "@arcblock/pm2": "^6.0.12",
-    "@blocklet/constant": "1.16.49-beta-20250823-082650-626c1473",
+    "@blocklet/constant": "1.16.49-beta-20250827-025603-2bb1a7ee",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.49-beta-20250823-082650-626c1473",
+    "@blocklet/meta": "1.16.49-beta-20250827-025603-2bb1a7ee",
     "@blocklet/xss": "^0.2.5",
     "@ocap/client": "1.22.2",
     "@ocap/mcrypto": "1.22.2",
@@ -91,5 +91,5 @@
     "fs-extra": "^11.2.0",
     "jest": "^29.7.0"
   },
-  "gitHead": "54d2281fc6f72dadd12ed86b38d5a4e150bcaba8"
+  "gitHead": "2b70eea34e8bc8546abb09d38935e8906d9586fd"
 }