Merge pull request #139 from swooletw/feature/coroutine_feature

albertcht · web-flow · commit 572d7f9e47f0 · 2018-09-04T21:54:05.000+08:00
Feature/coroutine feature
diff --git a/config/swoole_http.php b/config/swoole_http.php
@@ -17,6 +17,9 @@
         'public_path' => base_path('public'),
         // Determine if to use swoole to respond request for static files
         'handle_static_files' => env('SWOOLE_HANDLE_STATIC', true),
+        // You must add --enable-openssl while compiling Swoole
+        // Put `SWOOLE_SOCK_TCP | SWOOLE_SSL` if you want to enable SSL
+        'socket_type' => SWOOLE_SOCK_TCP,
         'options' => [
             'pid_file' => env('SWOOLE_HTTP_PID_FILE', base_path('storage/logs/swoole_http.pid')),
             'log_file' => env('SWOOLE_HTTP_LOG_FILE', base_path('storage/logs/swoole_http.log')),
@@ -57,6 +60,17 @@
     */
     'ob_output' => env('SWOOLE_OB_OUTPUT', true),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Pre-resolved instances here will be resolved when sandbox created.
+    |--------------------------------------------------------------------------
+    */
+    'pre_resolved' => [
+        'view', 'files', 'session', 'session.store', 'routes',
+        'db', 'db.factory', 'cache', 'cache.store', 'config', 'cookie',
+        'encrypter', 'hash', 'router', 'translator', 'url', 'log',
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | Instances here will be cleared on every request.
diff --git a/src/Commands/HttpServerCommand.php b/src/Commands/HttpServerCommand.php
@@ -328,13 +328,14 @@ protected function isDaemon()
     protected function checkEnvironment()
     {
         if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-            throw new \RuntimeException("Swoole extension doesn't support Windows OS yet.");
+            $this->error("Swoole extension doesn't support Windows OS yet.");
+            exit;
         } elseif (! extension_loaded('swoole')) {
-            throw new \RuntimeException("Can't detect Swoole extension installed.");
-        }
-
-        if (! version_compare(swoole_version(), '4.0.0-alpha', 'ge')) {
-            throw new \RuntimeException("Your Swoole version must be higher than 4.0 to use coroutine.");
+            $this->error("Can't detect Swoole extension installed.");
+            exit;
+        } elseif (! version_compare(swoole_version(), '4.0.0', 'ge')) {
+            $this->error("Your Swoole version must be higher than 4.0 to use coroutine.");
+            exit;
         }
     }
 }
diff --git a/src/Concerns/WithApplication.php b/src/Concerns/WithApplication.php
@@ -20,17 +20,6 @@ trait WithApplication
      */
     protected $app;
 
-    /**
-     * Aliases for pre-resolving.
-     *
-     * @var array
-     */
-    protected $resolves = [
-        'view', 'files', 'session', 'session.store', 'routes',
-        'db', 'db.factory', 'cache', 'cache.store', 'config', 'cookie',
-        'encrypter', 'hash', 'router', 'translator', 'url', 'log'
-    ];
-
     /**
      * Bootstrap framework.
      */
