4 files changed, 13 insertions, 8 deletions

diff --git a/subprojects/frontend/src/xtext/OccurrencesService.ts b/subprojects/frontend/src/xtext/OccurrencesService.ts
index 9d738d76..248a9a87 100644
--- a/subprojects/frontend/src/xtext/OccurrencesService.ts
+++ b/subprojects/frontend/src/xtext/OccurrencesService.ts
@@ -1,5 +1,6 @@
 import { Transaction } from '@codemirror/state';
 import { debounce } from 'lodash-es';
+import ms from 'ms';
 
 import type EditorStore from '../editor/EditorStore';
 import {
@@ -11,7 +12,7 @@ import getLogger from '../utils/getLogger';
 import type UpdateService from './UpdateService';
 import type { TextRegion } from './xtextServiceResults';
 
-const FIND_OCCURRENCES_TIMEOUT_MS = 1000;
+const FIND_OCCURRENCES_TIMEOUT = ms('1s');
 
 const log = getLogger('xtext.OccurrencesService');
 
@@ -33,7 +34,7 @@ export default class OccurrencesService {
 
   private readonly findOccurrencesLater = debounce(
     () => this.findOccurrences(),
-    FIND_OCCURRENCES_TIMEOUT_MS,
+    FIND_OCCURRENCES_TIMEOUT,
   );
 
   constructor(
diff --git a/subprojects/frontend/src/xtext/XtextClient.ts b/subprojects/frontend/src/xtext/XtextClient.ts
index 1f7e446f..cd5d280d 100644
--- a/subprojects/frontend/src/xtext/XtextClient.ts
+++ b/subprojects/frontend/src/xtext/XtextClient.ts
@@ -4,6 +4,7 @@ import type {
 } from '@codemirror/autocomplete';
 import type { Transaction } from '@codemirror/state';
 
+import type PWAStore from '../PWAStore';
 import type EditorStore from '../editor/EditorStore';
 import getLogger from '../utils/getLogger';
 
@@ -30,7 +31,7 @@ export default class XtextClient {
 
   private readonly occurrencesService: OccurrencesService;
 
-  constructor(store: EditorStore) {
+  constructor(store: EditorStore, private readonly pwaStore: PWAStore) {
     this.webSocketClient = new XtextWebSocketClient(
       () => this.onReconnect(),
       () => this.onDisconnect(),
@@ -54,6 +55,7 @@ export default class XtextClient {
   private onReconnect(): void {
     this.updateService.onReconnect();
     this.occurrencesService.onReconnect();
+    this.pwaStore.checkForUpdates();
   }
 
   private onDisconnect(): void {
diff --git a/subprojects/frontend/src/xtext/XtextWebSocketClient.ts b/subprojects/frontend/src/xtext/XtextWebSocketClient.ts
index cba6f064..a39620cb 100644
--- a/subprojects/frontend/src/xtext/XtextWebSocketClient.ts
+++ b/subprojects/frontend/src/xtext/XtextWebSocketClient.ts
@@ -1,4 +1,5 @@
 import { createAtom, makeAutoObservable, observable } from 'mobx';
+import ms from 'ms';
 import { nanoid } from 'nanoid';
 import { interpret } from 'xstate';
 
@@ -18,7 +19,7 @@ const XTEXT_SUBPROTOCOL_V1 = 'tools.refinery.language.web.xtext.v1';
 
 // Use a large enough timeout so that a request can complete successfully
 // even if the browser has throttled the background tab.
-const REQUEST_TIMEOUT = 5000;
+const REQUEST_TIMEOUT = ms('5s');
 
 const log = getLogger('xtext.XtextWebSocketClient');
 
diff --git a/subprojects/frontend/src/xtext/webSocketMachine.ts b/subprojects/frontend/src/xtext/webSocketMachine.ts
index 25689cec..a1eee781 100644
--- a/subprojects/frontend/src/xtext/webSocketMachine.ts
+++ b/subprojects/frontend/src/xtext/webSocketMachine.ts
@@ -1,8 +1,9 @@
+import ms from 'ms';
 import { actions, assign, createMachine, RaiseAction } from 'xstate';
 
 const { raise } = actions;
 
-const ERROR_WAIT_TIMES = [200, 1000, 5000, 30_000];
+const ERROR_WAIT_TIMES = ['200', '1s', '5s', '30s'].map(ms);
 
 export interface WebSocketContext {
   webSocketURL: string | undefined;
@@ -229,9 +230,9 @@ export default createMachine(
       needsNetwork: ({ webSocketURL }) => !isWebSocketURLLocal(webSocketURL),
     },
     delays: {
-      IDLE_TIMEOUT: 300_000,
-      OPEN_TIMEOUT: 10_000,
-      PING_PERIOD: 10_000,
+      IDLE_TIMEOUT: ms('5m'),
+      OPEN_TIMEOUT: ms('10s'),
+      PING_PERIOD: ms('10s'),
       ERROR_WAIT_TIME: ({ errors: { length: retryCount } }) => {
         const { length } = ERROR_WAIT_TIMES;
         const index = retryCount < length ? retryCount : length - 1;