NEW! refactor code to ALLOW look for chat history and inventory EVEN AFTER being disconnected!

Author: zardoy

src/controls.ts

@@ -463,12 +463,17 @@ const customCommandsHandler = ({ command }) => {
 }
 contro.on('trigger', customCommandsHandler)
 
+const isCommandAvailableAfterDisconnect = (command: Command) => {
+  if (!miscUiState.disconnectedCleanup?.wasConnected) return false
+  return command === 'general.chat' || command === 'general.inventory'
+}
+
 contro.on('trigger', ({ command }) => {
   if (isCommandDisabled(command)) return
 
   const willContinue = !isGameActive(true)
   alwaysPressedHandledCommand(command)
-  if (willContinue) return
+  if (willContinue && !isCommandAvailableAfterDisconnect(command)) return
 
   const secondActionCommand = secondActionCommands[command]
   if (secondActionCommand) {

src/globalState.ts

@@ -133,9 +133,17 @@ export const miscUiState = proxy({
   appConfig: null as AppConfig | null,
   displaySearchInput: false,
   displayFullmap: false,
-  fullscreen: false
+  fullscreen: false,
+  disconnectedCleanup: null as { callback: () => void, date: number, wasConnected: boolean } | null
 })
 
+export const maybeCleanupAfterDisconnect = () => {
+  if (miscUiState.disconnectedCleanup) {
+    miscUiState.disconnectedCleanup.callback()
+    miscUiState.disconnectedCleanup = null
+  }
+}
+
 window.miscUiState = miscUiState
 
 export const isGameActive = (foregroundCheck: boolean) => {

src/index.ts

@@ -50,6 +50,7 @@ import {
   miscUiState,
   showModal,
   gameAdditionalState,
+  maybeCleanupAfterDisconnect,
 } from './globalState'
 
 import { parseServerAddress } from './parseServerAddress'
@@ -168,6 +169,8 @@ export async function connect (connectOptions: ConnectOptions) {
     })
   }
 
+  maybeCleanupAfterDisconnect()
+
   appStatusState.showReconnect = false
   loadingTimerState.loading = true
   loadingTimerState.start = Date.now()
@@ -212,12 +215,13 @@ export async function connect (connectOptions: ConnectOptions) {
 
   let ended = false
   let bot!: typeof __type_bot
+  let hadWorldLoaded = false
   let hadConnected = false
-  const destroyAll = (wasKicked = false) => {
+  const handleSessionEnd = (wasKicked = false) => {
     if (ended) return
     loadingTimerState.loading = false
     const { alwaysReconnect } = appQueryParams
-    if ((!wasKicked && miscUiState.appConfig?.allowAutoConnect && appQueryParams.autoConnect && hadConnected) || (alwaysReconnect)) {
+    if ((!wasKicked && miscUiState.appConfig?.allowAutoConnect && appQueryParams.autoConnect && hadWorldLoaded) || (alwaysReconnect)) {
       if (alwaysReconnect === 'quick' || alwaysReconnect === 'fast') {
         quickDevReconnect()
       } else {
@@ -227,26 +231,33 @@ export async function connect (connectOptions: ConnectOptions) {
     errorAbortController.abort()
     ended = true
     progress.end()
-    // dont reset viewer so we can still do debugging
-    localServer = window.localServer = window.server = undefined
-    gameAdditionalState.viewerConnection = false
-
-    if (bot) {
-      bot.end()
-      // ensure mineflayer plugins receive this event for cleanup
-      bot.emit('end', '')
-      bot.removeAllListeners()
-      bot._client.removeAllListeners()
-      bot._client = {
-        //@ts-expect-error
-        write (packetName) {
-          console.warn('Tried to write packet', packetName, 'after bot was destroyed')
+    bot.end()
+    // ensure mineflayer plugins receive this event for cleanup
+    bot.emit('end', '')
+
+    miscUiState.disconnectedCleanup = {
+      callback () {
+        appViewer.resetBackend(true)
+        localServer = window.localServer = window.server = undefined
+        gameAdditionalState.viewerConnection = false
+
+        if (bot) {
+          bot.removeAllListeners()
+          bot._client.removeAllListeners()
+          bot._client = {
+            //@ts-expect-error
+            write (packetName) {
+              console.warn('Tried to write packet', packetName, 'after bot was destroyed')
+            }
+          }
+          //@ts-expect-error
+          window.bot = bot = undefined
         }
-      }
-      //@ts-expect-error
-      window.bot = bot = undefined
+        cleanFs()
+      },
+      date: Date.now(),
+      wasConnected: hadConnected
     }
-    cleanFs()
   }
   const cleanFs = () => {
     if (singleplayer && !fsState.inMemorySave) {
@@ -277,7 +288,7 @@ export async function connect (connectOptions: ConnectOptions) {
     setLoadingScreenStatus(`Error encountered. ${err}`, true)
     appStatusState.showReconnect = true
     onPossibleErrorDisconnect()
-    destroyAll()
+    handleSessionEnd()
   }
 
   // todo(hard): remove it!
@@ -678,7 +689,7 @@ export async function connect (connectOptions: ConnectOptions) {
     }
     setLoadingScreenStatus(`The Minecraft server kicked you. Kick reason: ${kickReasonString}`, true, undefined, undefined, kickReasonFormatted)
     appStatusState.showReconnect = true
-    destroyAll(true)
+    handleSessionEnd(true)
   })
 
   const packetBeforePlay = (_, __, ___, fullBuffer) => {
@@ -705,13 +716,14 @@ export async function connect (connectOptions: ConnectOptions) {
     setLoadingScreenStatus(`You have been disconnected from the server. End reason:\n${endReason}`, true)
     appStatusState.showReconnect = true
     onPossibleErrorDisconnect()
-    destroyAll()
+    handleSessionEnd()
     if (isCypress()) throw new Error(`disconnected: ${endReason}`)
   })
 
   onBotCreate()
 
   bot.once('login', () => {
+    hadConnected = true
     errorAbortController.abort()
     loadingTimerState.networkOnlyStart = 0
     progress.setMessage('Loading world')
@@ -871,7 +883,7 @@ export async function connect (connectOptions: ConnectOptions) {
     } catch (err) {
       handleError(err)
     }
-    hadConnected = true
+    hadWorldLoaded = true
   }
   // don't use spawn event, player can be dead
   bot.once(spawnEarlier ? 'forcedMove' : 'health', displayWorld)

src/inventoryWindows.ts

@@ -408,7 +408,7 @@ const upWindowItemsLocal = () => {
 let skipClosePacketSending = false
 const openWindow = (type: string | undefined, title: string | any = undefined) => {
   // if (activeModalStack.some(x => x.reactType?.includes?.('player_win:'))) {
-  if (activeModalStack.length) { // game is not in foreground, don't close current modal
+  if (activeModalStack.length && !miscUiState.disconnectedCleanup) { // game is not in foreground, don't close current modal
     if (type) {
       skipClosePacketSending = true
       hideCurrentModal()

src/react/AppStatusProvider.tsx

@@ -1,6 +1,6 @@
 import { proxy, useSnapshot } from 'valtio'
 import { useEffect, useRef, useState } from 'react'
-import { activeModalStack, activeModalStacks, hideModal, insertActiveModalStack, miscUiState } from '../globalState'
+import { activeModalStack, activeModalStacks, hideModal, insertActiveModalStack, maybeCleanupAfterDisconnect, miscUiState } from '../globalState'
 import { guessProblem } from '../errorLoadingScreenHelpers'
 import type { ConnectOptions } from '../connect'
 import { downloadPacketsReplay, packetsRecordingState, replayLogger } from '../packetsReplay/packetsReplayLegacy'
@@ -153,6 +153,8 @@ export default () => {
   let backAction = undefined as (() => void) | undefined
   if (maybeRecoverable && (!lockConnect || !wasDisconnected)) {
     backAction = () => {
+      maybeCleanupAfterDisconnect()
+
       if (!wasDisconnected) {
         hideModal(undefined, undefined, { force: true })
         return

src/react/ChatProvider.tsx

@@ -17,7 +17,10 @@ export default () => {
   const isChatActive = useIsModalActive('chat')
   const lastMessageId = useRef(0)
   const lastPingTime = useRef(0)
-  const usingTouch = useSnapshot(miscUiState).currentTouch
+  const {
+    currentTouch: usingTouch,
+    disconnectedCleanup
+  } = useSnapshot(miscUiState)
   const {
     chatSelect,
     messagesLimit,
@@ -61,6 +64,8 @@ export default () => {
     })
   }, [])
 
+  const disabledReason = disconnectedCleanup ? 'You have been disconnected from the server on ' + new Date(disconnectedCleanup.date).toLocaleString() : undefined
+
   return <Chat
     chatVanillaRestrictions={chatVanillaRestrictions}
     debugChatScroll={debugChatScroll}
@@ -70,6 +75,7 @@ export default () => {
     messages={messages}
     opened={isChatActive}
     placeholder={forwardChat || !viewerConnection ? undefined : 'Chat forwarding is not enabled in the plugin settings'}
+    inputDisabled={disabledReason}
     currentPlayerName={chatPingExtension ? bot.username : undefined}
     spellCheckEnabled={chatSpellCheckEnabled}
     onSpellCheckEnabledChange={(enabled) => {

src/reactUi.tsx

@@ -141,15 +141,17 @@ const InGameComponent = ({ children }) => {
 let adapter: DrawerAdapterImpl
 
 const InGameUi = () => {
-  const { gameLoaded, showUI: showUIRaw } = useSnapshot(miscUiState)
+  const { gameLoaded, showUI: showUIRaw, disconnectedCleanup } = useSnapshot(miscUiState)
   const { disabledUiParts, displayBossBars, showMinimap } = useSnapshot(options)
   const modalsSnapshot = useSnapshot(activeModalStack)
   const hasModals = modalsSnapshot.length > 0
   const showUI = showUIRaw || hasModals
   const displayFullmap = modalsSnapshot.some(modal => modal.reactType === 'full-map') || true
   // bot can't be used here
 
-  if (!gameLoaded || !bot || disabledUiParts.includes('*')) return
+  const gameWasLoaded = gameLoaded || disconnectedCleanup?.wasConnected
+
+  if (!gameWasLoaded || !bot || disabledUiParts.includes('*')) return
 
   if (!adapter) adapter = new DrawerAdapterImpl(bot.entity.position)