Hole/core
Hole/core
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

finish request_handler function

Browse source
This commit is contained in:
Horhik 2021-04-06 13:03:57 +03:00
parent 9ef832a332
commit f46404eb7e
5 changed files with 85 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/api/handlers.rs
View file

@ -1,6 +1,5 @@
use super::response::User;
use super::response::UserList;
use std::time::{SystemTime};
use super::{
request::*,
response::{AppStatus, ResponseType},
@ -9,27 +8,29 @@ use crate::chat::types::PackedMessage;
use crate::chat::types::SP;
use crate::db::{self, messages, types, users};
use async_std::io::Result;
use fcpv2::client::fcp_types::ClientPut;
use fcpv2::client::fcp_types::{ClientPut, ClientHello};
use fcpv2::types::{
traits::{FcpParser, FcpRequest},
SSK,
};
use rusqlite::Connection;
use serde_json::json;
use std::time::SystemTime;
use uuid::Uuid;
use crate::db::types::Id;
pub fn start_app(request: StartAppReq, server_sender: &SP) -> Result<()> {
pub fn start_app(request: StartAppReq, server_sender: SP) -> Result<()> {
server_sender.send(PackedMessage::ToFreenet(ClientHello::new("start_app_request".to_string(), 2.0).convert())).unwrap();
Ok(())
//sending *JSON*, what everything is OK
}
pub fn stop_app(request: StopAppReq, conn: &Connection, server_sender: &SP) -> Result<()> {
pub fn stop_app(request: StopAppReq, conn: &Connection, server_sender: SP) -> Result<()> {
std::process::exit(0)
}
pub fn load_users(request: LoadUsersReq, conn: &Connection, server_sender: &SP) -> Result<()> {
pub fn load_users(request: LoadUsersReq, conn: &Connection, server_sender: SP) -> Result<()> {
let jsoned_users: Vec<_> = users::load_all_users(conn)
.unwrap()
.into_iter()
@ -42,13 +43,13 @@ pub fn load_users(request: LoadUsersReq, conn: &Connection, server_sender: &SP)
let _ = server_sender.send(PackedMessage::ToClient(users)).unwrap();
Ok(())
}
pub fn send_message(request: SendMessageReq, conn: &Connection, server_sender: &SP) -> Result<()> {
pub fn send_message(request: SendMessageReq, conn: &Connection, server_sender: SP) -> Result<()> {
if let Ok(user_data) = db::users::get_user_by_id(request.user_id, conn) {
// Add message to DB
let key = user_data.insert_key;
let identifier = &user_data.id.0.to_string()[..];
let message_id :u32 = user_data.messages_count;
let db_message = db::types::Message{
let message_id: u32 = user_data.messages_count;
let db_message = db::types::Message {
id: message_id,
date: chrono::offset::Local::now(),
user_id: Id(uuid::Uuid::parse_str(identifier).unwrap()),
@ -77,11 +78,7 @@ pub fn send_message(request: SendMessageReq, conn: &Connection, server_sender: &
//sending FCP request
}
pub fn load_messages(
request: LoadMessagesReq,
conn: &Connection,
server_sender: &SP,
) -> Result<()> {
pub fn load_messages(request: LoadMessagesReq, conn: &Connection, server_sender: SP) -> Result<()> {
let messages = db::messages::select_n_last_messages(
request.user_id,
request.start_index,
@ -96,7 +93,7 @@ pub fn load_messages(
//sending *JSON*
}
// Adding user to DB
pub fn add_user(request: AddUserReq, conn: &Connection, server_sender: &SP) -> Result<()> {
pub fn add_user(request: AddUserReq, conn: &Connection, server_sender: SP) -> Result<()> {
let user = db::types::User {
id: db::types::Id(Uuid::new_v4()),
name: request.name,

36
src/api/request.rs
View file

@ -6,48 +6,60 @@ use serde_json::Result;
type Id = crate::db::types::Id;
#[derive(Serialize, Deserialize, Debug, PartialEq)]
#[serde(rename_all = "camelCase")]
pub struct CreateInstance;
#[derive(Serialize, Deserialize, Debug, PartialEq)]
#[serde(rename_all = "camelCase")]
pub struct SendMessage;
#[derive(Serialize, Deserialize, Debug, PartialEq)]
#[serde(rename_all = "camelCase")]
pub struct LoadUsers;
#[derive(Serialize, Deserialize, Debug, PartialEq)]
#[serde(rename_all = "camelCase")]
pub struct LoadMessages;
#[derive(Serialize, Deserialize, Debug, PartialEq)]
#[serde(rename_all = "camelCase")]
pub struct AddUser;
#[derive(Serialize, Deserialize, Debug, PartialEq)]
#[serde(rename_all = "camelCase")]
pub struct StartApp;
#[derive(Serialize, Deserialize, Debug, PartialEq)]
#[serde(rename_all = "camelCase")]
pub struct StopApp;
#[derive(Deserialize, Debug)]
#[serde(rename_all = "camelCase")]
pub struct CreateInstanceReq {
pub req_type: CreateInstance,
pub name: String,
}
#[derive(Deserialize, Debug, PartialEq)]
#[derive(Deserialize, Serialize, Debug, PartialEq)]
#[serde(rename_all = "camelCase")]
pub struct StartAppReq {
pub req_type: StartApp,
}
#[derive(Deserialize, Debug, PartialEq)]
#[derive(Deserialize,Serialize, Debug, PartialEq)]
#[serde(rename_all = "camelCase")]
pub struct StopAppReq {
pub(crate) req_type: StopApp,
}
#[derive(Deserialize, Debug)]
#[serde(rename_all = "camelCase")]
pub struct LoadUsersReq {
pub req_type: LoadUsers,
}
#[derive(Deserialize, Debug)]
#[serde(rename_all = "camelCase")]
pub struct SendMessageReq {
pub req_type: SendMessage,
pub user_id: Id,
@ -55,6 +67,7 @@ pub struct SendMessageReq {
}
#[derive(Deserialize, Debug)]
#[serde(rename_all = "camelCase")]
pub struct LoadMessagesReq {
pub req_type: LoadMessages,
pub user_id: Id,
@ -63,9 +76,28 @@ pub struct LoadMessagesReq {
}
#[derive(Deserialize, Debug)]
#[serde(rename_all = "camelCase")]
pub struct AddUserReq {
pub req_type: AddUser,
pub name: String,
pub sign_key: String,
pub insert_key: String,
}
#[test]
fn request_StoppApp_are_correct() {
let json: &str = "{'reqType':'StopApp'}";
//log::info!("{} and {}", json, tjsn);
//assert_eq!(jsoned, StopAppReq{req_type: StopApp});
//assert_eq!(json,tjsn);
}
#[test]
fn request_StartApp_are_correct() {}
#[test]
fn request_LoadUsers_are_correct() {}
#[test]
fn request_SendMessage_are_correct() {}
#[test]
fn request_LoadMessages_are_correct() {}
#[test]
fn request_AddUser_are_correct() {}

39
src/api/selector.rs
View file

@ -11,32 +11,29 @@ use rusqlite::Connection;
use serde_json::from_str;
use serde_json::json;
// server_sender sending data to server thread;
pub async fn request_selector(json: String, server_sender: &SP, conn: &Connection) -> Result<()> {
pub fn request_selector(json: String, server_sender: SP, conn: &Connection) -> Result<()> {
// if let Ok(res) = from_str::<CreateInstanceReq>(&json) {
//TODO v0.3 Add Instances return Ok(());
// }
log::info!("matching request...");
if let Ok(res) = from_str::<StartAppReq>(&json) {
handlers::start_app(res, server_sender)?
}
if let Ok(res) = from_str::<StopAppReq>(&json) {
handlers::stop_app(res, conn, server_sender)?
}
if let Ok(res) = from_str::<LoadUsersReq>(&json) {
handlers::load_users(res, conn, server_sender)?
}
if let Ok(res) = from_str::<SendMessageReq>(&json) {
handlers::send_message(res, conn, server_sender)?
}
if let Ok(res) = from_str::<LoadMessagesReq>(&json) {
handlers::load_messages(res, conn, server_sender)?
}
if let Ok(res) = from_str::<AddUserReq>(&json) {
match handlers::add_user(res, conn, server_sender) {
Ok(_) => {},
handlers::start_app(res, server_sender.clone())?
} else if let Ok(res) = from_str::<StopAppReq>(&json) {
handlers::stop_app(res, conn, server_sender.clone())?
} else if let Ok(res) = from_str::<LoadUsersReq>(&json) {
handlers::load_users(res, conn, server_sender.clone())?
} else if let Ok(res) = from_str::<SendMessageReq>(&json) {
handlers::send_message(res, conn, server_sender.clone())?
} else if let Ok(res) = from_str::<LoadMessagesReq>(&json) {
handlers::load_messages(res, conn, server_sender.clone())?
} else if let Ok(res) = from_str::<AddUserReq>(&json) {
match handlers::add_user(res, conn, server_sender.clone()) {
Ok(_) => return Ok(()),
Err(e) => {
// Sending error to user, because failed to add user
let _ = server_sender
.clone()
.send(PackedMessage::ToClient(
json!(AppError {
res_type: ErrorType::FailedToAddUser
@ -44,11 +41,15 @@ pub async fn request_selector(json: String, server_sender: &SP, conn: &Connectio
.to_string(),
))
.unwrap();
return Ok(());
}
}
} else {
log::error!("{}\n is wrong formatted", json)
}
Err(async_std::io::Error::new(
async_std::io::ErrorKind::InvalidData,
"Wrong request",
serde_json::to_string(&StartAppReq{req_type: StartApp}).unwrap(),
))
}

27
src/chat/front_conn.rs
View file

@ -91,13 +91,14 @@ async fn connection_for_receiving(
.await
.expect("Couldn't send message");
}
PackedMessage::FromFreenet(response) => {sender
// TODO freenet_response_handler
.send(Message::Text(response))
.await
.expect("Couldn't send messge");
PackedMessage::FromFreenet(response) => {
sender
// TODO freenet_response_handler
.send(Message::Text(response))
.await
.expect("Couldn't send messge");
}
_ => {},
_ => {}
}
}
Ok(())
@ -113,7 +114,14 @@ async fn connection_for_sending(
loop {
if let Some(msg) = new_msg.await {
let jsoned = msg.expect("Falied to unwrap gotted message");
request_selector(jsoned.to_string(), &server_sender, &conn);
log::info!("new request");
match request_selector(jsoned.to_string(), server_sender.clone(), &conn) {
Ok(_) => {}
Err(e) => {
log::error!("{}", e);
}
};
/*
let res: serde_json::Result<FrontMsg> =
serde_json::from_str(jsoned.to_text().expect("Falied to parse JSON"));
@ -139,7 +147,10 @@ async fn connection_for_sending(
new_msg = receiver.next();
} else {
{
break;
return Err(async_std::io::Error::new(
async_std::io::ErrorKind::InvalidData,
"failed to unwrap message",
));
}
}
}

1
src/chat/types.rs
View file

@ -32,6 +32,7 @@ use std::sync::mpsc::{Receiver, Sender};
// }
//}
pub enum PackedMessage {
ToFreenet(String),
FromFreenet(String),