Fix issues with reconnect and logging out

Fix problems encountered logging out and in while the connection has
dropped and is in the process of reconnecting.
This commit is contained in:
Hornwitser committed 2021-03-18 23:05:59 +01:00
1 parent 6458810571
commit d627c5e094
4 files changed
+17 -10

No files matched your search

+2 -1
View File
@@ -178,7 +178,7 @@ class WebSocketClientConnector extends WebSocketBaseConnector {
setTimeout(timeout) { setTimeout(timeout) {
this._timeout = timeout; this._timeout = timeout;
if (this._reconnectId && this.timeout < this._reconnectDelay / 2) { if (this._reconnectId && this._timeout < this._reconnectDelay / 2) {
clearTimeout(this._reconnectId); clearTimeout(this._reconnectId);
this.reconnect(); this.reconnect();
} }
@@ -280,6 +280,7 @@ class WebSocketClientConnector extends WebSocketBaseConnector {
this._lastReceivedSeq = null; this._lastReceivedSeq = null;
this._sessionToken = null; this._sessionToken = null;
this._sendBuffer.length = 0; this._sendBuffer.length = 0;
this._state = "new";
this._connected = false; this._connected = false;
this.emit("close"); this.emit("close");
return; return;
+1
View File
@@ -87,6 +87,7 @@ export default async function bootstrap() {
wsUrl.protocol = wsUrl.protocol.replace("http", "ws"); wsUrl.protocol = wsUrl.protocol.replace("http", "ws");
let controlConnector = new ControlConnector(wsUrl, 10); let controlConnector = new ControlConnector(wsUrl, 10);
controlConnector.setTimeout(15);
let control = new Control(controlConnector, plugins); let control = new Control(controlConnector, plugins);
ReactDOM.render(<App control={control} plugins={plugins}/>, document.getElementById("root")); ReactDOM.render(<App control={control} plugins={plugins}/>, document.getElementById("root"));
+10 -7
View File
@@ -31,6 +31,7 @@ export default function App(props) {
function clearToken() { function clearToken() {
setToken(null); setToken(null);
connector.token = null;
localStorage.removeItem("master_token"); localStorage.removeItem("master_token");
} }
@@ -54,6 +55,14 @@ export default function App(props) {
connector.on("close", onClose); connector.on("close", onClose);
connector.on("error", onError); connector.on("error", onError);
return () => {
connector.off("error", onError);
connector.off("close", onClose);
connector.off("connect", onConnect);
};
}, [props.control]);
useEffect(() => {
if (token && !connected) { if (token && !connected) {
if (props.control.loggingOut) { if (props.control.loggingOut) {
clearToken(); clearToken();
@@ -63,13 +72,7 @@ export default function App(props) {
connector.connect(); connector.connect();
} }
} }
}, [token, connected]);
return () => {
connector.off("error", onError);
connector.off("close", onClose);
connector.off("connect", onConnect);
};
});
let page; let page;
if (connected) { if (connected) {
+4 -2
View File
@@ -122,6 +122,10 @@ export class Control extends libLink.Link {
} }
async updateLogSubscriptions() { async updateLogSubscriptions() {
if (!this.connector.connected) {
return;
}
await libLink.messages.setLogSubscriptions.send(this, { await libLink.messages.setLogSubscriptions.send(this, {
all: false, all: false,
master: false, master: false,
@@ -137,8 +141,6 @@ export class Control extends libLink.Link {
} }
async shutdown() { async shutdown() {
this.connector.setTimeout(5);
try { try {
await libLink.messages.prepareDisconnect.send(this); await libLink.messages.prepareDisconnect.send(this);
} catch (err) { } catch (err) {