astelm/telemt
1
0
Fork 0
mirror of https://github.com/telemt/telemt.git synced 2026-09-13 22:14:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Stale Websocket-lanes recovers after restart

Browse Source 
Co-Authored-By: brekotis <93345790+brekotis@users.noreply.github.com>
This commit is contained in:
Alexey
2026-09-07 18:08:24 +03:00
parent 3693d1e2a8
commit 97c046757a
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/web/bridge/runtime.js
+5 -4
View File
@@ -395,16 +395,17 @@ function queueLane(value){
}
function openLaneSocket(lane){
if(lane.socket||closed)return;lane.socket=new WebSocket(socketURL(),'tproxy-lane-v1.'+sessionToken+'.'+String(lane.id));lane.socket.binaryType='arraybuffer';
const opened=lane.socket,openTimer=setTimeout(()=>{if(!closed&&lanes.get(lane.id)===lane&&lane.socket===opened)finishLane(lane,true)},websocketOpenMs);
lane.socket.onopen=()=>{if(closed||lanes.get(lane.id)!==lane)return;lane.ready=true;status('connected');runLaneSocketUp(lane)};
const opened=lane.socket;let upgraded=false,settled=false,openTimer=null;const finishSocket=reason=>{if(settled||closed||lanes.get(lane.id)!==lane||lane.socket!==opened)return;settled=true;if(openTimer)clearTimeout(openTimer);openTimer=null;lane.ready=false;if(!upgraded){lane.socket=null;opened.close();recoveryController.recover(reason,null);return}finishLane(lane,true)};
openTimer=setTimeout(()=>finishSocket('timeout'),websocketOpenMs);
lane.socket.onopen=()=>{if(closed||lanes.get(lane.id)!==lane||lane.socket!==opened){opened.close();return}upgraded=true;lane.ready=true;status('connected');runLaneSocketUp(lane)};
lane.socket.onmessage=event=>{
clearTimeout(openTimer);
if(openTimer)clearTimeout(openTimer);openTimer=null;
if(closed||lanes.get(lane.id)!==lane||!(event.data instanceof ArrayBuffer)){finishLane(lane,true);return}
let values;try{values=splitFrames(event.data);for(const value of values)if(value.id!==lane.id)throw new Error('cross-lane frame')}catch(error){finishLane(lane,true);return}
if(values.some(value=>value.type===3))lane.remoteClosed=true;
observeServerFrames(event.data);port.postMessage({t:'traffic',up:0,down:event.data.byteLength});port.postMessage(event.data,[event.data]);status('connected');
};
lane.socket.onerror=()=>{};lane.socket.onclose=()=>{clearTimeout(openTimer);lane.ready=false;lane.socket=null;if(!closed)finishLane(lane,true)};
lane.socket.onerror=()=>{};lane.socket.onclose=()=>finishSocket(upgraded?'network':'upgrade');
}
async function runLaneSocketUp(lane){
if(lane.running||!lane.ready)return;lane.running=true;let lease=null;
src/web/bridge/tests.rs
+23
View File
@@ -177,3 +177,26 @@ fn ambiguous_commit_is_resolved_before_carrier_advance() {
.contains("addEventListener('pagehide',()=>fail('navigation')")
);
}
#[test]
fn committed_websocket_lane_escalates_only_pre_upgrade_failure() {
let page = render_page("HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH", 4);
assert!(page.body.contains("let upgraded=false,settled=false"));
assert!(page.body.contains(
"if(settled||closed||lanes.get(lane.id)!==lane||lane.socket!==opened)return"
));
assert!(page.body.contains(
"if(!upgraded){lane.socket=null;opened.close();recoveryController.recover(reason,null);return}"
));
assert!(page
.body
.contains("recoveryController.recover(reason,null);return}finishLane(lane,true)"));
assert!(page
.body
.contains("openTimer=setTimeout(()=>finishSocket('timeout'),websocketOpenMs)"));
assert!(page.body.contains("upgraded=true;lane.ready=true"));
assert!(page
.body
.contains("lane.socket.onclose=()=>finishSocket(upgraded?'network':'upgrade')"));
}