mirror of
https://codeberg.org/JasterV/granc.git
synced 2026-04-26 18:40:05 +00:00
This pull request introduces a significant internal refactor of the `granc` project, decoupling core dynamic gRPC client logic into a new reusable library crate (`granc-core`). It also improves project organization, updates documentation, and enhances workspace configuration. The main CLI functionality is now built atop this new core, making future maintenance and extensibility easier. **Project structure and workspace improvements:** - Created a new crate, `granc-core`, to encapsulate all core dynamic gRPC client logic, including schema resolution, dynamic request dispatch, and reflection support. This enables potential reuse outside the CLI and clarifies project boundaries. (`granc-core/Cargo.toml`, `granc-core/src/client.rs`, [[1]](diffhunk://#diff-dd6f7ed591a1bd2577444d0079c1f56851ef74e3b9df75a86ef4af76681435f6R1-R126) [[2]](diffhunk://#diff-ddab7585cf4c860c9922ed56471bccf5804da60f0ccb174158fd31b9b82457abR1-R46) [[3]](diffhunk://#diff-46d757daaa6737f1a6247142e8abff1cb5079109e641c447e8a9793ea1f063adR1-R186) - Updated workspace configuration in `Cargo.toml` to include `granc-core`, centralize dependency versions, and set workspace-wide package metadata for consistency. (`Cargo.toml`, [Cargo.tomlL2-R26](diffhunk://#diff-2e9d962a08321605940b5a657135052fbcef87b5e360662bb527c96d9a615542L2-R26)) - Adjusted `echo-service` and other crates to use workspace-wide settings for edition and authors. (`echo-service/Cargo.toml`, [echo-service/Cargo.tomlL3-R3](diffhunk://#diff-e74eb8a3bebf341a9bee1cdcd5cd3a50e15998db5a9df9eaf9e7aec341287b1eL3-R3)) **Documentation :** - Added a detailed `README.md` for both the main project and the new `granc-core` library, providing clear installation, usage, and architecture guidance for users and contributors. (`README.md`, `granc-core/README.md`, [[1]](diffhunk://#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5R1-R172) [[2]](diffhunk://#diff-dd6f7ed591a1bd2577444d0079c1f56851ef74e3b9df75a86ef4af76681435f6R1-R126) **Build and tooling updates:** - Updated `Makefile.toml` to use workspace-wide test runs and renamed tasks/binaries for consistency with the new crate layout. (`Makefile.toml`, [[1]](diffhunk://#diff-9375fd04332c86472d7be397ef09428cb86babd8826880a5835bd1d1c1bdbc08L18-R18) [[2]](diffhunk://#diff-9375fd04332c86472d7be397ef09428cb86babd8826880a5835bd1d1c1bdbc08L45-R50) --- **Key changes:** **1. Core library extraction and refactor** - Moved dynamic gRPC client logic (including `GrancClient`, request/response types, and reflection handling) into a new `granc-core` crate, decoupling it from the CLI and preparing for independent publishing. [[1]](diffhunk://#diff-ddab7585cf4c860c9922ed56471bccf5804da60f0ccb174158fd31b9b82457abR1-R46) [[2]](diffhunk://#diff-46d757daaa6737f1a6247142e8abff1cb5079109e641c447e8a9793ea1f063adR1-R186) **2. Workspace and dependency management** - Updated the root `Cargo.toml` to add `granc-core` as a workspace member, centralize dependency versions, and set workspace-wide metadata fields (authors, edition, license, etc.). - Adjusted `echo-service` and new crates to inherit workspace settings for consistency. **3. Documentation** - Updated and added comprehensive `README.md` files for both the main project and the new core library, with installation, usage, and architecture sections. [[1]](diffhunk://#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5R1-R172) [[2]](diffhunk://#diff-dd6f7ed591a1bd2577444d0079c1f56851ef74e3b9df75a86ef4af76681435f6R1-R126) - Introduced a `CHANGELOG.md` to document project history and recent changes. **4. Build and CI tooling** - Updated test and generation commands in `Makefile.toml` to reflect the new workspace structure and binary names. [[1]](diffhunk://#diff-9375fd04332c86472d7be397ef09428cb86babd8826880a5835bd1d1c1bdbc08L18-R18) [[2]](diffhunk://#diff-9375fd04332c86472d7be397ef09428cb86babd8826880a5835bd1d1c1bdbc08L45-R50) **5. Housekeeping** - Removed outdated or redundant files as part of the refactor. [[1]](diffhunk://#diff-06572a96a58dc510037d5efa622f9bec8519bc1beab13c9f251e97e657a9d4edL1) [[2]](diffhunk://#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5L1) This refactor lays the groundwork for improved maintainability, easier future development, and potential wider adoption of the dynamic gRPC client logic outside the CLI.
128 lines
4.1 KiB
Rust
128 lines
4.1 KiB
Rust
use echo_service::EchoServiceServer;
|
|
use echo_service::FILE_DESCRIPTOR_SET;
|
|
use echo_service_impl::EchoServiceImpl;
|
|
use granc_core::client::{DynamicRequest, DynamicResponse, GrancClient};
|
|
|
|
mod echo_service_impl;
|
|
|
|
#[tokio::test]
|
|
async fn test_unary() {
|
|
let payload = serde_json::json!({ "message": "hello" });
|
|
|
|
let request = DynamicRequest {
|
|
file_descriptor_set: Some(FILE_DESCRIPTOR_SET.to_vec()),
|
|
body: payload.clone(),
|
|
headers: vec![],
|
|
service: "echo.EchoService".to_string(),
|
|
method: "UnaryEcho".to_string(),
|
|
};
|
|
|
|
let mut client = GrancClient::new(EchoServiceServer::new(EchoServiceImpl));
|
|
|
|
let res = client.dynamic(request).await.unwrap();
|
|
|
|
match res {
|
|
DynamicResponse::Unary(Ok(value)) => assert_eq!(value, payload),
|
|
DynamicResponse::Unary(Err(_)) => {
|
|
panic!("Received error status for valid unary request")
|
|
}
|
|
_ => panic!("Received stream response for unary request"),
|
|
};
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn test_server_streaming() {
|
|
let payload = serde_json::json!({ "message": "stream" });
|
|
|
|
let request = DynamicRequest {
|
|
file_descriptor_set: Some(FILE_DESCRIPTOR_SET.to_vec()),
|
|
body: payload.clone(),
|
|
headers: vec![],
|
|
service: "echo.EchoService".to_string(),
|
|
method: "ServerStreamingEcho".to_string(),
|
|
};
|
|
|
|
let mut client = GrancClient::new(EchoServiceServer::new(EchoServiceImpl));
|
|
|
|
let res = client.dynamic(request).await.unwrap();
|
|
|
|
match res {
|
|
DynamicResponse::Streaming(Ok(elems)) => {
|
|
let results: Vec<_> = elems.into_iter().map(|r| r.unwrap()).collect();
|
|
|
|
assert_eq!(results.len(), 3);
|
|
assert_eq!(results[0]["message"], "stream - seq 0");
|
|
assert_eq!(results[1]["message"], "stream - seq 1");
|
|
assert_eq!(results[2]["message"], "stream - seq 2");
|
|
}
|
|
DynamicResponse::Streaming(Err(_)) => {
|
|
panic!("Received error status for valid server streaming request")
|
|
}
|
|
_ => panic!("Received unary response for server streaming request"),
|
|
};
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn test_client_streaming() {
|
|
let payload = serde_json::json!([
|
|
{ "message": "A" },
|
|
{ "message": "B" },
|
|
{ "message": "C" }
|
|
]);
|
|
|
|
let request = DynamicRequest {
|
|
file_descriptor_set: Some(FILE_DESCRIPTOR_SET.to_vec()),
|
|
body: payload.clone(),
|
|
headers: vec![],
|
|
service: "echo.EchoService".to_string(),
|
|
method: "ClientStreamingEcho".to_string(),
|
|
};
|
|
|
|
let mut client = GrancClient::new(EchoServiceServer::new(EchoServiceImpl));
|
|
|
|
let res = client.dynamic(request).await.unwrap();
|
|
|
|
match res {
|
|
DynamicResponse::Unary(Ok(value)) => {
|
|
assert_eq!(value, serde_json::json!({"message": "ABC"}))
|
|
}
|
|
DynamicResponse::Unary(Err(_)) => {
|
|
panic!("Received error status for valid client stream request")
|
|
}
|
|
_ => panic!("Received stream response for client stream request"),
|
|
};
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn test_bidirectional_streaming() {
|
|
let payload = serde_json::json!([
|
|
{ "message": "Ping" },
|
|
{ "message": "Pong" }
|
|
]);
|
|
|
|
let request = DynamicRequest {
|
|
file_descriptor_set: Some(FILE_DESCRIPTOR_SET.to_vec()),
|
|
body: payload.clone(),
|
|
headers: vec![],
|
|
service: "echo.EchoService".to_string(),
|
|
method: "BidirectionalEcho".to_string(),
|
|
};
|
|
|
|
let mut client = GrancClient::new(EchoServiceServer::new(EchoServiceImpl));
|
|
|
|
let res = client.dynamic(request).await.unwrap();
|
|
|
|
match res {
|
|
DynamicResponse::Streaming(Ok(elems)) => {
|
|
let results: Vec<_> = elems.into_iter().map(|r| r.unwrap()).collect();
|
|
|
|
assert_eq!(results.len(), 2);
|
|
assert_eq!(results[0]["message"], "echo: Ping");
|
|
assert_eq!(results[1]["message"], "echo: Pong");
|
|
}
|
|
DynamicResponse::Streaming(Err(_)) => {
|
|
panic!("Received error status for valid bidirectional streaming request")
|
|
}
|
|
_ => panic!("Received unary response for bidirectional streaming request"),
|
|
};
|
|
}
|