server-side has getPeer method and on metadata and on cancelled

firecomm · Aug 14, 2019 · ac1d6e5 · ac1d6e5
1 parent f0243c5
commit ac1d6e5
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 58 deletions.
diff --git a/examples/firecomm/client.js b/examples/firecomm/client.js
@@ -7,9 +7,9 @@ const firecomm = require("../../index");
 
 let certificate = path.join(__dirname, "/server.crt");
 
-const stub = new firecomm.Stub(routeguide.RouteGuide, "localhost:3000", {
+const stub = new firecomm.Stub(routeguide.RouteGuide, "localhost:3000"/*, {
   certificate
-});
+}*/);
 
 // const healthStub = new firecomm.HealthStub("localhost:3000");
 

diff --git a/examples/firecomm/server.js b/examples/firecomm/server.js
@@ -38,10 +38,11 @@ server.addService(
 let certPath = path.join(__dirname, "/server.crt");
 let keyPath = path.join(__dirname, "/server.key");
 
-const result = server.bind(["0.0.0.0:3000", "192.168.10.82:3001"], {
+// const result = 
+server.bind(["0.0.0.0:3000", "192.168.10.82:3001"]/*, {
   privateKey: keyPath,
   certificate: certPath
-});
+}*/);
 // console.log({ result });
 // console.log({ server });
 // console.log(server.__proto__);

diff --git a/lib/callFactories/callDecorators/basicCallDecorator.js b/lib/callFactories/callDecorators/basicCallDecorator.js
@@ -2,4 +2,7 @@ module.exports = function(customCall, originalCall) {
   customCall.call = originalCall;
   customCall.state = null;
   customCall.head = originalCall.metadata;
+  customCall.getPeer = function() {
+    return originalCall.getPeer();
+  };
 };
diff --git a/lib/callFactories/callDecorators/clientStreamDecorator.js b/lib/callFactories/callDecorators/clientStreamDecorator.js
@@ -5,12 +5,16 @@
 module.exports = function(customCall, originalCall) {
   customCall.on = function(event, callback) {
     if (typeof event === "function") {
-      this.call.on("data", event);
+      originalCall.on("data", event);
     } else if (typeof event === "string") {
       if (event === "data") {
-        this.call.on("data", callback);
+        originalCall.on("data", callback);
+      } else if (event === "metadata") {
+        callback(this.head);
+      } else if (event === "cancelled") {
+        originalCall.on("cancelled", callback);
       } else {
-        this.call.on(event, callback);
+        originalCall.on(event, callback);
       }
     } else {
       throw new Error(

diff --git a/lib/callFactories/callDecorators/clientUnaryDecorator.js b/lib/callFactories/callDecorators/clientUnaryDecorator.js
@@ -18,15 +18,17 @@ module.exports = function clientUnaryDecorator(customCall, originalCall) {
     } else {
       if (typeof string !== "string") {
         throw new Error(
-          '.on takes "data" parameter and a callback to be invoked on data, or just the callback.'
+          '.on takes "data" or "metadata" parameter and a callback to be invoked on data, or just the callback.'
         );
       } else {
         if (string === "data") {
           callback(this.body);
         } else if (string === "metadata") {
           callback(this.head);
+        } else if (event === "cancelled") {
+          originalCall.on("cancelled", callback);
         } else {
-          throw new Error('Only the "data" event is support by unary .on');
+          throw new Error('Only the "data" and "metadata" events are supported by unary .on');
         }
       }
     }

diff --git a/lib/callFactories/callDecorators/serverStreamDecorator.js b/lib/callFactories/callDecorators/serverStreamDecorator.js
@@ -21,7 +21,7 @@ module.exports = function serverStreamDecorator(customCall, originalCall) {
         "Please pass your error details as an Error class. Firecomm supports adding additional error metadata in the trailers property using context.setStatus()"
       );
     }
-    this.call.emit("error", err);
+    originalCall.emit("error", err);
     return this;
   };
 
@@ -41,12 +41,16 @@ module.exports = function serverStreamDecorator(customCall, originalCall) {
     return this;
   };
 
+  // customCall.write = function(...args) {
+  //   customCall.send(...args);
+  // }
+
   customCall.send = function(message) {
     if (!this.metadataSent && this.metadata) {
       const metadata = generateMeta(this.metadata);
-      this.call.sendMetadata(metadata);
+      originalCall.sendMetadata(metadata);
     }
-    this.call.write(message);
+    originalCall.write(message);
   };
   return this;
 };
diff --git a/lib/callFactories/callDecorators/serverUnaryDecorator.js b/lib/callFactories/callDecorators/serverUnaryDecorator.js
@@ -1,24 +1,23 @@
 const grpc = require("grpc");
 const generateMeta = require("../../utils/generateMeta");
-// server unary
 
-// .send () // writes
-// .throw passes everything into call... if they pass a second parameter it becomes trailers
-// set() adds things to the metadata...
+module.exports = function serverUnaryDecorator(customCall, sendCallback) {
+  customCall.metadata = undefined;
+  customCall.sendCallback = sendCallback;
 
-module.exports = function serverUnaryDecorator(clone, sendCallback) {
-  clone.metadata = undefined;
-  clone.sendCallback = sendCallback;
+  // customCall.write = function(...args) {
+  //   customCall.send(...args);
+  // }
 
-  clone.send = function(message, flags) {
+  customCall.send = function(message, flags) {
     if (this.metadata) {
       this.call.sendMetadata(generateMeta(this.metadata));
     }
     this.sendCallback(null, message, null, flags);
     return this;
   };
 
-  clone.set = function(object, options) {
+  customCall.set = function(object, options) {
     // loop through
     if (typeof object !== "object") {
       throw new Error("Set should be passed an object with string values.");
@@ -34,7 +33,7 @@ module.exports = function serverUnaryDecorator(clone, sendCallback) {
     return this;
   };
 
-  clone.throw = function(err, trailers) {
+  customCall.throw = function(err, trailers) {
     if (!(err instanceof Error)) {
       throw new Error(
         "Please pass your error details as an Error class. Firecomm supports adding additional error metadata in the trailers property using call.setStatus()"
@@ -60,40 +59,4 @@ module.exports = function serverUnaryDecorator(clone, sendCallback) {
     this.sendCallback(err, {}, this.trailers);
     return this;
   };
-  //   ServerUnaryCallClone.send = function(message = {}) {
-  //     if (this.metaData) {
-  //       this.sendMetadata(this.metaData);
-  //     }
-  //     this.sendCallback(this.err, message, this.trailer);
-  //   };
-  //   return ServerUnaryCallClone;
-  // }
-
-  // ServerUnaryCallClone.throw = function(err) {
-  //   if (!(err instanceof Error)) {
-  //     throw new Error(
-  //       "Please pass your error details as an Error class. Firecomm supports adding additional error metadata in the trailers property using call.setStatus()"
-  //     );
-  //   }
-  //   this.sendCallback(err, {}, this.trailer);
-  // };
-  // ServerUnaryCallClone.setMeta = function(metaObject) {
-  //   if (!this.metaData) {
-  //     this.metaData = new grpc.Metadata();
-  //   }
-  //   const keys = Object.keys(metaObject);
-  //   for (let i = 0; i < keys.length; i++) {
-  //     this.metaData.set(keys[i], metaObject[keys[i]]);
-  //   }
-  // };
-
-  // ServerUnaryCallClone.setStatus = function(metaObject) {
-  //   if (!this.trailer) {
-  //     this.trailer = new grpc.Metadata();
-  //   }
-  //   const keys = Object.keys(metaObject);
-  //   for (let i = 0; i < keys.length; i++) {
-  //     this.trailer.set(keys[i], metaObject[keys[i]]);
-  //   }
-  // };
 };