Feature/websocket feature

.travis.yml

@@ -4,26 +4,6 @@ sudo: false
 
 matrix:
   include:
-    - php: 7.0
-      env: FRAMEWORK_VERSION=laravel/framework:5.1.*
-    - php: 7.0
-      env: FRAMEWORK_VERSION=laravel/framework:5.2.*
-    - php: 7.0
-      env: FRAMEWORK_VERSION=laravel/framework:5.3.*
-    - php: 7.0
-      env: FRAMEWORK_VERSION=laravel/framework:5.4.*
-    - php: 7.0
-      env: FRAMEWORK_VERSION=laravel/framework:5.5.*
-    - php: 7.0
-      env: FRAMEWORK_VERSION=laravel/lumen-framework:5.1.*
-    - php: 7.0
-      env: FRAMEWORK_VERSION=laravel/lumen-framework:5.2.*
-    - php: 7.0
-      env: FRAMEWORK_VERSION=laravel/lumen-framework:5.3.*
-    - php: 7.0
-      env: FRAMEWORK_VERSION=laravel/lumen-framework:5.4.*
-    - php: 7.0
-      env: FRAMEWORK_VERSION=laravel/lumen-framework:5.5.*
     - php: 7.1
       env: FRAMEWORK_VERSION=laravel/framework:5.1.*
     - php: 7.1
@@ -66,10 +46,10 @@ matrix:
       env: FRAMEWORK_VERSION=laravel/lumen-framework:5.5.*
 
 before_install:
-  - pecl install swoole
+  - printf "\n" | pecl install swoole
 
 install:
   - composer require "${FRAMEWORK_VERSION}" --no-update -n
   - travis_retry composer install --no-suggest --prefer-dist -n -o
 
-script: vendor/bin/phpunit
+script: vendor/bin/phpunit

composer.json

