Client ctor now accepts a single SOCKS URI as first argument

Author: clue

README.md

@@ -20,7 +20,7 @@ include_once __DIR__.'/vendor/autoload.php';
 $loop = React\EventLoop\Factory::create();
 
 // create SOCKS client which communicates with SOCKS server 127.0.0.1:9050
-$client = new Clue\React\Socks\Client($loop, '127.0.0.1', 9050);
+$client = new Clue\React\Socks\Client('127.0.0.1:9050', $loop);
 
 // now work with your $client, see below
 

examples/client.php

@@ -9,7 +9,7 @@
 
 $loop = React\EventLoop\Factory::create();
 
-$client = new Client($loop, '127.0.0.1', $port);
+$client = new Client('127.0.0.1:' . $port, $loop);
 $client->setTimeout(3.0);
 $client->setResolveLocal(false);
 // $client->setProtocolVersion(5);

examples/server-advanced-outgoing/server-forward-random-pool.php

@@ -16,15 +16,15 @@
 $connector = new ConnectionManagerRandom();
 
 // forward to socks server listening on 127.0.0.1:9051
-$client = new Client($loop, '127.0.0.1', 9051);
+$client = new Client('127.0.0.1:9051', $loop);
 $connector->addConnectionManager($client->createConnector());
 
 // forward to socks server listening on 127.0.0.1:9052
-$client = new Client($loop, '127.0.0.1', 9052);
+$client = new Client('127.0.0.1:9052', $loop);
 $connector->addConnectionManager($client->createConnector());
 
 // forward to socks server listening on 127.0.0.1:9053
-$client = new Client($loop, '127.0.0.1', 9053);
+$client = new Client('127.0.0.1:9053', $loop);
 $connector->addConnectionManager($client->createConnector());
 
 // start the server socket listening on localhost:$port for incoming socks connections

examples/server-middleman.php

@@ -12,8 +12,8 @@
 $loop = React\EventLoop\Factory::create();
 
 // set next SOCKS server localhost:$otherPort as target
-$target = new Client($loop, '127.0.0.1', $otherPort);
-$target->setAuth('user','p@ssw0rd');
+$target = new Client('127.0.0.1:' . $otherPort, $loop);
+$target->setAuth('user', 'p@ssw0rd');
 
 // listen on localhost:$myPort
 $socket = new Socket($loop);

src/Client.php

@@ -46,8 +46,19 @@ class Client
 
     protected $auth = null;
 
-    public function __construct(LoopInterface $loop, $socksHost, $socksPort, ConnectorInterface $connector = null, Resolver $resolver = null)
+    public function __construct($socksUrl, LoopInterface $loop, ConnectorInterface $connector = null, Resolver $resolver = null)
     {
+        // assume default scheme if none is given
+        if (strpos($socksUrl, '://') === false) {
+            $socksUrl = 'socks://' . $socksUrl;
+        }
+
+        // parse URL into individual parts
+        $parts = parse_url($socksUrl);
+        if (!$parts || !isset($parts['scheme'], $parts['host'], $parts['port'])) {
+            throw new \InvalidArgumentException('Invalid SOCKS URL');
+        }
+
         if ($resolver === null) {
             // default to using Google's public DNS server
             $dnsResolverFactory = new DnsFactory();
@@ -58,8 +69,8 @@ public function __construct(LoopInterface $loop, $socksHost, $socksPort, Connect
         }
 
         $this->loop = $loop;
-        $this->socksHost = $socksHost;
-        $this->socksPort = $socksPort;
+        $this->socksHost = $parts['host'];
+        $this->socksPort = $parts['port'];
         $this->connector = $connector;
         $this->resolver = $resolver;
 

tests/ClientTest.php

@@ -4,13 +4,33 @@
 
 class ClientTest extends TestCase
 {
+    private $loop;
+
     /** @var  Client */
     private $client;
 
     public function setUp()
     {
-        $loop = React\EventLoop\Factory::create();
-        $this->client = new Client($loop, '127.0.0.1', 9050);
+        $this->loop = React\EventLoop\Factory::create();
+        $this->client = new Client('127.0.0.1:9050', $this->loop);
+    }
+
+    public function testCtorAcceptsUriWithHostAndPort()
+    {
+        $client = new Client('127.0.0.1:9050', $this->loop);
+    }
+
+    public function testCtorAcceptsUriWithScheme()
+    {
+        $client = new Client('socks://127.0.0.1:9050', $this->loop);
+    }
+
+    /**
+     * @expectedException InvalidArgumentException
+     */
+    public function testCtorThrowsForInvalidUri()
+    {
+        new Client('12345', $this->loop);
     }
 
     /**

tests/FunctionalTest.php

@@ -20,7 +20,7 @@ public function setUp()
         $this->assertNotEquals(0, $port);
 
         $this->server = new Server($this->loop, $socket);
-        $this->client = new Client($this->loop, '127.0.0.1', $port);
+        $this->client = new Client('127.0.0.1:' . $port, $this->loop);
     }
 
     public function testConnection()