Merge pull request #51 from oslabs-beta/grpc-nested-testing

gRPC unary nested request and nested sever response and gitignore update

Author: danst3in

.gitignore

@@ -55,3 +55,7 @@ ehthumbs.db
 # Windows shortcuts #
 #####################
 *.lnk
+
+# proto files #
+#####################
+*.proto

grpc_mockData/protos/hw2.proto

@@ -5,7 +5,8 @@ package helloworld;
 // The greeting service definition.
 service Greeter {
   // Sends a greeting
-  rpc SayHello (HelloRequest) returns (HelloReply) {}
+  rpc SayHello (HelloRequest) returns (HelloReply) {} // single unary stream
+  rpc SayHelloNested (HelloNestedRequest) returns (HelloNestedReply) {} // nested unary stream
   rpc SayHelloCS (stream HelloRequest) returns (HelloReply) {}
   rpc SayHellos (HelloRequest) returns (stream HelloReply) {}
   rpc SayHelloBidi (stream HelloRequest) returns (stream HelloReply) {}
@@ -21,6 +22,16 @@ message HelloReply {
   string message = 1;
 }
 
+message HelloNestedRequest {
+  HelloRequest firstPerson = 1;
+  HelloRequest secondPerson = 2; 
+}
+
+message HelloNestedReply {
+  // create array of nested server response
+  repeated HelloReply serverMessage = 1;
+  
+}
 // The request message containing the user's name.
 message HelloHowOldRequest {
   int32 age = 1;

grpc_mockData/server.js

@@ -35,10 +35,10 @@ function sayHello(ctx) {
   metadata.set('indeed', 'it do')
   // Watcher creates a watch execution context for the watch
   // The execution context provides scripts and templates with access to the watch metadata
-  console.log("received metadata from client request", ctx.meta)
-  // console.dir(ctx.metadata, { depth: 3, colors: true });
+  console.log("received metadata from client request", ctx.metadata)
+  console.dir(ctx.metadata, { depth: 3, colors: true });
   console.log(`got sayHello request name: ${ctx.req.name}`);
-  
+
   // an alias to ctx.response.res
   // This is set only in case of DUPLEX calls, to the the gRPC call reference itself
   ctx.res = { message: "Hello " + ctx.req.name };
@@ -49,7 +49,28 @@ function sayHello(ctx) {
 
   console.log(`set sayHello response: ${ctx.res.message}`);
 }
+// nested Unary stream
+
+function sayHelloNested(ctx) {
+  // create new metadata
+  let metadata = new grpc.Metadata();
+  metadata.set('it', 'works?')
+  metadata.set('indeed', 'it do')
+  // Watcher creates a watch execution context for the watch
+  // The execution context provides scripts and templates with access to the watch metadata
+  console.log("received metadata from client request", ctx.metadata)
+  console.dir(ctx.metadata, { depth: 3, colors: true });
+  // console.log("ctx line 64 from server.js", ctx)
+
+  // nested unary response call
+  let firstPerson = ctx.req.firstPerson.name;
+  let secondPerson = ctx.req.secondPerson.name;
+  console.log("firstPerson line 68 from server.js:", firstPerson)
+  ctx.res = {"serverMessage": [{message: "Hello! " + firstPerson}, {message: 'Hello! ' + secondPerson}]}
 
+  // send response header metadata object directly as an argument and that is set and sent
+  ctx.sendMetadata(metadata)
+}
 // Server-Side Stream
 // used highland library to manage asynchronous data
 async function sayHellos(ctx) {
@@ -64,7 +85,9 @@ async function sayHellos(ctx) {
 
   // alias for ctx.request.req
   // In case of UNARY and RESPONSE_STREAM calls it is simply the gRPC call's request
+  
   let reqMessages = {"message": 'hello!!! ' + ctx.req.name}
+
   dataStream.push(reqMessages)
   reqMessages = dataStream
   let streamData = await hl(reqMessages)
@@ -80,6 +103,7 @@ async function sayHellos(ctx) {
   ctx.res.end()
 }
 
+
 // Client-Side stream
 function sayHelloCs (ctx) {
   // create new metadata
@@ -146,7 +170,7 @@ function sayHelloBidi(ctx) {
  */
 function main() {
   const app = new Mali(PROTO_PATH, "Greeter");
-  app.use({ sayHello, sayHellos, sayHelloCs, sayHelloBidi });
+  app.use({ sayHello, sayHelloNested, sayHellos, sayHelloCs, sayHelloBidi });
   app.start(HOSTPORT);
   console.log(`Greeter service running @ ${HOSTPORT}`);
 }

src/client/components/composer/protos/saveProto.proto

@@ -1,113 +1,39 @@
-
-// Copyright 2015 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 syntax = "proto3";
 
-option java_multiple_files = true;
-option java_package = "io.grpc.examples.routeguide";
-option java_outer_classname = "RouteGuideProto";
-option objc_class_prefix = "RTG";
-
-package routeguide;
-
-// Interface exported by the server.
-service RouteGuide {
-  // A simple RPC.
-  //
-  // Obtains the feature at a given position.
-  //
-  // A feature with an empty name is returned if there's no feature at the given
-  // position.
-  rpc GetFeature(Point) returns (Feature) {}
-
-  // A server-to-client streaming RPC.
-  //
-  // Obtains the Features available within the given Rectangle.  Results are
-  // streamed rather than returned at once (e.g. in a response message with a
-  // repeated field), as the rectangle may cover a large area and contain a
-  // huge number of features.
-  rpc ListFeatures(Rectangle) returns (stream Feature) {}
+package helloworld;
 
-  // A client-to-server streaming RPC.
-  //
-  // Accepts a stream of Points on a route being traversed, returning a
-  // RouteSummary when traversal is completed.
-  rpc RecordRoute(stream Point) returns (RouteSummary) {}
-
-  // A Bidirectional streaming RPC.
-  //
-  // Accepts a stream of RouteNotes sent while a route is being traversed,
-  // while receiving other RouteNotes (e.g. from other users).
-  rpc RouteChat(stream RouteNote) returns (stream RouteNote) {}
+// The greeting service definition.
+service Greeter {
+  // Sends a greeting
+  // rpc SayHello (HelloRequest) returns (HelloReply) {}
+  rpc SayHello (HelloNestedRequest) returns (HelloNestedReply) {}
+  rpc SayHelloCS (stream HelloRequest) returns (HelloReply) {}
+  rpc SayHellos (HelloRequest) returns (stream HelloReply) {}
+  rpc SayHelloBidi (stream HelloRequest) returns (stream HelloReply) {}
 }
 
-// Points are represented as latitude-longitude pairs in the E7 representation
-// (degrees multiplied by 10**7 and rounded to the nearest integer).
-// Latitudes should be in the range +/- 90 degrees and longitude should be in
-// the range +/- 180 degrees (inclusive).
-message Point {
-  int32 latitude = 1;
-  int32 longitude = 2;
+// The request message containing the user's name.
+message HelloRequest {
+  string name = 1;
 }
 
-// A latitude-longitude rectangle, represented as two diagonally opposite
-// points "lo" and "hi".
-message Rectangle {
-  // One corner of the rectangle.
-  Point lo = 1;
-
-  // The other corner of the rectangle.
-  Point hi = 2;
+// The response message containing the greetings
+message HelloReply {
+  string message = 1;
 }
 
-// A feature names something at a given point.
-//
-// If a feature could not be named, the name is empty.
-message Feature {
-  // The name of the feature.
-  string name = 1;
-
-  // The point where the feature is detected.
-  Point location = 2;
+message HelloNestedRequest {
+  HelloRequest firstPerson = 1;
+  HelloRequest secondPerson = 2; 
 }
 
-// A RouteNote is a message sent while at a given point.
-message RouteNote {
-  // The location from which the message is sent.
-  Point location = 1;
-
-  // The message to be sent.
-  string message = 2;
+message HelloNestedReply {
+  repeated HelloReply serverMessage = 1;
 }
-
-// A RouteSummary is received in response to a RecordRoute rpc.
-//
-// It contains the number of individual points received, the number of
-// detected features, and the total distance covered as the cumulative sum of
-// the distance between each point.
-message RouteSummary {
-  // The number of points received.
-  int32 point_count = 1;
-
-  // The number of known features passed while traversing the route.
-  int32 feature_count = 2;
-
-  // The distance covered in metres.
-  int32 distance = 3;
-
-  // The duration of the traversal in seconds.
-  int32 elapsed_time = 4;
+// The request message containing the user's name.
+message HelloHowOldRequest {
+  int32 age = 1;
+}
+message HelloAge {
+  int32 age = 1;
 }
-

src/client/controllers/grpcController.js

@@ -112,16 +112,17 @@ grpcController.openGrpcConnection = (reqResObj, connectionArray) => {
       }
 
       if (rpcType === 'UNARY') {
-        let query = reqResObj.queryArr[0];
+        let query = reqResObj.queryArr[0]
+
         // Open Connection and set time sent for Unary
         reqResObj.connection = 'open';
         reqResObj.timeSent = Date.now();
         // make Unary call
         client[rpc](query, meta, (err, data)=> {
+          console.log("query from line 122 in grpcController", query)
           if (err) {
             console.log('unary error' , err);
           }
-          // console.log('sent UNARY request', data);
           // Close Connection and set time received for Unary
           reqResObj.timeReceived = Date.now();
           reqResObj.connection = 'closed';