@@ -14,14 +14,17 @@
         }
     ],
     "require": {
+        "php": "^7.1",
         "illuminate/console": "~5.1",
         "illuminate/contracts": "~5.1",
         "illuminate/http": "~5.1",
         "illuminate/support": "~5.1"
     },
     "require-dev": {
         "laravel/lumen-framework": "~5.1",
-        "phpunit/phpunit": "~6.0"
+        "phpunit/phpunit": "^6.1",
+        "mockery/mockery": "~1.0",
+        "codedungeon/phpunit-result-printer": "^0.14.0"
     },
     "autoload": {
         "psr-4": {

config/swoole_http.php

@@ -1,5 +1,7 @@
 <?php
 
+use Swoole\Table;
+
 return [
     /*
     |--------------------------------------------------------------------------
@@ -15,10 +17,37 @@
         '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')),
-            'daemonize' => env('SWOOLE_HTTP_DAEMONIZE', 0),
+            'daemonize' => env('SWOOLE_HTTP_DAEMONIZE', false),
+            'task_worker_num' => env('SWOOLE_HTTP_TASK_WORKER_NUM', 4)
         ],
     ],
+
+    'websocket' => [
+        'enabled' => env('SWOOLE_HTTP_WEBSOCKET', false),
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Providers here will be registered on every request.
+    |--------------------------------------------------------------------------
+    */
     'providers' => [
         // App\Providers\AuthServiceProvider::class,
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Define your swoole tables here.
+    |
+    | @see https://wiki.swoole.com/wiki/page/p-table.html
+    |--------------------------------------------------------------------------
+    */
+    'tables' => [
+        // 'table_name' => [
+        //     'size' => 1024,
+        //     'columns' => [
+        //         ['name' => 'column_name', 'type' => Table::TYPE_STRING, 'size' => 1024],
+        //     ]
+        // ],
     ]
 ];

config/swoole_websocket.php

@@ -0,0 +1,59 @@
+<?php
+
+return [
+    /*
+    |--------------------------------------------------------------------------
+    | Websocket handler for onOpen and onClose callback
+    | Replace this handler before you start it
+    |--------------------------------------------------------------------------
+    */
+    'handler' => SwooleTW\Http\Websocket\WebsocketHandler::class,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Websocket handlers mapping for onMessage callback
+    |--------------------------------------------------------------------------
+    */
+    'handlers' => [
+        // 'event_name' => 'App\Handlers\ExampleHandler@function',
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default websocket driver
+    |--------------------------------------------------------------------------
+    */
+    'default' => 'table',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default message formatter
+    | Replace it if you want to customize your websocket payload
+    |--------------------------------------------------------------------------
+    */
+    'formatter' => SwooleTW\Http\Websocket\Formatters\DefaultFormatter::class,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Drivers mapping
+    |--------------------------------------------------------------------------
+    */
+    'drivers' => [
+        'table' => SwooleTW\Http\Websocket\Rooms\TableRoom::class,
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Drivers settings
+    |--------------------------------------------------------------------------
+    */
+    'settings' => [
+
+        'table' => [
+            'room_rows' => 4096,
+            'room_size' => 2048,
+            'client_rows' => 8192,
+            'client_size' => 2048
+        ]
+    ],
+];

phpunit.xml.dist

@@ -14,7 +14,7 @@
          stopOnError="false"
          stopOnFailure="false"
          verbose="true"
->
+         printerClass="Codedungeon\PHPUnitPrettyResultPrinter\Printer">
     <testsuites>
         <testsuite name="Laravel Swoole Http Test Suite">
             <directory suffix="Test.php">./tests</directory>

src/Commands/HttpServerCommand.php

@@ -176,13 +176,21 @@ protected function showInfos()
     {
         $pid = $this->getPid();
         $isRunning = $this->isRunning($pid);
+        $host = $this->configs['server']['host'];
+        $port = $this->configs['server']['port'];
+        $isWebsocket = $this->configs['websocket']['enabled'];
+        $logFile = $this->configs['server']['options']['log_file'];
 
         $this->table(['Name', 'Value'], [
             ['PHP Version', 'Version' => phpversion()],
             ['Swoole Version', 'Version' => swoole_version()],
             ['Laravel Version', $this->getApplication()->getVersion()],
             ['Server Status', $isRunning ? 'Online' : 'Offline'],
+            ['Listen IP', $host],
+            ['Listen Port', $port],
+            ['Websocket Mode', $isWebsocket ? 'On' : 'Off'],
             ['PID', $isRunning ? $pid : 'None'],
+            ['Log Path', $logFile],
         ]);
     }
 

src/HttpServiceProvider.php

@@ -2,8 +2,8 @@
 
 namespace SwooleTW\Http;
 
-use SwooleTW\Http\Commands\HttpServerCommand;
 use Illuminate\Support\ServiceProvider;
+use SwooleTW\Http\Commands\HttpServerCommand;
 
 abstract class HttpServiceProvider extends ServiceProvider
 {
@@ -21,7 +21,7 @@ abstract class HttpServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->mergeConfig();
+        $this->mergeConfigs();
         $this->registerManager();
         $this->registerCommands();
     }
@@ -41,16 +41,18 @@ abstract protected function registerManager();
     public function boot()
     {
         $this->publishes([
-            __DIR__ . '/../config/swoole_http.php' => base_path('config/swoole_http.php')
+            __DIR__ . '/../config/swoole_http.php' => base_path('config/swoole_http.php'),
+            __DIR__ . '/../config/swoole_websocket.php' => base_path('config/swoole_websocket.php')
         ], 'config');
     }
 
     /**
      * Merge configurations.
      */
-    protected function mergeConfig()
+    protected function mergeConfigs()
     {
         $this->mergeConfigFrom(__DIR__ . '/../config/swoole_http.php', 'swoole_http');
+        $this->mergeConfigFrom(__DIR__ . '/../config/swoole_websocket.php', 'swoole_websocket');
     }
 
     /**

src/Server/Facades/Server.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace SwooleTW\Http\Server\Facades;
+
+use Illuminate\Support\Facades\Facade;
+
+class Server extends Facade
+{
+    /**
+     * Get the registered name of the component.
+     *
+     * @return string
+     */
+    protected static function getFacadeAccessor()
+    {
+        return 'swoole.server';
+    }
+}

src/Server/Facades/Table.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace SwooleTW\Http\Server\Facades;
+
+use Illuminate\Support\Facades\Facade;
+
+class Table extends Facade
+{
+    /**
+     * Get the registered name of the component.
+     *
+     * @return string
+     */
+    protected static function getFacadeAccessor()
+    {
+        return 'swoole.table';
+    }
+}