Merge pull request #111 from rneswold/pull-request

prep for v0.4.0

Cargo.toml

@@ -6,6 +6,7 @@ members = [
     "drmemd"
 ]
 default-members = ["drmemd"]
+resolver = "2"
 
 [workspace.dependencies]
 async-trait = { version = "0.1", default-features = false }
@@ -19,7 +20,7 @@ tokio = { version = "1", default-features = false }
 tokio-stream = { version = "0.1", default-features = false }
 tracing = { version = "0.1", features = ["std"] }
 tracing-futures = { version = "0.2", default-features = false }
-tracing-subscriber = { version = "0.2", default-features = false }
+tracing-subscriber = { version = "0.3", default-features = false }
 
 serde = { version = "1.0", default-features = false }
 serde_json = { version = "1.0", default-features = false }

backends/drmem-db-redis/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "drmem-db-redis"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Rich Neswold <[email protected]>"]
 edition = "2021"
 description = "Redis backend for DrMem control system"
@@ -35,8 +35,8 @@ serde_derive.workspace = true
 
 palette.workspace = true
 
-redis.version = "0.22"
+redis.version = "0.25"
 redis.default-features = false
 redis.features = ["tokio-comp", "streams"]
 
-drmem-api = { path = "../../drmem-api", version = "0.3" }
+drmem-api = { path = "../../drmem-api", version = "0.4" }

backends/drmem-db-redis/src/lib.rs

@@ -21,7 +21,6 @@ use tracing::{debug, error, info, info_span, warn};
 use tracing_futures::Instrument;
 
 type AioMplexConnection = aio::MultiplexedConnection;
-type AioConnection = aio::Connection;
 type SettingTable = HashMap<device::Name, TxDeviceSetting>;
 
 pub mod config;
