LogalDeveloper/owncast
0
Fork 0
Code Activity

Handle websocket errors and reconnection. Closes #1869

Browse Source
This commit is contained in:
Gabe Kangas
2022-10-18 16:39:49 -07:00
parent cc94bdeda0
commit 3e89937d2b
2 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
web/components/stores/ClientConfigStore.tsx
View File

@@ -68,6 +68,7 @@ export const chatAuthenticatedAtom = atom<boolean>({
export const websocketServiceAtom = atom<WebsocketService>({ export const websocketServiceAtom = atom<WebsocketService>({
key: 'websocketServiceAtom', key: 'websocketServiceAtom',
default: null, default: null,
dangerouslyAllowMutability: true,
}); });
export const appStateAtom = atom<AppStateOptions>({ export const appStateAtom = atom<AppStateOptions>({

42
web/services/websocket-service.ts
View File

@@ -14,24 +14,24 @@ export default class WebsocketService {
websocketReconnectTimer: ReturnType<typeof setTimeout>; websocketReconnectTimer: ReturnType<typeof setTimeout>;
isShutdown = false;
backOff = 1000;
handleMessage?: (message: SocketEvent) => void; handleMessage?: (message: SocketEvent) => void;
constructor(accessToken, path) { constructor(accessToken, path) {
this.accessToken = accessToken; this.accessToken = accessToken;
this.path = path; this.path = path;
// this.websocketReconnectTimer = null; this.websocketReconnectTimer = null;
// this.accessToken = accessToken;
// this.websocketConnectedListeners = [];
// this.websocketDisconnectListeners = [];
// this.rawMessageListeners = [];
// this.send = this.send.bind(this); // this.send = this.send.bind(this);
// this.createAndConnect = this.createAndConnect.bind(this); this.createAndConnect = this.createAndConnect.bind(this);
// this.scheduleReconnect = this.scheduleReconnect.bind(this); // this.scheduleReconnect = this.scheduleReconnect.bind(this);
// this.shutdown = this.shutdown.bind(this); // this.onError = this.onError.bind(this);
this.shutdown = this.shutdown.bind(this);
// this.isShutdown = false; this.isShutdown = false;
this.createAndConnect(); this.createAndConnect();
} }
@@ -46,7 +46,6 @@ export default class WebsocketService {
console.debug('connecting to ', url.toString()); console.debug('connecting to ', url.toString());
const ws = new WebSocket(url.toString()); const ws = new WebSocket(url.toString());
ws.onopen = this.onOpen.bind(this); ws.onopen = this.onOpen.bind(this);
// ws.onclose = this.onClose.bind(this);
ws.onerror = this.onError.bind(this); ws.onerror = this.onError.bind(this);
ws.onmessage = this.onMessage.bind(this); ws.onmessage = this.onMessage.bind(this);
@@ -61,12 +60,27 @@ export default class WebsocketService {
// On ws error just close the socket and let it re-connect again for now. // On ws error just close the socket and let it re-connect again for now.
onError(e) { onError(e) {
console.error(e);
handleNetworkingError(`Socket error: ${e}`); handleNetworkingError(`Socket error: ${e}`);
this.websocket.close(); this.websocket.close();
// if (!this.isShutdown) { if (!this.isShutdown) {
// this.scheduleReconnect(); this.scheduleReconnect();
// } }
}
scheduleReconnect() {
if (this.websocketReconnectTimer) {
clearTimeout(this.websocketReconnectTimer);
}
this.backOff *= 2;
this.websocketReconnectTimer = setTimeout(
this.createAndConnect,
5000 + Math.min(this.backOff, 10_000),
);
}
shutdown() {
this.isShutdown = true;
this.websocket.close();
} }
/* /*