bump dropshot and friends (#109)

Signed-off-by: Jess Frazelle <[email protected]>

Author: jessfraz

Cargo.lock

@@ -30,12 +30,14 @@ clap = { version = "4.5.18", features = ["cargo", "derive", "env", "unicode"] }
 console-subscriber = { version = "0", optional = true }
 dashmap = "6.1.0"
 delouse = { version = "0.1", optional = true }
-dropshot = "0.11"
+dropshot = "0.12"
 futures = "0.3.28"
 futures-util = "0.3.30"
+http = "1"
+hyper = "1"
 libmdns = "0.9.1"
-multer = { version = "3.1.0", features = ["json"] }
 moonraker = { path = "moonraker", optional = true }
+multer = { version = "3.1.0", features = ["json"] }
 opentelemetry = "0.24.0"
 opentelemetry-otlp = "0.17.0"
 opentelemetry_sdk = { version = "0.24.1", features = ["rt-tokio"] }
@@ -50,15 +52,13 @@ slog-json = "2.6.1"
 slog-term = "2.9.1"
 thiserror = "1.0.64"
 tokio = { version = "1", features = ["rt-multi-thread", "macros", "time", "net"] }
+tokio-serial = { version = "5", optional = true, features = ["tokio-util", "libudev"] }
 toml = "0.8.19"
 tracing = "0.1"
 tracing-opentelemetry = "0.25.0"
+tracing-slog = "0.3.0"
 tracing-subscriber = { version = "0.3.18", features = ["registry", "std", "fmt", "smallvec", "ansi", "tracing-log", "json", "env-filter"] }
 uuid = "1.10.0"
-tokio-serial = { version = "5", optional = true, features = ["tokio-util", "libudev"] }
-tracing-slog = "0.3.0"
-http = "0.2.9"
-hyper = "0.14"
 
 [dev-dependencies]
 async-trait = "0.1"

Cargo.toml

@@ -1,6 +1,7 @@
-use crate::{Control as ControlTrait, MachineInfo, MachineMakeModel, MachineType, Volume};
 use anyhow::Result;
 
+use crate::{Control as ControlTrait, MachineInfo, MachineMakeModel, MachineType, Volume};
+
 /// AnyMachine is any supported machine.
 #[non_exhaustive]
 pub enum AnyMachine {

src/any_machine.rs

@@ -1,10 +1,11 @@
+use anyhow::Result;
+use bambulabs::{client::Client, command::Command};
+
 use super::{PrinterInfo, X1Carbon};
 use crate::{
     Control as ControlTrait, MachineInfo as MachineInfoTrait, MachineMakeModel, MachineType,
     SuspendControl as SuspendControlTrait, ThreeMfControl as ThreeMfControlTrait, ThreeMfTemporaryFile, Volume,
 };
-use anyhow::Result;
-use bambulabs::{client::Client, command::Command};
 
 impl X1Carbon {
     /// Return a borrow of the underlying Client.

src/bambu/control.rs

@@ -1,14 +1,16 @@
-use super::{PrinterInfo, X1Carbon};
-use crate::{slicer, Discover as DiscoverTrait, Machine, MachineMakeModel};
-use anyhow::Result;
-use serde::{Deserialize, Serialize};
 use std::{
     collections::HashMap,
     net::{IpAddr, Ipv4Addr},
     sync::Arc,
 };
+
+use anyhow::Result;
+use serde::{Deserialize, Serialize};
 use tokio::{net::UdpSocket, sync::RwLock};
 
+use super::{PrinterInfo, X1Carbon};
+use crate::{slicer, Discover as DiscoverTrait, Machine, MachineMakeModel};
+
 /// Specific make/model of Bambu device.
 #[derive(Copy, Clone, Debug, Deserialize, Serialize)]
 #[non_exhaustive]

src/bambu/discover.rs

@@ -3,11 +3,12 @@
 mod control;
 mod discover;
 
+use std::{net::IpAddr, sync::Arc};
+
+use bambulabs::client::Client;
 pub use discover::{BambuVariant, Config, X1CarbonDiscover};
 
 use crate::MachineMakeModel;
-use bambulabs::client::Client;
-use std::{net::IpAddr, sync::Arc};
 
 /// Control channel handle to a Bambu Labs X1 Carbon.
 #[derive(Clone)]

src/bambu/mod.rs

@@ -1,9 +1,11 @@
-use super::{Cli, Config};
+use std::{collections::HashMap, net::SocketAddr, sync::Arc};
+
 use anyhow::Result;
 use machine_api::server;
-use std::{collections::HashMap, net::SocketAddr, sync::Arc};
 use tokio::sync::RwLock;
 
+use super::{Cli, Config};
+
 pub async fn main(_cli: &Cli, cfg: &Config, bind: &str) -> Result<()> {
     let machines = Arc::new(RwLock::new(HashMap::new()));
 

src/bin/machine-api/cmd_serve.rs

@@ -1,9 +1,11 @@
-use super::{Config, MachineConfig};
+use std::{collections::HashMap, sync::Arc};
+
 use anyhow::Result;
 use machine_api::{bambu, Discover, Machine};
-use std::{collections::HashMap, sync::Arc};
 use tokio::sync::RwLock;
 
+use super::{Config, MachineConfig};
+
 impl Config {
     pub async fn spawn_discover_bambu(&self, machines: Arc<RwLock<HashMap<String, RwLock<Machine>>>>) -> Result<()> {
         let discovery = bambu::X1CarbonDiscover::new(

src/bin/machine-api/config/bambu.rs

@@ -1,6 +1,7 @@
+use std::collections::HashMap;
+
 use machine_api::{bambu as crate_bambu, moonraker as crate_moonraker, usb as crate_usb};
 use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
 
 mod bambu;
 mod moonraker;

src/bin/machine-api/config/mod.rs

@@ -1,9 +1,11 @@
-use super::{Config, MachineConfig};
+use std::{collections::HashMap, sync::Arc};
+
 use anyhow::Result;
 use machine_api::{moonraker, Machine, MachineMakeModel};
-use std::{collections::HashMap, sync::Arc};
 use tokio::sync::RwLock;
 
+use super::{Config, MachineConfig};
+
 impl Config {
     pub async fn create_moonraker(&self, machines: Arc<RwLock<HashMap<String, RwLock<Machine>>>>) -> Result<()> {
         for (key, config) in self