Hotfix/ws (#8)

* Fixes centrifugo services

* Fixes centrifugo config

* Fixes Docker file

app/config/centrifugo.php

@@ -5,8 +5,7 @@
 use App\Centrifuge\ConnectService;
 use App\Centrifuge\RPCService;
 use App\Centrifuge\SubscribeService;
-use RoadRunner\Centrifugo\RequestType;
-use App\Centrifuge\Interceptor;
+use RoadRunner\Centrifugo\Request\RequestType;
 
 $interceptors = [
     // Interceptor\LoggingInterceptor::class,

app/src/Centrifuge/ConnectService.php

@@ -4,15 +4,15 @@
 
 namespace App\Centrifuge;
 
-use RoadRunner\Centrifugo\ConnectRequest;
 use RoadRunner\Centrifugo\Payload\ConnectResponse;
-use RoadRunner\Centrifugo\RequestInterface;
+use RoadRunner\Centrifugo\Request\Connect;
+use RoadRunner\Centrifugo\Request\RequestInterface;
 use Spiral\RoadRunnerBridge\Centrifugo\ServiceInterface;
 
 class ConnectService implements ServiceInterface
 {
     /**
-     * @param ConnectRequest $request
+     * @param Connect $request
      */
     public function handle(RequestInterface $request): void
     {

app/src/Centrifuge/RPCService.php

@@ -7,8 +7,8 @@
 use Psr\Http\Message\ServerRequestFactoryInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use RoadRunner\Centrifugo\Payload\RPCResponse;
-use RoadRunner\Centrifugo\RequestInterface;
-use RoadRunner\Centrifugo\RPCRequest;
+use RoadRunner\Centrifugo\Request\RequestInterface;
+use RoadRunner\Centrifugo\Request\RPC;
 use Spiral\Filters\Exception\ValidationException;
 use Spiral\Http\Http;
 use Spiral\RoadRunnerBridge\Centrifugo\ServiceInterface;
@@ -22,7 +22,7 @@ public function __construct(
     }
 
     /**
-     * @param RPCRequest $request
+     * @param RPC $request
      */
     public function handle(RequestInterface $request): void
     {
@@ -53,7 +53,7 @@ public function handle(RequestInterface $request): void
         }
     }
 
-    public function createHttpRequest(RPCRequest $request): ServerRequestInterface
+    public function createHttpRequest(RPC $request): ServerRequestInterface
     {
         [$method, $uri] = \explode(':', $request->method, 2);
         $method = \strtoupper($method);
@@ -66,8 +66,8 @@ public function createHttpRequest(RPCRequest $request): ServerRequestInterface
 //        }
 
         return match ($method) {
-            'GET', 'HEAD' => $httpRequest->withQueryParams($request->data),
-            'POST', 'PUT', 'DELETE' => $httpRequest->withParsedBody($request->data),
+            'GET', 'HEAD' => $httpRequest->withQueryParams($request->getData()),
+            'POST', 'PUT', 'DELETE' => $httpRequest->withParsedBody($request->getData()),
             default => throw new \InvalidArgumentException('Unsupported method'),
         };
     }

app/src/Centrifuge/SubscribeService.php

@@ -5,14 +5,14 @@
 namespace App\Centrifuge;
 
 use RoadRunner\Centrifugo\Payload\SubscribeResponse;
-use RoadRunner\Centrifugo\RequestInterface;
-use RoadRunner\Centrifugo\SubscribeRequest;
+use RoadRunner\Centrifugo\Request\RequestInterface;
+use RoadRunner\Centrifugo\Request\Subscribe;
 use Spiral\RoadRunnerBridge\Centrifugo\ServiceInterface;
 
 final class SubscribeService implements ServiceInterface
 {
     /**
-     * @param SubscribeRequest $request
+     * @param Subscribe $request
      */
     public function handle(RequestInterface $request): void
     {

docker/Dockerfile

@@ -2,7 +2,8 @@
 FROM alpine/git as git
 
 ARG REPOSITORY=https://github.com/roadrunner-server/birddog
-RUN git clone $REPOSITORY /app
+ARG BRANCH=master
+RUN git clone -b $BRANCH $REPOSITORY /app
 
 WORKDIR /app/bin
 # Download all required binaries
@@ -34,7 +35,7 @@ RUN composer config --no-plugins allow-plugins.spiral/composer-publish-plugin fa
 RUN composer install --no-dev
 
 RUN echo "Download RoadRunner"
-RUN ./vendor/bin/rr get-binary -s beta
+RUN ./vendor/bin/rr get-binary
 
 WORKDIR /app