@vyr/service-rpc 0.0.19 → 0.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vyr/service-rpc",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "description": "",
   "main": "./src/index.ts",
   "author": "",

package/src/RpcService.ts

@@ -1,5 +1,5 @@
 import axios from 'axios'
-import { Descriptor, Listener } from '@vyr/engine'
+import { Serialization, Listener } from '@vyr/engine'
 import { Service } from '@vyr/service'
 import { path, tokenKey, topic, Confirm, Message } from '@vyr/service-rpc-universal'
 
@@ -55,7 +55,7 @@ class RpcService extends Service {
         this.socket = new window.io(location.href, params)
 
         this.socket.on(topic, (content: string) => {
-            const msg = Descriptor.deserialization<Message>(content)
+            const msg = Serialization.parse(content) as Message
             if (msg.message !== undefined) return config.notify(msg.message)
             this._delayTrigger(msg)
         })
@@ -106,7 +106,7 @@ class RpcService extends Service {
     trigger<T extends Message = Message>(method: string, msg: T) {
         this._listener.trigger(method, msg)
     }
-    listen<T extends Message = Message>(method: string, cb: (msg: T) => void) {
+    listen<T extends Message = Message>(method: string, cb: (msg: T, ...others: any[]) => void) {
         this._listener.listen(method, cb)
     }
     unlisten<T extends Message = Message>(method: string, cb: (msg: T) => void) {
@@ -114,8 +114,18 @@ class RpcService extends Service {
     }
 
     /**向服务端发送数据 */
-    send(msg: Message) {
-        this.socket.emit(topic, Descriptor.serialization(msg))
+    send<T extends Message | void = Message>(msg: Message) {
+        return new Promise<T>(resolve => {
+            this.socket.emit(topic, Serialization.stringify(msg), (content: string) => {
+                if (content) {
+                    const msg = Serialization.parse(content)
+                    resolve(msg as T)
+                } else {
+                    //@ts-ignore
+                    resolve()
+                }
+            })
+        })
     }
 }