mirror of
https://github.com/legop3/MultiRoombaRover.git
synced 2026-09-17 01:50:47 -04:00
update nickname on reconnect
This commit is contained in:
File diff suppressed because one or more lines are too long
@@ -5,7 +5,7 @@
|
|||||||
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
<title>webui</title>
|
<title>webui</title>
|
||||||
<script type="module" crossorigin src="/assets/index-Dsw_Z9n0.js"></script>
|
<script type="module" crossorigin src="/assets/index-BSgR8Uj3.js"></script>
|
||||||
<link rel="stylesheet" crossorigin href="/assets/index-CCqAmxiE.css">
|
<link rel="stylesheet" crossorigin href="/assets/index-CCqAmxiE.css">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { useEffect, useMemo, useRef, useState } from 'react';
|
import { useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import { useSession } from '../context/SessionContext.jsx';
|
import { useSession } from '../context/SessionContext.jsx';
|
||||||
import { useSettingsNamespace } from '../settings/index.js';
|
import { useSettingsNamespace } from '../settings/index.js';
|
||||||
|
import { useSocket } from '../context/SocketContext.jsx';
|
||||||
|
|
||||||
function roleColors(role) {
|
function roleColors(role) {
|
||||||
switch (role) {
|
switch (role) {
|
||||||
@@ -29,7 +30,8 @@ export default function UserListPanel() {
|
|||||||
const { value, save } = useSettingsNamespace('profile', { nickname: '' });
|
const { value, save } = useSettingsNamespace('profile', { nickname: '' });
|
||||||
const [nicknameInput, setNicknameInput] = useState(value.nickname || '');
|
const [nicknameInput, setNicknameInput] = useState(value.nickname || '');
|
||||||
const [saving, setSaving] = useState(false);
|
const [saving, setSaving] = useState(false);
|
||||||
const hasSyncedRef = useRef(false);
|
const lastSyncedSocketRef = useRef(null);
|
||||||
|
const socket = useSocket();
|
||||||
const canSetNickname = session?.role !== 'spectator';
|
const canSetNickname = session?.role !== 'spectator';
|
||||||
const users = session?.users ?? [];
|
const users = session?.users ?? [];
|
||||||
const selfId = session?.socketId || null;
|
const selfId = session?.socketId || null;
|
||||||
@@ -39,16 +41,30 @@ export default function UserListPanel() {
|
|||||||
}, [value.nickname]);
|
}, [value.nickname]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (hasSyncedRef.current) return;
|
|
||||||
if (!canSetNickname) return;
|
if (!canSetNickname) return;
|
||||||
if (!session?.socketId) return;
|
if (!session?.socketId) return;
|
||||||
if (!nicknameInput) return;
|
if (!nicknameInput) return;
|
||||||
hasSyncedRef.current = true;
|
if (session.socketId === lastSyncedSocketRef.current) return;
|
||||||
setNickname(nicknameInput).catch(() => {
|
const currentId = session.socketId;
|
||||||
hasSyncedRef.current = false;
|
setNickname(nicknameInput).then(() => {
|
||||||
});
|
lastSyncedSocketRef.current = currentId;
|
||||||
|
}).catch(() => {});
|
||||||
}, [canSetNickname, nicknameInput, session?.socketId, setNickname]);
|
}, [canSetNickname, nicknameInput, session?.socketId, setNickname]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!socket) return undefined;
|
||||||
|
const handleConnect = () => {
|
||||||
|
if (!canSetNickname) return;
|
||||||
|
const nick = (value.nickname || '').trim();
|
||||||
|
if (!nick) return;
|
||||||
|
setNickname(nick).then(() => {
|
||||||
|
lastSyncedSocketRef.current = session?.socketId || null;
|
||||||
|
}).catch(() => {});
|
||||||
|
};
|
||||||
|
socket.on('connect', handleConnect);
|
||||||
|
return () => socket.off('connect', handleConnect);
|
||||||
|
}, [canSetNickname, setNickname, socket, value.nickname, session?.socketId]);
|
||||||
|
|
||||||
const sorted = useMemo(
|
const sorted = useMemo(
|
||||||
() =>
|
() =>
|
||||||
[...users].sort((a, b) => {
|
[...users].sort((a, b) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user