re-integrate graph into app, add timeReceived to SSE responses

Author: nickhealy

SSEController.js

@@ -18,11 +18,12 @@ SSEController.createStream = (reqResObj, options, event) => {
     agent: false,
   });
   req.once('response', (res) => {
-      console.log('wrong thing got response, budy1')
       // update info in reqResObj to reflect fact that connection was succesful
       reqResObj.response.headers = {...res.headers};
       reqResObj.connection = 'open'; 
       reqResObj.connectionType = 'SSE';
+      // this is for purpose of logic in graph.jsx, which needs the entire req/res obj to have a timeReceived
+      reqResObj.timeReceived = Date.now();
       // invoke function that will create an EventSource
       SSEController.readStream(reqResObj, event, Date.now() - startTime);
       req.destroy(); 
@@ -47,7 +48,7 @@ SSEController.readStream = (reqResObj, event, timeDiff) => {
   }; 
   sse.onerror = (err) => {
     console.log('there was an error in SSEController.readStream', err);
-    see.close();
+    sse.close();
   };
 };
 

main_httpController.js

@@ -118,7 +118,7 @@ const httpController = {
 
       client.on("connect", () => {
         http2Connection.status = "connected";
-
+        console.log('about to attach request to http 2 client')
         // attach request, again passing in event so we can send response to renderer with event.sender.send()
         this.attachRequestToHTTP2Client(client, event, reqResObj, connectionArray);
       });
@@ -154,6 +154,7 @@ const httpController = {
       reqResObj.request.method !== "GET" &&
       reqResObj.request.method !== "HEAD"
     ) {
+      console.log('if this fires soemthing unexpected is happening')
       reqStream.end(reqResObj.request.body);
     } else {
       console.log("ending request");
@@ -173,8 +174,9 @@ const httpController = {
     let isSSE;
 
     reqStream.on("response", (headers, flags) => {
+      console.log('GOT BACK A RESPONSE, HALLELUJAH')
       // first argumnet of callback to response listener in ClientHttp2Stream is an object containing the receieved HTTP/2 Headers Object, as well as the flags associated with those headers
-      console.log('headers is : ', headers)
+      console.log('headers from line 178 is : ', headers)
       // SSE will have 'stream' in the 'content-type' heading
       isSSE = (headers["content-type"] && headers["content-type"].includes("stream"));
 
@@ -195,8 +197,8 @@ const httpController = {
           setCookie.parse(headers["set-cookie"])
         );
         // send back reqResObj to renderer so it can update the redux store
-        event.sender.send('reqResUpdate', reqResObj);
       }
+      event.sender.send('reqResUpdate', reqResObj);
     });
 
     reqStream.setEncoding("utf8");
@@ -245,8 +247,9 @@ const httpController = {
         event.sender.send('reqResUpdate', reqResObj);
       } else {
         reqResObj.connection = "closed";
-        reqResObj.response.events.push(JSON.parse(data));
+        reqResObj.response.events.push(data ? JSON.parse(data) : '');
         // send back reqResObj to renderer so it can update the redux store
+        console.log('ended, now sending back')
         event.sender.send('reqResUpdate', reqResObj);
       }
     });
@@ -410,10 +413,10 @@ const httpController = {
   // ----------------------------------------------------------------------------
 
   addSingleEvent(event, reqResObj) {
-    console.log('event in addSingleEvent :', event)
     // adds new event to reqResObj and returns it so obj can be sent back to renderer process
     reqResObj.timeReceived = Date.now();
     reqResObj.response.events.push(event);
+    reqResObj.connectionType = 'plain';
     // returns updated reqResObj 
     return reqResObj; 
   },

src/client/components/containers/ContentsContainer.jsx

@@ -1,6 +1,6 @@
 import React, { Component } from "react";
 
-// import GraphContainer from './GraphContainer.jsx';
+import GraphContainer from './GraphContainer.jsx';
 import ReqResContainer from "./ReqResContainer.jsx";
 import NavBarContainer from "./NavBarContainer.jsx";
 
@@ -12,7 +12,7 @@ class Contents extends Component {
   render() {
     return (
       <div className="contents">
-        {/* <GraphContainer/> */}
+        <GraphContainer/>
         <NavBarContainer />
         <ReqResContainer />
       </div>

src/client/components/display/Graph.jsx

@@ -120,6 +120,9 @@ class Graph extends Component {
 
     const newDataSets = [];
     this.props.reqResArray.forEach((reqRes, index) => {
+      console.log('reqRes in graph component : ', reqRes)
+      console.log('should be true :', reqRes.timeReceived > this.state.currentTime)
+      console.log('TIME RECEIVED : ', reqRes.timeReceived, 'CURRENT TIME : ', this.state.currentTime)
       if (
         (reqRes.response.events &&
           reqRes.timeReceived > this.state.currentTime) ||
@@ -221,6 +224,7 @@ class Graph extends Component {
           }
           case "SSE": {
             reqRes.response.events.forEach((event) => {
+              console.log('getting back this time received: ', event.timeReceived)
               if (
                 Date.now() - event.timeReceived <
                 this.state.timeFromNowToDisplay