@@ -260,8 +259,9 @@ fn id_to_ts(id: &str) -> Result<time::SystemTime> {
 
 type ReadFuture = Pin<
     Box<
-        dyn Future<Output = (AioConnection, redis::RedisResult<redis::Value>)>
-            + Send,
+        dyn Future<
+                Output = (AioMplexConnection, redis::RedisResult<redis::Value>),
+            > + Send,
     >,
 >;
 
@@ -305,7 +305,11 @@ impl ReadingStream {
     // returns it with the result.) This is necessary because an
     // AioConnection isn't clonable.
 
-    fn mk_fut(mut con: AioConnection, key: String, id: String) -> ReadFuture {
+    fn mk_fut(
+        mut con: AioMplexConnection,
+        key: String,
+        id: String,
+    ) -> ReadFuture {
         Box::pin(async move {
             let result =
                 Self::read_next_cmd(&key, &id).query_async(&mut con).await;
@@ -315,7 +319,7 @@ impl ReadingStream {
     }
 
     pub fn new(
-        con: AioConnection,
+        con: AioMplexConnection,
         key: &str,
         id: Option<time::SystemTime>,
     ) -> Self {
@@ -456,15 +460,18 @@ impl RedisStore {
         cfg: &config::Config,
         name: Option<String>,
         pword: Option<String>,
-    ) -> Result<AioConnection> {
+    ) -> Result<AioMplexConnection> {
         let client = Self::make_client(cfg, name.as_ref(), pword.as_ref())?;
 
         debug!("creating new redis connection");
 
-        client.get_tokio_connection().await.map_err(|e| {
-            error!("redis error: {}", &e);
-            xlat_err(e)
-        })
+        client
+            .get_multiplexed_tokio_connection()
+            .await
+            .map_err(|e| {
+                error!("redis error: {}", &e);
+                xlat_err(e)
+            })
     }
 
     // Creates a mulitplexed connection to redis.

backends/drmem-db-simple/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "drmem-db-simple"
 authors = ["Rich Neswold <[email protected]>"]
-version = "0.3.1"
+version = "0.4.0"
 edition = "2021"
 description = "Simple backend for DrMem control system"
 homepage = "https://github.com/DrMemCS/drmem"
@@ -31,7 +31,7 @@ tracing.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 
-drmem-api = { path = "../../drmem-api", version = "0.3" }
+drmem-api = { path = "../../drmem-api", version = "0.4" }
 
 [dev-dependencies]
 tokio-stream = { workspace = true, features = ["sync", "time"] }

drivers/drmem-drv-ntp/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "drmem-drv-ntp"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Rich Neswold <[email protected]>"]
 edition = "2021"
 homepage = "https://github.com/DrMemCS/drmem"
@@ -21,4 +21,4 @@ tracing.workspace = true
 tracing-futures.workspace = true
 tracing-subscriber.workspace = true
 
-drmem-api = { path = "../../drmem-api", version = "0.3" }
+drmem-api = { path = "../../drmem-api", version = "0.4" }

drivers/drmem-drv-sump/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "drmem-drv-sump"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Rich Neswold <[email protected]>"]
 edition = "2021"
 homepage = "https://github.com/DrMemCS/drmem"
@@ -23,4 +23,4 @@ tracing.workspace = true
 tracing-futures.workspace = true
 tracing-subscriber.workspace = true
 
-drmem-api = { path = "../../drmem-api", version = "0.3" }
+drmem-api = { path = "../../drmem-api", version = "0.4" }

drivers/drmem-drv-tplink/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "drmem-drv-tplink"
-version = "0.1.2"
+version = "0.2.0"
 authors = ["Rich Neswold <[email protected]>"]
 edition = "2021"
 homepage = "https://github.com/DrMemCS/drmem"
@@ -25,4 +25,4 @@ serde = { workspace = true, features = ["derive"] }
 serde_derive.workspace = true
 serde_json = { workspace = true, features = ["std"] }
 
-drmem-api = { path = "../../drmem-api", version = "0.3.1" }
+drmem-api = { path = "../../drmem-api", version = "0.4" }

drivers/drmem-drv-weather-wu/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "drmem-drv-weather-wu"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Rich Neswold <[email protected]>"]
 edition = "2021"
 homepage = "https://github.com/DrMemCS/drmem"
@@ -24,4 +24,4 @@ tracing-subscriber.workspace = true
 reqwest = { default-features = false, version = "0.11" }
 weather-underground = "0.1"
 
-drmem-api = { path = "../../drmem-api", version = "0.3" }
+drmem-api = { path = "../../drmem-api", version = "0.4" }

drmem-api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "drmem-api"
-version = "0.3.1"
+version = "0.4.0"
 authors = ["Rich Neswold <[email protected]>"]
 edition = "2021"
 description = "Traits and types used internally by the DrMem control system"

drmemd/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "drmemd"
-version = "0.3.1"
+version = "0.4.0"
 authors = ["Rich Neswold <[email protected]>"]
 edition = "2021"
 description = "Main process of the DrMem control system"
@@ -33,15 +33,15 @@ tracing-subscriber = { workspace = true, features = ["ansi"] }
 serde.workspace = true
 serde_derive.workspace = true
 
-clap = { version = "~4.4", features = ["cargo"] }
+clap = { version = "4", features = ["cargo"] }
 
 chrono = { workspace = true, features = ["clock"] }
 
 palette.workspace = true
 
 lazy_static = "1"
 
-drmem-api = { path = "../drmem-api", version = "0.3" }
+drmem-api = { path = "../drmem-api", version = "0.4" }
 
 cfgrammar = "0.13"
 lrlex = "0.13"
@@ -53,58 +53,59 @@ lrpar = "0.13"
 
 [dependencies.drmem-drv-ntp]
 path = "../drivers/drmem-drv-ntp"
-version = "0.3"
+version = "0.4"
 optional = true
 
 [dependencies.drmem-drv-sump]
 path = "../drivers/drmem-drv-sump"
-version = "0.3"
+version = "0.4"
 optional = true
 
 [dependencies.drmem-drv-tplink]
 path = "../drivers/drmem-drv-tplink"
-version = "0.1"
+version = "0.2"
 optional = true
 
 [dependencies.drmem-drv-weather-wu]
 path = "../drivers/drmem-drv-weather-wu"
-version = "0.3"
+version = "0.4"
 optional = true
 
 # This section defines the optional dependencies for backend storage.
 
 [dependencies.drmem-db-redis]
 path = "../backends/drmem-db-redis"
-version = "0.3"
+version = "0.4"
 optional = true
 
 [dependencies.drmem-db-simple]
 path = "../backends/drmem-db-simple"
-version = "0.3.1"
+version = "0.4"
 optional = true
 
 # This section defines the optional dependencies for the 'graphql'
 # feature.
 
 [dependencies.juniper]
-version = "0.15"
+version = "0.16"
+features = ["chrono"]
 optional = true
 
 [dependencies.juniper_warp]
-version = "0.7"
+version = "0.8"
 features = ["subscriptions"]
 optional = true
 
 [dependencies.juniper_graphql_ws]
-version = "0.3"
+version = "0.4"
 optional = true
 
 [dependencies.warp]
 version = "0.3"
 optional = true
 
 [dependencies.libmdns]
-version = "0.7"
+version = "0.8"
 optional = true
 
 # These are features that can be enabled for drmem.

drmemd/src/driver/mod.rs

@@ -262,6 +262,7 @@ impl DriverDb {
     /// found, it extracts the information needed for the GraphQL
     /// query and returns it.
 
+    #[cfg(feature = "graphql")]
     pub fn find(
         &self,
         key: &str,
@@ -273,6 +274,7 @@ impl DriverDb {
     /// Similar to `.find()`, but returns all the drivers'
     /// information.
 
+    #[cfg(feature = "graphql")]
     pub fn get_all(
         &self,
     ) -> impl Iterator<Item = (driver::Name, &'static str, &'static str)> + '_