bugfixes and refactoring in game-server

game-server/internal/ws/handler_test.go

@@ -52,14 +52,19 @@ func userToken(t *testing.T, userID int64) string {
 	return token
 }
 
-func startServer(t *testing.T, joinTimeout time.Duration) (url string) {
+func startServerWithManager(t *testing.T, joinTimeout time.Duration) (string, *game.Manager) {
 	t.Helper()
 	manager := game.NewManager(joinTimeout)
 	log := slog.New(slog.NewTextHandler(testWriter{t}, nil))
 	handler := ws.NewHandler(manager, secret, publicAddr, []string{"*"}, log)
 	srv := httptest.NewServer(handler)
 	t.Cleanup(srv.Close)
-	return "ws" + strings.TrimPrefix(srv.URL, "http")
+	return "ws" + strings.TrimPrefix(srv.URL, "http"), manager
+}
+
+func startServer(t *testing.T, joinTimeout time.Duration) (url string) {
+	u, _ := startServerWithManager(t, joinTimeout)
+	return u
 }
 
 type testWriter struct{ t *testing.T }
@@ -190,3 +195,125 @@ func TestReconnectDuringGame(t *testing.T) {
 		t.Fatalf("unexpected replayed message: %v", v)
 	}
 }
+
+func TestReconnectWithExpiredTokenAllowedIfSameToken(t *testing.T) {
+	url := startServer(t, time.Minute)
+	// Short expiration: 1200ms
+	exp := time.Now().Add(1200 * time.Millisecond)
+	gt := gameToken(t, "m-reconnect-exp", 1, 2, publicAddr, exp)
+
+	c1, c2 := dial(t, url), dial(t, url)
+	join(t, c1, gt, userToken(t, 1))
+	join(t, c2, gt, userToken(t, 2))
+	readMsg(t, c1) // STATE
+	readMsg(t, c2) // STATE
+
+	// Wait for the game token to expire
+	time.Sleep(1300 * time.Millisecond)
+
+	// Simulate disconnect
+	c1.Close(websocket.StatusAbnormalClosure, "network gone")
+
+	// Reconnect with the SAME token (which is now expired)
+	c1b := dial(t, url)
+	join(t, c1b, gt, userToken(t, 1))
+	v := readMsg(t, c1b)
+	if v[0] != float64(3) || v[1] != float64(1) || v[2] != float64(1) {
+		t.Fatalf("unexpected replayed message on reconnect: %v", v)
+	}
+
+	// But an expired token for a non-existent match is rejected with 4003
+	gtExpired := gameToken(t, "m-other", 1, 2, publicAddr, time.Now().Add(-time.Hour))
+	cOther := dial(t, url)
+	join(t, cOther, gtExpired, userToken(t, 1))
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+	_, _, err := cOther.Read(ctx)
+	if err == nil {
+		t.Fatal("expected connection to be rejected")
+	}
+	if code := websocket.CloseStatus(err); code != 4003 {
+		t.Fatalf("close code = %d, want 4003", code)
+	}
+}
+
+func TestDuplicateJoinIgnored(t *testing.T) {
+	url := startServer(t, time.Minute)
+	exp := time.Now().Add(time.Hour)
+	gt := gameToken(t, "m-dup-join", 1, 2, publicAddr, exp)
+
+	c1, c2 := dial(t, url), dial(t, url)
+	join(t, c1, gt, userToken(t, 1))
+	join(t, c2, gt, userToken(t, 2))
+	readMsg(t, c1) // STATE
+
+	// Send duplicate JOIN on c1
+	join(t, c1, gt, userToken(t, 1))
+
+	// Send ACK after duplicate JOIN; connection must still be open and functioning
+	ackMsg, _ := json.Marshal([]any{4, 1})
+	if err := c1.Write(context.Background(), websocket.MessageText, ackMsg); err != nil {
+		t.Fatalf("write ACK: %v", err)
+	}
+}
+
+func TestNonPositiveIDsRejected(t *testing.T) {
+	url := startServer(t, time.Minute)
+	exp := time.Now().Add(time.Hour)
+
+	// Non-positive Player1ID
+	gtBadP1 := gameToken(t, "m-bad-p1", 0, 2, publicAddr, exp)
+	c := dial(t, url)
+	join(t, c, gtBadP1, userToken(t, 2))
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+	_, _, err := c.Read(ctx)
+	if err == nil || websocket.CloseStatus(err) != 4003 {
+		t.Fatalf("expected 4003 for player1_id = 0, got err = %v", err)
+	}
+
+	// Non-positive UserID
+	gtValid := gameToken(t, "m-valid", 1, 2, publicAddr, exp)
+	c2 := dial(t, url)
+	join(t, c2, gtValid, userToken(t, -1))
+	ctx2, cancel2 := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel2()
+	_, _, err = c2.Read(ctx2)
+	if err == nil || websocket.CloseStatus(err) != 4004 {
+		t.Fatalf("expected 4004 for user_id = -1, got err = %v", err)
+	}
+}
+
+func TestManagerShutdownClosesConnectionsGoingAway(t *testing.T) {
+	url, mgr := startServerWithManager(t, time.Minute)
+	exp := time.Now().Add(time.Hour)
+	gt := gameToken(t, "m-shutdown", 1, 2, publicAddr, exp)
+
+	c1, c2 := dial(t, url), dial(t, url)
+	join(t, c1, gt, userToken(t, 1))
+	join(t, c2, gt, userToken(t, 2))
+	readMsg(t, c1)
+	readMsg(t, c2)
+
+	errCh := make(chan error, 2)
+	for _, c := range []*websocket.Conn{c1, c2} {
+		go func(conn *websocket.Conn) {
+			ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+			defer cancel()
+			_, _, err := conn.Read(ctx)
+			errCh <- err
+		}(c)
+	}
+
+	mgr.Shutdown()
+
+	for i := 0; i < 2; i++ {
+		err := <-errCh
+		if err == nil {
+			t.Fatalf("client %d: expected connection to be closed", i)
+		}
+		if code := websocket.CloseStatus(err); code != 1001 {
+			t.Fatalf("client %d: close status = %d, want 1001", i, code)
+		}
+	}
+}