Compare commits

..

No commits in common. "13ef3e40a8977abef0f2e56d9d2df5db4f488d9a" and "5dc87f60955314ca388891af1c96de60c93a9384" have entirely different histories.

3 changed files with 1 additions and 40 deletions

View File

@ -69,7 +69,6 @@ hostname = "0.3.1"
getrandom = { version = "0.2.12", features = ["js"] }
ws_stream_wasm = "0.7.4"
wasm-bindgen-futures = "0.4.39"
web-sys = "0.3.67"
[dev-dependencies]
lazy_static = "1.4.0"

View File

@ -29,9 +29,6 @@ impl HeartbeatHandler {
websocket_tx: Arc<Mutex<Sink>>,
kill_rc: tokio::sync::broadcast::Receiver<()>,
) -> Self {
#[cfg(target_arch = "wasm32")]
web_sys::console::log_1("HBH: Creating new self");
let (send, receive) = tokio::sync::mpsc::channel(32);
let kill_receive = kill_rc.resubscribe();
@ -43,8 +40,6 @@ impl HeartbeatHandler {
wasm_bindgen_futures::spawn_local(async move {
Self::heartbeat_task(websocket_tx, heartbeat_interval, receive, kill_receive).await;
});
#[cfg(target_arch = "wasm32")]
web_sys::console::log_1("HBH: Spawned task");
Self {
heartbeat_interval,
@ -62,26 +57,14 @@ impl HeartbeatHandler {
mut receive: Receiver<HeartbeatThreadCommunication>,
mut kill_receive: tokio::sync::broadcast::Receiver<()>,
) {
#[cfg(target_arch = "wasm32")]
web_sys::console::log_1("HBH: Running task");
let mut last_heartbeat_timestamp: Instant = time::Instant::now();
let mut last_heartbeat_acknowledged = true;
let mut last_seq_number: Option<u64> = None;
#[cfg(target_arch = "wasm32")]
web_sys::console::log_1("HBH: Initialized variables");
safina_timer::start_timer_thread();
loop {
#[cfg(target_arch = "wasm32")]
web_sys::console::log_1("HBH: L0");
println!("HBH: L0");
if kill_receive.try_recv().is_ok() {
#[cfg(target_arch = "wasm32")]
web_sys::console::log_1("HBH: dying");
println!("HBH: dying");
trace!("GW: Closing heartbeat task");
break;
}
@ -95,11 +78,6 @@ impl HeartbeatHandler {
let mut should_send = false;
#[cfg(target_arch = "wasm32")]
web_sys::console::log_1("HBH: L1");
println!("HBH: L1");
tokio::select! {
() = sleep_until(last_heartbeat_timestamp + timeout) => {
should_send = true;
@ -126,19 +104,9 @@ impl HeartbeatHandler {
}
}
#[cfg(target_arch = "wasm32")]
web_sys::console::log_1("HBH: L2");
println!("HBH: L2");
if should_send {
trace!("GW: Sending Heartbeat..");
#[cfg(target_arch = "wasm32")]
web_sys::console::log_1("HBH: L3, sending");
println!("HBH: L3, sending");
let heartbeat = types::GatewayHeartbeat {
op: GATEWAY_HEARTBEAT,
d: last_seq_number,
@ -157,9 +125,6 @@ impl HeartbeatHandler {
last_heartbeat_timestamp = time::Instant::now();
last_heartbeat_acknowledged = false;
#[cfg(target_arch = "wasm32")]
web_sys::console::log_1("HBH: L4, sending done");
}
}
}

View File

@ -32,10 +32,7 @@ async fn test_gateway_authenticate() {
identify.token = bundle.user.token.clone();
gateway.send_identify(identify).await;
common::teardown(bundle).await;
// deliberately fail the test so we get the output
assert!(false);
common::teardown(bundle).await
}
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]