fix: close json on error

Author: Jeday

index.ts

@@ -7,7 +7,12 @@ import { program } from './command/index.js';
 import { logError, logInfo } from './utils/logging/console.js';
 import { withInterruptHandling } from './utils/interrupt-handler.js';
 import './programs/index.js';
-import { disconnectWalletConnect } from './utils/index.js';
+import {
+  closeJsonLogging,
+  disconnectWalletConnect,
+  logJson,
+  openJsonLogging,
+} from './utils/index.js';
 
 export * from './utils/index.js';
 
@@ -60,7 +65,7 @@ const runCLI = withInterruptHandling(async () => {
   const isJson = process.argv.includes('--json');
   const chain = await getChain();
   if (isJson) {
-    console.info('[');
+    openJsonLogging();
   } else {
     logInfo(`${'-'.repeat(100)}`);
     logInfo(`Using chain: Name: ${chain.name}, Chain ID: ${chain.id}`);
@@ -71,13 +76,18 @@ const runCLI = withInterruptHandling(async () => {
 
 runCLI()
   .catch(async (error) => {
-    logError('CLI Error:', error.message);
-    await disconnectWalletConnect();
+    await disconnectWalletConnect().catch();
+    if (program.opts().json) {
+      logJson({ error: error.message });
+      closeJsonLogging();
+    } else {
+      logError('CLI Error:', error.message);
+    }
     process.exit(1);
   })
   .finally(async () => {
     if (program.opts().json) {
-      console.info(']');
+      closeJsonLogging();
     } else {
       const chain = await getChain();
       if (chain.id === mainnet.id) {

utils/interrupt-handler.ts

@@ -1,6 +1,11 @@
 import process from 'process';
 
-import { logError, logInfo } from './logging/console.js';
+import {
+  closeJsonLogging,
+  logError,
+  logInfo,
+  logJson,
+} from './logging/console.js';
 import { disconnectWalletConnect } from './wallet-connect.js';
 
 type ActionHandler = (...args: any[]) => Promise<any>;
@@ -27,10 +32,17 @@ export const withInterruptHandling = (action: ActionHandler) => {
 
       return result;
     } catch (err) {
-      if (err instanceof Error) logError('Command failed:', err.message);
-      else logError('Command failed:', err);
+      await disconnectWalletConnect().catch(() => {});
+      // programm.opts is not init
+      const isJson = process.argv.includes('--json');
+      if (isJson) {
+        logJson({ error: err instanceof Error ? err.message : err });
+        closeJsonLogging();
+      } else {
+        if (err instanceof Error) logError('Command failed:', err.message);
+        else logError('Command failed:', err);
+      }
 
-      await disconnectWalletConnect();
       process.exit(1);
     } finally {
       process.off('SIGINT', sigintHandler);

utils/logging/console.ts

@@ -28,11 +28,24 @@ const bigIntStringify = <T>(value: T): string => {
   );
 };
 
+// Flag so that next log can add comma if previous log is JSON to create valid JSON array output
 let IS_PREV_JSON_LOG = false;
 
+export const openJsonLogging = () => {
+  console.info('[');
+};
+
+export const closeJsonLogging = () => {
+  console.info(']');
+};
+
+export const TEST_RESET_JSON_LOG_FLAG = () => {
+  IS_PREV_JSON_LOG = false;
+};
+
 export const createConsole = (
   headMessage: HeadMessage,
-  type: 'info' | 'error' | 'table' | 'bold' = 'info',
+  type: 'info' | 'error' | 'table' | 'bold' | 'json' = 'info',
 ) => {
   return <T, U>(...args: T[] | U[]) => {
     // print comma if previous log is JSON to separate logs
@@ -57,6 +70,8 @@ export const createConsole = (
           return console.info(bigIntStringify({ result: args }));
         }
         return console.info(getColoredLog(headMessage, args));
+      case 'json':
+        return console.info(bigIntStringify(args));
       default:
         if (program.opts().json) {
           return console.info(bigIntStringify({ result: args }));
@@ -70,13 +85,9 @@ export const createConsole = (
   };
 };
 
-export const TEST_RESET_JSON_LOG_FLAG = () => {
-  IS_PREV_JSON_LOG = false;
-};
-
 const createTable = (headMessage?: HeadMessage) => (args: CreateTableArgs) => {
   const { data, params, csvPath } = args;
-  if (headMessage)
+  if (headMessage && !program.opts().json)
     console.info(`\n${getColoredLog(headMessage, headMessage + ':')}`);
 
   if (!data) return;
@@ -112,3 +123,4 @@ export const logError = createConsole('Error', 'error');
 export const logBold = createConsole('Bold', 'bold');
 export const logCancel = createConsole('Cancel');
 export const logResultSimple = createConsole('Result', 'table');
+export const logJson = createConsole('Result', 'json');