Skip to content

REST will return Json instead of ProtoJson #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raphael-goetz merged 3 commits into from
Mar 1, 2026
Merged

REST will return Json instead of ProtoJson #164

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0be1a87
feat: added function that turns protojson into json
raphael-goetz Mar 1, 2026
8339d53
Update adapter/rest/src/main.rs
raphael-goetz Mar 1, 2026
584f3b9
Update adapter/rest/src/main.rs
raphael-goetz Mar 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 34 additions & 2 deletions adapter/rest/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ use hyper::{
server::conn::http1,
};
use hyper_util::rt::TokioIo;
use serde_json::{Map, Number, Value as J};
use std::collections::HashMap;
use std::convert::Infallible;
use std::net::SocketAddr;
Expand Down Expand Up @@ -58,6 +59,36 @@ fn json_error(status: StatusCode, msg: &str) -> Response<Full<Bytes>> {
.unwrap()
}

fn pb_value_to_json(v: &Value) -> serde_json::Value {
match v.kind.as_ref() {
None => J::Null,

Some(Kind::NullValue(_)) => J::Null,

Some(Kind::BoolValue(b)) => J::Bool(*b),

Some(Kind::StringValue(s)) => J::String(s.clone()),

Some(Kind::NumberValue(n)) => {
if let Some(num) = Number::from_f64(*n) {
J::Number(num)
} else {
J::Null
}
}

Some(Kind::ListValue(lv)) => J::Array(lv.values.iter().map(pb_value_to_json).collect()),

Some(Kind::StructValue(st)) => {
let mut obj = Map::new();
for (k, v) in &st.fields {
obj.insert(k.clone(), pb_value_to_json(v));
}
J::Object(obj)
}
}
}

fn build_response(
status: StatusCode,
headers: HashMap<String, String>,
Expand Down Expand Up @@ -210,8 +241,9 @@ async fn execute_flow_to_hyper_response(
};

// payload -> json bytes
let json = serde_json::to_vec_pretty(payload_val).unwrap_or_else(|err| {
format!(r#"{{"error":"Serialization failed: {}"}}"#, err).into_bytes()
let json_val = pb_value_to_json(payload_val);
let json = serde_json::to_vec_pretty(&json_val).unwrap_or_else(|err| {
format!(r#"{{"error":"Serialization failed: {:?}"}}"#, err).into_bytes()
});

let status =
Expand Down