Skip to content
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.

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

Feat/config websocket timeout #112

Merged
merged 4 commits into from
Sep 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 9 additions & 6 deletions src/admin_websocket.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,20 @@ impl AdminWebsocket {
/// As string `"localhost:30000"`
/// As tuple `([127.0.0.1], 30000)`
pub async fn connect(socket_addr: impl ToSocketAddrs) -> Result<Self> {
Self::connect_with_config(socket_addr, Arc::new(WebsocketConfig::CLIENT_DEFAULT)).await
}

/// Connect to a Conductor API AdminWebsocket with a custom WebsocketConfig.
pub async fn connect_with_config(
socket_addr: impl ToSocketAddrs,
websocket_config: Arc<WebsocketConfig>,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The config wasn't being used.

) -> Result<Self> {
let addr = socket_addr
.to_socket_addrs()?
.next()
.expect("invalid websocket address");
let websocket_config = Arc::new(WebsocketConfig::CLIENT_DEFAULT);

let (tx, mut rx) = again::retry(|| {
let websocket_config = Arc::clone(&websocket_config);
connect(websocket_config, addr)
})
.await?;
let (tx, mut rx) = again::retry(|| connect(websocket_config.clone(), addr)).await?;

// WebsocketReceiver needs to be polled in order to receive responses
// from remote to sender requests.
Expand Down
1 change: 1 addition & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ pub use holochain_types::{
app::{InstallAppPayload, InstalledAppId},
dna::AgentPubKey,
};
pub use holochain_websocket::WebsocketConfig;
pub use signing::client_signing::{ClientAgentSigner, SigningCredentials};
#[cfg(feature = "lair_signing")]
pub use signing::lair_signing::LairAgentSigner;
Expand Down
Loading