Merge pull request #417 from chesslablab/issue/410-Parallelize-the-st…

…art-command Issue/410 parallelize the start command
chesslablab · Oct 7, 2024 · 7cb9d9f · 7cb9d9f
2 parents 10c9f84 + 3add356
commit 7cb9d9f
Show file tree

Hide file tree

Showing 14 changed files with 87 additions and 142 deletions.
diff --git a/cli/ratchet/game.php b/cli/ratchet/game.php
@@ -2,7 +2,6 @@
 
 namespace ChessServer\Cli\Ratchet;
 
-use ChessServer\Db;
 use ChessServer\Command\Parser;
 use ChessServer\Command\Game\Cli;
 use ChessServer\Socket\Ratchet\ClientStorage;
@@ -13,7 +12,6 @@
 use Ratchet\Http\HttpServer;
 use Ratchet\Server\IoServer;
 use Ratchet\WebSocket\WsServer;
-use React\EventLoop\Factory;
 use React\Socket\LimitingServer;
 use React\Socket\Server;
 use React\Socket\SecureServer;
@@ -26,20 +24,12 @@
 
 $pool = Pool::create();
 
-$db = new Db([
-   'driver' => $_ENV['DB_DRIVER'],
-   'host' => $_ENV['DB_HOST'],
-   'database' => $_ENV['DB_DATABASE'],
-   'username' => $_ENV['DB_USERNAME'],
-   'password' => $_ENV['DB_PASSWORD'],
-]);
-
 $logger = new Logger('log');
 $logger->pushHandler(new StreamHandler(__DIR__.'/../../storage' . '/game.log', Logger::INFO));
 
-$clientStorage = new ClientStorage($logger);
+$parser = new Parser(new Cli($pool));
 
-$parser = new Parser(new Cli($pool, $db));
+$clientStorage = new ClientStorage($logger);
 
 $webSocket = (new GameWebSocket($parser))->init($clientStorage);
 

diff --git a/cli/ratchet/ws_game.php b/cli/ratchet/ws_game.php
@@ -2,7 +2,6 @@
 
 namespace ChessServer\Cli\Ratchet;
 
-use ChessServer\Db;
 use ChessServer\Command\Parser;
 use ChessServer\Command\Game\Cli;
 use ChessServer\Socket\Ratchet\ClientStorage;
@@ -23,20 +22,12 @@
 
 $pool = Pool::create();
 
-$db = new Db([
-   'driver' => $_ENV['DB_DRIVER'],
-   'host' => $_ENV['DB_HOST'],
-   'database' => $_ENV['DB_DATABASE'],
-   'username' => $_ENV['DB_USERNAME'],
-   'password' => $_ENV['DB_PASSWORD'],
-]);
-
 $logger = new Logger('log');
 $logger->pushHandler(new StreamHandler(__DIR__.'/../../storage' . '/game.log', Logger::INFO));
 
-$clientStorage = new ClientStorage($logger);
+$parser = new Parser(new Cli($pool));
 
-$parser = new Parser(new Cli($pool, $db));
+$clientStorage = new ClientStorage($logger);
 
 $webSocket = (new GameWebSocket($parser))->init($clientStorage);
 

diff --git a/cli/workerman/game.php b/cli/workerman/game.php
@@ -2,7 +2,6 @@
 
 namespace ChessServer\Cli\Workerman;
 
-use ChessServer\Db;
 use ChessServer\Command\Parser;
 use ChessServer\Command\Game\Cli;
 use ChessServer\Socket\Workerman\ClientStorage;
@@ -19,18 +18,10 @@
 
 $pool = Pool::create();
 
-$db = new Db([
-   'driver' => $_ENV['DB_DRIVER'],
-   'host' => $_ENV['DB_HOST'],
-   'database' => $_ENV['DB_DATABASE'],
-   'username' => $_ENV['DB_USERNAME'],
-   'password' => $_ENV['DB_PASSWORD'],
-]);
-
 $logger = new Logger('game');
 $logger->pushHandler(new StreamHandler(GameWebSocket::STORAGE_FOLDER . '/game.log', Logger::INFO));
 
-$parser = new Parser(new Cli($pool, $db));
+$parser = new Parser(new Cli($pool));
 
 $clientStorage = new ClientStorage($logger);
 

