able to pass back send request to trpc controller as well as started working on pasing option

Author: nqnguyen1

main.js

@@ -33,7 +33,6 @@
 // ** Entry point for Electron **
 const { app, BrowserWindow, ipcMain, dialog, shell } = require('electron');
 
-
 const { autoUpdater } = require('electron-updater');
 const {
   default: installExtension,
@@ -61,7 +60,6 @@ require('./main_process/main_grpcController.js')();
 require('./main_process/main_wsController.js')();
 require('./main_process/main_mockController.js')();
 
-
 // require mac touchbar
 const { touchBar } = require('./main_process/main_touchbar.js');
 
@@ -218,8 +216,6 @@ app.on('ready', () => {
   }
 });
 
-
-
 // Quit when all windows are closed.
 app.on('window-all-closed', () => {
   if (mockServerProcess) {
@@ -427,9 +423,13 @@ ipcMain.on('import-proto', (event) => {
         if (err) {
           return console.log('import-proto error reading file : ', err);
         }
-        
+
         protoParserFunc(importedProto).then((protoObj) => {
-          mainWindow.webContents.send('proto-info', JSON.stringify(importedProto), JSON.stringify(protoObj));
+          mainWindow.webContents.send(
+            'proto-info',
+            JSON.stringify(importedProto),
+            JSON.stringify(protoObj)
+          );
         });
       });
     })
@@ -442,8 +442,11 @@ ipcMain.on('import-proto', (event) => {
 // Runs the function and returns the value back to GRPCProtoEntryForm
 ipcMain.on('protoParserFunc-request', async (event, data) => {
   try {
-    const result = await protoParserFunc(data)
-    mainWindow.webContents.send('protoParserFunc-return', JSON.stringify(result));
+    const result = await protoParserFunc(data);
+    mainWindow.webContents.send(
+      'protoParserFunc-return',
+      JSON.stringify(result)
+    );
   } catch (err) {
     console.log('error in protoParserFunc-request:, ', err);
     mainWindow.webContents.send('protoParserFunc-return', { error: err });
@@ -464,28 +467,30 @@ ipcMain.on('import-openapi', (event) => {
     .then((filePaths) => {
       if (!filePaths) return undefined;
       // read uploaded document & save in the redux store
-      fs.readFile(filePaths.filePaths[0], 'utf-8', async (err, importedFile) => {
-        // handle read error
-        if (err) {
-          return console.log('import-openapi error reading file : ', err);
-        }
-
-        try {
-          const documentObj = await openapiParserFunc(importedFile);
-          // console.log('Main.js - Working here!',documentObj);
-          mainWindow.webContents.send('openapi-info', documentObj);
-        } catch (err) {
-          return console.log('import-openapi error reading file : ', err);
+      fs.readFile(
+        filePaths.filePaths[0],
+        'utf-8',
+        async (err, importedFile) => {
+          // handle read error
+          if (err) {
+            return console.log('import-openapi error reading file : ', err);
+          }
+
+          try {
+            const documentObj = await openapiParserFunc(importedFile);
+            // console.log('Main.js - Working here!',documentObj);
+            mainWindow.webContents.send('openapi-info', documentObj);
+          } catch (err) {
+            return console.log('import-openapi error reading file : ', err);
+          }
         }
-
-      });
+      );
     })
     .catch((err) => {
       console.log('error in import-openapi', err);
     });
 });
 
-
 /////////////////////////////////////////////////////////////////////////////////
 /////////////////////////////// MOCK SERVER //////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////

main_process/main_httpController.js

@@ -191,13 +191,13 @@ const httpController = {
         reqResObj.connectionType = 'plain';
       }
 
-      // FIXME: There is something wrong with the logic below. 
-      // First, it is checking if the headers have a 'content-length' 
-      // or 'Content-Length' property. If it does not, it sets the 
-      // responseSize to null. It it does, it checks if the headers have 
-      // a 'content-length' property. If it does, it sets the contentLength 
-      // to 'content-length' or 'Content-Length'. This does not make sense. 
-      // I think it should be setting contentLength to headers['content-length'] 
+      // FIXME: There is something wrong with the logic below.
+      // First, it is checking if the headers have a 'content-length'
+      // or 'Content-Length' property. If it does not, it sets the
+      // responseSize to null. It it does, it checks if the headers have
+      // a 'content-length' property. If it does, it sets the contentLength
+      // to 'content-length' or 'Content-Length'. This does not make sense.
+      // I think it should be setting contentLength to headers['content-length']
       // or headers['Content-Length'].
 
       // check if response comes with 'content-length' header
@@ -209,14 +209,14 @@ const httpController = {
           ? (contentLength = 'content-length')
           : (contentLength = 'Content-Length');
 
-        // FIXME: A previous group used a conversion figure of 1023.89427 to 
-        // convert octets to bytes. This is incorrect because both an octet 
-        // and byte are exactly 8 bits in modern computing. There could, however, 
-        // be some ambiguity because "bytes" may have a different meaning in legacy 
-        // systems. Check out this link for more info: https://en.wikipedia.org/wiki/Octet_(computing). 
-        // If the desired responseSize is in bytes, it is enough to simply assign the value 
+        // FIXME: A previous group used a conversion figure of 1023.89427 to
+        // convert octets to bytes. This is incorrect because both an octet
+        // and byte are exactly 8 bits in modern computing. There could, however,
+        // be some ambiguity because "bytes" may have a different meaning in legacy
+        // systems. Check out this link for more info: https://en.wikipedia.org/wiki/Octet_(computing).
+        // If the desired responseSize is in bytes, it is enough to simply assign the value
         // of the content-length header.
-        
+
         // Converting content length octets into bytes
         const conversionFigure = 1023.89427;
         const octetToByteConversion =
@@ -295,7 +295,7 @@ const httpController = {
       const { method, headers, body } = args.options;
       const response = await fetch(headers.url, { method, headers, body });
       const headersResponse = response.headers.raw();
-
+      event.sender.send('console', 'WHATS UP');
       if (headersResponse['content-type'][0].includes('stream')) {
         return {
           headers: headersResponse,
@@ -334,7 +334,6 @@ const httpController = {
     reqResObj.timeSent = Date.now();
 
     const options = this.parseFetchOptionsFromReqRes(reqResObj);
-
     //-----------------------------------------
     // Check if the URL provided is a stream
     //-----------------------------------------
@@ -404,9 +403,10 @@ const httpController = {
       cookies.forEach((cookie) => {
         const cookieString = `${cookie.key}=${cookie.value}`;
         // attach to formattedHeaders so options object includes this
-        formattedHeaders.cookie = cookieString;
+        formattedHeaders.cookie = formattedHeaders.cookie + ';' + cookieString;
       });
     }
+    console.log(formattedHeaders);
 
     const outputObj = {
       method,

package.json

@@ -20,7 +20,7 @@
     "format": "prettier --write \"**/*.+(js|jsx| tsx| json|css|md)\"",
     "lint": "eslint .",
     "lint:fix": "eslint --fix . ",
-    "dev": "concurrently --success first \"webpack-dev-server --mode=development --config ./webpack.development.js\" \"nodemon ./src/server/server.js\"",
+    "dev": "concurrently --success first \"webpack-dev-server --mode=development --config ./webpack.development.js\" \"nodemon --legacy-watch ./src/server/server.js\"",
     "build": "concurrently --success first \"webpack --mode=production --config ./webpack.production.js\"",
     "prod": "concurrently --success first \"webpack --mode=production --config ./webpack.production.js && electron .\"",
     "package-mac": "webpack --mode=production --config ./webpack.production.js && electron-builder build --x64 --mac",
@@ -215,7 +215,7 @@
     "jest": "26.0.1",
     "mini-css-extract-plugin": "^2.6.0",
     "mocha": "^9.2.2",
-    "nodemon": "^2.0.15",
+    "nodemon": "^2.0.22",
     "nyc": "^15.1.0",
     "playwright": "^1.21.1",
     "postcss-cssnext": "^3.1.0",
@@ -509,3 +509,4 @@
     }
   ]
 }
+

preload.js

@@ -60,7 +60,12 @@ const apiObj = {
   },
   removeAllListeners: (channel, cb) => {
     // allow list channels
-    const allowedChannels = ['reqResUpdate', 'reply-gql', 'protoParserFunc-return', 'openapi-info'];
+    const allowedChannels = [
+      'reqResUpdate',
+      'reply-gql',
+      'protoParserFunc-return',
+      'openapi-info',
+    ];
     if (allowedChannels.includes(channel)) {
       ipcRenderer.removeAllListeners(channel, (event, ...args) => cb(...args));
     } else {
@@ -69,9 +74,9 @@ const apiObj = {
   },
 };
 
-// this is because we need to have context isolation to be false for spectron 
+// this is because we need to have context isolation to be false for spectron
 // tests to run, but context bridge only runs if context isolation is true
-// basically we are assigning certain node functionality (require, ipcRenderer) 
+// basically we are assigning certain node functionality (require, ipcRenderer)
 // to the window object in an UN-isolated context only for testing
 // security is reduced for testing, but remains sturdy otherwise
 

src/client/components/App.tsx

@@ -35,7 +35,6 @@ const App = () => {
     historyController.getHistory();
     collectionsController.getCollections();
   }, []);
-
   /**
    * All of the main components are rendered from here. Excluding the update pop
    * up, there are only 3 main containers for this application.
@@ -67,9 +66,7 @@ const App = () => {
           </ErrorBoundary>
         </Split>
 
-        <ErrorBoundary>
-          {/* <UpdatePopUpContainer /> */}
-        </ErrorBoundary>
+        <ErrorBoundary>{/* <UpdatePopUpContainer /> */}</ErrorBoundary>
       </HashRouter>
     </div>
   );