niklas/cc-haxe
1
0
Fork 0
Code Issues 13 Pull Requests Projects Releases Wiki Activity

rpc now can handle args

Browse Source
This commit is contained in:
Djeeberjr 2023-07-30 19:02:59 +02:00
parent 91972107eb
commit f3a13e4247
4 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/HelloWorld.hx
View File

@ -14,7 +14,7 @@ class HelloWorld implements Process {
var c = new HelloWorldServiceRPC(0); var c = new HelloWorldServiceRPC(0);
c.getNumber().handle((res) -> { c.getNumber(2,3).handle((res) -> {
Log.debug("Got number: " + res); Log.debug("Got number: " + res);
}); });

5
src/bin/HelloWorldService.hx
View File

@ -1,5 +1,6 @@
package bin; package bin;
import kernel.log.Log;
import macros.rpc.RPC; import macros.rpc.RPC;
import kernel.ps.ProcessHandle; import kernel.ps.ProcessHandle;
import kernel.ps.Process; import kernel.ps.Process;
@ -19,7 +20,9 @@ class HelloWorldService implements Process {
} }
@rpc @rpc
public function getNumber():Int { public function getNumber(arg1: Int, arg2: Int):Int {
Log.debug(arg1);
Log.debug(arg2);
return 42; return 42;
} }
} }

18
src/macros/rpc/RPC.hx
View File

@ -25,13 +25,15 @@ class RPC {
switch (field.kind) { switch (field.kind) {
case FFun(f): case FFun(f):
var argsExprs:Array<Expr> = [for (a in f.args) macro $i{a.name}];
c.fields.push({ c.fields.push({
name: field.name, name: field.name,
pos: field.pos, pos: field.pos,
kind: FFun({ kind: FFun({
args: f.args, args: f.args,
expr: macro { expr: macro {
return cast this._performRequest($v{field.name}, []); return cast this._performRequest($v{field.name}, $a{argsExprs});
}, },
ret: TPath({name: "Promise", params: [TPType(f.ret)], pack: ["tink", "core"]}), ret: TPath({name: "Promise", params: [TPType(f.ret)], pack: ["tink", "core"]}),
}), }),
@ -64,12 +66,22 @@ class RPC {
switch (field.kind) { switch (field.kind) {
case FMethod(k): case FMethod(k):
var funName = field.name; var funName = field.name;
var exprsType = field.expr().t;
switch (exprsType){
case TFun(args, ret):
var callArgs = [for (k => v in args) macro pack.data.args[$v{k}]];
// TODO: transform this to a switch statement
exprs.push(macro { exprs.push(macro {
if (pack.data.func == $v{funName}) { if (pack.data.func == $v{funName}) {
pack.respond(this.$funName()); pack.respond(this.$funName($a{callArgs}));
} }
}); });
default:
Context.error("Only functions can be used for rpc", field.pos);
}
default: default:
Context.error("Only functions can be used for rpc", field.pos); Context.error("Only functions can be used for rpc", field.pos);
} }

2
src/macros/rpc/RPCBase.hx
View File

@ -18,7 +18,7 @@ abstract class RPCBase {
private function _performRequest(func:String, args:Array<Dynamic>):Promise<Dynamic> { private function _performRequest(func:String, args:Array<Dynamic>):Promise<Dynamic> {
return Net.sendAndAwait(id, this._proto, { return Net.sendAndAwait(id, this._proto, {
func: func, func: func,
// args: args args: args
}).map((res) -> { }).map((res) -> {
switch (res) { switch (res) {
case Success(pack): case Success(pack):