properly read file data in multipart form request type in cli

Author: jsajal

packages/flowtest-cli/bin/index.js

@@ -68,7 +68,7 @@ const argv = yargs(hideBin(process.argv))
         try {
           const flowData = serialize(JSON.parse(content));
           // output json output to a file
-          //console.log(chalk.green(JSON.stringify(flowData)));
+
           const logger = new GraphLogger();
           const startTime = Date.now();
           const g = new Graph(
@@ -80,13 +80,11 @@ const argv = yargs(hideBin(process.argv))
             logger,
           );
           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 root directory of collection. Ignore if already doing that. \n',
-              ),
-            );
-          }
+          console.log(
+            chalk.blue(
+              'Right now CLI commands must be run from root directory of collection. We will gradually add support to run commands from anywhere inside the collection. \n',
+            ),
+          );
           const result = await g.run();
           console.log('\n');
           if (result.status === 'Success') {

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

@@ -3,6 +3,10 @@ const Node = require('./node');
 const axios = require('axios');
 const chalk = require('chalk');
 const { LogLevel } = require('../GraphLogger');
+const FormData = require('form-data');
+const { extend, cloneDeep } = require('lodash');
+const fs = require('fs');
+const path = require('path');
 
 const newAbortSignal = () => {
   const abortController = new AbortController();
@@ -113,19 +117,16 @@ class requestNode extends Node {
           : JSON.parse('{}');
       } else if (this.nodeData.requestBody.type === 'form-data') {
         contentType = 'multipart/form-data';
-        requestData = {
-          key: computeVariables(this.nodeData.requestBody.body.key, variablesDict),
-          value: this.nodeData.requestBody.body.value,
-          name: this.nodeData.requestBody.body.name,
-        };
+        const params = cloneDeep(this.nodeData.requestBody.body);
+        requestData = params;
       }
     }
 
     const options = {
       method: restMethod,
       url: finalUrl,
       headers: {
-        'Content-type': contentType,
+        'content-type': contentType,
       },
       data: requestData,
     };
@@ -141,12 +142,23 @@ class requestNode extends Node {
 
   async runHttpRequest(request) {
     try {
-      if (request.headers['Content-type'] === 'multipart/form-data') {
-        const requestData = new FormData();
-        const file = await convertBase64ToBlob(request.data.value);
-        requestData.append(request.data.key, file, request.data.name);
+      if (request.headers['content-type'] === 'multipart/form-data') {
+        const formData = new FormData();
+        const params = request.data;
+        await params.map(async (param, index) => {
+          if (param.type === 'text') {
+            formData.append(param.key, param.value);
+          }
+
+          if (param.type === 'file') {
+            let trimmedFilePath = param.value.trim();
+
+            formData.append(param.key, fs.createReadStream(trimmedFilePath), path.basename(trimmedFilePath));
+          }
+        });
 
-        request.data = requestData;
+        request.data = formData;
+        extend(request.headers, formData.getHeaders());
       }
 
       // assuming 'application/json' type

packages/flowtest-cli/package.json

@@ -17,6 +17,7 @@
     "boxen": "^7.1.1",
     "chalk": "^3.0.0",
     "dotenv": "^16.4.5",
+    "form-data": "^4.0.0",
     "fs": "^0.0.1-security",
     "lodash": "^4.17.21",
     "omelette": "^0.4.17",

packages/flowtest-electron/package.json

@@ -43,6 +43,7 @@
     "dotenv": "^16.4.5",
     "electron-store": "^8.1.0",
     "flatted": "^3.3.1",
+    "form-data": "^4.0.0",
     "fs": "^0.0.1-security",
     "json-refs": "^3.0.15",
     "langchain": "^0.1.28",