Skip to content
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

* Fix panic in web worker environments in `ic-agent`.
* Update `ic-management-canister-types` to 0.5.0

## [0.44.3] - 2025-10-31
Expand Down
16 changes: 11 additions & 5 deletions ic-agent/src/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,17 @@ pub async fn sleep(d: Duration) {
tokio::time::sleep(d).await;
#[cfg(all(target_family = "wasm", feature = "wasm-bindgen"))]
wasm_bindgen_futures::JsFuture::from(js_sys::Promise::new(&mut |rs, rj| {
if let Err(e) = web_sys::window()
.expect("global window unavailable")
.set_timeout_with_callback_and_timeout_and_arguments_0(&rs, d.as_millis() as _)
{
use wasm_bindgen::UnwrapThrowExt;
use wasm_bindgen::{JsCast, UnwrapThrowExt};

let global = js_sys::global();
let res = if let Some(window) = global.dyn_ref::<web_sys::Window>() {
window.set_timeout_with_callback_and_timeout_and_arguments_0(&rs, d.as_millis() as _)
} else if let Some(worker) = global.dyn_ref::<web_sys::WorkerGlobalScope>() {
worker.set_timeout_with_callback_and_timeout_and_arguments_0(&rs, d.as_millis() as _)
} else {
panic!("global window or worker unavailable");
};
if let Err(e) = res {
rj.call1(&rj, &e).unwrap_throw();
}
}))
Expand Down