Compare commits
No commits in common. "main" and "number-to-int-float" have entirely different histories.
main
...
number-to-
@ -9,9 +9,3 @@ insert_final_newline = true
|
||||
indent_size = 2
|
||||
[*.md]
|
||||
indent_size = 2
|
||||
[*.zig]
|
||||
indent_size = 4
|
||||
[*.dart]
|
||||
indent_size = 2
|
||||
[*.rs]
|
||||
indent_size = 4
|
||||
|
||||
7
.gitignore
vendored
7
.gitignore
vendored
@ -6,12 +6,5 @@ examples/CSharp/Generated
|
||||
examples/CSharp/Example/bin
|
||||
examples/CSharp/Example/obj
|
||||
examples/definition.json
|
||||
examples/Rust/Gen
|
||||
examples/Rust/Impl/target
|
||||
examples/Dart/out
|
||||
templates/CSharp/bin
|
||||
templates/CSharp/obj
|
||||
lib/
|
||||
templates/Dart/.dart_tool
|
||||
templates/Dart/.packages
|
||||
templates/Dart/pubspec.lock
|
||||
@ -1,5 +1,4 @@
|
||||
nodeLinker: node-modules
|
||||
npmRegistryServer: https://npm.hibas123.de
|
||||
|
||||
plugins:
|
||||
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
|
||||
|
||||
42
JsonRPC.sln
42
JsonRPC.sln
@ -1,42 +0,0 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 17
|
||||
VisualStudioVersion = 17.5.002.0
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{ECEBC2A1-9382-44B5-94A6-305DC8235859}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSharp", "templates\CSharp\CSharp.csproj", "{16231421-DB23-46D0-AFA8-81099E3CF97A}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{B6AB75C7-58FC-4F62-AFAA-ED8FEEBF2E1C}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CSharp", "CSharp", "{833192BE-67E8-425F-9AA7-23532485682A}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSharp_Example", "examples\CSharp\Example\CSharp_Example.csproj", "{3BD8D8BF-46ED-4F52-BD78-8B22FF3A77A2}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{16231421-DB23-46D0-AFA8-81099E3CF97A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{16231421-DB23-46D0-AFA8-81099E3CF97A}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{16231421-DB23-46D0-AFA8-81099E3CF97A}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{16231421-DB23-46D0-AFA8-81099E3CF97A}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{3BD8D8BF-46ED-4F52-BD78-8B22FF3A77A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{3BD8D8BF-46ED-4F52-BD78-8B22FF3A77A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{3BD8D8BF-46ED-4F52-BD78-8B22FF3A77A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{3BD8D8BF-46ED-4F52-BD78-8B22FF3A77A2}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(NestedProjects) = preSolution
|
||||
{16231421-DB23-46D0-AFA8-81099E3CF97A} = {ECEBC2A1-9382-44B5-94A6-305DC8235859}
|
||||
{833192BE-67E8-425F-9AA7-23532485682A} = {B6AB75C7-58FC-4F62-AFAA-ED8FEEBF2E1C}
|
||||
{3BD8D8BF-46ED-4F52-BD78-8B22FF3A77A2} = {833192BE-67E8-425F-9AA7-23532485682A}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {ED59162F-B7E7-4EA2-91D4-7F6D1BFBB820}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
11
README.md
11
README.md
@ -6,9 +6,6 @@ Type/Service definition language and code generator for json-rpc 2.0. Currently
|
||||
| ------- | --------------------------------- |
|
||||
| ts-node | Typescript for NodeJS |
|
||||
| ts-esm | Typescript in ESM format for Deno |
|
||||
| rust | Rust |
|
||||
| dart | Dart |
|
||||
| c# | C# |
|
||||
|
||||
## Usage
|
||||
|
||||
@ -26,7 +23,7 @@ enum TestEnum {
|
||||
type Test {
|
||||
testen: TestEnum;
|
||||
someString: string;
|
||||
someNumber?: number;
|
||||
someNumber: number;
|
||||
array: string[];
|
||||
map: {number, TestEnum};
|
||||
}
|
||||
@ -47,8 +44,4 @@ Then run the generator like this `jrpc compile test.jrpc -o=ts-node:output/`.
|
||||
|
||||
This will generate the Client and Server code in the specified folder.
|
||||
|
||||
## TODOS
|
||||
|
||||
1. Documentation
|
||||
2. Null Checks/Enforcements in all languages
|
||||
3. More and better tests
|
||||
//TODO: Make Documentation better
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
|
||||
@ -4,61 +4,47 @@ using System.Text;
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Nodes;
|
||||
|
||||
class TestSrvimpl : Example.TestServiceServer<int>
|
||||
{
|
||||
class TestSrvimpl : Example.TestServiceServer<int> {
|
||||
public TestSrvimpl(): base() {}
|
||||
public override async Task<Example.AddValueResponse> AddValuesSingleParam(AddValueRequest request, int ctx)
|
||||
{
|
||||
public override async Task<Example.AddValueResponse> AddValuesSingleParam(AddValueRequest request, int ctx) {
|
||||
var res = new Example.AddValueResponse();
|
||||
res.value = 1;
|
||||
return res;
|
||||
}
|
||||
|
||||
public override async Task<double> AddValuesMultipleParams(double value1, double value2, int ctx)
|
||||
{
|
||||
public override async Task<double> AddValuesMultipleParams(double value1,double value2,int ctx) {
|
||||
return value1 + value2;
|
||||
}
|
||||
|
||||
public override async Task ReturningVoid(double param1, int ctx)
|
||||
{
|
||||
public override async Task ReturningVoid(double param1,int ctx) {
|
||||
|
||||
}
|
||||
|
||||
public override void OnEvent(string param1, int ctx)
|
||||
{
|
||||
public override void OnEvent(string param1,int ctx) {
|
||||
Console.WriteLine($"OnEvent {param1}");
|
||||
}
|
||||
|
||||
public override async Task<IList<double>> FunctionWithArrayAsParamAndReturn(List<double> values1, List<double> values2, int ctx)
|
||||
{
|
||||
public override async Task<IList<double>> FunctionWithArrayAsParamAndReturn(List<double> values1,List<double> values2, int ctx) {
|
||||
var l = new List<double>();
|
||||
l.Append(1);
|
||||
return l;
|
||||
}
|
||||
|
||||
public override async Task ThrowingError(int ctx)
|
||||
{
|
||||
public override async Task ThrowingError(int ctx) {
|
||||
throw new Exception("This is a remote error :)");
|
||||
}
|
||||
|
||||
public override Task<double> FunctionWithKeywords(double type, double static_, double event_, int ctx)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
|
||||
class CopyTransportS2 : Example.JRpcTransport
|
||||
{
|
||||
class CopyTransportS2 : Example.JRpcTransport {
|
||||
CopyTransportS1 tr1;
|
||||
public Queue<string> backlog = new Queue<string>();
|
||||
|
||||
public CopyTransportS2(CopyTransportS1 tr1)
|
||||
{
|
||||
public CopyTransportS2(CopyTransportS1 tr1) {
|
||||
this.tr1 = tr1;
|
||||
}
|
||||
|
||||
public override Task Write(string data)
|
||||
{
|
||||
public override Task Write(string data) {
|
||||
Console.WriteLine("--> " + data);
|
||||
this.tr1.SendPacketEvent(data);
|
||||
|
||||
@ -66,34 +52,28 @@ class CopyTransportS2 : Example.JRpcTransport
|
||||
}
|
||||
}
|
||||
|
||||
class CopyTransportS1 : Example.JRpcTransport
|
||||
{
|
||||
class CopyTransportS1 : Example.JRpcTransport {
|
||||
public Queue<string> backlog = new Queue<string>();
|
||||
|
||||
public CopyTransportS2 tr2;
|
||||
|
||||
public CopyTransportS1()
|
||||
{
|
||||
public CopyTransportS1() {
|
||||
this.tr2 = new CopyTransportS2(this);
|
||||
}
|
||||
|
||||
public override Task Write(string data)
|
||||
{
|
||||
public override Task Write(string data) {
|
||||
Console.WriteLine("<-- " + data);
|
||||
this.tr2.SendPacketEvent(data);
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
}
|
||||
|
||||
class Program
|
||||
{
|
||||
public static void Main()
|
||||
{
|
||||
class Program {
|
||||
public static void Main() {
|
||||
Program.Start().Wait();
|
||||
}
|
||||
|
||||
public static async Task Start()
|
||||
{
|
||||
public static async Task Start() {
|
||||
var server = new Example.JRpcServer<int>();
|
||||
server.AddService(new TestSrvimpl());
|
||||
var transport = new CopyTransportS1();
|
||||
@ -106,15 +86,7 @@ class Program
|
||||
|
||||
Console.WriteLine($"Add 1 + 2 = {result}");
|
||||
|
||||
try
|
||||
{
|
||||
await testService.ThrowingError();
|
||||
throw new Exception("No error was issued, even though it was expected!");
|
||||
}
|
||||
catch (JRpcException err)
|
||||
{
|
||||
Console.WriteLine("Error successfully catched: ", err.Message);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
import 'dart:async';
|
||||
import 'dart:io';
|
||||
|
||||
import "./out/lib/example.dart";
|
||||
import "dart:convert";
|
||||
|
||||
void main() async {
|
||||
var str = StreamController<Map<String, dynamic>>();
|
||||
|
||||
var provider = ServiceProvider(str.stream);
|
||||
var sock = await Socket.connect("127.0.0.1", 8859);
|
||||
|
||||
utf8.decoder.bind(sock).transform(new LineSplitter()).listen((line) {
|
||||
str.add(jsonDecode(line));
|
||||
});
|
||||
|
||||
provider.output.stream.listen((event) {
|
||||
sock.writeln(jsonEncode(event));
|
||||
});
|
||||
|
||||
var s = new TestServiceClient(provider);
|
||||
|
||||
var r = await s.AddValuesMultipleParams(10, 15);
|
||||
print(r);
|
||||
|
||||
var r2 =
|
||||
await s.AddValuesSingleParam(AddValueRequest(value1: 10, value2: 15));
|
||||
print(r2?.value);
|
||||
|
||||
var catched = false;
|
||||
await s.ThrowingError().catchError((err) {
|
||||
catched = true;
|
||||
print("Expected error was catched: " + err.toString());
|
||||
});
|
||||
|
||||
if (!catched) {
|
||||
throw Error();
|
||||
}
|
||||
|
||||
await sock.close();
|
||||
// exit(0);
|
||||
}
|
||||
3
examples/Rust/.gitignore
vendored
3
examples/Rust/.gitignore
vendored
@ -1,3 +0,0 @@
|
||||
Generated/
|
||||
Server/target
|
||||
Client/target
|
||||
589
examples/Rust/Client/Cargo.lock
generated
589
examples/Rust/Client/Cargo.lock
generated
@ -1,589 +0,0 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 3
|
||||
|
||||
[[package]]
|
||||
name = "async-trait"
|
||||
version = "0.1.59"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "atty"
|
||||
version = "0.2.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
|
||||
dependencies = [
|
||||
"hermit-abi",
|
||||
"libc",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "autocfg"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "1.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||
|
||||
[[package]]
|
||||
name = "bytes"
|
||||
version = "1.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "colored"
|
||||
version = "2.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd"
|
||||
dependencies = [
|
||||
"atty",
|
||||
"lazy_static",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "example"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"int-enum",
|
||||
"log",
|
||||
"nanoid",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"simple_logger",
|
||||
"tokio",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.2.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"wasi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
version = "0.1.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "int-enum"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cff87d3cc4b79b4559e3c75068d64247284aceb6a038bd4bb38387f3f164476d"
|
||||
dependencies = [
|
||||
"int-enum-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "int-enum-impl"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "df1f2f068675add1a3fc77f5f5ab2e29290c841ee34d151abc007bce902e5d34"
|
||||
dependencies = [
|
||||
"proc-macro-crate",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
|
||||
|
||||
[[package]]
|
||||
name = "lazy_static"
|
||||
version = "1.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.138"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
|
||||
|
||||
[[package]]
|
||||
name = "lock_api"
|
||||
version = "0.4.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"scopeguard",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "log"
|
||||
version = "0.4.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
|
||||
|
||||
[[package]]
|
||||
name = "mio"
|
||||
version = "0.8.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"log",
|
||||
"wasi",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "nanoid"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8"
|
||||
dependencies = [
|
||||
"rand",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num_cpus"
|
||||
version = "1.13.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
|
||||
dependencies = [
|
||||
"hermit-abi",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num_threads"
|
||||
version = "0.1.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.16.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot"
|
||||
version = "0.12.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
|
||||
dependencies = [
|
||||
"lock_api",
|
||||
"parking_lot_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot_core"
|
||||
version = "0.9.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"redox_syscall",
|
||||
"smallvec",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pin-project-lite"
|
||||
version = "0.2.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
|
||||
|
||||
[[package]]
|
||||
name = "ppv-lite86"
|
||||
version = "0.2.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro-crate"
|
||||
version = "1.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
"thiserror",
|
||||
"toml",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.47"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand"
|
||||
version = "0.8.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"rand_chacha",
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_chacha"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
|
||||
dependencies = [
|
||||
"ppv-lite86",
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_core"
|
||||
version = "0.6.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.2.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ryu"
|
||||
version = "1.0.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
|
||||
|
||||
[[package]]
|
||||
name = "scopeguard"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.150"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.150"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.89"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"ryu",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "signal-hook-registry"
|
||||
version = "1.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "simple_logger"
|
||||
version = "4.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e190a521c2044948158666916d9e872cbb9984f755e9bb3b5b75a836205affcd"
|
||||
dependencies = [
|
||||
"atty",
|
||||
"colored",
|
||||
"log",
|
||||
"time",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "smallvec"
|
||||
version = "1.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
|
||||
|
||||
[[package]]
|
||||
name = "socket2"
|
||||
version = "0.4.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "1.0.105"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "test-impl-client"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"example",
|
||||
"serde_json",
|
||||
"tokio",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "1.0.37"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
|
||||
dependencies = [
|
||||
"thiserror-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror-impl"
|
||||
version = "1.0.37"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "time"
|
||||
version = "0.3.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"libc",
|
||||
"num_threads",
|
||||
"serde",
|
||||
"time-core",
|
||||
"time-macros",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "time-core"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
|
||||
|
||||
[[package]]
|
||||
name = "time-macros"
|
||||
version = "0.2.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2"
|
||||
dependencies = [
|
||||
"time-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tokio"
|
||||
version = "1.23.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"bytes",
|
||||
"libc",
|
||||
"memchr",
|
||||
"mio",
|
||||
"num_cpus",
|
||||
"parking_lot",
|
||||
"pin-project-lite",
|
||||
"signal-hook-registry",
|
||||
"socket2",
|
||||
"tokio-macros",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tokio-macros"
|
||||
version = "1.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "toml"
|
||||
version = "0.5.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
|
||||
dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.11.0+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
||||
|
||||
[[package]]
|
||||
name = "winapi"
|
||||
version = "0.3.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
|
||||
dependencies = [
|
||||
"winapi-i686-pc-windows-gnu",
|
||||
"winapi-x86_64-pc-windows-gnu",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winapi-i686-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||
|
||||
[[package]]
|
||||
name = "winapi-x86_64-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||
|
||||
[[package]]
|
||||
name = "windows-sys"
|
||||
version = "0.42.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm",
|
||||
"windows_aarch64_msvc",
|
||||
"windows_i686_gnu",
|
||||
"windows_i686_msvc",
|
||||
"windows_x86_64_gnu",
|
||||
"windows_x86_64_gnullvm",
|
||||
"windows_x86_64_msvc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.42.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.42.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.42.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.42.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.42.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.42.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.42.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
|
||||
@ -1,10 +0,0 @@
|
||||
[package]
|
||||
name = "test-impl-client"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
example = { path = "../Generated/" }
|
||||
async-trait = "0.1.59"
|
||||
tokio = { version = "1.22.0", features = ["full"] }
|
||||
serde_json = "1.0.88"
|
||||
@ -1,52 +0,0 @@
|
||||
use std::sync::atomic::AtomicU64;
|
||||
use std::sync::Arc;
|
||||
|
||||
use example::client::SimpleTestService;
|
||||
use example::JRPCClient;
|
||||
use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
|
||||
use tokio::net::TcpStream;
|
||||
use tokio::sync::mpsc::channel;
|
||||
|
||||
#[tokio::main]
|
||||
pub async fn main() {
|
||||
let (tx, mut rx) = channel(1);
|
||||
let stream = TcpStream::connect("127.0.0.1:4321").await.unwrap();
|
||||
let client = example::JRPCClient::new(tx.clone());
|
||||
let test_service = SimpleTestService::new(client.clone());
|
||||
|
||||
let (reader, mut writer) = stream.into_split();
|
||||
let mut reader = BufReader::new(reader);
|
||||
let mut line = String::new();
|
||||
|
||||
tokio::spawn(async move {
|
||||
loop {
|
||||
line.clear();
|
||||
reader.read_line(&mut line).await.unwrap();
|
||||
client.on_result(serde_json::from_str(&line).unwrap()).await;
|
||||
}
|
||||
});
|
||||
|
||||
tokio::spawn(async move {
|
||||
while let Some(message) = rx.recv().await {
|
||||
writer
|
||||
.write_all((serde_json::to_string(&message).unwrap() + "\n").as_bytes())
|
||||
.await
|
||||
.unwrap();
|
||||
}
|
||||
});
|
||||
|
||||
let ticks = Arc::new(AtomicU64::new(0));
|
||||
let t2 = ticks.clone();
|
||||
tokio::spawn(async move {
|
||||
loop {
|
||||
tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
|
||||
println!("Ticks: {}", t2.load(std::sync::atomic::Ordering::Relaxed));
|
||||
t2.store(0, std::sync::atomic::Ordering::Relaxed);
|
||||
}
|
||||
});
|
||||
|
||||
loop {
|
||||
let _result = test_service.GetTest("Hi".to_owned(), 55).await.unwrap();
|
||||
ticks.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
|
||||
}
|
||||
}
|
||||
589
examples/Rust/Server/Cargo.lock
generated
589
examples/Rust/Server/Cargo.lock
generated
@ -1,589 +0,0 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 3
|
||||
|
||||
[[package]]
|
||||
name = "async-trait"
|
||||
version = "0.1.59"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "atty"
|
||||
version = "0.2.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
|
||||
dependencies = [
|
||||
"hermit-abi",
|
||||
"libc",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "autocfg"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "1.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||
|
||||
[[package]]
|
||||
name = "bytes"
|
||||
version = "1.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "colored"
|
||||
version = "2.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd"
|
||||
dependencies = [
|
||||
"atty",
|
||||
"lazy_static",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "example"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"int-enum",
|
||||
"log",
|
||||
"nanoid",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"simple_logger",
|
||||
"tokio",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.2.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"wasi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
version = "0.1.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "int-enum"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cff87d3cc4b79b4559e3c75068d64247284aceb6a038bd4bb38387f3f164476d"
|
||||
dependencies = [
|
||||
"int-enum-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "int-enum-impl"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "df1f2f068675add1a3fc77f5f5ab2e29290c841ee34d151abc007bce902e5d34"
|
||||
dependencies = [
|
||||
"proc-macro-crate",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
|
||||
|
||||
[[package]]
|
||||
name = "lazy_static"
|
||||
version = "1.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.138"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
|
||||
|
||||
[[package]]
|
||||
name = "lock_api"
|
||||
version = "0.4.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"scopeguard",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "log"
|
||||
version = "0.4.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
|
||||
|
||||
[[package]]
|
||||
name = "mio"
|
||||
version = "0.8.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"log",
|
||||
"wasi",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "nanoid"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8"
|
||||
dependencies = [
|
||||
"rand",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num_cpus"
|
||||
version = "1.13.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
|
||||
dependencies = [
|
||||
"hermit-abi",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num_threads"
|
||||
version = "0.1.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.16.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot"
|
||||
version = "0.12.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
|
||||
dependencies = [
|
||||
"lock_api",
|
||||
"parking_lot_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot_core"
|
||||
version = "0.9.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"redox_syscall",
|
||||
"smallvec",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pin-project-lite"
|
||||
version = "0.2.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
|
||||
|
||||
[[package]]
|
||||
name = "ppv-lite86"
|
||||
version = "0.2.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro-crate"
|
||||
version = "1.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
"thiserror",
|
||||
"toml",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.47"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand"
|
||||
version = "0.8.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"rand_chacha",
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_chacha"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
|
||||
dependencies = [
|
||||
"ppv-lite86",
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_core"
|
||||
version = "0.6.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.2.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ryu"
|
||||
version = "1.0.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
|
||||
|
||||
[[package]]
|
||||
name = "scopeguard"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.150"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.150"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.89"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"ryu",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "signal-hook-registry"
|
||||
version = "1.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "simple_logger"
|
||||
version = "4.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e190a521c2044948158666916d9e872cbb9984f755e9bb3b5b75a836205affcd"
|
||||
dependencies = [
|
||||
"atty",
|
||||
"colored",
|
||||
"log",
|
||||
"time",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "smallvec"
|
||||
version = "1.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
|
||||
|
||||
[[package]]
|
||||
name = "socket2"
|
||||
version = "0.4.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "1.0.105"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "test-impl"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"example",
|
||||
"serde_json",
|
||||
"tokio",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "1.0.37"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
|
||||
dependencies = [
|
||||
"thiserror-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror-impl"
|
||||
version = "1.0.37"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "time"
|
||||
version = "0.3.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"libc",
|
||||
"num_threads",
|
||||
"serde",
|
||||
"time-core",
|
||||
"time-macros",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "time-core"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
|
||||
|
||||
[[package]]
|
||||
name = "time-macros"
|
||||
version = "0.2.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2"
|
||||
dependencies = [
|
||||
"time-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tokio"
|
||||
version = "1.23.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"bytes",
|
||||
"libc",
|
||||
"memchr",
|
||||
"mio",
|
||||
"num_cpus",
|
||||
"parking_lot",
|
||||
"pin-project-lite",
|
||||
"signal-hook-registry",
|
||||
"socket2",
|
||||
"tokio-macros",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tokio-macros"
|
||||
version = "1.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "toml"
|
||||
version = "0.5.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
|
||||
dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.11.0+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
||||
|
||||
[[package]]
|
||||
name = "winapi"
|
||||
version = "0.3.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
|
||||
dependencies = [
|
||||
"winapi-i686-pc-windows-gnu",
|
||||
"winapi-x86_64-pc-windows-gnu",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winapi-i686-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||
|
||||
[[package]]
|
||||
name = "winapi-x86_64-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||
|
||||
[[package]]
|
||||
name = "windows-sys"
|
||||
version = "0.42.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm",
|
||||
"windows_aarch64_msvc",
|
||||
"windows_i686_gnu",
|
||||
"windows_i686_msvc",
|
||||
"windows_x86_64_gnu",
|
||||
"windows_x86_64_gnullvm",
|
||||
"windows_x86_64_msvc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.42.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.42.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.42.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.42.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.42.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.42.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.42.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
|
||||
@ -1,10 +0,0 @@
|
||||
[package]
|
||||
name = "test-impl"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
example = { path = "../Generated/" }
|
||||
async-trait = "0.1.59"
|
||||
tokio = { version = "1.22.0", features = ["full"] }
|
||||
serde_json = "1.0.88"
|
||||
@ -1,75 +0,0 @@
|
||||
use async_trait::async_trait;
|
||||
use example::base_lib::JRPCResult;
|
||||
use example::server::{SimpleTestService, SimpleTestServiceHandler};
|
||||
use example::{JRPCServer, Result, Test2};
|
||||
use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
|
||||
use tokio::net::TcpStream;
|
||||
use tokio::sync::mpsc::channel;
|
||||
|
||||
#[derive(Clone)]
|
||||
struct TestServiceImplementation {}
|
||||
|
||||
#[async_trait]
|
||||
impl SimpleTestService for TestServiceImplementation {
|
||||
async fn GetTest(&self, name: String, age: i64) -> Result<Test2> {
|
||||
return Ok(Test2 { name, age });
|
||||
}
|
||||
|
||||
async fn TestNot(&self) -> Result<()> {
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
|
||||
fn handle_connection(stream: TcpStream, server: &JRPCServer) {
|
||||
let (response_sender, mut response_receiver) = channel::<JRPCResult>(1);
|
||||
|
||||
let session = server.get_session(response_sender);
|
||||
|
||||
let (r, mut w) = stream.into_split();
|
||||
tokio::spawn(async move {
|
||||
loop {
|
||||
let res = response_receiver.recv().await;
|
||||
match res {
|
||||
None => break,
|
||||
Some(res) => w
|
||||
.write_all((serde_json::to_string(&res).unwrap() + "\n").as_bytes())
|
||||
.await
|
||||
.unwrap(),
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
tokio::spawn(async move {
|
||||
let mut reader = BufReader::new(r);
|
||||
loop {
|
||||
let mut line = String::new();
|
||||
let res = reader.read_line(&mut line).await;
|
||||
match res {
|
||||
Ok(size) => {
|
||||
if size > 0 {
|
||||
session.handle_request(serde_json::from_str(&line).unwrap())
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
Err(_) => break,
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
#[tokio::main]
|
||||
pub async fn main() {
|
||||
let mut srv = JRPCServer::new();
|
||||
srv.add_service(SimpleTestServiceHandler::new(Box::from(
|
||||
TestServiceImplementation {},
|
||||
)));
|
||||
|
||||
let listener = tokio::net::TcpListener::bind("0.0.0.0:4321").await.unwrap();
|
||||
|
||||
loop {
|
||||
let (stream, address) = listener.accept().await.unwrap();
|
||||
println!("Got connection from {}", address);
|
||||
handle_connection(stream, &srv);
|
||||
}
|
||||
}
|
||||
@ -1,76 +0,0 @@
|
||||
|
||||
import * as net from "net";
|
||||
import { Server, AddValueRequest, AddValueResponse, Test2 } from "./out";
|
||||
import * as readline from 'node:readline';
|
||||
|
||||
|
||||
const server = new Server.ServiceProvider();
|
||||
|
||||
class SimpleTestService extends Server.SimpleTestService<undefined> {
|
||||
async GetTest(name: string, age: number, ctx: undefined): Promise<Test2> {
|
||||
return {
|
||||
name,
|
||||
age,
|
||||
};
|
||||
}
|
||||
TestNot(ctx: undefined): void {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
class TestService extends Server.TestService<undefined> {
|
||||
async AddValuesSingleParam(
|
||||
request: AddValueRequest,
|
||||
ctx: undefined
|
||||
): Promise<AddValueResponse> {
|
||||
return {
|
||||
value: request.value1! + request!.value2!,
|
||||
};
|
||||
}
|
||||
async AddValuesMultipleParams(
|
||||
value1: number,
|
||||
value2: number,
|
||||
ctx: undefined
|
||||
): Promise<number> {
|
||||
return value1 + value2;
|
||||
}
|
||||
|
||||
async ReturningVoid(param1) {
|
||||
console.log("Calling Returning Void");
|
||||
}
|
||||
|
||||
OnEvent(param1: string, ctx: undefined): void {
|
||||
console.log("Received notification", param1);
|
||||
}
|
||||
|
||||
async FunctionWithArrayAsParamAndReturn(vals1, vals2) {
|
||||
return [...vals1, ...vals2];
|
||||
}
|
||||
|
||||
async ThrowingError(ctx: undefined): Promise<void> {
|
||||
throw new Error("Remote error!");
|
||||
}
|
||||
}
|
||||
|
||||
server.addService(new TestService());
|
||||
server.addService(new SimpleTestService());
|
||||
|
||||
net.createServer((socket) => {
|
||||
socket.on("error", console.error);
|
||||
|
||||
console.log("Connection from:", socket.remoteAddress);
|
||||
const sess = server.getSession(msg => {
|
||||
const s = JSON.stringify(msg);
|
||||
console.log("Sending:", s);
|
||||
socket.write(s + "\n");
|
||||
});
|
||||
const rl = readline.createInterface(socket);
|
||||
rl.on("line", line => {
|
||||
console.log("Receiving:", line);
|
||||
sess.onMessage(JSON.parse(line));
|
||||
})
|
||||
rl.on("error", console.error);
|
||||
}).listen(4321).on("listening", () => {
|
||||
console.log("Is listening on :4321");
|
||||
}).on("error", console.error)
|
||||
@ -22,7 +22,7 @@ class TestService extends Server.TestService<undefined> {
|
||||
ctx: undefined
|
||||
): Promise<AddValueResponse> {
|
||||
return {
|
||||
value: request.value1 + request!.value2,
|
||||
value: request.value1 + request.value2,
|
||||
};
|
||||
}
|
||||
async AddValuesMultipleParams(
|
||||
|
||||
2
examples/Zig/.gitignore
vendored
2
examples/Zig/.gitignore
vendored
@ -1,2 +0,0 @@
|
||||
zig-cache/
|
||||
generated/
|
||||
@ -1,34 +0,0 @@
|
||||
const std = @import("std");
|
||||
|
||||
pub fn build(b: *std.build.Builder) void {
|
||||
// Standard target options allows the person running `zig build` to choose
|
||||
// what target to build for. Here we do not override the defaults, which
|
||||
// means any target is allowed, and the default is native. Other options
|
||||
// for restricting supported target set are available.
|
||||
const target = b.standardTargetOptions(.{});
|
||||
|
||||
// Standard release options allow the person running `zig build` to select
|
||||
// between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall.
|
||||
const mode = b.standardReleaseOptions();
|
||||
|
||||
const exe = b.addExecutable("ZigTests", "src/main.zig");
|
||||
exe.setTarget(target);
|
||||
exe.setBuildMode(mode);
|
||||
exe.install();
|
||||
|
||||
const run_cmd = exe.run();
|
||||
run_cmd.step.dependOn(b.getInstallStep());
|
||||
if (b.args) |args| {
|
||||
run_cmd.addArgs(args);
|
||||
}
|
||||
|
||||
const run_step = b.step("run", "Run the app");
|
||||
run_step.dependOn(&run_cmd.step);
|
||||
|
||||
const exe_tests = b.addTest("src/main.zig");
|
||||
exe_tests.setTarget(target);
|
||||
exe_tests.setBuildMode(mode);
|
||||
|
||||
const test_step = b.step("test", "Run unit tests");
|
||||
test_step.dependOn(&exe_tests.step);
|
||||
}
|
||||
@ -1,20 +0,0 @@
|
||||
const std = @import("std");
|
||||
const t = @import("./generated/mod.zig");
|
||||
|
||||
var mygpa = std.heap.GeneralPurposeAllocator(.{}){};
|
||||
const gpa = mygpa.allocator();
|
||||
|
||||
const payload =
|
||||
\\{
|
||||
\\ "val_number": 0.12,
|
||||
\\ "val_boolean": true,
|
||||
\\ "val_string": "Hallo Welt"
|
||||
\\}
|
||||
;
|
||||
|
||||
pub fn main() !void {
|
||||
var stream = std.json.TokenStream.init(payload);
|
||||
const res = std.json.parse(t.TestAtom, &stream, .{ .allocator = gpa }) catch unreachable;
|
||||
|
||||
std.log.info("{} {s}", .{ res, res.val_string });
|
||||
}
|
||||
@ -2,7 +2,6 @@ import "./import";
|
||||
|
||||
define csharp_namespace Example;
|
||||
define rust_crate example;
|
||||
define dart_library_name example;
|
||||
|
||||
enum TestEnum {
|
||||
VAL1,
|
||||
@ -52,23 +51,4 @@ service TestService {
|
||||
|
||||
|
||||
FunctionWithArrayAsParamAndReturn(values1: float[], values2: float[]): float[];
|
||||
|
||||
FunctionWithKeywords(type: float, static: float, event: float): float;
|
||||
}
|
||||
|
||||
type Test2 {
|
||||
name: string;
|
||||
age: int;
|
||||
}
|
||||
|
||||
type TestKeywords {
|
||||
type: float;
|
||||
static: float;
|
||||
event: float;
|
||||
}
|
||||
|
||||
service SimpleTestService {
|
||||
@Description("asdasdasd")
|
||||
GetTest(name: string, age: int): Test2;
|
||||
notification TestNot();
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
type TestAtom {
|
||||
val_number?: float;
|
||||
val_boolean?: boolean;
|
||||
val_string?: string;
|
||||
val_number: float;
|
||||
val_boolean: boolean;
|
||||
val_string: string;
|
||||
}
|
||||
|
||||
10874
lib/jrpc.js
Executable file
10874
lib/jrpc.js
Executable file
File diff suppressed because it is too large
Load Diff
20
package.json
20
package.json
@ -1,17 +1,16 @@
|
||||
{
|
||||
"name": "@hibas123/jrpcgen",
|
||||
"version": "1.2.20",
|
||||
"version": "1.1.1",
|
||||
"main": "lib/index.js",
|
||||
"license": "MIT",
|
||||
"packageManager": "yarn@3.1.1",
|
||||
"scripts": {
|
||||
"start": "ts-node src/index.ts",
|
||||
"test-start": "npm run start -- compile examples/example.jrpc --definition=examples/definition.json -o=ts-node:examples/Typescript/out -o=c#:examples/CSharp/Generated -o=rust:examples/Rust/Generated -o=zig:examples/Zig/generated",
|
||||
"test-start": "npm run start -- compile examples/example.jrpc --definition=examples/definition.json -o=ts-node:examples/Typescript/out -o=c#:examples/CSharp/Generated",
|
||||
"test-csharp": "cd examples/CSharp/Example/ && dotnet run",
|
||||
"test-typescript": "cd examples/Typescript && ts-node test.ts",
|
||||
"test-rust": "cd examples/Rust/Generated/ && cargo build",
|
||||
"test-typescript": "ts-node examples/test.ts",
|
||||
"test": "npm run test-start && npm run test-csharp && npm run test-typescript",
|
||||
"build": "esbuild src/index.ts --bundle --platform=node --target=node16 --outfile=lib/jrpc.js",
|
||||
"build": "esbuild src/index.ts --bundle --platform=node --target=node14 --outfile=lib/jrpc.js",
|
||||
"prepublishOnly": "npm run build"
|
||||
},
|
||||
"bin": {
|
||||
@ -19,15 +18,8 @@
|
||||
},
|
||||
"files": [
|
||||
"lib/jrpc.js",
|
||||
"templates/*.ts",
|
||||
"templates/CSharp/*.cs",
|
||||
"templates/CSharp/*.csproj",
|
||||
"templates/Rust/Cargo.toml",
|
||||
"templates/Rust/src/lib.rs",
|
||||
"templates/Dart/service_client.dart",
|
||||
"templates/Dart/base.dart",
|
||||
"templates/Dart/pubspec.yaml",
|
||||
"examples/*.jrpcproj",
|
||||
"templates/**",
|
||||
"examples/*.jrpc",
|
||||
"src/**",
|
||||
"tsconfig.json"
|
||||
],
|
||||
|
||||
25
src/index.ts
25
src/index.ts
@ -4,15 +4,13 @@ import yargs from "yargs";
|
||||
import { hideBin } from "yargs/helpers";
|
||||
import startCompile, { Target, Targets } from "./process";
|
||||
|
||||
const pkg = require("../package.json");
|
||||
|
||||
import dbg from "debug";
|
||||
const log = dbg("app");
|
||||
|
||||
dbg.disable();
|
||||
|
||||
yargs(hideBin(process.argv))
|
||||
.version(pkg.version)
|
||||
.version("1.0.0")
|
||||
.command(
|
||||
"compile <input>",
|
||||
"Compile source",
|
||||
@ -46,29 +44,22 @@ yargs(hideBin(process.argv))
|
||||
});
|
||||
},
|
||||
(argv) => {
|
||||
if (argv.verbose) {
|
||||
dbg.enable("app");
|
||||
}
|
||||
if (argv.verbose) {dbg.enable("app");}
|
||||
log("Received compile command with args", argv);
|
||||
|
||||
startCompile({
|
||||
input: argv.input,
|
||||
targets: argv.output as any,
|
||||
emitDefinitions: argv.definition,
|
||||
});
|
||||
emitDefinitions: argv.definition
|
||||
})
|
||||
}
|
||||
)
|
||||
.command(
|
||||
"targets",
|
||||
"List all targets",
|
||||
(yargs) => yargs,
|
||||
() => {
|
||||
console.log("Targets:");
|
||||
.command("targets", "List all targets", (yargs)=>yargs, ()=>{
|
||||
console.log("Targets:")
|
||||
Targets.forEach((__dirname, target) => {
|
||||
console.log(" " + target);
|
||||
});
|
||||
}
|
||||
)
|
||||
})
|
||||
})
|
||||
.option("verbose", {
|
||||
alias: "v",
|
||||
type: "boolean",
|
||||
|
||||
@ -2,7 +2,7 @@ import type { Parsed, StatementNode } from "./parser";
|
||||
import dbg from "debug";
|
||||
const log = dbg("app");
|
||||
|
||||
export const BUILTIN = ["float", "int", "string", "boolean"];
|
||||
const BUILTIN = ["float", "int", "string", "boolean"];
|
||||
|
||||
export class IRError extends Error {
|
||||
constructor(public statement: StatementNode, message: string) {
|
||||
@ -14,7 +14,6 @@ export interface TypeFieldDefinition {
|
||||
name: string;
|
||||
type: string;
|
||||
array: boolean;
|
||||
optional: boolean;
|
||||
map?: string;
|
||||
}
|
||||
|
||||
@ -128,7 +127,6 @@ export default function get_ir(parsed: Parsed): IR {
|
||||
type: field.fieldtype,
|
||||
array: field.array,
|
||||
map: field.map,
|
||||
optional: field.optional,
|
||||
};
|
||||
});
|
||||
steps.push([
|
||||
@ -318,10 +316,7 @@ export default function get_ir(parsed: Parsed): IR {
|
||||
builtin.push("bytes");
|
||||
}
|
||||
} else {
|
||||
throw new IRError(
|
||||
statement,
|
||||
"Invalid statement: " + (statement as any).type
|
||||
);
|
||||
throw new IRError(statement, "Invalid statement!");
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@ -16,7 +16,6 @@ export interface ImportStatement extends DefinitionNode {
|
||||
export interface TypeFieldStatement extends DefinitionNode {
|
||||
type: "type_field";
|
||||
name: string;
|
||||
optional: boolean;
|
||||
fieldtype: string;
|
||||
array: boolean;
|
||||
map?: string;
|
||||
@ -115,8 +114,8 @@ export default function parse(tokens: Token[], file: string): Parsed {
|
||||
return idx;
|
||||
};
|
||||
|
||||
const eatText = (allowKeyword?: boolean): [string, number] => {
|
||||
checkTypes(...(allowKeyword ? ["text", "keyword"] : ["text"]));
|
||||
const eatText = (): [string, number] => {
|
||||
checkTypes("text");
|
||||
let val = currentToken.value;
|
||||
let idx = currentToken.startIdx;
|
||||
eatToken();
|
||||
@ -140,7 +139,8 @@ export default function parse(tokens: Token[], file: string): Parsed {
|
||||
const checkTypes = (...types: string[]) => {
|
||||
if (types.indexOf(currentToken.type) < 0) {
|
||||
throw new ParserError(
|
||||
`Unexpected token value, expected ${types.join(" | ")}, received '${currentToken.value
|
||||
`Unexpected token value, expected ${types.join(" | ")}, received '${
|
||||
currentToken.value
|
||||
}'`,
|
||||
currentToken
|
||||
);
|
||||
@ -170,11 +170,6 @@ export default function parse(tokens: Token[], file: string): Parsed {
|
||||
const idx = currentToken.startIdx;
|
||||
let name = currentToken.value;
|
||||
eatToken();
|
||||
let optional = false;
|
||||
if (currentToken.type === "questionmark") {
|
||||
eatToken("?");
|
||||
optional = true;
|
||||
}
|
||||
eatToken(":");
|
||||
|
||||
let array = false;
|
||||
@ -203,7 +198,6 @@ export default function parse(tokens: Token[], file: string): Parsed {
|
||||
array,
|
||||
map: mapKey,
|
||||
location: { file, idx },
|
||||
optional
|
||||
};
|
||||
};
|
||||
|
||||
@ -351,7 +345,7 @@ export default function parse(tokens: Token[], file: string): Parsed {
|
||||
|
||||
if (currentToken.value !== ")") {
|
||||
while (true) {
|
||||
const [name] = eatText(true);
|
||||
const [name] = eatText();
|
||||
eatToken(":");
|
||||
const [type] = eatText();
|
||||
let array = false;
|
||||
|
||||
103
src/process.ts
103
src/process.ts
@ -2,8 +2,6 @@ import dbg from "debug";
|
||||
import * as FS from "fs";
|
||||
import Color from "chalk";
|
||||
import * as Path from "path";
|
||||
import * as Https from "https";
|
||||
import * as Http from "http";
|
||||
import tokenize, { TokenizerError } from "./tokenizer";
|
||||
import parse, { Parsed, ParserError } from "./parser";
|
||||
import get_ir, { IR, IRError } from "./ir";
|
||||
@ -13,10 +11,6 @@ import {
|
||||
NodeJSTypescriptTarget,
|
||||
} from "./targets/typescript";
|
||||
import { CSharpTarget } from "./targets/csharp";
|
||||
import { RustTarget } from "./targets/rust";
|
||||
import { ZIGTarget } from "./targets/zig";
|
||||
import { DartTarget } from "./targets/dart";
|
||||
import { URL } from "url";
|
||||
|
||||
class CatchedError extends Error {}
|
||||
|
||||
@ -27,9 +21,6 @@ export const Targets = new Map<string, typeof CompileTarget>();
|
||||
Targets.set("ts-esm", ESMTypescriptTarget);
|
||||
Targets.set("ts-node", NodeJSTypescriptTarget);
|
||||
Targets.set("c#", CSharpTarget as typeof CompileTarget);
|
||||
Targets.set("rust", RustTarget as typeof CompileTarget);
|
||||
Targets.set("zig", ZIGTarget as typeof CompileTarget);
|
||||
Targets.set("dart", DartTarget as typeof CompileTarget);
|
||||
|
||||
function indexToLineAndCol(src: string, index: number) {
|
||||
let line = 1;
|
||||
@ -46,70 +37,26 @@ function indexToLineAndCol(src: string, index: number) {
|
||||
return { line, col };
|
||||
}
|
||||
|
||||
function resolve(base: string, sub?: string) {
|
||||
if (sub && (sub.startsWith("http://") || sub.startsWith("https://"))) {
|
||||
let u = new URL(sub);
|
||||
return u.href;
|
||||
} else if (base.startsWith("http://") || base.startsWith("https://")) {
|
||||
let u = new URL(base);
|
||||
if (sub) {
|
||||
if (!sub.endsWith(".jrpc")) {
|
||||
sub += ".jrpc";
|
||||
}
|
||||
u = new URL(sub, u);
|
||||
}
|
||||
return u.href;
|
||||
} else {
|
||||
if (!sub) return Path.resolve(base);
|
||||
else return Path.resolve(Path.dirname(base), sub + ".jrpc");
|
||||
}
|
||||
}
|
||||
|
||||
async function fetchFileFromURL(url: string) {
|
||||
return new Promise<string>((yes, no) => {
|
||||
const makeReq = url.startsWith("https://") ? Https.request : Http.request;
|
||||
const req = makeReq(url, (res) => {
|
||||
let chunks: Buffer[] = [];
|
||||
res.on("data", (chunk) => {
|
||||
chunks.push(Buffer.from(chunk));
|
||||
});
|
||||
res.on("error", no);
|
||||
res.on("end", () => yes(Buffer.concat(chunks).toString("utf-8")));
|
||||
});
|
||||
|
||||
req.on("error", no);
|
||||
req.end();
|
||||
});
|
||||
}
|
||||
|
||||
const fileCache = new Map<string, string>();
|
||||
|
||||
async function getFile(name: string) {
|
||||
function getFile(name: string) {
|
||||
if (fileCache.has(name)) return fileCache.get(name);
|
||||
else {
|
||||
try {
|
||||
if (name.startsWith("http://") || name.startsWith("https://")) {
|
||||
const data = await fetchFileFromURL(name);
|
||||
fileCache.set(name, data);
|
||||
return data;
|
||||
} else {
|
||||
const data = FS.readFileSync(name, "utf-8");
|
||||
fileCache.set(name, data);
|
||||
return data;
|
||||
}
|
||||
} catch (err) {
|
||||
log(err);
|
||||
await printError(new Error(`Cannot open file ${name};`), null, 0);
|
||||
printError(new Error(`Cannot open file ${name};`), null, 0);
|
||||
}
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
|
||||
async function printError(err: Error, file: string | null, idx: number) {
|
||||
function printError(err: Error, file: string | null, idx: number) {
|
||||
let loc = { line: 0, col: 0 };
|
||||
if (file != null) {
|
||||
const data = getFile(file);
|
||||
if (data) loc = indexToLineAndCol(await data, idx);
|
||||
if (data) loc = indexToLineAndCol(data, idx);
|
||||
}
|
||||
|
||||
console.error(`${Color.red("ERROR: at")} ${file}:${loc.line}:${loc.col}`);
|
||||
@ -133,21 +80,21 @@ type ProcessContext = {
|
||||
processedFiles: Set<string>;
|
||||
};
|
||||
|
||||
async function processFile(
|
||||
function processFile(
|
||||
ctx: ProcessContext,
|
||||
file: string,
|
||||
root = false
|
||||
): Promise<Parsed | null> {
|
||||
file = resolve(file);
|
||||
): Parsed | null {
|
||||
file = Path.resolve(file);
|
||||
if (ctx.processedFiles.has(file)) {
|
||||
log("Skipping file %s since it has already been processed", file);
|
||||
log("Skipping file %s since it has already be processed", file);
|
||||
return null;
|
||||
}
|
||||
ctx.processedFiles.add(file);
|
||||
log("Processing file %s", file);
|
||||
|
||||
const content = await getFile(file);
|
||||
if (content == undefined) throw new Error("Could not open file " + file);
|
||||
const content = getFile(file);
|
||||
if (!content) throw new Error("Could not open file " + file);
|
||||
try {
|
||||
log("Tokenizing %s", file);
|
||||
const tokens = tokenize(content);
|
||||
@ -155,23 +102,27 @@ async function processFile(
|
||||
const parsed = parse(tokens, file);
|
||||
|
||||
log("Resolving imports of %s", file);
|
||||
let resolved: Parsed = [];
|
||||
for (const statement of parsed) {
|
||||
let resolved = parsed
|
||||
.map((statement) => {
|
||||
if (statement.type == "import") {
|
||||
let res = resolve(file, statement.path);
|
||||
resolved.push(...((await processFile(ctx, res)) || []));
|
||||
const base = Path.dirname(file);
|
||||
const resolved = Path.resolve(
|
||||
Path.join(base, statement.path + ".jrpc")
|
||||
);
|
||||
return processFile(ctx, resolved);
|
||||
} else {
|
||||
resolved.push(statement);
|
||||
return statement;
|
||||
}
|
||||
}
|
||||
|
||||
return resolved.filter((e) => !!e).flat(1) as Parsed;
|
||||
})
|
||||
.filter((e) => !!e)
|
||||
.flat(1) as Parsed;
|
||||
return resolved;
|
||||
} catch (err) {
|
||||
if (err instanceof TokenizerError) {
|
||||
await printError(err, file, err.index);
|
||||
printError(err, file, err.index);
|
||||
if (!root) throw new CatchedError();
|
||||
} else if (err instanceof ParserError) {
|
||||
await printError(err, file, err.token.startIdx);
|
||||
printError(err, file, err.token.startIdx);
|
||||
if (!root) throw new CatchedError();
|
||||
} else if (root && err instanceof CatchedError) {
|
||||
return null;
|
||||
@ -181,7 +132,7 @@ async function processFile(
|
||||
}
|
||||
}
|
||||
|
||||
export default async function startCompile(options: CompileOptions) {
|
||||
export default function startCompile(options: CompileOptions) {
|
||||
const ctx = {
|
||||
options,
|
||||
processedFiles: new Set(),
|
||||
@ -191,14 +142,14 @@ export default async function startCompile(options: CompileOptions) {
|
||||
if (options.input.endsWith(".json")) {
|
||||
ir = JSON.parse(FS.readFileSync(options.input, "utf-8"));
|
||||
} else {
|
||||
const parsed = await processFile(ctx, options.input, true);
|
||||
const parsed = processFile(ctx, options.input, true);
|
||||
|
||||
if (!parsed) process.exit(1); // Errors should have already been emitted
|
||||
try {
|
||||
ir = get_ir(parsed);
|
||||
} catch (err) {
|
||||
if (err instanceof IRError) {
|
||||
await printError(
|
||||
printError(
|
||||
err,
|
||||
err.statement.location.file,
|
||||
err.statement.location.idx
|
||||
|
||||
@ -7,8 +7,8 @@ import {
|
||||
} from "../ir";
|
||||
|
||||
import { CompileTarget } from "../compile";
|
||||
import { LineAppender } from "../utils";
|
||||
import chalk from "chalk";
|
||||
|
||||
type lineAppender = (ind: number, line: string | string[]) => void;
|
||||
|
||||
const conversion = {
|
||||
boolean: "bool",
|
||||
@ -23,16 +23,6 @@ function toCSharpType(type: string): string {
|
||||
return (conversion as any)[type] || type;
|
||||
}
|
||||
|
||||
// TODO: Add other keywords as well!
|
||||
const keywords = new Set(["event", "internal", "public", "private", "static"]);
|
||||
|
||||
const fixKeywordName = (name: string) => {
|
||||
if (keywords.has(name)) {
|
||||
return `${name}_`;
|
||||
}
|
||||
return name;
|
||||
}
|
||||
|
||||
export class CSharpTarget extends CompileTarget<{ csharp_namespace: string }> {
|
||||
name: string = "c#";
|
||||
|
||||
@ -62,7 +52,13 @@ export class CSharpTarget extends CompileTarget<{ csharp_namespace: string }> {
|
||||
}
|
||||
|
||||
generateType(definition: TypeDefinition): void {
|
||||
const { a, getResult } = LineAppender();
|
||||
let lines: string[] = [];
|
||||
const a: lineAppender = (i, t) => {
|
||||
if (!Array.isArray(t)) {
|
||||
t = [t];
|
||||
}
|
||||
t.forEach((l) => lines.push(" ".repeat(i) + l.trim()));
|
||||
};
|
||||
|
||||
a(0, `using System.Text.Json;`);
|
||||
a(0, `using System.Text.Json.Serialization;`);
|
||||
@ -72,20 +68,11 @@ export class CSharpTarget extends CompileTarget<{ csharp_namespace: string }> {
|
||||
a(0, ``);
|
||||
a(0, `public class ${definition.name} {`);
|
||||
for (const field of definition.fields) {
|
||||
let fn = field.name;
|
||||
if (keywords.has(field.name)) {
|
||||
console.log(
|
||||
chalk.yellow("[RUST] WARNING:"),
|
||||
`Field name '${fn}' is not allowed in C#. Renaming to '${fn}_'`
|
||||
);
|
||||
fn = fixKeywordName(fn);
|
||||
a(1, `[JsonPropertyName("${fn}")]`);
|
||||
}
|
||||
|
||||
if (field.array) {
|
||||
a(
|
||||
1,
|
||||
`public IList<${toCSharpType(field.type)}>? ${fn
|
||||
`public IList<${toCSharpType(field.type)}>? ${
|
||||
field.name
|
||||
} { get; set; }`
|
||||
);
|
||||
} else if (field.map) {
|
||||
@ -93,22 +80,28 @@ export class CSharpTarget extends CompileTarget<{ csharp_namespace: string }> {
|
||||
1,
|
||||
`public Dictionary<${toCSharpType(field.map)}, ${toCSharpType(
|
||||
field.type
|
||||
)}>? ${fn} { get; set; }`
|
||||
)}>? ${field.name} { get; set; }`
|
||||
);
|
||||
} else {
|
||||
a(
|
||||
1,
|
||||
`public ${toCSharpType(field.type)}? ${fn} { get; set; }`
|
||||
`public ${toCSharpType(field.type)}? ${field.name} { get; set; }`
|
||||
);
|
||||
}
|
||||
}
|
||||
a(0, `}`);
|
||||
|
||||
this.writeFile(`${definition.name}.cs`, getResult());
|
||||
this.writeFile(`${definition.name}.cs`, lines.join("\n"));
|
||||
}
|
||||
|
||||
generateEnum(definition: EnumDefinition): void {
|
||||
const { a, getResult } = LineAppender();
|
||||
let lines: string[] = [];
|
||||
const a: lineAppender = (i, t) => {
|
||||
if (!Array.isArray(t)) {
|
||||
t = [t];
|
||||
}
|
||||
t.forEach((l) => lines.push(" ".repeat(i) + l.trim()));
|
||||
};
|
||||
|
||||
a(0, `using System.Text.Json;`);
|
||||
a(0, `using System.Text.Json.Serialization;`);
|
||||
@ -121,11 +114,17 @@ export class CSharpTarget extends CompileTarget<{ csharp_namespace: string }> {
|
||||
}
|
||||
a(0, `}`);
|
||||
|
||||
this.writeFile(`${definition.name}.cs`, getResult());
|
||||
this.writeFile(`${definition.name}.cs`, lines.join("\n"));
|
||||
}
|
||||
|
||||
generateServiceClient(definition: ServiceDefinition) {
|
||||
const { a, getResult } = LineAppender();
|
||||
let lines: string[] = [];
|
||||
const a: lineAppender = (i, t) => {
|
||||
if (!Array.isArray(t)) {
|
||||
t = [t];
|
||||
}
|
||||
t.forEach((l) => lines.push(" ".repeat(i) + l.trim()));
|
||||
};
|
||||
|
||||
a(0, `using System;`);
|
||||
a(0, `using System.Text.Json;`);
|
||||
@ -147,12 +146,10 @@ export class CSharpTarget extends CompileTarget<{ csharp_namespace: string }> {
|
||||
for (const fnc of definition.functions) {
|
||||
let params = fnc.inputs
|
||||
.map((inp) => {
|
||||
let name = fixKeywordName(inp.name);
|
||||
|
||||
if (inp.array) {
|
||||
return `List<${toCSharpType(inp.type)}> ${name}`;
|
||||
return `List<${toCSharpType(inp.type)}> ${inp.name}`;
|
||||
} else {
|
||||
return `${toCSharpType(inp.type)} ${name}`;
|
||||
return `${toCSharpType(inp.type)} ${inp.name}`;
|
||||
}
|
||||
})
|
||||
.join(", ");
|
||||
@ -161,7 +158,7 @@ export class CSharpTarget extends CompileTarget<{ csharp_namespace: string }> {
|
||||
a(
|
||||
2,
|
||||
`var param = new JsonArray(${fnc.inputs
|
||||
.map((e) => `JsonSerializer.SerializeToNode(${fixKeywordName(e.name)})`)
|
||||
.map((e) => `JsonSerializer.SerializeToNode(${e.name})`)
|
||||
.join(", ")});`
|
||||
);
|
||||
|
||||
@ -205,11 +202,17 @@ export class CSharpTarget extends CompileTarget<{ csharp_namespace: string }> {
|
||||
// a(0, ``);
|
||||
a(0, `}`);
|
||||
|
||||
this.writeFile(`${definition.name}Client.cs`, getResult());
|
||||
this.writeFile(`${definition.name}Client.cs`, lines.join("\n"));
|
||||
}
|
||||
|
||||
generateServiceServer(definition: ServiceDefinition) {
|
||||
const { a, getResult } = LineAppender();
|
||||
let lines: string[] = [];
|
||||
const a: lineAppender = (i, t) => {
|
||||
if (!Array.isArray(t)) {
|
||||
t = [t];
|
||||
}
|
||||
t.forEach((l) => lines.push(" ".repeat(i) + l.trim()));
|
||||
};
|
||||
|
||||
a(0, `using System;`);
|
||||
a(0, `using System.Text.Json;`);
|
||||
@ -241,11 +244,10 @@ export class CSharpTarget extends CompileTarget<{ csharp_namespace: string }> {
|
||||
for (const fnc of definition.functions) {
|
||||
let params = [
|
||||
...fnc.inputs.map((inp) => {
|
||||
let name = fixKeywordName(inp.name)
|
||||
if (inp.array) {
|
||||
return `List<${toCSharpType(inp.type)}> ${name}`;
|
||||
return `List<${toCSharpType(inp.type)}> ${inp.name}`;
|
||||
} else {
|
||||
return `${toCSharpType(inp.type)} ${name}`;
|
||||
return `${toCSharpType(inp.type)} ${inp.name}`;
|
||||
}
|
||||
}),
|
||||
"TContext ctx",
|
||||
@ -329,7 +331,7 @@ export class CSharpTarget extends CompileTarget<{ csharp_namespace: string }> {
|
||||
a(1, `}`);
|
||||
a(0, `}`);
|
||||
|
||||
this.writeFile(`${definition.name}Server.cs`, getResult());
|
||||
this.writeFile(`${definition.name}Server.cs`, lines.join("\n"));
|
||||
}
|
||||
|
||||
generateService(definition: ServiceDefinition): void {
|
||||
|
||||
@ -1,328 +0,0 @@
|
||||
import { TypeDefinition, ServiceDefinition, EnumDefinition, Step } from "../ir";
|
||||
|
||||
import { CompileTarget } from "../compile";
|
||||
import { LineAppender, lineAppender } from "../utils";
|
||||
import chalk from "chalk";
|
||||
|
||||
const conversion = {
|
||||
boolean: "bool",
|
||||
int: "int",
|
||||
float: "double",
|
||||
string: "String",
|
||||
void: "void",
|
||||
// bytes: "Uint8List", //TODO: Check this
|
||||
};
|
||||
|
||||
function toDartType(type: string): string {
|
||||
return (conversion as any)[type] || type;
|
||||
}
|
||||
|
||||
export class DartTarget extends CompileTarget<{ dart_library_name: string }> {
|
||||
name: string = "dart";
|
||||
|
||||
start(): void {
|
||||
if (this.options.allow_bytes == true) {
|
||||
throw new Error("Dart has no support for 'bytes' yet!");
|
||||
}
|
||||
|
||||
if (!this.options.dart_library_name) {
|
||||
throw new Error(
|
||||
"Setting dart_library_name is required for DART target!"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
getImport(name: string) {
|
||||
return `import "./${name}.dart";`;
|
||||
}
|
||||
|
||||
generateImports(a: lineAppender, def: TypeDefinition | ServiceDefinition) {
|
||||
a(0, `import "./base.dart";`);
|
||||
def.depends.forEach((dep) => {
|
||||
a(0, this.getImport(dep));
|
||||
});
|
||||
}
|
||||
|
||||
getTypeParse(type: string, value: string) {
|
||||
if (conversion[type]) {
|
||||
return `${toDartType(type)}_fromJson(${value})`;
|
||||
} else {
|
||||
return `${toDartType(type)}.fromJson(${value})`;
|
||||
}
|
||||
}
|
||||
|
||||
generateType(definition: TypeDefinition): void {
|
||||
const { a, getResult } = LineAppender(2);
|
||||
|
||||
this.generateImports(a, definition);
|
||||
|
||||
a(0, ``);
|
||||
a(0, `class ${definition.name} {`);
|
||||
for (const field of definition.fields) {
|
||||
if (field.array) {
|
||||
a(1, `List<${toDartType(field.type)}>? ${field.name};`);
|
||||
} else if (field.map) {
|
||||
a(
|
||||
1,
|
||||
`Map<${toDartType(field.map)},${toDartType(field.type)}>? ${
|
||||
field.name
|
||||
};`
|
||||
);
|
||||
} else {
|
||||
a(1, `${toDartType(field.type)}? ${field.name};`);
|
||||
}
|
||||
}
|
||||
|
||||
a(0, ``);
|
||||
a(
|
||||
1,
|
||||
`${definition.name}({${definition.fields
|
||||
.map((e) => `this.${e.name}`)
|
||||
.join(", ")}});`
|
||||
);
|
||||
a(0, ``);
|
||||
a(1, `${definition.name}.fromJson(Map<String, dynamic> json) {`);
|
||||
for (const field of definition.fields) {
|
||||
a(2, `if(json.containsKey("${field.name}")) {`);
|
||||
|
||||
if (field.array) {
|
||||
a(3, `this.${field.name} = [];`);
|
||||
a(3, `(json["${field.name}"] as List<dynamic>).forEach((e) => {`);
|
||||
a(
|
||||
4,
|
||||
`this.${field.name}!.add(${this.getTypeParse(field.type, "e")})`
|
||||
);
|
||||
a(3, `});`);
|
||||
} else if (field.map) {
|
||||
a(3, `this.${field.name} = {};`);
|
||||
a(
|
||||
3,
|
||||
`(json["${field.name}"] as Map<${toDartType(
|
||||
field.map
|
||||
)},dynamic>).forEach((key, value) => {`
|
||||
);
|
||||
a(
|
||||
4,
|
||||
`this.${field.name}![key] = ${this.getTypeParse(
|
||||
field.type,
|
||||
"value"
|
||||
)}`
|
||||
);
|
||||
a(3, `});`);
|
||||
} else {
|
||||
a(
|
||||
3,
|
||||
`this.${field.name} = ${this.getTypeParse(
|
||||
field.type,
|
||||
`json["${field.name}"]`
|
||||
)};`
|
||||
);
|
||||
}
|
||||
a(2, `} else {`);
|
||||
a(3, `this.${field.name} = null;`);
|
||||
a(2, `}`);
|
||||
a(0, ``);
|
||||
}
|
||||
|
||||
a(1, `}`);
|
||||
|
||||
a(1, `Map<String, dynamic> toJson() {`);
|
||||
a(2, `Map<String, dynamic> res = {};`);
|
||||
for (const field of definition.fields) {
|
||||
if (conversion[field.type]) {
|
||||
a(2, `res["${field.name}"] = this.${field.name};`);
|
||||
} else {
|
||||
if (field.array) {
|
||||
a(
|
||||
2,
|
||||
`res["${field.name}"] = this.${field.name}?.map((entry) => entry.toJson()).toList();`
|
||||
);
|
||||
} else if (field.map) {
|
||||
// dict.map((key, value) => MapEntry(key, value.toString()));
|
||||
a(
|
||||
2,
|
||||
`res["${field.name}"] = this.${field.name}?.map((key, value) => MapEntry(key, value.toJson()));`
|
||||
);
|
||||
} else {
|
||||
a(2, `res["${field.name}"] = this.${field.name};`);
|
||||
}
|
||||
}
|
||||
}
|
||||
a(2, `return res;`);
|
||||
a(1, `}`);
|
||||
|
||||
a(0, `}`);
|
||||
|
||||
this.writeFile(`lib/src/${definition.name}.dart`, getResult());
|
||||
}
|
||||
|
||||
generateEnum(definition: EnumDefinition): void {
|
||||
const { a, getResult } = LineAppender(2);
|
||||
|
||||
a(0, `enum ${definition.name} {`);
|
||||
for (const entry of definition.values) {
|
||||
const isLast =
|
||||
definition.values[definition.values.length - 1] == entry;
|
||||
a(1, `${entry.name}(${entry.value})${isLast ? ";" : ","}`);
|
||||
}
|
||||
a(0, ``);
|
||||
a(1, `final int val;`);
|
||||
a(1, `const ${definition.name}(int valT) : val= valT;`);
|
||||
a(1, `static ${definition.name}? fromJson(int val) {`);
|
||||
a(2, `switch(val){`);
|
||||
for (const entry of definition.values) {
|
||||
a(3, `case ${entry.value}:`);
|
||||
a(4, `return ${definition.name}.${entry.name};`);
|
||||
}
|
||||
a(3, `default:`);
|
||||
a(4, `return null;`);
|
||||
a(2, `}`);
|
||||
a(1, `}`);
|
||||
|
||||
a(0, ``);
|
||||
|
||||
a(1, `int toJson() {`);
|
||||
a(2, `return this.val;`);
|
||||
a(1, `}`);
|
||||
|
||||
a(0, ``);
|
||||
a(0, `}`);
|
||||
|
||||
a(0, ``);
|
||||
|
||||
this.writeFile(`lib/src/${definition.name}.dart`, getResult());
|
||||
}
|
||||
|
||||
generateServiceClient(definition: ServiceDefinition): void {
|
||||
const { a, getResult } = LineAppender(2);
|
||||
|
||||
this.generateImports(a, definition);
|
||||
a(0, `import "./service_client.dart";`);
|
||||
a(0, ``);
|
||||
a(0, `class ${definition.name}Client extends Service {`);
|
||||
a(0, ``);
|
||||
|
||||
a(
|
||||
1,
|
||||
`${definition.name}Client(ServiceProvider provider):super(provider, "${definition.name}");`
|
||||
);
|
||||
|
||||
a(0, ``);
|
||||
|
||||
for (const func of definition.functions) {
|
||||
const args = func.inputs
|
||||
.map(
|
||||
(inp) =>
|
||||
(inp.array
|
||||
? `List<${toDartType(inp.type)}>`
|
||||
: toDartType(inp.type)) +
|
||||
" " +
|
||||
inp.name
|
||||
)
|
||||
.join(", ");
|
||||
|
||||
const asParams = func.inputs.map((e) => e.name).join(", ");
|
||||
|
||||
if (!func.return) {
|
||||
a(1, `void ${func.name}(${args}) {`);
|
||||
a(
|
||||
2,
|
||||
`provider.sendNotification("${definition.name}.${func.name}", [${asParams}]);`
|
||||
);
|
||||
a(1, `}`);
|
||||
} else {
|
||||
const baseReturnType =
|
||||
func.return.type != "void"
|
||||
? toDartType(func.return.type) + "?"
|
||||
: toDartType(func.return.type);
|
||||
const returnType = func.return.array
|
||||
? `List<${baseReturnType}>`
|
||||
: baseReturnType;
|
||||
|
||||
a(1, `Future<${returnType}> ${func.name}(${args}) async {`);
|
||||
a(
|
||||
2,
|
||||
`var res = await this.provider.sendRequest("${definition.name}.${func.name}", [${asParams}]);`
|
||||
);
|
||||
if (func.return.type !== "void") {
|
||||
if (func.return.array) {
|
||||
a(
|
||||
2,
|
||||
`return res.map((entry) =>${this.getTypeParse(
|
||||
func.return.type,
|
||||
"entry"
|
||||
)}).toList();`
|
||||
);
|
||||
} else {
|
||||
a(2, `return ${this.getTypeParse(func.return.type, "res")};`);
|
||||
}
|
||||
}
|
||||
a(1, `}`);
|
||||
}
|
||||
a(0, ``);
|
||||
}
|
||||
a(0, `}`);
|
||||
a(0, ``);
|
||||
|
||||
this.writeFile(`lib/src/${definition.name}Client.dart`, getResult());
|
||||
}
|
||||
|
||||
generateServiceServer(definition: ServiceDefinition): void {
|
||||
console.log(
|
||||
chalk.yellow("[DART] WARNING:"),
|
||||
"DART support for services is not yet there. Service generation is currently limited to clients!"
|
||||
);
|
||||
}
|
||||
|
||||
generateService(definition: ServiceDefinition): void {
|
||||
this.generateServiceClient(definition);
|
||||
this.writeFile(
|
||||
"lib/src/service_client.dart",
|
||||
this.getTemplate("Dart/service_client.dart")
|
||||
);
|
||||
}
|
||||
|
||||
finalize(steps: Step[]): void {
|
||||
const { a, getResult } = LineAppender(2);
|
||||
|
||||
a(0, `library ${this.options.dart_library_name};`);
|
||||
a(0, ``);
|
||||
|
||||
let hasService = false;
|
||||
|
||||
steps.forEach(([type, def]) => {
|
||||
switch (type) {
|
||||
case "type":
|
||||
a(0, `export 'src/${def.name}.dart';`);
|
||||
break;
|
||||
case "enum":
|
||||
a(0, `export 'src/${def.name}.dart';`);
|
||||
break;
|
||||
case "service":
|
||||
a(0, `export 'src/${def.name}Client.dart';`);
|
||||
hasService = true;
|
||||
break;
|
||||
default:
|
||||
console.warn(
|
||||
chalk.yellow("[DART] WARNING:"),
|
||||
"unimplemented step found:",
|
||||
type
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
if (hasService) {
|
||||
a(0, `export 'src/service_client.dart';`);
|
||||
}
|
||||
|
||||
this.writeFile(`lib/${this.options.dart_library_name}.dart`, getResult());
|
||||
this.writeFile(
|
||||
`pubspec.yaml`,
|
||||
this.getTemplate("Dart/pubspec.yaml").replace(
|
||||
"__NAME__",
|
||||
this.options.dart_library_name
|
||||
)
|
||||
);
|
||||
this.writeFile(`lib/src/base.dart`, this.getTemplate("Dart/base.dart"));
|
||||
}
|
||||
}
|
||||
@ -1,368 +0,0 @@
|
||||
import chalk from "chalk";
|
||||
import { CompileTarget } from "../compile";
|
||||
import { TypeDefinition, EnumDefinition, ServiceDefinition, Step, IR } from "../ir";
|
||||
import { lineAppender, LineAppender } from "../utils";
|
||||
|
||||
const conversion = {
|
||||
boolean: "bool",
|
||||
float: "f64",
|
||||
int: "i64",
|
||||
string: "String",
|
||||
void: "()",
|
||||
bytes: "Vec<u8>",
|
||||
};
|
||||
|
||||
function toRustType(type: string): string {
|
||||
return (conversion as any)[type] || type;
|
||||
}
|
||||
|
||||
function toSnake(input: string) {
|
||||
return (
|
||||
input[0].toLowerCase() +
|
||||
input.slice(1).replace(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`)
|
||||
);
|
||||
}
|
||||
|
||||
// TODO: Add other keywords as well!
|
||||
const keywords = new Set(["type", "static"]);
|
||||
|
||||
const fixKeywordName = (name: string) => {
|
||||
if (keywords.has(name)) {
|
||||
return `${name}_`;
|
||||
}
|
||||
return name;
|
||||
}
|
||||
|
||||
export class RustTarget extends CompileTarget<{ rust_crate: string }> {
|
||||
name: string = "rust";
|
||||
|
||||
get crate() {
|
||||
return this.options.rust_crate;
|
||||
}
|
||||
|
||||
start(): void {
|
||||
if (!this.crate)
|
||||
throw new Error(
|
||||
"Setting a crate name is required. Add the following to your jrpc file: 'define rust_crate <name>'"
|
||||
);
|
||||
|
||||
if (this.options.allow_bytes == true) {
|
||||
throw new Error("Rust has no support for 'bytes' yet!");
|
||||
}
|
||||
|
||||
this.writeFile(
|
||||
"Cargo.toml",
|
||||
this.getTemplate("Rust/Cargo.toml").replace("__name__", this.crate)
|
||||
);
|
||||
|
||||
this.writeFile("src/base_lib.rs", this.getTemplate("Rust/src/lib.rs"));
|
||||
}
|
||||
|
||||
private addDependencies(
|
||||
a: lineAppender,
|
||||
def: TypeDefinition | ServiceDefinition
|
||||
) {
|
||||
for (const dep of def.depends) {
|
||||
a(0, `use crate::${dep};`);
|
||||
}
|
||||
|
||||
a(0, ``);
|
||||
a(0, ``);
|
||||
}
|
||||
|
||||
generateType(definition: TypeDefinition): void {
|
||||
const { a, getResult } = LineAppender();
|
||||
|
||||
if (definition.fields.find((e) => e.map))
|
||||
a(0, `use std::collections::hash_map::HashMap;`);
|
||||
a(0, `use serde::{Deserialize, Serialize};`);
|
||||
this.addDependencies(a, definition);
|
||||
|
||||
a(0, `#[derive(Clone, Debug, Serialize, Deserialize)]`);
|
||||
a(0, `pub struct ${definition.name} {`);
|
||||
for (const field of definition.fields) {
|
||||
a(1, `#[allow(non_snake_case)]`);
|
||||
|
||||
let fn = `pub ${field.name}:`;
|
||||
if (keywords.has(field.name)) {
|
||||
// TODO: Add other keywords as well!
|
||||
console.log(
|
||||
chalk.yellow("[RUST] WARNING:"),
|
||||
`Field name '${field.name}' is not allowed in Rust. Renaming to '${field.name}_'`
|
||||
);
|
||||
fn = `pub ${fixKeywordName(field.name)}:`;
|
||||
a(1, `#[serde(rename = "${field.name}")]`);
|
||||
}
|
||||
let opts = "";
|
||||
let opte = "";
|
||||
if (field.optional) {
|
||||
opts = "Option<";
|
||||
opte = ">";
|
||||
}
|
||||
|
||||
if (field.array) {
|
||||
a(1, `${fn} ${opts}Vec<${toRustType(field.type)}>${opte},`);
|
||||
} else if (field.map) {
|
||||
a(
|
||||
1,
|
||||
`${fn} ${opts}HashMap<${toRustType(
|
||||
field.map
|
||||
)}, ${toRustType(field.type)}>${opte},`
|
||||
);
|
||||
} else {
|
||||
a(1, `${fn} ${opts}${toRustType(field.type)}${opte},`);
|
||||
}
|
||||
}
|
||||
a(0, `}`);
|
||||
|
||||
this.writeFile(`src/${toSnake(definition.name)}.rs`, getResult());
|
||||
}
|
||||
|
||||
generateEnum(definition: EnumDefinition): void {
|
||||
const { a, getResult } = LineAppender();
|
||||
|
||||
a(0, `use int_enum::IntEnum;`);
|
||||
a(0, `use serde::{Deserialize, Serialize};`);
|
||||
|
||||
a(0, ``);
|
||||
a(0, ``);
|
||||
|
||||
a(0, `#[repr(i64)]`);
|
||||
a(
|
||||
0,
|
||||
"#[derive(Clone, Copy, Debug, Eq, PartialEq, IntEnum)]"
|
||||
);
|
||||
a(0, `pub enum ${definition.name} {`);
|
||||
for (const field of definition.values) {
|
||||
a(1, `${field.name} = ${field.value},`);
|
||||
}
|
||||
a(0, `}`);
|
||||
|
||||
this.writeFile(`src/${toSnake(definition.name)}.rs`, getResult());
|
||||
}
|
||||
|
||||
private generateServiceClient(definition: ServiceDefinition): void {
|
||||
const { a, getResult } = LineAppender();
|
||||
|
||||
const typeToRust = (type: string, array: boolean) => {
|
||||
let rt = toRustType(type);
|
||||
return array ? `Vec<${rt}>` : rt;
|
||||
};
|
||||
|
||||
this.addDependencies(a, definition);
|
||||
|
||||
a(0, `use crate::base_lib::{JRPCClient, JRPCRequest, Result};`);
|
||||
a(0, `use serde_json::{json};`);
|
||||
a(0, ``);
|
||||
a(0, `pub struct ${definition.name}{`);
|
||||
a(1, `client: JRPCClient,`);
|
||||
a(0, `}`);
|
||||
a(0, ``);
|
||||
|
||||
a(0, `impl ${definition.name} {`);
|
||||
a(1, `pub fn new(client: JRPCClient) -> Self {`);
|
||||
a(2, `return Self { client };`);
|
||||
a(1, `}`);
|
||||
a(0, ``);
|
||||
for (const fnc of definition.functions) {
|
||||
let params = fnc.inputs
|
||||
.map((i) => fixKeywordName(i.name) + ": " + typeToRust(i.type, i.array))
|
||||
.join(", ");
|
||||
let ret = fnc.return
|
||||
? typeToRust(fnc.return.type, fnc.return.array)
|
||||
: "()";
|
||||
a(1, `#[allow(non_snake_case)]`);
|
||||
a(1, `pub async fn ${fnc.name}(&self, ${params}) -> Result<${ret}> {`);
|
||||
a(2, `let l_req = JRPCRequest {`);
|
||||
a(3, `jsonrpc: "2.0".to_owned(),`);
|
||||
a(3, `id: None, // 'id' will be set by the send_request function`);
|
||||
a(3, `method: "${definition.name}.${fnc.name}".to_owned(),`);
|
||||
a(3, `params: json!([${fnc.inputs.map((e) => fixKeywordName(e.name))}])`);
|
||||
a(2, `};`);
|
||||
a(2, ``);
|
||||
if (fnc.return) {
|
||||
a(2, `let l_res = self.client.send_request(l_req).await;`);
|
||||
a(2, `match l_res {`);
|
||||
a(3, `Err(e) => return Err(e),`);
|
||||
if (fnc.return.type == "void") {
|
||||
a(3, `Ok(_) => {`);
|
||||
a(4, `return Ok(());`);
|
||||
a(3, `}`);
|
||||
} else {
|
||||
a(3, `Ok(o) => {`);
|
||||
a(
|
||||
4,
|
||||
`return serde_json::from_value(o).map_err(|e| Box::from(e));`
|
||||
);
|
||||
a(3, `}`);
|
||||
}
|
||||
a(2, `}`);
|
||||
|
||||
} else {
|
||||
a(2, `self.client.send_notification(l_req).await;`);
|
||||
a(2, `return Ok(());`);
|
||||
}
|
||||
a(1, `}`);
|
||||
}
|
||||
a(0, `}`);
|
||||
a(0, ``);
|
||||
|
||||
this.writeFile(`src/client/${toSnake(definition.name)}.rs`, getResult());
|
||||
}
|
||||
|
||||
private generateServiceServer(definition: ServiceDefinition): void {
|
||||
const { a, getResult } = LineAppender();
|
||||
|
||||
this.addDependencies(a, definition);
|
||||
a(0, `use crate::base_lib::{JRPCServerService, JRPCRequest, Result};`);
|
||||
a(0, `use serde_json::{Value};`);
|
||||
a(0, `use std::sync::Arc;`);
|
||||
a(0, `use async_trait::async_trait;`);
|
||||
|
||||
const typeToRust = (type: string, array: boolean) => {
|
||||
let rt = toRustType(type);
|
||||
return array ? `Vec<${rt}>` : rt;
|
||||
};
|
||||
|
||||
a(0, `#[async_trait]`);
|
||||
a(0, `pub trait ${definition.name} {`);
|
||||
for (const fnc of definition.functions) {
|
||||
let params =
|
||||
fnc.inputs.length > 0
|
||||
? fnc.inputs
|
||||
.map((i) => fixKeywordName(i.name) + ": " + typeToRust(i.type, i.array))
|
||||
.join(", ")
|
||||
: "";
|
||||
let ret = fnc.return
|
||||
? typeToRust(fnc.return.type, fnc.return.array)
|
||||
: "()";
|
||||
a(1, `#[allow(non_snake_case)]`);
|
||||
a(1, `async fn ${fnc.name}(&self, ${params}) -> Result<${ret}>;`);
|
||||
}
|
||||
a(0, `}`);
|
||||
|
||||
a(0, ``);
|
||||
a(0, `pub struct ${definition.name}Handler {`);
|
||||
a(1, `implementation: Box<dyn ${definition.name} + Sync + Send + 'static>,`);
|
||||
a(0, `}`);
|
||||
a(0, ``);
|
||||
a(0, `impl ${definition.name}Handler {`);
|
||||
//TODO: Maybe add a new definition like, pub fn new2<T>(implementation: T) where T: ${definition.name} + Sync + Send + 'static {}
|
||||
a(
|
||||
1,
|
||||
`pub fn new(implementation: Box<dyn ${definition.name} + Sync + Send + 'static>) -> Arc<Self> {`
|
||||
);
|
||||
a(2, `return Arc::from(Self { implementation });`);
|
||||
a(1, `}`);
|
||||
a(0, `}`);
|
||||
|
||||
a(0, ``);
|
||||
|
||||
a(0, `#[async_trait]`);
|
||||
a(
|
||||
0,
|
||||
`impl JRPCServerService for ${definition.name}Handler {`
|
||||
);
|
||||
|
||||
a(1, `fn get_id(&self) -> String { "${definition.name}".to_owned() }`);
|
||||
a(0, ``);
|
||||
|
||||
a(1, `#[allow(non_snake_case)]`);
|
||||
a(
|
||||
1,
|
||||
`async fn handle(&self, msg: &JRPCRequest, function: &str) -> Result<(bool, Value)> {`
|
||||
);
|
||||
a(2, `match function {`);
|
||||
for (const fnc of definition.functions) {
|
||||
a(3, `"${fnc.name}" => {`);
|
||||
a(4, `if msg.params.is_array() {`);
|
||||
if (fnc.inputs.length > 0) {
|
||||
a(
|
||||
5,
|
||||
`let arr = msg.params.as_array().unwrap(); //TODO: Check if this can fail.`
|
||||
);
|
||||
}
|
||||
a(5, `let res = self.implementation.${fnc.name}(`);
|
||||
for (let i = 0; i < fnc.inputs.length; i++) {
|
||||
const inp = fnc.inputs[i];
|
||||
a(6, `serde_json::from_value(arr[${i}].clone())`);
|
||||
a(
|
||||
7,
|
||||
`.map_err(|_| "Parameter for field '${inp.name}' should be of type '${inp.type}'!")?${i == fnc.inputs.length - 1 ? "" : ","}` //TODO: Array
|
||||
);
|
||||
}
|
||||
a(5, `).await?;`);
|
||||
if (fnc.return) {
|
||||
a(5, `return Ok((true, serde_json::to_value(res)?));`);
|
||||
} else {
|
||||
a(5, `_ = res;`);
|
||||
a(5, `return Ok((false, Value::Null))`);
|
||||
}
|
||||
a(4, `} else if msg.params.is_object() {`);
|
||||
a(5, `return Err(Box::from("Not implemented yet".to_owned()));`);
|
||||
a(4, `} else {`);
|
||||
a(5, `return Err(Box::from("Invalid parameters??".to_owned()));`);
|
||||
a(4, `}`);
|
||||
a(3, `},`);
|
||||
}
|
||||
a(
|
||||
3,
|
||||
`_ => { return Err(Box::from(format!("Invalid function {}", function).to_owned())) ;},`
|
||||
);
|
||||
a(2, `}`);
|
||||
a(1, `}`);
|
||||
a(0, `}`);
|
||||
this.writeFile(`src/server/${toSnake(definition.name)}.rs`, getResult());
|
||||
}
|
||||
|
||||
generateService(definition: ServiceDefinition): void {
|
||||
console.log(
|
||||
chalk.yellow("[RUST] WARNING:"),
|
||||
"Rust support for services is WIP. Use with care!"
|
||||
);
|
||||
this.generateServiceServer(definition);
|
||||
this.generateServiceClient(definition);
|
||||
}
|
||||
|
||||
private generateLib(steps: Step[]) {
|
||||
const { a, getResult } = LineAppender();
|
||||
|
||||
const lc = LineAppender();
|
||||
const ls = LineAppender();
|
||||
|
||||
const ac = lc.a;
|
||||
const as = ls.a;
|
||||
|
||||
a(0, `pub mod base_lib;`);
|
||||
a(0, `pub use base_lib::{JRPCServer, JRPCClient, Result};`);
|
||||
|
||||
for (const [typ, def] of steps) {
|
||||
if (typ == "type" || typ == "enum") {
|
||||
a(0, `mod ${toSnake(def.name)};`);
|
||||
a(0, `pub use ${toSnake(def.name)}::${def.name};`);
|
||||
} else if (typ == "service") {
|
||||
as(0, `mod ${toSnake(def.name)};`);
|
||||
as(
|
||||
0,
|
||||
`pub use ${toSnake(def.name)}::{${def.name}, ${def.name
|
||||
}Handler};`
|
||||
);
|
||||
|
||||
ac(0, `mod ${toSnake(def.name)};`);
|
||||
ac(0, `pub use ${toSnake(def.name)}::${def.name};`);
|
||||
}
|
||||
}
|
||||
|
||||
a(0, `pub mod server;`);
|
||||
a(0, `pub mod client;`);
|
||||
|
||||
this.writeFile(`src/lib.rs`, getResult());
|
||||
this.writeFile(`src/server/mod.rs`, ls.getResult());
|
||||
this.writeFile(`src/client/mod.rs`, lc.getResult());
|
||||
}
|
||||
|
||||
finalize(steps: Step[]): void {
|
||||
this.generateLib(steps);
|
||||
// throw new Error("Method not implemented.");
|
||||
}
|
||||
}
|
||||
@ -7,9 +7,10 @@ import {
|
||||
} from "../ir";
|
||||
|
||||
import { CompileTarget } from "../compile";
|
||||
import { LineAppender, lineAppender } from "../utils";
|
||||
// import * as prettier from "prettier";
|
||||
|
||||
type lineAppender = (ind: number, line: string | string[]) => void;
|
||||
|
||||
const conversion = {
|
||||
boolean: "boolean",
|
||||
int: "number",
|
||||
@ -33,7 +34,8 @@ export class TypescriptTarget extends CompileTarget {
|
||||
}
|
||||
|
||||
private generateImport(imports: string, path: string) {
|
||||
return `import ${imports} from "${path + (this.flavour === "esm" ? ".js" : "")
|
||||
return `import ${imports} from "${
|
||||
path + (this.flavour === "esm" ? ".ts" : "")
|
||||
}";\n`;
|
||||
}
|
||||
|
||||
@ -71,7 +73,13 @@ export class TypescriptTarget extends CompileTarget {
|
||||
}
|
||||
|
||||
generateType(def: TypeDefinition) {
|
||||
const { a, getResult } = LineAppender();
|
||||
let lines: string[] = [];
|
||||
const a: lineAppender = (i, t) => {
|
||||
if (!Array.isArray(t)) {
|
||||
t = [t];
|
||||
}
|
||||
t.forEach((l) => lines.push(" ".repeat(i) + l.trim()));
|
||||
};
|
||||
|
||||
this.generateImports(a, def);
|
||||
a(0, `export default class ${def.name} {`);
|
||||
@ -88,7 +96,7 @@ export class TypescriptTarget extends CompileTarget {
|
||||
} else {
|
||||
type = toJSType(field.type);
|
||||
}
|
||||
return `${field.name}${field.optional ? "?" : ""}: ${type}; `;
|
||||
return `${field.name}?: ${type}; `;
|
||||
})
|
||||
);
|
||||
|
||||
@ -124,18 +132,10 @@ export class TypescriptTarget extends CompileTarget {
|
||||
);
|
||||
a(1, `let res = new ${def.name}() as any;`);
|
||||
def.fields.forEach((field) => {
|
||||
if (field.optional) {
|
||||
a(
|
||||
1,
|
||||
`if(data["${field.name}"] !== null && data["${field.name}"] !== undefined) {`
|
||||
);
|
||||
} else {
|
||||
a(
|
||||
1,
|
||||
`if(data["${field.name}"] === null || data["${field.name}"] === undefined) throw new VerificationError("${def.name}", "${field.name}", data["${field.name}"]);`
|
||||
);
|
||||
a(1, `else {`);
|
||||
}
|
||||
if (field.array) {
|
||||
a(
|
||||
2,
|
||||
@ -168,12 +168,17 @@ export class TypescriptTarget extends CompileTarget {
|
||||
|
||||
a(0, ``);
|
||||
|
||||
this.writeFormattedFile(this.getFileName(def.name), getResult());
|
||||
this.writeFormattedFile(this.getFileName(def.name), lines.join("\n"));
|
||||
}
|
||||
|
||||
generateEnum(def: EnumDefinition) {
|
||||
const { a, getResult } = LineAppender();
|
||||
|
||||
let lines: string[] = [];
|
||||
const a: lineAppender = (i, t) => {
|
||||
if (!Array.isArray(t)) {
|
||||
t = [t];
|
||||
}
|
||||
t.forEach((l) => lines.push(" ".repeat(i) + l.trim()));
|
||||
};
|
||||
a(0, this.generateImport("{ VerificationError }", "./ts_base"));
|
||||
|
||||
a(0, `enum ${def.name} {`);
|
||||
@ -200,14 +205,14 @@ export class TypescriptTarget extends CompileTarget {
|
||||
a(1, `return data;`);
|
||||
a(0, `}`);
|
||||
|
||||
this.writeFormattedFile(this.getFileName(def.name), getResult());
|
||||
this.writeFormattedFile(this.getFileName(def.name), lines.join("\n"));
|
||||
}
|
||||
|
||||
generateServiceClient(def: ServiceDefinition) {
|
||||
this.writeFormattedFile(
|
||||
"service_client.ts",
|
||||
this.generateImport(
|
||||
"{ type RequestObject, type ResponseObject, ErrorCodes, Logging }",
|
||||
"{ RequestObject, ResponseObject, ErrorCodes, Logging }",
|
||||
"./service_base"
|
||||
) +
|
||||
this.generateImport(" { VerificationError }", "./ts_base") +
|
||||
@ -215,7 +220,13 @@ export class TypescriptTarget extends CompileTarget {
|
||||
this.getTemplate("ts_service_client.ts")
|
||||
);
|
||||
|
||||
const { a, getResult } = LineAppender();
|
||||
let lines: string[] = [];
|
||||
const a: lineAppender = (i, t) => {
|
||||
if (!Array.isArray(t)) {
|
||||
t = [t];
|
||||
}
|
||||
t.forEach((l) => lines.push(" ".repeat(i) + l.trim()));
|
||||
};
|
||||
|
||||
this.generateImports(a, def);
|
||||
|
||||
@ -294,17 +305,23 @@ export class TypescriptTarget extends CompileTarget {
|
||||
|
||||
this.writeFormattedFile(
|
||||
this.getFileName(def.name + "_client"),
|
||||
getResult()
|
||||
lines.join("\n")
|
||||
);
|
||||
}
|
||||
|
||||
generateServiceServer(def: ServiceDefinition) {
|
||||
const { a, getResult } = LineAppender();
|
||||
let lines: string[] = [];
|
||||
const a: lineAppender = (i, t) => {
|
||||
if (!Array.isArray(t)) {
|
||||
t = [t];
|
||||
}
|
||||
t.forEach((l) => lines.push(" ".repeat(i) + l.trim()));
|
||||
};
|
||||
|
||||
this.writeFormattedFile(
|
||||
"service_server.ts",
|
||||
this.generateImport(
|
||||
"{ type RequestObject, type ResponseObject, ErrorCodes, Logging }",
|
||||
"{ RequestObject, ResponseObject, ErrorCodes, Logging }",
|
||||
"./service_base"
|
||||
) +
|
||||
this.generateImport(" { VerificationError }", "./ts_base") +
|
||||
@ -342,7 +359,8 @@ export class TypescriptTarget extends CompileTarget {
|
||||
`ctx: T`,
|
||||
].join(", ");
|
||||
const retVal = fnc.return
|
||||
? `Promise<${toJSType(fnc.return.type) + (fnc.return.array ? "[]" : "")
|
||||
? `Promise<${
|
||||
toJSType(fnc.return.type) + (fnc.return.array ? "[]" : "")
|
||||
}>`
|
||||
: `void`;
|
||||
a(1, `abstract ${fnc.name}(${params}): ${retVal};`);
|
||||
@ -354,9 +372,7 @@ export class TypescriptTarget extends CompileTarget {
|
||||
a(2, `if(Array.isArray(params)){`);
|
||||
a(3, `p = params;`);
|
||||
a(3, `while(p.length < ${fnc.inputs.length})`);
|
||||
a(4, `p.push(undefined);`);
|
||||
a(3, `if(p.length > ${fnc.inputs.length})`);
|
||||
a(4, `throw new Error("Too many parameters!");`);
|
||||
a(4, `p.push(undefined)`);
|
||||
a(2, `} else {`);
|
||||
for (const param of fnc.inputs) {
|
||||
a(3, `p.push(params["${param.name}"])`);
|
||||
@ -387,7 +403,8 @@ export class TypescriptTarget extends CompileTarget {
|
||||
2,
|
||||
`return this.${fnc.name}.call(this, ...p)` + //TODO: Refactor. This line is way to compicated for anyone to understand, including me
|
||||
(fnc.return
|
||||
? `.then(${fnc.return?.array
|
||||
? `.then(${
|
||||
fnc.return?.array
|
||||
? `res => res.map(e => apply_${fnc.return.type}(e))`
|
||||
: `res => apply_${fnc.return.type}(res)`
|
||||
});`
|
||||
@ -401,7 +418,7 @@ export class TypescriptTarget extends CompileTarget {
|
||||
|
||||
this.writeFormattedFile(
|
||||
this.getFileName(def.name + "_server"),
|
||||
getResult()
|
||||
lines.join("\n")
|
||||
);
|
||||
}
|
||||
|
||||
@ -415,13 +432,30 @@ export class TypescriptTarget extends CompileTarget {
|
||||
}
|
||||
|
||||
finalize(steps: Step[]) {
|
||||
const lc = LineAppender();
|
||||
const ls = LineAppender();
|
||||
let linesClient: string[] = [];
|
||||
let linesServer: string[] = [];
|
||||
|
||||
const ac = lc.a;
|
||||
const as = ls.a;
|
||||
const ac: lineAppender = (i, t) => {
|
||||
if (!Array.isArray(t)) {
|
||||
t = [t];
|
||||
}
|
||||
t.forEach((l) => linesClient.push(" ".repeat(i) + l.trim()));
|
||||
};
|
||||
|
||||
const { a, getResult } = LineAppender();
|
||||
const as: lineAppender = (i, t) => {
|
||||
if (!Array.isArray(t)) {
|
||||
t = [t];
|
||||
}
|
||||
t.forEach((l) => linesServer.push(" ".repeat(i) + l.trim()));
|
||||
};
|
||||
|
||||
let lines: string[] = [];
|
||||
const a: lineAppender = (i, t) => {
|
||||
if (!Array.isArray(t)) {
|
||||
t = [t];
|
||||
}
|
||||
t.forEach((l) => lines.push(" ".repeat(i) + l.trim()));
|
||||
};
|
||||
|
||||
let hasService = false;
|
||||
steps.forEach(([type, def]) => {
|
||||
@ -481,9 +515,17 @@ export class TypescriptTarget extends CompileTarget {
|
||||
}
|
||||
});
|
||||
|
||||
this.writeFormattedFile(this.getFileName("index"), getResult());
|
||||
this.writeFormattedFile(this.getFileName("index_client"), lc.getResult());
|
||||
this.writeFormattedFile(this.getFileName("index_server"), ls.getResult());
|
||||
this.writeFormattedFile(this.getFileName("index"), lines.join("\n"));
|
||||
|
||||
this.writeFormattedFile(
|
||||
this.getFileName("index_client"),
|
||||
linesClient.join("\n")
|
||||
);
|
||||
|
||||
this.writeFormattedFile(
|
||||
this.getFileName("index_server"),
|
||||
linesServer.join("\n")
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,110 +0,0 @@
|
||||
import { TypeDefinition, ServiceDefinition, EnumDefinition, Step } from "../ir";
|
||||
|
||||
import { CompileTarget } from "../compile";
|
||||
import { LineAppender, lineAppender } from "../utils";
|
||||
import chalk from "chalk";
|
||||
|
||||
const conversion = {
|
||||
boolean: "bool",
|
||||
int: "i64",
|
||||
float: "f64",
|
||||
string: "[]u8",
|
||||
void: "void",
|
||||
bytes: "[]u8",
|
||||
};
|
||||
|
||||
function toZigType(type: string): string {
|
||||
return (conversion as any)[type] || type;
|
||||
}
|
||||
|
||||
export class ZIGTarget extends CompileTarget<{ }> {
|
||||
name: string = "zig";
|
||||
|
||||
start(): void {
|
||||
if (this.options.allow_bytes == true) {
|
||||
throw new Error("Zig has no support for 'bytes' yet!");
|
||||
}
|
||||
}
|
||||
|
||||
getImport(name: string) {
|
||||
return `const ${name} = @import("./${name}.zig").${name};`;
|
||||
}
|
||||
|
||||
generateImports(a: lineAppender, def: TypeDefinition | ServiceDefinition) {
|
||||
a(0, `const std = @import("std");`);
|
||||
def.depends.forEach((dep) => {
|
||||
a(0, this.getImport(dep));
|
||||
});
|
||||
}
|
||||
|
||||
generateType(definition: TypeDefinition): void {
|
||||
const { a, getResult } = LineAppender();
|
||||
|
||||
this.generateImports(a, definition);
|
||||
|
||||
a(0, ``);
|
||||
|
||||
a(0, `pub const ${definition.name} = struct {`);
|
||||
for (const field of definition.fields) {
|
||||
if (field.array) {
|
||||
a(1, `${field.name}: std.ArrayList(${toZigType(field.type)}),`);
|
||||
} else if (field.map) {
|
||||
a(
|
||||
1,
|
||||
`${field.name}: std.AutoHashMap(${toZigType(
|
||||
field.map
|
||||
)}, ${toZigType(field.type)}),`
|
||||
);
|
||||
} else {
|
||||
a(1, `${field.name}: ${toZigType(field.type)},`);
|
||||
}
|
||||
}
|
||||
|
||||
a(0, `};`);
|
||||
|
||||
this.writeFile(`${definition.name}.zig`, getResult());
|
||||
}
|
||||
|
||||
generateEnum(definition: EnumDefinition): void {
|
||||
const { a, getResult } = LineAppender();
|
||||
|
||||
a(0, `pub const ${definition.name} = enum(i32) {`);
|
||||
for (const entry of definition.values) {
|
||||
a(1, `${entry.name} = ${entry.value},`);
|
||||
}
|
||||
a(0, `};`);
|
||||
|
||||
this.writeFile(`${definition.name}.zig`, getResult());
|
||||
}
|
||||
|
||||
generateService(definition: ServiceDefinition): void {
|
||||
console.log(
|
||||
chalk.yellow("[ZIG] WARNING:"),
|
||||
"ZIG support for services is not yet there. Service generation is skipped!"
|
||||
);
|
||||
}
|
||||
|
||||
finalize(steps: Step[]): void {
|
||||
const { a, getResult } = LineAppender();
|
||||
|
||||
steps.forEach(([type, def]) => {
|
||||
switch (type) {
|
||||
case "type":
|
||||
a(0, `pub ${this.getImport(def.name)}`);
|
||||
break;
|
||||
case "enum":
|
||||
a(0, `pub ${this.getImport(def.name)}`);
|
||||
break;
|
||||
default:
|
||||
console.warn(
|
||||
chalk.yellow("[ZIG] WARNING:"),
|
||||
"unimplemented step found:",
|
||||
type
|
||||
);
|
||||
// case "service":
|
||||
}
|
||||
});
|
||||
|
||||
this.writeFile(`mod.zig`, getResult());
|
||||
}
|
||||
}
|
||||
20
src/utils.ts
20
src/utils.ts
@ -1,20 +0,0 @@
|
||||
export type lineAppender = (ind: number, line: string | string[]) => void;
|
||||
|
||||
export function LineAppender(indentSize = 3): {
|
||||
a: lineAppender;
|
||||
getResult: () => string;
|
||||
} {
|
||||
const lines: string[] = [];
|
||||
|
||||
return {
|
||||
a: (indentation: number, line: string | string[]) => {
|
||||
if (!Array.isArray(line)) {
|
||||
line = [line];
|
||||
}
|
||||
line.forEach((l) =>
|
||||
lines.push(" ".repeat(indentation * indentSize) + l.trim())
|
||||
);
|
||||
},
|
||||
getResult: () => lines.join("\n"),
|
||||
};
|
||||
}
|
||||
@ -4,7 +4,6 @@
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<LangVersion>10.0</LangVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@ -11,12 +11,10 @@ public class JRpcClient
|
||||
{
|
||||
private JRpcTransport Transport;
|
||||
private IDictionary<string, TaskCompletionSource<JsonNode?>> Requests;
|
||||
private int? Timeout = null;
|
||||
|
||||
public JRpcClient(JRpcTransport transport, int? timeout = null)
|
||||
public JRpcClient(JRpcTransport transport)
|
||||
{
|
||||
this.Transport = transport;
|
||||
this.Timeout = timeout;
|
||||
this.Requests = new Dictionary<string, TaskCompletionSource<JsonNode?>>();
|
||||
|
||||
this.Transport.OnPacket += this.HandlePacket;
|
||||
@ -89,43 +87,10 @@ public class JRpcClient
|
||||
|
||||
var task = new TaskCompletionSource<JsonNode?>();
|
||||
this.Requests.Add(id, task);
|
||||
|
||||
try
|
||||
{
|
||||
_ = Task.Run(async () =>
|
||||
{
|
||||
try
|
||||
{
|
||||
await this.Transport.Write(request.ToJsonString());
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
task.SetException(e);
|
||||
}
|
||||
});
|
||||
|
||||
if (this.Timeout.HasValue)
|
||||
{
|
||||
if (await Task.WhenAny(task.Task, Task.Delay(this.Timeout.Value)) == task.Task)
|
||||
{
|
||||
return await task.Task;
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new JRpcTimeoutException();
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
return await task.Task;
|
||||
}
|
||||
}
|
||||
finally
|
||||
{
|
||||
this.Requests.Remove(id);
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<TResult?> SendRequest<TResult>(string method, JsonArray param)
|
||||
{
|
||||
@ -163,8 +128,3 @@ public class JRpcException : Exception
|
||||
{
|
||||
public JRpcException(string message) : base(message) { }
|
||||
}
|
||||
|
||||
public class JRpcTimeoutException : JRpcException
|
||||
{
|
||||
public JRpcTimeoutException() : base("Request Timeout") { }
|
||||
}
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
# This file configures the static analysis results for your project (errors,
|
||||
# warnings, and lints).
|
||||
#
|
||||
# This enables the 'recommended' set of lints from `package:lints`.
|
||||
# This set helps identify many issues that may lead to problems when running
|
||||
# or consuming Dart code, and enforces writing Dart using a single, idiomatic
|
||||
# style and format.
|
||||
#
|
||||
# If you want a smaller set of lints you can change this to specify
|
||||
# 'package:lints/core.yaml'. These are just the most critical lints
|
||||
# (the recommended set includes the core lints).
|
||||
# The core lints are also what is used by pub.dev for scoring packages.
|
||||
|
||||
include: package:lints/recommended.yaml
|
||||
|
||||
# Uncomment the following section to specify additional rules.
|
||||
|
||||
# linter:
|
||||
# rules:
|
||||
# - camel_case_types
|
||||
|
||||
# analyzer:
|
||||
# exclude:
|
||||
# - path/to/excluded/files/**
|
||||
|
||||
# For more information about the core and recommended set of lints, see
|
||||
# https://dart.dev/go/core-lints
|
||||
|
||||
# For additional information about configuring this file, see
|
||||
# https://dart.dev/guides/language/analysis-options
|
||||
@ -1,52 +0,0 @@
|
||||
class JRPCError extends Error {
|
||||
String message;
|
||||
JRPCError(this.message);
|
||||
|
||||
@override
|
||||
String toString() => message;
|
||||
}
|
||||
|
||||
int? int_fromJson(dynamic val) {
|
||||
if (val == null) {
|
||||
return null;
|
||||
} else if (val is int) {
|
||||
return val;
|
||||
} else if (val is double) {
|
||||
return val.toInt();
|
||||
} else {
|
||||
throw JRPCError("Not a number!");
|
||||
}
|
||||
}
|
||||
|
||||
double? double_fromJson(dynamic val) {
|
||||
if (val == null) {
|
||||
return null;
|
||||
} else if (val is int) {
|
||||
return val.toDouble();
|
||||
} else if (val is double) {
|
||||
return val;
|
||||
} else {
|
||||
throw JRPCError("Not a number!");
|
||||
}
|
||||
}
|
||||
|
||||
bool? bool_fromJson(dynamic val) {
|
||||
if (val == null) {
|
||||
return null;
|
||||
} else if (val is bool) {
|
||||
return val;
|
||||
} else {
|
||||
throw JRPCError("Not a bool!");
|
||||
}
|
||||
}
|
||||
|
||||
String? String_fromJson(dynamic val) {
|
||||
if (val == null) {
|
||||
return null;
|
||||
} else if (val is String) {
|
||||
return val;
|
||||
} else {
|
||||
return val.toString(); // TODO: Either this or error
|
||||
// throw JRPCError("Not a string!");
|
||||
}
|
||||
}
|
||||
@ -1,10 +0,0 @@
|
||||
name: __NAME__
|
||||
description: JRPC
|
||||
version: 1.0.0
|
||||
|
||||
environment:
|
||||
sdk: ">=2.17.6 <3.0.0"
|
||||
|
||||
dependencies: {}
|
||||
dev_dependencies:
|
||||
lints: ^2.0.0
|
||||
@ -1,86 +0,0 @@
|
||||
import "dart:async";
|
||||
import 'dart:math';
|
||||
|
||||
import "./base.dart";
|
||||
|
||||
abstract class Service {
|
||||
String name;
|
||||
ServiceProvider provider;
|
||||
|
||||
Service(this.provider, this.name) {
|
||||
provider._services[name] = this;
|
||||
}
|
||||
}
|
||||
|
||||
class ServiceProvider {
|
||||
final Map<String, Service> _services = {};
|
||||
final Map<String, Completer<dynamic>> _requests = {};
|
||||
|
||||
StreamController<Map<String, dynamic>> output = StreamController();
|
||||
late StreamSubscription s;
|
||||
|
||||
ServiceProvider(Stream<Map<String, dynamic>> input) {
|
||||
s = input.listen(onMessage);
|
||||
}
|
||||
|
||||
void onMessage(Map<String, dynamic> msg) {
|
||||
// print("Working on message");
|
||||
if (msg.containsKey("method")) {
|
||||
if (msg.containsKey("id")) {
|
||||
print("Message is request");
|
||||
// Request, not supported!
|
||||
return;
|
||||
} else {
|
||||
// print("Message is notification");
|
||||
// Notification
|
||||
// TODO: Implement
|
||||
}
|
||||
} else {
|
||||
// print("Message is response");
|
||||
// Response
|
||||
var req = _requests[msg["id"]];
|
||||
|
||||
if (req == null) {
|
||||
// print("Could not find related request. Ignoring");
|
||||
return; // Irrelevant response
|
||||
}
|
||||
if (msg.containsKey("error")) {
|
||||
//TODO:
|
||||
req.completeError(JRPCError(msg["error"]["message"]));
|
||||
} else {
|
||||
req.complete(msg["result"]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Future<dynamic> sendRequest(String method, dynamic params) {
|
||||
var id = nanoid(10);
|
||||
var req = {"jsonrpc": "2.0", "id": id, "method": method, "params": params};
|
||||
|
||||
var completer = Completer<dynamic>();
|
||||
|
||||
output.add(req);
|
||||
_requests[id] = completer;
|
||||
|
||||
return completer.future;
|
||||
}
|
||||
|
||||
void sendNotification(String method, dynamic params) {
|
||||
var req = {"jsonrpc": "2.0", "method": method, "params": params};
|
||||
output.add(req);
|
||||
}
|
||||
}
|
||||
|
||||
// Copied from: https://github.com/pd4d10/nanoid-dart (MIT License)
|
||||
final _random = Random.secure();
|
||||
const urlAlphabet =
|
||||
'ModuleSymbhasOwnPr-0123456789ABCDEFGHNRVfgctiUvz_KqYTJkLxpZXIjQW';
|
||||
|
||||
String nanoid([int size = 21]) {
|
||||
final len = urlAlphabet.length;
|
||||
String id = '';
|
||||
while (0 < size--) {
|
||||
id += urlAlphabet[_random.nextInt(len)];
|
||||
}
|
||||
return id;
|
||||
}
|
||||
@ -1,2 +0,0 @@
|
||||
[*.rs]
|
||||
indent_size = 4
|
||||
2
templates/Rust/.gitignore
vendored
2
templates/Rust/.gitignore
vendored
@ -1,2 +0,0 @@
|
||||
target
|
||||
Cargo.lock
|
||||
@ -1,15 +0,0 @@
|
||||
[package]
|
||||
name = "__name__"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[dependencies]
|
||||
int-enum = { version ="0.5.0", features = ["serde", "convert"] }
|
||||
serde = { version = "1.0.147", features = ["derive"] }
|
||||
serde_json = "1.0.88"
|
||||
nanoid = "0.4.0"
|
||||
tokio = { version = "1.22.0", features = ["full"] }
|
||||
log = "0.4.17"
|
||||
async-trait = "0.1.59"
|
||||
@ -1,226 +0,0 @@
|
||||
use log::{info, trace, warn};
|
||||
use nanoid::nanoid;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use serde_json::Value;
|
||||
use std::boxed::Box;
|
||||
use std::error::Error;
|
||||
use std::marker::Send;
|
||||
use std::{collections::HashMap, sync::Arc};
|
||||
use tokio::sync::{mpsc::Sender, Mutex};
|
||||
|
||||
pub type Result<T> = std::result::Result<T, Box<dyn Error + Send + Sync>>;
|
||||
|
||||
#[derive(Clone, Debug, Serialize, Deserialize)]
|
||||
pub struct JRPCRequest {
|
||||
pub jsonrpc: String,
|
||||
pub id: Option<String>,
|
||||
pub method: String,
|
||||
pub params: Value,
|
||||
}
|
||||
|
||||
impl JRPCRequest {
|
||||
pub fn new_request(method: String, params: Value) -> JRPCRequest {
|
||||
JRPCRequest {
|
||||
jsonrpc: "2.0".to_string(),
|
||||
id: None,
|
||||
method,
|
||||
params,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, Serialize, Deserialize)]
|
||||
pub struct JRPCError {
|
||||
pub code: i64,
|
||||
pub message: String,
|
||||
pub data: Value,
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, Serialize, Deserialize)]
|
||||
pub struct JRPCResult {
|
||||
pub jsonrpc: String,
|
||||
pub id: String,
|
||||
pub result: Option<Value>,
|
||||
pub error: Option<JRPCError>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct JRPCClient {
|
||||
message_sender: Sender<JRPCRequest>,
|
||||
requests: Arc<Mutex<HashMap<String, Sender<JRPCResult>>>>,
|
||||
}
|
||||
|
||||
impl JRPCClient {
|
||||
pub fn new(sender: Sender<JRPCRequest>) -> JRPCClient {
|
||||
JRPCClient {
|
||||
message_sender: sender,
|
||||
requests: Arc::new(Mutex::new(HashMap::new())),
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn send_request(&self, mut request: JRPCRequest) -> Result<Value> {
|
||||
let (sender, mut receiver) = tokio::sync::mpsc::channel(1);
|
||||
|
||||
if request.id.is_none() {
|
||||
request.id = Some(nanoid!());
|
||||
}
|
||||
|
||||
{
|
||||
let mut self_requests = self.requests.lock().await;
|
||||
self_requests.insert(request.id.clone().unwrap(), sender);
|
||||
}
|
||||
self.message_sender.send(request).await?;
|
||||
|
||||
let result = receiver.recv().await;
|
||||
|
||||
if let Some(result) = result {
|
||||
if let Some(error) = result.error {
|
||||
return Err(format!("Error while receiving result: {}", error.message).into());
|
||||
} else if let Some(result) = result.result {
|
||||
return Ok(result);
|
||||
} else {
|
||||
return Ok(Value::Null);
|
||||
// return Err(format!("No result received").into());
|
||||
}
|
||||
} else {
|
||||
return Err("Error while receiving result".into());
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn send_notification(&self, mut request: JRPCRequest) {
|
||||
request.id = None;
|
||||
|
||||
_ = self.message_sender.send(request).await;
|
||||
}
|
||||
|
||||
pub async fn on_result(&self, result: JRPCResult) {
|
||||
let id = result.id.clone();
|
||||
let mut self_requests = self.requests.lock().await;
|
||||
let sender = self_requests.get(&id);
|
||||
if let Some(sender) = sender {
|
||||
_ = sender.send(result).await;
|
||||
self_requests.remove(&id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait::async_trait]
|
||||
pub trait JRPCServerService: Send + Sync + 'static {
|
||||
fn get_id(&self) -> String;
|
||||
async fn handle(&self, request: &JRPCRequest, function: &str) -> Result<(bool, Value)>;
|
||||
}
|
||||
|
||||
pub type JRPCServiceHandle = Arc<dyn JRPCServerService>;
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct JRPCSession {
|
||||
server: JRPCServer,
|
||||
message_sender: Sender<JRPCResult>,
|
||||
}
|
||||
|
||||
impl JRPCSession {
|
||||
pub fn new(server: JRPCServer, sender: Sender<JRPCResult>) -> JRPCSession {
|
||||
JRPCSession {
|
||||
server,
|
||||
message_sender: sender,
|
||||
}
|
||||
}
|
||||
|
||||
async fn send_error(&self, request: JRPCRequest, error_msg: String, error_code: i64) -> () {
|
||||
if let Some(request_id) = request.id {
|
||||
let error = JRPCError {
|
||||
code: error_code,
|
||||
message: error_msg,
|
||||
data: Value::Null,
|
||||
};
|
||||
let result = JRPCResult {
|
||||
jsonrpc: "2.0".to_string(),
|
||||
id: request_id,
|
||||
result: None,
|
||||
error: Some(error),
|
||||
};
|
||||
|
||||
// Send result
|
||||
let result = self.message_sender.send(result).await;
|
||||
if let Err(err) = result {
|
||||
warn!("Error while sending result: {}", err);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn handle_request(&self, request: JRPCRequest) -> () {
|
||||
let session = self.clone();
|
||||
tokio::task::spawn(async move {
|
||||
info!("Received request: {}", request.method);
|
||||
trace!("Request data: {:?}", request);
|
||||
let method: Vec<&str> = request.method.split('.').collect();
|
||||
if method.len() != 2 {
|
||||
warn!("Invalid method received: {}", request.method);
|
||||
return;
|
||||
}
|
||||
let service = method[0];
|
||||
let function = method[1];
|
||||
|
||||
let service = session.server.services.get(service);
|
||||
if let Some(service) = service {
|
||||
let result = service.handle(&request, function).await;
|
||||
match result {
|
||||
Ok((is_send, result)) => {
|
||||
if is_send && request.id.is_some() {
|
||||
let result = session
|
||||
.message_sender
|
||||
.send(JRPCResult {
|
||||
jsonrpc: "2.0".to_string(),
|
||||
id: request.id.unwrap(),
|
||||
result: Some(result),
|
||||
error: None,
|
||||
})
|
||||
.await;
|
||||
if let Err(err) = result {
|
||||
warn!("Error while sending result: {}", err);
|
||||
}
|
||||
}
|
||||
}
|
||||
Err(err) => {
|
||||
warn!("Error while handling request: {}", err);
|
||||
session
|
||||
.send_error(
|
||||
request,
|
||||
format!("Error while handling request: {}", err),
|
||||
1,
|
||||
)
|
||||
.await;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
warn!("Service not found: {}", method[0]);
|
||||
session
|
||||
.send_error(request, "Service not found".to_string(), 1)
|
||||
.await;
|
||||
return;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct JRPCServer {
|
||||
services: HashMap<String, JRPCServiceHandle>,
|
||||
}
|
||||
|
||||
impl JRPCServer {
|
||||
pub fn new() -> JRPCServer {
|
||||
JRPCServer {
|
||||
services: HashMap::new(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn add_service(&mut self, service: JRPCServiceHandle) -> () {
|
||||
let id = service.get_id();
|
||||
self.services.insert(id, service);
|
||||
}
|
||||
|
||||
pub fn get_session(&self, sender: Sender<JRPCResult>) -> JRPCSession {
|
||||
JRPCSession::new(self.clone(), sender)
|
||||
}
|
||||
}
|
||||
@ -1,22 +1,14 @@
|
||||
function form_verficiation_error_message(type?: string, field?: string) {
|
||||
let msg = "Parameter verification failed! ";
|
||||
if (type && field) {
|
||||
msg += `At ${type}.${field}! `;
|
||||
} else if (type) {
|
||||
msg += `At type ${type}! `;
|
||||
} else if (field) {
|
||||
msg += `At field ${field}! `;
|
||||
}
|
||||
return msg;
|
||||
}
|
||||
|
||||
export class VerificationError extends Error {
|
||||
constructor(
|
||||
public readonly type?: string,
|
||||
public readonly field?: string,
|
||||
public readonly value?: any
|
||||
) {
|
||||
super(form_verficiation_error_message(type, field));
|
||||
super(
|
||||
"Parameter verification failed! " +
|
||||
(type ? "Expected " + type + "! " : "") +
|
||||
(field ? "At: " + field + "! " : "")
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//@template-ignore
|
||||
import { VerificationError } from "./ts_base";
|
||||
//@template-ignore
|
||||
import { type RequestObject, type ResponseObject, ErrorCodes, Logging } from "./ts_service_base";
|
||||
import { RequestObject, ResponseObject, ErrorCodes, Logging } from "./ts_service_base";
|
||||
|
||||
|
||||
export type IMessageCallback = (data: any) => void;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//@template-ignore
|
||||
import { VerificationError } from "./ts_base";
|
||||
//@template-ignore
|
||||
import { type RequestObject, type ResponseObject, ErrorCodes, Logging } from "./ts_service_base";
|
||||
import { RequestObject, ResponseObject, ErrorCodes, Logging } from "./ts_service_base";
|
||||
|
||||
|
||||
export class Service<T> {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user