Handle Battle, Lobby, Party, and Matchmaking status reconnections

lang/dev/lobby.json

@@ -570,6 +570,13 @@
                 "luaOptionsModal": {
                     "resetAllToDefault": "Reest all to dfauelt",
                     "close": "Csole"
+                },
+                "rejoinBattleModal": {
+                    "title": "Reojin Blatte?",
+                    "description1": "The sveerr idecatind that you were in an avctie btalte.",
+                    "description2": "Wulod you like to atemtpt to rejoin the btalte?",
+                    "rejoinButton": "Reojin",
+                    "ignoreButton": "Ingroe"
                 }
             },
             "controls": {

lang/en/lobby.json

@@ -570,6 +570,13 @@
                 "luaOptionsModal": {
                     "resetAllToDefault": "Reset all to default",
                     "close": "Close"
+                },
+                "rejoinBattleModal": {
+                    "title": "Rejoin Battle?",
+                    "description1": "The server indicated that you were in an active battle.",
+                    "description2": "Would you like to attempt to rejoin the battle?",
+                    "rejoinButton": "Rejoin",
+                    "ignoreButton": "Ignore"
                 }
             },
             "controls": {

src/main/main-window.ts

@@ -43,6 +43,7 @@ export function createWindow() {
             preload: path.join(__dirname, "../build/preload.js"),
             zoomFactor: 1,
             spellcheck: false,
+            autoplayPolicy: "no-user-gesture-required",
         },
     });
 

src/main/tachyon/tachyon.handlers.ts

