handle error closure events properly

Start9Labs · Jan 13, 2025 · 49a6f28 · 49a6f28
1 parent 3466aa4
commit 49a6f28
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 9 deletions.
diff --git a/web/projects/ui/src/app/pages/init/init.service.ts b/web/projects/ui/src/app/pages/init/init.service.ts
@@ -26,7 +26,15 @@ export class InitService extends Observable<MappedProgress> {
     from(this.api.initGetProgress()),
   ).pipe(
     switchMap(({ guid, progress }) =>
-      this.api.openWebsocket$<T.FullProgress>(guid).pipe(startWith(progress)),
+      this.api
+        .openWebsocket$<T.FullProgress>(guid, {
+          closeObserver: {
+            next: () => {
+              this.state.syncState()
+            },
+          },
+        })
+        .pipe(startWith(progress)),
     ),
     map(({ phases, overall }) => ({
       total: getOverallDecimal(overall),

diff --git a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.service.ts b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.service.ts
@@ -23,16 +23,27 @@ export class SideloadService {
 
   readonly progress$ = this.guid$.pipe(
     switchMap(guid =>
-      this.api.openWebsocket$<T.FullProgress>(guid).pipe(
-        tap(p => {
-          if (p.overall === true) {
-            this.router.navigate([''], { replaceUrl: true })
-          }
-        }),
-      ),
+      this.api
+        .openWebsocket$<T.FullProgress>(guid, {
+          closeObserver: {
+            next: event => {
+              if (event.code !== 1000) {
+                this.errorService.handleError(event.reason)
+              }
+            },
+          },
+        })
+        .pipe(
+          tap(p => {
+            if (p.overall === true) {
+              this.router.navigate([''], { replaceUrl: true })
+            }
+          }),
+          endWith(null),
+        ),
     ),
     catchError(e => {
-      this.errorService.handleError(e)
+      this.errorService.handleError('Websocket connection broken. Try again.')
       return EMPTY
     }),
     shareReplay(1),