some more improvements to the cli

Author: jsajal

packages/flowtest-cli/bin/index.js

@@ -18,6 +18,11 @@ const getEnvVariables = (pathname) => {
   return parsed;
 };
 
+function bytesToBase64(bytes) {
+  const binString = Array.from(bytes, (byte) => String.fromCodePoint(byte)).join('');
+  return btoa(binString);
+}
+
 // Define the CLI application using yargs
 const argv = yargs(hideBin(process.argv))
   .usage('Usage: $0 <command> [options]')
@@ -93,8 +98,16 @@ const argv = yargs(hideBin(process.argv))
           //console.log(logger.get());
 
           if (argv.scan) {
+            const data = {
+              version: 1,
+              name: argv.file.toString(),
+              scan: logger.get(),
+            };
             try {
-              const response = await axiosClient.post('/upload', btoa(JSON.stringify(logger.get())));
+              const response = await axiosClient.post(
+                '/upload',
+                bytesToBase64(new TextEncoder().encode(JSON.stringify(data))),
+              );
               console.log(response.data.data[0].id);
             } catch (error) {
               //console.log(error);

packages/flowtest-cli/graph/Graph.js

@@ -85,7 +85,7 @@ class Graph {
       if (node.type === 'outputNode') {
         console.log('Output Node');
         console.log(chalk.green(`   ✓ `) + chalk.dim(`${JSON.stringify(prevNodeOutputData)}`));
-        this.logger.add(LogLevel.INFO, '', { type: 'outputNode', data: prevNodeOutputData });
+        this.logger.add(LogLevel.INFO, '', { type: 'outputNode', data: { output: prevNodeOutputData } });
         result = {
           status: 'Success',
           data: prevNodeOutputData,
@@ -98,7 +98,7 @@ class Graph {
           node.data.variables,
           prevNodeOutputData,
           this.envVariables,
-          this.logs,
+          this.logger,
         );
         if (eNode.evaluate()) {
           console.log(chalk.green(`   ✓ `) + chalk.dim('True'));
@@ -124,7 +124,7 @@ class Graph {
         };
         console.log('Delay Node: ' + chalk.green(`....waiting for: ${delay} ms`));
         await wait(delay);
-        this.logger.add(LogLevel.INFO, '', { type: 'delayNode', data: delay });
+        this.logger.add(LogLevel.INFO, '', { type: 'delayNode', data: { delay } });
         result = {
           status: 'Success',
         };

packages/flowtest-cli/graph/compute/assertnode.js

@@ -5,12 +5,12 @@ const chalk = require('chalk');
 const { LogLevel } = require('../GraphLogger');
 
 class assertNode extends Node {
-  constructor(operator, variables, prevNodeOutputData, envVariables, logs) {
+  constructor(operator, variables, prevNodeOutputData, envVariables, logger) {
     super('assertNode');
     this.operator = operator;
     this.variables = variables;
     this.prevNodeOutputData = prevNodeOutputData;
-    this.logs = logs;
+    this.logger = logger;
     this.envVariables = envVariables;
   }
 

packages/flowtest-cli/graph/compute/authnode.js

@@ -3,21 +3,24 @@ const Node = require('./node');
 const chalk = require('chalk');
 
 class authNode extends Node {
-  constructor(auth, envVariables) {
+  constructor(auth, envVariables, logger) {
     super('authNode');
     (this.auth = auth), (this.envVariables = envVariables);
+    this.logger = logger;
   }
 
   evaluate() {
     //console.log('Evaluating an auth node');
     if (this.auth.type === 'basic-auth') {
       console.log(chalk.green(`   ✓ `) + chalk.dim('.....setting basic authentication'));
+      this.logger.add(LogLevel.INFO, '', { type: 'authNode', data: { authType: 'Basic Authentication' } });
       this.auth.username = computeVariables(this.auth.username, this.envVariables);
       this.auth.password = computeVariables(this.auth.password, this.envVariables);
 
       return this.auth;
     } else if (this.auth.type === 'no-auth') {
       console.log(chalk.green(`   ✓ `) + chalk.dim('.....using no authentication'));
+      this.logger.add(LogLevel.INFO, '', { type: 'authNode', data: { authType: 'No Authentication' } });
       return this.auth;
     } else {
       throw Error(`auth type: ${this.auth.type} is not valid`);

packages/flowtest-cli/graph/compute/requestnode.js

@@ -161,7 +161,9 @@ class requestNode extends Node {
       } else {
         return {
           error: {
-            message: `An error occurred while running the request : ${error?.message}`,
+            status: '',
+            statusText: '',
+            data: `An error occurred while running the request : ${error?.message}`,
           },
         };
       }