fix: emit onerror for websocket and reopen connection on reconnect at…

…tempts of y-websocket

Signed-off-by: Julius Härtl <[email protected]>

src/services/SyncService.js

@@ -105,8 +105,12 @@ class SyncService {
 		return this.#connection.session.guestName
 	}
 
+	get hasActiveConnection() {
+		return this.#connection && !this.#connection.isClosed
+	}
+
 	async open({ fileId, initialSession }) {
-		if (this.#connection && !this.#connection.isClosed) {
+		if (this.hasActiveConnection) {
 			// We're already connected.
 			return
 		}
@@ -320,7 +324,7 @@ class SyncService {
 		// Make sure to leave no pending requests behind.
 		this.autosave.clear()
 		this.backend?.disconnect()
-		if (!this.#connection || this.#connection.isClosed) {
+		if (!this.hasActiveConnection) {
 			return
 		}
 		return this.#connection.close()

src/services/WebSocketPolyfill.js

@@ -47,6 +47,9 @@ export default function initWebSocketPolyfill(syncService, fileId, initialSessio
 		constructor(url) {
 			this.url = url
 			logger.debug('WebSocketPolyfill#constructor', { url, fileId, initialSession })
+			if (syncService.hasActiveConnection) {
+				setTimeout(() => this.onopen?.(), 0)
+			}
 			this.#registerHandlers({
 				opened: ({ version, session }) => {
 					this.#version = version
@@ -101,7 +104,10 @@ export default function initWebSocketPolyfill(syncService, fileId, initialSessio
 					...queue.filter(s => !outbox.includes(s)),
 				)
 				return ret
-			}, err => logger.error(err))
+			}, err => {
+				logger.error(`Failed to push the queue with ${queue.length} steps to the server`, err)
+				this.onerror?.(err)
+			})
 		}
 
 		async close() {