Compare commits

...

4 Commits

Author SHA1 Message Date
Fabian Stamm
a2224bbf95 Working on Async Implementation 2022-04-17 10:46:37 +00:00
Fabian Stamm
42ef89f32b Merge branch 'rust-target' of https://gitlab.hibas.dev/hibas123/JsonRPC into rust-target 2022-04-13 19:02:30 +00:00
Fabian Stamm
f4a761bf55 Start implementing rust 2022-04-13 19:01:43 +00:00
Fabian Stamm
7b6ef3231f Start implementing Rust 2022-04-13 18:58:53 +00:00
11 changed files with 720 additions and 4 deletions

1
.gitignore vendored
View File

@ -6,5 +6,6 @@ examples/CSharp/Generated
examples/CSharp/Example/bin examples/CSharp/Example/bin
examples/CSharp/Example/obj examples/CSharp/Example/obj
examples/definition.json examples/definition.json
examples/Rust/Generated
templates/CSharp/bin templates/CSharp/bin
templates/CSharp/obj templates/CSharp/obj

View File

@ -1656,7 +1656,7 @@ var require_route = __commonJS({
} }
module2.exports = function(fromModel) { module2.exports = function(fromModel) {
const graph = deriveBFS(fromModel); const graph = deriveBFS(fromModel);
const conversion3 = {}; const conversion4 = {};
const models = Object.keys(graph); const models = Object.keys(graph);
for (let len = models.length, i = 0; i < len; i++) { for (let len = models.length, i = 0; i < len; i++) {
const toModel = models[i]; const toModel = models[i];
@ -1664,9 +1664,9 @@ var require_route = __commonJS({
if (node.parent === null) { if (node.parent === null) {
continue; continue;
} }
conversion3[toModel] = wrapConversion(toModel, graph); conversion4[toModel] = wrapConversion(toModel, graph);
} }
return conversion3; return conversion4;
}; };
} }
}); });
@ -10677,6 +10677,111 @@ var CSharpTarget = class extends CompileTarget {
} }
}; };
// src/targets/rust.ts
var conversion3 = {
boolean: "bool",
float: "f64",
int: "i64",
string: "String",
void: "void",
bytes: "Vec<u8>"
};
function toRustType(type) {
return conversion3[type] || type;
}
function toSnake(input) {
return input[0].toLowerCase() + input.slice(1).replace(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`);
}
var RustTarget = class extends CompileTarget {
name = "rust";
get crate() {
return this.options.rust_crate;
}
start() {
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));
}
addDependencies(a, def) {
for (const dep of def.depends) {
a(0, `use crate::${dep};`);
}
a(0, ``);
a(0, ``);
}
generateType(definition) {
let lines = [];
const a = (i, t) => {
if (!Array.isArray(t)) {
t = [t];
}
t.forEach((l) => lines.push(" ".repeat(i) + l.trim()));
};
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) {
if (field.array) {
a(1, `pub ${field.name}: Vec<${toRustType(field.type)}>,`);
} else if (field.map) {
a(1, `pub ${field.name}: HashMap<${toRustType(field.map)}, ${toRustType(field.type)}>,`);
} else {
a(1, `pub ${field.name}: ${toRustType(field.type)},`);
}
}
a(0, `}`);
this.writeFile(`src/${toSnake(definition.name)}.rs`, lines.join("\n"));
}
generateEnum(definition) {
let lines = [];
const a = (i, t) => {
if (!Array.isArray(t)) {
t = [t];
}
t.forEach((l) => lines.push(" ".repeat(i) + l.trim()));
};
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, Deserialize, Serialize)]");
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`, lines.join("\n"));
}
generateService(definition) {
}
generateLib(steps) {
let lines = [];
const a = (i, t) => {
if (!Array.isArray(t)) {
t = [t];
}
t.forEach((l) => lines.push(" ".repeat(i) + l.trim()));
};
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};`);
}
}
this.writeFile(`src/lib.rs`, lines.join("\n"));
}
finalize(steps) {
this.generateLib(steps);
}
};
// src/process.ts // src/process.ts
var CatchedError = class extends Error { var CatchedError = class extends Error {
}; };
@ -10685,6 +10790,7 @@ var Targets = /* @__PURE__ */ new Map();
Targets.set("ts-esm", ESMTypescriptTarget); Targets.set("ts-esm", ESMTypescriptTarget);
Targets.set("ts-node", NodeJSTypescriptTarget); Targets.set("ts-node", NodeJSTypescriptTarget);
Targets.set("c#", CSharpTarget); Targets.set("c#", CSharpTarget);
Targets.set("rust", RustTarget);
function indexToLineAndCol(src, index) { function indexToLineAndCol(src, index) {
let line = 1; let line = 1;
let col = 1; let col = 1;

View File

@ -6,8 +6,9 @@
"packageManager": "yarn@3.1.1", "packageManager": "yarn@3.1.1",
"scripts": { "scripts": {
"start": "ts-node src/index.ts", "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", "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",
"test-csharp": "cd examples/CSharp/Example/ && dotnet run", "test-csharp": "cd examples/CSharp/Example/ && dotnet run",
"test-rust": "cd examples/Rust/Generated/ && cargo build",
"test-typescript": "ts-node examples/test.ts", "test-typescript": "ts-node examples/test.ts",
"test": "npm run test-start && npm run test-csharp && npm run test-typescript", "test": "npm run test-start && npm run test-csharp && npm run test-typescript",
"build": "esbuild src/index.ts --bundle --platform=node --target=node14 --outfile=lib/jrpc.js", "build": "esbuild src/index.ts --bundle --platform=node --target=node14 --outfile=lib/jrpc.js",

View File

@ -11,6 +11,7 @@ import {
NodeJSTypescriptTarget, NodeJSTypescriptTarget,
} from "./targets/typescript"; } from "./targets/typescript";
import { CSharpTarget } from "./targets/csharp"; import { CSharpTarget } from "./targets/csharp";
import { RustTarget } from "./targets/rust";
class CatchedError extends Error {} class CatchedError extends Error {}
@ -21,6 +22,7 @@ export const Targets = new Map<string, typeof CompileTarget>();
Targets.set("ts-esm", ESMTypescriptTarget); Targets.set("ts-esm", ESMTypescriptTarget);
Targets.set("ts-node", NodeJSTypescriptTarget); Targets.set("ts-node", NodeJSTypescriptTarget);
Targets.set("c#", CSharpTarget as typeof CompileTarget); Targets.set("c#", CSharpTarget as typeof CompileTarget);
Targets.set("rust", RustTarget as typeof CompileTarget);
function indexToLineAndCol(src: string, index: number) { function indexToLineAndCol(src: string, index: number) {
let line = 1; let line = 1;

241
src/targets/rust.ts Normal file
View File

@ -0,0 +1,241 @@
import { CompileTarget } from "../compile";
import { TypeDefinition, EnumDefinition, ServiceDefinition, Step } from "../ir";
type lineAppender = (ind: number, line: string | string[]) => void;
const conversion = {
boolean: "bool",
float: "f64",
int: "i64",
string: "String",
void: "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()}`)
);
}
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)
);
}
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 {
let lines: string[] = [];
const a: lineAppender = (i, t) => {
if (!Array.isArray(t)) {
t = [t];
}
t.forEach((l) => lines.push(" ".repeat(i) + l.trim()));
};
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) {
if (field.array) {
a(1, `pub ${field.name}: Vec<${toRustType(field.type)}>,`);
} else if (field.map) {
a(
1,
`pub ${field.name}: HashMap<${toRustType(
field.map
)}, ${toRustType(field.type)}>,`
);
} else {
a(1, `pub ${field.name}: ${toRustType(field.type)},`);
}
}
a(0, `}`);
this.writeFile(`src/${toSnake(definition.name)}.rs`, lines.join("\n"));
}
generateEnum(definition: EnumDefinition): void {
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, `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, Deserialize, Serialize)]"
);
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`, lines.join("\n"));
}
private generateServiceReqResTypes(definition: ServiceDefinition) {
let lines: string[] = [];
const a: lineAppender = (i, t) => {
if (!Array.isArray(t)) {
t = [t];
}
t.forEach((l) => lines.push(" ".repeat(i) + l.trim()));
};
const paramToRust = (type: string, array: boolean) => {
let rt = toRustType(type);
return array ? `Vec<${rt}>` : rt;
};
this.addDependencies(a, definition);
let baseName = definition.name;
for (const fnc of definition.functions) {
let name = definition.name + "_" + toSnake(fnc.name);
a(
0,
`struct ${name}_Params(${fnc.inputs
.map((i) => paramToRust(i.type, i.array))
.join(",")});`
);
a(0, ``);
a(0, ``);
a(0, ``);
a(0, ``);
a(0, ``);
}
this.writeFile(
`src/${toSnake(definition.name)}_types.rs`,
lines.join("\n")
);
}
private generateServiceClient(definition: ServiceDefinition): void {}
private generateServiceServer(definition: ServiceDefinition): void {
let lines: string[] = [];
const a: lineAppender = (i, t) => {
if (!Array.isArray(t)) {
t = [t];
}
t.forEach((l) => lines.push(" ".repeat(i) + l.trim()));
};
this.addDependencies(a, definition);
const retToRust = (type: string, array: boolean) => {
let rt = toRustType(type);
return array ? `Vec<${rt}>` : rt;
};
a(0, ``);
a(0, `struct ${definition.name}ServiceHandler {`);
a(1, `service: impl ${definition.name}`);
a(1, ``);
a(1, ``);
a(0, `}`);
a(0, ``);
a(0, `impl ${definition.name}ServiceHandler {`);
a(
1,
`fn new(service: impl ${definition.name}) -> ${definition.name}ServiceHandler {`
);
a(2, ``);
a(2, ``);
a(2, ``);
a(1, `}`);
a(0, `}`);
a(0, ``);
a(0, `trait ${definition.name} {`);
for (const fnc of definition.functions) {
let returnType = !fnc.return
? "()"
: retToRust(fnc.return.type, fnc.return.array);
a(1, `pub async fn ${fnc.name}(&self) -> Result<${returnType}>;`);
// a(0, ``);
}
a(0, `}`);
this.writeFile(
`src/${toSnake(definition.name)}_types.rs`,
lines.join("\n")
);
}
generateService(definition: ServiceDefinition): void {
this.generateServiceServer(definition);
// throw new Error("Service not implemented.");
}
private generateLib(steps: Step[]) {
let lines: string[] = [];
const a: lineAppender = (i, t) => {
if (!Array.isArray(t)) {
t = [t];
}
t.forEach((l) => lines.push(" ".repeat(i) + l.trim()));
};
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};`);
}
}
this.writeFile(`src/lib.rs`, lines.join("\n"));
}
finalize(steps: Step[]): void {
this.generateLib(steps);
// throw new Error("Method not implemented.");
}
}

2
templates/Rust/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
target
Cargo.lock

13
templates/Rust/Cargo.toml Normal file
View File

@ -0,0 +1,13 @@
[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 = "0.4.0"
tokio = { version = "1.17.0", features = ["full"] }
serde = { version = "1.0.136", features = ["derive"] }
serde_json = "1.0.79"
async-trait = "0.1.7"

View File

@ -0,0 +1,22 @@
use std::future::Future;
use std::collections::HashMap;
use serde_json::Value;
pub struct ServiceClientRequest {
}
impl Future for ServiceClientRequest {
type Output = ()
}
pub struct ServiceClient {
channel: Box<dny ComChannel>,
requests: HashMap<String, Box<dyn >>
}
pub trait ServiceClient {
}

249
templates/Rust/src/lib.rs Normal file
View File

@ -0,0 +1,249 @@
mod service;
pub use service::{ComChannel, JRPCError, JRPCRequest, JRPCResult, Result};
use async_trait::async_trait;
use serde::{Deserialize, Serialize};
use serde_json::Value;
use std::boxed::Box;
use std::collections::HashMap;
use std::error::Error;
use std::marker::Send;
use std::sync::{Arc, Mutex};
// REGION: FIXED/STATIC Code
#[async_trait]
pub trait JRPCServiceHandler<C: Sync>: Send {
fn get_name(&self) -> String;
async fn on_message(&self, msg: JRPCRequest, function: String, ctx: &C)
-> Result<(bool, Value)>;
}
type Shared<T> = Arc<Mutex<T>>;
type SharedHM<K, V> = Shared<HashMap<K, V>>;
type ServiceSharedHM<C: 'static + Sync + Send> = SharedHM<String, Box<dyn JRPCServiceHandler<C>>>;
pub struct JRPCServer<C: 'static + Sync + Send> {
services: ServiceSharedHM<C>,
}
impl<C: 'static + Sync + Send> JRPCServer<C> {
fn new() -> Self {
return Self {
services: Arc::new(Mutex::new(HashMap::new())),
};
}
fn add_service(&mut self, service: Box<dyn JRPCServiceHandler<C>>) {
let mut services = self.services.lock().unwrap();
services.insert(service.get_name(), service);
}
fn start_session(&mut self, channel: Box<dyn ComChannel>, context: C) {
JRPCSession::start(channel, context, self.services.clone());
}
}
pub struct JRPCSession<C: 'static + Sync + Send> {
context: C,
channel: Box<dyn ComChannel>,
services: ServiceSharedHM<C>,
}
unsafe impl<C: 'static + Sync + Send> Sync for JRPCSession<C> {}
impl<C: 'static + Sync + Send> JRPCSession<C> {
fn start(channel: Box<dyn ComChannel>, context: C, services: ServiceSharedHM<C>) {
tokio::spawn(async move {
// let res = Self {
// channel,
// context,
// services,
// };
// let ch = &channel;
loop {
let pkg = channel.read_packet().await;
let data = match pkg {
Err(_) => return,
Ok(res) => res,
};
let req: Result<JRPCRequest> =
serde_json::from_str(data.as_str()).map_err(|err| Box::from(err));
let req = match req {
Err(err) => {
continue;
}
Ok(parsed) => parsed,
};
let construct_err = |err: Box<dyn Error>, code: i64| {
if let Some(id) = &req.id {
let error = JRPCError {
code,
message: err.to_string(),
data: Value::Null,
};
let r = JRPCResult {
jsonrpc: "2.0".to_owned(),
id: id.clone(),
result: Value::Null,
error: Option::from(error),
};
let s = serde_json::to_string(&r);
return Some(s.unwrap());
}
return None;
};
let parts: Vec<String> = req.method.split('.').map(|e| e.to_owned()).collect();
if parts.len() != 2 {
Self::send_err_res(req, &channel, &Box::from("Error".to_owned())).await;
// let res = construct_err(Box::from("Method not found!".to_owned()), -32602);
// if let Some(err) = res {
// channel.send_packet(err).await;
// }
continue;
}
let service = parts[0];
let name = parts[1];
// JRPCSession::send_err_res(&res, &channel, "Error").await;
// let pkg = self.channel.lock().unwrap().read_packet();
// if !pkg {
// return Ok(());
// }
// // pkg behandelm
// self.channel.send_packet(vec![0, 1, 2]);
}
});
}
async fn handle_packet(channel: &Box<dyn ComChannel>, context: C, services: ServiceSharedHM<C>) {
}
async fn send_err_res(req: JRPCRequest, channel: &Box<dyn ComChannel>, err: &Box<dyn Error>) {
if let Some(id) = &req.id {
let error = JRPCError {
code: 0, //TODO: Make this better?
message: err.to_string(),
data: Value::Null,
};
let r = JRPCResult {
jsonrpc: "2.0".to_owned(),
id: id.clone(),
result: Value::Null,
error: Option::from(error),
};
let s = serde_json::to_string(&r);
if s.is_ok() {
channel.send_packet(s.unwrap()).await;
}
}
return ();
}
}
// REGION: Generated Code
#[derive(Deserialize, Serialize, Debug, Clone)]
struct Test {
name: String,
age: i64,
}
#[async_trait]
trait TestService<C: 'static + Sync + Send> {
async fn GetTest(&self, name: String, age: i64, context: &C) -> Result<Test>;
async fn TestNot(&self, ctx: &C) -> Result<()>;
}
struct TestServiceHandler<C: 'static + Sync + Send> {
name: String,
implementation: Box<dyn TestService<C> + Sync + Send>,
}
impl<C: 'static + Sync + Send> TestServiceHandler<C> {
fn new(implementation: Box<dyn TestService<C> + Sync + Send>) -> Self {
return Self {
name: "TestService".to_owned(),
implementation,
};
}
}
#[async_trait]
impl<C: 'static + Sync + Send> JRPCServiceHandler<C> for TestServiceHandler<C> {
fn get_name(&self) -> String {
return "".to_owned();
}
async fn on_message(
&self,
msg: JRPCRequest,
function: String,
ctx: &C,
) -> Result<(bool, Value)> {
if function == "GetTest" {
if msg.params.is_array() {
let arr = msg.params.as_array().unwrap(); //TODO: Check this, but it should never ever happen
let res = self
.implementation
.GetTest(
serde_json::from_value(arr[0].clone())
.map_err(|_| "Parameter for field 'name' should be a string!")?,
serde_json::from_value(arr[1].clone())
.map_err(|_| "Parameter for field 'age' should be a int!")?,
ctx,
)
.await?;
return Ok((true, serde_json::to_value(res)?));
} else if msg.params.is_object() {
return Err(Box::from("Not implemented yet".to_owned()));
} else {
return Err(Box::from("Invalid parameters??".to_owned()));
}
} else if function == "TestNot" {
if msg.params.is_array() {
let arr = msg.params.as_array().unwrap(); //TODO: Check this, but it should never ever happen
self.implementation.TestNot(ctx).await?;
return Ok((false, Value::Null));
} else if msg.params.is_object() {
return Err(Box::from("Not implemented yet".to_owned()));
} else {
return Err(Box::from("Invalid parameters??".to_owned()));
}
}
return Err(Box::from(
format!("Invalid function {}", function).to_owned(),
));
}
}
// REGION: Not Generated. User implemented
struct MyCtx {
isAuthenticated: bool,
}
struct TestServiceImplementation {}
#[async_trait]
impl TestService<MyCtx> for TestServiceImplementation {
async fn GetTest(&self, name: String, age: i64, context: &MyCtx) -> Result<Test> {
return Ok(Test { name, age });
}
async fn TestNot(&self, _: &MyCtx) -> Result<()> {
return Ok(());
}
}

View File

@ -0,0 +1,27 @@
use crate::service::{ComChannel, JRPCRequest, JRPCResult, Result};
use async_trait::async_trait;
use std::collections::HashMap;
use std::error::Error;
#[#[derive(Send)]]
pub struct JRPCServer {
channel: Box<dyn ComChannel>,
}
impl JRPCServer {
fn new(channel: Box<dyn ComChannel>) -> JRPCServer {
return JRPCServer {
channel: channel,
services: HashMap::new(),
};
}
async fn run(&self) -> Result<()> {
loop {
let p = self.channel.readPacket().await?;
}
}
fn addService(serv: impl JRPCService) {
}
}

View File

@ -0,0 +1,52 @@
use async_trait::async_trait;
use serde_json::Value;
use std::error::Error;
// use serde_json::from_value()
// use int_enum::IntEnum;
use serde::{Deserialize, Serialize};
// use std::collections::HashMap;
// use std::future::Future;
pub type Result<T> = std::result::Result<T, Box<dyn Error>>;
//TODO: Vec<u8> or String.
pub trait ComChannel: Send + Sync {
fn send_packet(&self, packet: String) -> Result<()>;
fn read_packet(&self) -> Result<String>;
}
// TODO: Check what happens when error code is not included
// #[repr(i64)]
// #[derive(Clone, Copy, Debug, Eq, PartialEq, IntEnum, Deserialize, Serialize)]
// pub enum ErrorCodes {
// ParseError = -32700,
// InvalidRequest = -32600,
// MethodNotFound = -32601,
// InvalidParams = -32602,
// InternalError = -32603,
// }
#[derive(Serialize, Deserialize)]
pub struct JRPCRequest {
pub jsonrpc: String,
pub id: Option<String>,
pub method: String,
pub params: Value,
}
#[derive(Serialize, Deserialize)]
pub struct JRPCError {
pub code: i64,
pub message: String,
pub data: Value,
}
#[derive(Serialize, Deserialize)]
pub struct JRPCResult {
pub jsonrpc: String,
pub id: String,
pub result: Value,
pub error: Option<JRPCError>,
}