Allow http headers to be set

voryx · Mar 5, 2022 · 20563df · 20563df
1 parent da96788
commit 20563df
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -40,7 +40,7 @@
     "php": ">=7.1",
     "voryx/thruway-common": "^1.0.0",
     "reactivex/rxphp": "^2.0.4",
-    "rx/websocket": "^2.1.1"
+    "rx/websocket": "^2.1.7"
   },
   "extra": {
     "branch-alias": {

diff --git a/src/Client.php b/src/Client.php
@@ -26,7 +26,7 @@ final class Client
 
     private $currentRetryCount = 0;
 
-    public function __construct(string $url, string $realm, array $options = [], Subject $webSocket = null, Observable $messages = null, Observable $session = null, ConnectorInterface $connector = null)
+    public function __construct(string $url, string $realm, array $options = [], Subject $webSocket = null, Observable $messages = null, Observable $session = null, ConnectorInterface $connector = null, array $headers = [])
     {
         $this->disposable = new CompositeDisposable();
         $this->onClose    = new Subject();
@@ -37,7 +37,7 @@ public function __construct(string $url, string $realm, array $options = [], Sub
         $open  = new Subject();
         $close = new Subject();
 
-        $webSocket = $webSocket ?: new WebSocketSubject($url, ['wamp.2.json'], $open, $close, $connector);
+        $webSocket = $webSocket ?: new WebSocketSubject($url, ['wamp.2.json'], $open, $close, $connector, $headers);
         $messages  = $messages ?: $webSocket->retryWhen([$this, '_reconnect'])->singleInstance();
 
         //When the connection opens, send a HelloMessage

diff --git a/src/Subject/WebSocketSubject.php b/src/Subject/WebSocketSubject.php
@@ -23,14 +23,14 @@ final class WebSocketSubject extends Subject
     private $closeObserver;
     private $serializer;
 
-    public function __construct(string $url, array $protocols = [], Subject $openObserver = null, Subject $closeObserver = null, ConnectorInterface $connector = null)
+    public function __construct(string $url, array $protocols = [], Subject $openObserver = null, Subject $closeObserver = null, ConnectorInterface $connector = null, array $headers = [])
     {
         $this->openObserver  = $openObserver ?? new Subject();
         $this->closeObserver = $closeObserver ?? new Subject();
         $this->serializer    = new JsonSerializer();
         $this->sendSubject   = new ReplaySubject();
 
-        $this->ws = new Client($url, false, $protocols, getLoop(), $connector);
+        $this->ws = new Client($url, false, $protocols, getLoop(), $connector, 60000, $headers);
     }
 
     public function onNext($value)