Merge pull request #120 from FlowTestAI/live-logs

feat: init user settings configuration

Author: jsajal

.changeset/shiny-chefs-double.md

@@ -0,0 +1,5 @@
+---
+'flowtestai': minor
+---
+
+allow configurable user settings

packages/flowtest-cli/bin/index.js

@@ -45,13 +45,13 @@ const argv = yargs(hideBin(process.argv))
         })
         .option('timeout', {
           alias: 't',
-          describe: 'timeout for graph run in ms',
+          describe: 'timeout for flow run in ms',
           demandOption: false,
           type: 'number',
         })
         .option('scan', {
           alias: 's',
-          describe: 'generate and upload build scan',
+          describe: 'generate and upload flow scan',
         });
     },
     async (argv) => {
@@ -78,8 +78,8 @@ const argv = yargs(hideBin(process.argv))
             argv.env ? getEnvVariables(argv.env) : {},
             logger,
           );
-          console.log(chalk.yellow('Running Graph \n'));
-          if (flowData.nodes.find((n) => n.type === 'complexNode')) {
+          console.log(chalk.yellow('Running Flow \n'));
+          if (flowData.nodes.find((n) => n.type === 'flowNode')) {
             console.log(
               chalk.blue(
                 '[Note] This flow contains nested flows so run it from parent directory of collection. Ignore if already doing that. \n',
@@ -89,9 +89,9 @@ const argv = yargs(hideBin(process.argv))
           const result = await g.run();
           console.log('\n');
           if (result.status === 'Success') {
-            console.log(chalk.bold('Graph Run: ') + chalk.green(`   ✓ `) + chalk.dim(result.status));
+            console.log(chalk.bold('Flow Run: ') + chalk.green(`   ✓ `) + chalk.dim(result.status));
           } else {
-            console.log(chalk.bold('Graph Run: ') + chalk.red(`   ✕ `) + chalk.dim(result.status));
+            console.log(chalk.bold('Flow Run: ') + chalk.red(`   ✕ `) + chalk.dim(result.status));
           }
           logger.add(LogLevel.INFO, `Total time: ${Date.now() - startTime} ms`);
           console.log(chalk.bold('Total Time: ') + chalk.dim(`${Date.now() - startTime} ms`));
@@ -108,18 +108,18 @@ const argv = yargs(hideBin(process.argv))
                 '/upload',
                 bytesToBase64(new TextEncoder().encode(JSON.stringify(data))),
               );
-              console.log(chalk.bold('Build Scan: ') + chalk.dim(`${baseUrl}/scan/${response.data.data[0].id}`));
+              console.log(chalk.bold('Flow Scan: ') + chalk.dim(`${baseUrl}/scan/${response.data.data[0].id}`));
             } catch (error) {
               if (error?.response) {
-                if (error.response?.status === 403 || error.response?.status === 429) {
+                if (error.response?.status >= 400 && error.response?.status < 500) {
                   console.log(chalk.red(`   ${JSON.stringify(error.response?.data)}`));
                 }
 
                 if (error.response?.status === 500) {
                   console.log(chalk.red('   Internal Server Error'));
                 }
               }
-              console.log(chalk.red(`   ✕ `) + chalk.dim('Unable to upload build scan'));
+              console.log(chalk.red(`   ✕ `) + chalk.dim('Unable to upload flow scan'));
             }
           }
 

packages/flowtest-cli/graph/Graph.js

@@ -133,7 +133,7 @@ class Graph {
 
       if (node.type === 'authNode') {
         console.log('Authentication Node');
-        const aNode = new authNode(node.data, this.envVariables);
+        const aNode = new authNode(node.data, this.envVariables, this.logger);
         this.auth = node.data.type ? aNode.evaluate() : undefined;
         result = {
           status: 'Success',

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

@@ -1,6 +1,7 @@
 const { computeVariables } = require('./utils');
 const Node = require('./node');
 const chalk = require('chalk');
+const { LogLevel } = require('../GraphLogger');
 
 class authNode extends Node {
   constructor(auth, envVariables, logger) {

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

@@ -52,7 +52,11 @@ class requestNode extends Node {
       console.log(chalk.red(`   ✕ `) + chalk.dim(`Request failed: ${JSON.stringify(res.error)}`));
       this.logger.add(LogLevel.ERROR, 'HTTP request failed', {
         type: 'requestNode',
-        data: { request: { type: options.method, url: options.url }, response: res.error, preReqVars: evalVariables },
+        data: {
+          request: { type: options.method, url: options.url, data: options.data },
+          response: res.error,
+          preReqVars: evalVariables,
+        },
       });
       return {
         status: 'Failed',
@@ -78,7 +82,11 @@ class requestNode extends Node {
       }
       this.logger.add(LogLevel.INFO, 'HTTP request success', {
         type: 'requestNode',
-        data: { request: { type: options.method, url: options.url }, response: res, preReqVars: evalVariables },
+        data: {
+          request: { type: options.method, url: options.url, data: options.data },
+          response: res,
+          preReqVars: evalVariables,
+        },
       });
       return {
         status: 'Success',

packages/flowtest-electron/electron-main.js

@@ -5,6 +5,7 @@ const url = require('url');
 const template = require('./electron-menu');
 const Watcher = require('./src/app/watcher');
 const registerRendererEventHandlers = require('./src/ipc/collection');
+const registerSettingsEventHandlers = require('./src/ipc/settings');
 
 let mainWindow;
 let watcher;
@@ -59,6 +60,7 @@ app.on('ready', async () => {
   watcher = new Watcher();
 
   registerRendererEventHandlers(mainWindow, watcher);
+  registerSettingsEventHandlers(mainWindow);
 });
 
 // Quit when all windows are closed, except on macOS. There, it's common

packages/flowtest-electron/package.json

@@ -38,6 +38,7 @@
     "@smithy/signature-v4": "^3.0.0",
     "@smithy/util-utf8": "^3.0.0",
     "axios": "^1.6.7",
+    "axios-retry": "^4.4.0",
     "chokidar": "^3.6.0",
     "dotenv": "^16.4.5",
     "electron-store": "^8.1.0",

packages/flowtest-electron/src/ipc/axiosClient.js

@@ -0,0 +1,29 @@
+// lib/axiosClient.ts
+const axios = require('axios');
+const axiosRetry = require('axios-retry').default;
+
+const axiosClient = (baseUrl, accessId, accessKey) => {
+  const client = axios.create({
+    baseURL: `${baseUrl}/api`,
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  });
+
+  axiosRetry(client, {
+    retries: 3, // Number of retries
+    retryDelay: (retryCount) => {
+      return retryCount * 1000; // Time interval between retries (1000 ms = 1 second)
+    },
+    retryCondition: (error) => {
+      // Retry on network errors or rate limit errors or 5xx server errors
+      return error.response?.status === 500 || error.response?.status === 429 || error.code === 'ECONNABORTED';
+    },
+  });
+
+  return client;
+};
+
+module.exports = {
+  axiosClient,
+};

packages/flowtest-electron/src/ipc/collection.js

@@ -17,6 +17,7 @@ const readFile = require('../utils/filemanager/readfile');
 const FlowtestAI = require('../ai/flowtestai');
 const { stringify, parse } = require('flatted');
 const { deserialize, serialize } = require('../utils/flowparser/parser');
+const { axiosClient } = require('./axiosClient');
 
 const collectionStore = new Collections();
 const flowTestAI = new FlowtestAI();
@@ -317,7 +318,9 @@ const registerRendererEventHandlers = (mainWindow, watcher) => {
       } 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}`,
           },
         };
       }
@@ -336,6 +339,55 @@ const registerRendererEventHandlers = (mainWindow, watcher) => {
       return Promise.reject(error);
     }
   });
+
+  ipcMain.handle('renderer:upload-logs', async (event, name, config, logs) => {
+    function bytesToBase64(bytes) {
+      const binString = Array.from(bytes, (byte) => String.fromCodePoint(byte)).join('');
+      return btoa(binString);
+    }
+
+    try {
+      const data = {
+        version: 1,
+        name,
+        scan: logs,
+      };
+      try {
+        const response = await axiosClient(config.hostUrl, config.accessId, config.accessKey).post(
+          '/upload',
+          bytesToBase64(new TextEncoder().encode(JSON.stringify(data))),
+        );
+        return {
+          upload: 'success',
+          url: `${config.hostUrl}/scan/${response.data.data[0].id}`,
+        };
+      } catch (error) {
+        if (error?.response) {
+          if (error.response?.status >= 400 && error.response?.status < 500) {
+            return {
+              upload: 'fail',
+              message: 'Unable to upload flow scan',
+              reason: `${JSON.stringify(error.response?.data)}`,
+            };
+          }
+
+          if (error.response?.status === 500) {
+            return {
+              upload: 'fail',
+              message: 'Unable to upload flow scan',
+              reason: 'Internal Server Error',
+            };
+          }
+        }
+        return {
+          upload: 'fail',
+          message: 'Unable to upload flow scan',
+        };
+      }
+    } catch (error) {
+      return Promise.reject(error);
+    }
+  });
 };
 
 module.exports = registerRendererEventHandlers;

packages/flowtest-electron/src/ipc/settings.js

@@ -0,0 +1,25 @@
+const { ipcMain, shell, dialog, app } = require('electron');
+const Settings = require('../store/settings');
+
+const settingsStore = new Settings();
+
+const registerSettingsEventHandlers = (mainWindow) => {
+  ipcMain.handle('renderer:settings-window-ready', async (event) => {
+    const savedSettings = settingsStore.getAll();
+
+    mainWindow.webContents.send('main:saved-settings', savedSettings);
+  });
+
+  ipcMain.handle('renderer:add-logsyncconfig', async (event, config) => {
+    try {
+      settingsStore.addLogSyncConfig(...config);
+      const savedSettings = settingsStore.getAll();
+
+      mainWindow.webContents.send('main:saved-settings', savedSettings);
+    } catch (error) {
+      return Promise.reject(error);
+    }
+  });
+};
+
+module.exports = registerSettingsEventHandlers;