diff --git a/src/Command/Game/Cli.php b/src/Command/Game/Cli.php
@@ -10,11 +10,10 @@ class Cli extends AbstractCli
 {
     private Db $db;
 
-    public function __construct(Pool $pool, Db $db)
+    public function __construct(Pool $pool)
     {
         parent::__construct();
 
-        $this->db = $db;
         // text-based commands
         $this->commands->attach(new EvalNamesCommand());
         $this->commands->attach(new OnlineGamesCommand());
@@ -26,14 +25,14 @@ public function __construct(Pool $pool, Db $db)
         // param-based commands
         $this->commands->attach(new AcceptPlayRequestCommand());
         $this->commands->attach((new HeuristicCommand())->setPool($pool));
-        $this->commands->attach(new LeaveCommand($db));
+        $this->commands->attach((new LeaveCommand())->setPool($pool));
         $this->commands->attach(new LegalCommand());
         $this->commands->attach(new PlayLanCommand());
         $this->commands->attach((new PlayRavCommand())->setPool($pool));
         $this->commands->attach(new RandomizerCommand());
-        $this->commands->attach(new ResignCommand($db));
-        $this->commands->attach(new RestartCommand($db));
-        $this->commands->attach(new StartCommand($db));
+        $this->commands->attach((new ResignCommand())->setPool($pool));
+        $this->commands->attach((new RestartCommand())->setPool($pool));
+        $this->commands->attach((new StartCommand())->setPool($pool));
         $this->commands->attach((new StockfishCommand())->setPool($pool));
         $this->commands->attach(new TutorFenCommand());
     }

diff --git a/src/Command/Game/LeaveCommand.php b/src/Command/Game/LeaveCommand.php
@@ -2,17 +2,14 @@
 
 namespace ChessServer\Command\Game;
 
-use ChessServer\Db;
 use ChessServer\Command\AbstractCommand;
 use ChessServer\Repository\UserRepository;
 use ChessServer\Socket\AbstractSocket;
 
 class LeaveCommand extends AbstractCommand
 {
-    public function __construct(Db $db)
+    public function __construct()
     {
-        parent::__construct($db);
-
         $this->name = '/leave';
         $this->description = 'Leaves a game.';
         $this->params = [
@@ -31,7 +28,7 @@ public function run(AbstractSocket $socket, array $argv, int $id)
 
         if ($gameMode = $socket->getGameModeStorage()->getById($id)) {
             $gameMode->getGame()->setAbandoned($params['color']);
-            (new UserRepository($this->db))->updateElo(
+            (new UserRepository())->updateElo(
                 $gameMode->getGame()->state()->end['result'],
                 $gameMode->getJwtDecoded()
             );

diff --git a/src/Command/Game/Mode/PlayMode.php b/src/Command/Game/Mode/PlayMode.php
@@ -3,7 +3,6 @@
 namespace ChessServer\Command\Game\Mode;
 
 use Chess\Variant\Classical\PGN\AN\Color;
-use ChessServer\Db;
 use ChessServer\Command\Game\Game;
 use ChessServer\Command\Game\PlayLanCommand;
 use ChessServer\Repository\UserRepository;
@@ -18,8 +17,6 @@ class PlayMode extends AbstractMode
     const SUBMODE_FRIEND = 'friend';
     const SUBMODE_ONLINE = 'online';
 
-    protected Db $db;
-
     protected string $status;
 
     protected int $startedAt;
@@ -28,11 +25,10 @@ class PlayMode extends AbstractMode
 
     protected array $timer;
 
-    public function __construct(Game $game, array $resourceIds, string $jwt, Db $db)
+    public function __construct(Game $game, array $resourceIds, string $jwt)
     {
         parent::__construct($game, $resourceIds, $jwt);
 
-        $this->db = $db;
         $this->status = self::STATUS_PENDING;
     }
 
@@ -106,7 +102,7 @@ public function res($params, $cmd)
                 $isValid = $this->game->playLan($params['color'], $params['lan']);
                 if ($isValid) {
                     if (isset($this->game->state()->end)) {
-                        (new UserRepository($this->db))->updateElo(
+                        (new UserRepository())->updateElo(
                             $this->game->state()->end['result'],
                             $this->getJwtDecoded()
                         );

diff --git a/src/Command/Game/ResignCommand.php b/src/Command/Game/ResignCommand.php
@@ -2,17 +2,14 @@
 
 namespace ChessServer\Command\Game;
 
-use ChessServer\Db;
 use ChessServer\Command\AbstractCommand;
 use ChessServer\Repository\UserRepository;
 use ChessServer\Socket\AbstractSocket;
 
 class ResignCommand extends AbstractCommand
 {
-    public function __construct(Db $db)
+    public function __construct()
     {
-        parent::__construct($db);
-
         $this->name = '/resign';
         $this->description = 'Resigns a game.';
         $this->params = [
@@ -30,7 +27,7 @@ public function run(AbstractSocket $socket, array $argv, int $id)
         $params = json_decode(stripslashes($argv[1]), true);
         $gameMode = $socket->getGameModeStorage()->getById($id);
         $gameMode->getGame()->setResignation($params['color']);
-        (new UserRepository($this->db))->updateElo(
+        (new UserRepository())->updateElo(
             $gameMode->getGame()->state()->end['result'],
             $gameMode->getJwtDecoded()
         );

diff --git a/src/Command/Game/RestartCommand.php b/src/Command/Game/RestartCommand.php
@@ -4,7 +4,6 @@
 
 use Chess\Variant\Chess960\FEN\StrToBoard as Chess960FenStrToBoard;
 use Chess\Variant\Classical\PGN\AN\Color;
-use ChessServer\Db;
 use ChessServer\Command\AbstractCommand;
 use ChessServer\Command\Game\Game;
 use ChessServer\Command\Game\Mode\PlayMode;
@@ -13,10 +12,8 @@
 
 class RestartCommand extends AbstractCommand
 {
-    public function __construct(Db $db)
+    public function __construct()
     {
-        parent::__construct($db);
-
         $this->name = '/restart';
         $this->description = 'Restarts an existing game.';
         $this->params = [
@@ -47,8 +44,7 @@ public function run(AbstractSocket $socket, array $argv, int $id)
             $newGameMode = (new PlayMode(
                 $game,
                 $gameMode->getResourceIds(),
-                JWT::encode((array) $decoded, $_ENV['JWT_SECRET'], 'HS256'),
-                $this->db
+                JWT::encode((array) $decoded, $_ENV['JWT_SECRET'], 'HS256')
             ))->setStatus(PlayMode::STATUS_ACCEPTED)
             ->setStartedAt(time())
             ->setUpdatedAt(time())

diff --git a/src/Command/Game/StartCommand.php b/src/Command/Game/StartCommand.php
@@ -12,7 +12,6 @@
 use Chess\Variant\Dunsany\Board as DunsanyBoard;
 use Chess\Variant\Losing\Board as LosingBoard;
 use Chess\Variant\RacingKings\Board as RacingKingsBoard;
-use ChessServer\Db;
 use ChessServer\Command\AbstractCommand;
 use ChessServer\Command\Game\Mode\AnalysisMode;
 use ChessServer\Command\Game\Mode\PlayMode;
@@ -22,10 +21,8 @@
 
 class StartCommand extends AbstractCommand
 {
-    public function __construct(Db $db)
+    public function __construct()
     {
-        parent::__construct($db);
-
         $this->name = '/start';
         $this->description = 'Starts a new game.';
         $this->params = [
@@ -162,8 +159,7 @@ public function run(AbstractSocket $socket, array $argv, int $id)
                 $gameMode = new PlayMode(
                     $game,
                     [$id],
-                    JWT::encode($payload, $_ENV['JWT_SECRET'], 'HS256'),
-                    $this->db
+                    JWT::encode($payload, $_ENV['JWT_SECRET'], 'HS256')
                 );
                 $socket->getGameModeStorage()->set($gameMode);
                 if ($params['settings']['submode'] === PlayMode::SUBMODE_ONLINE) {

diff --git a/src/Repository/UpdateEloAsyncTask.php b/src/Repository/UpdateEloAsyncTask.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace ChessServer\Repository;
+
+use ChessServer\Db;
+use Spatie\Async\Task;
+
+class UpdateEloAsyncTask extends Task
+{
+    private array $params;
+
+    private array $env;
+
+    private Db $db;
+
+    public function __construct(array $params, array $env)
+    {
+        $this->params = $params;
+        $this->env = $env;
+    }
+
+    public function configure()
+    {
+        $this->db = new Db($this->env['db']);
+    }
+
+    public function run()
+    {
+        $sql = "UPDATE users SET elo = :elo WHERE username = :username";
+
+        $values= [
+            [
+                'param' => ":username",
+                'value' => $this->params['username'],
+                'type' => \PDO::PARAM_STR,
+            ],
+            [
+                'param' => ":elo",
+                'value' => $this->params['elo'],
+                'type' => \PDO::PARAM_INT,
+            ],
+        ];
+
+        return $this->db->query($sql, $values);
+    }
+}