Merge pull request #11 from MatviiB/develop

Fix conflicts with core auth routes (L5.5)

Author: MatviiB

composer.json

@@ -25,7 +25,7 @@
         "socketstream"
     ],
     "type": "library",
-    "version": "v1.2.0",
+    "version": "v1.2.1",
     "license": "MIT",
     "authors": [
         {

readme.md

@@ -5,9 +5,12 @@
 </p>
 
 ### Usage Example
-#### Send new values to chart on some page synchronously to each user:
-#### `event(new Notify($data, ['chart']));`
-#### Or to users with `id` 3 and 5: `event(new Notify($data, ['chart'], [3, 5]));`
+Send new values to chart on some page synchronously to each user:
+
+`event(new Notify($data, ['chart']));`
+
+Or to users with `id` 3 and 5: `event(new Notify($data, ['chart'], [3, 5]));`
+
 ![laravel socket server](https://gitlab.com/MatviiB/assets/raw/master/ezgif.com-video-to-gif.gif)
 
 ### Base concepts

src/Commands/Notifier.php

@@ -2,10 +2,12 @@
 
 namespace MatviiB\Notifier\Commands;
 
-use Cache;
 use Closure;
+
 use Illuminate\Routing\Router;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Cache;
+
 use MatviiB\Notifier\SocketServer;
 
 class Notifier extends Command
@@ -52,6 +54,13 @@ class Notifier extends Command
      */
     private $headers = ['Method', 'Name', 'Middleware'];
 
+    /**
+     * Available all except Auth routes.
+     *
+     * @var array
+     */
+    private $except = ['login', 'register', 'password.request', 'password.reset'];
+
     /**
      * Socket connections.
      *
@@ -74,28 +83,20 @@ class Notifier extends Command
     private $per_users;
 
     /**
-     * Create a new command instance.
+     * Execute the console command.
      *
      * @param  \Illuminate\Routing\Router  $router
+     * @param SocketServer $socket
+     * @return mixed
      */
-    public function __construct(Router $router)
+    public function handle(Router $router, SocketServer $socket)
     {
-        parent::__construct();
-
-        $this->server = new SocketServer();
+        $this->server = $socket;
         $this->router = $router;
         $this->routes = $this->getRoutes();
-
         $this->connects = $this->per_pages = $this->per_users = [];
-    }
 
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
+
         if ($this->argument('show')) {
             $this->displayRoutes();
         }
@@ -243,7 +244,7 @@ private function getRoutes()
             }
 
             $name = $route->getName();
-            if (!$name) {
+            if (!$name || in_array($name, $this->except)) {
                 continue;
             }
 

src/NotifierServiceProvider.php

@@ -2,10 +2,6 @@
 
 namespace MatviiB\Notifier;
 
-use MatviiB\Notifier\Middleware\InjectConnector;
-
-use App\Http\Kernel;
-
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Contracts\Events\Dispatcher;
 
@@ -20,7 +16,15 @@ class NotifierServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        //
+        if ($this->app->runningInConsole()) {
+            $this->commands([
+                Commands\Notifier::class
+            ]);
+
+            $this->publishes([
+                __DIR__ . '/config/notifier.php' => config_path('notifier.php'),
+            ], 'config');
+        }
     }
 
     /**
@@ -41,18 +45,5 @@ public function register()
         }
 
         $this->loadViewsFrom(__DIR__ . '/views', 'notifier');
-
-        if ($this->app->runningInConsole()) {
-
-            $this->commands([
-                Commands\Notifier::class,
-            ]);
-
-            $this->publishes([
-                __DIR__ . '/config/notifier.php' => config_path('notifier.php'),
-            ], 'config');
-        }
-
-
     }
 }