fix: automatically reconnect after losing a WebSocket connection
All checks were successful
actionlint check / actionlint check (pull_request) Successful in 12s
conventional commit messages check / conventional commit messages check (pull_request) Successful in 22s
conventional pull request title check / conventional pull request title check (pull_request) Successful in 4s
checkov check / checkov check (pull_request) Successful in 1m19s
dotenv-linter check / dotenv-linter check (pull_request) Successful in 10s
GitLeaks check / GitLeaks check (pull_request) Successful in 13s
hadolint check / hadolint check (pull_request) Successful in 11s
htmlhint check / htmlhint check (pull_request) Successful in 41s
markdownlint check / markdownlint check (pull_request) Successful in 34s
Prettier check / Prettier check (pull_request) Successful in 37s
ShellCheck check / ShellCheck check (pull_request) Successful in 25s
Stylelint check / Stylelint check (pull_request) Successful in 40s
yamllint check / yamllint check (pull_request) Successful in 29s
Rust check / Rust check (pull_request) Successful in 1h1m8s
All checks were successful
actionlint check / actionlint check (pull_request) Successful in 12s
conventional commit messages check / conventional commit messages check (pull_request) Successful in 22s
conventional pull request title check / conventional pull request title check (pull_request) Successful in 4s
checkov check / checkov check (pull_request) Successful in 1m19s
dotenv-linter check / dotenv-linter check (pull_request) Successful in 10s
GitLeaks check / GitLeaks check (pull_request) Successful in 13s
hadolint check / hadolint check (pull_request) Successful in 11s
htmlhint check / htmlhint check (pull_request) Successful in 41s
markdownlint check / markdownlint check (pull_request) Successful in 34s
Prettier check / Prettier check (pull_request) Successful in 37s
ShellCheck check / ShellCheck check (pull_request) Successful in 25s
Stylelint check / Stylelint check (pull_request) Successful in 40s
yamllint check / yamllint check (pull_request) Successful in 29s
Rust check / Rust check (pull_request) Successful in 1h1m8s
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
use dioxus::{
|
use dioxus::{
|
||||||
CapturedError,
|
CapturedError,
|
||||||
fullstack::{Loader, Loading, WebSocketOptions, use_websocket},
|
fullstack::{Loader, Loading, WebSocketOptions},
|
||||||
prelude::*,
|
prelude::*,
|
||||||
};
|
};
|
||||||
use serde::{Serialize, de::DeserializeOwned};
|
use serde::{Serialize, de::DeserializeOwned};
|
||||||
@@ -13,6 +13,29 @@ use crate::{
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
fn use_on_document_become_visible(mut callback: impl FnMut() + 'static) {
|
||||||
|
let callback = use_callback(move |_| callback());
|
||||||
|
use_effect(move || {
|
||||||
|
spawn(async move {
|
||||||
|
let mut eval = document::eval(
|
||||||
|
r#"
|
||||||
|
document.addEventListener("visibilitychange", () => {
|
||||||
|
if (!document.hidden) {
|
||||||
|
dioxus.send(0);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
"#,
|
||||||
|
);
|
||||||
|
loop {
|
||||||
|
eval.recv::<u8>()
|
||||||
|
.await
|
||||||
|
.expect("The JS code returned a value not parsable to `u8`.");
|
||||||
|
callback.call(());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
#[allow(clippy::result_large_err)]
|
#[allow(clippy::result_large_err)]
|
||||||
fn sort_loader_result<T: Ord + Clone>(
|
fn sort_loader_result<T: Ord + Clone>(
|
||||||
result: Result<Loader<Vec<T>>, Loading>,
|
result: Result<Loader<Vec<T>>, Loading>,
|
||||||
@@ -34,17 +57,37 @@ where
|
|||||||
E: Into<CapturedError> + 'static,
|
E: Into<CapturedError> + 'static,
|
||||||
{
|
{
|
||||||
let mut refresh_tick = use_signal(|| 0u64);
|
let mut refresh_tick = use_signal(|| 0u64);
|
||||||
|
let mut websocket_reset_tick = use_signal(|| 0u64);
|
||||||
|
|
||||||
let loader = use_loader(move || {
|
let loader = use_loader(move || {
|
||||||
let _ = refresh_tick(); // Read => dependency.
|
let _ = refresh_tick(); // Read => dependency.
|
||||||
future()
|
future()
|
||||||
});
|
});
|
||||||
|
|
||||||
let mut socket = use_websocket(|| subscribe_to_updates(WebSocketOptions::default()));
|
use_effect(move || {
|
||||||
use_future(move || async move {
|
let initial_websocket_reset_tick = websocket_reset_tick();
|
||||||
while socket.recv().await.is_ok() {
|
spawn(async move {
|
||||||
refresh_tick += 1;
|
let Ok(socket) =
|
||||||
}
|
subscribe_to_updates(WebSocketOptions::new().with_automatic_reconnect()).await
|
||||||
|
else {
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
while socket.recv().await.is_ok() {
|
||||||
|
if websocket_reset_tick() != initial_websocket_reset_tick {
|
||||||
|
// A new WebSocket has been created (a new task spawned), cleaning this one up.
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
refresh_tick += 1;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
/* So that when the device goes to sleep or suspends the app, the WebSocket gets recreated on
|
||||||
|
waking up. It is important to do this only on becoming visible (document.hidden == false),
|
||||||
|
because becoming hidden is the part when network may not work and thus cause errors. */
|
||||||
|
use_on_document_become_visible(move || {
|
||||||
|
websocket_reset_tick += 1;
|
||||||
|
refresh_tick += 1;
|
||||||
});
|
});
|
||||||
|
|
||||||
loader
|
loader
|
||||||
|
|||||||
Reference in New Issue
Block a user