fix arg handling

MemeLabs · Oct 25, 2021 · d068cc0 · d068cc0
1 parent 99405e6
commit d068cc0
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/examples/ts-go-ipc/go.mod b/examples/ts-go-ipc/go.mod
@@ -6,7 +6,7 @@ replace github.com/MemeLabs/protobuf => ../../
 
 require (
 	github.com/MemeLabs/protobuf v0.1.15
-	github.com/golang/protobuf v1.5.2
+	github.com/golang/protobuf v1.5.2 // indirect
 	go.uber.org/zap v1.16.0
 	google.golang.org/protobuf v1.26.0
 )
diff --git a/examples/ts-go-ipc/go.sum b/examples/ts-go-ipc/go.sum
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@memelabs/protobuf",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "",
   "license": "MIT",
   "repository": {

diff --git a/pkg/rpc/server.go b/pkg/rpc/server.go
@@ -69,7 +69,7 @@ type ServiceDispatcher struct {
 func (h *ServiceDispatcher) RegisterMethod(name string, method interface{}) {
 	h.methods[name] = serviceMethod{
 		fn:                reflect.ValueOf(method),
-		arg:               reflect.TypeOf(method).In(1),
+		arg:               reflect.TypeOf(method).In(1).Elem(),
 		requestCount:      serverRequestCount.WithLabelValues(name),
 		requestDurationMs: serverRequestDurationMs.WithLabelValues(name),
 		errorCount:        serverRequestCount.WithLabelValues(name),

diff --git a/src/rpc/host.ts b/src/rpc/host.ts
@@ -70,10 +70,10 @@ export default class Host {
 
         switch (res.kind) {
           case Call.Kind.CALL_KIND_DEFAULT:
-            resolve(Message.decode(call.argument));
+            resolve(Message.decode(res.argument));
             break;
           case Call.Kind.CALL_KIND_ERROR:
-            reject(Error.decode(call.argument));
+            reject(Error.decode(res.argument));
             break;
         }
       });