feat (backend-rs): impl bb8::ManageConnection for RedisConnectionManager

62597aa45a/redis/src/lib.rs

Co-authored-by: Kyle Huey <khuey@kylehuey.com>

COPYING

@@ -30,6 +30,10 @@ Chiptune2.js by Simon Gündling
 License: MIT
 https://github.com/deskjet/chiptune2.js#license
 
+bb8-redis by Kyle Huey
+License: MIT
+https://github.com/djc/bb8/blob/62597aa45ac1746780b08cb6a68cf7d65452a23a/LICENSE
+
 Licenses for all softwares and software libraries installed via the Node Package Manager ("npm") can be found by running the following shell command in the root directory of this repository:
 
 pnpm licenses list

Cargo.lock

@@ -211,7 +211,9 @@ name = "backend-rs"
 version = "0.0.0"
 dependencies = [
  "argon2",
+ "async-trait",
  "basen",
+ "bb8",
  "bcrypt",
  "chrono",
  "cuid2",
@@ -298,6 +300,19 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1dbe4bb73fd931c4d1aaf53b35d1286c8a948ad00ec92c8e3c856f15fd027f43"
 
+[[package]]
+name = "bb8"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df7c2093d15d6a1d33b1f972e1c5ea3177748742b97a5f392aa83a65262c6780"
+dependencies = [
+ "async-trait",
+ "futures-channel",
+ "futures-util",
+ "parking_lot",
+ "tokio",
+]
+
 [[package]]
 name = "bcrypt"
 version = "0.15.1"
@@ -2631,8 +2646,6 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "ryu",
- "sha1_smol",
- "socket2",
  "tokio",
  "tokio-util",
  "url",
@@ -3111,12 +3124,6 @@ dependencies = [
  "digest",
 ]
 
-[[package]]
-name = "sha1_smol"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
-
 [[package]]
 name = "sha2"
 version = "0.10.8"

Cargo.toml

@@ -10,7 +10,9 @@ napi-derive = "2.16.4"
 napi-build = "2.1.3"
 
 argon2 = "0.5.3"
+async-trait = "0.1.80"
 basen = "0.1.0"
+bb8 = "0.8.3"
 bcrypt = "0.15.1"
 chrono = "0.4.38"
 convert_case = "0.6.0"
@@ -26,7 +28,7 @@ pretty_assertions = "1.4.0"
 proc-macro2 = "1.0.82"
 quote = "1.0.36"
 rand = "0.8.5"
-redis = "0.25.3"
+redis = { version = "0.25.3", default-features = false }
 regex = "1.10.4"
 rmp-serde = "1.3.0"
 sea-orm = "0.12.15"

packages/backend-rs/Cargo.toml

@@ -19,7 +19,9 @@ napi = { workspace = true, optional = true, default-features = false, features =
 napi-derive = { workspace = true, optional = true }
 
 argon2 = { workspace = true, features = ["std"] }
+async-trait = { workspace = true }
 basen = { workspace = true }
+bb8 = { workspace = true }
 bcrypt = { workspace = true }
 chrono = { workspace = true }
 cuid2 = { workspace = true }
@@ -31,7 +33,7 @@ nom-exif = { workspace = true }
 once_cell = { workspace = true }
 openssl = { workspace = true, features = ["vendored"] }
 rand = { workspace = true }
-redis = { workspace = true, features = ["tokio-comp"] }
+redis = { workspace = true, default-features = false, features = ["streams", "tokio-comp"] }
 regex = { workspace = true }
 rmp-serde = { workspace = true }
 sea-orm = { workspace = true, features = ["sqlx-postgres", "runtime-tokio-rustls"] }

packages/backend-rs/src/database/redis.rs

@@ -1,6 +1,45 @@
 use crate::config::CONFIG;
+use async_trait::async_trait;
 use once_cell::sync::OnceCell;
-use redis::{aio::MultiplexedConnection, Client, RedisError};
+use redis::{aio::MultiplexedConnection, Client, ErrorKind, IntoConnectionInfo, RedisError};
+
+/// A `bb8::ManageConnection` for `redis::Client::get_async_connection`.
+#[derive(Clone, Debug)]
+pub struct RedisConnectionManager {
+    client: Client,
+}
+
+impl RedisConnectionManager {
+    /// Create a new `RedisConnectionManager`.
+    /// See `redis::Client::open` for a description of the parameter types.
+    pub fn new<T: IntoConnectionInfo>(info: T) -> Result<Self, RedisError> {
+        Ok(Self {
+            client: Client::open(info.into_connection_info()?)?,
+        })
+    }
+}
+
+#[async_trait]
+impl bb8::ManageConnection for RedisConnectionManager {
+    type Connection = MultiplexedConnection;
+    type Error = RedisError;
+
+    async fn connect(&self) -> Result<Self::Connection, Self::Error> {
+        self.client.get_multiplexed_async_connection().await
+    }
+
+    async fn is_valid(&self, conn: &mut Self::Connection) -> Result<(), Self::Error> {
+        let pong: String = redis::cmd("PING").query_async(conn).await?;
+        match pong.as_str() {
+            "PONG" => Ok(()),
+            _ => Err((ErrorKind::ResponseError, "ping request").into()),
+        }
+    }
+
+    fn has_broken(&self, _: &mut Self::Connection) -> bool {
+        false
+    }
+}
 
 static REDIS_CLIENT: OnceCell<Client> = OnceCell::new();