client now can listen for metadata and status without interceptors

firecomm · Aug 10, 2019 · 0421d95 · 0421d95
1 parent 60edc01
commit 0421d95
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 15 deletions.
diff --git a/examples/firecomm/client.js b/examples/firecomm/client.js
@@ -9,7 +9,7 @@ let certificate = path.join(__dirname, "/server.crt");
 
 const stub = new firecomm.Stub(routeguide.RouteGuide, "localhost:3000");
 
-const healthStub = new firecomm.HealthStub("localhost:3000");
+// const healthStub = new firecomm.HealthStub("localhost:3000");
 
 // healthStub
 //   .check()
@@ -70,12 +70,14 @@ const firstChat = {
 
 // testClientStream();
 
-const newClient = stub.clientStream({meta: 'data'}, [interceptorProvider])
+const newClient = stub.clientStream()
   .send({message: 'yolo'})
   .send(firstChat)
   .on((data) => console.log({ data }))
+  .on('status', (status) => console.log({ status }))
+  // .on('metadata', (metadata) => console.log({ metadata }))
   .catch(err => console.log({ err }))
-  .retry()
+
 
   setInterval(()=>{
     newClient.send({message:'please'})

diff --git a/lib/clientCalls/clientStreamCall.js b/lib/clientCalls/clientStreamCall.js
@@ -5,11 +5,6 @@ const generateMeta = require("../utils/generateMeta");
 module.exports = function clientStreamCall(that, methodName, first, second) {
   let metadata = null;
   let interceptors = null;
-  let callback = function(err, res) {
-    if (err) clientStreamObj.$catch(err);
-    clientStreamObj.$on(res);
-    return clientStreamObj;
-  };
   if (typeof first === "object") {
     if (Array.isArray(first)) {
       interceptors = { interceptors: first };
@@ -24,12 +19,17 @@ module.exports = function clientStreamCall(that, methodName, first, second) {
       metadata = generateMeta(second);
     }
   }
+  let callback = function(err, res) {
+    if (err) clientStreamObj.$catch(err);
+    clientStreamObj.$on(res);
+  };
   let sender = that[methodName](metadata, interceptors, callback);
   const clientStreamObj = {
-    retry: function(metadata, interceptors) {
-      clientStreamObj.$on
-      sender = that[methodName](metadata, interceptors, callback);
-      return clientStreamObj;
+    // throw: function(metadata) {
+    //   sender.throw()
+    // },
+    getPeer: function() {
+      return sender.getPeer();
     },
     send: function(message, flags, flushCallback) {
       lastMessage = { message, flags, flushCallback };
@@ -48,7 +48,7 @@ module.exports = function clientStreamCall(that, methodName, first, second) {
       clientStreamObj.$catch = first;
       return clientStreamObj;
     },
-    $on: () => {
+    $on: (res) => {
       throw new Error(
         "Client Stream: .catch and .on must be invoked to .send"
       );
@@ -63,7 +63,16 @@ module.exports = function clientStreamCall(that, methodName, first, second) {
       } else {
         listenerCallback = second;
       }
-      clientStreamObj.$on = listenerCallback;
+      switch (first) {
+        case 'status': 
+          sender.on('status', second);
+          break;
+        case 'metadata': 
+          sender.on('metadata', second);
+          break;
+        default: 
+          clientStreamObj.$on = listenerCallback;
+      }
       return clientStreamObj;
     }
   };

diff --git a/lib/custom-services/healthcheck-pkg.js b/lib/custom-services/healthcheck-pkg.js
@@ -6,5 +6,4 @@ const protoLoader = require("../build");
 const PROTO_PATH = path.join(__dirname, "./healthcheck.proto");
 
 const healthcheck = build(PROTO_PATH);
-console.log(healthcheck._serviceName);
 module.exports = healthcheck;