From 40b91af8007dd0a5d180eba37a8168ca12e013e2 Mon Sep 17 00:00:00 2001 From: Owen Jacobson Date: Wed, 9 Apr 2025 01:10:28 -0400 Subject: When booting a session, retry every five seconds if unable to send the request. This is intended to transparently resume the session (using `boot` to start over) after more serious connection interruptions. It interacts with the heartbeat timeout: we let the browser try to reconnect through `EventSource` on its own for up to 30 seconds, before intervening, closing the event source, and starting attempts to call `boot`. This covers both initial boot, which will now hang if the server is unavailable (sorry), and reconnection after an event timeout. No other operations are retried (particularly, sending a message is _not_ retried). --- ui/lib/apiServer.js | 60 ++++++++++++++++++++++++++++++++++-------------- ui/lib/retry.js | 21 +++++++++++++++++ ui/lib/session.svelte.js | 24 +++++++++++-------- 3 files changed, 78 insertions(+), 27 deletions(-) create mode 100644 ui/lib/retry.js diff --git a/ui/lib/apiServer.js b/ui/lib/apiServer.js index 0b51883..7edddc3 100644 --- a/ui/lib/apiServer.js +++ b/ui/lib/apiServer.js @@ -1,56 +1,58 @@ import axios from 'axios'; +import * as r from './retry.js'; + export const apiServer = axios.create({ - baseURL: '/api/', - validateStatus: () => true + baseURL: '/api/' }); export async function boot() { - return apiServer.get('/boot'); + return apiServer.get('/boot').catch(responseError); } export async function setup(name, password) { - return apiServer.post('/setup', { name, password }); + return await apiServer.post('/setup', { name, password }).catch(responseError); } export async function logIn(name, password) { - return apiServer.post('/auth/login', { name, password }); + return await apiServer.post('/auth/login', { name, password }).catch(responseError); } export async function logOut() { - return apiServer.post('/auth/logout', {}); + return await apiServer.post('/auth/logout', {}).catch(responseError); } export async function changePassword(password, to) { - return apiServer.post('/password', { password, to }); + return await apiServer.post('/password', { password, to }).catch(responseError); } export async function createChannel(name) { - return apiServer.post('/channels', { name }); + return await apiServer.post('/channels', { name }).catch(responseError); } export async function postToChannel(channelId, body) { - return apiServer.post(`/channels/${channelId}`, { body }); + return await apiServer.post(`/channels/${channelId}`, { body }).catch(responseError); } export async function deleteMessage(messageId) { - return apiServer.delete(`/messages/${messageId}`, {}); + return await apiServer.delete(`/messages/${messageId}`, {}).catch(responseError); } export async function createInvite() { - return apiServer.post(`/invite`, {}); + return await apiServer.post(`/invite`, {}).catch(responseError); } export async function getInvite(inviteId) { - return apiServer.get(`/invite/${inviteId}`); + return await apiServer.get(`/invite/${inviteId}`).catch(responseError); } export async function acceptInvite(inviteId, name, password) { - const data = { - name, - password - }; - return apiServer.post(`/invite/${inviteId}`, data); + return apiServer + .post(`/invite/${inviteId}`, { + name, + password + }) + .catch(responseError); } export function subscribeToEvents(resumePoint) { @@ -62,3 +64,27 @@ export function subscribeToEvents(resumePoint) { }); return new EventSource(eventsUrl); } + +export class LoggedOut extends Error {} + +export class SetupRequired extends Error {} + +export async function retry(op) { + return await r.retry(op, isRetryable, r.delay(5000)); +} + +function responseError(err) { + if (err.response) { + switch (err.response.status) { + case 401: + throw new LoggedOut(); + case 503: + throw new SetupRequired(); + } + } + throw err; +} + +function isRetryable(err) { + return !!err.request; +} diff --git a/ui/lib/retry.js b/ui/lib/retry.js new file mode 100644 index 0000000..777f1be --- /dev/null +++ b/ui/lib/retry.js @@ -0,0 +1,21 @@ +export async function retry(callback, retryCond, delay) { + while (true) { + try { + return await callback(); + } catch (err) { + if (retryCond(err)) { + await delay(); + } else { + throw err; + } + } + } +} + +export function delay(millis) { + return async () => await sleep(millis); +} + +function sleep(millis) { + return new Promise((resolve) => setTimeout(resolve, millis)); +} diff --git a/ui/lib/session.svelte.js b/ui/lib/session.svelte.js index b953d9c..21a391d 100644 --- a/ui/lib/session.svelte.js +++ b/ui/lib/session.svelte.js @@ -94,16 +94,20 @@ class Session { } async function bootOrNavigate(navigateTo) { - const response = await api.boot(); - switch (response.status) { - case 401: - await navigateTo('/login'); - break; - case 503: - await navigateTo('/setup'); - break; - case 200: - return response.data; + try { + const response = await api.retry(async () => await api.boot()); + return response.data; + } catch (err) { + switch (true) { + case err instanceof api.LoggedOut: + await navigateTo('/login'); + break; + case err instanceof api.SetupRequired: + await navigateTo('/setup'); + break; + default: + throw err; + } } } -- cgit v1.2.3 From 4d6cc62f0c9bb5d50720c83fb1ecbd0889d2acd3 Mon Sep 17 00:00:00 2001 From: Owen Jacobson Date: Wed, 23 Apr 2025 22:02:42 -0400 Subject: Naming improvements c/o Kit --- ui/lib/apiServer.js | 3 ++- ui/lib/retry.js | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ui/lib/apiServer.js b/ui/lib/apiServer.js index 7edddc3..cad8997 100644 --- a/ui/lib/apiServer.js +++ b/ui/lib/apiServer.js @@ -1,6 +1,7 @@ import axios from 'axios'; import * as r from './retry.js'; +import { timedDelay } from './retry.js'; export const apiServer = axios.create({ baseURL: '/api/' @@ -70,7 +71,7 @@ export class LoggedOut extends Error {} export class SetupRequired extends Error {} export async function retry(op) { - return await r.retry(op, isRetryable, r.delay(5000)); + return await r.retry(op, isRetryable, r.timedDelay(5000)); } function responseError(err) { diff --git a/ui/lib/retry.js b/ui/lib/retry.js index 777f1be..a2cff65 100644 --- a/ui/lib/retry.js +++ b/ui/lib/retry.js @@ -1,9 +1,9 @@ -export async function retry(callback, retryCond, delay) { +export async function retry(callback, shouldRetry, delay) { while (true) { try { return await callback(); } catch (err) { - if (retryCond(err)) { + if (shouldRetry(err)) { await delay(); } else { throw err; @@ -12,7 +12,7 @@ export async function retry(callback, retryCond, delay) { } } -export function delay(millis) { +export function timedDelay(millis) { return async () => await sleep(millis); } -- cgit v1.2.3