clean up RPC structure

src/Types.ts

@@ -18,36 +18,32 @@ export type SocketConf = {
 
 export type RPCType = 'Hook' | 'Unhook' | 'Call'
 
-export type BaseRPC = { 
+export type HookRPC = {
-    type: RPCType
     name: Name
-}
-
-export type HookRPC = BaseRPC & {
-    type: 'Hook'
     hook: HookFunction
     onCallback?: CallbackFunction,
     onClose?: HookCloseFunction
 }
 
-export type CallRPC = (BaseRPC & {
+export type CallRPC = {
-    type: 'Call'
+    name: Name
     call: AsyncFunction
-} ) | Function
+} | Function
 
 export type RPC = CallRPC | HookRPC
 
 export type BaseInfo = {
+    name: Name,
     owner: Name,
     argNames: Name[],
 }
 
-export type HookInfo = BaseRPC & BaseInfo & { 
+export type HookInfo = BaseInfo & { 
     type: 'Hook', 
     generator: (socket) => HookFunction
 }
 
-export type CallInfo = BaseRPC & BaseInfo & {
+export type CallInfo = BaseInfo & {
     type: 'Call',
     call: AsyncFunction
 }
@@ -56,7 +52,7 @@ export type RpcInfo = HookInfo |  CallInfo
 export type ExtendedRpcInfo = RpcInfo & { uniqueName: string } 
 
 export type OnFunction = (type: 'error' | 'close', f: (e?:any)=>void) => I.Socket
-export type HookCloseFunction = (res:R.SubscriptionResponse) => any
+export type HookCloseFunction = (res:R.SubscriptionResponse, rpc:HookRPC) => any
 export type HookFunction = (...args:any[]) => Promise<R.SubscriptionResponse | R.ErrorResponse>
 export type AsyncFunction = (...args:any[]) => Promise<any>
 export type CallbackFunction = (arg: any) => void

src/Utils.ts

@@ -6,27 +6,24 @@ import * as I from "./Interfaces";
 export const rpcToRpcinfo = (rpc : T.RPC, owner: T.Owner):T.RpcInfo => {
     switch (typeof rpc){
         case  "object":
-        switch(rpc.type){
+            if(rpc['call']){
-            case "Call" :
                 return {
                     owner: owner,
-                    argNames: extractArgs(rpc.call),
+                    argNames: extractArgs(rpc['call']),
-                    type: rpc.type,
+                    type: "Call",
                     name: rpc.name,
-                    call: rpc.call,
+                    call: rpc['call'],
                 }
-            case "Hook" :
+            }else{
-                const generator = hookGenerator(rpc)
+                const generator = hookGenerator(<T.HookRPC>rpc)
                 return {
                     owner: owner,
                     argNames: extractArgs(generator(undefined)),
-                    type: rpc.type,
+                    type: "Hook",
                     name: rpc.name,
                     generator: generator,
-                    
                 }
-        }
+            }
-        break;
         case "function":
             if(!rpc.name) throw new Error(`
             RPC did not provide a name. 
@@ -79,10 +76,11 @@ const hookGenerator = (rpc:T.HookRPC): T.HookInfo['generator'] => {
             socket.call.apply(socket, [res.uid, ...cbargs])
         })
         if(res.result == 'Success'){
-            if(rpc.onClose)
+            if(rpc.onClose){
-            socket.on('close', async () => {
+                socket.on('close', async () => {
-                rpc.onClose(res)
+                    rpc.onClose(res, rpc)
-            })
+                })
+            }
         }
         return res
     }`)

test/TestBackend.ts

@@ -6,26 +6,31 @@ let subcallback
 
 new RPCServer(20000, [{
     name: "HelloWorldRPCGroup",
-    exportRPCs: () => [{
+    exportRPCs: () => [
-        type: 'Call',
+        {
-        name: 'echo',
+            name: 'echo',
-        call: async (s:string) => s,
+            call: async (s:string) => s,
-    },
+        },{
-    {
+            name: 'simpleSubscribe',
-        type: 'Hook',
+            hook: async(callback) => {
-        name: 'subscribe',
+                subcallback =  callback
-        hook: async (callback):Promise<any> => {
+                return new SubscriptionResponse(""+Math.random())
-            subcallback = callback
+            }
-            return new SubscriptionResponse(""+Math.random())
+        },{
+            name: 'subscribe',
+            hook: async (callback):Promise<any> => {
+                subcallback = callback
+                return new SubscriptionResponse(""+Math.random())
+            },
+            onClose: (res:SubscriptionResponse, rpc:HookRPC) => { 
+                console.log("Specific close handler for", rpc.name, res)
+                subcallback = null 
+            },
+            onCallback: (...args) => { console.log.apply(console, args) }
         },
-        onClose: (res:SubscriptionResponse) => { 
+        function add(...args:number[]):number {return args.reduce((a,b)=>a+b, 0)},
-            console.log("Specific close handler for", res)
+        function triggerCallback(...messages:any[]):number {return subcallback.apply({}, messages)},
-            subcallback = null 
+    ]
-        }
-    },
-    function add(...args:number[]):number {return args.reduce((a,b)=>a+b, 0)},
-    function triggerCallback(...messages:any[]):number {return subcallback.apply({}, messages)},
-]
 }])
 
 try{

test/TestFrontend.ts

@@ -13,11 +13,24 @@ client.connect().then(async _ => {
     const handler = (s) => {
         counter++
         if(counter === 3)
-            console.log("callback was called 3 times", counter === 3)
+        console.log("subscribe call counter met", counter === 3)
     }
 
     await client["HelloWorldRPCGroup"].subscribe(handler)
-    client["HelloWorldRPCGroup"].triggerCallback("test1", "test1", "test1", )
+    await Promise.all([
-    client["HelloWorldRPCGroup"].triggerCallback("test2", "test2", "test2", )
+        client["HelloWorldRPCGroup"].triggerCallback("test1", "test1", "test1", ),
-    client["HelloWorldRPCGroup"].triggerCallback("test3", "test3", "test3", )
+        client["HelloWorldRPCGroup"].triggerCallback("test2", "test2", "test2", ),
+        client["HelloWorldRPCGroup"].triggerCallback("test3", "test3", "test3", ),
+    ])
+
+    counter = 0
+    const simplehandler = (s) => {
+        counter++
+        if(counter === 3)
+            console.log("simpleSubscribe call counter met", counter === 3)
+    }
+    await client["HelloWorldRPCGroup"].simpleSubscribe(simplehandler)
+    client["HelloWorldRPCGroup"].triggerCallback("simple1", "simple1", "simple1", )
+    client["HelloWorldRPCGroup"].triggerCallback("simple2", "simple2", "simple2", )
+    client["HelloWorldRPCGroup"].triggerCallback("simple3", "simple3", "simple3", )
 })