mirror of
https://github.com/speatzle/nfsense.git
synced 2025-05-10 18:38:22 +00:00
remove json_rpc modified crate
This commit is contained in:
parent
6b75341d03
commit
0a603b6642
3 changed files with 0 additions and 289 deletions
|
|
@ -1,97 +0,0 @@
|
|||
use serde::{Deserialize, Serialize};
|
||||
use thiserror::Error;
|
||||
|
||||
/// Constants for [error object](https://www.jsonrpc.org/specification#error_object)
|
||||
pub const INVALID_REQUEST: i32 = -32600;
|
||||
pub const METHOD_NOT_FOUND: i32 = -32601;
|
||||
pub const INVALID_PARAMS: i32 = -32602;
|
||||
pub const INTERNAL_ERROR: i32 = -32603;
|
||||
pub const PARSE_ERROR: i32 = -32700;
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum JsonRpcErrorReason {
|
||||
ParseError,
|
||||
InvalidRequest,
|
||||
MethodNotFound,
|
||||
InvalidParams,
|
||||
InternalError,
|
||||
/// -32000 to -32099
|
||||
ServerError(i32),
|
||||
}
|
||||
|
||||
impl std::fmt::Display for JsonRpcErrorReason {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
match self {
|
||||
JsonRpcErrorReason::ParseError => write!(f, "Parse error"),
|
||||
JsonRpcErrorReason::InvalidRequest => write!(f, "Invalid Request"),
|
||||
JsonRpcErrorReason::MethodNotFound => write!(f, "Method not found"),
|
||||
JsonRpcErrorReason::InvalidParams => write!(f, "Invalid params"),
|
||||
JsonRpcErrorReason::InternalError => write!(f, "Internal error"),
|
||||
JsonRpcErrorReason::ServerError(code) => write!(f, "Server error: {}", code),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl From<JsonRpcErrorReason> for i32 {
|
||||
fn from(reason: JsonRpcErrorReason) -> i32 {
|
||||
match reason {
|
||||
JsonRpcErrorReason::ParseError => PARSE_ERROR,
|
||||
JsonRpcErrorReason::InvalidRequest => INVALID_REQUEST,
|
||||
JsonRpcErrorReason::MethodNotFound => METHOD_NOT_FOUND,
|
||||
JsonRpcErrorReason::InvalidParams => INVALID_PARAMS,
|
||||
JsonRpcErrorReason::InternalError => INTERNAL_ERROR,
|
||||
JsonRpcErrorReason::ServerError(code) => code,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl JsonRpcErrorReason {
|
||||
fn new(code: i32) -> Self {
|
||||
match code {
|
||||
PARSE_ERROR => Self::ParseError,
|
||||
INVALID_REQUEST => Self::InvalidRequest,
|
||||
METHOD_NOT_FOUND => Self::MethodNotFound,
|
||||
INVALID_PARAMS => Self::InvalidParams,
|
||||
INTERNAL_ERROR => Self::InternalError,
|
||||
other => Self::ServerError(other),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Error, Serialize, Deserialize)]
|
||||
pub struct JsonRpcError {
|
||||
code: i32,
|
||||
message: String,
|
||||
data: serde_json::Value,
|
||||
}
|
||||
|
||||
impl JsonRpcError {
|
||||
pub fn new(code: JsonRpcErrorReason, message: String, data: serde_json::Value) -> Self {
|
||||
Self {
|
||||
code: code.into(),
|
||||
message,
|
||||
data,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl std::fmt::Display for JsonRpcError {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
write!(
|
||||
f,
|
||||
"{}: {}",
|
||||
JsonRpcErrorReason::new(self.code),
|
||||
self.message
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
impl JsonRpcError {
|
||||
pub fn error_reason(&self) -> JsonRpcErrorReason {
|
||||
JsonRpcErrorReason::new(self.code)
|
||||
}
|
||||
|
||||
pub fn code(&self) -> i32 {
|
||||
self.code
|
||||
}
|
||||
}
|
||||
|
|
@ -1,191 +0,0 @@
|
|||
// Copied from https://github.com/ralexstokes/axum-json-rpc since it needed minor modifications
|
||||
|
||||
use axum::body::HttpBody;
|
||||
use axum::extract::{FromRequest, FromRequestParts};
|
||||
use axum::http::Request;
|
||||
use axum::response::{IntoResponse, Response};
|
||||
use axum::{BoxError, Json};
|
||||
use error::{JsonRpcError, JsonRpcErrorReason};
|
||||
use serde::de::DeserializeOwned;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use serde_json::Value;
|
||||
|
||||
pub mod error;
|
||||
|
||||
/// Hack until [try_trait_v2](https://github.com/rust-lang/rust/issues/84277) is not stabilized
|
||||
pub type JsonRpcResult = Result<JsonRpcResponse, JsonRpcResponse>;
|
||||
|
||||
#[derive(Deserialize, Debug)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
struct JsonRpcRequest {
|
||||
id: i64,
|
||||
jsonrpc: String,
|
||||
method: String,
|
||||
params: Option<Value>,
|
||||
}
|
||||
|
||||
/// Parses a JSON-RPC request, and returns the request ID, the method name, and the parameters.
|
||||
/// If the request is invalid, returns an error.
|
||||
/// ```rust
|
||||
/// use axum_jrpc::{JsonRpcResult, JsonRpcExtractor, JsonRpcResponse};
|
||||
///
|
||||
/// fn router(req: JsonRpcExtractor) -> JsonRpcResult {
|
||||
/// let req_id = req.get_request_id()?;
|
||||
/// let method = req.method();
|
||||
/// match method {
|
||||
/// "add" => {
|
||||
/// let params: [i32;2] = req.parse_params()?;
|
||||
/// return Ok(JsonRpcResponse::success(req_id, params[0] + params[1]))
|
||||
/// }
|
||||
/// m => Ok(req.method_not_found(m))
|
||||
/// }
|
||||
/// }
|
||||
/// ```
|
||||
#[derive(Debug)]
|
||||
pub struct JsonRpcExtractor {
|
||||
pub parsed: Value,
|
||||
pub method: String,
|
||||
pub id: i64,
|
||||
}
|
||||
|
||||
impl JsonRpcExtractor {
|
||||
pub fn get_request_id(&self) -> i64 {
|
||||
self.id
|
||||
}
|
||||
|
||||
pub fn parse_params<T: DeserializeOwned>(self) -> Result<T, JsonRpcResponse> {
|
||||
let value = serde_json::from_value(self.parsed);
|
||||
match value {
|
||||
Ok(v) => Ok(v),
|
||||
Err(e) => {
|
||||
let error = JsonRpcError::new(
|
||||
JsonRpcErrorReason::InvalidParams,
|
||||
e.to_string(),
|
||||
Value::Null,
|
||||
);
|
||||
Err(JsonRpcResponse::error(self.id, error))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn method(&self) -> &str {
|
||||
&self.method
|
||||
}
|
||||
|
||||
pub fn method_not_found(&self, method: &str) -> JsonRpcResponse {
|
||||
let error = JsonRpcError::new(
|
||||
JsonRpcErrorReason::MethodNotFound,
|
||||
format!("Method `{}` not found", method),
|
||||
Value::Null,
|
||||
);
|
||||
JsonRpcResponse::error(self.id, error)
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait::async_trait]
|
||||
impl<S, B> FromRequest<S, B> for JsonRpcExtractor
|
||||
where
|
||||
S: Send + Sync,
|
||||
B: Send + 'static,
|
||||
B: HttpBody + Send,
|
||||
B::Data: Send,
|
||||
B::Error: Into<BoxError>,
|
||||
{
|
||||
type Rejection = JsonRpcResponse;
|
||||
|
||||
async fn from_request(req: Request<B>, state: &S) -> Result<Self, Self::Rejection> {
|
||||
let json = Json::from_request(req, state).await;
|
||||
let parsed: JsonRpcRequest = match json {
|
||||
Ok(a) => a.0,
|
||||
Err(e) => {
|
||||
return Err(JsonRpcResponse {
|
||||
id: 0,
|
||||
jsonrpc: "2.0".to_owned(),
|
||||
result: JsonRpcAnswer::Error(JsonRpcError::new(
|
||||
JsonRpcErrorReason::InvalidRequest,
|
||||
e.to_string(),
|
||||
Value::Null,
|
||||
)),
|
||||
})
|
||||
}
|
||||
};
|
||||
if parsed.jsonrpc != "2.0" {
|
||||
return Err(JsonRpcResponse {
|
||||
id: parsed.id,
|
||||
jsonrpc: "2.0".to_owned(),
|
||||
result: JsonRpcAnswer::Error(JsonRpcError::new(
|
||||
JsonRpcErrorReason::InvalidRequest,
|
||||
"Invalid jsonrpc version".to_owned(),
|
||||
Value::Null,
|
||||
)),
|
||||
});
|
||||
}
|
||||
Ok(Self {
|
||||
parsed: match parsed.params {
|
||||
Some(p) => p,
|
||||
None => Value::Null,
|
||||
},
|
||||
method: parsed.method,
|
||||
id: parsed.id,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Serialize, Debug, Deserialize)]
|
||||
/// A JSON-RPC response.
|
||||
pub struct JsonRpcResponse {
|
||||
jsonrpc: String,
|
||||
pub result: JsonRpcAnswer,
|
||||
/// The request ID.
|
||||
id: i64,
|
||||
}
|
||||
|
||||
impl JsonRpcResponse {
|
||||
/// Returns a response with the given result
|
||||
/// Returns JsonRpcError if the `result` is invalid input for [`serde_json::to_value`]
|
||||
pub fn success<T: Serialize>(id: i64, result: T) -> Self {
|
||||
let result = match serde_json::to_value(result) {
|
||||
Ok(v) => v,
|
||||
Err(e) => {
|
||||
let err = JsonRpcError::new(
|
||||
JsonRpcErrorReason::InternalError,
|
||||
e.to_string(),
|
||||
Value::Null,
|
||||
);
|
||||
return JsonRpcResponse {
|
||||
id,
|
||||
jsonrpc: "2.0".to_owned(),
|
||||
result: JsonRpcAnswer::Error(err),
|
||||
};
|
||||
}
|
||||
};
|
||||
|
||||
JsonRpcResponse {
|
||||
id,
|
||||
jsonrpc: "2.0".to_owned(),
|
||||
result: JsonRpcAnswer::Result(result),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn error(id: i64, error: JsonRpcError) -> Self {
|
||||
JsonRpcResponse {
|
||||
id,
|
||||
jsonrpc: "2.0".to_owned(),
|
||||
result: JsonRpcAnswer::Error(error),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl IntoResponse for JsonRpcResponse {
|
||||
fn into_response(self) -> Response {
|
||||
Json(self).into_response()
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Serialize, Debug, Deserialize)]
|
||||
#[serde(untagged)]
|
||||
/// JsonRpc [response object](https://www.jsonrpc.org/specification#response_object)
|
||||
pub enum JsonRpcAnswer {
|
||||
Result(Value),
|
||||
Error(JsonRpcError),
|
||||
}
|
||||
|
|
@ -17,7 +17,6 @@ use web::auth::SessionState;
|
|||
|
||||
mod config_manager;
|
||||
mod definitions;
|
||||
mod json_rpc;
|
||||
mod state;
|
||||
mod web;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue