fix(soprano): update instances and fix actualizer JSON schema (#34)

Author: cofob

fastside-actualizer/src/services/mod.rs

@@ -12,6 +12,7 @@ mod scribe;
 mod searx;
 mod searxng;
 mod simplytranslate;
+mod soprano;
 mod tent;
 mod translite;
 
@@ -25,6 +26,7 @@ pub fn get_service_updater(name: &str) -> Option<Box<dyn ServiceUpdater>> {
         "searx" => Some(Box::new(searx::SearxUpdater::new())),
         "searxng" => Some(Box::new(searxng::SearxngUpdater::new())),
         "simplytranslate" => Some(Box::new(simplytranslate::SimplyTranslateUpdater::new())),
+        "soprano" => Some(Box::new(soprano::SopranoUpdater::new())),
         "invidious" => Some(Box::new(invidious::InvidiousUpdater::new())),
         "scribe" => Some(Box::new(scribe::ScribeUpdater::new())),
         "libreddit" => Some(Box::new(libreddit::LibredditUpdater::new())),

fastside-actualizer/src/services/soprano.rs

@@ -0,0 +1,136 @@
+use crate::{types::ServiceUpdater, ChangesSummary};
+use anyhow::anyhow;
+use async_trait::async_trait;
+use fastside_shared::serde_types::Instance;
+use serde::Deserialize;
+use url::Url;
+
+pub struct SopranoUpdater {
+    pub instances_urls: [String; 2],
+}
+
+impl SopranoUpdater {
+    pub fn new() -> Self {
+        Self {
+            instances_urls: [
+                "https://git.vern.cc/cobra/Soprano/raw/branch/main/instances.json".to_string(),
+                "https://codeberg.org/cobra/Soprano/raw/branch/main/instances.json".to_string(),
+            ],
+        }
+    }
+}
+
+impl Default for SopranoUpdater {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+#[derive(Debug, Deserialize)]
+struct SopranoInstance {
+    #[serde(default)]
+    clearnet: String,
+    #[serde(default)]
+    tor: String,
+    #[serde(default)]
+    i2p: String,
+}
+
+impl SopranoInstance {
+    fn into_urls(self) -> Vec<Url> {
+        [self.clearnet, self.tor, self.i2p]
+            .into_iter()
+            .filter(|s| !s.is_empty())
+            .filter_map(|s| Url::parse(&s).ok())
+            .collect()
+    }
+}
+
+#[async_trait]
+impl ServiceUpdater for SopranoUpdater {
+    async fn update(
+        &self,
+        client: reqwest::Client,
+        current_instances: &[Instance],
+        changes_summary: ChangesSummary,
+    ) -> anyhow::Result<Vec<Instance>> {
+        let mut parsed = None;
+        let mut last_error = None;
+
+        for instances_url in &self.instances_urls {
+            let response = match client.get(instances_url).send().await {
+                Ok(response) => response,
+                Err(error) => {
+                    last_error = Some(anyhow!("failed to fetch {}: {}", instances_url, error));
+                    continue;
+                }
+            };
+
+            if !response.status().is_success() {
+                last_error = Some(anyhow!(
+                    "failed to fetch {}: HTTP {}",
+                    instances_url,
+                    response.status()
+                ));
+                continue;
+            }
+
+            let response_text = match response.text().await {
+                Ok(response_text) => response_text,
+                Err(error) => {
+                    last_error = Some(anyhow!(
+                        "failed to read response body from {}: {}",
+                        instances_url,
+                        error
+                    ));
+                    continue;
+                }
+            };
+
+            match serde_json::from_str::<Vec<SopranoInstance>>(&response_text) {
+                Ok(instances) => {
+                    parsed = Some(instances);
+                    break;
+                }
+                Err(error) => {
+                    last_error = Some(anyhow!(
+                        "failed to parse JSON from {}: {}",
+                        instances_url,
+                        error
+                    ));
+                }
+            }
+        }
+
+        let parsed = parsed.ok_or_else(|| {
+            last_error
+                .unwrap_or_else(|| anyhow!("failed to load soprano instances from all sources"))
+        })?;
+
+        let mut instances = current_instances.to_vec();
+        let mut new_instances = Vec::new();
+
+        for soprano_instance in parsed {
+            for url in soprano_instance.into_urls() {
+                if current_instances.iter().any(|instance| instance.url == url) {
+                    continue;
+                }
+                new_instances.push(Instance::from(url));
+            }
+        }
+
+        changes_summary
+            .set_new_instances_added(
+                "soprano",
+                new_instances
+                    .iter()
+                    .map(|instance| instance.url.clone())
+                    .collect(),
+            )
+            .await;
+
+        instances.extend(new_instances);
+
+        Ok(instances)
+    }
+}

services.json

@@ -7008,9 +7008,66 @@
       "search_string": null,
       "regexes": [],
       "aliases": [],
-      "source_link": null,
-      "deprecated_message": "No instances.",
-      "instances": []
+      "source_link": "https://codeberg.org/cobra/Soprano",
+      "deprecated_message": null,
+      "instances": [
+        {
+          "url": "https://sp.vern.cc/",
+          "tags": [
+            "clearnet",
+            "https"
+          ]
+        },
+        {
+          "url": "http://sp.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion/",
+          "tags": [
+            "http",
+            "tor"
+          ]
+        },
+        {
+          "url": "http://vernusqvmcnvmbewuec5d3vvnh3xpejcn74pkkjhj2qzfvgpogkq.b32.i2p/",
+          "tags": [
+            "http",
+            "i2p"
+          ]
+        },
+        {
+          "url": "https://soprano.catsarch.com/",
+          "tags": [
+            "clearnet",
+            "https"
+          ]
+        },
+        {
+          "url": "http://soprano.catsarchywsyuss6jdxlypsw5dc7owd5u5tr6bujxb7o6xw2hipqehyd.onion/",
+          "tags": [
+            "http",
+            "tor"
+          ]
+        },
+        {
+          "url": "http://eidq3irhlc235szbka6nn3odru3aovrxplhf4tggbz7ffam2jjiq.b32.i2p/",
+          "tags": [
+            "http",
+            "i2p"
+          ]
+        },
+        {
+          "url": "https://tenor.fsky.io/",
+          "tags": [
+            "clearnet",
+            "https"
+          ]
+        },
+        {
+          "url": "http://tenorxfrvzsgjde6k3f64jen7fqr5mouk7qr7c3tptab5b5ohnwpniyd.onion/",
+          "tags": [
+            "http",
+            "tor"
+          ]
+        }
+      ]
     },
     {
       "type": "suds",
@@ -7596,4 +7653,4 @@
       "instances": []
     }
   ]
-}
+}