- Added username persistence via localStorage with read-only input behavior.
- Added automatic connect() invocation on page load. - Implemented robust login flow: register or auto-login based on local flags. - Added logout support with clean WebSocket disconnect + state reset. - Updated NakamaProvider with getSession(), autoLogin(), registerWithUsername(). - Connected logout button and integrated updated login behavior into UI.
This commit is contained in:
@@ -6,7 +6,7 @@ import Leaderboard from "./Leaderboard";
|
|||||||
// import MatchList from "./MatchList";
|
// import MatchList from "./MatchList";
|
||||||
|
|
||||||
export default function TicTacToe() {
|
export default function TicTacToe() {
|
||||||
const [username, setUsername] = useState("");
|
const [username, setUsername] = useState(localStorage.getItem("username") ?? "");
|
||||||
const [selectedMode, setSelectedMode] = useState("classic");
|
const [selectedMode, setSelectedMode] = useState("classic");
|
||||||
const [board, setBoard] = useState<string[][]>([
|
const [board, setBoard] = useState<string[][]>([
|
||||||
["", "", ""],
|
["", "", ""],
|
||||||
@@ -35,6 +35,7 @@ export default function TicTacToe() {
|
|||||||
}
|
}
|
||||||
const {
|
const {
|
||||||
loginOrRegister,
|
loginOrRegister,
|
||||||
|
logout,
|
||||||
joinMatchmaker,
|
joinMatchmaker,
|
||||||
onMatchData,
|
onMatchData,
|
||||||
sendMatchData,
|
sendMatchData,
|
||||||
@@ -76,6 +77,10 @@ export default function TicTacToe() {
|
|||||||
onMatchData(onMatchDataCallback);
|
onMatchData(onMatchDataCallback);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
connect();
|
||||||
|
}, []);
|
||||||
|
|
||||||
// ------------------------------------------
|
// ------------------------------------------
|
||||||
// SEND A MOVE
|
// SEND A MOVE
|
||||||
// ------------------------------------------
|
// ------------------------------------------
|
||||||
@@ -102,6 +107,7 @@ export default function TicTacToe() {
|
|||||||
<input
|
<input
|
||||||
placeholder="username"
|
placeholder="username"
|
||||||
value={username}
|
value={username}
|
||||||
|
disabled={username.length > 0}
|
||||||
onChange={(e) => setUsername(e.target.value)}
|
onChange={(e) => setUsername(e.target.value)}
|
||||||
/>
|
/>
|
||||||
<button onClick={connect}>Connect</button>
|
<button onClick={connect}>Connect</button>
|
||||||
@@ -128,6 +134,7 @@ export default function TicTacToe() {
|
|||||||
|
|
||||||
{/* Join matchmaking */}
|
{/* Join matchmaking */}
|
||||||
<button onClick={() => startQueue(selectedMode)}>Join Matchmaking</button>
|
<button onClick={() => startQueue(selectedMode)}>Join Matchmaking</button>
|
||||||
|
<button onClick={() => logout()}>Logout</button>
|
||||||
|
|
||||||
{/*/!* List open matches *!/*/}
|
{/*/!* List open matches *!/*/}
|
||||||
{/*<MatchList matches={openMatches} />*/}
|
{/*<MatchList matches={openMatches} />*/}
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ export interface NakamaContextType {
|
|||||||
matchId: string | null;
|
matchId: string | null;
|
||||||
|
|
||||||
loginOrRegister(username: string): Promise<void>;
|
loginOrRegister(username: string): Promise<void>;
|
||||||
|
logout(): Promise<void>;
|
||||||
joinMatchmaker(mode: string): Promise<string>;
|
joinMatchmaker(mode: string): Promise<string>;
|
||||||
joinMatch(matchId: string): Promise<void>;
|
joinMatch(matchId: string): Promise<void>;
|
||||||
|
|
||||||
@@ -55,17 +56,63 @@ export function NakamaProvider({ children }: { children: React.ReactNode }) {
|
|||||||
const lastModeRef = React.useRef<string | null>(null);
|
const lastModeRef = React.useRef<string | null>(null);
|
||||||
const socketRef = React.useRef<Socket | null>(null);
|
const socketRef = React.useRef<Socket | null>(null);
|
||||||
|
|
||||||
|
async function autoLogin() {
|
||||||
|
const deviceId = getOrCreateDeviceId();
|
||||||
|
|
||||||
|
try {
|
||||||
|
return await client.authenticateDevice(
|
||||||
|
deviceId,
|
||||||
|
false
|
||||||
|
);
|
||||||
|
} catch (e) {
|
||||||
|
// fallback: treat as new user
|
||||||
|
localStorage.removeItem("registered");
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function registerWithUsername(username: string) {
|
||||||
|
const deviceId = getOrCreateDeviceId();
|
||||||
|
|
||||||
|
// create + set username
|
||||||
|
const session = await client.authenticateDevice(
|
||||||
|
deviceId,
|
||||||
|
true,
|
||||||
|
username
|
||||||
|
);
|
||||||
|
|
||||||
|
// mark an account as registered
|
||||||
|
localStorage.setItem("registered", "yes");
|
||||||
|
localStorage.setItem("username", username);
|
||||||
|
|
||||||
|
return session;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getSession(username?: string) {
|
||||||
|
const isRegistered = localStorage.getItem("registered") === "yes";
|
||||||
|
if (!username && !isRegistered) {
|
||||||
|
throw new Error("No username provided and not registered");
|
||||||
|
}
|
||||||
|
|
||||||
|
let newSession;
|
||||||
|
if (!isRegistered) {
|
||||||
|
newSession = await registerWithUsername(username ?? "");
|
||||||
|
} else {
|
||||||
|
newSession = await autoLogin();
|
||||||
|
}
|
||||||
|
|
||||||
|
return newSession;
|
||||||
|
}
|
||||||
|
|
||||||
// ----------------------------------------------------
|
// ----------------------------------------------------
|
||||||
// LOGIN
|
// LOGIN
|
||||||
// ----------------------------------------------------
|
// ----------------------------------------------------
|
||||||
async function loginOrRegister(username: string) {
|
async function loginOrRegister(username?: string) {
|
||||||
const deviceId = getOrCreateDeviceId();
|
|
||||||
|
|
||||||
// authenticate user
|
// authenticate user
|
||||||
const newSession = await client.authenticateDevice(deviceId, true, username);
|
const newSession = await getSession(username);
|
||||||
setSession(newSession);
|
setSession(newSession);
|
||||||
|
|
||||||
// create socket (new Nakama 3.x signature)
|
// create a socket (new Nakama 3.x signature)
|
||||||
const s = client.createSocket(undefined, undefined); // no SSL on localhost
|
const s = client.createSocket(undefined, undefined); // no SSL on localhost
|
||||||
await s.connect(newSession, true);
|
await s.connect(newSession, true);
|
||||||
setSocket(s);
|
setSocket(s);
|
||||||
@@ -102,6 +149,25 @@ export function NakamaProvider({ children }: { children: React.ReactNode }) {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function logout() {
|
||||||
|
try {
|
||||||
|
// 1) Disconnect socket if present
|
||||||
|
if (socketRef.current) {
|
||||||
|
socketRef.current.disconnect(true);
|
||||||
|
console.log("[Nakama] WebSocket disconnected");
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
console.warn("[Nakama] Error while disconnecting socket:", err);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2) Clear state
|
||||||
|
setSocket(null);
|
||||||
|
socketRef.current = null;
|
||||||
|
setSession(null);
|
||||||
|
|
||||||
|
console.log("[Nakama] Clean logout completed");
|
||||||
|
}
|
||||||
|
|
||||||
// ----------------------------------------------------
|
// ----------------------------------------------------
|
||||||
// MATCHMAKING
|
// MATCHMAKING
|
||||||
// ----------------------------------------------------
|
// ----------------------------------------------------
|
||||||
@@ -187,6 +253,7 @@ export function NakamaProvider({ children }: { children: React.ReactNode }) {
|
|||||||
socket,
|
socket,
|
||||||
matchId,
|
matchId,
|
||||||
loginOrRegister,
|
loginOrRegister,
|
||||||
|
logout,
|
||||||
joinMatchmaker,
|
joinMatchmaker,
|
||||||
joinMatch,
|
joinMatch,
|
||||||
sendMatchData,
|
sendMatchData,
|
||||||
|
|||||||
Reference in New Issue
Block a user