public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

collab_client: Treat RECONNECTING the same as CONNECTING

rhansen-collab_client
Richard Hansen 2021-03-30 17:08:45 -04:00
parent 02ae7f5c36
commit 67e7a822e8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/static/js/collab_client.js
View File

@ -80,8 +80,9 @@ const getCollabClient = (ace2editor, serverVars, initialUserInfo, options, _pad)
return; return;
} }
const now = Date.now(); const now = Date.now();
if ((!getSocket()) || channelState === 'CONNECTING') { const connecting = ['CONNECTING', 'RECONNECTING'].includes(channelState);
if (channelState === 'CONNECTING' && now - startConnectTime > 20000) { if (!getSocket() || connecting) {
if (connecting && now - startConnectTime > 20000) {
setChannelState('DISCONNECTED', 'initsocketfail'); setChannelState('DISCONNECTED', 'initsocketfail');
} else { } else {
// check again in a bit // check again in a bit
@ -355,6 +356,7 @@ const getCollabClient = (ace2editor, serverVars, initialUserInfo, options, _pad)
callbacks.onChannelStateChange(channelState, moreInfo); callbacks.onChannelStateChange(channelState, moreInfo);
switch (channelState) { switch (channelState) {
case 'CONNECTING': case 'CONNECTING':
case 'RECONNECTING':
startConnectTime = Date.now(); startConnectTime = Date.now();
break; break;
case 'CONNECTED': case 'CONNECTED':