Merge conflicts resolved

Author: pavel-pythagora

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pythagora",
-  "version": "0.0.78",
+  "version": "0.0.79",
   "author": {
     "name": "Zvonimir Sabljic",
     "email": "[email protected]"

src/helpers/api.js

@@ -41,13 +41,18 @@ function setOptions({path, method, headers}) {
 
 async function makeRequest(data, options, customLogFunction) {
     let gptResponse = '';
-    let end = false;
     let httpModule = options.protocol === 'http' ? require('http') : require('https');
+    let timeout;
 
     return new Promise((resolve, reject) => {
         const req = httpModule.request(_.omit(options, ['protocol']), function(res){
             res.on('data', (chunk) => {
                 try {
+                    clearTimeout(timeout);
+                    timeout = setTimeout(() => {
+                        reject(new Error("Request timeout"));
+                    }, 30000);
+
                     let stringified = chunk.toString();
                     try {
                         let json = JSON.parse(stringified);
@@ -58,11 +63,14 @@ async function makeRequest(data, options, customLogFunction) {
                     } catch (e) {}
 
                     gptResponse += stringified;
+                    if (gptResponse.indexOf('pythagora_end:') > -1) return;
                     if (customLogFunction) customLogFunction(gptResponse);
                     else process.stdout.write(stringified);
                 } catch (e) {}
             });
             res.on('end', async function ()  {
+                clearTimeout(timeout);
+
                 process.stdout.write('\n');
                 if (res.statusCode >= 400) return reject(new Error(`Response status code: ${res.statusCode}. Error message: ${gptResponse}`));
                 if (gptResponse.error) return reject(new Error(`Error: ${gptResponse.error.message}. Code: ${gptResponse.error.code}`));
@@ -73,6 +81,7 @@ async function makeRequest(data, options, customLogFunction) {
         });
 
         req.on('error', (e) => {
+            clearTimeout(timeout);
             console.error("problem with request:"+e.message);
             reject(e);
         });

src/helpers/starting.js

@@ -7,7 +7,8 @@ const {
     EXPORTED_TESTS_DATA_DIR,
     PYTHAGORA_METADATA_DIR,
     METADATA_FILENAME,
-    EXPORT_METADATA_FILENAME
+    EXPORT_METADATA_FILENAME,
+    PYTHAGORA_UNIT_DIR
 } = require("../const/common");
 let args = require('../utils/getArgs.js');
 
@@ -91,10 +92,19 @@ function startPythagora(args, app) {
 
 function setUpPythagoraDirs() {
     let root = args.pythagora_root;
-    if (!fs.existsSync(path.resolve(root, PYTHAGORA_TESTS_DIR))) fs.mkdirSync(path.resolve(root, PYTHAGORA_TESTS_DIR));
-    if (!fs.existsSync(path.resolve(root, EXPORTED_TESTS_DIR))) fs.mkdirSync(path.resolve(root, EXPORTED_TESTS_DIR));
-    if (!fs.existsSync(path.resolve(root, EXPORTED_TESTS_DATA_DIR))) fs.mkdirSync(path.resolve(root, EXPORTED_TESTS_DATA_DIR));
-    if (!fs.existsSync(path.resolve(root, PYTHAGORA_METADATA_DIR))) fs.mkdirSync(path.resolve(root, PYTHAGORA_METADATA_DIR));
+    const directories = [
+        PYTHAGORA_TESTS_DIR,
+        EXPORTED_TESTS_DIR,
+        EXPORTED_TESTS_DATA_DIR,
+        PYTHAGORA_UNIT_DIR,
+        PYTHAGORA_METADATA_DIR
+    ];
+
+    directories.forEach(directory => {
+        const directoryPath = path.resolve(root, directory);
+        if (!fs.existsSync(directoryPath)) fs.mkdirSync(directoryPath);
+    });
+
     if (!fs.existsSync(path.resolve(root, PYTHAGORA_METADATA_DIR, METADATA_FILENAME))) fs.writeFileSync(path.resolve(root, PYTHAGORA_METADATA_DIR, METADATA_FILENAME), '{}');
     if (!fs.existsSync(path.resolve(root, PYTHAGORA_METADATA_DIR, EXPORT_METADATA_FILENAME))) fs.writeFileSync(path.resolve(root, PYTHAGORA_METADATA_DIR, EXPORT_METADATA_FILENAME), '{}');
 }

src/helpers/unitTests.js

@@ -157,7 +157,6 @@ async function createTests(filePath, funcToTest, processingFunction = 'getUnitTe
     try {
         let extension = path.extname(filePath);
         let ast = await getAstFromFilePath(filePath);
-        const fileIndex = folderStructureTree.findIndex(item => item.absolutePath === filePath);
 
         const foundFunctions = [];
 
@@ -188,6 +187,7 @@ async function createTests(filePath, funcToTest, processingFunction = 'getUnitTe
 
         sortFolderTree(folderStructureTree);
 
+        const fileIndex = folderStructureTree.findIndex(item => item.absolutePath === filePath);
         for (const [i, funcData] of uniqueFoundFunctions.entries()) {
             let indexToPush = fileIndex + 1 + i;
             let prefix = folderStructureTree[fileIndex].line.split(path.basename(folderStructureTree[fileIndex].absolutePath))[0];