cli: add pretty-print option

PR-URL: #395 Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com> Reviewed-By: Denys Otrishko <shishugi@gmail.com> Reviewed-By: Dmytro Nechai <nechaido@gmail.com>
metarhia · Dec 21, 2018 · 02c4fd2 · 02c4fd2
1 parent fa4789c
commit 02c4fd2
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/bin/cli.js b/bin/cli.js
@@ -27,6 +27,12 @@ const args = yargs
     type: 'number',
     describe: 'Heartbeat interval in milliseconds',
   })
+  .option('pretty-print', {
+    alias: 'p',
+    type: 'string',
+    describe: 'Enable pretty-print. You can pass a string or a number' +
+      ' to specify indentation',
+  })
   .epilogue(`
 Environment variables:
 JSTP_CLI_HISTORY       path to the persistent CLI history file

diff --git a/lib/cli/cli.js b/lib/cli/cli.js
@@ -24,6 +24,13 @@ module.exports = class Cli extends EventEmitter {
     this.client = {
       heartbeatInterval: options.heartbeatInterval,
     };
+    this.indent = options.prettyPrint;
+    const numIndent = Number(this.indent);
+    if (this.indent === '') {
+      this.indent = 2;
+    } else if (!Number.isNaN(numIndent) && numIndent !== 0) {
+      this.indent = Number(this.indent);
+    }
 
     if (options.verbose) {
       this.client.logger = new EventEmitter();
@@ -33,7 +40,9 @@ module.exports = class Cli extends EventEmitter {
           (!message.pong && !message.ping) ||
           options.verbose === VERBOSENESS_LEVEL.ALL
         ) {
-          this.log(`Outgoing message:\n${mdsf.stringify(message)}`);
+          this.log(`Outgoing message:\n${mdsf.stringify(
+            message, null, this.indent
+          )}`);
         }
       });
 
@@ -42,7 +51,9 @@ module.exports = class Cli extends EventEmitter {
           (!message.pong && !message.ping) ||
           options.verbose === VERBOSENESS_LEVEL.ALL
         ) {
-          this.log(`Incoming message:\n${mdsf.stringify(message)}`);
+          this.log(`Incoming message:\n${mdsf.stringify(
+            message, null, this.indent
+          )}`);
         }
       });
     }

diff --git a/lib/cli/command-processor.js b/lib/cli/command-processor.js
@@ -165,7 +165,9 @@ module.exports = class CommandProcessor extends EventEmitter {
         // TODO: make event registering generic
         connection.on('event', (interfaceName, eventName, args) => {
           this.cli.log(`Received remote event '${eventName}'` +
-            ` in interface '${interfaceName}': ${mdsf.stringify(args)}`);
+            ` in interface '${interfaceName}':\n${mdsf.stringify(
+              args, null, this.cli.indent
+            )}`);
         });
         connection.on('error', err => {
           this.cli._logErr(err);

diff --git a/lib/cli/line-processor.js b/lib/cli/line-processor.js
@@ -39,8 +39,10 @@ module.exports = class LineProcessor {
         }
         const iface = args[0];
         const method = args[1];
-        const res = mdsf.stringify(result);
-        const msg = `Method ${iface}.${method} returned: ${res}`;
+        const res = mdsf.stringify(
+          result, null, this.commandProcessor.cli.indent
+        );
+        const msg = `Method ${iface}.${method} returned:\n${res}`;
         callback(null, msg);
       });
   }