Merge pull request #284 from zaxxo/master

[feature] Add restart command for WebSocket server

Author: rennokki

src/Console/RestartWebSocketServer.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace BeyondCode\LaravelWebSockets\Console;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\InteractsWithTime;
+
+class RestartWebSocketServer extends Command
+{
+    use InteractsWithTime;
+
+    protected $signature = 'websockets:restart';
+
+    protected $description = 'Restart the Laravel WebSocket Server';
+
+    public function handle()
+    {
+        Cache::forever('beyondcode:websockets:restart', $this->currentTime());
+
+        $this->info('Broadcasting WebSocket server restart signal.');
+    }
+}

src/Console/StartWebSocketServer.php

@@ -13,6 +13,7 @@
 use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager;
 use Clue\React\Buzz\Browser;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Cache;
 use React\Dns\Config\Config as DnsConfig;
 use React\Dns\Resolver\Factory as DnsFactory;
 use React\Dns\Resolver\ResolverInterface;
@@ -28,6 +29,9 @@ class StartWebSocketServer extends Command
     /** @var \React\EventLoop\LoopInterface */
     protected $loop;
 
+    /** @var int */
+    protected $lastRestart;
+
     public function __construct()
     {
         parent::__construct();
@@ -42,6 +46,7 @@ public function handle()
             ->configureHttpLogger()
             ->configureMessageLogger()
             ->configureConnectionLogger()
+            ->configureRestartTimer()
             ->registerEchoRoutes()
             ->registerCustomRoutes()
             ->startWebSocketServer();
@@ -105,6 +110,19 @@ protected function configureConnectionLogger()
         return $this;
     }
 
+    public function configureRestartTimer()
+    {
+        $this->lastRestart = $this->getLastRestart();
+
+        $this->loop->addPeriodicTimer(10, function () {
+            if ($this->getLastRestart() !== $this->lastRestart) {
+                $this->loop->stop();
+            }
+        });
+
+        return $this;
+    }
+
     protected function registerEchoRoutes()
     {
         WebSocketsRouter::echo();
@@ -151,4 +169,9 @@ protected function getDnsResolver(): ResolverInterface
             $this->loop
         );
     }
+
+    protected function getLastRestart()
+    {
+        return Cache::get('beyondcode:websockets:restart', 0);
+    }
 }

src/WebSocketsServiceProvider.php

@@ -41,6 +41,7 @@ public function boot()
         $this->commands([
             Console\StartWebSocketServer::class,
             Console\CleanStatistics::class,
+            Console\RestartWebSocketServer::class,
         ]);
     }
 

tests/Commands/RestartWebSocketServerTest.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace BeyondCode\LaravelWebSockets\Tests\Commands;
+
+use Artisan;
+use BeyondCode\LaravelWebSockets\Tests\TestCase;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\InteractsWithTime;
+
+class RestartWebSocketServerTest extends TestCase
+{
+    use InteractsWithTime;
+
+    /** @test */
+    public function it_can_broadcast_restart_signal()
+    {
+        $start = $this->currentTime();
+
+        Artisan::call('websockets:restart');
+
+        $this->assertGreaterThanOrEqual($start, Cache::get('beyondcode:websockets:restart', 0));
+    }
+}