Thanks to visit codestin.com
Credit goes to github.com

Skip to content

New fields: focused, paused, failed #324

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

New fields: focused, paused, failed #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd54420
fix: Fix loading state between play and song select + add spectating …
cyperdark Sep 18, 2025
7b89b8e
feat: New fields `Focused`, `Paused` and `Failed`
cyperdark Sep 18, 2025
6b0e396
chore: forgot to add states
cyperdark Sep 19, 2025
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
4 changes: 3 additions & 1 deletion packages/common/enums/osu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ export enum GameState {
packageUpdater,
benchmark,
tourney,
charts
charts,
spectating,
watchingReplay
}

export enum LobbyStatus {
Expand Down
8 changes: 8 additions & 0 deletions packages/tosu/src/api/types/v2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export type ApiAnswer = TosuAPi | { error?: string };
export type ApiAnswerPrecise = TosuPreciseAnswer | { error?: string };

export interface TosuAPi {
game: Game;
client: string;
server: string;
state: NumberName;
Expand All @@ -21,6 +22,11 @@ export interface TosuAPi {
tourney: Tourney | undefined;
}

export interface Game {
focused: boolean;
paused: boolean;
}

export interface BeatmapTime {
live: number;
firstObject: number;
Expand Down Expand Up @@ -281,6 +287,8 @@ export interface Objects {
}

export interface Play {
failed: boolean;

playerName: string;
mode: NumberName;
score: number;
Expand Down
9 changes: 8 additions & 1 deletion packages/tosu/src/api/utils/buildResultV2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import path from 'path';
import {
ApiAnswer,
Leaderboard,
Play,
Tourney,
TourneyChatMessages,
TourneyClients
Expand Down Expand Up @@ -125,6 +126,10 @@ export const buildResult = (instanceManager: InstanceManager): ApiAnswer => {
: menu.gamemode;

return {
game: {
focused: instanceManager.gameFocused,
paused: global.paused
},
client: ClientType[osuInstance.client],
server: osuInstance.customServerEndpoint ?? 'ppy.sh',
state: {
Expand Down Expand Up @@ -565,6 +570,7 @@ const buildLazerTourneyData = (
},

play: {
failed: false,
playerName: client.score!.playerName,

mode: {
Expand Down Expand Up @@ -876,8 +882,9 @@ function buildPlay(
gameplay: Gameplay,
beatmapPP: BeatmapPP,
currentMods: CalculateMods
) {
): Play {
return {
failed: gameplay.failed,
playerName: gameplay.playerName,

mode: {
Expand Down
2 changes: 1 addition & 1 deletion packages/tosu/src/assets/offsets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"OsuVersion":"2025.912.0","osu.Game.OsuGame":{"osuLogo":1592,"ScreenStack":1536,"<frameworkConfig>k__BackingField":1464,"SentryLogger":1496},"osu.Framework.Game":{"<Host>k__BackingField":824},"osu.Game.OsuGameBase":{"<API>k__BackingField":1080,"<SpectatorClient>k__BackingField":1192,"<ScoreManager>k__BackingField":1024,"<MultiplayerClient>k__BackingField":1200,"beatmapClock":1232,"<Storage>k__BackingField":1088,"<Beatmap>k__BackingField":1104,"<SkinManager>k__BackingField":1040,"<VersionHash>k__BackingField":976,"<LocalConfig>k__BackingField":984,"rulesetConfigCache":1176,"realm":1216},"osu.Game.Screens.SelectV2.SoloSongSelect":{"<game>k__BackingField":1264},"osu.Game.Screens.Play.SubmittingPlayer":{"<api>k__BackingField":1248,"<spectatorClient>k__BackingField":1256},"osu.Game.Screens.Play.PlayerLoader":{"osuLogo":1168},"osu.Game.Beatmaps.FramedBeatmapClock":{"finalClockSource":528,"decoupledTrack":552},"osu.Framework.Timing.DecouplingFramedClock":{"<Source>k__BackingField":24},"osu.Framework.Audio.Track.Track":{"length":72},"osu.Framework.Timing.FramedClock":{"<CurrentTime>k__BackingField":48},"osu.Game.Screens.OsuScreen":{"<logo>k__BackingField":896},"osu.Game.Screens.Ranking.SoloResultsScreen":{"<api>k__BackingField":1040,"SelectedScore":920},"osu.Game.Screens.Edit.Editor":{"<realm>k__BackingField":960,"<api>k__BackingField":1096},"osu.Game.Screens.OnlinePlay.OnlinePlayScreen":{"<API>k__BackingField":960},"osu.Game.Screens.OnlinePlay.Multiplayer.Multiplayer":{"<client>k__BackingField":976},"osu.Game.Screens.Spectate.SpectatorScreen":{"<spectatorClient>k__BackingField":944,"gameplayStates":992},"osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.MultiSpectatorScreen":{"<multiplayerClient>k__BackingField":1032},"osu.Game.Online.Multiplayer.OnlineMultiplayerClient":{"<IsConnected>k__BackingField":736},"osu.Game.Online.Multiplayer.MultiplayerClient":{"room":648},"osu.Game.Screens.Play.Player":{"<api>k__BackingField":1008,"<scoreManager>k__BackingField":1000,"<Score>k__BackingField":1152,"<ScoreProcessor>k__BackingField":1096,"<HealthProcessor>k__BackingField":1104,"<HUDOverlay>k__BackingField":1120,"dependencies":1168},"osu.Framework.Screens.ScreenStack":{"stack":800},"osu.Game.Rulesets.RulesetConfigCache":{"configCache":520},"osu.Game.Online.Chat.ExternalLinkOpener":{"<api>k__BackingField":536},"osu.Game.Online.API.APIAccess":{"<localUser>k__BackingField":592,"game":504},"osu.Desktop.OsuGameDesktop":{"AvailableMods":1128,"SelectedMods":1120,"Ruleset":1112},"osu.Game.Scoring.ScoreInfo":{"<OnlineID>k__BackingField":184,"<LegacyOnlineID>k__BackingField":192,"<ModsJson>k__BackingField":80,"<HitEvents>k__BackingField":120,"<RealmUser>k__BackingField":72,"<TotalScore>k__BackingField":160,"<MaxCombo>k__BackingField":204,"<Combo>k__BackingField":212,"<Passed>k__BackingField":220,"<Ruleset>k__BackingField":48,"<Accuracy>k__BackingField":176,"<Date>k__BackingField":256,"statistics":128,"maximumStatistics":136,"user":112},"osu.Framework.Platform.Storage":{"<BasePath>k__BackingField":8},"osu.Game.IO.WrappedStorage":{"<UnderlyingStorage>k__BackingField":16},"osu.Game.Beatmaps.WorkingBeatmapCache+BeatmapManagerWorkingBeatmap":{"BeatmapInfo":8,"BeatmapSetInfo":16},"osu.Game.Models.RealmUser":{"<Username>k__BackingField":24,"<OnlineID>k__BackingField":40},"osu.Game.Rulesets.RulesetInfo":{"<OnlineID>k__BackingField":48},"osu.Game.Screens.Play.SoloPlayer":{"RestartCount":916},"osu.Game.Rulesets.Osu.Scoring.OsuScoreProcessor":{"Combo":592},"osu.Game.Rulesets.Scoring.ScoreProcessor":{"hitEvents":648},"osu.Game.Online.API.Requests.Responses.APIMe":{"PlayMode":136},"osu.Game.Online.API.Requests.Responses.APIUser":{"<Id>k__BackingField":232,"<Username>k__BackingField":8,"countryCodeString":32,"statistics":160},"osu.Game.Users.UserStatistics":{"RankedScore":32,"GlobalRank":84,"PlayCount":56,"Accuracy":40,"Level":76,"PP":104},"osu.Game.Rulesets.Osu.Scoring.OsuHealthProcessor":{"Health":560},"osu.Game.Screens.Play.HUDOverlay":{"InputCountController":840},"osu.Game.Screens.Play.HUD.InputCountController":{"triggers":512},"osu.Game.Rulesets.UI.DrawableRuleset":{"<ReplayScore>k__BackingField":808},"osu.Game.Beatmaps.BeatmapInfo":{"<OnlineID>k__BackingField":140,"<MD5Hash>k__BackingField":88,"<StatusInt>k__BackingField":136,"<Metadata>k__BackingField":48,"<Difficulty>k__BackingField":40,"<DifficultyName>k__BackingField":24,"<TotalObjectCount>k__BackingField":148,"<Hash>k__BackingField":80},"osu.Game.Beatmaps.BeatmapSetInfo":{"<OnlineID>k__BackingField":48},"osu.Game.Beatmaps.BeatmapMetadata":{"<Title>k__BackingField":24,"<TitleUnicode>k__BackingField":32,"<Artist>k__BackingField":40,"<ArtistUnicode>k__BackingField":48,"<Author>k__BackingField":56,"<Source>k__BackingField":64,"<Tags>k__BackingField":72,"<UserTags>k__BackingField":80,"<PreviewTime>k__BackingField":104,"<AudioFile>k__BackingField":88,"<BackgroundFile>k__BackingField":96},"osu.Game.Beatmaps.BeatmapDifficulty":{"<DrainRate>k__BackingField":40,"<CircleSize>k__BackingField":44,"<OverallDifficulty>k__BackingField":48,"<ApproachRate>k__BackingField":52,"<SliderMultiplier>k__BackingField":24,"<SliderTickRate>k__BackingField":32},"osu.Game.Online.Multiplayer.MultiplayerRoomUser":{"UserID":40,"<State>k__BackingField":44,"<BeatmapAvailability>k__BackingField":8,"<Mods>k__BackingField":16,"<MatchState>k__BackingField":24,"RulesetId":48,"BeatmapId":56,"<User>k__BackingField":32},"osu.Game.Skinning.SkinManager":{"CurrentSkin":80},"osu.Game.Skinning.Skin":{"<Name>k__BackingField":64},"osu.Framework.Platform.GameHost":{"<inputConfig>k__BackingField":48},"osu.Framework.Configuration.InputConfigManager":{"<InputHandlers>k__BackingField":32},"osu.Framework.Input.Handlers.Tablet.OpenTabletDriverHandler":{"<AreaOffset>k__BackingField":72,"<AreaSize>k__BackingField":80,"<Rotation>k__BackingField":104,"<PressureThreshold>k__BackingField":112},"osu.Framework.Input.Handlers.Mouse.MouseHandler":{"<UseRelativeMode>k__BackingField":40},"osu.Game.Utils.SentryLogger":{"sentrySession":16},"Sentry.SentrySdk+DisposeHandle":{"_localHub":8},"Sentry.Internal.Hub":{"_options":32},"Sentry.SentryOptions":{"<Release>k__BackingField":176}}
{"OsuVersion":"2025.912.0","osu.Game.OsuGame":{"osuLogo":1592,"ScreenStack":1536,"<frameworkConfig>k__BackingField":1464,"SentryLogger":1496},"osu.Framework.Game":{"<Host>k__BackingField":824},"osu.Game.OsuGameBase":{"<API>k__BackingField":1080,"<SpectatorClient>k__BackingField":1192,"<ScoreManager>k__BackingField":1024,"<MultiplayerClient>k__BackingField":1200,"<LeaderboardManager>k__BackingField":1168,"<SessionStatics>k__BackingField":992,"beatmapClock":1232,"<Storage>k__BackingField":1088,"<Beatmap>k__BackingField":1104,"<SkinManager>k__BackingField":1040,"<VersionHash>k__BackingField":976,"<LocalConfig>k__BackingField":984,"rulesetConfigCache":1176,"realm":1216},"osu.Game.Screens.SelectV2.SoloSongSelect":{"<game>k__BackingField":1264},"osu.Game.Screens.Play.SubmittingPlayer":{"<api>k__BackingField":1248,"<spectatorClient>k__BackingField":1256},"osu.Game.Screens.Play.PlayerLoader":{"osuLogo":1168,"<leaderboardManager>k__BackingField":1160},"osu.Game.Screens.Play.SpectatorPlayer":{"score":1264,"<SpectatorClient>k__BackingField":1256},"osu.Game.Beatmaps.FramedBeatmapClock":{"finalClockSource":528,"decoupledTrack":552},"osu.Framework.Timing.DecouplingFramedClock":{"<Source>k__BackingField":24},"osu.Framework.Audio.Track.Track":{"length":72},"osu.Framework.Timing.FramedClock":{"<CurrentTime>k__BackingField":48},"osu.Game.Screens.OsuScreen":{"<logo>k__BackingField":896},"osu.Game.Screens.Ranking.SoloResultsScreen":{"<api>k__BackingField":1040,"SelectedScore":920},"osu.Game.Screens.Edit.Editor":{"<realm>k__BackingField":960,"<api>k__BackingField":1096},"osu.Game.Screens.OnlinePlay.OnlinePlayScreen":{"<API>k__BackingField":960},"osu.Game.Screens.OnlinePlay.Multiplayer.Multiplayer":{"<client>k__BackingField":976},"osu.Game.Screens.Spectate.SpectatorScreen":{"<spectatorClient>k__BackingField":944,"gameplayStates":992},"osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.MultiSpectatorScreen":{"<multiplayerClient>k__BackingField":1032},"osu.Game.Online.Multiplayer.OnlineMultiplayerClient":{"<IsConnected>k__BackingField":736},"osu.Game.Online.Multiplayer.MultiplayerClient":{"room":648},"osu.Game.Screens.Play.Player":{"<api>k__BackingField":1008,"<scoreManager>k__BackingField":1000,"<Score>k__BackingField":1152,"<ScoreProcessor>k__BackingField":1096,"<HealthProcessor>k__BackingField":1104,"<HUDOverlay>k__BackingField":1120,"<DrawableRuleset>k__BackingField":1112,"dependencies":1168},"osu.Framework.Screens.ScreenStack":{"stack":800},"osu.Game.Rulesets.RulesetConfigCache":{"configCache":520},"osu.Game.Online.Chat.ExternalLinkOpener":{"<api>k__BackingField":536},"osu.Game.Online.API.APIAccess":{"<localUser>k__BackingField":592,"game":504},"osu.Desktop.OsuGameDesktop":{"AvailableMods":1128,"SelectedMods":1120,"Ruleset":1112},"osu.Game.Scoring.ScoreInfo":{"<OnlineID>k__BackingField":184,"<LegacyOnlineID>k__BackingField":192,"<ModsJson>k__BackingField":80,"<HitEvents>k__BackingField":120,"<RealmUser>k__BackingField":72,"<TotalScore>k__BackingField":160,"<MaxCombo>k__BackingField":204,"<Combo>k__BackingField":212,"<Passed>k__BackingField":220,"<Ruleset>k__BackingField":48,"<Accuracy>k__BackingField":176,"<Date>k__BackingField":256,"statistics":128,"maximumStatistics":136,"user":112},"osu.Framework.Platform.Storage":{"<BasePath>k__BackingField":8},"osu.Game.IO.WrappedStorage":{"<UnderlyingStorage>k__BackingField":16},"osu.Game.Beatmaps.WorkingBeatmapCache+BeatmapManagerWorkingBeatmap":{"BeatmapInfo":8,"BeatmapSetInfo":16},"osu.Game.Models.RealmUser":{"<Username>k__BackingField":24,"<OnlineID>k__BackingField":40},"osu.Game.Rulesets.RulesetInfo":{"<OnlineID>k__BackingField":48},"osu.Game.Screens.Play.SoloPlayer":{"RestartCount":916},"osu.Game.Rulesets.Osu.Scoring.OsuScoreProcessor":{"Combo":592},"osu.Game.Rulesets.Scoring.ScoreProcessor":{"hitEvents":648},"osu.Game.Online.API.Requests.Responses.APIMe":{"PlayMode":136},"osu.Game.Online.API.Requests.Responses.APIUser":{"<Id>k__BackingField":232,"<Username>k__BackingField":8,"countryCodeString":32,"statistics":160},"osu.Game.Users.UserStatistics":{"RankedScore":32,"GlobalRank":84,"PlayCount":56,"Accuracy":40,"Level":76,"PP":104},"osu.Game.Rulesets.Osu.Scoring.OsuHealthProcessor":{"Health":560},"osu.Game.Screens.Play.HUDOverlay":{"InputCountController":840},"osu.Game.Screens.Play.HUD.InputCountController":{"triggers":512},"osu.Game.Rulesets.UI.DrawableRuleset":{"<ReplayScore>k__BackingField":808},"osu.Game.Beatmaps.BeatmapInfo":{"<OnlineID>k__BackingField":140,"<MD5Hash>k__BackingField":88,"<StatusInt>k__BackingField":136,"<Metadata>k__BackingField":48,"<Difficulty>k__BackingField":40,"<DifficultyName>k__BackingField":24,"<TotalObjectCount>k__BackingField":148,"<Hash>k__BackingField":80},"osu.Game.Beatmaps.BeatmapSetInfo":{"<OnlineID>k__BackingField":48},"osu.Game.Beatmaps.BeatmapMetadata":{"<Title>k__BackingField":24,"<TitleUnicode>k__BackingField":32,"<Artist>k__BackingField":40,"<ArtistUnicode>k__BackingField":48,"<Author>k__BackingField":56,"<Source>k__BackingField":64,"<Tags>k__BackingField":72,"<UserTags>k__BackingField":80,"<PreviewTime>k__BackingField":104,"<AudioFile>k__BackingField":88,"<BackgroundFile>k__BackingField":96},"osu.Game.Beatmaps.BeatmapDifficulty":{"<DrainRate>k__BackingField":40,"<CircleSize>k__BackingField":44,"<OverallDifficulty>k__BackingField":48,"<ApproachRate>k__BackingField":52,"<SliderMultiplier>k__BackingField":24,"<SliderTickRate>k__BackingField":32},"osu.Game.Online.Multiplayer.MultiplayerRoomUser":{"UserID":40,"<State>k__BackingField":44,"<BeatmapAvailability>k__BackingField":8,"<Mods>k__BackingField":16,"<MatchState>k__BackingField":24,"RulesetId":48,"BeatmapId":56,"<User>k__BackingField":32},"osu.Game.Skinning.SkinManager":{"CurrentSkin":80},"osu.Game.Skinning.Skin":{"<Name>k__BackingField":64},"osu.Framework.Platform.GameHost":{"<inputConfig>k__BackingField":48},"osu.Framework.Configuration.InputConfigManager":{"<InputHandlers>k__BackingField":32},"osu.Framework.Input.Handlers.Tablet.OpenTabletDriverHandler":{"<AreaOffset>k__BackingField":72,"<AreaSize>k__BackingField":80,"<Rotation>k__BackingField":104,"<PressureThreshold>k__BackingField":112},"osu.Framework.Input.Handlers.Mouse.MouseHandler":{"<UseRelativeMode>k__BackingField":40},"osu.Game.Utils.SentryLogger":{"sentrySession":16},"Sentry.SentrySdk+DisposeHandle":{"_localHub":8},"Sentry.Internal.Hub":{"_options":32},"Sentry.SentryOptions":{"<Release>k__BackingField":176}}
4 changes: 4 additions & 0 deletions packages/tosu/src/instances/lazerInstance.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,8 @@ export class LazerInstance extends AbstractInstance {
break;

case GameState.play: // is playing (after player is loaded)
case GameState.spectating: // is playing (after player is loaded)
case GameState.watchingReplay: // is playing (after player is loaded)
// Reset gameplay data on retry
if (this.previousTime > global.playTime) {
gameplay.init(true);
Expand Down Expand Up @@ -385,6 +387,8 @@ export class LazerInstance extends AbstractInstance {

switch (global.status) {
case GameState.play:
case GameState.spectating:
case GameState.watchingReplay:
if (global.playTime < 150) {
break;
}
Expand Down
2 changes: 2 additions & 0 deletions packages/tosu/src/instances/manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { OsuInstance } from './osuInstance';
export class InstanceManager {
platformType: Platform;
focusedClient: ClientType;
gameFocused: boolean;

osuInstances: {
[key: number]: AbstractInstance;
Expand Down Expand Up @@ -172,6 +173,7 @@ export class InstanceManager {
(r) => r.pid === focusedPID
);
if (instance) this.focusedClient = instance.client;
this.gameFocused = instance !== undefined;

if (this.focusedClient === undefined) {
this.focusedClient =
Expand Down
4 changes: 4 additions & 0 deletions packages/tosu/src/instances/osuInstance.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,8 @@ export class OsuInstance extends AbstractInstance {
break;

case GameState.play:
case GameState.spectating:
case GameState.watchingReplay:
// Reset gameplay data on retry
if (this.previousTime > global.playTime) {
gameplay.init(true);
Expand Down Expand Up @@ -224,6 +226,8 @@ export class OsuInstance extends AbstractInstance {

switch (global.status) {
case GameState.play:
case GameState.spectating:
case GameState.watchingReplay:
if (global.playTime < 150) {
break;
}
Expand Down
Loading
Loading