@@ -146,7 +135,9 @@ public function getBasePath()
      */
     protected function preResolveInstances()
     {
-        foreach ($this->resolves as $abstract) {
+        $resolves = $this->container['config']->get('swoole_http.pre_resolved', []);
+
+        foreach ($resolves as $abstract) {
             if ($this->getApplication()->offsetExists($abstract)) {
                 $this->getApplication()->make($abstract);
             }
diff --git a/src/HttpServiceProvider.php b/src/HttpServiceProvider.php
@@ -116,11 +116,9 @@ protected function createSwooleServer()
         $server = $this->isWebsocket ? WebsocketServer::class : HttpServer::class;
         $host = $this->app['config']->get('swoole_http.server.host');
         $port = $this->app['config']->get('swoole_http.server.port');
-        $hasCert = $this->app['config']->get('swoole_http.server.options.ssl_cert_file');
-        $hasKey = $this->app['config']->get('swoole_http.server.options.ssl_key_file');
-        $args = $hasCert && $hasKey ? [SWOOLE_PROCESS, SWOOLE_SOCK_TCP | SWOOLE_SSL] : [];
+        $socketType = $this->app['config']->get('swoole_http.server.socket_type', SWOOLE_SOCK_TCP);
 
-        static::$server = new $server($host, $port, ...$args);
+        static::$server = new $server($host, $port, SWOOLE_PROCESS, $socketType);
     }
 
     /**
@@ -185,7 +183,7 @@ protected function registerSwooleQueueDriver()
     {
         $this->app->afterResolving('queue', function ($manager) {
             $manager->addConnector('swoole', function () {
-                return new SwooleTaskConnector(static::$server);
+                return new SwooleTaskConnector($this->app->make(Server::class));
             });
         });
     }
diff --git a/src/Server/Manager.php b/src/Server/Manager.php
@@ -255,6 +255,7 @@ public function onTask($server, $taskId, $srcWorkerId, $data)
     public function onFinish($server, $taskId, $data)
     {
         // task worker callback
+        return;
     }
 
     /**
@@ -271,7 +272,6 @@ public function onShutdown()
     protected function bindToLaravelApp()
     {
         $this->bindSandbox();
-        $this->bindSwooleServer();
         $this->bindSwooleTable();
 
         if ($this->isWebsocket) {
@@ -280,17 +280,6 @@ protected function bindToLaravelApp()
         }
     }
 
-    /**
-     * Bind swoole server to Laravel app container.
-     */
-    protected function bindSwooleServer()
-    {
-        $this->app->singleton(Server::class, function ($app) {
-            return $this->container['swoole.server'];
-        });
-        $this->app->alias(Server::class, 'swoole.server');
-    }
-
     /**
      * Bind sandbox to Laravel app container.
      */
@@ -396,6 +385,6 @@ protected function isInTesting()
      */
     public function logServerError(Throwable $e)
     {
-        $this->app[ExceptionHandler::class]->report($e);
+        $this->container[ExceptionHandler::class]->report($e);
     }
 }
diff --git a/src/Server/Resetters/BindRequest.php b/src/Server/Resetters/BindRequest.php
@@ -5,8 +5,9 @@
 use Illuminate\Http\Request;
 use SwooleTW\Http\Server\Sandbox;
 use Illuminate\Contracts\Container\Container;
+use SwooleTW\Http\Server\Resetters\ResetterContract;
 
-class BindRequest
+class BindRequest implements ResetterContract
 {
     /**
      * "handle" function for resetting app.
diff --git a/src/Server/Resetters/ClearInstances.php b/src/Server/Resetters/ClearInstances.php
@@ -4,8 +4,9 @@
 
 use SwooleTW\Http\Server\Sandbox;
 use Illuminate\Contracts\Container\Container;
+use SwooleTW\Http\Server\Resetters\ResetterContract;
 
-class ClearInstances
+class ClearInstances implements ResetterContract
 {
     /**
      * "handle" function for resetting app.
diff --git a/src/Server/Resetters/RebindKernelContainer.php b/src/Server/Resetters/RebindKernelContainer.php
@@ -5,8 +5,9 @@
 use SwooleTW\Http\Server\Sandbox;
 use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Contracts\Container\Container;
+use SwooleTW\Http\Server\Resetters\ResetterContract;
 
-class RebindKernelContainer
+class RebindKernelContainer implements ResetterContract
 {
     /**
      * "handle" function for resetting app.
diff --git a/src/Server/Resetters/RebindRouterContainer.php b/src/Server/Resetters/RebindRouterContainer.php
@@ -4,9 +4,10 @@
 
 use SwooleTW\Http\Server\Sandbox;
 use Illuminate\Contracts\Container\Container;
+use SwooleTW\Http\Server\Resetters\ResetterContract;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-class RebindRouterContainer
+class RebindRouterContainer implements ResetterContract
 {
     /**
      * "handle" function for resetting app.
diff --git a/src/Server/Resetters/RebindViewContainer.php b/src/Server/Resetters/RebindViewContainer.php
@@ -4,8 +4,9 @@
 
 use SwooleTW\Http\Server\Sandbox;
 use Illuminate\Contracts\Container\Container;
+use SwooleTW\Http\Server\Resetters\ResetterContract;
 
-class RebindViewContainer
+class RebindViewContainer implements ResetterContract
 {
     /**
      * "handle" function for resetting app.
diff --git a/src/Server/Resetters/ResetConfig.php b/src/Server/Resetters/ResetConfig.php
@@ -4,8 +4,9 @@
 
 use SwooleTW\Http\Server\Sandbox;
 use Illuminate\Contracts\Container\Container;
+use SwooleTW\Http\Server\Resetters\ResetterContract;
 
-class ResetConfig
+class ResetConfig implements ResetterContract
 {
     /**
      * "handle" function for resetting app.
diff --git a/src/Server/Resetters/ResetCookie.php b/src/Server/Resetters/ResetCookie.php
@@ -4,8 +4,9 @@
 
 use SwooleTW\Http\Server\Sandbox;
 use Illuminate\Contracts\Container\Container;
+use SwooleTW\Http\Server\Resetters\ResetterContract;
 
-class ResetCookie
+class ResetCookie implements ResetterContract
 {
     /**
      * "handle" function for resetting app.
diff --git a/src/Server/Resetters/ResetProviders.php b/src/Server/Resetters/ResetProviders.php
@@ -4,8 +4,9 @@
 
 use SwooleTW\Http\Server\Sandbox;
 use Illuminate\Contracts\Container\Container;
+use SwooleTW\Http\Server\Resetters\ResetterContract;
 
-class ResetProviders
+class ResetProviders implements ResetterContract
 {
     /**
      * "handle" function for resetting app.
diff --git a/src/Server/Resetters/ResetSession.php b/src/Server/Resetters/ResetSession.php
@@ -4,8 +4,9 @@
 
 use SwooleTW\Http\Server\Sandbox;
 use Illuminate\Contracts\Container\Container;
+use SwooleTW\Http\Server\Resetters\ResetterContract;
 
-class ResetSession
+class ResetSession implements ResetterContract
 {
     /**
      * "handle" function for resetting app.
diff --git a/src/Server/helpers.php b/src/Server/helpers.php
@@ -9,3 +9,10 @@ function swoole_cpu_num()
         return;
     }
 }
+
+/**
+ * This is only for `function not exists` in config/swoole_http.php.
+ */
+if (! defined('SWOOLE_SOCK_TCP')) {
+    define('SWOOLE_SOCK_TCP', 1);
+}
diff --git a/src/Task/SwooleTaskJob.php b/src/Task/SwooleTaskJob.php
@@ -42,6 +42,8 @@ class SwooleTaskJob extends Job implements JobContract
      * @param  \Illuminate\Container\Container  $container
      * @param  \Swoole\Http\Server  $swoole
      * @param  string  $job
+     * @param  int  $taskId
+     * @param  int  $srcWorkerId
      * @return void
      */
     public function __construct(Container $container, $swoole, $job, $taskId, $srcWrokerId)
diff --git a/src/Task/SwooleTaskQueue.php b/src/Task/SwooleTaskQueue.php
@@ -3,6 +3,7 @@
 namespace SwooleTW\Http\Task;
 
 use Exception;
+use Swoole\Timer;
 use Illuminate\Queue\Queue;
 use Illuminate\Contracts\Queue\Queue as QueueContract;
 
@@ -62,7 +63,7 @@ public function pushRaw($payload, $queue = null, array $options = [])
      */
     public function later($delay, $job, $data = '', $queue = null)
     {
-        return swoole_timer_after($this->secondsUntil($delay) * 1000, function () use ($job, $data, $queue) {
+        return Timer::after($this->secondsUntil($delay) * 1000, function () use ($job, $data, $queue) {
             return $this->push($job, $data, $queue);
         });
     }
@@ -77,7 +78,7 @@ public function later($delay, $job, $data = '', $queue = null)
      */
     protected function createStringPayload($job, $data)
     {
-        throw new Exception("Unsupported empty data");
+        throw new Exception('Unsupported empty data');
     }
 
     /**
diff --git a/src/Websocket/Rooms/RedisRoom.php b/src/Websocket/Rooms/RedisRoom.php
@@ -127,7 +127,7 @@ public function getRooms(int $fd)
     protected function checkTable(string $table)
     {
         if (! in_array($table, ['rooms', 'fds'])) {
-            throw new \InvalidArgumentException('invalid table name.');
+            throw new \InvalidArgumentException('Invalid table name.');
         }
     }
 
diff --git a/src/Websocket/Rooms/TableRoom.php b/src/Websocket/Rooms/TableRoom.php
@@ -123,7 +123,7 @@ public function getValue(string $key, string $table)
     protected function checkTable(string $table)
     {
         if (! property_exists($this, $table) || ! $this->$table instanceof Table) {
-            throw new \InvalidArgumentException('invalid table name.');
+            throw new \InvalidArgumentException('Invalid table name.');
         }
     }
 }
diff --git a/tests/Server/ManagerTest.php b/tests/Server/ManagerTest.php
@@ -36,7 +36,8 @@ class ManagerTest extends TestCase
             ]
         ],
         'swoole_http.providers' => [],
-        'swoole_http.resetters' => []
+        'swoole_http.resetters' => [],
+        'swoole_http.pre_resolved' => ['foo']
     ];
 
     protected $websocketConfig = [
@@ -149,6 +150,23 @@ public function testOnWorkerStart()
         $this->assertTrue($app->make('swoole.websocket') instanceof Websocket);
     }
 
+    public function testLoadApplication()
+    {
+        $server = $this->getServer();
+        $manager = $this->getManager();
+
+        $container = $this->getContainer($this->getServer(), $this->getConfig());
+        $container->singleton('events', function () {
+            return $this->getEvent('swoole.workerStart');
+        });
+
+        $path = __DIR__ . '/../fixtures';
+        $manager = $this->getManager($container, $framework = 'laravel', $path);
+        $manager->onWorkerStart($server);
+
+        $app = $manager->getApplication();
+    }
+
     public function testOnTaskWorkerStart()
     {
         $server = $this->getServer();
diff --git a/tests/Server/SandboxTest.php b/tests/Server/SandboxTest.php
@@ -121,6 +121,13 @@ public function testSetSnapshot()
         $this->assertSame($container, Context::getApp());
     }
 
+    public function testIsLaravel()
+    {
+        $sandbox = new Sandbox;
+
+        $this->assertTrue($sandbox->isLaravel());
+    }
+
     protected function getContainer()
     {
         $config = m::mock(Illuminate\Config\Repository::class);
diff --git a/tests/fixtures/bootstrap/app.php b/tests/fixtures/bootstrap/app.php
@@ -0,0 +1,34 @@
+<?php
+
+use Mockery as m;
+use Illuminate\Contracts\Http\Kernel;
+use Illuminate\Contracts\Container\Container;
+
+$kernel = new TestKernel;
+
+$app = m::mock(Container::class);
+$app->shouldReceive('make')
+    ->with(Kernel::class)
+    ->once()
+    ->andReturn($kernel);
+$app->shouldReceive('bootstrapWith')
+    ->once()
+    ->andReturn($kernel);
+$app->shouldReceive('offsetExists')
+    ->with('foo')
+    ->once()
+    ->andReturn(true);
+$app->shouldReceive('make')
+    ->with('foo')
+    ->once();
+$app->shouldReceive('singleton');
+$app->shouldReceive('alias');
+
+return $app;
+
+class TestKernel {
+    public function bootstrappers()
+    {
+        return [];
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -328,13 +328,14 @@ protected function isDaemon()`
`328`	`328`	`protected function checkEnvironment()`
`329`	`329`	`{`
`330`	`330`	`if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {`
`331`		`- throw new \RuntimeException("Swoole extension doesn't support Windows OS yet.");`
	`331`	`+ $this->error("Swoole extension doesn't support Windows OS yet.");`
	`332`	`+ exit;`
`332`	`333`	`} elseif (! extension_loaded('swoole')) {`
`333`		`- throw new \RuntimeException("Can't detect Swoole extension installed.");`
`334`		`- }`
`335`		`-`
`336`		`- if (! version_compare(swoole_version(), '4.0.0-alpha', 'ge')) {`
`337`		`- throw new \RuntimeException("Your Swoole version must be higher than 4.0 to use coroutine.");`
	`334`	`+ $this->error("Can't detect Swoole extension installed.");`
	`335`	`+ exit;`
	`336`	`+ } elseif (! version_compare(swoole_version(), '4.0.0', 'ge')) {`
	`337`	`+ $this->error("Your Swoole version must be higher than 4.0 to use coroutine.");`
	`338`	`+ exit;`
`338`	`339`	`}`
`339`	`340`	`}`
`340`	`341`	`}`
Original file line number	Diff line number	Diff line change
`@@ -255,6 +255,7 @@ public function onTask($server, $taskId, $srcWorkerId, $data)`
`255`	`255`	`public function onFinish($server, $taskId, $data)`
`256`	`256`	`{`
`257`	`257`	`// task worker callback`
	`258`	`+ return;`
`258`	`259`	`}`
`259`	`260`
`260`	`261`	`/**`
`@@ -271,7 +272,6 @@ public function onShutdown()`
`271`	`272`	`protected function bindToLaravelApp()`
`272`	`273`	`{`
`273`	`274`	`$this->bindSandbox();`
`274`		`- $this->bindSwooleServer();`
`275`	`275`	`$this->bindSwooleTable();`
`276`	`276`
`277`	`277`	`if ($this->isWebsocket) {`
`@@ -280,17 +280,6 @@ protected function bindToLaravelApp()`
`280`	`280`	`}`
`281`	`281`	`}`
`282`	`282`
`283`		`- /**`
`284`		`- * Bind swoole server to Laravel app container.`
`285`		`- */`
`286`		`- protected function bindSwooleServer()`
`287`		`- {`
`288`		`- $this->app->singleton(Server::class, function ($app) {`
`289`		`- return $this->container['swoole.server'];`
`290`		`- });`
`291`		`- $this->app->alias(Server::class, 'swoole.server');`
`292`		`- }`
`293`		`-`
`294`	`283`	`/**`
`295`	`284`	`* Bind sandbox to Laravel app container.`
`296`	`285`	`*/`
`@@ -396,6 +385,6 @@ protected function isInTesting()`
`396`	`385`	`*/`
`397`	`386`	`public function logServerError(Throwable $e)`
`398`	`387`	`{`
`399`		`- $this->app[ExceptionHandler::class]->report($e);`
	`388`	`+ $this->container[ExceptionHandler::class]->report($e);`
`400`	`389`	`}`
`401`	`390`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,9 @@`
`4`	`4`
`5`	`5`	`use SwooleTW\Http\Server\Sandbox;`
`6`	`6`	`use Illuminate\Contracts\Container\Container;`
	`7`	`+use SwooleTW\Http\Server\Resetters\ResetterContract;`
`7`	`8`
`8`		`-class ClearInstances`
	`9`	`+class ClearInstances implements ResetterContract`
`9`	`10`	`{`
`10`	`11`	`/**`
`11`	`12`	`* "handle" function for resetting app.`