Updated the game CLI commands

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);
 

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);
 

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);
 

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());
     }

src/Socket/Ratchet/GameWebSocket.php

@@ -4,21 +4,14 @@
 
 use ChessServer\Command\Parser;
 use ChessServer\Command\Game\GameModeStorage;
-use ChessServer\Socket\DbReconnectTrait;
 use Ratchet\ConnectionInterface;
 
 class GameWebSocket extends AbstractWebSocket
 {
-    use DbReconnectTrait;
-
     public function __construct(Parser $parser)
     {
         parent::__construct($parser);
 
-        $this->loop->addPeriodicTimer($this->timeInterval, function() {
-            $this->reconnect();
-        });
-
         $this->gameModeStorage = new GameModeStorage();
     }
 

src/Socket/Workerman/GameWebSocket.php

@@ -4,13 +4,10 @@
 
 use ChessServer\Command\Parser;
 use ChessServer\Command\Game\GameModeStorage;
-use ChessServer\Socket\DbReconnectTrait;
 use Workerman\Timer;
 
 class GameWebSocket extends AbstractWebSocket
 {
-    use DbReconnectTrait;
-
     private GrandmasterMove $gmMove;
 
     private GameModeStorage $gameModeStorage;
@@ -19,12 +16,6 @@ public function __construct(string $socketName, array $context, Parser $parser)
     {
         parent::__construct($socketName, $context, $parser);
 
-        $this->worker->onWorkerStart = function() {
-            Timer::add($this->timeInterval, function() {
-                $this->reconnect();
-            });
-        };
-
         $this->gameModeStorage = new GameModeStorage();
 
         $this->connect()->message()->error()->close();