From 0897769f70af20923b7f4ccce3e7ebb8d4ff0249 Mon Sep 17 00:00:00 2001 From: ading2210 Date: Sun, 3 Nov 2024 22:15:36 -0800 Subject: [PATCH] Revert "improve download speeds by listening directly for ws messages" This reverts commit 40044096500ea7a79591c05d9bd80dc9fe18946a. --- client/fragments/notify_ws_events.js | 5 ----- client/javascript/main.js | 2 -- client/javascript/session.js | 8 ++------ 3 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 client/fragments/notify_ws_events.js diff --git a/client/fragments/notify_ws_events.js b/client/fragments/notify_ws_events.js deleted file mode 100644 index dffb26c..0000000 --- a/client/fragments/notify_ws_events.js +++ /dev/null @@ -1,5 +0,0 @@ -/* INSERT -Module\[['"]websocket['"]\]\.emit\(['"]message['"], ?sock\.stream\.fd\) -*/ -; ws_events.dispatchEvent(new Event("message")); - diff --git a/client/javascript/main.js b/client/javascript/main.js index a6f93c9..47ee3e9 100644 --- a/client/javascript/main.js +++ b/client/javascript/main.js @@ -30,8 +30,6 @@ var wasm_ready = false; var version_dict = null; var api = null; var main_session = null; -const ws_events = new EventTarget(); - const libcurl_version = "__library_version__"; const wisp_version = "__wisp_version__"; diff --git a/client/javascript/session.js b/client/javascript/session.js index fdb2a69..c6c8d9a 100644 --- a/client/javascript/session.js +++ b/client/javascript/session.js @@ -20,9 +20,6 @@ class CurlSession { }, "viii"); this.request_callbacks = {}; this.last_request_id = 0; - - this.ws_event_listener = () => {this.event_loop_func()}; - ws_events.addEventListener("message", this.ws_event_listener); } assert_ready() { @@ -100,7 +97,7 @@ class CurlSession { if (this.event_loop) { return; } - + this.event_loop = setInterval(() => { this.event_loop_func(); }, 0); @@ -111,7 +108,7 @@ class CurlSession { if (libcurl_active || this.active_requests) { _session_perform(this.session_ptr); } - else if (this.event_loop) { + else { clearInterval(this.event_loop); this.event_loop = null; } @@ -123,7 +120,6 @@ class CurlSession { } _session_cleanup(this.session_ptr); this.session_ptr = null; - ws_events.removeEventListener("message", this.ws_event_listener); Module.removeFunction(this.end_callback_ptr); Module.removeFunction(this.headers_callback_ptr); Module.removeFunction(this.data_callback_ptr);