Merge pull request swooletw#39 from swooletw/develop

Develop

Author: albertcht

.github/ISSUE_TEMPLATE.md

@@ -8,14 +8,18 @@ Please answer these questions before submitting your issue. Thanks!
 
 
 
-3. What did you do? If possible, provide a recipe for reproducing the error.
+3. Which release version of this package are you using?
 
 
 
-4. What did you expect to see?
+4. What did you do? If possible, provide a recipe for reproducing the error.
 
 
 
-5. What did you see instead?
+5. What did you expect to see?
+
+
+
+6. What did you see instead?
 
 

config/swoole_http.php

@@ -15,6 +15,8 @@
         'host' => env('SWOOLE_HTTP_HOST', '127.0.0.1'),
         'port' => env('SWOOLE_HTTP_PORT', '1215'),
         'public_path' => base_path('public'),
+        // If use swoole to respond request for static files
+        'handle_static_files' => true,
         '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')),
@@ -31,6 +33,8 @@
             'socket_buffer_size' => 128 * 1024 * 1024,
             // Worker will restart after processing this number of request
             'max_request' => 3000,
+            // Enable coroutine send
+            'send_yield' => true,
         ],
     ],
 

src/Server/Manager.php

@@ -240,12 +240,14 @@ public function onRequest($swooleRequest, $swooleResponse)
 
         $this->resetOnRequest();
 
+        $handleStatic = $this->container['config']->get('swoole_http.handle_static_files', true);
+
         try {
             // transform swoole request to illuminate request
             $illuminateRequest = Request::make($swooleRequest)->toIlluminate();
 
             // handle static file request first
-            if ($this->handleStaticRequest($illuminateRequest, $swooleResponse)) {
+            if ($handleStatic && $this->handleStaticRequest($illuminateRequest, $swooleResponse)) {
                 return;
             }
 
@@ -301,7 +303,7 @@ protected function handleStaticRequest($illuminateRequest, $swooleResponse)
         $publicPath = $this->container['config']->get('swoole_http.server.public_path', base_path('public'));
         $filename = $publicPath . $uri;
 
-        if (! is_file($filename)) {
+        if (! is_file($filename) || filesize($filename) === 0) {
             return;
         }
 

src/Server/Sandbox.php

@@ -19,6 +19,11 @@ class Sandbox
      */
     protected $snapshot;
 
+    /**
+     * @var \Illuminate\Config\Repository
+     */
+    protected $config;
+
     /**
      * @var boolean
      */
@@ -41,6 +46,7 @@ public static function make(Application $application)
     public function __construct(Application $application)
     {
         $this->setApplication($application);
+        $this->setInitialConfig($application);
     }
 
     /**
@@ -53,6 +59,16 @@ public function setApplication(Application $application)
         $this->application = $application;
     }
 
+    /**
+     * Set config snapshot.
+     *
+     * @param \SwooleTW\Http\Server\Application
+     */
+    protected function setInitialConfig(Application $application)
+    {
+        $this->config = clone $application->getApplication()['config'];
+    }
+
     /**
      * Get an application snapshot
      *
@@ -75,20 +91,19 @@ public function getApplication()
      */
     protected function resetLaravelApp($application)
     {
-        if ($this->isFramework('laravel')) {
-            $application->bootstrapWith([
-                'Illuminate\Foundation\Bootstrap\LoadConfiguration'
-            ]);
-        } elseif ($this->isFramework('lumen')) {
-            $reflector = new \ReflectionMethod(LumenApplication::class, 'registerConfigBindings');
-            $reflector->setAccessible(true);
-            $reflector->invoke($application);
-        }
-
+        $this->resetConfigInstance($application);
         $this->rebindRouterContainer($application);
         $this->rebindViewContainer($application);
     }
 
+    /**
+     * Reset laravel/lumen's config to initial values.
+     */
+    protected function resetConfigInstance($application)
+    {
+        $application->instance('config', clone $this->config);
+    }
+
     /**
      * Rebind laravel's container in router.
      */
@@ -98,6 +113,14 @@ protected function rebindRouterContainer($application)
             $router = $application->make('router');
             $closure = function () use ($application) {
                 $this->container = $application;
+                if (! isset($application['request'])) {
+                    return;
+                }
+                $route = $this->routes->match($application['request']);
+                // clear resolved controller
+                if (property_exists($route, 'container')) {
+                    $route->controller = null;
+                }
             };
 
             $resetRouter = $closure->bindTo($router, $router);

tests/Server/SandboxTest.php

@@ -19,8 +19,7 @@ public function testGetSandbox()
 
     public function testMakeSandbox()
     {
-        $application = m::mock(Application::class);
-        $sandbox = Sandbox::make($application);
+        $sandbox = Sandbox::make($this->getApplication());
 
         $this->assertTrue($sandbox instanceof Sandbox);
     }
@@ -55,8 +54,8 @@ protected function getSandbox()
     protected function getContainer()
     {
         $container = m::mock(Container::class);
-        $container->shouldReceive('bootstrapWith')
-            ->andReturnNull();
+        $container->shouldReceive('offsetGet')
+            ->andReturn((object)[]);
 
         return $container;
     }