Revert "feat: sync individual content installation states on panel" (#7154)

Revert "feat: sync individual content installation states on panel (#6909)"

This reverts commit 9628b4c269.

packages/ui/src/composables/server-manage-core-runtime.ts

@@ -5,23 +5,19 @@ import {
 	type UploadState,
 } from '@modrinth/api-client'
 import type { ComputedRef, Ref } from 'vue'
-import { computed, ref, watch } from 'vue'
+import { computed, ref } from 'vue'
 
 import type { FileOperation } from '../layouts/shared/files-tab/types'
 import { injectModrinthClient, provideModrinthServerContext } from '../providers'
 import type { BusyReason, CancelUploadHandler, ServerStats } from '../providers/server-context'
 import { defineMessage } from './i18n'
 import { useModrinthServersConsole } from './server-console'
-import {
-	retainServerContextRuntime,
-	type ServerContextRuntimeLease,
-} from './server-context-runtime'
-import { useServerInstallationTracker } from './server-installation-tracker'
 
 type ReadableRef<T> = Ref<T> | ComputedRef<T>
 type SocketUnsubscriber = () => void
 
 type ConnectSocketOptions = {
+	force?: boolean
 	extraSubscriptions?: (targetServerId: string) => SocketUnsubscriber[]
 }
 
@@ -30,7 +26,7 @@ type UseServerManageCoreRuntimeOptions = {
 	worldId: ReadableRef<string | null>
 	server: ReadableRef<Archon.Servers.v0.Server | null | undefined>
 	serverFull?: ReadableRef<Archon.Servers.v1.ServerFull | null | undefined>
-	content?: ReadableRef<Archon.Content.v1.Addons | null | undefined>
+	isSyncingContent: ReadableRef<boolean>
 	extraBusyReasons?: ComputedRef<BusyReason[]>
 	setDisconnectedOnAuthIncorrect?: boolean
 	syncUptimeFromState?: boolean
@@ -100,25 +96,10 @@ export function useServerManageCoreRuntime(options: UseServerManageCoreRuntimeOp
 	const fsAuth = ref<{ url: string; token: string } | null>(null)
 	const fsOps = ref<Archon.Websocket.v0.FilesystemOperation[]>([])
 	const fsQueuedOps = ref<Archon.Websocket.v0.QueuedFilesystemOp[]>([])
-	const {
-		begin: beginInstallation,
-		cancelOptimistic: cancelOptimisticInstallation,
-		dismiss: dismissInstallation,
-		handleProgress: handleInstallProgress,
-		installation,
-		installProgressItems,
-		isBlocking: isInstallationBlocking,
-		reset: resetInstallation,
-	} = useServerInstallationTracker({
-		worldId: options.worldId,
-		server: options.server,
-		content: options.content,
-	})
 	const connectedSocketServerId = ref<string | null>(null)
 	const socketUnsubscribers = ref<SocketUnsubscriber[]>([])
 	const cpuData = ref<number[]>([])
 	const ramData = ref<number[]>([])
-	let serverContextRuntimeLease: ServerContextRuntimeLease | null = null
 
 	let uptimeIntervalId: ReturnType<typeof setInterval> | null = null
 	let staleStatsTimeoutId: ReturnType<typeof setTimeout> | null = null
@@ -126,7 +107,7 @@ export function useServerManageCoreRuntime(options: UseServerManageCoreRuntimeOp
 
 	const busyReasons = computed<BusyReason[]>(() => {
 		const reasons: BusyReason[] = []
-		if (isInstallationBlocking.value) {
+		if (options.server.value?.status === 'installing') {
 			reasons.push({
 				reason: defineMessage({
 					id: 'servers.busy.installing',
@@ -134,6 +115,14 @@ export function useServerManageCoreRuntime(options: UseServerManageCoreRuntimeOp
 				}),
 			})
 		}
+		if (options.isSyncingContent.value) {
+			reasons.push({
+				reason: defineMessage({
+					id: 'servers.busy.syncing-content',
+					defaultMessage: 'Content sync in progress',
+				}),
+			})
+		}
 		if (options.extraBusyReasons) reasons.push(...options.extraBusyReasons.value)
 		return reasons
 	})
@@ -276,6 +265,20 @@ export function useServerManageCoreRuntime(options: UseServerManageCoreRuntimeOp
 		startUptimeTicker()
 	}
 
+	const handleAuthIncorrect = () => {
+		if (!shouldProcessEvent()) return
+		isWsAuthIncorrect.value = true
+		if (options.setDisconnectedOnAuthIncorrect) {
+			isConnected.value = false
+		}
+	}
+
+	const handleAuthOk = () => {
+		if (!shouldProcessEvent()) return
+		isWsAuthIncorrect.value = false
+		isConnected.value = true
+	}
+
 	const clearSocketListeners = () => {
 		for (const unsub of socketUnsubscribers.value) unsub()
 		socketUnsubscribers.value = []
@@ -285,8 +288,10 @@ export function useServerManageCoreRuntime(options: UseServerManageCoreRuntimeOp
 		if (!targetServerId && !connectedSocketServerId.value) return
 
 		clearSocketListeners()
-		serverContextRuntimeLease?.release()
-		serverContextRuntimeLease = null
+
+		if (targetServerId) {
+			client.archon.sockets.disconnect(targetServerId)
+		}
 
 		stopUptimeTicker()
 		clearStaleStatsTimers()
@@ -296,7 +301,6 @@ export function useServerManageCoreRuntime(options: UseServerManageCoreRuntimeOp
 		serverPowerState.value = 'stopped'
 		powerStateDetails.value = undefined
 		uptimeSeconds.value = 0
-		resetInstallation()
 	}
 
 	const connectSocket = async (
@@ -313,11 +317,14 @@ export function useServerManageCoreRuntime(options: UseServerManageCoreRuntimeOp
 		disconnectSocket(connectedSocketServerId.value ?? undefined)
 
 		try {
-			const runtimeLease = retainServerContextRuntime(client, targetServerId, {
-				connect: false,
-			})
-			serverContextRuntimeLease = runtimeLease
+			const safeConnectOptions = connectOptions.force ? { force: true } : undefined
+			await client.archon.sockets.safeConnect(targetServerId, safeConnectOptions)
 			connectedSocketServerId.value = targetServerId
+			isConnected.value = true
+			isWsAuthIncorrect.value = false
+
+			modrinthServersConsole.clear()
+			modrinthServersConsole.beginInitialLogHydration()
 
 			const baseSubscriptions: SocketUnsubscriber[] = [
 				client.archon.sockets.on(targetServerId, 'log', handleLog),
@@ -326,45 +333,15 @@ export function useServerManageCoreRuntime(options: UseServerManageCoreRuntimeOp
 				client.archon.sockets.on(targetServerId, 'state', handleState),
 				client.archon.sockets.on(targetServerId, 'power-state', handlePowerState),
 				client.archon.sockets.on(targetServerId, 'uptime', handleUptime),
-				watch(
-					runtimeLease.installProgressItems,
-					(items) => {
-						if (shouldProcessEvent()) handleInstallProgress(items)
-					},
-					{ immediate: true },
-				),
-				watch(
-					runtimeLease.isSocketAuthenticated,
-					(authenticated) => {
-						if (!shouldProcessEvent()) return
-						if (authenticated || options.setDisconnectedOnAuthIncorrect) {
-							isConnected.value = authenticated
-						}
-					},
-					{ immediate: true },
-				),
-				watch(
-					runtimeLease.isSocketAuthIncorrect,
-					(authIncorrect) => {
-						if (shouldProcessEvent()) isWsAuthIncorrect.value = authIncorrect
-					},
-					{ immediate: true },
-				),
+				client.archon.sockets.on(targetServerId, 'auth-incorrect', handleAuthIncorrect),
+				client.archon.sockets.on(targetServerId, 'auth-ok', handleAuthOk),
 			]
 			const extraSubscriptions = connectOptions.extraSubscriptions?.(targetServerId) ?? []
 			socketUnsubscribers.value = [...baseSubscriptions, ...extraSubscriptions]
-
-			modrinthServersConsole.clear()
-			modrinthServersConsole.beginInitialLogHydration()
-
-			await runtimeLease.waitUntilReady()
-			isConnected.value = true
-			isWsAuthIncorrect.value = false
-
 			return true
 		} catch (error) {
 			console.error('[hosting/manage] Failed to connect server socket:', error)
-			disconnectSocket(targetServerId)
+			isConnected.value = false
 			return false
 		}
 	}
@@ -425,11 +402,7 @@ export function useServerManageCoreRuntime(options: UseServerManageCoreRuntimeOp
 		isServerRunning,
 		stats,
 		uptimeSeconds,
-		installProgressItems,
-		installation,
-		beginInstallation,
-		cancelOptimisticInstallation,
-		dismissInstallation,
+		isSyncingContent: options.isSyncingContent as Ref<boolean>,
 		busyReasons,
 		fsAuth,
 		fsOps,
@@ -450,25 +423,20 @@ export function useServerManageCoreRuntime(options: UseServerManageCoreRuntimeOp
 
 	return {
 		activeOperations,
-		beginInstallation,
 		busyReasons,
 		cancelUpload,
-		cancelOptimisticInstallation,
 		cleanupCoreRuntime,
 		connectSocket,
 		connectedSocketServerId,
 		cpuData,
 		disconnectSocket,
-		dismissInstallation,
 		dismissOperation,
 		fsAuth,
 		fsOps,
 		fsQueuedOps,
-		installation,
 		isConnected,
 		isServerRunning,
 		isWsAuthIncorrect,
-		installProgressItems,
 		powerStateDetails,
 		ramData,
 		refreshFsAuth,