fix(server): race condition that created server panic.

.env.example

@@ -0,0 +1,13 @@
+# Remote Server Operations
+# Copy this file to .env and update values
+
+# SSH connection string (user@host)
+SERVER=erupe@your-server.example.com
+
+# Remote paths
+REMOTE_DIR=/home/erupe/Erupe
+REMOTE_LOGS=/home/erupe/Erupe/logs
+REMOTE_BIN=/home/erupe/Erupe/erupe-ce
+
+# Local paths
+LOCAL_LOGS=./logs

.gitignore

@@ -17,3 +17,5 @@ config.json
 
 # Logs
 logs/
+
+.env

CHANGELOG.md

@@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Upgraded Go version requirement from 1.19 to 1.25
 - Renamed `config.json` to `config.example.json` as template file
 
+### Fixed
+
+- Race condition in stage broadcast causing nil pointer panics during player logout
+
 ## [9.2.0] - 2023-04-01
 
 ### Added in 9.2.0

CLAUDE.md

@@ -334,6 +334,41 @@ func handleMsgMhfYourPacket(s *Session, p mhfpacket.MHFPacket) {
 - Passes all existing tests
 - Updated documentation if needed
 
+## Remote Server Operations
+
+Environment variables for remote operations are stored in `.env` (gitignored). Copy from `.env.example` if needed.
+
+### Fetch Logs
+
+```bash
+# Load environment and fetch logs
+source .env
+scp -r $SERVER:$REMOTE_LOGS/* $LOCAL_LOGS/
+```
+
+### Deploy
+
+```bash
+# Build for Linux, upload, and restart
+source .env
+GOOS=linux GOARCH=amd64 go build -o erupe-ce
+scp erupe-ce $SERVER:$REMOTE_BIN
+ssh $SERVER "cd $REMOTE_DIR && sudo systemctl restart erupe"
+```
+
+### Quick Commands
+
+```bash
+# Check server status
+source .env && ssh $SERVER "systemctl status erupe"
+
+# Tail remote logs
+source .env && ssh $SERVER "tail -f $REMOTE_LOGS/erupe.log"
+
+# View recent errors
+source .env && ssh $SERVER "grep -E 'level.*(error|warn)' $REMOTE_LOGS/erupe.log | tail -50"
+```
+
 ## Discord Integration
 
 Optional Discord bot in `server/discordbot/` provides:

server/channelserver/handlers.go

@@ -171,13 +171,13 @@ func handleMsgSysLogout(s *Session, p mhfpacket.MHFPacket) {
 
 func logoutPlayer(s *Session) {
 	s.server.Lock()
-	if _, exists := s.server.sessions[s.rawConn]; exists {
+	delete(s.server.sessions, s.rawConn)
-		delete(s.server.sessions, s.rawConn)
-	}
 	s.rawConn.Close()
 	s.server.Unlock()
 
+	s.server.stagesLock.RLock()
 	for _, stage := range s.server.stages {
+		stage.Lock()
 		// Tell sessions registered to disconnecting players quest to unregister
 		if stage.host != nil && stage.host.charID == s.charID {
 			for _, sess := range s.server.sessions {
@@ -193,7 +193,9 @@ func logoutPlayer(s *Session) {
 				delete(stage.clients, session)
 			}
 		}
+		stage.Unlock()
 	}
+	s.server.stagesLock.RUnlock()
 
 	_, err := s.server.db.Exec("UPDATE sign_sessions SET server_id=NULL, char_id=NULL WHERE token=$1", s.token)
 	if err != nil {

server/channelserver/handlers_cast_binary.go

@@ -201,13 +201,13 @@ func parseChatCommand(s *Session, command string) {
 				name = strings.ToLower(name)
 				for _, course := range mhfcourse.Courses() {
 					for _, alias := range course.Aliases() {
-						if strings.ToLower(name) == strings.ToLower(alias) {
+						if strings.EqualFold(name, alias) {
 							if slices.Contains(s.server.erupeConfig.Courses, config.Course{Name: course.Aliases()[0], Enabled: true}) {
 								var delta, rightsInt uint32
 								if mhfcourse.CourseExists(course.ID, s.courses) {
 									ei := slices.IndexFunc(s.courses, func(c mhfcourse.Course) bool {
 										for _, alias := range c.Aliases() {
-											if strings.ToLower(name) == strings.ToLower(alias) {
+											if strings.EqualFold(name, alias) {
 												return true
 											}
 										}

server/channelserver/sys_stage.go

@@ -68,7 +68,7 @@ func (s *Stage) BroadcastMHF(pkt mhfpacket.MHFPacket, ignoredSession *Session) {
 	s.Lock()
 	defer s.Unlock()
 	for session := range s.clients {
-		if session == ignoredSession {
+		if session == ignoredSession || session.clientContext == nil {
 			continue
 		}
 

server/channelserver/sys_stage_test.go

@@ -0,0 +1,247 @@
+package channelserver
+
+import (
+	"net"
+	"sync"
+	"testing"
+
+	"erupe-ce/common/byteframe"
+	"erupe-ce/config"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
+
+	"go.uber.org/zap"
+)
+
+// mockPacket implements mhfpacket.MHFPacket for testing
+type mockPacket struct {
+	opcode uint16
+}
+
+func (m *mockPacket) Opcode() network.PacketID {
+	return network.PacketID(m.opcode)
+}
+
+func (m *mockPacket) Build(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
+	// Access ctx to trigger nil pointer if ctx is nil
+	if ctx == nil {
+		panic("clientContext is nil")
+	}
+	bf.WriteUint32(0x12345678)
+	return nil
+}
+
+func (m *mockPacket) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
+	return nil
+}
+
+// createMockServer creates a minimal Server for testing
+func createMockServer() *Server {
+	logger, _ := zap.NewDevelopment()
+	return &Server{
+		logger:      logger,
+		erupeConfig: &config.Config{DevMode: false},
+		stages:      make(map[string]*Stage),
+		sessions:    make(map[net.Conn]*Session),
+	}
+}
+
+// createMockSession creates a minimal Session for testing
+func createMockSession(charID uint32, server *Server) *Session {
+	logger, _ := zap.NewDevelopment()
+	return &Session{
+		charID:        charID,
+		clientContext: &clientctx.ClientContext{},
+		sendPackets:   make(chan packet, 20),
+		Name:          "TestPlayer",
+		server:        server,
+		logger:        logger,
+	}
+}
+
+func TestStageBroadcastMHF(t *testing.T) {
+	stage := NewStage("test_stage")
+	server := createMockServer()
+
+	// Add some sessions
+	session1 := createMockSession(1, server)
+	session2 := createMockSession(2, server)
+	session3 := createMockSession(3, server)
+
+	stage.clients[session1] = session1.charID
+	stage.clients[session2] = session2.charID
+	stage.clients[session3] = session3.charID
+
+	pkt := &mockPacket{opcode: 0x1234}
+
+	// Should not panic
+	stage.BroadcastMHF(pkt, session1)
+
+	// Verify session2 and session3 received data
+	select {
+	case data := <-session2.sendPackets:
+		if len(data.data) == 0 {
+			t.Error("session2 received empty data")
+		}
+	default:
+		t.Error("session2 did not receive data")
+	}
+
+	select {
+	case data := <-session3.sendPackets:
+		if len(data.data) == 0 {
+			t.Error("session3 received empty data")
+		}
+	default:
+		t.Error("session3 did not receive data")
+	}
+}
+
+func TestStageBroadcastMHF_NilClientContext(t *testing.T) {
+	stage := NewStage("test_stage")
+	server := createMockServer()
+
+	session1 := createMockSession(1, server)
+	session2 := createMockSession(2, server)
+	session2.clientContext = nil // Simulate corrupted session
+
+	stage.clients[session1] = session1.charID
+	stage.clients[session2] = session2.charID
+
+	pkt := &mockPacket{opcode: 0x1234}
+
+	// This should panic with the current implementation
+	defer func() {
+		if r := recover(); r != nil {
+			t.Logf("Caught expected panic: %v", r)
+			// Test passes - we've confirmed the bug exists
+		} else {
+			t.Log("No panic occurred - either the bug is fixed or test is wrong")
+		}
+	}()
+
+	stage.BroadcastMHF(pkt, nil)
+}
+
+// TestStageBroadcastMHF_ConcurrentModificationWithLock tests that proper locking
+// prevents the race condition between BroadcastMHF and session removal
+func TestStageBroadcastMHF_ConcurrentModificationWithLock(t *testing.T) {
+	stage := NewStage("test_stage")
+	server := createMockServer()
+
+	// Create many sessions
+	sessions := make([]*Session, 100)
+	for i := range sessions {
+		sessions[i] = createMockSession(uint32(i), server)
+		stage.clients[sessions[i]] = sessions[i].charID
+	}
+
+	pkt := &mockPacket{opcode: 0x1234}
+
+	var wg sync.WaitGroup
+
+	// Start goroutines that broadcast
+	for i := 0; i < 10; i++ {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			for j := 0; j < 100; j++ {
+				stage.BroadcastMHF(pkt, nil)
+			}
+		}()
+	}
+
+	// Start goroutines that remove sessions WITH proper locking
+	// This simulates the fixed logoutPlayer behavior
+	for i := 0; i < 10; i++ {
+		wg.Add(1)
+		idx := i * 10
+		go func(startIdx int) {
+			defer wg.Done()
+			for j := 0; j < 10; j++ {
+				sessionIdx := startIdx + j
+				if sessionIdx < len(sessions) {
+					// Fixed: modifying stage.clients WITH lock
+					stage.Lock()
+					delete(stage.clients, sessions[sessionIdx])
+					stage.Unlock()
+				}
+			}
+		}(idx)
+	}
+
+	wg.Wait()
+}
+
+// TestStageBroadcastMHF_RaceDetectorWithLock verifies no race when
+// modifications are done with proper locking
+func TestStageBroadcastMHF_RaceDetectorWithLock(t *testing.T) {
+	stage := NewStage("test_stage")
+	server := createMockServer()
+
+	session1 := createMockSession(1, server)
+	session2 := createMockSession(2, server)
+
+	stage.clients[session1] = session1.charID
+	stage.clients[session2] = session2.charID
+
+	pkt := &mockPacket{opcode: 0x1234}
+
+	var wg sync.WaitGroup
+
+	// Goroutine 1: Continuously broadcast
+	wg.Go(func() {
+		for i := 0; i < 1000; i++ {
+			stage.BroadcastMHF(pkt, nil)
+		}
+	})
+
+	// Goroutine 2: Add and remove sessions WITH proper locking
+	// This simulates the fixed logoutPlayer behavior
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+		for i := 0; i < 1000; i++ {
+			newSession := createMockSession(uint32(100+i), server)
+			// Add WITH lock (fixed)
+			stage.Lock()
+			stage.clients[newSession] = newSession.charID
+			stage.Unlock()
+			// Remove WITH lock (fixed)
+			stage.Lock()
+			delete(stage.clients, newSession)
+			stage.Unlock()
+		}
+	}()
+
+	wg.Wait()
+}
+
+// TestStageBroadcastMHF_NilClientContextSkipped verifies sessions with nil
+// clientContext are safely skipped
+func TestStageBroadcastMHF_NilClientContextSkipped(t *testing.T) {
+	stage := NewStage("test_stage")
+	server := createMockServer()
+
+	session1 := createMockSession(1, server)
+	session2 := createMockSession(2, server)
+	session2.clientContext = nil // Simulate corrupted session
+
+	stage.clients[session1] = session1.charID
+	stage.clients[session2] = session2.charID
+
+	pkt := &mockPacket{opcode: 0x1234}
+
+	// Should NOT panic now that we have the nil check
+	stage.BroadcastMHF(pkt, nil)
+
+	// Verify session1 received data (session2 was skipped)
+	select {
+	case data := <-session1.sendPackets:
+		if len(data.data) == 0 {
+			t.Error("session1 received empty data")
+		}
+	default:
+		t.Error("session1 did not receive data")
+	}
+}