wip

explorer-api/src/service_providers/http.rs

@@ -1,35 +1,88 @@
-use crate::service_providers::models::{DirectoryService, HarbourMasterService, PagedResult};
+use crate::service_providers::models::{
+    DirectoryService, DirectorySpDetailed, HarbourMasterService, PagedResult,
+};
 use okapi::openapi3::OpenApi;
-use reqwest::Error as ReqwestError;
+use reqwest::{Client, Error as ReqwestError};
 use rocket::{serde::json::Json, Route};
 use rocket_okapi::settings::OpenApiSettings;
 
-static SERVICE_PROVIDER_WELLKNOWN_URL: &str =
+const SERVICE_PROVIDER_WELLKNOWN_URL: &str =
     "https://nymtech.net/.wellknown/connect/service-providers.json";
 
-static HARBOUR_MASTER_URL: &str = "https://harbourmaster.nymtech.net/v1/services/?size=100";
+const HARBOUR_MASTER_URL: &str = "https://harbourmaster.nymtech.net/v1/services/?size=100";
+const HM_SINCE_MIN: u32 = 1000000;
+const HM_SIZE: u8 = 100;
+
+#[derive(Debug)]
+pub enum GetSpError {
+    ReqwestError(ReqwestError),
+    Error(String),
+}
+
+impl From<ReqwestError> for GetSpError {
+    fn from(error: ReqwestError) -> Self {
+        GetSpError::ReqwestError(error)
+    }
+}
+
+impl From<&str> for GetSpError {
+    fn from(error: &str) -> Self {
+        GetSpError::Error(String::from(error))
+    }
+}
 
 pub fn service_providers_make_default_routes(settings: &OpenApiSettings) -> (Vec<Route>, OpenApi) {
     openapi_get_routes_spec![settings: get_service_providers]
 }
 
-pub async fn get_services() -> Result<Vec<DirectoryService>, ReqwestError> {
-    let services_res = reqwest::get(SERVICE_PROVIDER_WELLKNOWN_URL)
+pub async fn get_services() -> Result<Vec<DirectorySpDetailed>, GetSpError> {
+    let reqw = Client::new();
+
+    let services_res = reqw
+        .get(SERVICE_PROVIDER_WELLKNOWN_URL)
+        .send()
         .await?
         .json::<Vec<DirectoryService>>()
-        .await;
+        .await?;
 
-    let active_services_res = reqwest::get(HARBOUR_MASTER_URL)
+    let directory_sp = services_res
+        .iter()
+        .find(|item| item.id == "all")
+        .ok_or("NymConnect network requesters data not found in response")?;
+
+    let hm_services = reqw
+        .get(format!(
+            "{HARBOUR_MASTER_URL}?since_min={HM_SINCE_MIN}&size={HM_SIZE}"
+        ))
+        .send()
         .await?
         .json::<PagedResult<HarbourMasterService>>()
         .await?;
 
-    return services_res;
+    let sp_list = directory_sp.items.iter().fold(vec![], |mut acc, dir_sp| {
+        let directory_sp = hm_services
+            .items
+            .iter()
+            .find(|item| item.service_provider_client_id == dir_sp.address);
+        if let Some(sp) = directory_sp {
+            acc.push(DirectorySpDetailed {
+                id: sp.service_provider_client_id.clone(),
+                description: dir_sp.description.clone(),
+                address: dir_sp.address.clone(),
+                gateway: dir_sp.gateway.clone(),
+                routing_score: sp.routing_score,
+                service_type: "something".into(),
+            });
+        }
+        acc
+    });
+
+    Ok(sp_list)
 }
 
 #[openapi(tag = "service_providers")]
 #[get("/")]
-pub(crate) async fn get_service_providers() -> Json<Vec<DirectoryService>> {
+pub(crate) async fn get_service_providers() -> Json<Vec<DirectorySpDetailed>> {
     let result = get_services().await.unwrap();
     Json(result)
 }

explorer-api/src/service_providers/models.rs

@@ -8,7 +8,8 @@ pub struct DirectoryServiceProvider {
     pub gateway: String,
 }
 
-pub struct DirectoryServiceProviderDetailed {
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
+pub struct DirectorySpDetailed {
     pub id: String,
     pub description: String,
     pub address: String,