This commit is contained in:
2026-08-08 20:55:01 +02:00
parent 8f3fd6a127
commit 93800e8460
5 changed files with 80 additions and 9 deletions
+12 -1
View File
@@ -1,11 +1,12 @@
<script lang="ts" setup> <script lang="ts" setup>
import 'highlight.js/styles/github-dark.css' import 'highlight.js/styles/github-dark.css'
import {computed, nextTick, ref, watch} from 'vue'; import {computed, nextTick, onMounted, onUnmounted, ref, watch} from 'vue';
import {storeToRefs} from 'pinia'; import {storeToRefs} from 'pinia';
import {useMessageStore} from '@/stores/message'; import {useMessageStore} from '@/stores/message';
import {useServerStore} from '@/stores/server'; import {useServerStore} from '@/stores/server';
import {useUserStore} from "@/stores/user.ts"; import {useUserStore} from "@/stores/user.ts";
import {useMarkdown} from '@/composables/useMarkdown' import {useMarkdown} from '@/composables/useMarkdown'
import {onReloadAll} from '@/plugins/events.ts'
const props = defineProps<{ const props = defineProps<{
serverId: string serverId: string
@@ -186,6 +187,16 @@ const returnToRecentMessages = async () => {
await markCurrentChannelRead(channelId.value); await markCurrentChannelRead(channelId.value);
}; };
let stopReloadAll: (() => void) | null = null;
onMounted(() => {
stopReloadAll = onReloadAll(() => messageStore.fetchMessages(channelId.value));
});
onUnmounted(() => {
stopReloadAll?.();
});
// Only explicit initial loads and realtime messages received while at the // Only explicit initial loads and realtime messages received while at the
// bottom request an automatic scroll. Pagination restores its own anchor. // bottom request an automatic scroll. Pagination restores its own anchor.
watch(messages, async () => { watch(messages, async () => {
+12 -1
View File
@@ -2,7 +2,7 @@
import {storeToRefs} from 'pinia' import {storeToRefs} from 'pinia'
import {useChannelStore} from '@/stores/channel' import {useChannelStore} from '@/stores/channel'
import {useCategoryStore} from '@/stores/category' import {useCategoryStore} from '@/stores/category'
import {computed, ref, watch} from 'vue' import {computed, onMounted, onUnmounted, ref, watch} from 'vue'
import {useRoute} from 'vue-router' import {useRoute} from 'vue-router'
import CreateChannelDialog from '@/components/channel/CreateChannelDialog.vue' import CreateChannelDialog from '@/components/channel/CreateChannelDialog.vue'
import CreateCategoryDialog from '@/components/category/CreateCategoryDialog.vue' import CreateCategoryDialog from '@/components/category/CreateCategoryDialog.vue'
@@ -12,6 +12,7 @@ import {useServerStore} from "@/stores/server.ts";
import ChannelPermissionsDialog from '@/components/permissions/ChannelPermissionsDialog.vue' import ChannelPermissionsDialog from '@/components/permissions/ChannelPermissionsDialog.vue'
import {useAuthStore} from '@/stores/auth' import {useAuthStore} from '@/stores/auth'
import ServerSettingsDialog from '@/components/server/ServerSettingsDialog.vue' import ServerSettingsDialog from '@/components/server/ServerSettingsDialog.vue'
import {onReloadAll} from '@/plugins/events.ts'
const props = defineProps<{ const props = defineProps<{
serverId: string serverId: string
@@ -48,6 +49,16 @@ const loadServerData = async (targetServerId: string) => {
} }
} }
let stopReloadAll: (() => void) | null = null
onMounted(() => {
stopReloadAll = onReloadAll(() => loadServerData(props.serverId))
})
onUnmounted(() => {
stopReloadAll?.()
})
watch( watch(
() => props.serverId, () => props.serverId,
async (newServerId) => { async (newServerId) => {
+21
View File
@@ -1,5 +1,9 @@
export const bus = new EventTarget(); export const bus = new EventTarget();
type ReloadAllHandler = () => void | Promise<void>;
const reloadAllHandlers = new Set<ReloadAllHandler>();
export function emitGatewayEvent(namespace: string, action: string, content: any) { export function emitGatewayEvent(namespace: string, action: string, content: any) {
// On construit le nom de l'événement de manière cohérente : gateway:message // On construit le nom de l'événement de manière cohérente : gateway:message
const eventName = `gateway:${namespace.toLowerCase()}`; const eventName = `gateway:${namespace.toLowerCase()}`;
@@ -17,3 +21,20 @@ export function onGatewayEvent(namespace: string, callback: (payload: { action:
// Retourne une fonction pour se désabonner facilement si besoin // Retourne une fonction pour se désabonner facilement si besoin
return () => bus.removeEventListener(eventName, wrapper); return () => bus.removeEventListener(eventName, wrapper);
} }
export function onReloadAll(handler: ReloadAllHandler) {
reloadAllHandlers.add(handler);
return () => reloadAllHandlers.delete(handler);
}
export async function emitReloadAll() {
const results = await Promise.allSettled(
Array.from(reloadAllHandlers, handler => Promise.resolve().then(handler)),
);
for (const result of results) {
if (result.status === 'rejected') {
console.error('Reload after WebSocket reconnection failed:', result.reason);
}
}
}
+14 -3
View File
@@ -1,6 +1,6 @@
import {defineStore} from 'pinia'; import {defineStore} from 'pinia';
import {useAppStore} from "@/stores/app.ts"; import {useAppStore} from "@/stores/app.ts";
import {emitGatewayEvent} from "@/plugins/events.ts"; import {emitGatewayEvent, emitReloadAll} from "@/plugins/events.ts";
type GatewayStatus = 'disconnected' | 'connecting' | 'connected' | 'error' type GatewayStatus = 'disconnected' | 'connecting' | 'connected' | 'error'
@@ -10,6 +10,7 @@ export const useGatewayStore = defineStore('gateway', {
status: 'disconnected' as GatewayStatus, status: 'disconnected' as GatewayStatus,
reconnectAttempts: 0, reconnectAttempts: 0,
shouldReconnect: false, shouldReconnect: false,
reloadOnConnect: false,
reconnectTimer: null as number | null, reconnectTimer: null as number | null,
}), }),
@@ -34,22 +35,31 @@ export const useGatewayStore = defineStore('gateway', {
const socket = new WebSocket(wsUrl) const socket = new WebSocket(wsUrl)
socket.onopen = () => { socket.onopen = () => {
if (this.socket !== socket) return
const shouldReload = this.reloadOnConnect
this.status = 'connected' this.status = 'connected'
this.reconnectAttempts = 0 this.reconnectAttempts = 0
this.reloadOnConnect = false
if (shouldReload) {
void emitReloadAll()
}
} }
socket.onclose = () => { socket.onclose = () => {
if (this.socket !== socket) return
this.status = 'disconnected' this.status = 'disconnected'
if (this.socket === socket) {
this.socket = null this.socket = null
}
if (this.shouldReconnect) { if (this.shouldReconnect) {
this.reloadOnConnect = true
this.scheduleReconnect() this.scheduleReconnect()
} }
} }
socket.onerror = () => { socket.onerror = () => {
if (this.socket !== socket) return
this.status = 'error' this.status = 'error'
} }
@@ -70,6 +80,7 @@ export const useGatewayStore = defineStore('gateway', {
this.socket = null this.socket = null
this.status = 'disconnected' this.status = 'disconnected'
this.reconnectAttempts = 0 this.reconnectAttempts = 0
this.reloadOnConnect = false
}, },
async send(payload: object) { async send(payload: object) {
+17
View File
@@ -5,8 +5,10 @@ import {useServerStore} from '@/stores/server.ts'
import {useCategoryStore} from '@/stores/category.ts' import {useCategoryStore} from '@/stores/category.ts'
import {useChannelStore} from '@/stores/channel.ts' import {useChannelStore} from '@/stores/channel.ts'
import {useMessageStore} from '@/stores/message.ts' import {useMessageStore} from '@/stores/message.ts'
import {onReloadAll} from '@/plugins/events.ts'
let bootstrapPromise: Promise<void> | null = null let bootstrapPromise: Promise<void> | null = null
let reloadServersPromise: Promise<void> | null = null
export const useSessionStore = defineStore('session', { export const useSessionStore = defineStore('session', {
state: () => ({ state: () => ({
@@ -77,6 +79,19 @@ export const useSessionStore = defineStore('session', {
]) ])
}, },
async reloadServers() {
if (reloadServersPromise) {
return reloadServersPromise
}
const serverStore = useServerStore()
reloadServersPromise = serverStore.fetchServers().finally(() => {
reloadServersPromise = null
})
return reloadServersPromise
},
async login(username: string, password: string) { async login(username: string, password: string) {
const authStore = useAuthStore() const authStore = useAuthStore()
@@ -94,3 +109,5 @@ export const useSessionStore = defineStore('session', {
}, },
}, },
}) })
onReloadAll(() => useSessionStore().reloadServers())