noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure HTTP REST API responses are simplified when serialized ()

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2023-05-05 19:54:49 +01:00 committed by GitHub
parent 3dd0b6d5e8
commit 591634e049
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 54 additions and 54 deletions

6
src/net/import.rs
View file

@ -41,9 +41,9 @@ async fn handler(
match db.execute(sql, &session, None, opt.strict).await {
Ok(res) => match output.as_ref() {
// Simple serialization
"application/json" => Ok(output::json(&res)),
"application/cbor" => Ok(output::cbor(&res)),
"application/pack" => Ok(output::pack(&res)),
"application/json" => Ok(output::json(&output::simplify(res))),
"application/cbor" => Ok(output::cbor(&output::simplify(res))),
"application/pack" => Ok(output::pack(&output::simplify(res))),
// Internal serialization
"application/bung" => Ok(output::full(&res)),
// Return nothing

70
src/net/key.rs
View file

@ -172,9 +172,9 @@ async fn select_all(
match db.execute(sql.as_str(), &session, Some(vars), opt.strict).await {
Ok(ref res) => match output.as_ref() {
// Simple serialization
"application/json" => Ok(output::json(&res)),
"application/cbor" => Ok(output::cbor(&res)),
"application/pack" => Ok(output::pack(&res)),
"application/json" => Ok(output::json(&output::simplify(res))),
"application/cbor" => Ok(output::cbor(&output::simplify(res))),
"application/pack" => Ok(output::pack(&output::simplify(res))),
// Internal serialization
"application/bung" => Ok(output::full(&res)),
// An incorrect content-type was requested
@ -213,9 +213,9 @@ async fn create_all(
match db.execute(sql, &session, Some(vars), opt.strict).await {
Ok(res) => match output.as_ref() {
// Simple serialization
"application/json" => Ok(output::json(&res)),
"application/cbor" => Ok(output::cbor(&res)),
"application/pack" => Ok(output::pack(&res)),
"application/json" => Ok(output::json(&output::simplify(res))),
"application/cbor" => Ok(output::cbor(&output::simplify(res))),
"application/pack" => Ok(output::pack(&output::simplify(res))),
// Internal serialization
"application/bung" => Ok(output::full(&res)),
// An incorrect content-type was requested
@ -257,9 +257,9 @@ async fn update_all(
match db.execute(sql, &session, Some(vars), opt.strict).await {
Ok(res) => match output.as_ref() {
// Simple serialization
"application/json" => Ok(output::json(&res)),
"application/cbor" => Ok(output::cbor(&res)),
"application/pack" => Ok(output::pack(&res)),
"application/json" => Ok(output::json(&output::simplify(res))),
"application/cbor" => Ok(output::cbor(&output::simplify(res))),
"application/pack" => Ok(output::pack(&output::simplify(res))),
// Internal serialization
"application/bung" => Ok(output::full(&res)),
// An incorrect content-type was requested
@ -301,9 +301,9 @@ async fn modify_all(
match db.execute(sql, &session, Some(vars), opt.strict).await {
Ok(res) => match output.as_ref() {
// Simple serialization
"application/json" => Ok(output::json(&res)),
"application/cbor" => Ok(output::cbor(&res)),
"application/pack" => Ok(output::pack(&res)),
"application/json" => Ok(output::json(&output::simplify(res))),
"application/cbor" => Ok(output::cbor(&output::simplify(res))),
"application/pack" => Ok(output::pack(&output::simplify(res))),
// Internal serialization
"application/bung" => Ok(output::full(&res)),
// An incorrect content-type was requested
@ -338,9 +338,9 @@ async fn delete_all(
match db.execute(sql, &session, Some(vars), opt.strict).await {
Ok(res) => match output.as_ref() {
// Simple serialization
"application/json" => Ok(output::json(&res)),
"application/cbor" => Ok(output::cbor(&res)),
"application/pack" => Ok(output::pack(&res)),
"application/json" => Ok(output::json(&output::simplify(res))),
"application/cbor" => Ok(output::cbor(&output::simplify(res))),
"application/pack" => Ok(output::pack(&output::simplify(res))),
// Internal serialization
"application/bung" => Ok(output::full(&res)),
// An incorrect content-type was requested
@ -368,7 +368,7 @@ async fn select_one(
// Specify the request statement
let sql = "SELECT * FROM type::thing($table, $id)";
// Parse the Record ID as a SurrealQL value
let rid = match surrealdb::sql::value(&id) {
let rid = match surrealdb::sql::json(&id) {
Ok(id) => id,
Err(_) => Value::from(id),
};
@ -381,9 +381,9 @@ async fn select_one(
match db.execute(sql, &session, Some(vars), opt.strict).await {
Ok(res) => match output.as_ref() {
// Simple serialization
"application/json" => Ok(output::json(&res)),
"application/cbor" => Ok(output::cbor(&res)),
"application/pack" => Ok(output::pack(&res)),
"application/json" => Ok(output::json(&output::simplify(res))),
"application/cbor" => Ok(output::cbor(&output::simplify(res))),
"application/pack" => Ok(output::pack(&output::simplify(res))),
// Internal serialization
"application/bung" => Ok(output::full(&res)),
// An incorrect content-type was requested
@ -409,7 +409,7 @@ async fn create_one(
// Convert the HTTP request body
let data = bytes_to_utf8(&body)?;
// Parse the Record ID as a SurrealQL value
let rid = match surrealdb::sql::value(&id) {
let rid = match surrealdb::sql::json(&id) {
Ok(id) => id,
Err(_) => Value::from(id),
};
@ -429,9 +429,9 @@ async fn create_one(
match db.execute(sql, &session, Some(vars), opt.strict).await {
Ok(res) => match output.as_ref() {
// Simple serialization
"application/json" => Ok(output::json(&res)),
"application/cbor" => Ok(output::cbor(&res)),
"application/pack" => Ok(output::pack(&res)),
"application/json" => Ok(output::json(&output::simplify(res))),
"application/cbor" => Ok(output::cbor(&output::simplify(res))),
"application/pack" => Ok(output::pack(&output::simplify(res))),
// Internal serialization
"application/bung" => Ok(output::full(&res)),
// An incorrect content-type was requested
@ -460,7 +460,7 @@ async fn update_one(
// Convert the HTTP request body
let data = bytes_to_utf8(&body)?;
// Parse the Record ID as a SurrealQL value
let rid = match surrealdb::sql::value(&id) {
let rid = match surrealdb::sql::json(&id) {
Ok(id) => id,
Err(_) => Value::from(id),
};
@ -480,9 +480,9 @@ async fn update_one(
match db.execute(sql, &session, Some(vars), opt.strict).await {
Ok(res) => match output.as_ref() {
// Simple serialization
"application/json" => Ok(output::json(&res)),
"application/cbor" => Ok(output::cbor(&res)),
"application/pack" => Ok(output::pack(&res)),
"application/json" => Ok(output::json(&output::simplify(res))),
"application/cbor" => Ok(output::cbor(&output::simplify(res))),
"application/pack" => Ok(output::pack(&output::simplify(res))),
// Internal serialization
"application/bung" => Ok(output::full(&res)),
// An incorrect content-type was requested
@ -511,7 +511,7 @@ async fn modify_one(
// Convert the HTTP request body
let data = bytes_to_utf8(&body)?;
// Parse the Record ID as a SurrealQL value
let rid = match surrealdb::sql::value(&id) {
let rid = match surrealdb::sql::json(&id) {
Ok(id) => id,
Err(_) => Value::from(id),
};
@ -531,9 +531,9 @@ async fn modify_one(
match db.execute(sql, &session, Some(vars), opt.strict).await {
Ok(res) => match output.as_ref() {
// Simple serialization
"application/json" => Ok(output::json(&res)),
"application/cbor" => Ok(output::cbor(&res)),
"application/pack" => Ok(output::pack(&res)),
"application/json" => Ok(output::json(&output::simplify(res))),
"application/cbor" => Ok(output::cbor(&output::simplify(res))),
"application/pack" => Ok(output::pack(&output::simplify(res))),
// Internal serialization
"application/bung" => Ok(output::full(&res)),
// An incorrect content-type was requested
@ -561,7 +561,7 @@ async fn delete_one(
// Specify the request statement
let sql = "DELETE type::thing($table, $id) RETURN BEFORE";
// Parse the Record ID as a SurrealQL value
let rid = match surrealdb::sql::value(&id) {
let rid = match surrealdb::sql::json(&id) {
Ok(id) => id,
Err(_) => Value::from(id),
};
@ -575,9 +575,9 @@ async fn delete_one(
match db.execute(sql, &session, Some(vars), opt.strict).await {
Ok(res) => match output.as_ref() {
// Simple serialization
"application/json" => Ok(output::json(&res)),
"application/cbor" => Ok(output::cbor(&res)),
"application/pack" => Ok(output::pack(&res)),
"application/json" => Ok(output::json(&output::simplify(res))),
"application/cbor" => Ok(output::cbor(&output::simplify(res))),
"application/pack" => Ok(output::pack(&output::simplify(res))),
// Internal serialization
"application/bung" => Ok(output::full(&res)),
// An incorrect content-type was requested

7
src/net/output.rs
View file

@ -1,6 +1,8 @@
use http::header::{HeaderValue, CONTENT_TYPE};
use http::StatusCode;
use serde::Serialize;
use serde_json::Value as Json;
use surrealdb::sql;
pub enum Output {
None,
@ -60,6 +62,11 @@ where
}
}
/// Convert and simplify the value into JSON
pub fn simplify<T: Serialize>(v: T) -> Json {
sql::to_value(v).unwrap().into()
}
impl warp::Reply for Output {
fn into_response(self) -> warp::reply::Response {
match self {

13
src/net/sql.rs
View file

@ -7,10 +7,7 @@ use crate::net::params::Params;
use crate::net::session;
use bytes::Bytes;
use futures::{SinkExt, StreamExt};
use serde_json::Value as Json;
use surrealdb::dbs::Response;
use surrealdb::dbs::Session;
use surrealdb::sql;
use warp::ws::{Message, WebSocket, Ws};
use warp::Filter;
@ -40,10 +37,6 @@ pub fn config() -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejecti
opts.or(post).or(sock)
}
fn json(res: Vec<Response>) -> Json {
sql::to_value(res).unwrap().into()
}
async fn handler(
output: String,
sql: Bytes,
@ -61,9 +54,9 @@ async fn handler(
// Convert the response to JSON
Ok(res) => match output.as_ref() {
// Simple serialization
"application/json" => Ok(output::json(&json(res))),
"application/cbor" => Ok(output::cbor(&json(res))),
"application/pack" => Ok(output::pack(&json(res))),
"application/json" => Ok(output::json(&output::simplify(res))),
"application/cbor" => Ok(output::cbor(&output::simplify(res))),
"application/pack" => Ok(output::pack(&output::simplify(res))),
// Internal serialization
"application/bung" => Ok(output::full(&res)),
// An incorrect content-type was requested

12
src/rpc/res.rs
View file

@ -31,26 +31,26 @@ enum Content<T> {
}
impl<T: Serialize> Response<T> {
/// Convert and simplify the value into JSON
#[inline]
fn json(self) -> Json {
fn simplify(self) -> Json {
sql::to_value(self).unwrap().into()
}
/// Send the response to the channel
/// Send the response to the WebSocket channel
pub async fn send(self, out: Output, chn: Sender<Message>) {
match out {
Output::Json => {
let res = serde_json::to_string(&self.json()).unwrap();
let res = serde_json::to_string(&self.simplify()).unwrap();
let res = Message::text(res);
let _ = chn.send(res).await;
}
Output::Cbor => {
let res = serde_cbor::to_vec(&self.json()).unwrap();
let res = serde_cbor::to_vec(&self.simplify()).unwrap();
let res = Message::binary(res);
let _ = chn.send(res).await;
}
Output::Pack => {
let res = serde_pack::to_vec(&self.json()).unwrap();
let res = serde_pack::to_vec(&self.simplify()).unwrap();
let res = Message::binary(res);
let _ = chn.send(res).await;
}