fix: backups resilience improvements (#5555)

* fix: backups

* fix: stability

packages/ui/src/components/servers/backups/BackupItem.vue

@@ -50,11 +50,13 @@ const props = withDefaults(
 
 const backupQueued = computed(
 	() =>
+		props.backup.status === 'pending' ||
 		props.backup.task?.create?.progress === 0 ||
-		(props.backup.ongoing && !props.backup.task?.create),
+		(props.backup.status === 'in_progress' && !props.backup.task?.create),
+)
+const failedToCreate = computed(
+	() => props.backup.status === 'error' || props.backup.status === 'timed_out',
 )
-// const automated = computed(() => props.backup.automated)
-const failedToCreate = computed(() => props.backup.interrupted)
 
 const inactiveStates = ['failed', 'cancelled', 'done']
 
@@ -64,11 +66,11 @@ const creating = computed(() => {
 		return task
 	}
 
-	if (props.backup.ongoing && !props.backup.task?.restore) {
-		return {
-			progress: 0,
-			state: 'ongoing',
-		}
+	if (
+		(props.backup.status === 'in_progress' || props.backup.status === 'pending') &&
+		!props.backup.task?.restore
+	) {
+		return { progress: 0, state: 'ongoing' as const }
 	}
 	return undefined
 })
@@ -78,13 +80,6 @@ const restoring = computed(() => {
 	if (task && task.progress < 1 && !inactiveStates.includes(task.state)) {
 		return task
 	}
-
-	if (props.backup.ongoing && props.backup.task?.restore) {
-		return {
-			progress: 0,
-			state: 'ongoing',
-		}
-	}
 	return undefined
 })
 

packages/ui/src/layouts/shared/content-tab/composables/use-inline-backup.ts

@@ -86,13 +86,16 @@ export function useInlineBackup(backupName: string | (() => string)) {
 			if (!entry?.create) return
 
 			if (entry.create.state === 'done') {
+				stopPolling()
 				isBackingUp.value = false
 				backupComplete.value = true
 			} else if (entry.create.state === 'cancelled') {
+				stopPolling()
 				isBackingUp.value = false
 				isCancelling.value = false
 				backupCancelled.value = true
 			} else if (entry.create.state === 'failed') {
+				stopPolling()
 				isBackingUp.value = false
 				backupFailed.value = true
 			}
@@ -118,11 +121,13 @@ export function useInlineBackup(backupName: string | (() => string)) {
 
 		try {
 			const backup = await client.archon.backups_v1.get(serverId, worldId.value!, backupId)
+			const isTerminal =
+				backup.status === 'done' || backup.status === 'error' || backup.status === 'timed_out'
 
-			if (!backup.ongoing) {
+			if (isTerminal) {
 				stopPolling()
-
-				if (backup.interrupted) {
+				if (!isBackingUp.value) return
+				if (backup.status === 'error' || backup.status === 'timed_out') {
 					isBackingUp.value = false
 					backupFailed.value = true
 				} else {

packages/ui/src/layouts/wrapped/hosting/manage/backups.vue

@@ -221,7 +221,11 @@ const backups = computed(() => {
 					...backup.task,
 					...progressState,
 				},
-
+				status: hasOngoingTask
+					? ('in_progress' as const)
+					: hasCompletedTask
+						? ('done' as const)
+						: backup.status,
 				ongoing: hasOngoingTask || (backup.ongoing && !hasCompletedTask),
 			}
 		}
@@ -304,8 +308,8 @@ const backupCreationDisabled = computed(() => {
 	if (busyReasons.value.length > 0) {
 		return formatMessage(busyReasons.value[0].reason)
 	}
-	// also check API data for ongoing backups (before ws fires)
-	if (backupsData.value?.some((backup) => backup.ongoing)) {
+	// also check for active backups, combining REST data with WS overlay
+	if (backups.value.some((b) => b.status === 'in_progress' || b.status === 'pending')) {
 		return 'A backup is already in progress'
 	}
 	return undefined