Preferred instances (#15)

README.md

@@ -33,6 +33,7 @@ bottlenecks and rate-limiting.
 
 - [x] Support for hidden networks (tor, i2p, etc).
 - [x] Redirect behaviour can be configured. (for example - you can exclude cloudflare)
+- [x] User-preferred instances.
 - [x] POST redirects.
 - [x] Regex redirects via `/{url}` routes.
 - [x] Anonymous and cached redirects via `/@cached/#{path}` routes.

fastside-shared/src/config.rs

@@ -90,6 +90,8 @@ pub struct UserConfig {
     pub select_method: SelectMethod,
     #[serde(default)]
     pub ignore_fallback_warning: bool,
+    #[serde(default)]
+    pub preferred_instances: Vec<String>,
 }
 
 impl UserConfig {

fastside-shared/src/serde_types.rs

@@ -333,6 +333,29 @@ impl StoredData {
             }
         }
 
+        // Check if all URLs have host
+        {
+            for service in &self.services {
+                if let Some(fallback) = &service.fallback {
+                    if fallback.host_str().is_none() {
+                        results.add_warning(format!(
+                            "Service {} has fallback URL without host",
+                            service.name
+                        ));
+                    }
+                }
+
+                for instance in &service.instances {
+                    if instance.url.host_str().is_none() {
+                        results.add_warning(format!(
+                            "Service {} has instance URL without host",
+                            service.name
+                        ));
+                    }
+                }
+            }
+        }
+
         results
     }
 }

fastside/src/routes/redirect.rs

@@ -59,6 +59,7 @@ async fn cached_redirect(
         crawled_service,
         &user_config.required_tags,
         &user_config.forbidden_tags,
+        &user_config.preferred_instances,
     )
     .ok_or(RedirectError::from(SearchError::NoInstancesFound))?;
     if user_config.select_method == SelectMethod::LowPing {

fastside/src/search.rs

@@ -174,6 +174,7 @@ pub fn get_redirect_instances<'a>(
     crawled_service: &'a CrawledService,
     required_tags: &[String],
     forbidden_tags: &[String],
+    preferred_instances: &[String],
 ) -> Option<Vec<&'a CrawledInstance>> {
     let alive_instances = crawled_service.get_alive_instances();
     let instances = alive_instances
@@ -183,6 +184,25 @@ pub fn get_redirect_instances<'a>(
     if instances.is_empty() {
         return None;
     }
+    let instances = if preferred_instances.is_empty() {
+        instances
+    } else {
+        // Filter out instances that are not in the preferred list.
+        let filtered_preferred_instances: Vec<_> = instances
+            .iter()
+            .filter(|i| {
+                let host = i.url.host_str().unwrap_or("");
+                preferred_instances.iter().any(|p| host == p)
+            })
+            .cloned()
+            .collect();
+        // If there are no preferred instances, return all instances.
+        if filtered_preferred_instances.is_empty() {
+            instances
+        } else {
+            filtered_preferred_instances
+        }
+    };
     Some(instances)
 }
 
@@ -197,6 +217,7 @@ pub fn get_redirect_instance(
         crawled_service,
         &user_config.required_tags,
         &user_config.forbidden_tags,
+        &user_config.preferred_instances,
     );
     match &instances {
         None => match &service.fallback {

fastside/templates/configure.html

@@ -31,6 +31,13 @@ <h3>Ignore fallback warning</h3>
   <input type="checkbox" id="ignore-fallback-warning" value="true">
 </div>
 
+<div>
+  <h3>Preferred instances</h3>
+  <input type="text" id="preferred-instance-input" placeholder="Add preferred instance">
+  <button onclick="addPreferred()">Add</button>
+  <ul id="preferred-instances-list"></ul>
+</div>
+
 <div>
   <h3>Generated config</h3>
   <textarea id="generated-json" readonly cols="80" rows="10"></textarea>
@@ -44,6 +51,7 @@ <h3>Generated config</h3>
     required: [],
     forbidden: []
   };
+  let preferred = [];
   let ignoreFallbackWarning = false;
 
   document.addEventListener('DOMContentLoaded', () => {
@@ -57,9 +65,11 @@ <h3>Generated config</h3>
       tags.required = decodedConfig.required_tags || [];
       tags.forbidden = decodedConfig.forbidden_tags || [];
       const selectorMethod = decodedConfig.select_method || 'Random';
+      preferred = decodedConfig.preferred_instances || [];
 
       renderTags('required');
       renderTags('forbidden');
+      renderPreferred();
       if (selectorMethod) {
         document.querySelector('input[name="selector-method"]:checked').checked = false;
         document.querySelector(`input[name="selector-method"][value="${selectorMethod}"]`).checked = true;
@@ -101,13 +111,45 @@ <h3>Generated config</h3>
     });
   }
 
+  function addPreferred() {
+    const input = document.getElementById('preferred-instance-input');
+    const instance = input.value.trim();
+    if (instance && !preferred.includes(instance)) {
+      preferred.push(instance);
+      input.value = '';
+      renderPreferred();
+      generateJSON();
+    }
+  }
+
+  function removePreferred(index) {
+    preferred.splice(index, 1);
+    renderPreferred();
+    generateJSON();
+  }
+
+  function renderPreferred() {
+    const list = document.getElementById('preferred-instances-list');
+    list.innerHTML = '';
+    preferred.forEach((instance, index) => {
+      const li = document.createElement('li');
+      li.textContent = instance;
+      const removeButton = document.createElement('button');
+      removeButton.textContent = 'Remove';
+      removeButton.onclick = () => removePreferred(index);
+      li.appendChild(removeButton);
+      list.appendChild(li);
+    });
+  }
+
   function generateJSON() {
     const selectorMethod = document.querySelector('input[name="selector-method"]:checked')?.value || '';
     const json = JSON.stringify({
       required_tags: tags.required,
       forbidden_tags: tags.forbidden,
       select_method: selectorMethod,
-      ignore_fallback_warning: document.getElementById('ignore-fallback-warning').checked
+      ignore_fallback_warning: document.getElementById('ignore-fallback-warning').checked,
+      preferred_instances: preferred
     });
     const encoded = btoa(json);
     document.getElementById('generated-json').value = `/configure/save?${encoded}`;