Update Handshake

Handshake is now a value-object. The constructor now accepts Ws instances or a string.

composer.json

@@ -31,7 +31,7 @@
     "require": {
         "php": ">=7.1",
         "amphp/amp": "^2",
-        "amphp/http": "dev-master as 1.0.1",
+        "amphp/http": "dev-master as 1.1",
         "amphp/byte-stream": "^1",
         "amphp/socket": "^0.10",
         "amphp/websocket": "dev-master as 1.0",

examples/amp.php

@@ -11,8 +11,8 @@
 // Connects to the websocket endpoint in examples/broadcast-server/server.php provided in
 // amphp/websocket-server (https://github.com/amphp/websocket-server).
 Amp\Loop::run(function () {
-    $handshake = new Handshake('ws://localhost:1337/broadcast');
-    $handshake->setHeader('Origin', 'http://localhost:1337');
+    $handshake = (new Handshake('ws://localhost:1337/broadcast'))
+        ->withHeader('Origin', 'http://localhost:1337');
 
     /** @var Connection $connection */
     $connection = yield connect($handshake);

examples/kaazing-echo-demo.php

@@ -9,7 +9,7 @@
 
 Amp\Loop::run(function () {
     /** @var Connection $connection */
-    $connection = yield connect('ws://demos.kaazing.com/echo');
+    $connection = yield connect('wss://demos.kaazing.com/echo');
     yield $connection->send('Hello!');
 
     $i = 0;

src/Handshake.php

@@ -16,21 +16,27 @@ final class Handshake extends Message
     private $options;
 
     /**
-     * @param string              $uri target address of websocket (e.g. ws://foo.bar/bar or
-     *                                 wss://crypto.example/?secureConnection)
+     * @param string|Ws           $uri target address of websocket (e.g. ws://foo.bar/bar or
+     *                                 wss://crypto.example/?secureConnection) or a \League\Uri\Ws instance.
      * @param Options|null        $options
      * @param string[]|string[][] $headers
      *
+     * @throws \TypeError If $uri is not a string or and instance of \League\Uri\Ws.
      * @throws \Error If compression is enabled in the options but the zlib extension is not installed.
      */
-    public function __construct(string $uri, ?Options $options = null, array $headers = [])
+    public function __construct($uri, ?Options $options = null, array $headers = [])
     {
-        try {
-            $this->uri = Ws::createFromString($uri);
-        } catch (UriException $exception) {
-            throw new \Error('Invalid Websocket URI provided', 0, $exception);
+        if (\is_string($uri)) {
+            try {
+                $uri = Ws::createFromString($uri);
+            } catch (UriException $exception) {
+                throw new \Error('Invalid Websocket URI provided', 0, $exception);
+            }
+        } elseif (!$uri instanceof Ws) {
+            throw new \TypeError(\sprintf('Must provide an instance of %s or a URL as a string', Ws::class));
         }
 
+        $this->uri = $uri;
         $this->options = $options ?? new Options;
 
         if ($this->options->isCompressionEnabled() && !\extension_loaded('zlib')) {
@@ -57,4 +63,36 @@ public function getOptions(): Options
     {
         return $this->options;
     }
+
+    public function withHeaders(array $headers): self
+    {
+        $clone = clone $this;
+        $clone->setHeaders($headers);
+
+        return $clone;
+    }
+
+    public function withHeader(string $name, $value): self
+    {
+        $clone = clone $this;
+        $clone->setHeader($name, $value);
+
+        return $clone;
+    }
+
+    public function withAddedHeader(string $name, $value): self
+    {
+        $clone = clone $this;
+        $clone->addHeader($name, $value);
+
+        return $clone;
+    }
+
+    public function withoutHeader(string $name): self
+    {
+        $clone = clone $this;
+        $clone->removeHeader($name);
+
+        return $clone;
+    }
 }