Exit from updater UI after close window

Author: pappz

client/ui/update/main.go

@@ -75,15 +75,15 @@ func Execute() {
 	ui := NewUI()
 
 	// Create a context with timeout for the entire update process
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Minute)
-	defer cancel()
+	//defer cancel()
 
-	ui.ShowUpdateProgress(ctx, targetVersionFlag)
+	ui.ShowUpdateProgress(context.Background(), targetVersionFlag)
 	// Run the update function in a goroutine
 	go func() {
-		defer cancel()
+		//defer cancel()
 
-		if err := update(); err != nil {
+		ctx, _ := context.WithTimeout(context.Background(), 10*time.Minute)
+		if err := update(ctx); err != nil {
 			log.Errorf("update failed: %v", err)
 			ui.SetError(err)
 			return
@@ -98,11 +98,10 @@ func Execute() {
 	ui.Run()
 }
 
-func update() error {
+func update(ctx context.Context) error {
 	log.Infof("updater started: %s, %s", serviceDirFlag, targetVersionFlag)
 	updater := installer.NewWithDir(tempDirFlag)
-	if err := updater.Setup(context.Background(), dryRunFlag, targetVersionFlag, serviceDirFlag); err != nil {
-		// todo update ui
+	if err := updater.Setup(ctx, dryRunFlag, targetVersionFlag, serviceDirFlag); err != nil {
 		log.Errorf("failed to update application: %v", err)
 		return err
 	}

client/ui/update/progresswindow.go

@@ -26,7 +26,9 @@ func NewUI() *UI {
 	a := app.NewWithID("NetBird-update")
 
 	return &UI{
-		app: a,
+		app:         a,
+		resultErrCh: make(chan error, 1),
+		resultOkCh:  make(chan struct{}, 1),
 	}
 }
 
@@ -61,13 +63,15 @@ func (u *UI) ShowUpdateProgress(ctx context.Context, version string) {
 		for {
 			select {
 			case <-ctx.Done():
+				u.wUpdateProgress.SetCloseIntercept(u.closeApp)
 				u.showInstallerResult(statusLabel, ctx.Err())
 				return
 			case err := <-u.resultErrCh:
+				u.wUpdateProgress.SetCloseIntercept(u.closeApp)
 				u.showInstallerResult(statusLabel, err)
 				return
 			case <-u.resultOkCh:
-				u.wUpdateProgress.SetCloseIntercept(nil)
+				u.wUpdateProgress.SetCloseIntercept(u.closeApp)
 				u.wUpdateProgress.Close()
 				return
 			case <-ticker.C:
@@ -99,7 +103,6 @@ func (u *UI) SetError(err error) {
 }
 
 func (u *UI) showInstallerResult(statusLabel *widget.Label, err error) {
-	u.wUpdateProgress.SetCloseIntercept(nil)
 	switch {
 	case errors.Is(err, context.DeadlineExceeded):
 		log.Warn("update timed out")
@@ -115,6 +118,11 @@ func (u *UI) showInstallerResult(statusLabel *widget.Label, err error) {
 	}
 }
 
+func (u *UI) closeApp() {
+	log.Infof("close updater UI app")
+	u.app.Quit()
+}
+
 // dotUpdater returns a closure that cycles through dots for a loading animation.
 func dotUpdater() func() string {
 	dotCount := 0