remove old capnp code

Author: ranfdev

Cargo.lock

@@ -12,8 +12,6 @@ capnpc = "0.17.2"
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-capnp = "0.18.0"
-capnp-rpc = "0.18.0"
 futures = "0.3.0"
 tokio = { version = "1.0.0", features = ["net", "rt", "macros", "parking_lot"]}
 tokio-util = { version = "0.7.4", features = ["compat", "io"] }

ntfy-daemon/Cargo.toml

@@ -166,8 +166,7 @@ impl Credentials {
         let values = self
             .keyring
             .search_items(attrs)
-            .await
-            .map_err(|e| capnp::Error::failed(e.to_string()))?;
+            .await?;
 
         let mut lock = self.creds.write().unwrap();
         lock.clear();
@@ -206,8 +205,7 @@ impl Credentials {
         ]);
         self.keyring
             .create_item("Password", attrs, password, true)
-            .await
-            .map_err(|e| capnp::Error::failed(e.to_string()))?;
+            .await?;
 
         self.creds.write().unwrap().insert(
             server.to_string(),
@@ -234,8 +232,7 @@ impl Credentials {
         ]);
         self.keyring
             .delete(attrs)
-            .await
-            .map_err(|e| capnp::Error::failed(e.to_string()))?;
+            .await?;
         self.creds
             .write()
             .unwrap()

ntfy-daemon/build.rs

@@ -2,8 +2,6 @@ pub mod credentials;
 pub mod message_repo;
 pub mod models;
 pub mod retry;
-pub mod system_client;
-pub mod topic_listener;
 mod http_client;
 mod output_tracker;
 mod listener;
@@ -14,11 +12,6 @@ pub use subscription::SubscriptionHandle;
 pub use listener::*;
 pub use ntfy::NtfyHandle;
 pub use ntfy::start;
-
-pub mod ntfy_capnp {
-    include!(concat!(env!("OUT_DIR"), "/src/ntfy_capnp.rs"));
-}
-
 use std::sync::Arc;
 
 use http_client::HttpClient;
@@ -51,8 +44,3 @@ pub enum Error {
     SubscriptionNotFound(String),
 }
 
-impl From<Error> for capnp::Error {
-    fn from(value: Error) -> Self {
-        capnp::Error::failed(format!("{:?}", value))
-    }
-}

ntfy-daemon/src/credentials.rs

@@ -13,10 +13,29 @@ use crate::{
     http_client::HttpClient,
     message_repo::Db,
     models::{self, Account},
-    topic_listener::build_client,
     ListenerActor, ListenerCommand, ListenerConfig, ListenerHandle, SharedEnv, SubscriptionHandle,
 };
 
+
+const CONNECT_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(15);
+const TIMEOUT: std::time::Duration = std::time::Duration::from_secs(240); // 4 minutes
+
+
+pub fn build_client() -> anyhow::Result<reqwest::Client> {
+    Ok(reqwest::Client::builder()
+        .connect_timeout(CONNECT_TIMEOUT)
+        .pool_idle_timeout(TIMEOUT)
+        // rustls is used because HTTP 2 isn't discovered with native-tls.
+        // HTTP 2 is required to multiplex multiple requests over a single connection.
+        // You can check that the app is using a single connection to a server by doing
+        // ```
+        // ping ntfy.sh # to get the ip address
+        // netstat | grep $ip
+        // ```
+        .use_rustls_tls()
+        .build()?)
+}
+
 // Message types for the actor
 #[derive()]
 pub enum NtfyMessage {