Remove kitsune-search-server (#359)

* Remove kitsune-search-server

* fix deprecated warning

Cargo.toml

@@ -30,8 +30,6 @@ members = [
     "kitsune",
     "kitsune-cli",
     "kitsune-job-runner",
-    "kitsune-search-server",
-    "kitsune-search-server/proto",
     "lib/athena",
     "lib/post-process",
     "lib/speedy-uuid",

README.md

@@ -35,7 +35,6 @@ So, as long as this disclaimer is here, make sure to double check all the change
 - `kitsune-cli/`: Kitsune CLI binary
 - `kitsune-fe/`: Kitsune frontend project
 - `kitsune-job-runner/`: Kitsune dedicated job runner
-- `kitsune-search-server/`: Search server for Kitsune
 - `lib/`: Libraries made for Kitsune but with no dependencies on Kitsune-specific code. Easily usable by other projects
 - `proto/`: Any Protobuf definitions for the Kitsune project
 - `public/`: Public web assets

crates/kitsune-core/Cargo.toml

@@ -77,7 +77,6 @@ zxcvbn = { version = "2.2.2", default-features = false }
 
 [features]
 default = []
-kitsune-search = ["kitsune-search/kitsune-search"]
 mastodon-api = []
 meilisearch = ["kitsune-search/meilisearch"]
 

crates/kitsune-core/src/config.rs

@@ -110,13 +110,6 @@ pub enum MessagingConfiguration {
     InProcess,
 }
 
-#[derive(Clone, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct KitsuneSearchConfiguration {
-    pub index_server: SmolStr,
-    pub search_servers: Vec<SmolStr>,
-}
-
 #[derive(Clone, Deserialize, Serialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct MeiliSearchConfiguration {
@@ -127,7 +120,6 @@ pub struct MeiliSearchConfiguration {
 #[derive(Clone, Deserialize, Serialize)]
 #[serde(rename_all = "kebab-case", tag = "type")]
 pub enum SearchConfiguration {
-    Kitsune(KitsuneSearchConfiguration),
     Meilisearch(MeiliSearchConfiguration),
     Sql,
     None,

crates/kitsune-core/src/lib.rs

@@ -69,9 +69,6 @@ use std::{
     time::Duration,
 };
 
-#[cfg(feature = "kitsune-search")]
-use kitsune_search::GrpcSearchService;
-
 #[cfg(feature = "meilisearch")]
 use kitsune_search::MeiliSearchService;
 
@@ -188,20 +185,6 @@ async fn prepare_search(
     db_pool: &PgPool,
 ) -> eyre::Result<SearchService> {
     let service = match search_config {
-        SearchConfiguration::Kitsune(_config) => {
-            #[cfg(not(feature = "kitsune-search"))]
-            panic!("Server compiled without Kitsune Search compatibility");
-
-            #[cfg(feature = "kitsune-search")]
-            #[allow(clippy::used_underscore_binding)]
-            GrpcSearchService::connect(
-                &_config.index_server,
-                _config.search_servers.iter().map(ToString::to_string),
-            )
-            .await
-            .context("Failed to connect to the search servers")?
-            .into()
-        }
         SearchConfiguration::Meilisearch(_config) => {
             #[cfg(not(feature = "meilisearch"))]
             panic!("Server compiled without Meilisearch compatibility");

crates/kitsune-http-signatures/Cargo.toml

@@ -8,7 +8,7 @@ base64-simd = "0.8.0"
 derive_builder = "0.12.0"
 http = "0.2.9"
 rayon = "1.8.0"
-ring = { version = "0.16.20", features = ["std"] }
+ring = { version = "0.17.0", features = ["std"] }
 time = { version = "0.3.29", features = ["formatting", "parsing"] }
 thiserror = "1.0.49"
 tokio = { version = "1.32.0", features = ["sync"] }

crates/kitsune-http-signatures/src/lib.rs

@@ -98,9 +98,10 @@ impl SigningKey for Ed25519KeyPair {
 
 impl SigningKey for RsaKeyPair {
     fn sign(&self, msg: &[u8]) -> Vec<u8> {
-        let mut signature = vec![0; self.public_modulus_len()];
+        let mut signature = vec![0; self.public().modulus_len()];
         self.sign(&RSA_PKCS1_SHA256, &SystemRandom::new(), msg, &mut signature)
             .unwrap();
+
         signature
     }
 }

crates/kitsune-search/Cargo.toml

@@ -18,15 +18,9 @@ strum = { version = "0.25.0", features = ["derive"] }
 thiserror = "1.0.49"
 tracing = "0.1.37"
 
-# "kitsune-search" feature
-bytes = { version = "1.5.0", optional = true }
-kitsune-search-proto = { path = "../../kitsune-search-server/proto", optional = true }
-tonic = { version = "0.10.2", optional = true }
-
 # "meilisearch" feature
 meilisearch-sdk = { version = "0.24.2", optional = true }
 
 [features]
 default = []
-kitsune-search = ["dep:bytes", "dep:kitsune-search-proto", "dep:tonic"]
 meilisearch = ["dep:meilisearch-sdk"]

crates/kitsune-search/src/error.rs

@@ -11,14 +11,6 @@ pub enum Error {
     #[cfg(feature = "meilisearch")]
     #[error(transparent)]
     Meilisearch(#[from] meilisearch_sdk::errors::Error),
-
-    #[cfg(feature = "kitsune-search")]
-    #[error(transparent)]
-    TonicStatus(#[from] tonic::Status),
-
-    #[cfg(feature = "kitsune-search")]
-    #[error(transparent)]
-    TonicTransport(#[from] tonic::transport::Error),
 }
 
 impl<E> From<kitsune_db::PoolError<E>> for Error

crates/kitsune-search/src/lib.rs

@@ -13,15 +13,11 @@ use speedy_uuid::Uuid;
 use strum::EnumIter;
 
 mod error;
-#[cfg(feature = "kitsune-search")]
-mod grpc;
 #[cfg(feature = "meilisearch")]
 mod meilisearch;
 mod sql;
 
 pub use self::error::Error;
-#[cfg(feature = "kitsune-search")]
-pub use self::grpc::SearchService as GrpcSearchService;
 #[cfg(feature = "meilisearch")]
 pub use self::meilisearch::MeiliSearchService;
 pub use self::sql::SearchService as SqlSearchService;
@@ -31,8 +27,6 @@ type Result<T, E = Error> = std::result::Result<T, E>;
 #[derive(Clone)]
 #[enum_dispatch(SearchBackend)]
 pub enum SearchService {
-    #[cfg(feature = "kitsune-search")]
-    Grpc(GrpcSearchService),
     #[cfg(feature = "meilisearch")]
     Meilisearch(MeiliSearchService),
     Noop(NoopSearchService),

docker-compose.yml

@@ -16,8 +16,6 @@ services:
       JOB_WORKERS: 1
       REDIS_URL: redis://redis:6379
       RUST_LOG: debug
-      SEARCH_INDEX_SERVER: http://backend-search:8080
-      SEARCH_SERVERS: http://backend-search:8080
     volumes:
       - upload-data:/app/uploads
       - type: bind
@@ -28,20 +26,6 @@ services:
       - db
       - redis
 
-  backend-search:
-    image: kitsune-search
-    networks:
-      - backend
-    environment:
-      INDEX_DIR_PATH: search-index
-      LEVENSHTEIN_DISTANCE: 2
-      MEMORY_ARENA_SIZE: 3MB
-      PORT: 8080
-      READ_ONLY: false
-      RUST_LOG: debug
-    volumes:
-      - search-index:/app/search-index
-
   db:
     image: postgres:15-alpine
     environment:

flake.nix

@@ -96,11 +96,6 @@
               cargoBuildFlags = "-p kitsune";
             });
 
-            search = rustPlatform.buildRustPackage (basePackage // {
-              pname = "kitsune-search";
-              cargoBuildFlags = "-p kitsune-search";
-            });
-
             frontend = pkgs.mkYarnPackage {
               inherit version;