Skip to content

Introduce new version of spectator API with explicit score token passing #523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
bdach wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

Introduce new version of spectator API with explicit score token passing #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5b45b1c
Introduce new version of spectator API with explicit score token passing
bdach Jul 2, 2026
cd72154
Move out `BufferedScore` to outer scope
bdach Jul 3, 2026
56ee2a8
Unbreak tests to demonstrate old pathways stil work
bdach Jul 3, 2026
ea8be25
Move tests to new pathways
bdach Jul 3, 2026
a1b4bf6
Add a test for interleaving spectator calls for multiple concurrent s…
bdach Jul 3, 2026
4d7a636
Adjust `EndPlaySession()` API further
bdach Jul 3, 2026
e773eec
Add test for token cycling
bdach Jul 6, 2026
71a7863
Add test for starting single score multiple times
bdach Jul 6, 2026
073027b
Correctly allow starting single score multiple times
bdach Jul 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions osu.Server.Spectator.Tests/ScoreUploaderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public async Task ScoreDataMergedCorrectly()
SaveReplays = true
};

await uploader.EnqueueAsync(1, new Score
await uploader.EnqueueAsync(1, new BufferedScore(new Score
{
ScoreInfo =
{
Expand All @@ -75,14 +75,14 @@ public async Task ScoreDataMergedCorrectly()
}
// note OnlineID and Passed not set.
}
}, new database_beatmap());
}, new database_beatmap()));

await uploadsCompleteAsync(uploader);

mockStorage.Verify(s => s.WriteAsync(
It.Is<ScoreUploader.UploadItem>(item => item.Score.ScoreInfo.OnlineID == 2
&& item.Score.ScoreInfo.Passed
&& item.Score.ScoreInfo.User.Username == "some user")), Times.Once);
It.Is<ScoreUploader.UploadItem>(item => item.Score.Score.ScoreInfo.OnlineID == 2
&& item.Score.Score.ScoreInfo.Passed
&& item.Score.Score.ScoreInfo.User.Username == "some user")), Times.Once);
}

[Fact]
Expand All @@ -93,13 +93,13 @@ public async Task ScoreUploads()
SaveReplays = true
};

await uploader.EnqueueAsync(1, new Score(), new database_beatmap());
await uploader.EnqueueAsync(1, new BufferedScore(new Score(), new database_beatmap()));
await uploadsCompleteAsync(uploader);
mockStorage.Verify(s => s.WriteAsync(It.Is<ScoreUploader.UploadItem>(item => item.Score.ScoreInfo.OnlineID == 2)), Times.Once);
mockStorage.Verify(s => s.WriteAsync(It.Is<ScoreUploader.UploadItem>(item => item.Score.Score.ScoreInfo.OnlineID == 2)), Times.Once);

await uploader.EnqueueAsync(1, new Score(), new database_beatmap());
await uploader.EnqueueAsync(1, new BufferedScore(new Score(), new database_beatmap()));
await uploadsCompleteAsync(uploader);
mockStorage.Verify(s => s.WriteAsync(It.Is<ScoreUploader.UploadItem>(item => item.Score.ScoreInfo.OnlineID == 2)), Times.Exactly(2));
mockStorage.Verify(s => s.WriteAsync(It.Is<ScoreUploader.UploadItem>(item => item.Score.Score.ScoreInfo.OnlineID == 2)), Times.Exactly(2));
}

[Fact]
Expand All @@ -116,9 +116,9 @@ public async Task NonPassingScoreDoesNotUpload()
SaveReplays = true
};

await uploader.EnqueueAsync(1, new Score(), new database_beatmap());
await uploader.EnqueueAsync(1, new BufferedScore(new Score(), new database_beatmap()));
await uploadsCompleteAsync(uploader);
mockStorage.Verify(s => s.WriteAsync(It.Is<ScoreUploader.UploadItem>(item => item.Score.ScoreInfo.OnlineID == 2)), Times.Never);
mockStorage.Verify(s => s.WriteAsync(It.Is<ScoreUploader.UploadItem>(item => item.Score.Score.ScoreInfo.OnlineID == 2)), Times.Never);
}

[Fact]
Expand All @@ -129,7 +129,7 @@ public async Task ScoreDoesNotUploadIfDisabled()
SaveReplays = false
};

