commit 20d9604ef8fdd7e30244ef6e7d4cde541c4a0863 · dunkirk.sh/battleship-arena

+1 -1

cmd/battleship-arena/main.go

···

       80
        
       

     

       81
        
       	workerCtx, workerCancel := context.WithCancel(context.Background())

     

       82
        
       	defer workerCancel()

     

       83
       -
       	go runner.StartWorker(workerCtx, cfg.UploadDir, server.BroadcastProgress, server.NotifyLeaderboardUpdate, server.BroadcastProgressComplete)

     

       84
        
       

     

       85
        
       	toClient, fromClient := server.NewSCPHandlers(cfg.UploadDir)

     

       86
        
       	sshServer, err := wish.NewServer(

···

       80
        
       

     

       81
        
       	workerCtx, workerCancel := context.WithCancel(context.Background())

     

       82
        
       	defer workerCancel()

     

       83
       +
       	go runner.StartWorker(workerCtx, cfg.UploadDir, server.BroadcastProgress, server.NotifyLeaderboardUpdate, server.BroadcastProgressComplete, server.BroadcastStatusUpdate)

     

       84
        
       

     

       85
        
       	toClient, fromClient := server.NewSCPHandlers(cfg.UploadDir)

     

       86
        
       	sshServer, err := wish.NewServer(

+10 -6

internal/runner/worker.go

···

       11
        
       

     

       12
        
       var workerMutex sync.Mutex

     

       13
        
       

     

       14
       -
       func StartWorker(ctx context.Context, uploadDir string, broadcastFunc func(string, int, int, time.Time, []string), notifyFunc func(), completeFunc func()) {

     

       15
        
       	ticker := time.NewTicker(10 * time.Second)

     

       16
        
       	defer ticker.Stop()

     

       17
        
       

     

       18
        
       	go func() {

     

       19
       -
       		if err := processSubmissionsWithLock(uploadDir, broadcastFunc, notifyFunc, completeFunc); err != nil {

     

       20
        
       			log.Printf("Worker error (submissions): %v", err)

     

       21
        
       		}

     

       22
        
       	}()

     
···

       27
        
       			return

     

       28
        
       		case <-ticker.C:

     

       29
        
       			go func() {

     

       30
       -
       				if err := processSubmissionsWithLock(uploadDir, broadcastFunc, notifyFunc, completeFunc); err != nil {

     

       31
        
       					log.Printf("Worker error (submissions): %v", err)

     

       32
        
       				}

     

       33
        
       			}()

     
···

       35
        
       	}

     

       36
        
       }

     

       37
        
       

     

       38
       -
       func processSubmissionsWithLock(uploadDir string, broadcastFunc func(string, int, int, time.Time, []string), notifyFunc func(), completeFunc func()) error {

     

       39
        
       	if !workerMutex.TryLock() {

     

       40
        
       		// Silently skip if worker is already running

     

       41
        
       		return nil

     

       42
        
       	}

     

       43
        
       	defer workerMutex.Unlock()

     

       44
        
       	

     

       45
       -
       	return ProcessSubmissions(uploadDir, broadcastFunc, notifyFunc, completeFunc)

     

       46
        
       }

     

       47
        
       

     

       48
       -
       func ProcessSubmissions(uploadDir string, broadcastFunc func(string, int, int, time.Time, []string), notifyFunc func(), completeFunc func()) error {

     

       49
        
       	submissions, err := storage.GetPendingSubmissions()

     

       50
        
       	if err != nil {

     

       51
        
       		return err

     
···

       58
        
       

     

       59
        
       	for _, sub := range submissions {

     

       60
        
       		log.Printf("⚙️  Compiling %s (%s)", sub.Username, sub.Filename)

     

       0
        
       
     

       61
        
       		

     

       62
        
       		if err := CompileSubmission(sub, uploadDir); err != nil {

     

       63
        
       			log.Printf("❌ Compilation failed for %s: %v", sub.Username, err)

     

       64
        
       			storage.UpdateSubmissionStatusWithMessage(sub.ID, "compilation_failed", err.Error())

     

       0
        
       
     

       65
        
       			notifyFunc()

     

       66
        
       			continue

     

       67
        
       		}

     

       68
        
       		

     

       69
        
       		log.Printf("✓ Compiled %s", sub.Username)

     

       70
        
       		storage.UpdateSubmissionStatus(sub.ID, "completed")

     

       0
        
       
     

       71
        
       		

     

       72
        
       		RunRoundRobinMatches(sub, uploadDir, broadcastFunc)

     

       0
        
       
     

       73
        
       		notifyFunc()

     

       74
        
       	}

     

       75

···

       11
        
       

     

       12
        
       var workerMutex sync.Mutex

     

       13
        
       

     

       14
       +
       func StartWorker(ctx context.Context, uploadDir string, broadcastFunc func(string, int, int, time.Time, []string), notifyFunc func(), completeFunc func(), statusFunc func(string, string, string)) {

     

       15
        
       	ticker := time.NewTicker(10 * time.Second)

     

       16
        
       	defer ticker.Stop()

     

       17
        
       

     

       18
        
       	go func() {

     

       19
       +
       		if err := processSubmissionsWithLock(uploadDir, broadcastFunc, notifyFunc, completeFunc, statusFunc); err != nil {

     

       20
        
       			log.Printf("Worker error (submissions): %v", err)

     

       21
        
       		}

     

       22
        
       	}()

     
···

       27
        
       			return

     

       28
        
       		case <-ticker.C:

     

       29
        
       			go func() {

     

       30
       +
       				if err := processSubmissionsWithLock(uploadDir, broadcastFunc, notifyFunc, completeFunc, statusFunc); err != nil {

     

       31
        
       					log.Printf("Worker error (submissions): %v", err)

     

       32
        
       				}

     

       33
        
       			}()

     
···

       35
        
       	}

     

       36
        
       }

     

       37
        
       

     

       38
       +
       func processSubmissionsWithLock(uploadDir string, broadcastFunc func(string, int, int, time.Time, []string), notifyFunc func(), completeFunc func(), statusFunc func(string, string, string)) error {

     

       39
        
       	if !workerMutex.TryLock() {

     

       40
        
       		// Silently skip if worker is already running

     

       41
        
       		return nil

     

       42
        
       	}

     

       43
        
       	defer workerMutex.Unlock()

     

       44
        
       	

     

       45
       +
       	return ProcessSubmissions(uploadDir, broadcastFunc, notifyFunc, completeFunc, statusFunc)

     

       46
        
       }

     

       47
        
       

     

       48
       +
       func ProcessSubmissions(uploadDir string, broadcastFunc func(string, int, int, time.Time, []string), notifyFunc func(), completeFunc func(), statusFunc func(string, string, string)) error {

     

       49
        
       	submissions, err := storage.GetPendingSubmissions()

     

       50
        
       	if err != nil {

     

       51
        
       		return err

     
···

       58
        
       

     

       59
        
       	for _, sub := range submissions {

     

       60
        
       		log.Printf("⚙️  Compiling %s (%s)", sub.Username, sub.Filename)

     

       61
       +
       		statusFunc(sub.Username, "compiling", "")

     

       62
        
       		

     

       63
        
       		if err := CompileSubmission(sub, uploadDir); err != nil {

     

       64
        
       			log.Printf("❌ Compilation failed for %s: %v", sub.Username, err)

     

       65
        
       			storage.UpdateSubmissionStatusWithMessage(sub.ID, "compilation_failed", err.Error())

     

       66
       +
       			statusFunc(sub.Username, "compilation_failed", err.Error())

     

       67
        
       			notifyFunc()

     

       68
        
       			continue

     

       69
        
       		}

     

       70
        
       		

     

       71
        
       		log.Printf("✓ Compiled %s", sub.Username)

     

       72
        
       		storage.UpdateSubmissionStatus(sub.ID, "completed")

     

       73
       +
       		statusFunc(sub.Username, "running_matches", "")

     

       74
        
       		

     

       75
        
       		RunRoundRobinMatches(sub, uploadDir, broadcastFunc)

     

       76
       +
       		statusFunc(sub.Username, "completed", "")

     

       77
        
       		notifyFunc()

     

       78
        
       	}

     

       79

+19

internal/server/sse.go

···

       22
        
       	EstimatedTimeLeft string   `json:"estimated_time_left,omitempty"`

     

       23
        
       	PercentComplete   float64  `json:"percent_complete,omitempty"`

     

       24
        
       	QueuedPlayers     []string `json:"queued_players,omitempty"`

     

       0
        
       
     

       0
        
       
     

       25
        
       }

     

       26
        
       

     

       27
        
       func InitSSE() {

     
···

       114
        
       	// Silent - no log needed for routine completion

     

       115
        
       	SSEServer.SendMessage("/events/updates", sse.SimpleMessage(string(data)))

     

       116
        
       }

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0

···

       22
        
       	EstimatedTimeLeft string   `json:"estimated_time_left,omitempty"`

     

       23
        
       	PercentComplete   float64  `json:"percent_complete,omitempty"`

     

       24
        
       	QueuedPlayers     []string `json:"queued_players,omitempty"`

     

       25
       +
       	Status            string   `json:"status,omitempty"`

     

       26
       +
       	FailureMessage    string   `json:"failure_message,omitempty"`

     

       27
        
       }

     

       28
        
       

     

       29
        
       func InitSSE() {

     
···

       116
        
       	// Silent - no log needed for routine completion

     

       117
        
       	SSEServer.SendMessage("/events/updates", sse.SimpleMessage(string(data)))

     

       118
        
       }

     

       119
       +
       

     

       120
       +
       func BroadcastStatusUpdate(player, status, failureMessage string) {

     

       121
       +
       	update := ProgressUpdate{

     

       122
       +
       		Type:           "status",

     

       123
       +
       		Player:         player,

     

       124
       +
       		Status:         status,

     

       125
       +
       		FailureMessage: failureMessage,

     

       126
       +
       	}

     

       127
       +
       	

     

       128
       +
       	data, err := json.Marshal(update)

     

       129
       +
       	if err != nil {

     

       130
       +
       		log.Printf("Failed to marshal status update: %v", err)

     

       131
       +
       		return

     

       132
       +
       	}

     

       133
       +
       	

     

       134
       +
       	SSEServer.SendMessage("/events/updates", sse.SimpleMessage(string(data)))

     

       135
       +
       }

+34 -1

internal/server/web.go

···

       613
        
                           const data = JSON.parse(event.data);

     

       614
        
                           console.log('SSE message received:', data);

     

       615
        
                           

     

       616
       -
                           // Check if it's a progress update or leaderboard update

     

       617
        
                           if (data.type === 'progress') {

     

       618
        
                               console.log('Progress update:', data);

     

       619
        
                               updateProgress(data);

     

       620
        
                           } else if (data.type === 'complete') {

     

       621
        
                               console.log('Progress complete');

     

       622
        
                               hideProgress();

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       623
        
                           } else if (Array.isArray(data)) {

     

       624
        
                               // Leaderboard update

     

       625
        
                               console.log('Updating leaderboard with', data.length, 'entries');

     
···

       734
        
                   const indicator = document.getElementById('progress-indicator');

     

       735
        
                   if (indicator) {

     

       736
        
                       indicator.classList.add('hidden');

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       737
        
                   }

     

       738
        
               }

     

       739

···

       613
        
                           const data = JSON.parse(event.data);

     

       614
        
                           console.log('SSE message received:', data);

     

       615
        
                           

     

       616
       +
                           // Check message type

     

       617
        
                           if (data.type === 'progress') {

     

       618
        
                               console.log('Progress update:', data);

     

       619
        
                               updateProgress(data);

     

       620
        
                           } else if (data.type === 'complete') {

     

       621
        
                               console.log('Progress complete');

     

       622
        
                               hideProgress();

     

       623
       +
                           } else if (data.type === 'status') {

     

       624
       +
                               console.log('Status update:', data);

     

       625
       +
                               updatePlayerStatus(data);

     

       626
        
                           } else if (Array.isArray(data)) {

     

       627
        
                               // Leaderboard update

     

       628
        
                               console.log('Updating leaderboard with', data.length, 'entries');

     
···

       737
        
                   const indicator = document.getElementById('progress-indicator');

     

       738
        
                   if (indicator) {

     

       739
        
                       indicator.classList.add('hidden');

     

       740
       +
                   }

     

       741
       +
               }

     

       742
       +
               

     

       743
       +
               function updatePlayerStatus(data) {

     

       744
       +
                   // Find the player's row in the leaderboard

     

       745
       +
                   const rows = document.querySelectorAll('tbody tr');

     

       746
       +
                   for (const row of rows) {

     

       747
       +
                       const playerLink = row.querySelector('.player-name a');

     

       748
       +
                       if (!playerLink) continue;

     

       749
       +
                       

     

       750
       +
                       const username = playerLink.getAttribute('href').split('/').pop();

     

       751
       +
                       if (username === data.player) {

     

       752
       +
                           const lastPlayedCell = row.cells[7]; // Last cell (Last Active)

     

       753
       +
                           

     

       754
       +
                           if (data.status === 'compiling') {

     

       755
       +
                               lastPlayedCell.innerHTML = '<span style="color: #3b82f6;">⚙️ Compiling...</span>';

     

       756
       +
                               row.classList.add('pending');

     

       757
       +
                           } else if (data.status === 'compilation_failed') {

     

       758
       +
                               lastPlayedCell.innerHTML = '<span style="color: #ef4444;" title="' + 

     

       759
       +
                                   (data.failure_message || 'Compilation failed') + '">❌ Failed</span>';

     

       760
       +
                               row.classList.remove('pending');

     

       761
       +
                           } else if (data.status === 'running_matches') {

     

       762
       +
                               lastPlayedCell.innerHTML = '<span style="color: #10b981;">▶️ Running matches...</span>';

     

       763
       +
                               row.classList.add('pending');

     

       764
       +
                           } else if (data.status === 'completed') {

     

       765
       +
                               // Will be updated by leaderboard refresh

     

       766
       +
                               row.classList.remove('pending');

     

       767
       +
                           }

     

       768
       +
                           break;

     

       769
       +
                       }

     

       770
        
                   }

     

       771
        
               }

     

       772