bit
/
metagen_cs
25
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Further improving services codegen
Publish PHP Package / docker (push) Successful in 7s Details

This commit is contained in:
Pavel Shevaev 2025-05-21 18:10:14 +03:00
parent 0c234c9103
commit 1287703435
3 changed files with 113 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/codegen.inc.php
View File

@ -25,9 +25,6 @@ function supported_tokens() : array
'cs_obsolete',
//TODO:
//'i18n'
'cs_service_call_builder',
'cs_service_client',
];
}

90
tpl/codegen_services.twig
View File

@ -8,11 +8,60 @@ using BitGames.Bits;
using {{use}};
{%- endfor ~%}
{% import "service_macro.twig" as macro %}
{% import "service_macro.twig" as svc_macro %}
{% import "macro.twig" as cs_macro %}
namespace {{namespace}}
{
public interface IRpcCaller
{
Task CallRpc(metagen.IRpc rpc);
}
public interface IApiBase
{
public IRpcCaller Caller { get; }
}
public interface IRpcCallBuilder<TRpc> where TRpc : metagen.IRpc
{
public Task<TRpc> Call();
}
public struct RpcCallBuilder<TRpc> : IRpcCallBuilder<TRpc> where TRpc : IRpc
{
private IRpcCaller clt;
private TRpc rpc;
public RpcCallBuilder(IRpcCaller clt, TRpc rpc)
{
this.clt = clt;
this.rpc = rpc;
}
public async Task<TRpc> Call()
{
await clt.CallRpc(rpc);
return rpc;
}
}
public struct MockRpcCallBuilder<TRpc> : IRpcCallBuilder<TRpc> where TRpc : IRpc
{
public TRpc Rpc { get; }
public MockRpcCallBuilder(TRpc rpc)
{
this.Rpc = rpc;
}
public Task<TRpc> Call()
{
return Task.FromResult(Rpc);
}
}
{%- for unit in meta.units %}
{% if unit.object is instanceof('\\mtgMetaService') %}
@ -20,9 +69,44 @@ namespace {{namespace}}
namespace {{unit.object.name}}
{
{{macro.gen_client(unit.object)}}
//constrained local interface,
//(this way we don't have to change anything in generated
//structs below)
public interface IRpc : metagen.IRpc
{}
{{macro.gen_server(unit.object)}}
{%- for rpc in unit.object.rpcs %}
{{cs_macro.decl_rpc(rpc, false)}}
{%- endfor ~%}
{%- for utype in unit.object.usertypes %}
{%- if utype is instanceof('\\mtgMetaStruct') -%}
{{cs_macro.decl_struct(utype)}}
{% elseif utype is instanceof('\\mtgMetaEnum') %}
{{cs_macro.decl_enum(utype)}}
{% endif %}
{%- endfor ~%}
public static class Factory
{
public static IRpc CreateRPC(int code)
{
switch(code)
{
{%- for rpc in unit.object.rpcs ~%}
case {{rpc.code}}: return new {{rpc.name}}();
{%- endfor ~%}
}
throw new Exception("Unsupported RPC code: " + code);
}
}
{{svc_macro.gen_client(unit.object)}}
{{svc_macro.gen_server(unit.object)}}
}

103
tpl/service_macro.twig
View File

@ -1,87 +1,33 @@
{%- macro gen_client(obj) ~%}
{% import "macro.twig" as cs_macro %}
//constrained local interface
public interface IRpc : metagen.IRpc
{}
{%- for rpc in obj.rpcs %}
{{cs_macro.decl_rpc(rpc, false)}}
{%- endfor ~%}
{%- for utype in obj.usertypes %}
{%- if utype is instanceof('\\mtgMetaStruct') -%}
{{cs_macro.decl_struct(utype)}}
{% elseif utype is instanceof('\\mtgMetaEnum') %}
{{cs_macro.decl_enum(utype)}}
{% endif %}
{%- endfor ~%}
public static class Factory
public interface IApi : IApiBase
{
public static IRpc CreateRPC(int code)
{
switch(code)
{
{%- for rpc in obj.rpcs ~%}
case {{rpc.code}}: return new {{rpc.name}}();
{%- endfor ~%}
}
throw new Exception("Unsupported RPC code: " + code);
}
}
public interface IRpcCaller
{
Task CallRpc(metagen.IRpc rpc);
}
public struct RpcCallBuilder<TRpc> where TRpc : IRpc
{
private IRpcCaller clt;
private TRpc rpc;
public RpcCallBuilder(IRpcCaller clt, TRpc rpc)
{
this.clt = clt;
this.rpc = rpc;
}
public async Task<TRpc> Call()
{
await clt.CallRpc(rpc);
return rpc;
}
}
public interface IApi
{
public {{token_or(obj, 'cs_service_client', 'IRpcCaller')}} Client { get; }
{%- for rpc in obj.rpcs ~%}
public {{token_or(obj, 'cs_service_call_builder', 'RpcCallBuilder')}}<{{rpc.name}}> Begin({{rpc.name}} rpc);
public IRpcCallBuilder<{{rpc.name}}> Begin({{rpc.name}} rpc);
{%- endfor ~%}
}
public class Api : IApi
{
public {{token_or(obj, 'cs_service_client', 'IRpcCaller')}} Client { get; private set; }
public IRpcCaller Caller { get; }
public Api({{token_or(obj, 'cs_service_client', 'IRpcCaller')}} client)
public Api(IRpcCaller caller)
{
this.Client = client;
this.Caller = caller;
}
public virtual IRpcCallBuilder<T> CreateCallBuilder<T>(metagen.IRpc rpc) where T : IRpc
{
return new RpcCallBuilder<T>(Caller, (T)rpc);
}
{%- for rpc in obj.rpcs ~%}
public {{token_or(obj, 'cs_service_call_builder', 'RpcCallBuilder')}}<{{rpc.name}}> Begin({{rpc.name}} rpc)
public IRpcCallBuilder<{{rpc.name}}> Begin({{rpc.name}} rpc)
{
return new {{token_or(obj, 'cs_service_call_builder', 'RpcCallBuilder')}}<{{rpc.name}}>(Client, rpc);
var builder = CreateCallBuilder<{{rpc.name}}>(rpc);
return builder;
}
{%- endfor ~%}
@ -91,7 +37,7 @@ public class Api : IApi
public class ApiDecoratorBase : IApi
{
private IApi orig;
public {{token_or(obj, 'cs_service_client', 'IRpcCaller')}} Client => orig.Client;
public IRpcCaller Caller => orig.Caller;
public ApiDecoratorBase(IApi orig)
{
@ -103,7 +49,7 @@ public class ApiDecoratorBase : IApi
{%- for rpc in obj.rpcs ~%}
public virtual {{token_or(obj, 'cs_service_call_builder', 'RpcCallBuilder')}}<{{rpc.name}}> Begin({{rpc.name}} rpc)
public virtual IRpcCallBuilder<{{rpc.name}}> Begin({{rpc.name}} rpc)
{
OnBefore(rpc);
return orig.Begin(rpc);
@ -115,16 +61,21 @@ public class ApiDecoratorBase : IApi
public class MockApiBase : IApi
{
public {{token_or(obj, 'cs_service_client', 'IRpcCaller')}} Client { get; private set; }
public IRpcCaller Caller { get; private set; }
public MockApiBase({{token_or(obj, 'cs_service_client', 'IRpcCaller')}} client)
static protected IRpcCallBuilder<T> Result<T>(T rpc) where T : metagen.IRpc
{
this.Client = client;
return new MockRpcCallBuilder<T>(rpc);
}
public MockApiBase(IRpcCaller caller)
{
this.Caller = caller;
}
{%- for rpc in obj.rpcs ~%}
public virtual {{token_or(obj, 'cs_service_call_builder', 'RpcCallBuilder')}}<{{rpc.name}}> Begin({{rpc.name}} rpc)
public virtual IRpcCallBuilder<{{rpc.name}}> Begin({{rpc.name}} rpc)
{
throw new System.NotImplementedException();
}
@ -150,7 +101,7 @@ static public class ApiExtensions
return __rpc;
}
static public {{token_or(obj, 'cs_service_call_builder', 'RpcCallBuilder')}}<{{rpc.name}}> {{rpc.name}}(this IApi __api{%- if rpc.req.fields|length > 0 -%},{%-endif-%}
static public IRpcCallBuilder<{{rpc.name}}> {{rpc.name}}(this IApi __api{%- if rpc.req.fields|length > 0 -%},{%-endif-%}
{%- for fld in rpc.req.fields ~%}
{{fld.type|cs_type}} {% if has_token(fld, 'default') -%} {{ var_reset(fld.name, fld.type, token(fld, 'default'))|trim(';', 'right') }} {%-else-%} {{fld.name}} {%-endif-%}
{%- if not loop.last -%},{%-endif-%}
@ -174,8 +125,6 @@ static public class ApiExtensions
{%- macro gen_server(obj) ~%}
{% import "macro.twig" as cs_macro %}
public interface IServer<TConn, TRet>
{
@ -196,7 +145,7 @@ public static class Router<TConn, TRet>
{%- endfor ~%}
}
static public TRet DispatchRequest(IServer<TConn, TRet> server, TConn conn, IRpc rpc)
static public TRet DispatchRequest(IServer<TConn, TRet> server, TConn conn, metagen.IRpc rpc)
{
switch(rpc.GetCode())
{