move client into main crate

Cargo.toml

@@ -9,7 +9,6 @@ version = "0.0.7"
 edition = "2021"
 
 [dependencies]
-gateway-client = { version = "0.1.0", path = "gateway-client" }
 hftwo = "0.1.2"
 uftwo = "0.1.0"
 anyhow = "1.0.81"
@@ -20,15 +19,13 @@ reqwest = { version = "0.12.4", features = ["json"] }
 serde_json = "1.0.117"
 serde = { version = "1.0.202", features = ["derive"] }
 colored = "2.1.0"
+tokio-modbus = "0.14.0"
 
 # The profile that 'cargo dist' will build with
 [profile.dist]
 inherits = "release"
 lto = "thin"
 
-[workspace]
-members = ["gateway-client"]
-
 # Config for 'cargo dist'
 [workspace.metadata.dist]
 # The preferred cargo-dist version to use in CI (Cargo.toml SemVer syntax)

gateway-client/src/lib.rs → src/gateway/client.rs

@@ -1,3 +1,5 @@
+#![allow(unused)]
+
 use std::{
     fmt::Display,
     net::{IpAddr, Ipv4Addr, SocketAddr},

src/gateway/config.rs

@@ -1,6 +1,6 @@
+use super::client::{Client, DeviceIdentifier};
 use clap::{error, Parser, Subcommand};
 use colored::Colorize;
-use gateway_client::{Client, DeviceIdentifier};
 use std::net::Ipv4Addr;
 
 use crate::write_with_header;

src/gateway/mod.rs

@@ -1,3 +1,4 @@
+mod client;
 mod config;
 mod manifest;
 mod reset;

src/gateway/reset.rs

@@ -8,7 +8,7 @@ pub async fn command(
     mut output: impl std::io::Write,
     ip: IpAddr,
 ) -> anyhow::Result<()> {
-    let mut client = gateway_client::Client::connect(ip).await?;
+    let mut client = super::client::Client::connect(ip).await?;
 
     write_with_header(&mut output, "Resetting".green(), " ");
     let _ = timeout(Duration::from_secs(1), client.reset()).await;

src/gateway/restart.rs

@@ -8,7 +8,7 @@ pub async fn command(
     mut output: impl std::io::Write,
     ip: IpAddr,
 ) -> anyhow::Result<()> {
-    let mut client = gateway_client::Client::connect(ip).await?;
+    let mut client = super::client::Client::connect(ip).await?;
 
     write_with_header(&mut output, "Restarting".green(), " ");
     let _ = timeout(Duration::from_secs(1), client.restart()).await;

src/gateway/status.rs

@@ -6,7 +6,7 @@ pub async fn command(
     mut output: impl std::io::Write,
     ip: IpAddr,
 ) -> anyhow::Result<()> {
-    let mut client = gateway_client::Client::connect(ip).await?;
+    let mut client = super::client::Client::connect(ip).await?;
 
     let start = Instant::now();