|
|
|
@ -1,10 +1,11 @@ |
|
|
|
|
|
|
|
use esse_primitives::{id_from_str, id_to_str}; |
|
|
|
use std::collections::HashMap; |
|
|
|
use std::collections::HashMap; |
|
|
|
use std::net::SocketAddr; |
|
|
|
use std::net::SocketAddr; |
|
|
|
use std::sync::Arc; |
|
|
|
use std::sync::Arc; |
|
|
|
use tdn::types::{ |
|
|
|
use tdn::types::{ |
|
|
|
group::GroupId, |
|
|
|
group::GroupId, |
|
|
|
message::{NetworkType, SendMessage, SendType, StateRequest, StateResponse}, |
|
|
|
message::{NetworkType, SendMessage, SendType, StateRequest, StateResponse}, |
|
|
|
primitive::{HandleResult, Peer, PeerId, Result}, |
|
|
|
primitives::{HandleResult, Peer, PeerId, Result}, |
|
|
|
rpc::{json, rpc_response, RpcError, RpcHandler, RpcParam}, |
|
|
|
rpc::{json, rpc_response, RpcError, RpcHandler, RpcParam}, |
|
|
|
}; |
|
|
|
}; |
|
|
|
use tdn_did::{generate_mnemonic, Count}; |
|
|
|
use tdn_did::{generate_mnemonic, Count}; |
|
|
|
@ -15,28 +16,20 @@ use tokio::sync::{ |
|
|
|
|
|
|
|
|
|
|
|
use crate::account::lang_from_i64; |
|
|
|
use crate::account::lang_from_i64; |
|
|
|
use crate::apps::app_rpc_inject; |
|
|
|
use crate::apps::app_rpc_inject; |
|
|
|
use crate::apps::chat::chat_conn; |
|
|
|
use crate::global::Global; |
|
|
|
use crate::apps::group::{add_layer, group_conn, GroupChat}; |
|
|
|
//use crate::apps::chat::chat_conn;
|
|
|
|
use crate::event::InnerEvent; |
|
|
|
//use crate::apps::group::{add_layer, group_conn, GroupChat};
|
|
|
|
|
|
|
|
//use crate::event::InnerEvent;
|
|
|
|
use crate::group::Group; |
|
|
|
use crate::group::Group; |
|
|
|
use crate::layer::{Layer, LayerEvent, Online}; |
|
|
|
use crate::layer::{Layer, LayerEvent, Online}; |
|
|
|
use crate::session::{connect_session, Session, SessionType}; |
|
|
|
//use crate::session::{connect_session, Session, SessionType};
|
|
|
|
|
|
|
|
|
|
|
|
pub(crate) fn init_rpc( |
|
|
|
pub(crate) fn init_rpc(global: Arc<Global>) -> RpcHandler<Global> { |
|
|
|
addr: PeerId, |
|
|
|
let mut handler = new_rpc_handler(global); |
|
|
|
group: Arc<RwLock<Group>>, |
|
|
|
|
|
|
|
layer: Arc<RwLock<Layer>>, |
|
|
|
|
|
|
|
) -> RpcHandler<RpcState> { |
|
|
|
|
|
|
|
let mut handler = new_rpc_handler(addr, group, layer); |
|
|
|
|
|
|
|
app_rpc_inject(&mut handler); |
|
|
|
app_rpc_inject(&mut handler); |
|
|
|
handler |
|
|
|
handler |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
pub(crate) struct RpcState { |
|
|
|
|
|
|
|
pub group: Arc<RwLock<Group>>, |
|
|
|
|
|
|
|
pub layer: Arc<RwLock<Layer>>, |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#[inline] |
|
|
|
#[inline] |
|
|
|
pub(crate) fn network_stable(peers: Vec<(PeerId, bool)>) -> RpcParam { |
|
|
|
pub(crate) fn network_stable(peers: Vec<(PeerId, bool)>) -> RpcParam { |
|
|
|
let s_peers: Vec<Vec<String>> = peers |
|
|
|
let s_peers: Vec<Vec<String>> = peers |
|
|
|
@ -50,100 +43,95 @@ pub(crate) fn network_stable(peers: Vec<(PeerId, bool)>) -> RpcParam { |
|
|
|
vec![p.to_hex(), d] |
|
|
|
vec![p.to_hex(), d] |
|
|
|
}) |
|
|
|
}) |
|
|
|
.collect(); |
|
|
|
.collect(); |
|
|
|
rpc_response(0, "network-stable", json!(s_peers), GroupId::default()) |
|
|
|
rpc_response(0, "network-stable", json!(s_peers)) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
#[inline] |
|
|
|
#[inline] |
|
|
|
pub(crate) fn network_dht(peers: Vec<PeerId>) -> RpcParam { |
|
|
|
pub(crate) fn network_dht(peers: Vec<PeerId>) -> RpcParam { |
|
|
|
let s_peers: Vec<String> = peers.iter().map(|p| p.to_hex()).collect(); |
|
|
|
let s_peers: Vec<String> = peers.iter().map(|p| p.to_hex()).collect(); |
|
|
|
rpc_response(0, "network-dht", json!(s_peers), GroupId::default()) |
|
|
|
rpc_response(0, "network-dht", json!(s_peers)) |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#[inline] |
|
|
|
|
|
|
|
pub(crate) fn account_update(mgid: GroupId, name: &str, avatar: String) -> RpcParam { |
|
|
|
|
|
|
|
rpc_response( |
|
|
|
|
|
|
|
0, |
|
|
|
|
|
|
|
"account-update", |
|
|
|
|
|
|
|
json!([mgid.to_hex(), name, avatar]), |
|
|
|
|
|
|
|
mgid, |
|
|
|
|
|
|
|
) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#[inline] |
|
|
|
|
|
|
|
pub(crate) fn session_create(mgid: GroupId, session: &Session) -> RpcParam { |
|
|
|
|
|
|
|
rpc_response(0, "session-create", session.to_rpc(), mgid) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#[inline] |
|
|
|
|
|
|
|
pub(crate) fn session_last( |
|
|
|
|
|
|
|
mgid: GroupId, |
|
|
|
|
|
|
|
id: &i64, |
|
|
|
|
|
|
|
time: &i64, |
|
|
|
|
|
|
|
content: &str, |
|
|
|
|
|
|
|
readed: bool, |
|
|
|
|
|
|
|
) -> RpcParam { |
|
|
|
|
|
|
|
rpc_response(0, "session-last", json!([id, time, content, readed]), mgid) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#[inline] |
|
|
|
|
|
|
|
pub(crate) fn notice_menu(mgid: GroupId, t: &SessionType) -> RpcParam { |
|
|
|
|
|
|
|
rpc_response(0, "notice-menu", json!([t.to_int()]), mgid) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#[inline] |
|
|
|
|
|
|
|
pub(crate) fn session_update_name(mgid: GroupId, id: &i64, name: &str) -> RpcParam { |
|
|
|
|
|
|
|
rpc_response(0, "session-update", json!([id, "", name, false]), mgid) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#[inline] |
|
|
|
|
|
|
|
pub(crate) fn session_update( |
|
|
|
|
|
|
|
mgid: GroupId, |
|
|
|
|
|
|
|
id: &i64, |
|
|
|
|
|
|
|
addr: &PeerId, |
|
|
|
|
|
|
|
name: &str, |
|
|
|
|
|
|
|
is_top: bool, |
|
|
|
|
|
|
|
) -> RpcParam { |
|
|
|
|
|
|
|
rpc_response( |
|
|
|
|
|
|
|
0, |
|
|
|
|
|
|
|
"session-update", |
|
|
|
|
|
|
|
json!([id, addr.to_hex(), name, is_top]), |
|
|
|
|
|
|
|
mgid, |
|
|
|
|
|
|
|
) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#[inline] |
|
|
|
|
|
|
|
pub(crate) fn session_connect(mgid: GroupId, id: &i64, addr: &PeerId) -> RpcParam { |
|
|
|
|
|
|
|
rpc_response(0, "session-connect", json!([id, addr.to_hex()]), mgid) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#[inline] |
|
|
|
|
|
|
|
pub(crate) fn session_suspend(mgid: GroupId, id: &i64) -> RpcParam { |
|
|
|
|
|
|
|
rpc_response(0, "session-suspend", json!([id]), mgid) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#[inline] |
|
|
|
|
|
|
|
pub(crate) fn session_lost(mgid: GroupId, id: &i64) -> RpcParam { |
|
|
|
|
|
|
|
rpc_response(0, "session-lost", json!([id]), mgid) |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
#[inline] |
|
|
|
#[inline] |
|
|
|
pub(crate) fn session_delete(mgid: GroupId, id: &i64) -> RpcParam { |
|
|
|
pub(crate) fn account_update(pid: &PeerId, name: &str, avatar: String) -> RpcParam { |
|
|
|
rpc_response(0, "session-delete", json!([id]), mgid) |
|
|
|
rpc_response(0, "account-update", json!([id_to_str(pid), name, avatar])) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
#[inline] |
|
|
|
// #[inline]
|
|
|
|
pub(crate) fn session_close(mgid: GroupId, id: &i64) -> RpcParam { |
|
|
|
// pub(crate) fn session_create(mgid: GroupId, session: &Session) -> RpcParam {
|
|
|
|
rpc_response(0, "session-close", json!([id]), mgid) |
|
|
|
// rpc_response(0, "session-create", session.to_rpc(), mgid)
|
|
|
|
} |
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
#[inline] |
|
|
|
// #[inline]
|
|
|
|
fn session_list(sessions: Vec<Session>) -> RpcParam { |
|
|
|
// pub(crate) fn session_last(
|
|
|
|
let mut results = vec![]; |
|
|
|
// mgid: GroupId,
|
|
|
|
for session in sessions { |
|
|
|
// id: &i64,
|
|
|
|
results.push(session.to_rpc()); |
|
|
|
// time: &i64,
|
|
|
|
} |
|
|
|
// content: &str,
|
|
|
|
json!(results) |
|
|
|
// readed: bool,
|
|
|
|
} |
|
|
|
// ) -> RpcParam {
|
|
|
|
|
|
|
|
// rpc_response(0, "session-last", json!([id, time, content, readed]), mgid)
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// #[inline]
|
|
|
|
|
|
|
|
// pub(crate) fn notice_menu(mgid: GroupId, t: &SessionType) -> RpcParam {
|
|
|
|
|
|
|
|
// rpc_response(0, "notice-menu", json!([t.to_int()]), mgid)
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// #[inline]
|
|
|
|
|
|
|
|
// pub(crate) fn session_update_name(mgid: GroupId, id: &i64, name: &str) -> RpcParam {
|
|
|
|
|
|
|
|
// rpc_response(0, "session-update", json!([id, "", name, false]), mgid)
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// #[inline]
|
|
|
|
|
|
|
|
// pub(crate) fn session_update(
|
|
|
|
|
|
|
|
// mgid: GroupId,
|
|
|
|
|
|
|
|
// id: &i64,
|
|
|
|
|
|
|
|
// addr: &PeerId,
|
|
|
|
|
|
|
|
// name: &str,
|
|
|
|
|
|
|
|
// is_top: bool,
|
|
|
|
|
|
|
|
// ) -> RpcParam {
|
|
|
|
|
|
|
|
// rpc_response(
|
|
|
|
|
|
|
|
// 0,
|
|
|
|
|
|
|
|
// "session-update",
|
|
|
|
|
|
|
|
// json!([id, addr.to_hex(), name, is_top]),
|
|
|
|
|
|
|
|
// mgid,
|
|
|
|
|
|
|
|
// )
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// #[inline]
|
|
|
|
|
|
|
|
// pub(crate) fn session_connect(mgid: GroupId, id: &i64, addr: &PeerId) -> RpcParam {
|
|
|
|
|
|
|
|
// rpc_response(0, "session-connect", json!([id, addr.to_hex()]), mgid)
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// #[inline]
|
|
|
|
|
|
|
|
// pub(crate) fn session_suspend(mgid: GroupId, id: &i64) -> RpcParam {
|
|
|
|
|
|
|
|
// rpc_response(0, "session-suspend", json!([id]), mgid)
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// #[inline]
|
|
|
|
|
|
|
|
// pub(crate) fn session_lost(mgid: GroupId, id: &i64) -> RpcParam {
|
|
|
|
|
|
|
|
// rpc_response(0, "session-lost", json!([id]), mgid)
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// #[inline]
|
|
|
|
|
|
|
|
// pub(crate) fn session_delete(mgid: GroupId, id: &i64) -> RpcParam {
|
|
|
|
|
|
|
|
// rpc_response(0, "session-delete", json!([id]), mgid)
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// #[inline]
|
|
|
|
|
|
|
|
// pub(crate) fn session_close(mgid: GroupId, id: &i64) -> RpcParam {
|
|
|
|
|
|
|
|
// rpc_response(0, "session-close", json!([id]), mgid)
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// #[inline]
|
|
|
|
|
|
|
|
// fn session_list(sessions: Vec<Session>) -> RpcParam {
|
|
|
|
|
|
|
|
// let mut results = vec![];
|
|
|
|
|
|
|
|
// for session in sessions {
|
|
|
|
|
|
|
|
// results.push(session.to_rpc());
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// json!(results)
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
#[inline] |
|
|
|
#[inline] |
|
|
|
pub(crate) async fn sleep_waiting_close_stable( |
|
|
|
pub(crate) async fn sleep_waiting_close_stable( |
|
|
|
@ -154,20 +142,13 @@ pub(crate) async fn sleep_waiting_close_stable( |
|
|
|
tokio::time::sleep(std::time::Duration::from_secs(10)).await; |
|
|
|
tokio::time::sleep(std::time::Duration::from_secs(10)).await; |
|
|
|
for (addr, _) in groups { |
|
|
|
for (addr, _) in groups { |
|
|
|
sender |
|
|
|
sender |
|
|
|
.send(SendMessage::Group( |
|
|
|
.send(SendMessage::Group(SendType::Disconnect(addr))) |
|
|
|
Default::default(), |
|
|
|
|
|
|
|
SendType::Disconnect(addr), |
|
|
|
|
|
|
|
)) |
|
|
|
|
|
|
|
.await?; |
|
|
|
.await?; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
for (faddr, fgid) in layers { |
|
|
|
for (faddr, fgid) in layers { |
|
|
|
sender |
|
|
|
sender |
|
|
|
.send(SendMessage::Layer( |
|
|
|
.send(SendMessage::Layer(fgid, SendType::Disconnect(faddr))) |
|
|
|
Default::default(), |
|
|
|
|
|
|
|
fgid, |
|
|
|
|
|
|
|
SendType::Disconnect(faddr), |
|
|
|
|
|
|
|
)) |
|
|
|
|
|
|
|
.await?; |
|
|
|
.await?; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -175,7 +156,7 @@ pub(crate) async fn sleep_waiting_close_stable( |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
#[inline] |
|
|
|
#[inline] |
|
|
|
pub(crate) async fn inner_rpc(uid: u64, method: &str, sender: &Sender<SendMessage>) -> Result<()> { |
|
|
|
pub(crate) async fn inner_rpc(uid: u64, method: &str, global: &Arc<Global>) -> Result<()> { |
|
|
|
// Inner network default rpc method. only use in http-rpc.
|
|
|
|
// Inner network default rpc method. only use in http-rpc.
|
|
|
|
if method == "network-stable" || method == "network-dht" { |
|
|
|
if method == "network-stable" || method == "network-dht" { |
|
|
|
let req = match method { |
|
|
|
let req = match method { |
|
|
|
@ -185,7 +166,10 @@ pub(crate) async fn inner_rpc(uid: u64, method: &str, sender: &Sender<SendMessag |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
let (s, mut r) = mpsc::channel::<StateResponse>(128); |
|
|
|
let (s, mut r) = mpsc::channel::<StateResponse>(128); |
|
|
|
let _ = sender |
|
|
|
let _ = global |
|
|
|
|
|
|
|
.sender |
|
|
|
|
|
|
|
.read() |
|
|
|
|
|
|
|
.await |
|
|
|
.send(SendMessage::Network(NetworkType::NetworkState(req, s))) |
|
|
|
.send(SendMessage::Network(NetworkType::NetworkState(req, s))) |
|
|
|
.await |
|
|
|
.await |
|
|
|
.expect("TDN channel closed"); |
|
|
|
.expect("TDN channel closed"); |
|
|
|
@ -198,7 +182,10 @@ pub(crate) async fn inner_rpc(uid: u64, method: &str, sender: &Sender<SendMessag |
|
|
|
} |
|
|
|
} |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
sender |
|
|
|
global |
|
|
|
|
|
|
|
.sender |
|
|
|
|
|
|
|
.read() |
|
|
|
|
|
|
|
.await |
|
|
|
.send(SendMessage::Rpc(uid, param, false)) |
|
|
|
.send(SendMessage::Rpc(uid, param, false)) |
|
|
|
.await |
|
|
|
.await |
|
|
|
.expect("TDN channel closed"); |
|
|
|
.expect("TDN channel closed"); |
|
|
|
@ -209,58 +196,44 @@ pub(crate) async fn inner_rpc(uid: u64, method: &str, sender: &Sender<SendMessag |
|
|
|
Err(anyhow!("not found")) |
|
|
|
Err(anyhow!("not found")) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
fn new_rpc_handler( |
|
|
|
fn new_rpc_handler(global: Arc<Global>) -> RpcHandler<Global> { |
|
|
|
addr: PeerId, |
|
|
|
let mut handler = RpcHandler::new_with_state(global); |
|
|
|
group: Arc<RwLock<Group>>, |
|
|
|
|
|
|
|
layer: Arc<RwLock<Layer>>, |
|
|
|
|
|
|
|
) -> RpcHandler<RpcState> { |
|
|
|
|
|
|
|
let mut handler = RpcHandler::new(RpcState { group, layer }); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
handler.add_method("echo", |_, params, _| async move { |
|
|
|
handler.add_method("echo", |params, _| async move { |
|
|
|
Ok(HandleResult::rpc(json!(params))) |
|
|
|
Ok(HandleResult::rpc(json!(params))) |
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
handler.add_method("account-system-info", move |_, _, _| async move { |
|
|
|
handler.add_method("add-bootstrap", |params: Vec<RpcParam>, _| async move { |
|
|
|
Ok(HandleResult::rpc(json!(vec![addr.to_hex()]))) |
|
|
|
let socket = params[0].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
|
|
|
|
let transport = params[1].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if let Ok(addr) = socket.parse::<SocketAddr>() { |
|
|
|
|
|
|
|
Ok(HandleResult::network(NetworkType::Connect( |
|
|
|
|
|
|
|
Peer::socket_transport(addr, transport), |
|
|
|
|
|
|
|
))) |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
Err(RpcError::InvalidRequest) |
|
|
|
|
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
handler.add_method( |
|
|
|
handler.add_method("account-list", |_, state: Arc<Global>| async move { |
|
|
|
"add-bootstrap", |
|
|
|
let mut accounts: Vec<Vec<String>> = vec![]; |
|
|
|
|_gid, params: Vec<RpcParam>, _| async move { |
|
|
|
let group_lock = state.group.read().await; |
|
|
|
let socket = params[0].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
for (pid, account) in group_lock.list_accounts().iter() { |
|
|
|
let transport = params[1].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
accounts.push(vec![ |
|
|
|
|
|
|
|
id_to_str(pid), |
|
|
|
if let Ok(addr) = socket.parse::<SocketAddr>() { |
|
|
|
account.name.clone(), |
|
|
|
Ok(HandleResult::network(NetworkType::Connect( |
|
|
|
base64::encode(&account.avatar), |
|
|
|
Peer::socket_transport(addr, transport), |
|
|
|
]); |
|
|
|
))) |
|
|
|
} |
|
|
|
} else { |
|
|
|
drop(group_lock); |
|
|
|
Err(RpcError::InvalidRequest) |
|
|
|
|
|
|
|
} |
|
|
|
Ok(HandleResult::rpc(json!(accounts))) |
|
|
|
}, |
|
|
|
}); |
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
handler.add_method( |
|
|
|
|
|
|
|
"account-list", |
|
|
|
|
|
|
|
|_gid, _params: Vec<RpcParam>, state: Arc<RpcState>| async move { |
|
|
|
|
|
|
|
let mut users: Vec<Vec<String>> = vec![]; |
|
|
|
|
|
|
|
let group_lock = state.group.read().await; |
|
|
|
|
|
|
|
for (gid, user) in group_lock.list_users().iter() { |
|
|
|
|
|
|
|
users.push(vec![ |
|
|
|
|
|
|
|
gid.to_hex(), |
|
|
|
|
|
|
|
user.name.clone(), |
|
|
|
|
|
|
|
base64::encode(&user.avatar), |
|
|
|
|
|
|
|
]); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
drop(group_lock); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Ok(HandleResult::rpc(json!(users))) |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
handler.add_method( |
|
|
|
handler.add_method( |
|
|
|
"account-generate", |
|
|
|
"account-generate", |
|
|
|
|_gid, params: Vec<RpcParam>, _state: Arc<RpcState>| async move { |
|
|
|
|params: Vec<RpcParam>, _state: Arc<Global>| async move { |
|
|
|
let lang = params[0].as_i64().ok_or(RpcError::ParseError)?; |
|
|
|
let lang = params[0].as_i64().ok_or(RpcError::ParseError)?; |
|
|
|
let language = lang_from_i64(lang); |
|
|
|
let language = lang_from_i64(lang); |
|
|
|
let words = generate_mnemonic(language, Count::Words12); |
|
|
|
let words = generate_mnemonic(language, Count::Words12); |
|
|
|
@ -270,7 +243,7 @@ fn new_rpc_handler( |
|
|
|
|
|
|
|
|
|
|
|
handler.add_method( |
|
|
|
handler.add_method( |
|
|
|
"account-create", |
|
|
|
"account-create", |
|
|
|
|_gid, params: Vec<RpcParam>, state: Arc<RpcState>| async move { |
|
|
|
|params: Vec<RpcParam>, state: Arc<Global>| async move { |
|
|
|
let lang = params[0].as_i64().ok_or(RpcError::ParseError)?; |
|
|
|
let lang = params[0].as_i64().ok_or(RpcError::ParseError)?; |
|
|
|
let seed = params[1].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
let seed = params[1].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
let pass = params[2].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
let pass = params[2].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
@ -280,26 +253,29 @@ fn new_rpc_handler( |
|
|
|
let avatar = params[5].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
let avatar = params[5].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
|
|
|
|
|
|
|
|
let avatar_bytes = base64::decode(avatar).unwrap_or(vec![]); |
|
|
|
let avatar_bytes = base64::decode(avatar).unwrap_or(vec![]); |
|
|
|
let (id, gid) = state |
|
|
|
let (_id, pid) = state |
|
|
|
.group |
|
|
|
.group |
|
|
|
.write() |
|
|
|
.write() |
|
|
|
.await |
|
|
|
.await |
|
|
|
.add_account(lang, seed, pass, name, lock, avatar_bytes) |
|
|
|
.add_account( |
|
|
|
|
|
|
|
lang, |
|
|
|
|
|
|
|
seed, |
|
|
|
|
|
|
|
pass, |
|
|
|
|
|
|
|
name, |
|
|
|
|
|
|
|
lock, |
|
|
|
|
|
|
|
avatar_bytes, |
|
|
|
|
|
|
|
&state.base, |
|
|
|
|
|
|
|
&state.secret, |
|
|
|
|
|
|
|
) |
|
|
|
.await?; |
|
|
|
.await?; |
|
|
|
state.layer.write().await.add_running(&gid, gid, id, 0)?; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let mut results = HandleResult::rpc(json!(vec![gid.to_hex()])); |
|
|
|
|
|
|
|
results.networks.push(NetworkType::AddGroup(gid)); // add AddGroup to TDN.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
debug!("Account Logined: {}.", gid.to_hex()); |
|
|
|
Ok(HandleResult::rpc(json!(vec![id_to_str(&pid)]))) |
|
|
|
|
|
|
|
|
|
|
|
Ok(results) |
|
|
|
|
|
|
|
}, |
|
|
|
}, |
|
|
|
); |
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
handler.add_method( |
|
|
|
handler.add_method( |
|
|
|
"account-restore", |
|
|
|
"account-restore", |
|
|
|
|_gid, params: Vec<RpcParam>, state: Arc<RpcState>| async move { |
|
|
|
|params: Vec<RpcParam>, state: Arc<Global>| async move { |
|
|
|
let lang = params[0].as_i64().ok_or(RpcError::ParseError)?; |
|
|
|
let lang = params[0].as_i64().ok_or(RpcError::ParseError)?; |
|
|
|
let seed = params[1].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
let seed = params[1].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
let pass = params[2].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
let pass = params[2].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
@ -307,60 +283,55 @@ fn new_rpc_handler( |
|
|
|
let name = params[3].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
let name = params[3].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
let lock = params[4].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
let lock = params[4].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
|
|
|
|
|
|
|
|
let some_addr = PeerId::from_hex(params[5].as_str().ok_or(RpcError::ParseError)?).ok(); |
|
|
|
let (_id, pid) = state |
|
|
|
|
|
|
|
|
|
|
|
let (id, gid) = state |
|
|
|
|
|
|
|
.group |
|
|
|
.group |
|
|
|
.write() |
|
|
|
.write() |
|
|
|
.await |
|
|
|
.await |
|
|
|
.add_account(lang, seed, pass, name, lock, vec![]) |
|
|
|
.add_account( |
|
|
|
|
|
|
|
lang, |
|
|
|
|
|
|
|
seed, |
|
|
|
|
|
|
|
pass, |
|
|
|
|
|
|
|
name, |
|
|
|
|
|
|
|
lock, |
|
|
|
|
|
|
|
vec![], |
|
|
|
|
|
|
|
&state.base, |
|
|
|
|
|
|
|
&state.secret, |
|
|
|
|
|
|
|
) |
|
|
|
.await?; |
|
|
|
.await?; |
|
|
|
state.layer.write().await.add_running(&gid, gid, id, 0)?; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let mut results = HandleResult::rpc(json!(vec![gid.to_hex()])); |
|
|
|
|
|
|
|
results.networks.push(NetworkType::AddGroup(gid)); // add AddGroup to TDN.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
debug!("Account Logined: {}.", gid.to_hex()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if let Some(addr) = some_addr { |
|
|
|
|
|
|
|
let group_lock = state.group.read().await; |
|
|
|
|
|
|
|
let sender = group_lock.sender(); |
|
|
|
|
|
|
|
let msg = group_lock.create_message(&gid, Peer::peer(addr))?; |
|
|
|
|
|
|
|
drop(group_lock); |
|
|
|
|
|
|
|
tokio::spawn(async move { |
|
|
|
|
|
|
|
tokio::time::sleep(std::time::Duration::from_secs(2)).await; |
|
|
|
|
|
|
|
let _ = sender.send(SendMessage::Group(gid, msg)).await; |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Ok(results) |
|
|
|
// TODO auto search online account info.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Ok(HandleResult::rpc(json!(vec![id_to_str(&pid)]))) |
|
|
|
}, |
|
|
|
}, |
|
|
|
); |
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
handler.add_method( |
|
|
|
handler.add_method( |
|
|
|
"account-update", |
|
|
|
"account-update", |
|
|
|
|gid: GroupId, params: Vec<RpcParam>, state: Arc<RpcState>| async move { |
|
|
|
|params: Vec<RpcParam>, state: Arc<Global>| async move { |
|
|
|
let name = params[0].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
let name = params[0].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
let avatar = params[1].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
let avatar = params[1].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
|
|
|
|
|
|
|
|
let avatar_bytes = base64::decode(avatar).unwrap_or(vec![]); |
|
|
|
let avatar_bytes = base64::decode(avatar).unwrap_or(vec![]); |
|
|
|
|
|
|
|
let pid = state.pid().await; |
|
|
|
|
|
|
|
|
|
|
|
let mut group_lock = state.group.write().await; |
|
|
|
let mut group_lock = state.group.write().await; |
|
|
|
group_lock.update_account(gid, name, avatar_bytes.clone())?; |
|
|
|
group_lock.update_account( |
|
|
|
let user = group_lock.clone_user(&gid)?; |
|
|
|
pid, |
|
|
|
|
|
|
|
name, |
|
|
|
let mut results = HandleResult::new(); |
|
|
|
avatar_bytes.clone(), |
|
|
|
group_lock.broadcast( |
|
|
|
&state.base, |
|
|
|
&gid, |
|
|
|
&state.secret, |
|
|
|
InnerEvent::UserInfo(name.to_owned(), avatar_bytes.clone()), |
|
|
|
|
|
|
|
0, |
|
|
|
|
|
|
|
0, |
|
|
|
|
|
|
|
&mut results, |
|
|
|
|
|
|
|
)?; |
|
|
|
)?; |
|
|
|
drop(group_lock); |
|
|
|
drop(group_lock); |
|
|
|
|
|
|
|
|
|
|
|
// broadcast all friends.
|
|
|
|
let results = HandleResult::new(); |
|
|
|
state.layer.read().await.broadcast(user, &mut results); |
|
|
|
|
|
|
|
|
|
|
|
// TODO broadcast to all devices.
|
|
|
|
|
|
|
|
//let user = group_lock.clone_user(&pid)?;
|
|
|
|
|
|
|
|
//group_lock.broadcast(&pid, &mut results)?;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// TODO broadcast to all layers.
|
|
|
|
|
|
|
|
//state.layer.read().await.broadcast(user, &mut results);
|
|
|
|
|
|
|
|
|
|
|
|
Ok(results) |
|
|
|
Ok(results) |
|
|
|
}, |
|
|
|
}, |
|
|
|
@ -368,81 +339,84 @@ fn new_rpc_handler( |
|
|
|
|
|
|
|
|
|
|
|
handler.add_method( |
|
|
|
handler.add_method( |
|
|
|
"account-pin-check", |
|
|
|
"account-pin-check", |
|
|
|
|_gid: GroupId, params: Vec<RpcParam>, state: Arc<RpcState>| async move { |
|
|
|
|params: Vec<RpcParam>, state: Arc<Global>| async move { |
|
|
|
let gid = GroupId::from_hex(params[0].as_str().ok_or(RpcError::ParseError)?)?; |
|
|
|
let pid = id_from_str(params[0].as_str().ok_or(RpcError::ParseError)?)?; |
|
|
|
let lock = params[1].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
let lock = params[1].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
let res = state.group.read().await.check_lock(&gid, lock); |
|
|
|
let res = state.group.read().await.check_lock(&pid, lock); |
|
|
|
Ok(HandleResult::rpc(json!([res]))) |
|
|
|
Ok(HandleResult::rpc(json!([res]))) |
|
|
|
}, |
|
|
|
}, |
|
|
|
); |
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
handler.add_method( |
|
|
|
handler.add_method( |
|
|
|
"account-pin", |
|
|
|
"account-pin-change", |
|
|
|
|gid: GroupId, params: Vec<RpcParam>, state: Arc<RpcState>| async move { |
|
|
|
|params: Vec<RpcParam>, state: Arc<Global>| async move { |
|
|
|
let old = params[0].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
let old = params[0].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
let new = params[1].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
let new = params[1].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
|
|
|
|
let pid = state.pid().await; |
|
|
|
let result = HandleResult::rpc(json!([new])); |
|
|
|
let result = HandleResult::rpc(json!([new])); |
|
|
|
state.group.write().await.pin(&gid, old, new)?; |
|
|
|
state |
|
|
|
|
|
|
|
.group |
|
|
|
|
|
|
|
.write() |
|
|
|
|
|
|
|
.await |
|
|
|
|
|
|
|
.pin(&pid, old, new, &state.base, &state.secret)?; |
|
|
|
Ok(result) |
|
|
|
Ok(result) |
|
|
|
}, |
|
|
|
}, |
|
|
|
); |
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
handler.add_method( |
|
|
|
handler.add_method( |
|
|
|
"account-mnemonic", |
|
|
|
"account-mnemonic", |
|
|
|
|gid: GroupId, params: Vec<RpcParam>, state: Arc<RpcState>| async move { |
|
|
|
|params: Vec<RpcParam>, state: Arc<Global>| async move { |
|
|
|
let lock = params[0].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
let lock = params[0].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
|
|
|
|
let pid = state.pid().await; |
|
|
|
let mnemonic = state.group.read().await.mnemonic(&gid, lock)?; |
|
|
|
let mnemonic = state |
|
|
|
|
|
|
|
.group |
|
|
|
|
|
|
|
.read() |
|
|
|
|
|
|
|
.await |
|
|
|
|
|
|
|
.mnemonic(&pid, lock, &state.secret)?; |
|
|
|
Ok(HandleResult::rpc(json!([mnemonic]))) |
|
|
|
Ok(HandleResult::rpc(json!([mnemonic]))) |
|
|
|
}, |
|
|
|
}, |
|
|
|
); |
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
handler.add_method( |
|
|
|
handler.add_method( |
|
|
|
"account-login", |
|
|
|
"account-login", |
|
|
|
|_gid: GroupId, params: Vec<RpcParam>, state: Arc<RpcState>| async move { |
|
|
|
|params: Vec<RpcParam>, state: Arc<Global>| async move { |
|
|
|
let ogid = GroupId::from_hex(params[0].as_str().ok_or(RpcError::ParseError)?)?; |
|
|
|
let pid = id_from_str(params[0].as_str().ok_or(RpcError::ParseError)?)?; |
|
|
|
let me_lock = params[1].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
let me_lock = params[1].as_str().ok_or(RpcError::ParseError)?; |
|
|
|
|
|
|
|
|
|
|
|
let mut results = HandleResult::rpc(json!([ogid.to_hex()])); |
|
|
|
let mut results = HandleResult::rpc(json!([id_to_str(&pid)])); |
|
|
|
|
|
|
|
|
|
|
|
let (id, running) = state.group.write().await.add_running(&ogid, me_lock)?; |
|
|
|
let running = state.reset(&pid, me_lock).await?; |
|
|
|
if running { |
|
|
|
if running { |
|
|
|
return Ok(results); |
|
|
|
return Ok(results); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// add AddGroup to TDN.
|
|
|
|
// TODO load all local services created by this account.
|
|
|
|
results.networks.push(NetworkType::AddGroup(ogid)); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let mut layer_lock = state.layer.write().await; |
|
|
|
|
|
|
|
layer_lock.add_running(&ogid, ogid, id, 0)?; // TODO account current state height.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// load all services layer created by this account.
|
|
|
|
|
|
|
|
// 1. group chat.
|
|
|
|
// 1. group chat.
|
|
|
|
let self_addr = layer_lock.addr.clone(); |
|
|
|
// let self_addr = layer_lock.addr.clone();
|
|
|
|
let group_lock = state.group.read().await; |
|
|
|
// let group_lock = state.group.read().await;
|
|
|
|
let group_db = group_lock.group_db(&ogid)?; |
|
|
|
// let group_db = group_lock.group_db(&ogid)?;
|
|
|
|
let s_db = group_lock.session_db(&ogid)?; |
|
|
|
// let s_db = group_lock.session_db(&ogid)?;
|
|
|
|
drop(group_lock); |
|
|
|
// drop(group_lock);
|
|
|
|
let group_chats = GroupChat::local(&group_db)?; |
|
|
|
// let group_chats = GroupChat::local(&group_db)?;
|
|
|
|
for g in group_chats { |
|
|
|
// for g in group_chats {
|
|
|
|
layer_lock.add_running(&g.g_id, ogid, g.id, g.height)?; |
|
|
|
// layer_lock.add_running(&g.g_id, ogid, g.id, g.height)?;
|
|
|
|
results.networks.push(NetworkType::AddGroup(g.g_id)); |
|
|
|
// results.networks.push(NetworkType::AddGroup(g.g_id));
|
|
|
|
|
|
|
|
|
|
|
|
// 2. online group to self group onlines.
|
|
|
|
// // 2. online group to self group onlines.
|
|
|
|
if let Some(session) = |
|
|
|
// if let Some(session) =
|
|
|
|
connect_session(&s_db, &SessionType::Group, &g.id, &self_addr)? |
|
|
|
// connect_session(&s_db, &SessionType::Group, &g.id, &self_addr)?
|
|
|
|
{ |
|
|
|
// {
|
|
|
|
layer_lock.running_mut(&ogid)?.check_add_online( |
|
|
|
// layer_lock.running_mut(&ogid)?.check_add_online(
|
|
|
|
g.g_id, |
|
|
|
// g.g_id,
|
|
|
|
Online::Direct(self_addr), |
|
|
|
// Online::Direct(self_addr),
|
|
|
|
session.id, |
|
|
|
// session.id,
|
|
|
|
g.id, |
|
|
|
// g.id,
|
|
|
|
)?; |
|
|
|
// )?;
|
|
|
|
} |
|
|
|
// }
|
|
|
|
} |
|
|
|
// }
|
|
|
|
drop(layer_lock); |
|
|
|
// drop(layer_lock);
|
|
|
|
|
|
|
|
|
|
|
|
debug!("Account Logined: {}.", ogid.to_hex()); |
|
|
|
debug!("Account Logined: {}.", id_to_str(&pid)); |
|
|
|
|
|
|
|
|
|
|
|
Ok(results) |
|
|
|
Ok(results) |
|
|
|
}, |
|
|
|
}, |
|
|
|
@ -450,209 +424,152 @@ fn new_rpc_handler( |
|
|
|
|
|
|
|
|
|
|
|
handler.add_method( |
|
|
|
handler.add_method( |
|
|
|
"account-logout", |
|
|
|
"account-logout", |
|
|
|
|_gid: GroupId, _params: Vec<RpcParam>, state: Arc<RpcState>| async move { |
|
|
|
|_params: Vec<RpcParam>, state: Arc<Global>| async move { |
|
|
|
let mut results = HandleResult::new(); |
|
|
|
let mut results = HandleResult::new(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// TODO broadcast to inner-group.
|
|
|
|
let group_lock = state.group.read().await; |
|
|
|
let group_lock = state.group.read().await; |
|
|
|
let layer_lock = state.layer.read().await; |
|
|
|
|
|
|
|
let keys = group_lock.list_running_user(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for gid in keys { |
|
|
|
|
|
|
|
for (fgid, addr) in layer_lock.running(&gid)?.onlines() { |
|
|
|
|
|
|
|
// send a event that is offline.
|
|
|
|
|
|
|
|
let data = bincode::serialize(&LayerEvent::Offline(*fgid))?; |
|
|
|
|
|
|
|
let msg = SendType::Event(0, *addr, data); |
|
|
|
|
|
|
|
results.layers.push((gid, *fgid, msg)); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
debug!("Account Offline: {}.", gid.to_hex()); |
|
|
|
|
|
|
|
// add Remove Group to TDN.
|
|
|
|
|
|
|
|
results.networks.push(NetworkType::DelGroup(gid)); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
drop(group_lock); |
|
|
|
|
|
|
|
drop(layer_lock); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let mut layer_lock = state.layer.write().await; |
|
|
|
|
|
|
|
let layers = layer_lock.remove_all_running(); |
|
|
|
|
|
|
|
drop(layer_lock); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let mut group_lock = state.group.write().await; |
|
|
|
|
|
|
|
let groups = group_lock.remove_all_running(); |
|
|
|
|
|
|
|
let sender = group_lock.sender(); |
|
|
|
|
|
|
|
drop(group_lock); |
|
|
|
|
|
|
|
tokio::spawn(sleep_waiting_close_stable(sender, groups, layers)); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Ok(results) |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
handler.add_method( |
|
|
|
|
|
|
|
"account-online", |
|
|
|
|
|
|
|
|_gid: GroupId, params: Vec<RpcParam>, state: Arc<RpcState>| async move { |
|
|
|
|
|
|
|
let gid = GroupId::from_hex(params[0].as_str().ok_or(RpcError::ParseError)?)?; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let mut results = HandleResult::new(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let group_lock = state.group.read().await; |
|
|
|
|
|
|
|
let devices = group_lock.distribute_conns(&gid); |
|
|
|
|
|
|
|
for device in devices { |
|
|
|
|
|
|
|
results.groups.push((gid, device)); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
drop(group_lock); |
|
|
|
drop(group_lock); |
|
|
|
debug!("Account Online: {}.", gid.to_hex()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Ok(results) |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
handler.add_method( |
|
|
|
|
|
|
|
"account-offline", |
|
|
|
|
|
|
|
|_gid: GroupId, params: Vec<RpcParam>, state: Arc<RpcState>| async move { |
|
|
|
|
|
|
|
let gid = GroupId::from_hex(params[0].as_str().ok_or(RpcError::ParseError)?)?; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let mut results = HandleResult::new(); |
|
|
|
// TODO broadcast to layers.
|
|
|
|
let layer_lock = state.layer.read().await; |
|
|
|
let layer_lock = state.layer.read().await; |
|
|
|
for (fgid, addr) in layer_lock.running(&gid)?.onlines() { |
|
|
|
for (gid, sessions) in layer_lock.sessions.iter() { |
|
|
|
// send a event that is offline.
|
|
|
|
for (pid, _) in sessions { |
|
|
|
let data = bincode::serialize(&LayerEvent::Offline(*fgid))?; |
|
|
|
// send a event that is offline.
|
|
|
|
let msg = SendType::Event(0, *addr, data); |
|
|
|
let data = bincode::serialize(&LayerEvent::Offline(*gid))?; |
|
|
|
results.layers.push((gid, *fgid, msg)); |
|
|
|
let msg = SendType::Event(0, *pid, data); |
|
|
|
} |
|
|
|
results.layers.push((*gid, msg)); |
|
|
|
drop(layer_lock); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let layers = state.layer.write().await.remove_running(&gid); |
|
|
|
|
|
|
|
let mut group_lock = state.group.write().await; |
|
|
|
|
|
|
|
let groups = group_lock.remove_running(&gid); |
|
|
|
|
|
|
|
let sender = group_lock.sender(); |
|
|
|
|
|
|
|
drop(group_lock); |
|
|
|
|
|
|
|
tokio::spawn(sleep_waiting_close_stable(sender, groups, layers)); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
debug!("Account Offline: {}.", gid.to_hex()); |
|
|
|
|
|
|
|
// add Remove Group to TDN.
|
|
|
|
|
|
|
|
results.networks.push(NetworkType::DelGroup(gid)); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Ok(results) |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
handler.add_method( |
|
|
|
|
|
|
|
"session-list", |
|
|
|
|
|
|
|
|gid: GroupId, _params: Vec<RpcParam>, state: Arc<RpcState>| async move { |
|
|
|
|
|
|
|
let db = state.group.read().await.session_db(&gid)?; |
|
|
|
|
|
|
|
Ok(HandleResult::rpc(session_list(Session::list(&db)?))) |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
handler.add_method( |
|
|
|
|
|
|
|
"session-connect", |
|
|
|
|
|
|
|
|gid: GroupId, params: Vec<RpcParam>, state: Arc<RpcState>| async move { |
|
|
|
|
|
|
|
let id = params[0].as_i64().ok_or(RpcError::ParseError)?; |
|
|
|
|
|
|
|
let remote = GroupId::from_hex(params[1].as_str().ok_or(RpcError::ParseError)?)?; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let group_lock = state.group.read().await; |
|
|
|
|
|
|
|
let db = group_lock.session_db(&gid)?; |
|
|
|
|
|
|
|
Session::readed(&db, &id)?; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let mut layer_lock = state.layer.write().await; |
|
|
|
|
|
|
|
let online = layer_lock.running_mut(&gid)?.active(&remote, true); |
|
|
|
|
|
|
|
drop(layer_lock); |
|
|
|
|
|
|
|
if let Some(addr) = online { |
|
|
|
|
|
|
|
return Ok(HandleResult::rpc(json!([id, addr.to_hex()]))); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let s = Session::get(&db, &id)?; |
|
|
|
|
|
|
|
drop(db); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let mut results = HandleResult::new(); |
|
|
|
|
|
|
|
match s.s_type { |
|
|
|
|
|
|
|
SessionType::Chat => { |
|
|
|
|
|
|
|
let proof = group_lock.prove_addr(&gid, &s.addr)?; |
|
|
|
|
|
|
|
results |
|
|
|
|
|
|
|
.layers |
|
|
|
|
|
|
|
.push((gid, s.gid, chat_conn(proof, Peer::peer(s.addr)))); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
SessionType::Group => { |
|
|
|
|
|
|
|
let proof = group_lock.prove_addr(&gid, &s.addr)?; |
|
|
|
|
|
|
|
add_layer( |
|
|
|
|
|
|
|
&mut results, |
|
|
|
|
|
|
|
gid, |
|
|
|
|
|
|
|
group_conn(proof, Peer::peer(s.addr), s.gid), |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
_ => {} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
Ok(results) |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
handler.add_method( |
|
|
|
|
|
|
|
"session-suspend", |
|
|
|
|
|
|
|
|gid: GroupId, params: Vec<RpcParam>, state: Arc<RpcState>| async move { |
|
|
|
|
|
|
|
let id = params[0].as_i64().ok_or(RpcError::ParseError)?; |
|
|
|
|
|
|
|
let remote = GroupId::from_hex(params[1].as_str().ok_or(RpcError::ParseError)?)?; |
|
|
|
|
|
|
|
let must = params[2].as_bool().ok_or(RpcError::ParseError)?; // if need must suspend.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let db = state.group.read().await.session_db(&gid)?; |
|
|
|
|
|
|
|
let s = Session::get(&db, &id)?; |
|
|
|
|
|
|
|
drop(db); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let msg = match s.s_type { |
|
|
|
|
|
|
|
SessionType::Chat | SessionType::Group => { |
|
|
|
|
|
|
|
let event = LayerEvent::Suspend(s.gid); |
|
|
|
|
|
|
|
let data = bincode::serialize(&event)?; |
|
|
|
|
|
|
|
SendType::Event(0, s.addr, data) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
_ => { |
|
|
|
|
|
|
|
return Ok(HandleResult::new()); // others has no online.
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let mut layer_lock = state.layer.write().await; |
|
|
|
|
|
|
|
let suspend = layer_lock.running_mut(&gid)?.suspend(&remote, true, must)?; |
|
|
|
|
|
|
|
drop(layer_lock); |
|
|
|
drop(layer_lock); |
|
|
|
|
|
|
|
|
|
|
|
let mut results = HandleResult::new(); |
|
|
|
debug!("Account Offline: {}.", id_to_str(&state.pid().await)); |
|
|
|
if suspend { |
|
|
|
|
|
|
|
results.rpcs.push(json!([id])) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
match s.s_type { |
|
|
|
//let sender = state.sender.read().await.clone();
|
|
|
|
SessionType::Chat => { |
|
|
|
state.clear().await; |
|
|
|
results.layers.push((gid, s.gid, msg)); |
|
|
|
//tokio::spawn(sleep_waiting_close_stable(sender, groups, layers));
|
|
|
|
} |
|
|
|
|
|
|
|
SessionType::Group => { |
|
|
|
|
|
|
|
add_layer(&mut results, gid, msg); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
_ => {} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Ok(results) |
|
|
|
Ok(results) |
|
|
|
}, |
|
|
|
}, |
|
|
|
); |
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
handler.add_method( |
|
|
|
// handler.add_method(
|
|
|
|
"session-readed", |
|
|
|
// "session-list",
|
|
|
|
|gid: GroupId, params: Vec<RpcParam>, state: Arc<RpcState>| async move { |
|
|
|
// |gid: GroupId, _params: Vec<RpcParam>, state: Arc<Global>| async move {
|
|
|
|
let id = params[0].as_i64().ok_or(RpcError::ParseError)?; |
|
|
|
// let db = state.group.read().await.session_db(&gid)?;
|
|
|
|
let db = state.group.read().await.session_db(&gid)?; |
|
|
|
// Ok(HandleResult::rpc(session_list(Session::list(&db)?)))
|
|
|
|
Session::readed(&db, &id)?; |
|
|
|
// },
|
|
|
|
Ok(HandleResult::new()) |
|
|
|
// );
|
|
|
|
}, |
|
|
|
|
|
|
|
); |
|
|
|
// handler.add_method(
|
|
|
|
|
|
|
|
// "session-connect",
|
|
|
|
handler.add_method( |
|
|
|
// |gid: GroupId, params: Vec<RpcParam>, state: Arc<Global>| async move {
|
|
|
|
"session-update", |
|
|
|
// let id = params[0].as_i64().ok_or(RpcError::ParseError)?;
|
|
|
|
|gid: GroupId, params: Vec<RpcParam>, state: Arc<RpcState>| async move { |
|
|
|
// let remote = GroupId::from_hex(params[1].as_str().ok_or(RpcError::ParseError)?)?;
|
|
|
|
let id = params[0].as_i64().ok_or(RpcError::ParseError)?; |
|
|
|
|
|
|
|
let is_top = params[1].as_bool().ok_or(RpcError::ParseError)?; |
|
|
|
// let group_lock = state.group.read().await;
|
|
|
|
let is_close = params[2].as_bool().ok_or(RpcError::ParseError)?; |
|
|
|
// let db = group_lock.session_db(&gid)?;
|
|
|
|
|
|
|
|
// Session::readed(&db, &id)?;
|
|
|
|
let db = state.group.read().await.session_db(&gid)?; |
|
|
|
|
|
|
|
Session::update(&db, &id, is_top, is_close)?; |
|
|
|
// let mut layer_lock = state.layer.write().await;
|
|
|
|
Ok(HandleResult::new()) |
|
|
|
// let online = layer_lock.running_mut(&gid)?.active(&remote, true);
|
|
|
|
}, |
|
|
|
// drop(layer_lock);
|
|
|
|
); |
|
|
|
// if let Some(addr) = online {
|
|
|
|
|
|
|
|
// return Ok(HandleResult::rpc(json!([id, addr.to_hex()])));
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// let s = Session::get(&db, &id)?;
|
|
|
|
|
|
|
|
// drop(db);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// let mut results = HandleResult::new();
|
|
|
|
|
|
|
|
// match s.s_type {
|
|
|
|
|
|
|
|
// SessionType::Chat => {
|
|
|
|
|
|
|
|
// let proof = group_lock.prove_addr(&gid, &s.addr)?;
|
|
|
|
|
|
|
|
// results
|
|
|
|
|
|
|
|
// .layers
|
|
|
|
|
|
|
|
// .push((gid, s.gid, chat_conn(proof, Peer::peer(s.addr))));
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// SessionType::Group => {
|
|
|
|
|
|
|
|
// let proof = group_lock.prove_addr(&gid, &s.addr)?;
|
|
|
|
|
|
|
|
// add_layer(
|
|
|
|
|
|
|
|
// &mut results,
|
|
|
|
|
|
|
|
// gid,
|
|
|
|
|
|
|
|
// group_conn(proof, Peer::peer(s.addr), s.gid),
|
|
|
|
|
|
|
|
// );
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// _ => {}
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// Ok(results)
|
|
|
|
|
|
|
|
// },
|
|
|
|
|
|
|
|
// );
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// handler.add_method(
|
|
|
|
|
|
|
|
// "session-suspend",
|
|
|
|
|
|
|
|
// |gid: GroupId, params: Vec<RpcParam>, state: Arc<Global>| async move {
|
|
|
|
|
|
|
|
// let id = params[0].as_i64().ok_or(RpcError::ParseError)?;
|
|
|
|
|
|
|
|
// let remote = GroupId::from_hex(params[1].as_str().ok_or(RpcError::ParseError)?)?;
|
|
|
|
|
|
|
|
// let must = params[2].as_bool().ok_or(RpcError::ParseError)?; // if need must suspend.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// let db = state.group.read().await.session_db(&gid)?;
|
|
|
|
|
|
|
|
// let s = Session::get(&db, &id)?;
|
|
|
|
|
|
|
|
// drop(db);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// let msg = match s.s_type {
|
|
|
|
|
|
|
|
// SessionType::Chat | SessionType::Group => {
|
|
|
|
|
|
|
|
// let event = LayerEvent::Suspend(s.gid);
|
|
|
|
|
|
|
|
// let data = bincode::serialize(&event)?;
|
|
|
|
|
|
|
|
// SendType::Event(0, s.addr, data)
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// _ => {
|
|
|
|
|
|
|
|
// return Ok(HandleResult::new()); // others has no online.
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// };
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// let mut layer_lock = state.layer.write().await;
|
|
|
|
|
|
|
|
// let suspend = layer_lock.running_mut(&gid)?.suspend(&remote, true, must)?;
|
|
|
|
|
|
|
|
// drop(layer_lock);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// let mut results = HandleResult::new();
|
|
|
|
|
|
|
|
// if suspend {
|
|
|
|
|
|
|
|
// results.rpcs.push(json!([id]))
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// match s.s_type {
|
|
|
|
|
|
|
|
// SessionType::Chat => {
|
|
|
|
|
|
|
|
// results.layers.push((gid, s.gid, msg));
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// SessionType::Group => {
|
|
|
|
|
|
|
|
// add_layer(&mut results, gid, msg);
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// _ => {}
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Ok(results)
|
|
|
|
|
|
|
|
// },
|
|
|
|
|
|
|
|
// );
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// handler.add_method(
|
|
|
|
|
|
|
|
// "session-readed",
|
|
|
|
|
|
|
|
// |gid: GroupId, params: Vec<RpcParam>, state: Arc<Global>| async move {
|
|
|
|
|
|
|
|
// let id = params[0].as_i64().ok_or(RpcError::ParseError)?;
|
|
|
|
|
|
|
|
// let db = state.group.read().await.session_db(&gid)?;
|
|
|
|
|
|
|
|
// Session::readed(&db, &id)?;
|
|
|
|
|
|
|
|
// Ok(HandleResult::new())
|
|
|
|
|
|
|
|
// },
|
|
|
|
|
|
|
|
// );
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// handler.add_method(
|
|
|
|
|
|
|
|
// "session-update",
|
|
|
|
|
|
|
|
// |gid: GroupId, params: Vec<RpcParam>, state: Arc<Global>| async move {
|
|
|
|
|
|
|
|
// let id = params[0].as_i64().ok_or(RpcError::ParseError)?;
|
|
|
|
|
|
|
|
// let is_top = params[1].as_bool().ok_or(RpcError::ParseError)?;
|
|
|
|
|
|
|
|
// let is_close = params[2].as_bool().ok_or(RpcError::ParseError)?;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// let db = state.group.read().await.session_db(&gid)?;
|
|
|
|
|
|
|
|
// Session::update(&db, &id, is_top, is_close)?;
|
|
|
|
|
|
|
|
// Ok(HandleResult::new())
|
|
|
|
|
|
|
|
// },
|
|
|
|
|
|
|
|
// );
|
|
|
|
|
|
|
|
|
|
|
|
handler |
|
|
|
handler |
|
|
|
} |
|
|
|
} |
|
|
|
|
Sun
4 years ago