diff --git a/src/apps/domain/layer.rs b/src/apps/domain/layer.rs index 0088067..865f441 100644 --- a/src/apps/domain/layer.rs +++ b/src/apps/domain/layer.rs @@ -1,21 +1,18 @@ -use std::path::PathBuf; use std::sync::Arc; use tdn::types::{ group::GroupId, - message::{RecvType, SendType}, - primitive::{HandleResult, PeerAddr, Result}, + message::RecvType, + primitive::{HandleResult, Result}, }; use tokio::sync::RwLock; -use domain_types::{LayerPeerEvent, LayerServerEvent, ServerEvent}; -use tdn_did::Proof; -use tdn_storage::local::DStorage; +use domain_types::{LayerServerEvent, ServerEvent}; -use crate::layer::{Layer, Online}; +use crate::layer::Layer; use crate::storage::domain_db; use super::models::{Name, Provider}; -use super::{add_layer, rpc}; +use super::rpc; pub(crate) async fn handle( layer: &Arc>, @@ -40,11 +37,6 @@ pub(crate) async fn handle( match event { ServerEvent::Status(name, support_request) => { - println!( - "------ DEBUG DOMAIN SERVICE IS {}, request: {}", - name, support_request - ); - let mut provider = Provider::get_by_addr(&db, &addr)?; provider.ok(&db, name, support_request)?; results.rpcs.push(rpc::add_provider(ogid, &provider)); @@ -64,13 +56,12 @@ pub(crate) async fn handle( } } ServerEvent::Info(uname, ugid, uaddr, ubio, uavatar) => { - println!("------ Search: {} --", uname); results.rpcs.push(rpc::search_result( ogid, &uname, &ugid, &uaddr, &ubio, &uavatar, )); } - ServerEvent::None(_name) => { - // TODO UI: show search result. + ServerEvent::None(uname) => { + results.rpcs.push(rpc::search_none(ogid, &uname)); } ServerEvent::Response(_ugid, _uname, _is_ok) => {} } diff --git a/src/apps/domain/rpc.rs b/src/apps/domain/rpc.rs index be8b243..c4c21ee 100644 --- a/src/apps/domain/rpc.rs +++ b/src/apps/domain/rpc.rs @@ -55,6 +55,11 @@ pub(crate) fn search_result( ) } +#[inline] +pub(crate) fn search_none(mgid: GroupId, name: &str) -> RpcParam { + rpc_response(0, "domain-search", json!([name]), mgid) +} + pub(crate) fn new_rpc_handler(handler: &mut RpcHandler) { handler.add_method( "domain-list",