Game Sessions
+
+
+
@@ -106,7 +112,9 @@ else
{
| @s.CreatedAt.ToString("yyyy-MM-dd HH:mm") |
- @s.Id.ToString()[..8]… |
+
+ @s.Id.ToString()[..8]…
+ |
@s.PlayerOneAccountId.ToString()[..8]… |
@s.PlayerTwoAccountId.ToString()[..8]… |
@s.Status |
@@ -239,6 +247,16 @@ else
await LoadAsync();
}
+ private async Task PurgeAllAsync()
+ {
+ if (!await JS.InvokeAsync("confirm", "Permanently delete ALL sessions and action logs?"))
+ return;
+ // Cascade delete on action_logs means deleting sessions removes logs too.
+ await Db.GameSessions.ExecuteDeleteAsync();
+ _page = 1;
+ await LoadAsync();
+ }
+
private async Task AbandonAllActiveAsync()
{
var now = DateTimeOffset.UtcNow;
diff --git a/Server/src/SOR.Database/Contexts/GameDbContext.cs b/Server/src/SOR.Database/Contexts/GameDbContext.cs
index 13d09c2..cd5a57d 100644
--- a/Server/src/SOR.Database/Contexts/GameDbContext.cs
+++ b/Server/src/SOR.Database/Contexts/GameDbContext.cs
@@ -63,6 +63,7 @@ public sealed class GameDbContext : DbContext
e.ToTable("action_logs");
e.HasKey(a => a.Id);
e.Property(a => a.PayloadJson).HasColumnType("jsonb").HasColumnName("payload");
+ e.Property(a => a.ResultJson).HasColumnType("jsonb").HasColumnName("result");
e.HasIndex(a => new { a.GameSessionId, a.SequenceNumber }).IsUnique();
e.HasIndex(a => a.ActorAccountId);
});
diff --git a/Server/src/SOR.Database/Entities/Game/GameActionLog.cs b/Server/src/SOR.Database/Entities/Game/GameActionLog.cs
index a46eddc..000448d 100644
--- a/Server/src/SOR.Database/Entities/Game/GameActionLog.cs
+++ b/Server/src/SOR.Database/Entities/Game/GameActionLog.cs
@@ -22,6 +22,9 @@ public sealed class GameActionLog
/// JSONB: serialized action request payload.
public string? PayloadJson { get; set; }
+ /// JSONB: serialized server response / result state sent back to the actor.
+ public string? ResultJson { get; set; }
+
/// 1-based sequence number within the game session.
public int SequenceNumber { get; set; }
diff --git a/Server/src/SOR.Database/Migrations/Game/20260309000000_AddActionLogResult.cs b/Server/src/SOR.Database/Migrations/Game/20260309000000_AddActionLogResult.cs
new file mode 100644
index 0000000..f885e15
--- /dev/null
+++ b/Server/src/SOR.Database/Migrations/Game/20260309000000_AddActionLogResult.cs
@@ -0,0 +1,30 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace SOR.Database.Migrations.Game
+{
+ ///
+ public partial class AddActionLogResult : Migration
+ {
+ ///
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.AddColumn(
+ name: "result",
+ schema: "game",
+ table: "action_logs",
+ type: "jsonb",
+ nullable: true);
+ }
+
+ ///
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropColumn(
+ name: "result",
+ schema: "game",
+ table: "action_logs");
+ }
+ }
+}
diff --git a/Server/src/SOR.Database/Migrations/Game/GameDbContextModelSnapshot.cs b/Server/src/SOR.Database/Migrations/Game/GameDbContextModelSnapshot.cs
index e7b56fa..a123756 100644
--- a/Server/src/SOR.Database/Migrations/Game/GameDbContextModelSnapshot.cs
+++ b/Server/src/SOR.Database/Migrations/Game/GameDbContextModelSnapshot.cs
@@ -105,6 +105,10 @@ namespace SOR.Database.Migrations.Game
.HasColumnType("jsonb")
.HasColumnName("payload");
+ b.Property("ResultJson")
+ .HasColumnType("jsonb")
+ .HasColumnName("result");
+
b.Property("SequenceNumber")
.HasColumnType("integer");
diff --git a/Server/src/SOR.Game/Handlers/GameActivateAbilityHandler.cs b/Server/src/SOR.Game/Handlers/GameActivateAbilityHandler.cs
index 8cddd37..0041c96 100644
--- a/Server/src/SOR.Game/Handlers/GameActivateAbilityHandler.cs
+++ b/Server/src/SOR.Game/Handlers/GameActivateAbilityHandler.cs
@@ -44,12 +44,13 @@ internal sealed class GameActivateAbilityHandler : GameHandlerBase, IMessageHand
var newState = GameEngine.ActivateAbility(
state, actorId, req.SourceInstanceId, req.AbilityIndex, req.Targets);
+ var dto = GameEngine.ToDto(newState, actorId);
await SaveStateAsync(_gameDb, session, newState, actorId, "game.activate_ability",
- JsonSerializer.Serialize(req), ct);
+ JsonSerializer.Serialize(req), ct, JsonSerializer.Serialize(dto));
await PushStateToPlayersAsync(_clientPush, session, newState, ct);
return ServerMessage.Reply("game.activate_ability.ack", message.Seq,
- new GameActivateAbilityResponse(GameEngine.ToDto(newState, actorId)));
+ new GameActivateAbilityResponse(dto));
}
}
diff --git a/Server/src/SOR.Game/Handlers/GameAscendHandler.cs b/Server/src/SOR.Game/Handlers/GameAscendHandler.cs
index 14f60b6..9231cd2 100644
--- a/Server/src/SOR.Game/Handlers/GameAscendHandler.cs
+++ b/Server/src/SOR.Game/Handlers/GameAscendHandler.cs
@@ -45,12 +45,13 @@ internal sealed class GameAscendHandler : GameHandlerBase, IMessageHandler
var state = GameEngine.Deserialize(session.StateJson!);
var newState = GameEngine.Ascend(state, actorId, req.IncomingCardInstanceId);
+ var dto = GameEngine.ToDto(newState, actorId);
await SaveStateAsync(_gameDb, session, newState, actorId, "game.ascend",
- JsonSerializer.Serialize(req), ct);
+ JsonSerializer.Serialize(req), ct, JsonSerializer.Serialize(dto));
await PushStateToPlayersAsync(_clientPush, session, newState, ct);
return ServerMessage.Reply("game.ascend.ack", message.Seq,
- new GameAscendResponse(GameEngine.ToDto(newState, actorId)));
+ new GameAscendResponse(dto));
}
}
diff --git a/Server/src/SOR.Game/Handlers/GameAttackHandler.cs b/Server/src/SOR.Game/Handlers/GameAttackHandler.cs
index cd665cf..b965375 100644
--- a/Server/src/SOR.Game/Handlers/GameAttackHandler.cs
+++ b/Server/src/SOR.Game/Handlers/GameAttackHandler.cs
@@ -45,8 +45,9 @@ internal sealed class GameAttackHandler : GameHandlerBase, IMessageHandler
var (newState, gameOver) = GameEngine.Attack(
state, actorId, req.AttackerInstanceId, req.TargetInstanceId);
+ var dto = GameEngine.ToDto(newState, actorId);
await SaveStateAsync(_gameDb, session, newState, actorId, "game.attack",
- JsonSerializer.Serialize(req), ct);
+ JsonSerializer.Serialize(req), ct, JsonSerializer.Serialize(dto));
if (gameOver)
{
@@ -69,6 +70,6 @@ internal sealed class GameAttackHandler : GameHandlerBase, IMessageHandler
}
return ServerMessage.Reply("game.attack.ack", message.Seq,
- new GameAttackResponse(GameEngine.ToDto(newState, actorId)));
+ new GameAttackResponse(dto));
}
}
diff --git a/Server/src/SOR.Game/Handlers/GameConcedeHandler.cs b/Server/src/SOR.Game/Handlers/GameConcedeHandler.cs
index 030c640..0911bde 100644
--- a/Server/src/SOR.Game/Handlers/GameConcedeHandler.cs
+++ b/Server/src/SOR.Game/Handlers/GameConcedeHandler.cs
@@ -43,8 +43,9 @@ internal sealed class GameConcedeHandler : GameHandlerBase, IMessageHandler
var state = GameEngine.Deserialize(session.StateJson!);
var newState = GameEngine.Concede(state, actorId);
+ var dto = GameEngine.ToDto(newState, actorId);
await SaveStateAsync(_gameDb, session, newState, actorId, "game.concede",
- JsonSerializer.Serialize(req), ct);
+ JsonSerializer.Serialize(req), ct, JsonSerializer.Serialize(dto));
var winnerId = session.PlayerOneAccountId.ToString() == actorId
? session.PlayerTwoAccountId
@@ -59,6 +60,6 @@ internal sealed class GameConcedeHandler : GameHandlerBase, IMessageHandler
ct);
return ServerMessage.Reply("game.concede.ack", message.Seq,
- new GameConcedeResponse(GameEngine.ToDto(newState, actorId)));
+ new GameConcedeResponse(dto));
}
}
diff --git a/Server/src/SOR.Game/Handlers/GameDrawHandler.cs b/Server/src/SOR.Game/Handlers/GameDrawHandler.cs
index ea0cb8f..6a5ab61 100644
--- a/Server/src/SOR.Game/Handlers/GameDrawHandler.cs
+++ b/Server/src/SOR.Game/Handlers/GameDrawHandler.cs
@@ -38,12 +38,13 @@ internal sealed class GameDrawHandler : GameHandlerBase, IMessageHandler
var (newState, drawn) = GameEngine.Draw(state, actorId);
+ var dto = GameEngine.ToDto(newState, actorId);
await SaveStateAsync(_gameDb, session, newState, actorId, "game.draw",
- JsonSerializer.Serialize(req), ct);
+ JsonSerializer.Serialize(req), ct, JsonSerializer.Serialize(dto));
await PushStateToPlayersAsync(_clientPush, session, newState, ct);
return ServerMessage.Reply("game.draw.ack", message.Seq,
- new GameDrawResponse(GameEngine.ToDto(newState, actorId)));
+ new GameDrawResponse(dto));
}
}
diff --git a/Server/src/SOR.Game/Handlers/GameEndTurnHandler.cs b/Server/src/SOR.Game/Handlers/GameEndTurnHandler.cs
index a63bee2..26ba8ac 100644
--- a/Server/src/SOR.Game/Handlers/GameEndTurnHandler.cs
+++ b/Server/src/SOR.Game/Handlers/GameEndTurnHandler.cs
@@ -37,12 +37,13 @@ internal sealed class GameEndTurnHandler : GameHandlerBase, IMessageHandler
var state = GameEngine.Deserialize(session.StateJson!);
var newState = GameEngine.EndTurn(state, actorId);
+ var dto = GameEngine.ToDto(newState, actorId);
await SaveStateAsync(_gameDb, session, newState, actorId, "game.end_turn",
- JsonSerializer.Serialize(req), ct);
+ JsonSerializer.Serialize(req), ct, JsonSerializer.Serialize(dto));
await PushStateToPlayersAsync(_clientPush, session, newState, ct);
return ServerMessage.Reply("game.end_turn.ack", message.Seq,
- new GameEndTurnResponse(GameEngine.ToDto(newState, actorId)));
+ new GameEndTurnResponse(dto));
}
}
diff --git a/Server/src/SOR.Game/Handlers/GameHandlerBase.cs b/Server/src/SOR.Game/Handlers/GameHandlerBase.cs
index 0d014c5..7a23f7a 100644
--- a/Server/src/SOR.Game/Handlers/GameHandlerBase.cs
+++ b/Server/src/SOR.Game/Handlers/GameHandlerBase.cs
@@ -62,7 +62,8 @@ internal abstract class GameHandlerBase
string actorId,
string actionType,
string? payloadJson,
- CancellationToken ct)
+ CancellationToken ct,
+ string? resultJson = null)
{
var seqNum = state.NextActionSequence++; // increment before serialize so the saved JSON reflects the consumed number
session.StateJson = GameEngine.Serialize(state);
@@ -72,6 +73,7 @@ internal abstract class GameHandlerBase
ActorAccountId = Guid.Parse(actorId),
ActionType = actionType,
PayloadJson = payloadJson,
+ ResultJson = resultJson,
SequenceNumber = seqNum,
OccurredAt = DateTimeOffset.UtcNow,
});
diff --git a/Server/src/SOR.Game/Handlers/GameMoveUnitHandler.cs b/Server/src/SOR.Game/Handlers/GameMoveUnitHandler.cs
index b2b1c10..8a99d30 100644
--- a/Server/src/SOR.Game/Handlers/GameMoveUnitHandler.cs
+++ b/Server/src/SOR.Game/Handlers/GameMoveUnitHandler.cs
@@ -45,12 +45,13 @@ internal sealed class GameMoveUnitHandler : GameHandlerBase, IMessageHandler
var target = new Coord(req.TargetPosition.X, req.TargetPosition.Y);
var newState = GameEngine.MoveUnit(state, actorId, req.UnitInstanceId, target);
+ var dto = GameEngine.ToDto(newState, actorId);
await SaveStateAsync(_gameDb, session, newState, actorId, "game.move_unit",
- JsonSerializer.Serialize(req), ct);
+ JsonSerializer.Serialize(req), ct, JsonSerializer.Serialize(dto));
await PushStateToPlayersAsync(_clientPush, session, newState, ct);
return ServerMessage.Reply("game.move_unit.ack", message.Seq,
- new GameMoveUnitResponse(GameEngine.ToDto(newState, actorId)));
+ new GameMoveUnitResponse(dto));
}
}
diff --git a/Server/src/SOR.Game/Handlers/GamePlaceArchSpiritHandler.cs b/Server/src/SOR.Game/Handlers/GamePlaceArchSpiritHandler.cs
index 7361760..bd1a4c5 100644
--- a/Server/src/SOR.Game/Handlers/GamePlaceArchSpiritHandler.cs
+++ b/Server/src/SOR.Game/Handlers/GamePlaceArchSpiritHandler.cs
@@ -49,12 +49,13 @@ internal sealed class GamePlaceArchSpiritHandler : GameHandlerBase, IMessageHand
var coord = new Coord(req.Position.X, req.Position.Y);
var (newState, _) = GameEngine.PlaceArchSpirit(state, actorId, coord);
+ var dto = GameEngine.ToDto(newState, actorId);
await SaveStateAsync(_gameDb, session, newState, actorId, "game.place_arch_spirit",
- JsonSerializer.Serialize(req), ct);
+ JsonSerializer.Serialize(req), ct, JsonSerializer.Serialize(dto));
await PushStateToPlayersAsync(_clientPush, session, newState, ct);
return ServerMessage.Reply("game.place_arch_spirit.ack", message.Seq,
- new GamePlaceArchSpiritResponse(GameEngine.ToDto(newState, actorId)));
+ new GamePlaceArchSpiritResponse(dto));
}
}
diff --git a/Server/src/SOR.Game/Handlers/GamePlayCardHandler.cs b/Server/src/SOR.Game/Handlers/GamePlayCardHandler.cs
index ffa5d54..5f3e7fc 100644
--- a/Server/src/SOR.Game/Handlers/GamePlayCardHandler.cs
+++ b/Server/src/SOR.Game/Handlers/GamePlayCardHandler.cs
@@ -51,12 +51,12 @@ internal sealed class GamePlayCardHandler : GameHandlerBase, IMessageHandler
var newState = GameEngine.ChannelCard(state, actorId, req.CardInstanceId, targets, req.Targets);
+ var dto = GameEngine.ToDto(newState, actorId);
await SaveStateAsync(_gameDb, session, newState, actorId, "game.play_card",
- JsonSerializer.Serialize(req), ct);
+ JsonSerializer.Serialize(req), ct, JsonSerializer.Serialize(dto));
await PushStateToPlayersAsync(_clientPush, session, newState, ct);
- return ServerMessage.Reply("game.play_card.ack", message.Seq,
- new GamePlayCardResponse(GameEngine.ToDto(newState, actorId)));
+ return ServerMessage.Reply("game.play_card.ack", message.Seq, new GamePlayCardResponse(dto));
}
}
diff --git a/Server/src/SOR.Game/Handlers/GameSacrificeHandler.cs b/Server/src/SOR.Game/Handlers/GameSacrificeHandler.cs
index 6fad96b..ebcc740 100644
--- a/Server/src/SOR.Game/Handlers/GameSacrificeHandler.cs
+++ b/Server/src/SOR.Game/Handlers/GameSacrificeHandler.cs
@@ -44,12 +44,13 @@ internal sealed class GameSacrificeHandler : GameHandlerBase, IMessageHandler
var state = GameEngine.Deserialize(session.StateJson!);
var newState = GameEngine.Sacrifice(state, actorId, req.UnitInstanceId);
+ var dto = GameEngine.ToDto(newState, actorId);
await SaveStateAsync(_gameDb, session, newState, actorId, "game.sacrifice",
- JsonSerializer.Serialize(req), ct);
+ JsonSerializer.Serialize(req), ct, JsonSerializer.Serialize(dto));
await PushStateToPlayersAsync(_clientPush, session, newState, ct);
return ServerMessage.Reply("game.sacrifice.ack", message.Seq,
- new GameSacrificeResponse(GameEngine.ToDto(newState, actorId)));
+ new GameSacrificeResponse(dto));
}
}
diff --git a/Server/src/SOR.Game/Handlers/GameTransitionHandler.cs b/Server/src/SOR.Game/Handlers/GameTransitionHandler.cs
index 446d343..33588d9 100644
--- a/Server/src/SOR.Game/Handlers/GameTransitionHandler.cs
+++ b/Server/src/SOR.Game/Handlers/GameTransitionHandler.cs
@@ -45,12 +45,13 @@ internal sealed class GameTransitionHandler : GameHandlerBase, IMessageHandler
var state = GameEngine.Deserialize(session.StateJson!);
var newState = GameEngine.Transition(state, actorId, req.IncomingCardInstanceId);
+ var dto = GameEngine.ToDto(newState, actorId);
await SaveStateAsync(_gameDb, session, newState, actorId, "game.transition",
- JsonSerializer.Serialize(req), ct);
+ JsonSerializer.Serialize(req), ct, JsonSerializer.Serialize(dto));
await PushStateToPlayersAsync(_clientPush, session, newState, ct);
return ServerMessage.Reply("game.transition.ack", message.Seq,
- new GameTransitionResponse(GameEngine.ToDto(newState, actorId)));
+ new GameTransitionResponse(dto));
}
}