anna/async-graphql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve websocket

Browse Source
This commit is contained in:
Sunli 2020-09-14 10:44:56 +08:00
parent 01f02c6bc1
commit 1ab5da63ef
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/http/websocket.rs
View File

@ -11,7 +11,7 @@ use std::pin::Pin;
use std::sync::Arc; use std::sync::Arc;
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
struct OperationMessage<'a> { struct OperationMessage<'a, T> {
#[serde(rename = "type")] #[serde(rename = "type")]
ty: &'a str, ty: &'a str,
@ -19,7 +19,7 @@ struct OperationMessage<'a> {
id: Option<String>, id: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
payload: Option<serde_json::Value>, payload: Option<T>,
} }
type SubscriptionStreams = HashMap<String, Pin<Box<dyn Stream<Item = Response> + Send>>>; type SubscriptionStreams = HashMap<String, Pin<Box<dyn Stream<Item = Response> + Send>>>;
@ -158,7 +158,7 @@ where
&OperationMessage { &OperationMessage {
ty: "error", ty: "error",
id: Some(id.to_string()), id: Some(id.to_string()),
payload: Some(serde_json::to_value(err).unwrap()), payload: Some(err),
}, },
); );
} else { } else {
@ -167,7 +167,7 @@ where
&OperationMessage { &OperationMessage {
ty: "data", ty: "data",
id: Some(id.to_string()), id: Some(id.to_string()),
payload: Some(serde_json::to_value(&res).unwrap()), payload: Some(&res),
}, },
); );
} }
@ -179,7 +179,7 @@ where
&OperationMessage { &OperationMessage {
ty: "complete", ty: "complete",
id: Some(id.to_string()), id: Some(id.to_string()),
payload: None, payload: Option::<serde_json::Value>::None,
}, },
); );
} }
@ -212,7 +212,7 @@ where
Mutation: ObjectType + Send + Sync + 'static, Mutation: ObjectType + Send + Sync + 'static,
Subscription: SubscriptionType + Send + Sync + 'static, Subscription: SubscriptionType + Send + Sync + 'static,
{ {
match serde_json::from_slice::<OperationMessage>(&data) { match serde_json::from_slice::<OperationMessage<serde_json::Value>>(&data) {
Ok(msg) => match msg.ty { Ok(msg) => match msg.ty {
"connection_init" => { "connection_init" => {
if let Some(payload) = msg.payload { if let Some(payload) = msg.payload {
@ -223,7 +223,7 @@ where
&OperationMessage { &OperationMessage {
ty: "connection_ack", ty: "connection_ack",
id: None, id: None,
payload: None, payload: Option::<serde_json::Value>::None,
}, },
); );
} }
@ -245,7 +245,7 @@ where
&OperationMessage { &OperationMessage {
ty: "complete", ty: "complete",
id: Some(id), id: Some(id),
payload: None, payload: Option::<serde_json::Value>::None,
}, },
); );
} }