feat(net4mqtt): rename netmqtt to net4mqtt

binbat · Sep 28, 2024 · 7033f7b · 7033f7b
1 parent 6480a3e
commit 7033f7b
Show file tree

Hide file tree

Showing 17 changed files with 15 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,6 +14,7 @@ members = [
     "libs/http-log",
     "libs/libwish",
     "libs/signal",
+    "libs/net4mqtt",
     "tools/whepfrom",
     "tools/whipinto",
     "liveion",

diff --git a/libs/netmqtt/Cargo.toml → libs/net4mqtt/Cargo.toml b/libs/netmqtt/Cargo.toml → libs/net4mqtt/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "netmqtt"
+name = "net4mqtt"
 description = "net (TCP/UDP) over mqtt tool"
 version.workspace = true
 edition.workspace = true

diff --git a/libs/netmqtt/README.md → libs/net4mqtt/README.md b/libs/netmqtt/README.md → libs/net4mqtt/README.md
diff --git a/libs/netmqtt/bin/main.rs → libs/net4mqtt/bin/main.rs b/libs/netmqtt/bin/main.rs → libs/net4mqtt/bin/main.rs
@@ -3,7 +3,7 @@ use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 use clap::{ArgAction, Parser, Subcommand};
 use tracing::{debug, info, trace, Level};
 
-use netmqtt::proxy;
+use net4mqtt::proxy;
 
 #[derive(Parser, Debug)]
 #[command(version, about, long_about = None)]

diff --git a/libs/netmqtt/src/broker.rs → libs/net4mqtt/src/broker.rs b/libs/netmqtt/src/broker.rs → libs/net4mqtt/src/broker.rs
diff --git a/libs/netmqtt/src/kxdns.rs → libs/net4mqtt/src/kxdns.rs b/libs/netmqtt/src/kxdns.rs → libs/net4mqtt/src/kxdns.rs
diff --git a/libs/netmqtt/src/lib.rs → libs/net4mqtt/src/lib.rs b/libs/netmqtt/src/lib.rs → libs/net4mqtt/src/lib.rs
diff --git a/libs/netmqtt/src/proxy.rs → libs/net4mqtt/src/proxy.rs b/libs/netmqtt/src/proxy.rs → libs/net4mqtt/src/proxy.rs
diff --git a/libs/netmqtt/src/socks.rs → libs/net4mqtt/src/socks.rs b/libs/netmqtt/src/socks.rs → libs/net4mqtt/src/socks.rs
diff --git a/libs/netmqtt/src/tests.rs → libs/net4mqtt/src/tests.rs b/libs/netmqtt/src/tests.rs → libs/net4mqtt/src/tests.rs
diff --git a/libs/netmqtt/src/topic.rs → libs/net4mqtt/src/topic.rs b/libs/netmqtt/src/topic.rs → libs/net4mqtt/src/topic.rs
diff --git a/libs/netmqtt/src/utils.rs → libs/net4mqtt/src/utils.rs b/libs/netmqtt/src/utils.rs → libs/net4mqtt/src/utils.rs
diff --git a/liveion/Cargo.toml b/liveion/Cargo.toml
@@ -17,7 +17,7 @@ libwish = { path = "../libs/libwish" }
 signal = { path = "../libs/signal" }
 utils = { path = "../libs/utils" }
 
-netmqtt = { path = "../libs/netmqtt", optional = true }
+net4mqtt = { path = "../libs/net4mqtt", optional = true }
 
 anyhow = { workspace = true, features = ["backtrace"] }
 clap = { workspace = true, features = ["derive"] }
@@ -51,4 +51,4 @@ reqwest = { version = "0.12", optional = true, features = [
 [features]
 default = ["net4mqtt"]
 webhook = ["dep:reqwest"]
-net4mqtt = ["dep:netmqtt"]
+net4mqtt = ["dep:net4mqtt"]
diff --git a/liveion/src/lib.rs b/liveion/src/lib.rs
@@ -95,7 +95,7 @@ where
                 tokio::runtime::Runtime::new()
                     .unwrap()
                     .block_on(async move {
-                        netmqtt::proxy::agent(
+                        net4mqtt::proxy::agent(
                             &c.mqtt_url,
                             cfg.http.listen,
                             &c.alias.clone(),

diff --git a/liveman/Cargo.toml b/liveman/Cargo.toml
@@ -8,7 +8,7 @@ repository.workspace = true
 
 [dependencies]
 liveion = { path = "../liveion", optional = true }
-netmqtt = { path = "../libs/netmqtt", optional = true }
+net4mqtt = { path = "../libs/net4mqtt", optional = true }
 
 api = { path = "../libs/api" }
 auth = { path = "../libs/auth" }
@@ -42,5 +42,5 @@ url = "2.5"
 [features]
 default = ["net4mqtt"]
 liveion = ["dep:liveion"]
-net4mqtt = ["dep:netmqtt"]
+net4mqtt = ["dep:net4mqtt"]
 
diff --git a/liveman/src/main.rs b/liveman/src/main.rs
@@ -144,7 +144,7 @@ where
                 tokio::runtime::Runtime::new()
                     .unwrap()
                     .block_on(async move {
-                        netmqtt::proxy::local_socks(
+                        net4mqtt::proxy::local_socks(
                             &c.mqtt_url,
                             c.listen,
                             "-",
@@ -161,7 +161,7 @@ where
 
         std::thread::spawn(move || {
             let suffix = "net4mqtt.local";
-            let dns = netmqtt::kxdns::Kxdns::new(suffix);
+            let dns = net4mqtt::kxdns::Kxdns::new(suffix);
             tokio::runtime::Runtime::new()
                 .unwrap()
                 .block_on(async move {