use grpc method to call

wechaty · Jul 2, 2020 · 9b3b5f7 · 9b3b5f7
1 parent 13be9df
commit 9b3b5f7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/wechaty-puppet-hostie/src/main/scala/wechaty/hostie/support/ContactRawSupport.scala b/wechaty-puppet-hostie/src/main/scala/wechaty/hostie/support/ContactRawSupport.scala
@@ -1,6 +1,7 @@
 package wechaty.hostie.support
 
 import com.google.protobuf.StringValue
+import io.github.wechaty.grpc.PuppetGrpc
 import io.github.wechaty.grpc.puppet.Contact
 import io.github.wechaty.grpc.puppet.Contact.ContactPayloadRequest
 import wechaty.puppet.ResourceBox
@@ -84,7 +85,7 @@ trait ContactRawSupport {
 
   override protected def contactRawPayload(contactID: String): Future[ContactPayload] = {
     val request = ContactPayloadRequest.newBuilder().setId(contactID).build()
-    asyncCallback(asyncGrpcClient.contactPayload,request){response =>
+    asyncCallback(PuppetGrpc.getContactPayloadMethod,request){ response =>
       val contact = new ContactPayload
       contact.id = response.getId
       contact.gender = wechaty.puppet.schemas.Contact.ContactGender.apply(response.getGenderValue)

diff --git a/wechaty-puppet-hostie/src/main/scala/wechaty/hostie/support/GrpcSupport.scala b/wechaty-puppet-hostie/src/main/scala/wechaty/hostie/support/GrpcSupport.scala
@@ -9,8 +9,8 @@ import io.github.wechaty.grpc.puppet.Contact.ContactPayloadRequest
 import io.github.wechaty.grpc.puppet.{Base, Contact}
 import io.github.wechaty.grpc.puppet.Event.EventRequest
 import io.grpc.stub.ClientCalls.asyncUnaryCall
-import io.grpc.stub.StreamObserver
-import io.grpc.{ClientCall, ManagedChannel, ManagedChannelBuilder}
+import io.grpc.stub.{ClientCalls, StreamObserver}
+import io.grpc.{ClientCall, ManagedChannel, ManagedChannelBuilder, MethodDescriptor}
 import wechaty.hostie.PuppetHostie
 import wechaty.puppet.schemas.Contact.ContactPayload
 
@@ -139,14 +139,14 @@ trait GrpcSupport {
     }
   }
 
-  type ClientCall[ReqT,RespT]=(ReqT,StreamObserver[RespT])=>Unit
   type ClientCallback[RespT,T]=RespT => T
-  protected def asyncCall[ReqT,RespT](call: ClientCall[ReqT, RespT], req: ReqT): Unit = {
+  protected def asyncCall[ReqT,RespT](call: MethodDescriptor[ReqT, RespT], req: ReqT): Unit = {
     asyncCallback(call,req)(resp=> resp)
   }
-  protected def asyncCallback[ReqT,RespT,T](call: ClientCall[ReqT, RespT], req: ReqT)(callback:ClientCallback[RespT,T]):Future[T]= {
+  def asyncCallback[ReqT, RespT,T](callMethod: MethodDescriptor[ReqT, RespT], req: ReqT)(callback:ClientCallback[RespT,T]): Future[T]= {
+    val call = channel.newCall(callMethod,asyncGrpcClient.getCallOptions)
     val promise = Promise[T]
-    call(req,new StreamObserver[RespT] {
+    ClientCalls.asyncUnaryCall(call,req,new StreamObserver[RespT] {
       override def onNext(value: RespT): Unit = {
         val result = callback(value)
         promise.success(result)

diff --git a/wechaty-puppet-padplus/src/main/scala/wechaty/padplus/support/LocalStoreSupport.scala b/wechaty-puppet-padplus/src/main/scala/wechaty/padplus/support/LocalStoreSupport.scala
@@ -8,6 +8,8 @@ import wechaty.padplus.schemas.ModelMessage.PadplusMessagePayload
 import wechaty.padplus.schemas.ModelRoom.{PadplusRoomMemberMap, PadplusRoomPayload}
 import wechaty.puppet.schemas.Puppet.objectMapper
 
+import scala.language.implicitConversions
+
 /**
   *
   * @author <a href="mailto:[email protected]">Jun Tsai</a>