@@ -53,9 +53,7 @@ function createBattleHandlers(webContents: BarIpcWebContents) {
                     });
                     return { status: "failed", reason: "internal_error" };
                 } else {
-                    const { ip, port, username, password } = data;
-                    const springString = `spring://${username}:${password}@${ip}:${port}`;
-                    webContents.send("tachyon:battleStart", springString, data);
+                    webContents.send("tachyon:battleStart", data);
                     return {
                         status: "success",
                     };

src/main/typed-ipc.ts

@@ -5,7 +5,7 @@
 import type { AuthState } from "@main/services/auth.service";
 import type { StoredIdentity } from "@main/model/user";
 import type { BattleWithMetadata } from "@main/game/battle/battle-types";
-import type { BattleStartRequestData } from "tachyon-protocol/types";
+import type { BattleStartRequestData, BattleEndedEventData } from "tachyon-protocol/types";
 import type { ContentRef } from "@main/content/content-ref";
 import type { ContentPresence, ContentState } from "@main/content/content-state";
 import type { DownloadInfo } from "@main/content/downloads";
@@ -47,7 +47,8 @@ export type IPCEvents = {
     "replays:replayCachingStarted": (filename: string) => void;
     "replays:replayDeleted": (filename: string) => void;
     "replays:highlightOpened": (fileNames: string[]) => void;
-    "tachyon:battleStart": (springString: string, data: BattleStartRequestData) => void;
+    "tachyon:battleStart": (data: BattleStartRequestData) => void;
+    "tachyon:battleEnded": (data: BattleEndedEventData) => void;
     "tachyon:connected": () => void;
     "tachyon:disconnected": () => void;
     "tachyon:event": (event: TachyonEvent) => void;

src/preload/preload.ts

@@ -16,7 +16,7 @@ import { DownloadInfo } from "@main/content/downloads";
 import { Info } from "@main/services/info.service";
 import { BattleWithMetadata } from "@main/game/battle/battle-types";
 import { GetCommandData, GetCommandIds, GetCommands } from "tachyon-protocol";
-import type { BattleStartRequestData } from "tachyon-protocol/types";
+import type { BattleStartRequestData, BattleEndedEventData } from "tachyon-protocol/types";
 import { MultiplayerLaunchSettings } from "@main/game/game";
 import { logLevels } from "@main/services/log.service";
 import { Config } from "@main/services/config.service";
@@ -248,7 +248,8 @@ const tachyonApi = {
     onConnected: (callback: () => void) => ipcRenderer.on("tachyon:connected", callback),
     onDisconnected: (callback: () => void) => ipcRenderer.on("tachyon:disconnected", callback),
     onEvent,
-    onBattleStart: (callback: (springString: string, data: BattleStartRequestData) => void) => ipcRenderer.on("tachyon:battleStart", (_event, springString, data) => callback(springString, data)),
+    onBattleStart: (callback: (data: BattleStartRequestData) => void) => ipcRenderer.on("tachyon:battleStart", (_event, data) => callback(data)),
+    onBattleEnded: (callback: (data: BattleEndedEventData) => void) => ipcRenderer.on("tachyon:battleEnded", (_event, data) => callback(data)),
 };
 export type TachyonApi = typeof tachyonApi;
 contextBridge.exposeInMainWorld("tachyon", tachyonApi);

src/renderer/App.vue

@@ -62,6 +62,7 @@ SPDX-License-Identifier: MIT
         <FullscreenGameModeSelector v-if="state === 'default'" :visible="battleStore.isSelectingGameMode" />
         <LogInConfirmationModal v-model="logInConfirmationIsOpen" :intendedRoute="logInConfirmationIntendedRoute" />
         <ReportUserModal />
+        <RejoinBattleModal v-model="tachyonStore.rejoinModalOpen" />
     </div>
     <Error />
 </template>
@@ -89,6 +90,7 @@ import ReconnectingOverlay from "@renderer/components/misc/ReconnectingOverlay.v
 import PromptContainer from "@renderer/components/prompts/PromptContainer.vue";
 import LogInConfirmationModal from "@renderer/components/misc/LogInConfirmationModal.vue";
 import ReportUserModal from "@renderer/components/user/ReportUserModal.vue";
+import RejoinBattleModal from "@renderer/components/battle/RejoinBattleModal.vue";
 
 import { playRandomMusic } from "@renderer/utils/play-random-music";
 import { settingsStore } from "./store/settings.store";

src/renderer/assets/assetFiles.ts

@@ -12,6 +12,7 @@ export const sfxFiles = import.meta.glob<string>(["./audio/sfx/*", "!**/*.licens
 
 // Videos
 export const introVideos = import.meta.glob<string>(["./videos/intros/*", "!**/*.license"], { eager: true, import: "default", query: "?url" });
+export const miscVideos = import.meta.glob<string>(["./videos/misc/*", "!**/*.license"], { eager: true, import: "default", query: "?url" });
 
 // Images
 export const backgroundImages = import.meta.glob<string>(["./images/backgrounds/*", "!**/*.license"], { eager: true, import: "default", query: "?url" });

src/renderer/assets/languages/cs.json

@@ -2553,6 +2553,13 @@
                 "luaOptionsModal": {
                     "resetAllToDefault": null,
                     "close": null
+                },
+                "rejoinBattleModal": {
+                    "title": null,
+                    "description1": null,
+                    "description2": null,
+                    "rejoinButton": null,
+                    "ignoreButton": null
                 }
             },
             "controls": {

src/renderer/assets/languages/de.json

@@ -2424,6 +2424,13 @@
                 "luaOptionsModal": {
                     "resetAllToDefault": null,
                     "close": null
+                },
+                "rejoinBattleModal": {
+                    "title": null,
+                    "description1": null,
+                    "description2": null,
+                    "rejoinButton": null,
+                    "ignoreButton": null
                 }
             },
             "controls": {

src/renderer/assets/languages/dev.json

@@ -570,6 +570,13 @@
                 "luaOptionsModal": {
                     "resetAllToDefault": "Reest all to dfauelt",
                     "close": "Csole"
+                },
+                "rejoinBattleModal": {
+                    "title": "Reojin Blatte?",
+                    "description1": "The sveerr idecatind that you were in an avctie btalte.",
+                    "description2": "Wulod you like to atemtpt to rejoin the btalte?",
+                    "rejoinButton": "Reojin",
+                    "ignoreButton": "Ingroe"
                 }
             },
             "controls": {

src/renderer/assets/languages/en.json

@@ -2401,6 +2401,13 @@
                 "luaOptionsModal": {
                     "resetAllToDefault": "Reset all to default",
                     "close": "Close"
+                },
+                "rejoinBattleModal": {
+                    "title": "Rejoin Battle?",
+                    "description1": "The server indicated that you were in an active battle.",
+                    "description2": "Would you like to attempt to rejoin the battle?",
+                    "rejoinButton": "Rejoin",
+                    "ignoreButton": "Ignore"
                 }
             },
             "controls": {

src/renderer/assets/languages/fr.json

@@ -4406,6 +4406,13 @@
                 "luaOptionsModal": {
                     "resetAllToDefault": null,
                     "close": null
+                },
+                "rejoinBattleModal": {
+                    "title": null,
+                    "description1": null,
+                    "description2": null,
+                    "rejoinButton": null,
+                    "ignoreButton": null
                 }
             },
             "controls": {

src/renderer/assets/languages/ru.json

@@ -4375,6 +4375,13 @@
                 "luaOptionsModal": {
                     "resetAllToDefault": null,
                     "close": null
+                },
+                "rejoinBattleModal": {
+                    "title": null,
+                    "description1": null,
+                    "description2": null,
+                    "rejoinButton": null,
+                    "ignoreButton": null
                 }
             },
             "controls": {

src/renderer/assets/languages/zh.json

@@ -4517,6 +4517,13 @@
                 "luaOptionsModal": {
                     "resetAllToDefault": null,
                     "close": null
+                },
+                "rejoinBattleModal": {
+                    "title": null,
+                    "description1": null,
+                    "description2": null,
+                    "rejoinButton": null,
+                    "ignoreButton": null
                 }
             },
             "controls": {

src/renderer/assets/videos/misc/active_battle.mkv.license

@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2026 The BAR Lobby Authors
+
+SPDX-License-Identifier: CC0-1.0

src/renderer/components/battle/RejoinBattleModal.vue

@@ -0,0 +1,57 @@
+<!--
+SPDX-FileCopyrightText: 2026 The BAR Lobby Authors
+
+SPDX-License-Identifier: MIT
+-->
+
+<template>
+    <Modal v-model="isOpen" :title="t('lobby.components.battle.rejoinBattleModal.title')">
+        <div class="container">
+            <p>{{ t("lobby.components.battle.rejoinBattleModal.description1") }}</p>
+            <p>{{ t("lobby.components.battle.rejoinBattleModal.description2") }}</p>
+            <div class="flex-row flex-center padding-top-lg gap-xl">
+                <Button class="green fullwidth" @click="onConfirm">{{
+                    t("lobby.components.battle.rejoinBattleModal.rejoinButton")
+                }}</Button>
+                <Button class="red fullwidth" @click="onCancel">{{ t("lobby.components.battle.rejoinBattleModal.ignoreButton") }}</Button>
+            </div>
+        </div>
+    </Modal>
+</template>
+
+<script lang="ts" setup>
+import { computed } from "vue";
+import Modal from "@renderer/components/common/Modal.vue";
+import Button from "@renderer/components/controls/Button.vue";
+import { tachyon, tachyonStore } from "@renderer/store/tachyon.store";
+import { useTypedI18n } from "@renderer/i18n";
+
+const { t } = useTypedI18n();
+
+const props = withDefaults(
+    defineProps<{
+        modelValue?: boolean;
+    }>(),
+    { modelValue: false }
+);
+
+const emit = defineEmits<{ (e: "update:modelValue", v: boolean): void }>();
+const isOpen = computed({
+    get: () => props.modelValue,
+    set: (v: boolean) => emit("update:modelValue", v),
+});
+
+function onConfirm() {
+    console.log("Rejoining battle...");
+    if (tachyonStore.springConnectionDetails) {
+        tachyon.launchMultiplayerBattle(tachyonStore.springConnectionDetails);
+    }
+    isOpen.value = false;
+}
+function onCancel() {
+    console.log("Ignoring rejoin battle prompt.");
+    isOpen.value = false;
+}
+</script>
+
+<style lang="scss" scoped></style>

src/renderer/components/maps/MapSimplePreview.vue

@@ -16,6 +16,7 @@ import { useImageBlobUrlCache } from "@renderer/composables/useImageBlobUrlCache
 import vStartBox from "@renderer/directives/vStartBox";
 import vStartPos from "@renderer/directives/vStartPos";
 import { computed, defineComponent } from "vue";
+import defaultMiniMap from "/src/renderer/assets/images/default-minimap.png?url";
 
 defineComponent({
     directives: {
@@ -25,17 +26,14 @@ defineComponent({
 });
 
 const props = defineProps<{
-    map: MapData;
+    map: MapData | undefined;
 }>();
 
-const { get } = useImageBlobUrlCache();
+const cache = useImageBlobUrlCache();
 
-const mapTextureUrl = computed(() => {
-    if (!props.map?.images) {
-        return;
-    }
-    return get(props.map?.springName, props.map?.imagesBlob?.preview);
-});
+const mapTextureUrl = computed(() =>
+    props.map?.imagesBlob?.preview ? cache.get(props.map?.springName, props.map?.imagesBlob?.preview) : defaultMiniMap
+);
 </script>
 
 <style lang="scss" scoped>

src/renderer/components/misc/ActiveBattleVideo.vue

@@ -0,0 +1,24 @@
+<!--
+SPDX-FileCopyrightText: 2026 The BAR Lobby Authors
+
+SPDX-License-Identifier: MIT
+-->
+
+<template>
+    <video :src="video" autoplay muted loop></video>
+</template>
+
+<script lang="ts" setup>
+import { miscVideos } from "@renderer/assets/assetFiles";
+
+const video = miscVideos["./videos/misc/active_battle.mkv"];
+</script>
+
+<style lang="scss" scoped>
+video {
+    max-width: 100%;
+    max-height: 200px;
+    height: auto;
+    object-fit: fill;
+}
+</style>

src/renderer/components/navbar/NavBar.vue

@@ -7,8 +7,11 @@ SPDX-License-Identifier: MIT
 <template>
     <div class="nav" :class="{ hidden }">
         <div class="logo">
-            <Button to="/play/menu?">
-                <img src="/src/renderer/assets/images/logo.svg" />
+            <Button @click="onLogoClick">
+                <div class="logo-container">
+                    <img src="/src/renderer/assets/images/logo.svg" :class="{ dim: tachyonStore.springConnectionDetails }" />
+                    <ActiveBattleVideo class="battle-video" v-if="tachyonStore.springConnectionDetails" />
+                </div>
             </Button>
         </div>
         <div class="flex-col flex-grow">
@@ -126,6 +129,8 @@ import { me } from "@renderer/store/me.store";
 import ServerStatus from "@renderer/components/navbar/ServerStatus.vue";
 import { useLogInConfirmation } from "@renderer/composables/useLogInConfirmation";
 import { chatStore } from "@renderer/store/chat.store";
+import { tachyonStore } from "@renderer/store/tachyon.store";
+import ActiveBattleVideo from "@renderer/components/misc/ActiveBattleVideo.vue";
 
 defineProps<{
     hidden?: boolean;
@@ -173,6 +178,14 @@ function minimizeWindow() {
 function toggleFullscreen() {
     settingsStore.fullscreen = !settingsStore.fullscreen;
 }
+
+function onLogoClick() {
+    if (tachyonStore.springConnectionDetails) {
+        tachyonStore.rejoinModalOpen = true;
+    } else {
+        router.push("/play");
+    }
+}
 </script>
 
 <style lang="scss" scoped>
@@ -361,4 +374,23 @@ function toggleFullscreen() {
     flex-grow: 1;
     -webkit-app-region: drag !important;
 }
+.logo-container {
+    position: relative;
+    display: inline-block;
+}
+.logo-container img {
+    display: block;
+    // max-width: 100%;
+    // height: auto;
+}
+.battle-video {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    z-index: 2;
+}
+.dim {
+    filter: brightness(0.2);
+}
 </style>

src/renderer/store/chat.store.ts

@@ -36,6 +36,10 @@ export const chatStore: {
 });
 
 export async function initChatStore() {
+    if (chatStore.isInitialized) {
+        console.warn("Chat store is already initialized. Skipping initialization.");
+        return;
+    }
     onWentOffline.add(clearOnlineState);
     // Losing the session is the one signal every way of leaving an account reaches:
     // the exit menu, a server switch, and a refresh token the server rejects.