Add a ThenableCall base class for the promise-based unaryCall function

grpc · Jun 10, 2020 · 63ebf39 · 63ebf39
1 parent b80a65f
commit 63ebf39
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/javascript/net/grpc/web/abstractclientbase.js b/javascript/net/grpc/web/abstractclientbase.js
@@ -97,17 +97,18 @@ AbstractClientBase.prototype.rpcCall = function(
 
 /**
  * @abstract
+ * @protected
  * @template REQUEST, RESPONSE
  * @param {string} method The method to invoke
  * @param {REQUEST} requestMessage The request proto
  * @param {!Object<string, string>} metadata User defined call metadata
  * @param {!MethodDescriptor<REQUEST, RESPONSE>|
  *     !AbstractClientBase.MethodInfo<REQUEST,RESPONSE>}
  *   methodDescriptor Information of this RPC method
- * @return {!Promise<!RESPONSE>}
+ * @return {!IThenable <!RESPONSE>}
  *   A promise that resolves to the response message
  */
-AbstractClientBase.prototype.unaryCall = function(
+AbstractClientBase.prototype.thenableCall = function(
     method, requestMessage, metadata, methodDescriptor) {};
 
 

diff --git a/javascript/net/grpc/web/grpcwebclientbase.js b/javascript/net/grpc/web/grpcwebclientbase.js
@@ -33,6 +33,7 @@ const ClientReadableStream = goog.require('grpc.web.ClientReadableStream');
 const Error = goog.require('grpc.web.Error');
 const GrpcWebClientReadableStream = goog.require('grpc.web.GrpcWebClientReadableStream');
 const HttpCors = goog.require('goog.net.rpc.HttpCors');
+const MethodDescriptor = goog.requireType('grpc.web.MethodDescriptor');
 const MethodType = goog.require('grpc.web.MethodType');
 const Request = goog.require('grpc.web.Request');
 const StatusCode = goog.require('grpc.web.StatusCode');
@@ -112,7 +113,7 @@ GrpcWebClientBase.prototype.rpcCall = function(
  * @override
  * @export
  */
-GrpcWebClientBase.prototype.unaryCall = function(
+GrpcWebClientBase.prototype.thenableCall = function(
     method, requestMessage, metadata, methodDescriptor) {
   methodDescriptor = AbstractClientBase.ensureMethodDescriptor(
       method, requestMessage, MethodType.UNARY, methodDescriptor);
@@ -144,6 +145,23 @@ GrpcWebClientBase.prototype.unaryCall = function(
   return unaryResponse.then((response) => response.getResponseMessage());
 };
 
+/**
+ * @export
+ * @param {string} method The method to invoke
+ * @param {REQUEST} requestMessage The request proto
+ * @param {!Object<string, string>} metadata User defined call metadata
+ * @param {!MethodDescriptor<REQUEST, RESPONSE>|
+ *     !AbstractClientBase.MethodInfo<REQUEST,RESPONSE>}
+ *   methodDescriptor Information of this RPC method
+ * @return {!Promise<RESPONSE>}
+ * @template REQUEST, RESPONSE
+ */
+GrpcWebClientBase.prototype.unaryCall = function(
+    method, requestMessage, metadata, methodDescriptor) {
+  return /** @type {!Promise<RESPONSE>}*/ (
+      this.thenableCall(method, requestMessage, metadata, methodDescriptor));
+};
+
 
 /**
  * @override