await uploader.EnqueueAsync(1, new Score(), new database_beatmap());
await uploader.EnqueueAsync(1, new BufferedScore(new Score(), new database_beatmap()));
await Task.Delay(1000);
mockStorage.Verify(s => s.WriteAsync(It.IsAny<ScoreUploader.UploadItem>()), Times.Never);
}
Expand All @@ -143,7 +143,7 @@ public async Task ScoreUploadsWithDelayedScoreToken()
};

// Score with no token.
await uploader.EnqueueAsync(2, new Score(), new database_beatmap());
await uploader.EnqueueAsync(2, new BufferedScore(new Score(), new database_beatmap()));
await Task.Delay(1000);
mockStorage.Verify(s => s.WriteAsync(It.IsAny<ScoreUploader.UploadItem>()), Times.Never);

Expand All @@ -155,7 +155,7 @@ public async Task ScoreUploadsWithDelayedScoreToken()
}));

await uploadsCompleteAsync(uploader);
mockStorage.Verify(s => s.WriteAsync(It.Is<ScoreUploader.UploadItem>(item => item.Score.ScoreInfo.OnlineID == 3)), Times.Once);
mockStorage.Verify(s => s.WriteAsync(It.Is<ScoreUploader.UploadItem>(item => item.Score.Score.ScoreInfo.OnlineID == 3)), Times.Once);
}

[Fact]
Expand All @@ -169,7 +169,7 @@ public async Task TimedOutScoreDoesNotUpload()
uploader.TimeoutInterval = 100;

// Score with no token.
await uploader.EnqueueAsync(2, new Score(), new database_beatmap());
await uploader.EnqueueAsync(2, new BufferedScore(new Score(), new database_beatmap()));
Thread.Sleep(1000); // Wait for cancellation.
mockStorage.Verify(s => s.WriteAsync(It.IsAny<ScoreUploader.UploadItem>()), Times.Never);

Expand All @@ -187,10 +187,10 @@ public async Task TimedOutScoreDoesNotUpload()
id = 4,
passed = true
}));
await uploader.EnqueueAsync(3, new Score(), new database_beatmap());
await uploader.EnqueueAsync(3, new BufferedScore(new Score(), new database_beatmap()));
await uploadsCompleteAsync(uploader);
mockStorage.Verify(s => s.WriteAsync(It.IsAny<ScoreUploader.UploadItem>()), Times.Once);
mockStorage.Verify(s => s.WriteAsync(It.Is<ScoreUploader.UploadItem>(item => item.Score.ScoreInfo.OnlineID == 4)), Times.Once);
mockStorage.Verify(s => s.WriteAsync(It.Is<ScoreUploader.UploadItem>(item => item.Score.Score.ScoreInfo.OnlineID == 4)), Times.Once);
}

[Fact]
Expand All @@ -205,7 +205,7 @@ public async Task FailedUploadDoesRetryAndFail()
mockStorage.Setup(storage => storage.WriteAsync(It.IsAny<ScoreUploader.UploadItem>()))
.Callback<ScoreUploader.UploadItem>(_ => throw new InvalidOperationException());

await uploader.EnqueueAsync(1, new Score(), new database_beatmap());
await uploader.EnqueueAsync(1, new BufferedScore(new Score(), new database_beatmap()));

// Things are failing badly, exceptions that don't resolve.
// We expect the upload to be dropped after the `TimeoutInterval` in such a case.
Expand Down Expand Up @@ -238,7 +238,7 @@ public async Task FailedUploadDoesRetryAndSucceed()
});

// Throwing score.
await uploader.EnqueueAsync(1, new Score(), new database_beatmap());
await uploader.EnqueueAsync(1, new BufferedScore(new Score(), new database_beatmap()));

failed.Wait();
Assert.Equal(0, uploadCount);
Expand All @@ -259,10 +259,10 @@ public async Task TestMassUploads()
};

for (int i = 0; i < 1000; ++i)
await uploader.EnqueueAsync(1, new Score(), new database_beatmap());
await uploader.EnqueueAsync(1, new BufferedScore(new Score(), new database_beatmap()));

await uploadsCompleteAsync(uploader);
mockStorage.Verify(s => s.WriteAsync(It.Is<ScoreUploader.UploadItem>(item => item.Score.ScoreInfo.OnlineID == 2)), Times.Exactly(1000));
mockStorage.Verify(s => s.WriteAsync(It.Is<ScoreUploader.UploadItem>(item => item.Score.Score.ScoreInfo.OnlineID == 2)), Times.Exactly(1000));
AppSettings.ReplayUploaderConcurrency = 1;
}

Expand Down
Loading