rename proto to Ss for serverSide vs clientSide streams, refactor main serverSide code

Author: h15200

grpc_mockData/protos/hw2.proto

@@ -7,8 +7,8 @@ service Greeter {
   // Sends a greeting
   rpc SayHello (HelloRequest) returns (HelloReply) {} // single unary stream
   rpc SayHelloNested (HelloNestedRequest) returns (HelloNestedReply) {} // nested unary stream
+  rpc SayHellosSs (HelloRequest) returns (stream HelloReply) {}
   rpc SayHelloCS (stream HelloRequest) returns (HelloReply) {}
-  rpc SayHellos (HelloRequest) returns (stream HelloReply) {}
   rpc SayHelloBidi (stream HelloRequest) returns (stream HelloReply) {}
 }
 

grpc_mockData/server.js

@@ -36,7 +36,7 @@ async function sayHelloNested(ctx) {
 }
 // Server-Side Stream
 // used highland library to manage asynchronous data
-async function sayHellos(ctx) {
+async function sayHellosSs(ctx) {
   ctx.set("SERVER-SIDE STREAM", "true");
   // In case of UNARY and RESPONSE_STREAM calls it is simply the gRPC call's request
 
@@ -130,7 +130,7 @@ function sayHelloBidi(ctx) {
  */
 function main() {
   const app = new Mali(PROTO_PATH, "Greeter");
-  app.use({ sayHello, sayHelloNested, sayHellos, sayHelloCs, sayHelloBidi });
+  app.use({ sayHello, sayHelloNested, sayHellosSs, sayHelloCs, sayHelloBidi });
   app.start(HOSTPORT);
   console.log(`Greeter service running @ ${HOSTPORT}`);
 }

main.js

@@ -552,7 +552,7 @@ ipcMain.on("fetch-meta-and-client", (event, data) => {
   const { reqResObj } = data;
   const { rpcType } = data;
   const PROTO_PATH = reqResObj.protoPath;
-  const { packageName, service, url, rpc } = data.reqResObj;
+  const { packageName, service, url, rpc, queryArr } = data.reqResObj;
 
   const packageDefinition = protoLoader.loadSync(PROTO_PATH, {
     keepCase: true,
@@ -620,7 +620,6 @@ ipcMain.on("fetch-meta-and-client", (event, data) => {
     const call = client[rpc](meta, function (error, response) {
       if (error) {
         console.log("error in client stream", error);
-        return undefined;
       }
       //Close Connection for client Stream
       reqResObj.connection = "closed";
@@ -630,15 +629,16 @@ ipcMain.on("fetch-meta-and-client", (event, data) => {
         reqResObj.timeReceived = time.timeReceived;
       });
       reqResObj.response.events.push(response);
-      store.default.dispatch(actions.reqResUpdate(reqResObj));
-    }).on("metadata", (metadata) => {
-      // if metadata is sent back from the server, analyze and handle
-      const keys = Object.keys(metadata._internal_repr);
-      for (let i = 0; i < keys.length; i += 1) {
-        const key = keys[i];
-        reqResObj.response.headers[key] = metadata._internal_repr[key][0];
-      }
-      store.default.dispatch(actions.reqResUpdate(reqResObj));
+      // update state
+      mainWindow.webContents.send("reqResUpdate", reqResObj);
+    }).on("metadata", (data) => {
+      // metadata is a Map, not an object
+      const metadata = data.internalRepr;
+
+      metadata.forEach((value, key) => {
+        reqResObj.response.headers[key] = value[0];
+      });
+      mainWindow.webContents.send("reqResUpdate", reqResObj);
     });
 
     for (let i = 0; i < queryArr.length; i++) {

src/client/controllers/grpcController.js

@@ -1,21 +1,5 @@
-// import { Router } from "express";
-// import { ipcRenderer } from "electron";
-// import { remote } from "electron";
-// import { Metadata } from "@grpc/grpc-js";
-
-import * as store from "../store";
-import * as actions from "../actions/actions";
-
 const { api } = window;
 
-// const async = require("async");
-// const fs = require("fs");
-// const parseArgs = require("minimist");
-// const path = require("path");
-
-// const grpc = require("@grpc/grpc-js");
-// const protoLoader = require("@grpc/proto-loader");
-
 const grpcController = {};
 
 grpcController.openGrpcConnection = (reqResObj, connectionArray) => {
@@ -57,9 +41,9 @@ grpcController.openGrpcConnection = (reqResObj, connectionArray) => {
     }
   }
 
-  console.log("foundService", foundService);
-  console.log("foundRpc", foundRpc);
-  console.log("rpcType", rpcType);
+  // console.log("foundService", foundService);
+  // console.log("foundRpc", foundRpc);
+  // console.log("rpcType", rpcType);
 
   // build gRPC package definition with protoLoader module
   const PROTO_PATH = reqResObj.protoPath;

src/client/controllers/reqResController.js

@@ -62,10 +62,6 @@ const connectionController = {
     else if (/wss?:\/\//.test(reqResObj.protocol))
       wsController.openWSconnection(reqResObj, this.openConnectionArray);
     else if (reqResObj.gRPC) {
-      console.log(
-        "reqResObj INSIDE reqResController BEFORE sending to GRPC controller",
-        reqResObj
-      );
       grpcController.openGrpcConnection(reqResObj);
     } else {
       console.log("should be sending");