fix: Cleanup by sending a command and kill when dropped (#1945)

* fix: Cleanup by sending a command and kill when dropped

* chore: Fix the loadModule run command

* fix: cleans up failed health

* refactor long-running

* chore: Fixes?"

* refactor

* run iso ci on pr

* fix debuild

* fix tests

* switch to libc kill

* kill process by parent

* fix graceful shutdown

* recurse submodules

* fix compat build

* feat: Add back in the timeout

* chore: add the missing types for the unnstable

* inherited logs

Co-authored-by: J M <Blu-J@users.noreply.github.com>

* fix deleted code

Co-authored-by: Aiden McClelland <me@drbonez.dev>
Co-authored-by: J M <Blu-J@users.noreply.github.com>

backend/src/net/cert_resolver.rs

@@ -105,7 +105,6 @@ impl ResolvesServerCert for EmbassyCertResolver {
 
         match hostname_raw {
             Some(hostname_str) => {
-
                 let full_fqdn = match ResourceFqdn::from_str(hostname_str) {
                     Ok(fqdn) => fqdn,
                     Err(_) => {

backend/src/net/mod.rs

@@ -7,22 +7,20 @@ use indexmap::IndexSet;
 use rpc_toolkit::command;
 
 use self::interface::InterfaceId;
-
 use crate::net::interface::LanPortConfig;
-
 use crate::util::serde::Port;
 use crate::Error;
 
+pub mod cert_resolver;
 pub mod dns;
+pub mod embassy_service_http_server;
 pub mod interface;
 #[cfg(feature = "avahi")]
 pub mod mdns;
-pub mod embassy_service_http_server;
 pub mod net_controller;
 pub mod net_utils;
 pub mod proxy_controller;
 pub mod ssl;
-pub mod cert_resolver;
 pub mod static_server;
 pub mod tor;
 pub mod vhost_controller;

backend/src/net/net_controller.rs

@@ -11,7 +11,7 @@ use torut::onion::{OnionAddressV3, TorSecretKeyV3};
 use tracing::instrument;
 
 use crate::context::RpcContext;
-use crate::hostname::{get_current_ip, get_embassyd_tor_addr, get_hostname, HostNameReceipt};
+use crate::hostname::{get_embassyd_tor_addr, get_hostname, HostNameReceipt};
 use crate::net::dns::DnsController;
 use crate::net::interface::{Interface, TorConfig};
 #[cfg(feature = "avahi")]
@@ -115,7 +115,7 @@ impl NetController {
 
     async fn setup_embassy_http_ui_handle(rpc_ctx: RpcContext) -> Result<(), Error> {
         let host_name = rpc_ctx.net_controller.proxy.get_hostname().await;
-        
+
         let embassy_tor_addr = get_embassyd_tor_addr(rpc_ctx.clone()).await?;
         let embassy_tor_fqdn: ResourceFqdn = embassy_tor_addr.parse()?;
         let host_name_fqdn: ResourceFqdn = host_name.parse()?;

backend/src/net/proxy_controller.rs

@@ -15,7 +15,7 @@ use tokio::net::TcpStream;
 use tokio::sync::Mutex;
 use tracing::{error, info, instrument};
 
-use crate::net::net_utils::{host_addr_fqdn, ResourceFqdn};
+use crate::net::net_utils::ResourceFqdn;
 use crate::net::ssl::SslManager;
 use crate::net::vhost_controller::VHOSTController;
 use crate::net::{HttpClient, HttpHandler, InterfaceMetadata, PackageNetInfo};

backend/src/net/static_server.rs

@@ -8,7 +8,6 @@ use digest::Digest;
 use futures::FutureExt;
 use http::response::Builder;
 use hyper::{Body, Method, Request, Response, StatusCode};
-
 use rpc_toolkit::rpc_handler;
 use tokio::fs::File;
 use tokio_util::codec::{BytesCodec, FramedRead};

backend/src/net/tor.rs

@@ -377,8 +377,7 @@ pub async fn tor_health_check(client: &Client, tor_controller: &TorController) {
         .await;
     if let Err(e) = result {
         let mut num_attempt = 1;
-        tracing::error!(
-            "Unable to reach self over tor, we will retry now...");
+        tracing::error!("Unable to reach self over tor, we will retry now...");
         tracing::error!("The first TOR error: {}", e);
 
         loop {

backend/src/net/vhost_controller.rs

@@ -3,12 +3,12 @@ use std::net::SocketAddr;
 use std::sync::Arc;
 
 use tokio_rustls::rustls::ServerConfig;
-use crate::net::cert_resolver::EmbassyCertResolver;
-use crate::net::embassy_service_http_server::{EmbassyServiceHTTPServer};
 
+use crate::net::cert_resolver::EmbassyCertResolver;
+use crate::net::embassy_service_http_server::EmbassyServiceHTTPServer;
+use crate::net::net_utils::ResourceFqdn;
 use crate::net::HttpHandler;
 use crate::Error;
-use crate::net::net_utils::ResourceFqdn;
 
 pub struct VHOSTController {
     pub service_servers: BTreeMap<u16, EmbassyServiceHTTPServer>,
@@ -67,7 +67,6 @@ impl VHOSTController {
             None
         };
 
-
         let mut new_service_server =
             EmbassyServiceHTTPServer::new(self.embassyd_addr.ip(), external_svc_port, ssl_cfg)
                 .await?;
@@ -76,7 +75,7 @@ impl VHOSTController {
             .await?;
         self.service_servers
             .insert(external_svc_port, new_service_server);
-   
+
         Ok(())
     }
 }