Skip to content

mobile: initialize rustls provider before bridge startup #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
saintmob wants to merge 1 commit into
base: main
Choose a base branch
from
Open

mobile: initialize rustls provider before bridge startup #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion shared/rust-bridge/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions shared/rust-bridge/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ codex-cloud-requirements = { path = "../third_party/codex/codex-rs/cloud-require
codex-config = { path = "../third_party/codex/codex-rs/config" }
codex-utils-absolute-path = { path = "../third_party/codex/codex-rs/utils/absolute-path" }
codex-git-utils = { path = "../third_party/codex/codex-rs/git-utils" }
codex-utils-rustls-provider = { path = "../third_party/codex/codex-rs/utils/rustls-provider" }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
tokio = { version = "1", features = ["rt-multi-thread", "macros", "sync", "time", "net", "io-util"] }
Expand Down
1 change: 1 addition & 0 deletions shared/rust-bridge/codex-mobile-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ codex-utils-absolute-path = { workspace = true }
codex-git-utils = { workspace = true }
codex-feedback = { workspace = true }
codex-arg0 = { workspace = true }
codex-utils-rustls-provider = { workspace = true }
tokio = { workspace = true }
async-trait = { workspace = true }
serde = { workspace = true }
Expand Down
2 changes: 2 additions & 0 deletions shared/rust-bridge/codex-mobile-client/src/ffi/shared.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use crate::MobileClient;
use codex_utils_rustls_provider::ensure_rustls_crypto_provider;
use std::sync::Arc;
use std::sync::OnceLock;
static SHARED_RUNTIME: OnceLock<Arc<tokio::runtime::Runtime>> = OnceLock::new();
Expand All @@ -7,6 +8,7 @@ static PLATFORM_INIT: OnceLock<()> = OnceLock::new();

fn ensure_platform_init() {
PLATFORM_INIT.get_or_init(|| {
ensure_rustls_crypto_provider();
#[cfg(target_os = "ios")]
crate::ios_exec::install();
});
Expand Down
2 changes: 2 additions & 0 deletions shared/rust-bridge/codex-mobile-client/src/mobile_client_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ use tokio::sync::{Mutex, broadcast, mpsc};
use tracing::{debug, info, trace, warn};
use url::Url;

use codex_utils_rustls_provider::ensure_rustls_crypto_provider;
use crate::discovery::{DiscoveredServer, DiscoveryConfig, DiscoveryService, MdnsSeed};
use crate::session::connection::InProcessConfig;
use crate::session::connection::{
Expand Down Expand Up @@ -173,6 +174,7 @@ impl MobileClient {
/// Create a new `MobileClient`.
pub fn new() -> Self {
crate::logging::install_ipc_wire_trace_logger();
ensure_rustls_crypto_provider();
let event_processor = Arc::new(EventProcessor::new());
let app_store = Arc::new(AppStoreReducer::new());
let sessions = Arc::new(RwLock::new(HashMap::new()));
Expand Down