@blocklet/cli 1.16.54-beta-20251024-030947-6f2889bf → 1.16.54-beta-20251027-105624-dfa978f8

package/lib/commands/server/stop.js

@@ -73,6 +73,7 @@ const forceStopServer = async () => {
       }
     } catch (error) {
       printError(`Blocklet Server related processes stop failed: ${error.message}`);
+      throw error;
     }
   };
   const timeout = 20; // 20 seconds

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/cli",
-  "version": "1.16.54-beta-20251024-030947-6f2889bf",
+  "version": "1.16.54-beta-20251027-105624-dfa978f8",
   "description": "Command line tools to manage Blocklet Server",
   "homepage": "https://www.arcblock.io/docs/blocklet-cli",
   "bin": {
@@ -12,8 +12,8 @@
   "scripts": {
     "lint": "eslint lib bin",
     "lint:fix": "eslint lib bin --fix",
-    "test": "bun test",
-    "coverage": "bun test --coverage",
+    "test": "bun test --bail --timeout 30000",
+    "coverage": "bun test --bail --timeout 30000 --coverage",
     "postinstall": "node lib/postinstall.js"
   },
   "files": [
@@ -35,28 +35,28 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/blocklet-services": "1.16.54-beta-20251024-030947-6f2889bf",
-    "@abtnode/constant": "1.16.54-beta-20251024-030947-6f2889bf",
-    "@abtnode/core": "1.16.54-beta-20251024-030947-6f2889bf",
-    "@abtnode/db-cache": "1.16.54-beta-20251024-030947-6f2889bf",
-    "@abtnode/logger": "1.16.54-beta-20251024-030947-6f2889bf",
-    "@abtnode/models": "1.16.54-beta-20251024-030947-6f2889bf",
-    "@abtnode/router-provider": "1.16.54-beta-20251024-030947-6f2889bf",
-    "@abtnode/util": "1.16.54-beta-20251024-030947-6f2889bf",
-    "@abtnode/webapp": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@abtnode/blocklet-services": "1.16.54-beta-20251027-105624-dfa978f8",
+    "@abtnode/constant": "1.16.54-beta-20251027-105624-dfa978f8",
+    "@abtnode/core": "1.16.54-beta-20251027-105624-dfa978f8",
+    "@abtnode/db-cache": "1.16.54-beta-20251027-105624-dfa978f8",
+    "@abtnode/logger": "1.16.54-beta-20251027-105624-dfa978f8",
+    "@abtnode/models": "1.16.54-beta-20251027-105624-dfa978f8",
+    "@abtnode/router-provider": "1.16.54-beta-20251027-105624-dfa978f8",
+    "@abtnode/util": "1.16.54-beta-20251027-105624-dfa978f8",
+    "@abtnode/webapp": "1.16.54-beta-20251027-105624-dfa978f8",
     "@arcblock/did": "^1.26.3",
     "@arcblock/event-hub": "^1.26.3",
     "@arcblock/ipfs-only-hash": "^0.0.2",
     "@arcblock/jwt": "^1.26.3",
     "@arcblock/ws": "^1.26.3",
-    "@blocklet/constant": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@blocklet/constant": "1.16.54-beta-20251027-105624-dfa978f8",
     "@blocklet/error": "^0.2.5",
     "@blocklet/form-collector": "^0.1.8",
-    "@blocklet/images": "1.16.54-beta-20251024-030947-6f2889bf",
-    "@blocklet/meta": "1.16.54-beta-20251024-030947-6f2889bf",
-    "@blocklet/resolver": "1.16.54-beta-20251024-030947-6f2889bf",
-    "@blocklet/server-js": "1.16.54-beta-20251024-030947-6f2889bf",
-    "@blocklet/store": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@blocklet/images": "1.16.54-beta-20251027-105624-dfa978f8",
+    "@blocklet/meta": "1.16.54-beta-20251027-105624-dfa978f8",
+    "@blocklet/resolver": "1.16.54-beta-20251027-105624-dfa978f8",
+    "@blocklet/server-js": "1.16.54-beta-20251027-105624-dfa978f8",
+    "@blocklet/store": "1.16.54-beta-20251027-105624-dfa978f8",
     "@blocklet/theme-builder": "^0.4.7",
     "@ocap/client": "^1.26.3",
     "@ocap/mcrypto": "^1.26.3",
@@ -155,9 +155,8 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "73e5a3a80b82a2a7c62d42fdc08207b28e67633e",
+  "gitHead": "03b0bb26807c6c427ca700f48566ecc913f1353e",
   "devDependencies": {
-    "@types/fs-extra": "^11.0.4",
-    "@types/jest": "^29.5.13"
+    "@types/fs-extra": "^11.0.4"
   }
 }

package/lib/util/restart-running-component.js

@@ -1,135 +0,0 @@
-const logger = require('@abtnode/logger')('restart-running-component');
-const AsyncQueue = require('async/queue');
-const { BlockletStatus, BLOCKLET_MODES } = require('@blocklet/constant');
-const { getBlockletEngine } = require('@blocklet/meta/lib/engine');
-const { findComponentV2, forEachComponentV2, hasStartEngine, getDisplayName } = require('@blocklet/meta/lib/util');
-const { getComponentProcessId } = require('@blocklet/meta/lib/get-component-process-id');
-const getPm2ProcessInfo = require('@abtnode/util/lib/get-pm2-process-info');
-const formatContext = require('@abtnode/util/lib/format-context');
-const pAll = require('p-all');
-
-const createAuditLog = (wallet, node, action, args, result) => {
-  return node
-    .createAuditLog(
-      {
-        action,
-        args,
-        context: formatContext({
-          user: { fullName: 'CLI', role: 'admin', did: wallet.address },
-          headers: { 'user-agent': 'CLI' },
-        }),
-        result,
-      },
-      node
-    )
-    .catch(console.error);
-};
-
-const isHealthWithProcessId = async (processId) => {
-  try {
-    const info = await getPm2ProcessInfo(processId);
-    if (info.pm2_env.status !== 'online') {
-      // process not running
-      return false;
-    }
-  } catch {
-    // probably process not exists
-    return false;
-  }
-  return true;
-};
-
-const getComponentDids = async ({ app }) => {
-  const processNotRunnings = [];
-  const needStoppedDids = [];
-  await forEachComponentV2(app, async (component) => {
-    if (component.mode === BLOCKLET_MODES.DEVELOPMENT) {
-      needStoppedDids.push(component.meta.did);
-      return;
-    }
-
-    if (component.status === BlockletStatus.waiting) {
-      processNotRunnings.push(component.meta.did);
-      return;
-    }
-
-    if (component.status !== BlockletStatus.running) {
-      return;
-    }
-
-    if (!hasStartEngine(component.meta)) {
-      return;
-    }
-
-    if (getBlockletEngine(component.meta)?.interpreter === 'blocklet') {
-      return;
-    }
-
-    const processId = getComponentProcessId(component, [app]);
-    const isHealth = await isHealthWithProcessId(processId);
-    if (isHealth) {
-      return;
-    }
-
-    processNotRunnings.push(component.meta.did);
-  });
-
-  return [processNotRunnings, needStoppedDids];
-};
-
-const restartRunningComponent = async (wallet, node) => {
-  const queue = AsyncQueue(async (app, next) => {
-    logger.info(`Restarting app ${getDisplayName(app)}...`);
-    const [componentDids] = await getComponentDids({ app });
-
-    if (!componentDids.length) {
-      logger.info(`> No component need to restart for app ${getDisplayName(app)}`);
-      next();
-      return;
-    }
-
-    try {
-      const result = await node.startBlocklet({ did: app.meta.did, checkHealthImmediately: true, componentDids }, {});
-      logger.info(`> Restarted app ${getDisplayName(app)} / [${componentDids.join(',')}]`);
-      await createAuditLog(wallet, node, 'startBlocklet', { did: app.meta.did, reason: 'on server restart' }, result);
-    } catch (err) {
-      logger.error(`> Restarted app ${getDisplayName(app)} / [${componentDids.join(',')}] failed`, err);
-    }
-
-    next();
-  }, 1);
-
-  const apps = await node.getBlocklets({ includeRuntimeInfo: false });
-
-  const running = apps.filter((app) =>
-    findComponentV2(app, (component) => component.status === BlockletStatus.running)
-  );
-
-  if (running.length === 0) {
-    return;
-  }
-
-  await pAll(
-    running.map((app) => async () => {
-      try {
-        const [componentDids, needStoppedDids] = await getComponentDids({ app });
-        if (componentDids.length) {
-          await node.setBlockletStatus(app.meta.did, BlockletStatus.waiting, {
-            componentDids,
-          });
-        }
-        if (needStoppedDids.length) {
-          await node.stopBlocklet({ did: app.meta.did, componentDids: needStoppedDids });
-        }
-      } catch (err) {
-        logger.error(`Failed to set blocklet ${getDisplayName(app)} status to waiting or stopped`, err);
-      }
-    }),
-    { concurrency: 2 }
-  );
-
-  running.forEach((app) => queue.push(app));
-  await queue.drain();
-};
-
-module.exports = restartRunningComponent;