Merge pull request #319 from mxp100/bugfix/websocket-in-tasks

fixes for working with websocket in jobs

Author: albertcht

src/Server/Manager.php

@@ -122,13 +122,18 @@ protected function initialize()
      */
     protected function setSwooleServerListeners()
     {
+        $server = $this->container->make(Server::class);
+        if ($server->taskworker){
+            return;
+        }
+
         foreach ($this->events as $event) {
             $listener = Str::camel("on_$event");
             $callback = method_exists($this, $listener) ? [$this, $listener] : function () use ($event) {
                 $this->container->make('events')->dispatch("swoole.$event", func_get_args());
             };
 
-            $this->container->make(Server::class)->on($event, $callback);
+            $server->on($event, $callback);
         }
     }
 
@@ -170,11 +175,8 @@ public function onWorkerStart($server)
 
         $this->container->make('events')->dispatch('swoole.workerStart', func_get_args());
 
-        // don't init laravel app in task workers
         if ($server->taskworker) {
             $this->setProcessName('task process');
-
-            return;
         }
         $this->setProcessName('worker process');
 

src/Websocket/Websocket.php

@@ -8,6 +8,7 @@
 use Illuminate\Support\Facades\Config;
 use InvalidArgumentException;
 use SwooleTW\Http\Server\Facades\Server;
+use SwooleTW\Http\Server\Manager;
 use SwooleTW\Http\Websocket\Rooms\RoomContract;
 
 /**
@@ -172,17 +173,35 @@ public function emit(string $event, $data): bool
             return false;
         }
 
-        $result = App::make(Server::class)->task([
-            'action' => static::PUSH_ACTION,
-            'data' => [
-                'sender' => $this->sender,
-                'fds' => $fds,
+        /** @var Server $server */
+        $server = App::make(Server::class);
+
+        if (!empty($server->taskworker)) {
+            /** @var Manager $manager */
+            $manager = App::make(Manager::class);
+            $manager->pushMessage($server, [
+                'sender'    => $this->sender,
+                'fds'       => $fds,
                 'broadcast' => $this->isBroadcast,
-                'assigned' => $assigned,
-                'event' => $event,
-                'message' => $data,
-            ],
-        ]);
+                'assigned'  => $assigned,
+                'event'     => $event,
+                'message'   => $data,
+            ]);
+
+            $result = true;
+        } else {
+            $result = $server->task([
+                'action' => static::PUSH_ACTION,
+                'data'   => [
+                    'sender'    => $this->sender,
+                    'fds'       => $fds,
+                    'broadcast' => $this->isBroadcast,
+                    'assigned'  => $assigned,
+                    'event'     => $event,
+                    'message'   => $data,
+                ],
+            ]);
+        }
 
         $this->reset();
 

tests/Server/ManagerTest.php

@@ -178,7 +178,8 @@ public function testOnTaskWorkerStart()
             return $this->getEvent('swoole.workerStart');
         });
 
-        $manager = $this->getManager($container);
+        $path = __DIR__ . '/../fixtures';
+        $manager = $this->getManager($container, $framework = 'laravel', $path);
 
         $this->assertNull($manager->onWorkerStart($server));
     }