Merge pull request #53 from oslabs-beta/grpcTesting

Fix problems with webpackconfig that was preventing build

Author: danst3in

main.js

@@ -168,6 +168,7 @@ function createWindow() {
     });
   }
   else {
+    console.log('__dirname', __dirname);
     indexPath = url.format({// if we are not in dev mode load production build file
       protocol: 'file:',
       pathname: path.join(__dirname, 'dist', 'index.html'),
@@ -221,7 +222,7 @@ app.on('ready', () => {
 app.on('window-all-closed', () => {
   // On macOS it is common for applications and their menu bar
   // to stay active until the user quits explicitly with Cmd + Q
-  if (process.platform !== 'darwin') {//darwin refers to macOS... 
+  if (process.platform !== 'darwin') {//darwin refers to macOS...
     app.quit();// If User is on mac exit the program when all windows are closed
   }
 });
@@ -287,13 +288,13 @@ ipcMain.on('export-collection', (event, args) => {
           return;
       }
 
-      // fileName is a string that contains the path and filename created in the save file dialog.  
+      // fileName is a string that contains the path and filename created in the save file dialog.
       fs.writeFile(resp.filePath, content, (err) => {
           if(err){
               console.log("An error ocurred creating the file "+ err.message)
           }
         })
-    
+
   })})
 
 
@@ -349,10 +350,10 @@ ipcMain.on('import-collection', (event, args) => {
 
         if (parsed) {
           // validate parsed data type and properties
-          if (typeof parsed !== 'object' || 
-          !parsed['id'] || 
-          !parsed['name'] || 
-          !parsed['reqResArray'] || 
+          if (typeof parsed !== 'object' ||
+          !parsed['id'] ||
+          !parsed['name'] ||
+          !parsed['reqResArray'] ||
           !parsed['created_at']) {
             options.message = 'Invalid File';
             options.detail = 'Please try again.';
@@ -368,7 +369,7 @@ ipcMain.on('import-collection', (event, args) => {
 })
 
 
-// ipcMain listener that 
+// ipcMain listener that
 ipcMain.on('http1-fetch-message', (event, arg) => {
   const { method, headers, body } = arg.options;
 
@@ -377,18 +378,18 @@ ipcMain.on('http1-fetch-message', (event, arg) => {
       const headers = response.headers.raw();
       // check if the endpoint sends SSE
         // add status code for regular http requests in the response header
-        
+
         if (headers['content-type'][0].includes('stream')) {
           // invoke another func that fetches to SSE and reads stream
           // params: method, headers, body
           event.sender.send('http1-fetch-reply', { headers, body: { error: 'This Is An SSE endpoint' } })
          }
         else {
           headers[':status'] = response.status;
-  
+
           const receivedCookie = headers['set-cookie'];
           headers.cookies = receivedCookie;
-  
+
           const contents = /json/.test(response.headers.get('content-type')) ? response.json() : response.text();
           contents
             .then(body => {
@@ -441,7 +442,7 @@ ipcMain.on('open-gql', (event, args) => {
             const parsedRemainingCookieProperties = cookie.parse(thisCookie.slice(idx + 1));
 
             const parsedCookie = {...parsedRemainingCookieProperties, name: keyValueArr[0], value: keyValueArr[1]};
-  
+
             parsedCookies.push(parsedCookie);
           })
           reqResObj.response.cookies = parsedCookies;
@@ -487,4 +488,3 @@ ipcMain.on('open-gql', (event, args) => {
       });
   }
 });
-

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "Swell",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Swell",
   "main": "main.js",
   "repository": "https://github.com/open-source-labs/Swell",
@@ -82,6 +82,31 @@
       "name": "Sam Parsons",
       "email": "samparsons269@gmail.com",
       "url": "https://github.com/sam-parsons"
+    },
+    {
+      "name": "Dan Stein",
+      "email": "50937807+danst3in@users.noreply.github.com",
+      "url": "https://github.com/danst3in"
+    },
+    {
+      "name": "Evan Grobar",
+      "email": "egrobar@gmail.com",
+      "url": "https://github.com/egrobar"
+    },
+    {
+      "name": "Nancy Dao",
+      "email": "nancyddao@gmail.com",
+      "url": "https://github.com/nancyddao"
+    },
+    {
+      "name": "Yoon Choi",
+      "email": "choi.yoon333@gmail.com",
+      "url": "https://github.com/cyoonique"
+    },
+    {
+      "name": "Amruth Uppaluri",
+      "email": "amruth@uppaluri.org",
+      "url": "https://github.com/amuuth"
     }
   ],
   "build": {
@@ -99,6 +124,7 @@
       "main.js",
       "httpserver.js"
     ],
+    "nodeVersion":"12.14.1",
     "nsis": {
       "createDesktopShortcut": "always"
     },
@@ -150,7 +176,7 @@
   "license": "MIT",
   "homepage": "http://www.getswell.io",
   "engines": {
-    "node": ">=12.0.0",
+    "node": ">=12.14.1",
     "npm": ">=6.0.0"
   },
   "dependencies": {

package.json

@@ -38,7 +38,7 @@ grpcController.openGrpcConnection = (reqResObj, connectionArray) => {
     if (reqResObj.response.headers === null) {
       reqResObj.response.headers = {};
     }
-    
+
     // go through services object, find service where name matches our passed
     // in service, then grab the rpc list of that service, also save that service
     let rpcList;
@@ -183,7 +183,7 @@ grpcController.openGrpcConnection = (reqResObj, connectionArray) => {
           // request without overwrite
           reqResObj.connection = 'pending';
           reqResObj.connectionType = 'plain';
-          reqResObj.timeReceived = Date.now();
+          reqResObj.timeSent = Date.now();
           call.write(query);
           // add console log for completed write?
         }

saveProto.proto

@@ -1,8 +1,10 @@
 const webpack = require('webpack');
 const path = require('path');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
-const BabiliPlugin = require('babili-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const TerserPlugin = require('terser-webpack-plugin');
+const nodeExternals = require('webpack-node-externals');
+
 
 // Any directories you will be adding code/files into,
 // need to be added to this array so webpack will pick them up
@@ -46,6 +48,11 @@ module.exports = {
     ],
   },
   target: 'electron-renderer',
+  optimization: {
+   minimize: true,
+   minimizer: [new TerserPlugin({})],
+  },
+  externals: [nodeExternals()],
   plugins: [
     new HtmlWebpackPlugin(),
     new MiniCssExtractPlugin({
@@ -57,7 +64,6 @@ module.exports = {
     new webpack.DefinePlugin({
       'process.env.NODE_ENV': JSON.stringify('production'),
     }),
-    new BabiliPlugin(),
   ],
   stats: {
     colors: true,