Compare commits
17 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7372867a82 | |||
| c3e7b82ae8 | |||
| e88b081947 | |||
| 1b30c3be39 | |||
| f8ca95af3c | |||
| 4a50db0721 | |||
| 260db25803 | |||
| 80e1cc258b | |||
| bfc46723e6 | |||
| bace029a8a | |||
| 7664042193 | |||
| a604b4ad42 | |||
| fdf4c94811 | |||
| d9f30f0bfe | |||
| 1f4e9c8498 | |||
| e2b13c0c8f | |||
| bfb15c7299 |
@@ -81,3 +81,20 @@
|
|||||||
|
|
||||||
* **analytics:** upgrade Spark to 4.0.3 — 3.5.x has no official Docker image ([46af115](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/46af1154de34a8596cb6cb28c6fad7aba90f597c))
|
* **analytics:** upgrade Spark to 4.0.3 — 3.5.x has no official Docker image ([46af115](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/46af1154de34a8596cb6cb28c6fad7aba90f597c))
|
||||||
* **analytics:** write decompressed PGN to shared PVC path for executor access ([a268a9a](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/a268a9acb7ba190c76e996ccf3ea3bd00e5cec92))
|
* **analytics:** write decompressed PGN to shared PVC path for executor access ([a268a9a](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/a268a9acb7ba190c76e996ccf3ea3bd00e5cec92))
|
||||||
|
## (2026-06-23)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **analytics:** add 7 new Spark analytics jobs and extend GameSource ([8e17c14](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/8e17c14dff740cd115011dfbf17de35083b8fe46))
|
||||||
|
* **analytics:** add accuracy and blunder analysis job for Lichess data ([c3e7b82](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/c3e7b82ae806adf5713ce4d267c1155e73a40ff5))
|
||||||
|
* **analytics:** add Dockerfile, CI workflow, and stable jar name for K8s deployment ([95215b6](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/95215b6a420fd526df1aa395f9b087556c8ad03b))
|
||||||
|
* **analytics:** add PostgreSQL JDBC write-back to all four batch jobs ([0e0ea4c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/0e0ea4c9893c6efed52e633e55d05ab3ed004502))
|
||||||
|
* **analytics:** add Spark batch analytics module ([259b3bb](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/259b3bbb24c0f23326269b93f4b3c84012f727cd))
|
||||||
|
* **analytics:** add Structured Streaming, MLlib clustering, GraphX jobs ([e1d80b9](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/e1d80b9331666feea191b1fd08aa762f3581c918))
|
||||||
|
* **analytics:** always write results to PostgreSQL regardless of input source ([da0e6d1](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/da0e6d1ee2d391ecb6291396f82471eb51b1b25e))
|
||||||
|
* **official-bots:** park expert bot on tournament server at startup ([#76](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/76)) ([751a58b](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/751a58b6061f7434115e229a7661894c76768bc2))
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **analytics:** upgrade Spark to 4.0.3 — 3.5.x has no official Docker image ([46af115](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/46af1154de34a8596cb6cb28c6fad7aba90f597c))
|
||||||
|
* **analytics:** write decompressed PGN to shared PVC path for executor access ([a268a9a](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/a268a9acb7ba190c76e996ccf3ea3bd00e5cec92))
|
||||||
|
|||||||
@@ -0,0 +1,191 @@
|
|||||||
|
package de.nowchess.analytics
|
||||||
|
|
||||||
|
import org.apache.spark.sql.SparkSession
|
||||||
|
import org.apache.spark.sql.expressions.Window
|
||||||
|
import org.apache.spark.sql.functions as F
|
||||||
|
|
||||||
|
/** Per-move accuracy & blunder analysis mined from Lichess `[%eval ...]` move annotations.
|
||||||
|
*
|
||||||
|
* Unlike the flat single-`groupBy` summaries (opening rates, colour advantage), this job reconstructs the *quality of
|
||||||
|
* every move* from the engine evaluations Lichess embeds in the movetext (`{ [%eval 0.24] }`, mate scores `[%eval
|
||||||
|
* #-3]`) and turns them into the same accuracy signals lichess.com surfaces: average centipawn loss (ACPL), and counts
|
||||||
|
* of inaccuracies / mistakes / blunders.
|
||||||
|
*
|
||||||
|
* Pipeline (all Spark SQL string/array functions + window funcs — no UDFs, Catalyst-friendly):
|
||||||
|
* 1. Keep only games carrying `[%eval` comments.
|
||||||
|
* 2. `regexp_extract_all` pulls every eval in ply order; mate scores collapse to ±10 pawns, normal evals are clamped
|
||||||
|
* to ±10 so a single huge swing cannot dominate the mean. All evals are White-POV pawns.
|
||||||
|
* 3. `posexplode` → one row per ply; a per-game window `lag` gives the eval *before* the move.
|
||||||
|
* 4. Centipawn loss for the side that moved = how much the eval moved against them (white wants it up, black down),
|
||||||
|
* floored at 0 and scaled to centipawns.
|
||||||
|
* 5. Roll up to (game, side): ACPL + inaccuracy(≥50cp) / mistake(≥100cp) / blunder(≥200cp) counts, tagged with that
|
||||||
|
* side's Elo and whether they won.
|
||||||
|
*
|
||||||
|
* Outputs (Parquet + CSV + JDBC):
|
||||||
|
* - `accuracy_by_rating` — ACPL, avg blunders/mistakes/inaccuracies per game and win-rate, per Elo band. Shows how
|
||||||
|
* move quality scales with rating.
|
||||||
|
* - `blunder_outcome` — win-rate bucketed by number of blunders in the game. Quantifies "one blunder costs you the
|
||||||
|
* game".
|
||||||
|
*
|
||||||
|
* Requires the eval-annotated Lichess dump (`NOWCHESS_PGN_PATH` → an evals dump); JDBC games carry no per-move evals.
|
||||||
|
*/
|
||||||
|
object AccuracyBlunderJob:
|
||||||
|
|
||||||
|
def main(args: Array[String]): Unit =
|
||||||
|
val jdbcUrl = sys.env.getOrElse("NOWCHESS_JDBC_URL", "jdbc:postgresql://localhost:5432/nowchess")
|
||||||
|
val dbUser = sys.env.getOrElse("NOWCHESS_DB_USER", "nowchess")
|
||||||
|
val dbPass = sys.env.getOrElse("NOWCHESS_DB_PASS", "nowchess")
|
||||||
|
val outputDir = if args.length > 0 then args(0) else "/tmp/nowchess-accuracy"
|
||||||
|
|
||||||
|
val spark = SparkSession
|
||||||
|
.builder()
|
||||||
|
.appName("NowChess Accuracy & Blunders")
|
||||||
|
.getOrCreate()
|
||||||
|
|
||||||
|
run(spark, jdbcUrl, dbUser, dbPass, outputDir)
|
||||||
|
spark.stop()
|
||||||
|
|
||||||
|
def run(spark: SparkSession, jdbcUrl: String, dbUser: String, dbPass: String, outputDir: String): Unit =
|
||||||
|
val games = GameSource
|
||||||
|
.loadExtended(spark, jdbcUrl, dbUser, dbPass)
|
||||||
|
.select("pgn", "result", "white_elo", "black_elo")
|
||||||
|
.filter(F.col("result").isNotNull.and(F.col("pgn").contains("[%eval")))
|
||||||
|
.withColumn("game_id", F.monotonically_increasing_id())
|
||||||
|
|
||||||
|
// White-POV pawn evals in ply order; mate → ±10, normal evals clamped to ±10.
|
||||||
|
val evalStrs = F.expr("""regexp_extract_all(pgn, '\\[%eval ([^\\]]+)\\]', 1)""")
|
||||||
|
val evalCps = F.expr(
|
||||||
|
"transform(eval_strs, x -> CASE " +
|
||||||
|
"WHEN x LIKE '#-%' THEN -10.0 " +
|
||||||
|
"WHEN x LIKE '#%' THEN 10.0 " +
|
||||||
|
"ELSE greatest(-10.0, least(10.0, cast(x as double))) END)",
|
||||||
|
)
|
||||||
|
|
||||||
|
val withEvals = games
|
||||||
|
.withColumn("eval_strs", evalStrs)
|
||||||
|
.withColumn("eval_cp", evalCps)
|
||||||
|
.filter(F.size(F.col("eval_cp")) >= 2)
|
||||||
|
|
||||||
|
val plies = withEvals.select(
|
||||||
|
F.col("game_id"),
|
||||||
|
F.col("result"),
|
||||||
|
F.col("white_elo"),
|
||||||
|
F.col("black_elo"),
|
||||||
|
F.posexplode(F.col("eval_cp")).as(Seq("ply", "eval_after")),
|
||||||
|
)
|
||||||
|
|
||||||
|
val byGame = Window.partitionBy("game_id").orderBy("ply")
|
||||||
|
val mover = F.when(F.col("ply") % 2 === 0, "white").otherwise("black")
|
||||||
|
val evalBefore = F.coalesce(F.lag("eval_after", 1).over(byGame), F.lit(0.15))
|
||||||
|
val cpl = F.greatest(
|
||||||
|
F.lit(0.0),
|
||||||
|
F.when(F.col("mover") === "white", evalBefore - F.col("eval_after"))
|
||||||
|
.otherwise(F.col("eval_after") - evalBefore),
|
||||||
|
) * 100
|
||||||
|
|
||||||
|
val moves = plies
|
||||||
|
.withColumn("mover", mover)
|
||||||
|
.withColumn("cpl", cpl)
|
||||||
|
|
||||||
|
val perSide = moves
|
||||||
|
.groupBy("game_id", "mover", "result", "white_elo", "black_elo")
|
||||||
|
.agg(
|
||||||
|
F.round(F.avg("cpl"), 1).as("acpl"),
|
||||||
|
F.sum(F.when(F.col("cpl") >= 200, 1).otherwise(0)).as("blunders"),
|
||||||
|
F.sum(F.when(F.col("cpl") >= 100 && F.col("cpl") < 200, 1).otherwise(0)).as("mistakes"),
|
||||||
|
F.sum(F.when(F.col("cpl") >= 50 && F.col("cpl") < 100, 1).otherwise(0)).as("inaccuracies"),
|
||||||
|
)
|
||||||
|
.withColumn(
|
||||||
|
"self_elo",
|
||||||
|
F.when(F.col("mover") === "white", F.col("white_elo")).otherwise(F.col("black_elo")),
|
||||||
|
)
|
||||||
|
.withColumn("won", F.when(F.col("mover") === F.col("result"), 1).otherwise(0))
|
||||||
|
|
||||||
|
writeAccuracyByRating(perSide, jdbcUrl, dbUser, dbPass, outputDir)
|
||||||
|
writeBlunderOutcome(perSide, jdbcUrl, dbUser, dbPass, outputDir)
|
||||||
|
|
||||||
|
private def writeAccuracyByRating(
|
||||||
|
perSide: org.apache.spark.sql.DataFrame,
|
||||||
|
jdbcUrl: String,
|
||||||
|
dbUser: String,
|
||||||
|
dbPass: String,
|
||||||
|
outputDir: String,
|
||||||
|
): Unit =
|
||||||
|
val elo = F.col("self_elo")
|
||||||
|
val band = F
|
||||||
|
.when(elo < 1200, "<1200")
|
||||||
|
.when(elo < 1500, "1200–1499")
|
||||||
|
.when(elo < 1800, "1500–1799")
|
||||||
|
.when(elo < 2100, "1800–2099")
|
||||||
|
.otherwise("2100+")
|
||||||
|
val bandOrder = F
|
||||||
|
.when(elo < 1200, 1)
|
||||||
|
.when(elo < 1500, 2)
|
||||||
|
.when(elo < 1800, 3)
|
||||||
|
.when(elo < 2100, 4)
|
||||||
|
.otherwise(5)
|
||||||
|
|
||||||
|
val stats = perSide
|
||||||
|
.filter(elo.isNotNull)
|
||||||
|
.withColumn("band", band)
|
||||||
|
.withColumn("band_order", bandOrder)
|
||||||
|
.groupBy("band", "band_order")
|
||||||
|
.agg(
|
||||||
|
F.count("*").as("player_games"),
|
||||||
|
F.round(F.avg("acpl"), 1).as("avg_acpl"),
|
||||||
|
F.round(F.avg("blunders"), 2).as("avg_blunders"),
|
||||||
|
F.round(F.avg("mistakes"), 2).as("avg_mistakes"),
|
||||||
|
F.round(F.avg("inaccuracies"), 2).as("avg_inaccuracies"),
|
||||||
|
F.round(F.avg("won"), 3).as("win_rate"),
|
||||||
|
)
|
||||||
|
.orderBy(F.asc("band_order"))
|
||||||
|
.drop("band_order")
|
||||||
|
|
||||||
|
write(stats, outputDir, "accuracy_by_rating", jdbcUrl, dbUser, dbPass, "analytics_accuracy_by_rating")
|
||||||
|
|
||||||
|
private def writeBlunderOutcome(
|
||||||
|
perSide: org.apache.spark.sql.DataFrame,
|
||||||
|
jdbcUrl: String,
|
||||||
|
dbUser: String,
|
||||||
|
dbPass: String,
|
||||||
|
outputDir: String,
|
||||||
|
): Unit =
|
||||||
|
val b = F.col("blunders")
|
||||||
|
val bucket = F.when(b === 0, "0").when(b === 1, "1").when(b === 2, "2").otherwise("3+")
|
||||||
|
val order = F.when(b === 0, 0).when(b === 1, 1).when(b === 2, 2).otherwise(3)
|
||||||
|
|
||||||
|
val stats = perSide
|
||||||
|
.withColumn("blunder_bucket", bucket)
|
||||||
|
.withColumn("bucket_order", order)
|
||||||
|
.groupBy("blunder_bucket", "bucket_order")
|
||||||
|
.agg(
|
||||||
|
F.count("*").as("player_games"),
|
||||||
|
F.round(F.avg("won"), 3).as("win_rate"),
|
||||||
|
F.round(F.avg("acpl"), 1).as("avg_acpl"),
|
||||||
|
)
|
||||||
|
.orderBy(F.asc("bucket_order"))
|
||||||
|
.drop("bucket_order")
|
||||||
|
|
||||||
|
write(stats, outputDir, "blunder_outcome", jdbcUrl, dbUser, dbPass, "analytics_blunder_outcome")
|
||||||
|
|
||||||
|
private def write(
|
||||||
|
df: org.apache.spark.sql.DataFrame,
|
||||||
|
outputDir: String,
|
||||||
|
name: String,
|
||||||
|
jdbcUrl: String,
|
||||||
|
dbUser: String,
|
||||||
|
dbPass: String,
|
||||||
|
table: String,
|
||||||
|
): Unit =
|
||||||
|
df.write.mode("overwrite").parquet(s"$outputDir/$name")
|
||||||
|
df.write.mode("overwrite").option("header", "true").csv(s"$outputDir/${name}_csv")
|
||||||
|
if !GameSource.isPgnMode then
|
||||||
|
df.write
|
||||||
|
.mode("overwrite")
|
||||||
|
.format("jdbc")
|
||||||
|
.option("url", jdbcUrl)
|
||||||
|
.option("dbtable", table)
|
||||||
|
.option("user", dbUser)
|
||||||
|
.option("password", dbPass)
|
||||||
|
.option("driver", "org.postgresql.Driver")
|
||||||
|
.save()
|
||||||
@@ -0,0 +1,199 @@
|
|||||||
|
package de.nowchess.analytics
|
||||||
|
|
||||||
|
import org.apache.spark.sql.SparkSession
|
||||||
|
import org.apache.spark.sql.expressions.Window
|
||||||
|
import org.apache.spark.sql.functions as F
|
||||||
|
|
||||||
|
/** Time-management & clock-pressure analysis mined from Lichess `[%clk ...]` move annotations.
|
||||||
|
*
|
||||||
|
* Lichess records each player's remaining clock after every move (`{ [%clk 0:02:31] }`). This job reconstructs
|
||||||
|
* per-move thinking time and remaining-time from those stamps to answer questions the existing time-control summary
|
||||||
|
* cannot: how long do players actually think, how often do they fall into time scrambles (<10 s left), how often do
|
||||||
|
* they flag (lose on time), and does burning the clock correlate with winning?
|
||||||
|
*
|
||||||
|
* Pipeline (Spark SQL string/array funcs + window funcs — no UDFs):
|
||||||
|
* 1. `regexp_extract_all` pulls every `h:mm:ss` clock in ply order, converted to seconds.
|
||||||
|
* 2. `posexplode` → one row per ply; even plies are White's clock, odd plies Black's.
|
||||||
|
* 3. A per-(game,side) window `lag` gives the same side's previous clock; the difference is that move's thinking time.
|
||||||
|
* Remaining clock <10 s marks a time-scramble move.
|
||||||
|
* 4. Roll up to (game, side): avg move time, scramble fraction, min clock, Elo, win flag, and whether the side lost on
|
||||||
|
* time (`Termination "Time forfeit"`).
|
||||||
|
*
|
||||||
|
* Outputs (Parquet + CSV + JDBC):
|
||||||
|
* - `clock_by_rating` — avg move time, scramble fraction, flag-loss rate and win-rate per Elo band.
|
||||||
|
* - `scramble_outcome` — win-rate bucketed by how much of the game was played in time-scramble. Quantifies the cost of
|
||||||
|
* time trouble.
|
||||||
|
*
|
||||||
|
* Requires a clock-annotated Lichess dump (`NOWCHESS_PGN_PATH`).
|
||||||
|
*/
|
||||||
|
object ClockPressureJob:
|
||||||
|
|
||||||
|
def main(args: Array[String]): Unit =
|
||||||
|
val jdbcUrl = sys.env.getOrElse("NOWCHESS_JDBC_URL", "jdbc:postgresql://localhost:5432/nowchess")
|
||||||
|
val dbUser = sys.env.getOrElse("NOWCHESS_DB_USER", "nowchess")
|
||||||
|
val dbPass = sys.env.getOrElse("NOWCHESS_DB_PASS", "nowchess")
|
||||||
|
val outputDir = if args.length > 0 then args(0) else "/tmp/nowchess-clock-pressure"
|
||||||
|
|
||||||
|
val spark = SparkSession
|
||||||
|
.builder()
|
||||||
|
.appName("NowChess Clock Pressure")
|
||||||
|
.getOrCreate()
|
||||||
|
|
||||||
|
run(spark, jdbcUrl, dbUser, dbPass, outputDir)
|
||||||
|
spark.stop()
|
||||||
|
|
||||||
|
def run(spark: SparkSession, jdbcUrl: String, dbUser: String, dbPass: String, outputDir: String): Unit =
|
||||||
|
val games = GameSource
|
||||||
|
.loadExtended(spark, jdbcUrl, dbUser, dbPass)
|
||||||
|
.select("pgn", "result", "white_elo", "black_elo", "termination")
|
||||||
|
.filter(F.col("result").isNotNull.and(F.col("pgn").contains("[%clk")))
|
||||||
|
.withColumn("game_id", F.monotonically_increasing_id())
|
||||||
|
|
||||||
|
val clkStrs = F.expr("""regexp_extract_all(pgn, '\\[%clk ([^\\]]+)\\]', 1)""")
|
||||||
|
// "h:mm:ss" → seconds.
|
||||||
|
val clkSecs = F.expr(
|
||||||
|
"transform(clk_strs, x -> " +
|
||||||
|
"cast(split(x, ':')[0] as double) * 3600 + " +
|
||||||
|
"cast(split(x, ':')[1] as double) * 60 + " +
|
||||||
|
"cast(split(x, ':')[2] as double))",
|
||||||
|
)
|
||||||
|
|
||||||
|
val withClk = games
|
||||||
|
.withColumn("clk_strs", clkStrs)
|
||||||
|
.withColumn("clk_sec", clkSecs)
|
||||||
|
.filter(F.size(F.col("clk_sec")) >= 4)
|
||||||
|
|
||||||
|
val plies = withClk.select(
|
||||||
|
F.col("game_id"),
|
||||||
|
F.col("result"),
|
||||||
|
F.col("white_elo"),
|
||||||
|
F.col("black_elo"),
|
||||||
|
F.col("termination"),
|
||||||
|
F.posexplode(F.col("clk_sec")).as(Seq("ply", "clk_after")),
|
||||||
|
)
|
||||||
|
|
||||||
|
val mover = F.when(F.col("ply") % 2 === 0, "white").otherwise("black")
|
||||||
|
val bySide = Window.partitionBy("game_id", "mover").orderBy("ply")
|
||||||
|
val moveTime = F.lag("clk_after", 1).over(bySide) - F.col("clk_after")
|
||||||
|
|
||||||
|
val moves = plies
|
||||||
|
.withColumn("mover", mover)
|
||||||
|
.withColumn("move_time", moveTime)
|
||||||
|
|
||||||
|
val perSide = moves
|
||||||
|
.groupBy("game_id", "mover", "result", "white_elo", "black_elo", "termination")
|
||||||
|
.agg(
|
||||||
|
F.round(F.avg("move_time"), 1).as("avg_move_time"),
|
||||||
|
F.count("*").as("moves"),
|
||||||
|
F.round(F.min("clk_after"), 1).as("min_clk"),
|
||||||
|
F.sum(F.when(F.col("clk_after") < 10, 1).otherwise(0)).as("scramble_moves"),
|
||||||
|
)
|
||||||
|
.withColumn("scramble_fraction", F.round(F.col("scramble_moves") / F.col("moves"), 3))
|
||||||
|
.withColumn(
|
||||||
|
"self_elo",
|
||||||
|
F.when(F.col("mover") === "white", F.col("white_elo")).otherwise(F.col("black_elo")),
|
||||||
|
)
|
||||||
|
.withColumn("won", F.when(F.col("mover") === F.col("result"), 1).otherwise(0))
|
||||||
|
.withColumn(
|
||||||
|
"flag_loss",
|
||||||
|
F.when(
|
||||||
|
F.coalesce(F.col("termination"), F.lit("")).contains("Time forfeit") && F.col("won") === 0,
|
||||||
|
1,
|
||||||
|
).otherwise(0),
|
||||||
|
)
|
||||||
|
|
||||||
|
writeClockByRating(perSide, jdbcUrl, dbUser, dbPass, outputDir)
|
||||||
|
writeScrambleOutcome(perSide, jdbcUrl, dbUser, dbPass, outputDir)
|
||||||
|
|
||||||
|
private def writeClockByRating(
|
||||||
|
perSide: org.apache.spark.sql.DataFrame,
|
||||||
|
jdbcUrl: String,
|
||||||
|
dbUser: String,
|
||||||
|
dbPass: String,
|
||||||
|
outputDir: String,
|
||||||
|
): Unit =
|
||||||
|
val elo = F.col("self_elo")
|
||||||
|
val band = F
|
||||||
|
.when(elo < 1200, "<1200")
|
||||||
|
.when(elo < 1500, "1200–1499")
|
||||||
|
.when(elo < 1800, "1500–1799")
|
||||||
|
.when(elo < 2100, "1800–2099")
|
||||||
|
.otherwise("2100+")
|
||||||
|
val bandOrder = F
|
||||||
|
.when(elo < 1200, 1)
|
||||||
|
.when(elo < 1500, 2)
|
||||||
|
.when(elo < 1800, 3)
|
||||||
|
.when(elo < 2100, 4)
|
||||||
|
.otherwise(5)
|
||||||
|
|
||||||
|
val stats = perSide
|
||||||
|
.filter(elo.isNotNull)
|
||||||
|
.withColumn("band", band)
|
||||||
|
.withColumn("band_order", bandOrder)
|
||||||
|
.groupBy("band", "band_order")
|
||||||
|
.agg(
|
||||||
|
F.count("*").as("player_games"),
|
||||||
|
F.round(F.avg("avg_move_time"), 1).as("avg_move_time_s"),
|
||||||
|
F.round(F.avg("scramble_fraction"), 3).as("avg_scramble_fraction"),
|
||||||
|
F.round(F.avg("flag_loss"), 3).as("flag_loss_rate"),
|
||||||
|
F.round(F.avg("won"), 3).as("win_rate"),
|
||||||
|
)
|
||||||
|
.orderBy(F.asc("band_order"))
|
||||||
|
.drop("band_order")
|
||||||
|
|
||||||
|
write(stats, outputDir, "clock_by_rating", jdbcUrl, dbUser, dbPass, "analytics_clock_by_rating")
|
||||||
|
|
||||||
|
private def writeScrambleOutcome(
|
||||||
|
perSide: org.apache.spark.sql.DataFrame,
|
||||||
|
jdbcUrl: String,
|
||||||
|
dbUser: String,
|
||||||
|
dbPass: String,
|
||||||
|
outputDir: String,
|
||||||
|
): Unit =
|
||||||
|
val sf = F.col("scramble_fraction")
|
||||||
|
val bucket = F
|
||||||
|
.when(sf === 0, "none")
|
||||||
|
.when(sf < 0.05, "<5%")
|
||||||
|
.when(sf < 0.20, "5–20%")
|
||||||
|
.otherwise(">20%")
|
||||||
|
val order = F
|
||||||
|
.when(sf === 0, 0)
|
||||||
|
.when(sf < 0.05, 1)
|
||||||
|
.when(sf < 0.20, 2)
|
||||||
|
.otherwise(3)
|
||||||
|
|
||||||
|
val stats = perSide
|
||||||
|
.withColumn("scramble_bucket", bucket)
|
||||||
|
.withColumn("bucket_order", order)
|
||||||
|
.groupBy("scramble_bucket", "bucket_order")
|
||||||
|
.agg(
|
||||||
|
F.count("*").as("player_games"),
|
||||||
|
F.round(F.avg("won"), 3).as("win_rate"),
|
||||||
|
F.round(F.avg("flag_loss"), 3).as("flag_loss_rate"),
|
||||||
|
)
|
||||||
|
.orderBy(F.asc("bucket_order"))
|
||||||
|
.drop("bucket_order")
|
||||||
|
|
||||||
|
write(stats, outputDir, "scramble_outcome", jdbcUrl, dbUser, dbPass, "analytics_scramble_outcome")
|
||||||
|
|
||||||
|
private def write(
|
||||||
|
df: org.apache.spark.sql.DataFrame,
|
||||||
|
outputDir: String,
|
||||||
|
name: String,
|
||||||
|
jdbcUrl: String,
|
||||||
|
dbUser: String,
|
||||||
|
dbPass: String,
|
||||||
|
table: String,
|
||||||
|
): Unit =
|
||||||
|
df.write.mode("overwrite").parquet(s"$outputDir/$name")
|
||||||
|
df.write.mode("overwrite").option("header", "true").csv(s"$outputDir/${name}_csv")
|
||||||
|
if !GameSource.isPgnMode then
|
||||||
|
df.write
|
||||||
|
.mode("overwrite")
|
||||||
|
.format("jdbc")
|
||||||
|
.option("url", jdbcUrl)
|
||||||
|
.option("dbtable", table)
|
||||||
|
.option("user", dbUser)
|
||||||
|
.option("password", dbPass)
|
||||||
|
.option("driver", "org.postgresql.Driver")
|
||||||
|
.save()
|
||||||
@@ -0,0 +1,154 @@
|
|||||||
|
package de.nowchess.analytics
|
||||||
|
|
||||||
|
import org.apache.spark.sql.SparkSession
|
||||||
|
import org.apache.spark.sql.expressions.Window
|
||||||
|
import org.apache.spark.sql.functions as F
|
||||||
|
|
||||||
|
/** Smurf / sandbagging anomaly detection via population z-scores.
|
||||||
|
*
|
||||||
|
* Smurfs (strong players on fresh accounts) and sandbaggers leave a statistical signature: a win-rate, an upset-rate
|
||||||
|
* (beating higher-rated opponents) and a self-Elo climb that sit far above the population norm. This job builds those
|
||||||
|
* three features per player, standardises each against the whole player base, and flags the players whose combined
|
||||||
|
* deviation is extreme.
|
||||||
|
*
|
||||||
|
* Features per player (from each game's own/opponent Elo):
|
||||||
|
* - win_rate — fraction of decisive results won
|
||||||
|
* - upset_rate — wins vs higher-rated opponents / games vs higher-rated opponents
|
||||||
|
* - elo_climb — max self-Elo − min self-Elo across their games (rapid rating gain)
|
||||||
|
*
|
||||||
|
* Standardisation uses a single unbounded window (`Window.partitionBy()`), i.e. mean/stddev over every qualifying
|
||||||
|
* player, so z = (x − μ) / σ. The composite anomaly score sums the three z-scores. No UDFs — pure SQL aggregates +
|
||||||
|
* window functions, so Catalyst plans the whole job.
|
||||||
|
*
|
||||||
|
* Outputs (Parquet + CSV + JDBC):
|
||||||
|
* - `anomaly_scores` — every qualifying player with features, z-scores and composite, ranked most-anomalous first.
|
||||||
|
* - `flagged_smurfs` — the suspicious subset (high composite, or the classic high-winrate / few-games / steep-climb
|
||||||
|
* profile).
|
||||||
|
*
|
||||||
|
* Meaningful only when Elo is present (Lichess dump); requires `minGames` (arg 1, default 15) to avoid small-sample
|
||||||
|
* noise.
|
||||||
|
*/
|
||||||
|
object SmurfAnomalyJob:
|
||||||
|
|
||||||
|
def main(args: Array[String]): Unit =
|
||||||
|
val jdbcUrl = sys.env.getOrElse("NOWCHESS_JDBC_URL", "jdbc:postgresql://localhost:5432/nowchess")
|
||||||
|
val dbUser = sys.env.getOrElse("NOWCHESS_DB_USER", "nowchess")
|
||||||
|
val dbPass = sys.env.getOrElse("NOWCHESS_DB_PASS", "nowchess")
|
||||||
|
val outputDir = if args.length > 0 then args(0) else "/tmp/nowchess-smurf-anomaly"
|
||||||
|
val minGames = if args.length > 1 then args(1).toInt else 15
|
||||||
|
|
||||||
|
val spark = SparkSession
|
||||||
|
.builder()
|
||||||
|
.appName("NowChess Smurf Anomaly Detection")
|
||||||
|
.getOrCreate()
|
||||||
|
|
||||||
|
run(spark, jdbcUrl, dbUser, dbPass, outputDir, minGames)
|
||||||
|
spark.stop()
|
||||||
|
|
||||||
|
def run(
|
||||||
|
spark: SparkSession,
|
||||||
|
jdbcUrl: String,
|
||||||
|
dbUser: String,
|
||||||
|
dbPass: String,
|
||||||
|
outputDir: String,
|
||||||
|
minGames: Int,
|
||||||
|
): Unit =
|
||||||
|
val games = GameSource
|
||||||
|
.loadExtended(spark, jdbcUrl, dbUser, dbPass)
|
||||||
|
.select("white_id", "black_id", "result", "white_elo", "black_elo")
|
||||||
|
.filter(F.col("result").isNotNull)
|
||||||
|
|
||||||
|
val asWhite = games.select(
|
||||||
|
F.col("white_id").as("player_id"),
|
||||||
|
F.col("white_elo").as("self_elo"),
|
||||||
|
F.col("black_elo").as("opp_elo"),
|
||||||
|
F.when(F.col("result") === "white", 1).otherwise(0).as("won"),
|
||||||
|
)
|
||||||
|
val asBlack = games.select(
|
||||||
|
F.col("black_id").as("player_id"),
|
||||||
|
F.col("black_elo").as("self_elo"),
|
||||||
|
F.col("white_elo").as("opp_elo"),
|
||||||
|
F.when(F.col("result") === "black", 1).otherwise(0).as("won"),
|
||||||
|
)
|
||||||
|
|
||||||
|
val playerGames = asWhite
|
||||||
|
.union(asBlack)
|
||||||
|
.filter(F.col("self_elo").isNotNull.and(F.col("opp_elo").isNotNull))
|
||||||
|
|
||||||
|
val higher = F.col("opp_elo") > F.col("self_elo")
|
||||||
|
|
||||||
|
val features = playerGames
|
||||||
|
.groupBy("player_id")
|
||||||
|
.agg(
|
||||||
|
F.count("*").as("total_games"),
|
||||||
|
F.round(F.avg("won"), 3).as("win_rate"),
|
||||||
|
F.round(F.avg("self_elo"), 0).as("avg_self_elo"),
|
||||||
|
(F.max("self_elo") - F.min("self_elo")).as("elo_climb"),
|
||||||
|
F.sum(F.when(higher, 1).otherwise(0)).as("vs_higher"),
|
||||||
|
F.sum(F.when(higher && F.col("won") === 1, 1).otherwise(0)).as("upsets"),
|
||||||
|
)
|
||||||
|
.filter(F.col("total_games") >= minGames)
|
||||||
|
.withColumn("upset_rate", F.round(F.col("upsets") / F.greatest(F.col("vs_higher"), F.lit(1)), 3))
|
||||||
|
|
||||||
|
val all = Window.partitionBy()
|
||||||
|
def z(col: String): org.apache.spark.sql.Column =
|
||||||
|
val mean = F.avg(col).over(all)
|
||||||
|
val std = F.stddev(col).over(all)
|
||||||
|
F.round((F.col(col) - mean) / F.when(std === 0 || std.isNull, F.lit(1.0)).otherwise(std), 2)
|
||||||
|
|
||||||
|
val scored = features
|
||||||
|
.withColumn("z_win_rate", z("win_rate"))
|
||||||
|
.withColumn("z_upset_rate", z("upset_rate"))
|
||||||
|
.withColumn("z_elo_climb", z("elo_climb"))
|
||||||
|
.withColumn(
|
||||||
|
"anomaly_score",
|
||||||
|
F.round(F.col("z_win_rate") + F.col("z_upset_rate") + F.col("z_elo_climb"), 2),
|
||||||
|
)
|
||||||
|
.withColumn(
|
||||||
|
"flagged",
|
||||||
|
(F.col("anomaly_score") >= 4.0)
|
||||||
|
.or(F.col("win_rate") >= 0.8 && F.col("total_games") < 50 && F.col("elo_climb") >= 300),
|
||||||
|
)
|
||||||
|
|
||||||
|
val ordered = scored
|
||||||
|
.select(
|
||||||
|
"player_id",
|
||||||
|
"total_games",
|
||||||
|
"win_rate",
|
||||||
|
"avg_self_elo",
|
||||||
|
"elo_climb",
|
||||||
|
"upset_rate",
|
||||||
|
"z_win_rate",
|
||||||
|
"z_upset_rate",
|
||||||
|
"z_elo_climb",
|
||||||
|
"anomaly_score",
|
||||||
|
"flagged",
|
||||||
|
)
|
||||||
|
.orderBy(F.desc("anomaly_score"))
|
||||||
|
|
||||||
|
write(ordered, outputDir, "anomaly_scores", jdbcUrl, dbUser, dbPass, "analytics_smurf_anomaly")
|
||||||
|
|
||||||
|
val flagged = ordered.filter(F.col("flagged") === true)
|
||||||
|
write(flagged, outputDir, "flagged_smurfs", jdbcUrl, dbUser, dbPass, "analytics_flagged_smurfs")
|
||||||
|
|
||||||
|
private def write(
|
||||||
|
df: org.apache.spark.sql.DataFrame,
|
||||||
|
outputDir: String,
|
||||||
|
name: String,
|
||||||
|
jdbcUrl: String,
|
||||||
|
dbUser: String,
|
||||||
|
dbPass: String,
|
||||||
|
table: String,
|
||||||
|
): Unit =
|
||||||
|
df.write.mode("overwrite").parquet(s"$outputDir/$name")
|
||||||
|
df.write.mode("overwrite").option("header", "true").csv(s"$outputDir/${name}_csv")
|
||||||
|
if !GameSource.isPgnMode then
|
||||||
|
df.write
|
||||||
|
.mode("overwrite")
|
||||||
|
.format("jdbc")
|
||||||
|
.option("url", jdbcUrl)
|
||||||
|
.option("dbtable", table)
|
||||||
|
.option("user", dbUser)
|
||||||
|
.option("password", dbPass)
|
||||||
|
.option("driver", "org.postgresql.Driver")
|
||||||
|
.save()
|
||||||
@@ -1,3 +1,3 @@
|
|||||||
MAJOR=0
|
MAJOR=0
|
||||||
MINOR=7
|
MINOR=8
|
||||||
PATCH=0
|
PATCH=0
|
||||||
|
|||||||
@@ -752,3 +752,238 @@
|
|||||||
### Reverts
|
### Reverts
|
||||||
|
|
||||||
* Revert "refactor: update metrics paths formatting in application.yml for clarity" ([3870566](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/38705663498d5f47c40dafe2f26198589ede8656))
|
* Revert "refactor: update metrics paths formatting in application.yml for clarity" ([3870566](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/38705663498d5f47c40dafe2f26198589ede8656))
|
||||||
|
## (2026-06-23)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* add initialization metrics for various services ([d438e97](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/d438e97f32bdde0bfc63c1b4a8cc810cdd093166))
|
||||||
|
* add OpenTelemetry trace configuration with parentbased sampler ([3904d5a](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/3904d5ad8ad4930ddee65287a7bfab785a6148f5))
|
||||||
|
* **analytics:** add Spark batch analytics module ([#70](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/70)) ([39f1657](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/39f1657e1db6e84889af338c43be8cb5c03c3ec3))
|
||||||
|
* **config:** update application.yml for PostgreSQL and remove staging/production configurations ([2404e61](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/2404e6164c3b50ffccbea5238d636060d6abe4d6))
|
||||||
|
* **config:** update application.yml for staging and production environments ([6113432](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/6113432a14c476a3a0dfc0d449e17d023697f2ba))
|
||||||
|
* configure logging and add OpenTelemetry support ([#49](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/49)) ([d57c488](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/d57c4886612d1d92da0e1b79209fc83e6ef537a1))
|
||||||
|
* **docker:** add .dockerignore and .gitignore files for build exclusions ([c987d8e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/c987d8e258c0e6c4cfbdaa8381c64c410d7a2b83))
|
||||||
|
* **docker:** add Dockerfiles for building Quarkus application in native and JVM modes ([3f2d2bb](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/3f2d2bb4c97fa8cddba66e1da4427c54236dfeed))
|
||||||
|
* **docker:** add Dockerfiles for Quarkus application in JVM and native modes ([34b9933](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/34b993304670cf2aa62cd2f6460cee7b9864b08e))
|
||||||
|
* **events:** migrate game-creation and bot flows to Redis Streams NCS-89 ([#62](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/62)) ([a24924c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/a24924c23057db3d700a75dbc4333557789cd991))
|
||||||
|
* NCS-78 Add Traceability to the Applications ([#46](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/46)) ([649566e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/649566eb3fcf38f91c8896a739f74ea318af312d))
|
||||||
|
* NCS-78 Add Traceability to the Applications ([#47](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/47)) ([87dfc6c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/87dfc6c2bcce7f7d58fc641bd8d468a2e584c108))
|
||||||
|
* NCS-82 add Swiss-system tournament module ([#55](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/55)) ([c5661de](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/c5661de4a0ebf4b33211f5a391840dcf744656b7))
|
||||||
|
* **official-bots:** consume GameOver stream for bot cleanup ([#67](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/67)) ([db9d153](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/db9d1533912f4b41c4d1ca80ccffdde5d23d6ff6))
|
||||||
|
* **official-bots:** make HybridBot veto actionable and use it for expert ([1df29cf](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/1df29cf3a6e21af3f396b2b7a6da67d978f941ae))
|
||||||
|
* **official-bots:** park expert bot on tournament server at startup ([#75](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/75)) ([30295a4](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/30295a4bb95855ee8261c92278bb9ebc80ee12ee))
|
||||||
|
* **official-bots:** resolve tournament bot token from Redis and account service ([386ddc5](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/386ddc5c19f8f893b16c6422aa5393b54c872e45))
|
||||||
|
* **tournament:** auto-join external tournaments and publish created ones ([#77](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/77)) ([9978b7e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/9978b7ea78eb658a225a461b9cd339386c0c14f3))
|
||||||
|
* **tournament:** federate tournaments across clusters with DB replication ([5b000a6](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/5b000a6e5f04ea6770d1c7ab6bfdaded77a99172))
|
||||||
|
* **tournament:** seed external server registry from env var on startup ([845dc9c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/845dc9c2935c8bc1be42541dfaf31c9a861d3272))
|
||||||
|
* true-microservices ([#40](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/40)) ([5909242](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/590924254e8a2754de661a57a03e43f89ceb6299))
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* enable official bots to connect to external tournament server ([#71](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/71)) ([688d30e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/688d30e2b10026923372be5fca3c63eaaee2de2a))
|
||||||
|
* **official-bots:** configure JWT verification ([#72](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/72)) ([98c64fc](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/98c64fc0d56dc542beb31c75f4b9056d91de03cd))
|
||||||
|
* **official-bots:** correct parkOn path from /api/bots to /api/account/bots ([1be9949](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/1be9949c0b5c6a1db535696620d77735050d6c93))
|
||||||
|
* **official-bots:** discover tournament games by polling, not just the stream ([10113fd](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/10113fd0579b614d15870798d933bc9c495d2049))
|
||||||
|
* **official-bots:** make botToken optional, fall back to env, fix 502 status ([f43d193](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/f43d1930d80670d810c57b54eaa3789854fa082c))
|
||||||
|
* **official-bots:** NCS-70-auto-register official bots with account service ([#59](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/59)) ([7117a93](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/7117a93376272094d0b1a6abf2121254ce396684))
|
||||||
|
* **official-bots:** park on external tournament servers using correct endpoint and token ([3188241](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/31882417377468b41bbe3ff94506aa4928024450))
|
||||||
|
* **official-bots:** play games by polling state instead of NDJSON stream ([bfb15c7](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/bfb15c7299bd471d5e064a577ed10af98e2ea90a))
|
||||||
|
* **official-bots:** play only own tournament games with correct color ([4651bb7](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/4651bb796f07a21bd013d9521b2dfe2e1078cebb))
|
||||||
|
* **official-bots:** prioritize Redis token over stale env var in joinTournament ([83dd2d4](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/83dd2d4335ca48eb3e5aa234a75367574276ba63))
|
||||||
|
* **official-bots:** register with tournament server directly to get correct token ([64b5d55](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/64b5d5567f110c2fe152558c7de275a1e0b30e21))
|
||||||
|
* **official-bots:** resume tournaments already joined after restart ([285b73e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/285b73efbd6dd98cec410ade9eead9881d693a8f))
|
||||||
|
* **official-bots:** sync bots before token fetch on first startup after DB wipe ([b0ddb27](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/b0ddb274d23bca8b1b3f691ce0d643f33e0b54cd))
|
||||||
|
|
||||||
|
### Reverts
|
||||||
|
|
||||||
|
* Revert "refactor: update metrics paths formatting in application.yml for clarity" ([3870566](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/38705663498d5f47c40dafe2f26198589ede8656))
|
||||||
|
## (2026-06-23)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* add initialization metrics for various services ([d438e97](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/d438e97f32bdde0bfc63c1b4a8cc810cdd093166))
|
||||||
|
* add OpenTelemetry trace configuration with parentbased sampler ([3904d5a](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/3904d5ad8ad4930ddee65287a7bfab785a6148f5))
|
||||||
|
* **analytics:** add Spark batch analytics module ([#70](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/70)) ([39f1657](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/39f1657e1db6e84889af338c43be8cb5c03c3ec3))
|
||||||
|
* **config:** update application.yml for PostgreSQL and remove staging/production configurations ([2404e61](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/2404e6164c3b50ffccbea5238d636060d6abe4d6))
|
||||||
|
* **config:** update application.yml for staging and production environments ([6113432](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/6113432a14c476a3a0dfc0d449e17d023697f2ba))
|
||||||
|
* configure logging and add OpenTelemetry support ([#49](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/49)) ([d57c488](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/d57c4886612d1d92da0e1b79209fc83e6ef537a1))
|
||||||
|
* **docker:** add .dockerignore and .gitignore files for build exclusions ([c987d8e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/c987d8e258c0e6c4cfbdaa8381c64c410d7a2b83))
|
||||||
|
* **docker:** add Dockerfiles for building Quarkus application in native and JVM modes ([3f2d2bb](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/3f2d2bb4c97fa8cddba66e1da4427c54236dfeed))
|
||||||
|
* **docker:** add Dockerfiles for Quarkus application in JVM and native modes ([34b9933](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/34b993304670cf2aa62cd2f6460cee7b9864b08e))
|
||||||
|
* **events:** migrate game-creation and bot flows to Redis Streams NCS-89 ([#62](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/62)) ([a24924c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/a24924c23057db3d700a75dbc4333557789cd991))
|
||||||
|
* NCS-78 Add Traceability to the Applications ([#46](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/46)) ([649566e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/649566eb3fcf38f91c8896a739f74ea318af312d))
|
||||||
|
* NCS-78 Add Traceability to the Applications ([#47](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/47)) ([87dfc6c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/87dfc6c2bcce7f7d58fc641bd8d468a2e584c108))
|
||||||
|
* NCS-82 add Swiss-system tournament module ([#55](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/55)) ([c5661de](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/c5661de4a0ebf4b33211f5a391840dcf744656b7))
|
||||||
|
* **official-bots:** consume GameOver stream for bot cleanup ([#67](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/67)) ([db9d153](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/db9d1533912f4b41c4d1ca80ccffdde5d23d6ff6))
|
||||||
|
* **official-bots:** make HybridBot veto actionable and use it for expert ([1df29cf](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/1df29cf3a6e21af3f396b2b7a6da67d978f941ae))
|
||||||
|
* **official-bots:** park expert bot on tournament server at startup ([#75](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/75)) ([30295a4](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/30295a4bb95855ee8261c92278bb9ebc80ee12ee))
|
||||||
|
* **official-bots:** resolve tournament bot token from Redis and account service ([386ddc5](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/386ddc5c19f8f893b16c6422aa5393b54c872e45))
|
||||||
|
* **tournament:** auto-join external tournaments and publish created ones ([#77](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/77)) ([9978b7e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/9978b7ea78eb658a225a461b9cd339386c0c14f3))
|
||||||
|
* **tournament:** federate tournaments across clusters with DB replication ([5b000a6](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/5b000a6e5f04ea6770d1c7ab6bfdaded77a99172))
|
||||||
|
* **tournament:** seed external server registry from env var on startup ([845dc9c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/845dc9c2935c8bc1be42541dfaf31c9a861d3272))
|
||||||
|
* true-microservices ([#40](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/40)) ([5909242](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/590924254e8a2754de661a57a03e43f89ceb6299))
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* enable official bots to connect to external tournament server ([#71](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/71)) ([688d30e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/688d30e2b10026923372be5fca3c63eaaee2de2a))
|
||||||
|
* **official-bots:** configure JWT verification ([#72](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/72)) ([98c64fc](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/98c64fc0d56dc542beb31c75f4b9056d91de03cd))
|
||||||
|
* **official-bots:** correct parkOn path from /api/bots to /api/account/bots ([1be9949](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/1be9949c0b5c6a1db535696620d77735050d6c93))
|
||||||
|
* **official-bots:** discover tournament games by polling, not just the stream ([10113fd](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/10113fd0579b614d15870798d933bc9c495d2049))
|
||||||
|
* **official-bots:** make botToken optional, fall back to env, fix 502 status ([f43d193](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/f43d1930d80670d810c57b54eaa3789854fa082c))
|
||||||
|
* **official-bots:** NCS-70-auto-register official bots with account service ([#59](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/59)) ([7117a93](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/7117a93376272094d0b1a6abf2121254ce396684))
|
||||||
|
* **official-bots:** park on external tournament servers using correct endpoint and token ([3188241](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/31882417377468b41bbe3ff94506aa4928024450))
|
||||||
|
* **official-bots:** play games by polling state instead of NDJSON stream ([bfb15c7](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/bfb15c7299bd471d5e064a577ed10af98e2ea90a))
|
||||||
|
* **official-bots:** play only own tournament games with correct color ([4651bb7](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/4651bb796f07a21bd013d9521b2dfe2e1078cebb))
|
||||||
|
* **official-bots:** prioritize Redis token over stale env var in joinTournament ([83dd2d4](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/83dd2d4335ca48eb3e5aa234a75367574276ba63))
|
||||||
|
* **official-bots:** register with tournament server directly to get correct token ([64b5d55](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/64b5d5567f110c2fe152558c7de275a1e0b30e21))
|
||||||
|
* **official-bots:** resolve per-difficulty bot token on tournament join ([fdf4c94](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/fdf4c94811d086996447bb4657fac1d9bd6e5a93))
|
||||||
|
* **official-bots:** resume tournaments already joined after restart ([285b73e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/285b73efbd6dd98cec410ade9eead9881d693a8f))
|
||||||
|
* **official-bots:** sync bots before token fetch on first startup after DB wipe ([b0ddb27](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/b0ddb274d23bca8b1b3f691ce0d643f33e0b54cd))
|
||||||
|
|
||||||
|
### Reverts
|
||||||
|
|
||||||
|
* Revert "refactor: update metrics paths formatting in application.yml for clarity" ([3870566](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/38705663498d5f47c40dafe2f26198589ede8656))
|
||||||
|
## (2026-06-23)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* add initialization metrics for various services ([d438e97](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/d438e97f32bdde0bfc63c1b4a8cc810cdd093166))
|
||||||
|
* add OpenTelemetry trace configuration with parentbased sampler ([3904d5a](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/3904d5ad8ad4930ddee65287a7bfab785a6148f5))
|
||||||
|
* **analytics:** add Spark batch analytics module ([#70](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/70)) ([39f1657](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/39f1657e1db6e84889af338c43be8cb5c03c3ec3))
|
||||||
|
* **config:** update application.yml for PostgreSQL and remove staging/production configurations ([2404e61](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/2404e6164c3b50ffccbea5238d636060d6abe4d6))
|
||||||
|
* **config:** update application.yml for staging and production environments ([6113432](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/6113432a14c476a3a0dfc0d449e17d023697f2ba))
|
||||||
|
* configure logging and add OpenTelemetry support ([#49](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/49)) ([d57c488](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/d57c4886612d1d92da0e1b79209fc83e6ef537a1))
|
||||||
|
* **docker:** add .dockerignore and .gitignore files for build exclusions ([c987d8e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/c987d8e258c0e6c4cfbdaa8381c64c410d7a2b83))
|
||||||
|
* **docker:** add Dockerfiles for building Quarkus application in native and JVM modes ([3f2d2bb](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/3f2d2bb4c97fa8cddba66e1da4427c54236dfeed))
|
||||||
|
* **docker:** add Dockerfiles for Quarkus application in JVM and native modes ([34b9933](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/34b993304670cf2aa62cd2f6460cee7b9864b08e))
|
||||||
|
* **events:** migrate game-creation and bot flows to Redis Streams NCS-89 ([#62](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/62)) ([a24924c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/a24924c23057db3d700a75dbc4333557789cd991))
|
||||||
|
* NCS-78 Add Traceability to the Applications ([#46](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/46)) ([649566e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/649566eb3fcf38f91c8896a739f74ea318af312d))
|
||||||
|
* NCS-78 Add Traceability to the Applications ([#47](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/47)) ([87dfc6c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/87dfc6c2bcce7f7d58fc641bd8d468a2e584c108))
|
||||||
|
* NCS-82 add Swiss-system tournament module ([#55](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/55)) ([c5661de](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/c5661de4a0ebf4b33211f5a391840dcf744656b7))
|
||||||
|
* **official-bots:** consume GameOver stream for bot cleanup ([#67](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/67)) ([db9d153](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/db9d1533912f4b41c4d1ca80ccffdde5d23d6ff6))
|
||||||
|
* **official-bots:** make HybridBot veto actionable and use it for expert ([1df29cf](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/1df29cf3a6e21af3f396b2b7a6da67d978f941ae))
|
||||||
|
* **official-bots:** park expert bot on tournament server at startup ([#75](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/75)) ([30295a4](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/30295a4bb95855ee8261c92278bb9ebc80ee12ee))
|
||||||
|
* **official-bots:** resolve tournament bot token from Redis and account service ([386ddc5](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/386ddc5c19f8f893b16c6422aa5393b54c872e45))
|
||||||
|
* **tournament:** auto-join external tournaments and publish created ones ([#77](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/77)) ([9978b7e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/9978b7ea78eb658a225a461b9cd339386c0c14f3))
|
||||||
|
* **tournament:** federate tournaments across clusters with DB replication ([5b000a6](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/5b000a6e5f04ea6770d1c7ab6bfdaded77a99172))
|
||||||
|
* **tournament:** seed external server registry from env var on startup ([845dc9c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/845dc9c2935c8bc1be42541dfaf31c9a861d3272))
|
||||||
|
* true-microservices ([#40](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/40)) ([5909242](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/590924254e8a2754de661a57a03e43f89ceb6299))
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* enable official bots to connect to external tournament server ([#71](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/71)) ([688d30e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/688d30e2b10026923372be5fca3c63eaaee2de2a))
|
||||||
|
* **official-bots:** configure JWT verification ([#72](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/72)) ([98c64fc](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/98c64fc0d56dc542beb31c75f4b9056d91de03cd))
|
||||||
|
* **official-bots:** correct parkOn path from /api/bots to /api/account/bots ([1be9949](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/1be9949c0b5c6a1db535696620d77735050d6c93))
|
||||||
|
* **official-bots:** derive tournament game color from game endpoint ([#79](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/79)) ([bfc4672](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/bfc46723e615bb9b65f7f9bba5f53877c4f079a7))
|
||||||
|
* **official-bots:** discover tournament games by polling, not just the stream ([10113fd](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/10113fd0579b614d15870798d933bc9c495d2049))
|
||||||
|
* **official-bots:** make botToken optional, fall back to env, fix 502 status ([f43d193](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/f43d1930d80670d810c57b54eaa3789854fa082c))
|
||||||
|
* **official-bots:** NCS-70-auto-register official bots with account service ([#59](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/59)) ([7117a93](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/7117a93376272094d0b1a6abf2121254ce396684))
|
||||||
|
* **official-bots:** park on external tournament servers using correct endpoint and token ([3188241](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/31882417377468b41bbe3ff94506aa4928024450))
|
||||||
|
* **official-bots:** play games by polling state instead of NDJSON stream ([bfb15c7](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/bfb15c7299bd471d5e064a577ed10af98e2ea90a))
|
||||||
|
* **official-bots:** play only own tournament games with correct color ([4651bb7](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/4651bb796f07a21bd013d9521b2dfe2e1078cebb))
|
||||||
|
* **official-bots:** prioritize Redis token over stale env var in joinTournament ([83dd2d4](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/83dd2d4335ca48eb3e5aa234a75367574276ba63))
|
||||||
|
* **official-bots:** register with tournament server directly to get correct token ([64b5d55](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/64b5d5567f110c2fe152558c7de275a1e0b30e21))
|
||||||
|
* **official-bots:** resolve per-difficulty bot token on tournament join ([fdf4c94](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/fdf4c94811d086996447bb4657fac1d9bd6e5a93))
|
||||||
|
* **official-bots:** resume tournaments already joined after restart ([285b73e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/285b73efbd6dd98cec410ade9eead9881d693a8f))
|
||||||
|
* **official-bots:** sync bots before token fetch on first startup after DB wipe ([b0ddb27](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/b0ddb274d23bca8b1b3f691ce0d643f33e0b54cd))
|
||||||
|
|
||||||
|
### Reverts
|
||||||
|
|
||||||
|
* Revert "refactor: update metrics paths formatting in application.yml for clarity" ([3870566](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/38705663498d5f47c40dafe2f26198589ede8656))
|
||||||
|
## (2026-06-23)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* add initialization metrics for various services ([d438e97](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/d438e97f32bdde0bfc63c1b4a8cc810cdd093166))
|
||||||
|
* add OpenTelemetry trace configuration with parentbased sampler ([3904d5a](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/3904d5ad8ad4930ddee65287a7bfab785a6148f5))
|
||||||
|
* **analytics:** add Spark batch analytics module ([#70](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/70)) ([39f1657](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/39f1657e1db6e84889af338c43be8cb5c03c3ec3))
|
||||||
|
* **config:** update application.yml for PostgreSQL and remove staging/production configurations ([2404e61](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/2404e6164c3b50ffccbea5238d636060d6abe4d6))
|
||||||
|
* **config:** update application.yml for staging and production environments ([6113432](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/6113432a14c476a3a0dfc0d449e17d023697f2ba))
|
||||||
|
* configure logging and add OpenTelemetry support ([#49](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/49)) ([d57c488](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/d57c4886612d1d92da0e1b79209fc83e6ef537a1))
|
||||||
|
* **docker:** add .dockerignore and .gitignore files for build exclusions ([c987d8e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/c987d8e258c0e6c4cfbdaa8381c64c410d7a2b83))
|
||||||
|
* **docker:** add Dockerfiles for building Quarkus application in native and JVM modes ([3f2d2bb](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/3f2d2bb4c97fa8cddba66e1da4427c54236dfeed))
|
||||||
|
* **docker:** add Dockerfiles for Quarkus application in JVM and native modes ([34b9933](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/34b993304670cf2aa62cd2f6460cee7b9864b08e))
|
||||||
|
* **events:** migrate game-creation and bot flows to Redis Streams NCS-89 ([#62](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/62)) ([a24924c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/a24924c23057db3d700a75dbc4333557789cd991))
|
||||||
|
* NCS-78 Add Traceability to the Applications ([#46](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/46)) ([649566e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/649566eb3fcf38f91c8896a739f74ea318af312d))
|
||||||
|
* NCS-78 Add Traceability to the Applications ([#47](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/47)) ([87dfc6c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/87dfc6c2bcce7f7d58fc641bd8d468a2e584c108))
|
||||||
|
* NCS-82 add Swiss-system tournament module ([#55](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/55)) ([c5661de](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/c5661de4a0ebf4b33211f5a391840dcf744656b7))
|
||||||
|
* **official-bots:** activate opening book in expert bot (native-safe) ([260db25](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/260db25803ec55ce99e55782791eabdc190dfed4))
|
||||||
|
* **official-bots:** consume GameOver stream for bot cleanup ([#67](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/67)) ([db9d153](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/db9d1533912f4b41c4d1ca80ccffdde5d23d6ff6))
|
||||||
|
* **official-bots:** make HybridBot veto actionable and use it for expert ([1df29cf](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/1df29cf3a6e21af3f396b2b7a6da67d978f941ae))
|
||||||
|
* **official-bots:** park expert bot on tournament server at startup ([#75](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/75)) ([30295a4](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/30295a4bb95855ee8261c92278bb9ebc80ee12ee))
|
||||||
|
* **official-bots:** resolve tournament bot token from Redis and account service ([386ddc5](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/386ddc5c19f8f893b16c6422aa5393b54c872e45))
|
||||||
|
* **tournament:** auto-join external tournaments and publish created ones ([#77](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/77)) ([9978b7e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/9978b7ea78eb658a225a461b9cd339386c0c14f3))
|
||||||
|
* **tournament:** federate tournaments across clusters with DB replication ([5b000a6](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/5b000a6e5f04ea6770d1c7ab6bfdaded77a99172))
|
||||||
|
* **tournament:** seed external server registry from env var on startup ([845dc9c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/845dc9c2935c8bc1be42541dfaf31c9a861d3272))
|
||||||
|
* true-microservices ([#40](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/40)) ([5909242](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/590924254e8a2754de661a57a03e43f89ceb6299))
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* enable official bots to connect to external tournament server ([#71](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/71)) ([688d30e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/688d30e2b10026923372be5fca3c63eaaee2de2a))
|
||||||
|
* **official-bots:** configure JWT verification ([#72](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/72)) ([98c64fc](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/98c64fc0d56dc542beb31c75f4b9056d91de03cd))
|
||||||
|
* **official-bots:** correct parkOn path from /api/bots to /api/account/bots ([1be9949](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/1be9949c0b5c6a1db535696620d77735050d6c93))
|
||||||
|
* **official-bots:** derive tournament game color from game endpoint ([#79](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/79)) ([bfc4672](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/bfc46723e615bb9b65f7f9bba5f53877c4f079a7))
|
||||||
|
* **official-bots:** discover tournament games by polling, not just the stream ([10113fd](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/10113fd0579b614d15870798d933bc9c495d2049))
|
||||||
|
* **official-bots:** make botToken optional, fall back to env, fix 502 status ([f43d193](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/f43d1930d80670d810c57b54eaa3789854fa082c))
|
||||||
|
* **official-bots:** NCS-70-auto-register official bots with account service ([#59](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/59)) ([7117a93](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/7117a93376272094d0b1a6abf2121254ce396684))
|
||||||
|
* **official-bots:** park on external tournament servers using correct endpoint and token ([3188241](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/31882417377468b41bbe3ff94506aa4928024450))
|
||||||
|
* **official-bots:** play games by polling state instead of NDJSON stream ([bfb15c7](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/bfb15c7299bd471d5e064a577ed10af98e2ea90a))
|
||||||
|
* **official-bots:** play only own tournament games with correct color ([4651bb7](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/4651bb796f07a21bd013d9521b2dfe2e1078cebb))
|
||||||
|
* **official-bots:** prioritize Redis token over stale env var in joinTournament ([83dd2d4](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/83dd2d4335ca48eb3e5aa234a75367574276ba63))
|
||||||
|
* **official-bots:** register with tournament server directly to get correct token ([64b5d55](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/64b5d5567f110c2fe152558c7de275a1e0b30e21))
|
||||||
|
* **official-bots:** resolve per-difficulty bot token on tournament join ([fdf4c94](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/fdf4c94811d086996447bb4657fac1d9bd6e5a93))
|
||||||
|
* **official-bots:** resume tournaments already joined after restart ([285b73e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/285b73efbd6dd98cec410ade9eead9881d693a8f))
|
||||||
|
* **official-bots:** sync bots before token fetch on first startup after DB wipe ([b0ddb27](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/b0ddb274d23bca8b1b3f691ce0d643f33e0b54cd))
|
||||||
|
|
||||||
|
### Reverts
|
||||||
|
|
||||||
|
* Revert "refactor: update metrics paths formatting in application.yml for clarity" ([3870566](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/38705663498d5f47c40dafe2f26198589ede8656))
|
||||||
|
## (2026-06-23)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* add initialization metrics for various services ([d438e97](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/d438e97f32bdde0bfc63c1b4a8cc810cdd093166))
|
||||||
|
* add OpenTelemetry trace configuration with parentbased sampler ([3904d5a](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/3904d5ad8ad4930ddee65287a7bfab785a6148f5))
|
||||||
|
* **analytics:** add Spark batch analytics module ([#70](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/70)) ([39f1657](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/39f1657e1db6e84889af338c43be8cb5c03c3ec3))
|
||||||
|
* **config:** update application.yml for PostgreSQL and remove staging/production configurations ([2404e61](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/2404e6164c3b50ffccbea5238d636060d6abe4d6))
|
||||||
|
* **config:** update application.yml for staging and production environments ([6113432](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/6113432a14c476a3a0dfc0d449e17d023697f2ba))
|
||||||
|
* configure logging and add OpenTelemetry support ([#49](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/49)) ([d57c488](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/d57c4886612d1d92da0e1b79209fc83e6ef537a1))
|
||||||
|
* **docker:** add .dockerignore and .gitignore files for build exclusions ([c987d8e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/c987d8e258c0e6c4cfbdaa8381c64c410d7a2b83))
|
||||||
|
* **docker:** add Dockerfiles for building Quarkus application in native and JVM modes ([3f2d2bb](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/3f2d2bb4c97fa8cddba66e1da4427c54236dfeed))
|
||||||
|
* **docker:** add Dockerfiles for Quarkus application in JVM and native modes ([34b9933](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/34b993304670cf2aa62cd2f6460cee7b9864b08e))
|
||||||
|
* **events:** migrate game-creation and bot flows to Redis Streams NCS-89 ([#62](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/62)) ([a24924c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/a24924c23057db3d700a75dbc4333557789cd991))
|
||||||
|
* NCS-78 Add Traceability to the Applications ([#46](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/46)) ([649566e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/649566eb3fcf38f91c8896a739f74ea318af312d))
|
||||||
|
* NCS-78 Add Traceability to the Applications ([#47](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/47)) ([87dfc6c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/87dfc6c2bcce7f7d58fc641bd8d468a2e584c108))
|
||||||
|
* NCS-82 add Swiss-system tournament module ([#55](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/55)) ([c5661de](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/c5661de4a0ebf4b33211f5a391840dcf744656b7))
|
||||||
|
* **official-bots:** activate opening book in expert bot (native-safe) ([260db25](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/260db25803ec55ce99e55782791eabdc190dfed4))
|
||||||
|
* **official-bots:** consume GameOver stream for bot cleanup ([#67](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/67)) ([db9d153](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/db9d1533912f4b41c4d1ca80ccffdde5d23d6ff6))
|
||||||
|
* **official-bots:** make HybridBot veto actionable and use it for expert ([1df29cf](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/1df29cf3a6e21af3f396b2b7a6da67d978f941ae))
|
||||||
|
* **official-bots:** park expert bot on tournament server at startup ([#75](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/75)) ([30295a4](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/30295a4bb95855ee8261c92278bb9ebc80ee12ee))
|
||||||
|
* **official-bots:** resolve tournament bot token from Redis and account service ([386ddc5](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/386ddc5c19f8f893b16c6422aa5393b54c872e45))
|
||||||
|
* **tournament:** auto-join external tournaments and publish created ones ([#77](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/77)) ([9978b7e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/9978b7ea78eb658a225a461b9cd339386c0c14f3))
|
||||||
|
* **tournament:** federate tournaments across clusters with DB replication ([5b000a6](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/5b000a6e5f04ea6770d1c7ab6bfdaded77a99172))
|
||||||
|
* **tournament:** seed external server registry from env var on startup ([845dc9c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/845dc9c2935c8bc1be42541dfaf31c9a861d3272))
|
||||||
|
* true-microservices ([#40](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/40)) ([5909242](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/590924254e8a2754de661a57a03e43f89ceb6299))
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* enable official bots to connect to external tournament server ([#71](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/71)) ([688d30e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/688d30e2b10026923372be5fca3c63eaaee2de2a))
|
||||||
|
* **official-bots:** configure JWT verification ([#72](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/72)) ([98c64fc](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/98c64fc0d56dc542beb31c75f4b9056d91de03cd))
|
||||||
|
* **official-bots:** correct parkOn path from /api/bots to /api/account/bots ([1be9949](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/1be9949c0b5c6a1db535696620d77735050d6c93))
|
||||||
|
* **official-bots:** derive tournament game color from game endpoint ([#79](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/79)) ([bfc4672](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/bfc46723e615bb9b65f7f9bba5f53877c4f079a7))
|
||||||
|
* **official-bots:** discover tournament games by polling, not just the stream ([10113fd](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/10113fd0579b614d15870798d933bc9c495d2049))
|
||||||
|
* **official-bots:** make botToken optional, fall back to env, fix 502 status ([f43d193](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/f43d1930d80670d810c57b54eaa3789854fa082c))
|
||||||
|
* **official-bots:** NCS-70-auto-register official bots with account service ([#59](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/59)) ([7117a93](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/7117a93376272094d0b1a6abf2121254ce396684))
|
||||||
|
* **official-bots:** park on external tournament servers using correct endpoint and token ([3188241](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/31882417377468b41bbe3ff94506aa4928024450))
|
||||||
|
* **official-bots:** play games by polling state instead of NDJSON stream ([bfb15c7](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/bfb15c7299bd471d5e064a577ed10af98e2ea90a))
|
||||||
|
* **official-bots:** play only own tournament games with correct color ([4651bb7](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/4651bb796f07a21bd013d9521b2dfe2e1078cebb))
|
||||||
|
* **official-bots:** prioritize Redis token over stale env var in joinTournament ([83dd2d4](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/83dd2d4335ca48eb3e5aa234a75367574276ba63))
|
||||||
|
* **official-bots:** register with tournament server directly to get correct token ([64b5d55](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/64b5d5567f110c2fe152558c7de275a1e0b30e21))
|
||||||
|
* **official-bots:** resolve per-difficulty bot token on tournament join ([fdf4c94](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/fdf4c94811d086996447bb4657fac1d9bd6e5a93))
|
||||||
|
* **official-bots:** resume tournaments already joined after restart ([285b73e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/285b73efbd6dd98cec410ade9eead9881d693a8f))
|
||||||
|
* **official-bots:** sync bots before token fetch on first startup after DB wipe ([b0ddb27](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/b0ddb274d23bca8b1b3f691ce0d643f33e0b54cd))
|
||||||
|
* **official-bots:** use ThreadLocalRandom in PolyglotBook for native image ([1b30c3b](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/1b30c3be393d25712c8743d3d9057207f8bbb67c))
|
||||||
|
|
||||||
|
### Reverts
|
||||||
|
|
||||||
|
* Revert "refactor: update metrics paths formatting in application.yml for clarity" ([3870566](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/38705663498d5f47c40dafe2f26198589ede8656))
|
||||||
|
|||||||
@@ -1,17 +1,20 @@
|
|||||||
package de.nowchess.bot
|
package de.nowchess.bot
|
||||||
|
|
||||||
import de.nowchess.bot.bots.{ClassicalBot, HybridBot}
|
import de.nowchess.bot.bots.{ClassicalBot, HybridBot}
|
||||||
|
import de.nowchess.bot.util.PolyglotBook
|
||||||
import jakarta.enterprise.context.ApplicationScoped
|
import jakarta.enterprise.context.ApplicationScoped
|
||||||
import org.jboss.logging.Logger
|
import org.jboss.logging.Logger
|
||||||
|
|
||||||
object BotController:
|
object BotController:
|
||||||
private val log = Logger.getLogger(classOf[BotController])
|
private val log = Logger.getLogger(classOf[BotController])
|
||||||
|
|
||||||
|
private val openingBook = PolyglotBook.fromResource("/opening_book.bin")
|
||||||
|
|
||||||
private val bots: Map[String, Bot] = Map(
|
private val bots: Map[String, Bot] = Map(
|
||||||
"easy" -> ClassicalBot(BotDifficulty.Easy),
|
"easy" -> ClassicalBot(BotDifficulty.Easy),
|
||||||
"medium" -> ClassicalBot(BotDifficulty.Medium),
|
"medium" -> ClassicalBot(BotDifficulty.Medium),
|
||||||
"hard" -> ClassicalBot(BotDifficulty.Hard),
|
"hard" -> ClassicalBot(BotDifficulty.Hard),
|
||||||
"expert" -> HybridBot(BotDifficulty.Expert, vetoReporter = log.debug(_)),
|
"expert" -> HybridBot(BotDifficulty.Expert, vetoReporter = log.debug(_), book = Some(openingBook)),
|
||||||
)
|
)
|
||||||
|
|
||||||
def getBot(name: String): Option[Bot] = bots.get(name.toLowerCase)
|
def getBot(name: String): Option[Bot] = bots.get(name.toLowerCase)
|
||||||
|
|||||||
+12
@@ -0,0 +1,12 @@
|
|||||||
|
package de.nowchess.bot.config
|
||||||
|
|
||||||
|
import de.nowchess.bot.resource.{JoinTournamentRequest, JoinTournamentResponse}
|
||||||
|
import io.quarkus.runtime.annotations.RegisterForReflection
|
||||||
|
|
||||||
|
@RegisterForReflection(
|
||||||
|
targets = Array(
|
||||||
|
classOf[JoinTournamentRequest],
|
||||||
|
classOf[JoinTournamentResponse],
|
||||||
|
),
|
||||||
|
)
|
||||||
|
class NativeReflectionConfig
|
||||||
+82
-82
@@ -28,10 +28,10 @@ class TournamentBotGamePlayer:
|
|||||||
private val log = Logger.getLogger(classOf[TournamentBotGamePlayer])
|
private val log = Logger.getLogger(classOf[TournamentBotGamePlayer])
|
||||||
|
|
||||||
// scalafix:off DisableSyntax.var
|
// scalafix:off DisableSyntax.var
|
||||||
@Inject var objectMapper: ObjectMapper = uninitialized
|
@Inject var objectMapper: ObjectMapper = uninitialized
|
||||||
@Inject var botController: BotController = uninitialized
|
@Inject var botController: BotController = uninitialized
|
||||||
@Inject var redis: RedisDataSource = uninitialized
|
@Inject var redis: RedisDataSource = uninitialized
|
||||||
@Inject var redisConfig: RedisConfig = uninitialized
|
@Inject var redisConfig: RedisConfig = uninitialized
|
||||||
@Inject @RestClient var accountServiceClient: AccountServiceClient = uninitialized
|
@Inject @RestClient var accountServiceClient: AccountServiceClient = uninitialized
|
||||||
// scalafix:on DisableSyntax.var
|
// scalafix:on DisableSyntax.var
|
||||||
|
|
||||||
@@ -43,6 +43,9 @@ class TournamentBotGamePlayer:
|
|||||||
private val hardestDifficulty = "expert"
|
private val hardestDifficulty = "expert"
|
||||||
private val autoJoinIntervalMs = 15000L
|
private val autoJoinIntervalMs = 15000L
|
||||||
|
|
||||||
|
private val gameTerminalStatuses =
|
||||||
|
Set("checkmate", "stalemate", "draw", "resigned", "timeout", "aborted", "finished")
|
||||||
|
|
||||||
// scalafix:off DisableSyntax.var
|
// scalafix:off DisableSyntax.var
|
||||||
@volatile private var running = true
|
@volatile private var running = true
|
||||||
@volatile private var autoJoinToken: Option[String] = None
|
@volatile private var autoJoinToken: Option[String] = None
|
||||||
@@ -87,8 +90,7 @@ class TournamentBotGamePlayer:
|
|||||||
open.foreach { tournamentId =>
|
open.foreach { tournamentId =>
|
||||||
if joinedTournaments.add(tournamentId) then
|
if joinedTournaments.add(tournamentId) then
|
||||||
val cfg = TournamentBotConfig(autoJoinServerUrl, tournamentId, token, botId, hardestDifficulty)
|
val cfg = TournamentBotConfig(autoJoinServerUrl, tournamentId, token, botId, hardestDifficulty)
|
||||||
if joinedOrParticipating(cfg) then startAsync(cfg)
|
if !joinedOrParticipating(cfg) then joinedTournaments.remove(tournamentId)
|
||||||
else joinedTournaments.remove(tournamentId)
|
|
||||||
}
|
}
|
||||||
playPendingGames(token, botId)
|
playPendingGames(token, botId)
|
||||||
}
|
}
|
||||||
@@ -117,7 +119,9 @@ class TournamentBotGamePlayer:
|
|||||||
yield result
|
yield result
|
||||||
|
|
||||||
private def findBotGame(pairings: JsonNode, botId: String): Option[(String, String)] =
|
private def findBotGame(pairings: JsonNode, botId: String): Option[(String, String)] =
|
||||||
pairings.elements().asScala
|
pairings
|
||||||
|
.elements()
|
||||||
|
.asScala
|
||||||
.flatMap { p =>
|
.flatMap { p =>
|
||||||
val whiteId = p.path("white").path("id").asText()
|
val whiteId = p.path("white").path("id").asText()
|
||||||
val blackId = p.path("black").path("id").asText()
|
val blackId = p.path("black").path("id").asText()
|
||||||
@@ -127,7 +131,9 @@ class TournamentBotGamePlayer:
|
|||||||
.nextOption()
|
.nextOption()
|
||||||
|
|
||||||
private def activeMatch(matches: JsonNode): Option[String] =
|
private def activeMatch(matches: JsonNode): Option[String] =
|
||||||
matches.elements().asScala
|
matches
|
||||||
|
.elements()
|
||||||
|
.asScala
|
||||||
.find(m => m.path("gameId").asText().nonEmpty && !(m.has("outcome") && !m.path("outcome").isNull))
|
.find(m => m.path("gameId").asText().nonEmpty && !(m.has("outcome") && !m.path("outcome").isNull))
|
||||||
.map(_.path("gameId").asText())
|
.map(_.path("gameId").asText())
|
||||||
|
|
||||||
@@ -149,9 +155,12 @@ class TournamentBotGamePlayer:
|
|||||||
|
|
||||||
private def openTournaments(): List[String] =
|
private def openTournaments(): List[String] =
|
||||||
Try {
|
Try {
|
||||||
val response = client.target(autoJoinServerUrl)
|
val response = client
|
||||||
.path("api").path("tournament")
|
.target(autoJoinServerUrl)
|
||||||
.request(MediaType.APPLICATION_JSON).get()
|
.path("api")
|
||||||
|
.path("tournament")
|
||||||
|
.request(MediaType.APPLICATION_JSON)
|
||||||
|
.get()
|
||||||
if response.getStatus == 200 then
|
if response.getStatus == 200 then
|
||||||
val node = objectMapper.readTree(response.readEntity(classOf[String]))
|
val node = objectMapper.readTree(response.readEntity(classOf[String]))
|
||||||
response.close()
|
response.close()
|
||||||
@@ -162,8 +171,8 @@ class TournamentBotGamePlayer:
|
|||||||
private def resolveToken(difficulty: String): Option[String] =
|
private def resolveToken(difficulty: String): Option[String] =
|
||||||
val name = botName(difficulty)
|
val name = botName(difficulty)
|
||||||
val redisKey = s"${redisConfig.prefix}:tournament-bot:token:$name"
|
val redisKey = s"${redisConfig.prefix}:tournament-bot:token:$name"
|
||||||
registerWithServer(tournamentServiceUrl, name)
|
fetchTokenFromAccountService(name)
|
||||||
.orElse(fetchTokenFromAccountService(name))
|
.orElse(registerWithServer(tournamentServiceUrl, name))
|
||||||
.map { token =>
|
.map { token =>
|
||||||
redis.value(classOf[String]).set(redisKey, token)
|
redis.value(classOf[String]).set(redisKey, token)
|
||||||
log.infof("Refreshed bot token for %s — stored in Redis", name)
|
log.infof("Refreshed bot token for %s — stored in Redis", name)
|
||||||
@@ -185,8 +194,11 @@ class TournamentBotGamePlayer:
|
|||||||
private def registerWithServer(serverUrl: String, name: String): Option[String] =
|
private def registerWithServer(serverUrl: String, name: String): Option[String] =
|
||||||
Try {
|
Try {
|
||||||
val body = s"""{"name":"${name.replace("\"", "\\\"")}","isBot":true}"""
|
val body = s"""{"name":"${name.replace("\"", "\\\"")}","isBot":true}"""
|
||||||
val response = client.target(serverUrl)
|
val response = client
|
||||||
.path("api").path("auth").path("register")
|
.target(serverUrl)
|
||||||
|
.path("api")
|
||||||
|
.path("auth")
|
||||||
|
.path("register")
|
||||||
.request(MediaType.APPLICATION_JSON)
|
.request(MediaType.APPLICATION_JSON)
|
||||||
.post(Entity.entity(body, MediaType.APPLICATION_JSON))
|
.post(Entity.entity(body, MediaType.APPLICATION_JSON))
|
||||||
val status = response.getStatus
|
val status = response.getStatus
|
||||||
@@ -199,11 +211,11 @@ class TournamentBotGamePlayer:
|
|||||||
log.warnf("Register %s on %s returned status %d: %s", name, serverUrl, status, errBody)
|
log.warnf("Register %s on %s returned status %d: %s", name, serverUrl, status, errBody)
|
||||||
response.close()
|
response.close()
|
||||||
None
|
None
|
||||||
}.recover { case ex => log.warnf(ex, "Register %s on %s failed", name, serverUrl); None }
|
}.recover { case ex => log.warnf(ex, "Register %s on %s failed", name, serverUrl); None }.toOption.flatten
|
||||||
.toOption.flatten
|
|
||||||
|
|
||||||
private def fetchTokenFromAccountService(name: String): Option[String] =
|
private def fetchTokenFromAccountService(name: String): Option[String] =
|
||||||
Try(accountServiceClient.getBotToken(name).token).toOption.filter(_.nonEmpty)
|
Try(accountServiceClient.getBotToken(name).token).toOption
|
||||||
|
.filter(_.nonEmpty)
|
||||||
.orElse {
|
.orElse {
|
||||||
Try {
|
Try {
|
||||||
val allNames = BotController.listBots.map(botName)
|
val allNames = BotController.listBots.map(botName)
|
||||||
@@ -229,9 +241,13 @@ class TournamentBotGamePlayer:
|
|||||||
|
|
||||||
private def fetchRemoteServers(): List[String] =
|
private def fetchRemoteServers(): List[String] =
|
||||||
Try {
|
Try {
|
||||||
val response = client.target(tournamentServiceUrl)
|
val response = client
|
||||||
.path("api").path("tournament").path("servers")
|
.target(tournamentServiceUrl)
|
||||||
.request(MediaType.APPLICATION_JSON).get()
|
.path("api")
|
||||||
|
.path("tournament")
|
||||||
|
.path("servers")
|
||||||
|
.request(MediaType.APPLICATION_JSON)
|
||||||
|
.get()
|
||||||
if response.getStatus == 200 then
|
if response.getStatus == 200 then
|
||||||
val node = objectMapper.readTree(response.readEntity(classOf[String]))
|
val node = objectMapper.readTree(response.readEntity(classOf[String]))
|
||||||
response.close()
|
response.close()
|
||||||
@@ -242,7 +258,11 @@ class TournamentBotGamePlayer:
|
|||||||
private def parkOnAccountService(serverUrl: String, difficulty: String, token: String): Unit =
|
private def parkOnAccountService(serverUrl: String, difficulty: String, token: String): Unit =
|
||||||
Try {
|
Try {
|
||||||
val body = s"""{"name":"${botName(difficulty)}"}"""
|
val body = s"""{"name":"${botName(difficulty)}"}"""
|
||||||
val response = client.target(serverUrl).path("api").path("account").path("bots")
|
val response = client
|
||||||
|
.target(serverUrl)
|
||||||
|
.path("api")
|
||||||
|
.path("account")
|
||||||
|
.path("bots")
|
||||||
.request(MediaType.APPLICATION_JSON)
|
.request(MediaType.APPLICATION_JSON)
|
||||||
.header("Authorization", s"Bearer $token")
|
.header("Authorization", s"Bearer $token")
|
||||||
.post(Entity.entity(body, MediaType.APPLICATION_JSON))
|
.post(Entity.entity(body, MediaType.APPLICATION_JSON))
|
||||||
@@ -256,7 +276,10 @@ class TournamentBotGamePlayer:
|
|||||||
private def parkOnTournamentServer(serverUrl: String, name: String, token: String): Unit =
|
private def parkOnTournamentServer(serverUrl: String, name: String, token: String): Unit =
|
||||||
Try {
|
Try {
|
||||||
val body = s"""{"name":"${name.replace("\"", "\\\"")}"}"""
|
val body = s"""{"name":"${name.replace("\"", "\\\"")}"}"""
|
||||||
val response = client.target(serverUrl).path("api").path("bots")
|
val response = client
|
||||||
|
.target(serverUrl)
|
||||||
|
.path("api")
|
||||||
|
.path("bots")
|
||||||
.request(MediaType.APPLICATION_JSON)
|
.request(MediaType.APPLICATION_JSON)
|
||||||
.header("Authorization", s"Bearer $token")
|
.header("Authorization", s"Bearer $token")
|
||||||
.post(Entity.entity(body, MediaType.APPLICATION_JSON))
|
.post(Entity.entity(body, MediaType.APPLICATION_JSON))
|
||||||
@@ -274,10 +297,11 @@ class TournamentBotGamePlayer:
|
|||||||
botToken: Option[String],
|
botToken: Option[String],
|
||||||
difficulty: String,
|
difficulty: String,
|
||||||
): Either[String, String] =
|
): Either[String, String] =
|
||||||
val redisKey = s"${redisConfig.prefix}:tournament-bot:token:${botName(difficulty)}"
|
val redisKey = s"${redisConfig.prefix}:tournament-bot:token:${botName(difficulty)}"
|
||||||
val resolvedToken = botToken.filter(_.nonEmpty)
|
val resolvedToken = botToken
|
||||||
|
.filter(_.nonEmpty)
|
||||||
.orElse(Option(redis.value(classOf[String]).get(redisKey)).filter(_.nonEmpty))
|
.orElse(Option(redis.value(classOf[String]).get(redisKey)).filter(_.nonEmpty))
|
||||||
.orElse(System.getenv().asScala.get("TOURNAMENT_BOT_TOKEN").filter(_.nonEmpty))
|
.orElse(resolveToken(difficulty))
|
||||||
resolvedToken match
|
resolvedToken match
|
||||||
case None => Left("No bot token provided and TOURNAMENT_BOT_TOKEN not configured")
|
case None => Left("No bot token provided and TOURNAMENT_BOT_TOKEN not configured")
|
||||||
case Some(token) =>
|
case Some(token) =>
|
||||||
@@ -334,8 +358,7 @@ class TournamentBotGamePlayer:
|
|||||||
log.infof("Listening to tournament %s event stream", cfg.tournamentId)
|
log.infof("Listening to tournament %s event stream", cfg.tournamentId)
|
||||||
forEachLine(response.readEntity(classOf[InputStream])): line =>
|
forEachLine(response.readEntity(classOf[InputStream])): line =>
|
||||||
parse(line).foreach: node =>
|
parse(line).foreach: node =>
|
||||||
if node.path("type").asText() == "gameStart" then
|
if node.path("type").asText() == "gameStart" then onGameStart(cfg, node.path("gameId").asText())
|
||||||
onGameStart(cfg, node.path("gameId").asText())
|
|
||||||
|
|
||||||
private def onGameStart(cfg: TournamentBotConfig, gameId: String): Unit =
|
private def onGameStart(cfg: TournamentBotConfig, gameId: String): Unit =
|
||||||
if gameId.isEmpty then ()
|
if gameId.isEmpty then ()
|
||||||
@@ -370,58 +393,44 @@ class TournamentBotGamePlayer:
|
|||||||
private def playGame(cfg: TournamentBotConfig, gameId: String, color: String): Unit =
|
private def playGame(cfg: TournamentBotConfig, gameId: String, color: String): Unit =
|
||||||
Try {
|
Try {
|
||||||
log.infof("Playing game %s as %s", gameId, color)
|
log.infof("Playing game %s as %s", gameId, color)
|
||||||
openGameStream(cfg, gameId).foreach(consumeGameStream(cfg, gameId, color, _))
|
pollGameLoop(cfg, gameId, color)
|
||||||
activeGames.remove(gameId)
|
activeGames.remove(gameId)
|
||||||
} match
|
} match
|
||||||
case Failure(ex) => log.errorf(ex, "Game %s crashed", gameId); activeGames.remove(gameId)
|
case Failure(ex) => log.errorf(ex, "Game %s crashed", gameId); activeGames.remove(gameId)
|
||||||
case Success(_) => ()
|
case Success(_) => ()
|
||||||
|
|
||||||
private def consumeGameStream(cfg: TournamentBotConfig, gameId: String, color: String, stream: InputStream): Unit =
|
// The native JAX-RS client buffers streaming responses, so reading the NDJSON game stream blocks
|
||||||
val reader = new BufferedReader(new InputStreamReader(stream))
|
// forever. Poll the game state with plain GETs (which work) and move when it is our turn.
|
||||||
|
private def pollGameLoop(cfg: TournamentBotConfig, gameId: String, color: String): Unit =
|
||||||
// scalafix:off DisableSyntax.var
|
// scalafix:off DisableSyntax.var
|
||||||
var done = false
|
var done = false
|
||||||
|
var lastFen = ""
|
||||||
// scalafix:on DisableSyntax.var
|
// scalafix:on DisableSyntax.var
|
||||||
Iterator
|
while running && !done do
|
||||||
.continually(reader.readLine())
|
fetchJson(cfg, target(cfg).path("game").path(gameId)) match
|
||||||
.map(Option(_))
|
case None => sleep(2000)
|
||||||
.takeWhile(opt => opt.isDefined && running && !done)
|
case Some(node) =>
|
||||||
.flatten
|
val status = node.path("status").asText()
|
||||||
.foreach { line =>
|
if gameTerminalStatuses.contains(status) then
|
||||||
parse(line).foreach: node =>
|
log.infof("Game %s ended — status=%s", gameId, status); done = true
|
||||||
node.path("type").asText() match
|
else
|
||||||
case "gameState" =>
|
// TEMP: tournament-server reports wrong color in pairings (everyone white).
|
||||||
maybeMove(
|
// The game endpoint white/black ids are correct, so derive our color from it.
|
||||||
cfg,
|
val whiteId = node.path("white").path("id").asText()
|
||||||
gameId,
|
val blackId = node.path("black").path("id").asText()
|
||||||
color,
|
val myColor =
|
||||||
node.path("turn").asText(),
|
if whiteId == cfg.botId then "white"
|
||||||
node.path("status").asText(),
|
else if blackId == cfg.botId then "black"
|
||||||
node.path("fen").asText(),
|
else color
|
||||||
)
|
val turn = node.path("turn").asText()
|
||||||
case "move" =>
|
val fen = node.path("fen").asText()
|
||||||
maybeMove(cfg, gameId, color, node.path("turn").asText(), "ongoing", node.path("fen").asText())
|
if turn == myColor && status == "ongoing" && fen.nonEmpty && fen != lastFen then
|
||||||
case "gameEnd" =>
|
lastFen = fen
|
||||||
log.infof(
|
log.infof("Our turn in game %s — computing move (fen=%s)", gameId, fen)
|
||||||
"Game %s ended — status=%s winner=%s",
|
computeUci(cfg, fen) match
|
||||||
gameId,
|
case None => log.warnf("No move found for game %s (fen=%s)", gameId, fen)
|
||||||
node.path("status").asText(),
|
case Some(uci) => submitMove(cfg, gameId, uci)
|
||||||
node.path("winner").asText(),
|
sleep(1000)
|
||||||
); done = true
|
|
||||||
case _ => ()
|
|
||||||
}
|
|
||||||
|
|
||||||
private def maybeMove(
|
|
||||||
cfg: TournamentBotConfig,
|
|
||||||
gameId: String,
|
|
||||||
color: String,
|
|
||||||
turn: String,
|
|
||||||
status: String,
|
|
||||||
fen: String,
|
|
||||||
): Unit =
|
|
||||||
if turn == color && status == "ongoing" && fen.nonEmpty then
|
|
||||||
computeUci(cfg, fen) match
|
|
||||||
case None => log.warnf("No move found for game %s (fen=%s)", gameId, fen)
|
|
||||||
case Some(uci) => submitMove(cfg, gameId, uci)
|
|
||||||
|
|
||||||
private def computeUci(cfg: TournamentBotConfig, fen: String): Option[String] =
|
private def computeUci(cfg: TournamentBotConfig, fen: String): Option[String] =
|
||||||
FenParser.parseFen(fen) match
|
FenParser.parseFen(fen) match
|
||||||
@@ -439,15 +448,6 @@ class TournamentBotGamePlayer:
|
|||||||
case Failure(ex) => log.errorf(ex, "Error submitting move %s in game %s", uci, gameId)
|
case Failure(ex) => log.errorf(ex, "Error submitting move %s in game %s", uci, gameId)
|
||||||
case Success(_) => ()
|
case Success(_) => ()
|
||||||
|
|
||||||
private def openGameStream(cfg: TournamentBotConfig, gameId: String): Option[InputStream] =
|
|
||||||
Try {
|
|
||||||
val response = authed(cfg, target(cfg).path("game").path(gameId).path("stream"))
|
|
||||||
.header("Accept", "application/x-ndjson")
|
|
||||||
.get()
|
|
||||||
if response.getStatus == 200 then Some(response.readEntity(classOf[InputStream]))
|
|
||||||
else { log.warnf("Game stream %s returned status %d", gameId, response.getStatus); response.close(); None }
|
|
||||||
}.getOrElse(None)
|
|
||||||
|
|
||||||
private def engine(cfg: TournamentBotConfig): Bot =
|
private def engine(cfg: TournamentBotConfig): Bot =
|
||||||
botController.getBot(cfg.difficulty).orElse(botController.getBot("medium")).get
|
botController.getBot(cfg.difficulty).orElse(botController.getBot("medium")).get
|
||||||
|
|
||||||
|
|||||||
@@ -4,9 +4,9 @@ import de.nowchess.api.board.*
|
|||||||
import de.nowchess.api.game.GameContext
|
import de.nowchess.api.game.GameContext
|
||||||
import de.nowchess.api.move.{Move, MoveType, PromotionPiece}
|
import de.nowchess.api.move.{Move, MoveType, PromotionPiece}
|
||||||
|
|
||||||
import java.io.{DataInputStream, FileInputStream}
|
import java.io.{DataInputStream, FileInputStream, InputStream}
|
||||||
|
import java.util.concurrent.ThreadLocalRandom
|
||||||
import scala.collection.mutable
|
import scala.collection.mutable
|
||||||
import scala.util.Random
|
|
||||||
|
|
||||||
/** Reads a Polyglot opening book (.bin file) and probes it for moves.
|
/** Reads a Polyglot opening book (.bin file) and probes it for moves.
|
||||||
*
|
*
|
||||||
@@ -16,24 +16,11 @@ import scala.util.Random
|
|||||||
* - weight: 2 bytes (Short) — move weight (higher = preferred)
|
* - weight: 2 bytes (Short) — move weight (higher = preferred)
|
||||||
* - learn: 4 bytes (Int) — learning data (unused)
|
* - learn: 4 bytes (Int) — learning data (unused)
|
||||||
*/
|
*/
|
||||||
final class PolyglotBook(path: String):
|
final class PolyglotBook private (entries: Map[Long, Vector[BookEntry]]):
|
||||||
|
|
||||||
private val entries: Map[Long, Vector[BookEntry]] =
|
|
||||||
try {
|
|
||||||
val r = loadBookFile(path)
|
|
||||||
println(s"Book loaded successfully. ${r.size} entries found.")
|
|
||||||
r
|
|
||||||
} catch
|
|
||||||
case e: Exception =>
|
|
||||||
println(s"Error loading book: $e")
|
|
||||||
// Gracefully fail: return empty map if book cannot be loaded
|
|
||||||
// This allows the bot to work even if the book file is missing
|
|
||||||
scala.collection.immutable.Map.empty
|
|
||||||
|
|
||||||
/** Probe the book for a move in the given position. Returns a weighted random move, or None if not in book. */
|
/** Probe the book for a move in the given position. Returns a weighted random move, or None if not in book. */
|
||||||
def probe(context: GameContext): Option[Move] =
|
def probe(context: GameContext): Option[Move] =
|
||||||
val hash = PolyglotHash.hash(context)
|
val hash = PolyglotHash.hash(context)
|
||||||
println(f"0x$hash%016X")
|
|
||||||
entries.get(hash).flatMap { bookEntries =>
|
entries.get(hash).flatMap { bookEntries =>
|
||||||
if bookEntries.isEmpty then None
|
if bookEntries.isEmpty then None
|
||||||
else
|
else
|
||||||
@@ -41,24 +28,6 @@ final class PolyglotBook(path: String):
|
|||||||
decodeMove(entry.move, context)
|
decodeMove(entry.move, context)
|
||||||
}
|
}
|
||||||
|
|
||||||
private def loadBookFile(path: String): Map[Long, Vector[BookEntry]] =
|
|
||||||
val input = DataInputStream(FileInputStream(path))
|
|
||||||
try
|
|
||||||
val result = mutable.Map[Long, Vector[BookEntry]]()
|
|
||||||
while input.available() > 0 do
|
|
||||||
val key = input.readLong()
|
|
||||||
val move = input.readShort()
|
|
||||||
val weight = input.readShort()
|
|
||||||
input.readInt() // learning data (unused)
|
|
||||||
|
|
||||||
val entry = BookEntry(key, move, weight)
|
|
||||||
result.updateWith(key) {
|
|
||||||
case Some(entries) => Some(entries :+ entry)
|
|
||||||
case None => Some(Vector(entry))
|
|
||||||
}
|
|
||||||
result.toMap
|
|
||||||
finally input.close()
|
|
||||||
|
|
||||||
/** Decode a packed Polyglot move short into an Option[Move].
|
/** Decode a packed Polyglot move short into an Option[Move].
|
||||||
*
|
*
|
||||||
* Bit layout of the move Short:
|
* Bit layout of the move Short:
|
||||||
@@ -124,7 +93,7 @@ final class PolyglotBook(path: String):
|
|||||||
if entries.length == 1 then entries.head
|
if entries.length == 1 then entries.head
|
||||||
else
|
else
|
||||||
val totalWeight = entries.map(_.weight).sum
|
val totalWeight = entries.map(_.weight).sum
|
||||||
val pick = Random.nextInt(totalWeight.max(1)) // NOSONAR
|
val pick = ThreadLocalRandom.current().nextInt(totalWeight.max(1)) // NOSONAR
|
||||||
|
|
||||||
@scala.annotation.tailrec
|
@scala.annotation.tailrec
|
||||||
def select(remaining: Int, idx: Int): BookEntry =
|
def select(remaining: Int, idx: Int): BookEntry =
|
||||||
@@ -134,4 +103,48 @@ final class PolyglotBook(path: String):
|
|||||||
|
|
||||||
select(pick, 0)
|
select(pick, 0)
|
||||||
|
|
||||||
|
object PolyglotBook:
|
||||||
|
|
||||||
|
/** Load a book from a filesystem path. Fails gracefully to an empty book. */
|
||||||
|
def apply(path: String): PolyglotBook =
|
||||||
|
safeLoad(s"file $path")(FileInputStream(path))
|
||||||
|
|
||||||
|
/** Load a book from a classpath resource (native-image safe: the resource is embedded in the binary, so no file must
|
||||||
|
* be mounted into the pod).
|
||||||
|
*/
|
||||||
|
def fromResource(name: String): PolyglotBook =
|
||||||
|
Option(getClass.getResourceAsStream(name)) match
|
||||||
|
case Some(stream) => safeLoad(s"resource $name")(stream)
|
||||||
|
case None =>
|
||||||
|
println(s"Error loading book: resource $name not found on classpath")
|
||||||
|
new PolyglotBook(Map.empty)
|
||||||
|
|
||||||
|
private def safeLoad(source: String)(stream: => InputStream): PolyglotBook =
|
||||||
|
try
|
||||||
|
val entries = parse(stream)
|
||||||
|
println(s"Book loaded successfully from $source. ${entries.size} entries found.")
|
||||||
|
new PolyglotBook(entries)
|
||||||
|
catch
|
||||||
|
case e: Exception =>
|
||||||
|
println(s"Error loading book from $source: $e")
|
||||||
|
new PolyglotBook(Map.empty)
|
||||||
|
|
||||||
|
private def parse(stream: InputStream): Map[Long, Vector[BookEntry]] =
|
||||||
|
val input = DataInputStream(stream)
|
||||||
|
try
|
||||||
|
val result = mutable.Map[Long, Vector[BookEntry]]()
|
||||||
|
while input.available() > 0 do
|
||||||
|
val key = input.readLong()
|
||||||
|
val move = input.readShort()
|
||||||
|
val weight = input.readShort()
|
||||||
|
input.readInt() // learning data (unused)
|
||||||
|
|
||||||
|
val entry = BookEntry(key, move, weight)
|
||||||
|
result.updateWith(key) {
|
||||||
|
case Some(entries) => Some(entries :+ entry)
|
||||||
|
case None => Some(Vector(entry))
|
||||||
|
}
|
||||||
|
result.toMap
|
||||||
|
finally input.close()
|
||||||
|
|
||||||
private case class BookEntry(key: Long, move: Short, weight: Int)
|
private case class BookEntry(key: Long, move: Short, weight: Int)
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
MAJOR=0
|
MAJOR=0
|
||||||
MINOR=31
|
MINOR=36
|
||||||
PATCH=0
|
PATCH=0
|
||||||
|
|||||||
@@ -94,3 +94,46 @@
|
|||||||
* **tournament:** use HS256 director token for native tournament-server calls ([b98bdd2](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/b98bdd2a64eb6c8279bd3cfe15d70628025ef0e5))
|
* **tournament:** use HS256 director token for native tournament-server calls ([b98bdd2](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/b98bdd2a64eb6c8279bd3cfe15d70628025ef0e5))
|
||||||
* **tournament:** use Optional[String] for selfUrl ConfigProperty to avoid startup failure ([28cbc2e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/28cbc2e18447aa8a04a5868889a49b555075d0c6))
|
* **tournament:** use Optional[String] for selfUrl ConfigProperty to avoid startup failure ([28cbc2e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/28cbc2e18447aa8a04a5868889a49b555075d0c6))
|
||||||
* wrap server list response in ExternalTournamentServerList ([f2d79e4](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/f2d79e4952aea6bde762c294eb202474b7827054))
|
* wrap server list response in ExternalTournamentServerList ([f2d79e4](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/f2d79e4952aea6bde762c294eb202474b7827054))
|
||||||
|
## (2026-06-23)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **analytics:** add Spark batch analytics module ([#70](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/70)) ([39f1657](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/39f1657e1db6e84889af338c43be8cb5c03c3ec3))
|
||||||
|
* NCS-121 pipeline for tournament ([#68](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/68)) ([145f467](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/145f4676483f92bfe6f2d9ca40e2cb4200982e87))
|
||||||
|
* NCS-82 add Swiss-system tournament module ([#55](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/55)) ([c5661de](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/c5661de4a0ebf4b33211f5a391840dcf744656b7))
|
||||||
|
* **reflection:** add GameWritebackEventDto to native reflection configuration ([1aee39c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/1aee39c1ad286984501ac4b47da2b72d60b58a6f))
|
||||||
|
* **reflection:** add native reflection configuration for tournament classes ([65bc6a7](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/65bc6a759937543df2d29905688bfa9e68d0c9d4))
|
||||||
|
* **tournament:** auto-join external tournaments and publish created ones ([#77](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/77)) ([9978b7e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/9978b7ea78eb658a225a461b9cd339386c0c14f3))
|
||||||
|
* **tournament:** federate tournaments across clusters with DB replication ([5b000a6](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/5b000a6e5f04ea6770d1c7ab6bfdaded77a99172))
|
||||||
|
* **tournament:** remove dynamic server add/remove endpoints ([6d06edd](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/6d06edda69a50de65cd9efa27f26a4cc6b437f9d))
|
||||||
|
* **tournament:** seed external server registry from env var on startup ([845dc9c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/845dc9c2935c8bc1be42541dfaf31c9a861d3272))
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **tournament:** replace scala.util.Random singleton with UUID for native image ([a50884a](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/a50884a11b1de500e74c18fd08d2d102d53cc3e9))
|
||||||
|
* **tournament:** sync native-server participants and route start ([#78](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/78)) ([1f4e9c8](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/1f4e9c8498f55d95ab48758df60c7618445bf6ca))
|
||||||
|
* **tournament:** use HS256 director token for native tournament-server calls ([b98bdd2](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/b98bdd2a64eb6c8279bd3cfe15d70628025ef0e5))
|
||||||
|
* **tournament:** use Optional[String] for selfUrl ConfigProperty to avoid startup failure ([28cbc2e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/28cbc2e18447aa8a04a5868889a49b555075d0c6))
|
||||||
|
* wrap server list response in ExternalTournamentServerList ([f2d79e4](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/f2d79e4952aea6bde762c294eb202474b7827054))
|
||||||
|
## (2026-06-23)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **analytics:** add Spark batch analytics module ([#70](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/70)) ([39f1657](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/39f1657e1db6e84889af338c43be8cb5c03c3ec3))
|
||||||
|
* NCS-121 pipeline for tournament ([#68](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/68)) ([145f467](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/145f4676483f92bfe6f2d9ca40e2cb4200982e87))
|
||||||
|
* NCS-82 add Swiss-system tournament module ([#55](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/55)) ([c5661de](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/c5661de4a0ebf4b33211f5a391840dcf744656b7))
|
||||||
|
* **reflection:** add GameWritebackEventDto to native reflection configuration ([1aee39c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/1aee39c1ad286984501ac4b47da2b72d60b58a6f))
|
||||||
|
* **reflection:** add native reflection configuration for tournament classes ([65bc6a7](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/65bc6a759937543df2d29905688bfa9e68d0c9d4))
|
||||||
|
* **tournament:** auto-join external tournaments and publish created ones ([#77](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/77)) ([9978b7e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/9978b7ea78eb658a225a461b9cd339386c0c14f3))
|
||||||
|
* **tournament:** federate tournaments across clusters with DB replication ([5b000a6](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/5b000a6e5f04ea6770d1c7ab6bfdaded77a99172))
|
||||||
|
* **tournament:** remove dynamic server add/remove endpoints ([6d06edd](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/6d06edda69a50de65cd9efa27f26a4cc6b437f9d))
|
||||||
|
* **tournament:** seed external server registry from env var on startup ([845dc9c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/845dc9c2935c8bc1be42541dfaf31c9a861d3272))
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **tournament:** mirror bot join onto native twin ([7664042](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/76640421930c26a9260da002c90e2966b97a57a4))
|
||||||
|
* **tournament:** replace scala.util.Random singleton with UUID for native image ([a50884a](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/a50884a11b1de500e74c18fd08d2d102d53cc3e9))
|
||||||
|
* **tournament:** sync native-server participants and route start ([#78](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/78)) ([1f4e9c8](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/1f4e9c8498f55d95ab48758df60c7618445bf6ca))
|
||||||
|
* **tournament:** use HS256 director token for native tournament-server calls ([b98bdd2](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/b98bdd2a64eb6c8279bd3cfe15d70628025ef0e5))
|
||||||
|
* **tournament:** use Optional[String] for selfUrl ConfigProperty to avoid startup failure ([28cbc2e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/28cbc2e18447aa8a04a5868889a49b555075d0c6))
|
||||||
|
* wrap server list response in ExternalTournamentServerList ([f2d79e4](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/f2d79e4952aea6bde762c294eb202474b7827054))
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import java.time.Instant
|
|||||||
@Entity
|
@Entity
|
||||||
@Table(name = "tournaments")
|
@Table(name = "tournaments")
|
||||||
class Tournament:
|
class Tournament:
|
||||||
// scalafix:off DisableSyntax.var
|
// scalafix:off
|
||||||
@Id
|
@Id
|
||||||
var id: String = uninitialized
|
var id: String = uninitialized
|
||||||
|
|
||||||
@@ -33,4 +33,7 @@ class Tournament:
|
|||||||
|
|
||||||
@Column(nullable = true)
|
@Column(nullable = true)
|
||||||
var originServerUrl: String = null
|
var originServerUrl: String = null
|
||||||
|
|
||||||
|
@Column(nullable = true)
|
||||||
|
var nativeTournamentId: String = null
|
||||||
// scalafix:on
|
// scalafix:on
|
||||||
|
|||||||
+88
-27
@@ -52,9 +52,9 @@ class TournamentResource:
|
|||||||
@PermitAll
|
@PermitAll
|
||||||
def list(): Response =
|
def list(): Response =
|
||||||
val (created, started, finished) = tournamentService.list()
|
val (created, started, finished) = tournamentService.list()
|
||||||
val internalCreated = created.map(t => objectMapper.valueToTree[JsonNode](tournamentService.toDto(t)))
|
val internalCreated = created.map(nativeOverlay)
|
||||||
val internalStarted = started.map(t => objectMapper.valueToTree[JsonNode](tournamentService.toDto(t)))
|
val internalStarted = started.map(nativeOverlay)
|
||||||
val internalFinished = finished.map(t => objectMapper.valueToTree[JsonNode](tournamentService.toDto(t)))
|
val internalFinished = finished.map(nativeOverlay)
|
||||||
|
|
||||||
val (extCreated, extStarted, extFinished) = registry
|
val (extCreated, extStarted, extFinished) = registry
|
||||||
.serverUrls()
|
.serverUrls()
|
||||||
@@ -96,7 +96,7 @@ class TournamentResource:
|
|||||||
val form = CreateTournamentForm(name, nbRounds, clockLimit, clockIncrement, rated)
|
val form = CreateTournamentForm(name, nbRounds, clockLimit, clockIncrement, rated)
|
||||||
val t = tournamentService.create(userId, form)
|
val t = tournamentService.create(userId, form)
|
||||||
selfUrl.ifPresent { url =>
|
selfUrl.ifPresent { url =>
|
||||||
registry.serverUrls().foreach { remoteUrl =>
|
registry.serverUrls().filterNot(externalClient.isNativeServer).foreach { remoteUrl =>
|
||||||
if !externalClient.replicateTournament(remoteUrl, toReplicateRequest(t), url) then
|
if !externalClient.replicateTournament(remoteUrl, toReplicateRequest(t), url) then
|
||||||
log.warnf("Failed to replicate tournament %s to %s", t.id, remoteUrl)
|
log.warnf("Failed to replicate tournament %s to %s", t.id, remoteUrl)
|
||||||
}
|
}
|
||||||
@@ -115,8 +115,52 @@ class TournamentResource:
|
|||||||
"rated" -> t.rated.toString,
|
"rated" -> t.rated.toString,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
if !externalClient.publishNative(nativeServerUrl, directorName, form) then
|
externalClient.publishNative(nativeServerUrl, directorName, form) match
|
||||||
log.warnf("Failed to publish tournament %s to native server %s", t.id, nativeServerUrl)
|
case Some(nativeId) => tournamentService.setNativeTournamentId(t.id, nativeId)
|
||||||
|
case None => log.warnf("Failed to publish tournament %s to native server %s", t.id, nativeServerUrl)
|
||||||
|
|
||||||
|
// Mirror a bot join onto the native twin so it surfaces in the UI, which reads participant and
|
||||||
|
// standings fields from the native server (see nativeOverlay).
|
||||||
|
private def joinNativeTwin(id: String, botName: String): Unit =
|
||||||
|
if nativeServerUrl.nonEmpty then
|
||||||
|
tournamentService.get(id).flatMap(nativeIdFor).foreach { nativeId =>
|
||||||
|
if externalClient.joinNativeAsBot(nativeServerUrl, nativeId, botName) then
|
||||||
|
log.infof("Joined bot %s on native twin %s of tournament %s", botName, nativeId, id)
|
||||||
|
else log.warnf("Failed to join bot %s on native twin %s of tournament %s", botName, nativeId, id)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Resolve the native-server twin of a local tournament. Backfills the stored id by matching
|
||||||
|
// fullName against the native list for tournaments created before the id was captured.
|
||||||
|
private def nativeIdFor(t: de.nowchess.tournament.domain.Tournament): Option[String] =
|
||||||
|
if nativeServerUrl.isEmpty then None
|
||||||
|
else
|
||||||
|
Option(t.nativeTournamentId).filter(_.nonEmpty).orElse {
|
||||||
|
val found = externalClient
|
||||||
|
.fetchList(nativeServerUrl)
|
||||||
|
.flatMap { node =>
|
||||||
|
Seq("created", "started", "finished").iterator
|
||||||
|
.flatMap(k => node.path(k).elements().asScala)
|
||||||
|
.find(_.path("fullName").asText() == t.fullName)
|
||||||
|
.map(_.path("id").asText())
|
||||||
|
.filter(_.nonEmpty)
|
||||||
|
}
|
||||||
|
found.foreach(id => tournamentService.setNativeTournamentId(t.id, id))
|
||||||
|
found
|
||||||
|
}
|
||||||
|
|
||||||
|
// Overlay live participant/standings/status fields from the native twin onto a local DTO so
|
||||||
|
// bots that joined directly on the native server are reflected in NowChess.
|
||||||
|
private def nativeOverlay(t: de.nowchess.tournament.domain.Tournament): JsonNode =
|
||||||
|
val standings = tournamentService.getStandings(t.id)
|
||||||
|
val dto = objectMapper.valueToTree[JsonNode](tournamentService.toDto(t, standings))
|
||||||
|
nativeIdFor(t).flatMap(nid => externalClient.fetch(nativeServerUrl, nid)) match
|
||||||
|
case Some(native) =>
|
||||||
|
val merged = dto.deepCopy[com.fasterxml.jackson.databind.node.ObjectNode]()
|
||||||
|
Seq("nbPlayers", "standing", "status", "round", "winner").foreach { field =>
|
||||||
|
if native.has(field) then merged.set(field, native.get(field))
|
||||||
|
}
|
||||||
|
merged
|
||||||
|
case None => dto
|
||||||
|
|
||||||
private def encodeForm(params: Map[String, String]): String =
|
private def encodeForm(params: Map[String, String]): String =
|
||||||
params
|
params
|
||||||
@@ -132,8 +176,7 @@ class TournamentResource:
|
|||||||
def get(@PathParam("id") id: String): Response =
|
def get(@PathParam("id") id: String): Response =
|
||||||
tournamentService.get(id) match
|
tournamentService.get(id) match
|
||||||
case Some(t) =>
|
case Some(t) =>
|
||||||
val standings = tournamentService.getStandings(id)
|
Response.ok(nativeOverlay(t)).build()
|
||||||
Response.ok(tournamentService.toDto(t, standings)).build()
|
|
||||||
case None =>
|
case None =>
|
||||||
resolveServer(id)
|
resolveServer(id)
|
||||||
.flatMap(url => externalClient.fetch(url, id).map(node => Response.ok(node).build()))
|
.flatMap(url => externalClient.fetch(url, id).map(node => Response.ok(node).build()))
|
||||||
@@ -179,19 +222,26 @@ class TournamentResource:
|
|||||||
val (status, body) = externalClient.proxyPost(originUrl, s"api/tournament/$id/start", auth)
|
val (status, body) = externalClient.proxyPost(originUrl, s"api/tournament/$id/start", auth)
|
||||||
Response.status(status).entity(body).build()
|
Response.status(status).entity(body).build()
|
||||||
case None =>
|
case None =>
|
||||||
tournamentService.start(id, userId) match
|
tournamentService.get(id).flatMap(nativeIdFor) match
|
||||||
case Right(t) => Response.ok(tournamentService.toDto(t)).build()
|
case Some(nativeId) =>
|
||||||
case Left(error) =>
|
val auth = Option(headers.getHeaderString("Authorization"))
|
||||||
error match
|
val (status, body) = externalClient.proxyPost(nativeServerUrl, s"api/tournament/$nativeId/start", auth)
|
||||||
case TournamentError.NotFound(_) =>
|
if status / 100 == 2 then tournamentService.markStatus(id, "started")
|
||||||
val auth = Option(headers.getHeaderString("Authorization"))
|
Response.status(status).entity(body).build()
|
||||||
resolveServer(id)
|
case None =>
|
||||||
.map { url =>
|
tournamentService.start(id, userId) match
|
||||||
val (status, body) = externalClient.proxyPost(url, s"api/tournament/$id/start", auth)
|
case Right(t) => Response.ok(tournamentService.toDto(t)).build()
|
||||||
Response.status(status).entity(body).build()
|
case Left(error) =>
|
||||||
}
|
error match
|
||||||
.getOrElse(errorResponse(error))
|
case TournamentError.NotFound(_) =>
|
||||||
case _ => errorResponse(error)
|
val auth = Option(headers.getHeaderString("Authorization"))
|
||||||
|
resolveServer(id)
|
||||||
|
.map { url =>
|
||||||
|
val (status, body) = externalClient.proxyPost(url, s"api/tournament/$id/start", auth)
|
||||||
|
Response.status(status).entity(body).build()
|
||||||
|
}
|
||||||
|
.getOrElse(errorResponse(error))
|
||||||
|
case _ => errorResponse(error)
|
||||||
|
|
||||||
@POST
|
@POST
|
||||||
@Path("/{id}/join")
|
@Path("/{id}/join")
|
||||||
@@ -210,7 +260,14 @@ class TournamentResource:
|
|||||||
val botId = Option(jwt.getSubject).getOrElse("")
|
val botId = Option(jwt.getSubject).getOrElse("")
|
||||||
val botName = Option(jwt.getClaim[AnyRef]("name")).map(_.toString).getOrElse(botId)
|
val botName = Option(jwt.getClaim[AnyRef]("name")).map(_.toString).getOrElse(botId)
|
||||||
tournamentService.join(id, botId, botName) match
|
tournamentService.join(id, botId, botName) match
|
||||||
case Right(_) => Response.ok(OkDto()).build()
|
case Right(_) =>
|
||||||
|
joinNativeTwin(id, botName)
|
||||||
|
Response.ok(OkDto()).build()
|
||||||
|
// Already in the NowChess participant list but possibly never mirrored onto the native
|
||||||
|
// twin (where the UI reads participants from) — make the native join idempotent.
|
||||||
|
case Left(TournamentError.AlreadyJoined) =>
|
||||||
|
joinNativeTwin(id, botName)
|
||||||
|
Response.ok(OkDto()).build()
|
||||||
case Left(error) =>
|
case Left(error) =>
|
||||||
error match
|
error match
|
||||||
case TournamentError.NotFound(_) =>
|
case TournamentError.NotFound(_) =>
|
||||||
@@ -317,7 +374,8 @@ class TournamentResource:
|
|||||||
tournamentService.get(id) match
|
tournamentService.get(id) match
|
||||||
case Some(t) if Option(t.originServerUrl).isDefined =>
|
case Some(t) if Option(t.originServerUrl).isDefined =>
|
||||||
val auth = Option(headers.getHeaderString("Authorization"))
|
val auth = Option(headers.getHeaderString("Authorization"))
|
||||||
externalClient.proxyGetStream(t.originServerUrl, s"api/tournament/$id/stream", auth)
|
externalClient
|
||||||
|
.proxyGetStream(t.originServerUrl, s"api/tournament/$id/stream", auth)
|
||||||
.map { inputStream =>
|
.map { inputStream =>
|
||||||
Response
|
Response
|
||||||
.ok(new StreamingOutput {
|
.ok(new StreamingOutput {
|
||||||
@@ -334,10 +392,12 @@ class TournamentResource:
|
|||||||
.`type`("application/x-ndjson")
|
.`type`("application/x-ndjson")
|
||||||
.build()
|
.build()
|
||||||
}
|
}
|
||||||
.getOrElse(Response.status(Response.Status.NOT_FOUND).entity(ErrorDto(s"Tournament $id stream unavailable")).build())
|
.getOrElse(
|
||||||
|
Response.status(Response.Status.NOT_FOUND).entity(ErrorDto(s"Tournament $id stream unavailable")).build(),
|
||||||
|
)
|
||||||
case Some(_) =>
|
case Some(_) =>
|
||||||
val botId = Option(jwt.getSubject).getOrElse("")
|
val botId = Option(jwt.getSubject).getOrElse("")
|
||||||
val queue = new java.util.concurrent.LinkedBlockingQueue[Option[String]]()
|
val queue = new java.util.concurrent.LinkedBlockingQueue[Option[String]]()
|
||||||
val emitter = new io.smallrye.mutiny.subscription.MultiEmitter[String] {
|
val emitter = new io.smallrye.mutiny.subscription.MultiEmitter[String] {
|
||||||
def emit(item: String): io.smallrye.mutiny.subscription.MultiEmitter[String] =
|
def emit(item: String): io.smallrye.mutiny.subscription.MultiEmitter[String] =
|
||||||
queue.put(Some(item)); this
|
queue.put(Some(item)); this
|
||||||
@@ -358,7 +418,7 @@ class TournamentResource:
|
|||||||
var cont = true
|
var cont = true
|
||||||
while cont do
|
while cont do
|
||||||
queue.take() match
|
queue.take() match
|
||||||
case None => cont = false
|
case None => cont = false
|
||||||
case Some(line) =>
|
case Some(line) =>
|
||||||
output.write((line + "\n").getBytes("UTF-8"))
|
output.write((line + "\n").getBytes("UTF-8"))
|
||||||
output.flush()
|
output.flush()
|
||||||
@@ -440,7 +500,8 @@ class TournamentResource:
|
|||||||
.getOrElse(Response.status(Response.Status.NOT_FOUND).build())
|
.getOrElse(Response.status(Response.Status.NOT_FOUND).build())
|
||||||
|
|
||||||
private def resolveServer(tournamentId: String): Option[String] =
|
private def resolveServer(tournamentId: String): Option[String] =
|
||||||
tournamentService.get(tournamentId)
|
tournamentService
|
||||||
|
.get(tournamentId)
|
||||||
.flatMap(t => Option(t.originServerUrl))
|
.flatMap(t => Option(t.originServerUrl))
|
||||||
.orElse(registry.findServerUrl(tournamentId))
|
.orElse(registry.findServerUrl(tournamentId))
|
||||||
.orElse {
|
.orElse {
|
||||||
|
|||||||
+37
-13
@@ -14,7 +14,7 @@ import scala.util.Try
|
|||||||
class ExternalTournamentClient:
|
class ExternalTournamentClient:
|
||||||
|
|
||||||
// scalafix:off DisableSyntax.var
|
// scalafix:off DisableSyntax.var
|
||||||
@Inject var objectMapper: ObjectMapper = uninitialized
|
@Inject var objectMapper: ObjectMapper = uninitialized
|
||||||
@volatile private var directorToken: Option[String] = None
|
@volatile private var directorToken: Option[String] = None
|
||||||
|
|
||||||
@ConfigProperty(name = "nowchess.tournament.native-server-url", defaultValue = "http://141.37.123.132:8086")
|
@ConfigProperty(name = "nowchess.tournament.native-server-url", defaultValue = "http://141.37.123.132:8086")
|
||||||
@@ -30,7 +30,7 @@ class ExternalTournamentClient:
|
|||||||
// RS256 user token to it — swap in the director token registered on that server.
|
// RS256 user token to it — swap in the director token registered on that server.
|
||||||
private def normalize(url: String): String = url.stripSuffix("/")
|
private def normalize(url: String): String = url.stripSuffix("/")
|
||||||
|
|
||||||
private def isNativeServer(serverUrl: String): Boolean =
|
def isNativeServer(serverUrl: String): Boolean =
|
||||||
nativeServerUrl.nonEmpty && normalize(serverUrl) == normalize(nativeServerUrl)
|
nativeServerUrl.nonEmpty && normalize(serverUrl) == normalize(nativeServerUrl)
|
||||||
|
|
||||||
private def directorBearer(): Option[String] =
|
private def directorBearer(): Option[String] =
|
||||||
@@ -45,24 +45,27 @@ class ExternalTournamentClient:
|
|||||||
private def authFor(serverUrl: String, userAuth: Option[String]): Option[String] =
|
private def authFor(serverUrl: String, userAuth: Option[String]): Option[String] =
|
||||||
if isNativeServer(serverUrl) then directorBearer() else userAuth
|
if isNativeServer(serverUrl) then directorBearer() else userAuth
|
||||||
|
|
||||||
def publishNative(serverUrl: String, directorName: String, form: String): Boolean =
|
def publishNative(serverUrl: String, directorName: String, form: String): Option[String] =
|
||||||
val token = directorToken.orElse {
|
val token = directorToken.orElse {
|
||||||
val fresh = registerDirector(serverUrl, directorName)
|
val fresh = registerDirector(serverUrl, directorName)
|
||||||
directorToken = fresh
|
directorToken = fresh
|
||||||
fresh
|
fresh
|
||||||
}
|
}
|
||||||
token.exists { tok =>
|
token.flatMap { tok =>
|
||||||
if createNative(serverUrl, tok, form) then true
|
createNative(serverUrl, tok, form).orElse {
|
||||||
else
|
|
||||||
val refreshed = registerDirector(serverUrl, directorName)
|
val refreshed = registerDirector(serverUrl, directorName)
|
||||||
directorToken = refreshed
|
directorToken = refreshed
|
||||||
refreshed.exists(createNative(serverUrl, _, form))
|
refreshed.flatMap(createNative(serverUrl, _, form))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private def registerDirector(serverUrl: String, name: String): Option[String] =
|
private def registerDirector(serverUrl: String, name: String): Option[String] =
|
||||||
|
registerAccount(serverUrl, name, isBot = false)
|
||||||
|
|
||||||
|
private def registerAccount(serverUrl: String, name: String, isBot: Boolean): Option[String] =
|
||||||
Try {
|
Try {
|
||||||
val client = buildClient()
|
val client = buildClient()
|
||||||
val body = s"""{"name":"${name.replace("\"", "\\\"")}","isBot":false}"""
|
val body = s"""{"name":"${name.replace("\"", "\\\"")}","isBot":$isBot}"""
|
||||||
val response = client
|
val response = client
|
||||||
.target(s"$serverUrl/api/auth/register")
|
.target(s"$serverUrl/api/auth/register")
|
||||||
.request(MediaType.APPLICATION_JSON)
|
.request(MediaType.APPLICATION_JSON)
|
||||||
@@ -76,7 +79,25 @@ class ExternalTournamentClient:
|
|||||||
client.close()
|
client.close()
|
||||||
}.getOrElse(None)
|
}.getOrElse(None)
|
||||||
|
|
||||||
private def createNative(serverUrl: String, token: String, form: String): Boolean =
|
// The tournament server holds only the director token, which cannot join as a bot. Register the
|
||||||
|
// bot on the native server by name to mint a bot token, then join the native twin as that bot.
|
||||||
|
def joinNativeAsBot(serverUrl: String, tournamentId: String, botName: String): Boolean =
|
||||||
|
registerAccount(serverUrl, botName, isBot = true).exists { token =>
|
||||||
|
Try {
|
||||||
|
val client = buildClient()
|
||||||
|
val response = client
|
||||||
|
.target(s"$serverUrl/api/tournament/$tournamentId/join")
|
||||||
|
.request(MediaType.APPLICATION_JSON)
|
||||||
|
.header("Authorization", s"Bearer $token")
|
||||||
|
.post(Entity.json(""))
|
||||||
|
try response.getStatus / 100 == 2 || response.getStatus == 409
|
||||||
|
finally
|
||||||
|
response.close()
|
||||||
|
client.close()
|
||||||
|
}.getOrElse(false)
|
||||||
|
}
|
||||||
|
|
||||||
|
private def createNative(serverUrl: String, token: String, form: String): Option[String] =
|
||||||
Try {
|
Try {
|
||||||
val client = buildClient()
|
val client = buildClient()
|
||||||
val response = client
|
val response = client
|
||||||
@@ -84,11 +105,14 @@ class ExternalTournamentClient:
|
|||||||
.request(MediaType.APPLICATION_JSON)
|
.request(MediaType.APPLICATION_JSON)
|
||||||
.header("Authorization", s"Bearer $token")
|
.header("Authorization", s"Bearer $token")
|
||||||
.post(Entity.entity(form, MediaType.APPLICATION_FORM_URLENCODED))
|
.post(Entity.entity(form, MediaType.APPLICATION_FORM_URLENCODED))
|
||||||
try response.getStatus / 100 == 2
|
try
|
||||||
|
if response.getStatus / 100 == 2 then
|
||||||
|
Option(objectMapper.readTree(response.readEntity(classOf[String])).path("id").asText()).filter(_.nonEmpty)
|
||||||
|
else None
|
||||||
finally
|
finally
|
||||||
response.close()
|
response.close()
|
||||||
client.close()
|
client.close()
|
||||||
}.getOrElse(false)
|
}.getOrElse(None)
|
||||||
|
|
||||||
def fetchList(serverUrl: String): Option[JsonNode] =
|
def fetchList(serverUrl: String): Option[JsonNode] =
|
||||||
Try {
|
Try {
|
||||||
@@ -141,8 +165,8 @@ class ExternalTournamentClient:
|
|||||||
|
|
||||||
def replicateTournament(serverUrl: String, req: ReplicateTournamentRequest, selfUrl: String): Boolean =
|
def replicateTournament(serverUrl: String, req: ReplicateTournamentRequest, selfUrl: String): Boolean =
|
||||||
Try {
|
Try {
|
||||||
val client = buildClient()
|
val client = buildClient()
|
||||||
val body = objectMapper.writeValueAsString(req)
|
val body = objectMapper.writeValueAsString(req)
|
||||||
val response = client
|
val response = client
|
||||||
.target(s"$serverUrl/api/tournament/replicate")
|
.target(s"$serverUrl/api/tournament/replicate")
|
||||||
.request(MediaType.APPLICATION_JSON)
|
.request(MediaType.APPLICATION_JSON)
|
||||||
|
|||||||
+8
@@ -82,6 +82,14 @@ class TournamentService:
|
|||||||
def get(id: String): Option[Tournament] =
|
def get(id: String): Option[Tournament] =
|
||||||
tournamentRepository.findOptById(id)
|
tournamentRepository.findOptById(id)
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
def setNativeTournamentId(id: String, nativeId: String): Unit =
|
||||||
|
tournamentRepository.findOptById(id).foreach(_.nativeTournamentId = nativeId)
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
def markStatus(id: String, status: String): Unit =
|
||||||
|
tournamentRepository.findOptById(id).foreach(_.status = status)
|
||||||
|
|
||||||
def list(): (List[Tournament], List[Tournament], List[Tournament]) =
|
def list(): (List[Tournament], List[Tournament], List[Tournament]) =
|
||||||
(
|
(
|
||||||
tournamentRepository.findByStatus("created"),
|
tournamentRepository.findByStatus("created"),
|
||||||
|
|||||||
@@ -30,3 +30,7 @@ nowchess:
|
|||||||
secret: test-secret
|
secret: test-secret
|
||||||
auth:
|
auth:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
tournament:
|
||||||
|
self-url: ""
|
||||||
|
external-servers: ""
|
||||||
|
native-server-url: "http://localhost:1"
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
MAJOR=0
|
MAJOR=0
|
||||||
MINOR=7
|
MINOR=9
|
||||||
PATCH=0
|
PATCH=0
|
||||||
|
|||||||
Reference in New Issue
Block a user