Merge branch 'main' into cancellation

Cargo.toml

@@ -27,7 +27,7 @@ serde_json = "1.0"
 tempdir = "0.3"
 thiserror = "1"
 tokio = { version = "1", features = ["rt-multi-thread", "process"] }
-tokio-stream = "0.1"
+tokio-stream = "0.1.15"
 tokio-util = { version = "0.7", features = ["codec", "time"] }
 
 [profile.dev]

storage/src/lib.rs

@@ -431,7 +431,7 @@ mod test {
                 break;
             }
 
-            match read(storage.reader(), 1048).unwrap() {
+            match Packet::read(storage.reader(), 1048).unwrap() {
                 Packet::Publish(p) => publishes.push(p),
                 packet => unreachable!("{:?}", packet),
             }

uplink/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "uplink"
-version = "2.12.0"
+version = "2.12.1"
 authors = ["tekjar <[email protected]>"]
 edition = "2021"
 
@@ -32,7 +32,7 @@ storage = { path = "../storage" }
 log = { workspace = true }
 regex = "1.7.1"
 tracing = { version="0.1", features=["log"] }
-tracing-subscriber = { version="=0.3.14", features=["env-filter"] }
+tracing-subscriber = { version="0.3.18", features=["env-filter"] }
 
 # built-in collectors
 # tunshell

uplink/src/base/mqtt/mod.rs

@@ -12,8 +12,8 @@ use std::path::Path;
 
 use crate::{Action, Config};
 use rumqttc::{
-    read, AsyncClient, ConnectionError, Event, EventLoop, Incoming, MqttOptions, Packet, Publish,
-    QoS, Request, TlsConfiguration, Transport,
+    AsyncClient, ConnectionError, Event, EventLoop, Incoming, MqttOptions, Packet, Publish, QoS,
+    Request, TlsConfiguration, Transport,
 };
 use std::sync::Arc;
 
@@ -138,7 +138,7 @@ impl Mqtt {
         let max_packet_size = self.config.mqtt.max_packet_size;
         loop {
             // NOTE: This can fail when packet sizes > max_payload_size in config are written to disk.
-            match read(&mut buf, max_packet_size) {
+            match Packet::read(&mut buf, max_packet_size) {
                 Ok(Packet::Publish(publish)) => {
                     self.eventloop.pending.push_back(Request::Publish(publish))
                 }