From b49f7223bc334c405f37762899282f59623d46c1 Mon Sep 17 00:00:00 2001
From: jmwample <jmwample@users.noreply.github.com>
Date: Tue, 7 Jan 2025 12:53:38 -0700
Subject: [PATCH] rebase and accomodate changes in develop

---
 nym-vpn-core/Cargo.lock                         | 17 +++++++++++++++++
 nym-vpn-core/Cargo.toml                         |  1 +
 nym-vpn-core/crates/nym-vpn-lib/Cargo.toml      |  3 ++-
 .../crates/nym-vpn-lib/src/platform/mod.rs      |  7 ++-----
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/nym-vpn-core/Cargo.lock b/nym-vpn-core/Cargo.lock
index d84db81ce9..a5f95d6be8 100644
--- a/nym-vpn-core/Cargo.lock
+++ b/nym-vpn-core/Cargo.lock
@@ -1379,6 +1379,16 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "debounced"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "107e5cd9b5163c19751e53eef634cae25cf5ed5f6d0c81125feaa92e43703cc7"
+dependencies = [
+ "futures-timer",
+ "futures-util",
+]
+
 [[package]]
 name = "der"
 version = "0.7.9"
@@ -1906,6 +1916,12 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
+[[package]]
+name = "futures-timer"
+version = "3.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
+
 [[package]]
 name = "futures-util"
 version = "0.3.31"
@@ -4760,6 +4776,7 @@ dependencies = [
  "bincode",
  "bs58",
  "bytes",
+ "debounced",
  "futures",
  "hickory-resolver",
  "ipnetwork",
diff --git a/nym-vpn-core/Cargo.toml b/nym-vpn-core/Cargo.toml
index b60d2efe6f..f4f9388a68 100644
--- a/nym-vpn-core/Cargo.toml
+++ b/nym-vpn-core/Cargo.toml
@@ -150,6 +150,7 @@ tower = "0.5.2"
 tower-http = { version = "0.6.2", features = ["cors"] }
 tracing = "0.1"
 tracing-appender = "0.2.3"
+tracing-oslog = "0.2.0"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 triggered = "0.1.1"
 tun = { version = "0.6.1", features = ["async"] }
diff --git a/nym-vpn-core/crates/nym-vpn-lib/Cargo.toml b/nym-vpn-core/crates/nym-vpn-lib/Cargo.toml
index b69c6a7805..dfb104b2c7 100644
--- a/nym-vpn-core/crates/nym-vpn-lib/Cargo.toml
+++ b/nym-vpn-core/crates/nym-vpn-lib/Cargo.toml
@@ -99,7 +99,8 @@ android_logger.workspace = true
 rand.workspace = true
 
 [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies]
-tracing-oslog = "0.2.0"
+debounced.workspace = true
+tracing-oslog.workspace = true
 
 [build-dependencies]
 uniffi = { workspace = true, features = ["build"] }
diff --git a/nym-vpn-core/crates/nym-vpn-lib/src/platform/mod.rs b/nym-vpn-core/crates/nym-vpn-lib/src/platform/mod.rs
index e596a87be1..ca04c7c544 100644
--- a/nym-vpn-core/crates/nym-vpn-lib/src/platform/mod.rs
+++ b/nym-vpn-core/crates/nym-vpn-lib/src/platform/mod.rs
@@ -47,18 +47,15 @@ pub mod helpers;
 
 mod account;
 mod environment;
-mod state_machine;
 mod logging;
+mod state_machine;
 pub use logging::init_logger;
 
 use std::{path::PathBuf, sync::Arc, time::Duration};
 
 use account::AccountControllerHandle;
 use lazy_static::lazy_static;
-use tokio::{
-    runtime::Runtime,
-    sync::Mutex,
-};
+use tokio::{runtime::Runtime, sync::Mutex};
 
 use state_machine::StateMachineHandle;