From 601a3bf1e085e3a28d0e91e3bd2f2d0de5b4ab62 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Fri, 22 Nov 2019 05:43:40 -0500 Subject: don't manually disconnect on disconnect events we only get the disconnect events after the disconnect happens, and in this particular case it's happening because we dropped the old connection to replace it with a new connection, and so manually clearing the current connection on a disconnect event will usually end up clearing the new connection --- teleterm-web/src/lib.rs | 1 - teleterm-web/src/model.rs | 4 ---- teleterm/static/teleterm_web.js | 38 +++++++++++++++++------------------ teleterm/static/teleterm_web_bg.wasm | Bin 389883 -> 389782 bytes 4 files changed, 19 insertions(+), 24 deletions(-) diff --git a/teleterm-web/src/lib.rs b/teleterm-web/src/lib.rs index 9ec713e..453d086 100644 --- a/teleterm-web/src/lib.rs +++ b/teleterm-web/src/lib.rs @@ -55,7 +55,6 @@ fn update( } ws::WebSocketEvent::Disconnected(_) => { log("disconnected"); - model.watch_disconnect(); } ws::WebSocketEvent::Message(msg) => { log(&format!("message from id {}: {:?}", id, msg)); diff --git a/teleterm-web/src/model.rs b/teleterm-web/src/model.rs index 77b3ead..263dd7c 100644 --- a/teleterm-web/src/model.rs +++ b/teleterm-web/src/model.rs @@ -54,8 +54,4 @@ impl Model { pub fn update_sessions(&mut self, sessions: Vec) { self.sessions = sessions; } - - pub fn watch_disconnect(&mut self) { - self.watch_conn = None; - } } diff --git a/teleterm/static/teleterm_web.js b/teleterm/static/teleterm_web.js index c979271..f7b9436 100644 --- a/teleterm/static/teleterm_web.js +++ b/teleterm/static/teleterm_web.js @@ -20,23 +20,23 @@ function addHeapObject(obj) { function __wbg_elem_binding0(arg0, arg1, arg2) { wasm.__wbg_function_table.get(49)(arg0, arg1, addHeapObject(arg2)); } -function __wbg_elem_binding1(arg0, arg1) { - wasm.__wbg_function_table.get(174)(arg0, arg1); +function __wbg_elem_binding1(arg0, arg1, arg2) { + wasm.__wbg_function_table.get(49)(arg0, arg1, addHeapObject(arg2)); } function __wbg_elem_binding2(arg0, arg1, arg2) { - wasm.__wbg_function_table.get(49)(arg0, arg1, addHeapObject(arg2)); + wasm.__wbg_function_table.get(54)(arg0, arg1, arg2); } function __wbg_elem_binding3(arg0, arg1, arg2) { wasm.__wbg_function_table.get(49)(arg0, arg1, addHeapObject(arg2)); } -function __wbg_elem_binding4(arg0, arg1, arg2) { - wasm.__wbg_function_table.get(244)(arg0, arg1, addHeapObject(arg2)); +function __wbg_elem_binding4(arg0, arg1) { + wasm.__wbg_function_table.get(174)(arg0, arg1); } function __wbg_elem_binding5(arg0, arg1, arg2) { - wasm.__wbg_function_table.get(49)(arg0, arg1, addHeapObject(arg2)); + wasm.__wbg_function_table.get(244)(arg0, arg1, addHeapObject(arg2)); } function __wbg_elem_binding6(arg0, arg1, arg2) { - wasm.__wbg_function_table.get(54)(arg0, arg1, arg2); + wasm.__wbg_function_table.get(49)(arg0, arg1, addHeapObject(arg2)); } function __wbg_elem_binding7(arg0, arg1, arg2, arg3, arg4) { wasm.__wbg_function_table.get(271)(arg0, arg1, addHeapObject(arg2), arg3, addHeapObject(arg4)); @@ -871,16 +871,16 @@ function init(module) { imports.wbg.__wbindgen_throw = function(arg0, arg1) { throw new Error(getStringFromWasm(arg0, arg1)); }; - imports.wbg.__wbindgen_closure_wrapper909 = function(arg0, arg1, arg2) { + imports.wbg.__wbindgen_closure_wrapper214 = function(arg0, arg1, arg2) { const state = { a: arg0, b: arg1, cnt: 1 }; const real = (arg0) => { state.cnt++; const a = state.a; state.a = 0; try { - return __wbg_elem_binding4(a, state.b, arg0); + return __wbg_elem_binding1(a, state.b, arg0); } finally { - if (--state.cnt === 0) wasm.__wbg_function_table.get(245)(a, state.b); + if (--state.cnt === 0) wasm.__wbg_function_table.get(50)(a, state.b); else state.a = a; } } @@ -896,7 +896,7 @@ function init(module) { const a = state.a; state.a = 0; try { - return __wbg_elem_binding5(a, state.b, arg0); + return __wbg_elem_binding0(a, state.b, arg0); } finally { if (--state.cnt === 0) wasm.__wbg_function_table.get(50)(a, state.b); else state.a = a; @@ -907,14 +907,14 @@ function init(module) { const ret = real; return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper220 = function(arg0, arg1, arg2) { + imports.wbg.__wbindgen_closure_wrapper218 = function(arg0, arg1, arg2) { const state = { a: arg0, b: arg1, cnt: 1 }; const real = (arg0) => { state.cnt++; const a = state.a; state.a = 0; try { - return __wbg_elem_binding0(a, state.b, arg0); + return __wbg_elem_binding2(a, state.b, arg0); } finally { if (--state.cnt === 0) wasm.__wbg_function_table.get(50)(a, state.b); else state.a = a; @@ -932,7 +932,7 @@ function init(module) { const a = state.a; state.a = 0; try { - return __wbg_elem_binding2(a, state.b, arg0); + return __wbg_elem_binding3(a, state.b, arg0); } finally { if (--state.cnt === 0) wasm.__wbg_function_table.get(50)(a, state.b); else state.a = a; @@ -950,7 +950,7 @@ function init(module) { const a = state.a; state.a = 0; try { - return __wbg_elem_binding1(a, state.b, ); + return __wbg_elem_binding4(a, state.b, ); } finally { if (--state.cnt === 0) wasm.__wbg_function_table.get(175)(a, state.b); else state.a = a; @@ -961,16 +961,16 @@ function init(module) { const ret = real; return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper214 = function(arg0, arg1, arg2) { + imports.wbg.__wbindgen_closure_wrapper909 = function(arg0, arg1, arg2) { const state = { a: arg0, b: arg1, cnt: 1 }; const real = (arg0) => { state.cnt++; const a = state.a; state.a = 0; try { - return __wbg_elem_binding3(a, state.b, arg0); + return __wbg_elem_binding5(a, state.b, arg0); } finally { - if (--state.cnt === 0) wasm.__wbg_function_table.get(50)(a, state.b); + if (--state.cnt === 0) wasm.__wbg_function_table.get(245)(a, state.b); else state.a = a; } } @@ -979,7 +979,7 @@ function init(module) { const ret = real; return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper218 = function(arg0, arg1, arg2) { + imports.wbg.__wbindgen_closure_wrapper220 = function(arg0, arg1, arg2) { const state = { a: arg0, b: arg1, cnt: 1 }; const real = (arg0) => { state.cnt++; diff --git a/teleterm/static/teleterm_web_bg.wasm b/teleterm/static/teleterm_web_bg.wasm index 3279e33..254392e 100644 Binary files a/teleterm/static/teleterm_web_bg.wasm and b/teleterm/static/teleterm_web_bg.wasm differ -- cgit v1.2.3-54-g00ecf