Remove Factory, create instances of Client and Server

Author: clue

README.md

@@ -19,13 +19,8 @@ include_once __DIR__.'/vendor/autoload.php';
 
 $loop = React\EventLoop\Factory::create();
 
-// use google's dns servers
-$dnsResolverFactory = new React\Dns\Resolver\Factory();
-$dns = $dnsResolverFactory->createCached('8.8.8.8', $loop);
-
 // create SOCKS client which communicates with SOCKS server 127.0.0.1:9050
-$factory = new Clue\React\Socks\Factory($loop, $dns);
-$client = $factory->createClient('127.0.0.1', 9050);
+$client = new Clue\React\Socks\Client($loop, '127.0.0.1', 9050);
 
 // now work with your $client, see below
 
@@ -34,7 +29,7 @@ $loop->run();
 
 ### Tunnelled TCP connections
 
-The `Socks/Client` uses a [Promise](https://github.com/reactphp/promise)-based interface which makes working with asynchronous functions a breeze.
+The `Client` uses a [Promise](https://github.com/reactphp/promise)-based interface which makes working with asynchronous functions a breeze.
 Let's open up a TCP [Stream](https://github.com/reactphp/stream) connection and write some data:
 ```PHP
 $tcp = $client->createConnector();
@@ -223,7 +218,7 @@ If you already have an SSH server set up, you can easily use it as a SOCKS tunne
 `$ ssh -D 9050 ssh-server`
 
 ```PHP
-$client = $factory->createClient('127.0.0.1', 9050);
+$client = new Client($loop, '127.0.0.1', 9050);
 ```
 
 ### Using the Tor (anonymity network) to tunnel SOCKS connections
@@ -232,7 +227,7 @@ The [Tor anonymity network](http://www.torproject.org) client software is design
 
 ```PHP
 
-$client = $factory->createClient('127.0.0.1', 9050);
+$client = new Client($loop, '127.0.0.1', 9050);
 $client->setResolveLocal(false);
 ```
 

examples/client.php

@@ -3,17 +3,13 @@
 use ConnectionManager\SecureConnectionManager;
 use React\Promise\PromiseInterface;
 use React\Stream\Stream;
+use Clue\React\Socks\Client;
 
 include_once __DIR__.'/../vendor/autoload.php';
 
 $loop = React\EventLoop\Factory::create();
 
-$dnsResolverFactory = new React\Dns\Resolver\Factory();
-$dns = $dnsResolverFactory->createCached('8.8.8.8', $loop);
-
-$factory = new Clue\React\Socks\Factory($loop, $dns);
-
-$client = $factory->createClient('127.0.0.1', 9051);
+$client = new Client($loop, '127.0.0.1', 9051);
 $client->setTimeout(3.0);
 $client->setResolveLocal(false);
 //$client->setProtocolVersion(5);

examples/server-middleman.php

@@ -1,23 +1,20 @@
 <?php
 
+use Clue\React\Socks\Client;
+use Clue\React\Socks\Server;
 include_once __DIR__.'/../vendor/autoload.php';
 
 $loop = React\EventLoop\Factory::create();
 
-$dnsResolverFactory = new React\Dns\Resolver\Factory();
-$dns = $dnsResolverFactory->createCached('8.8.8.8', $loop);
-
-$factory = new Clue\React\Socks\Factory($loop, $dns);
-
 // set next SOCKS server as target
-$target = $factory->createClient('127.0.0.1',9050);
+$target = new Client($loop, '127.0.0.1',9050);
 $target->setAuth('user','p@ssw0rd');
 
 // start a new server which forwards all connections to another SOCKS server
 $socket = new React\Socket\Server($loop);
-$server = new Clue\React\Socks\Server($socket, $loop, $target->createConnector());
+$socket->listen(9051, 'localhost');
 
-$socket->listen('9051','localhost');
+$server = new Server($loop, $socket, $target->createConnector());
 
 echo 'SOCKS server listening on localhost:9051 (which forwards everything to SOCKS server 127.0.0.1:9050)' . PHP_EOL;
 

examples/server.php

@@ -1,17 +1,14 @@
 <?php
 
+use Clue\React\Socks\Server;
 include_once __DIR__.'/../vendor/autoload.php';
 
 $loop = React\EventLoop\Factory::create();
 
-$dnsResolverFactory = new React\Dns\Resolver\Factory();
-$dns = $dnsResolverFactory->createCached('8.8.8.8', $loop);
-
 $socket = new React\Socket\Server($loop);
 $socket->listen('9050','localhost');
 
-$factory = new Clue\React\Socks\Factory($loop, $dns);
-$server = $factory->createServer($socket);
+$server = new Server($loop, $socket);
 $server->setAuthArray(array(
     'tom' => 'god',
     'user' => 'p@ssw0rd'

src/Factory.php

@@ -1,6 +1,5 @@
 <?php
 
-use Clue\React\Socks;
 use Clue\React\Socks\Client;
 
 class ClientApiTest extends TestCase
@@ -11,13 +10,7 @@ class ClientApiTest extends TestCase
     public function setUp()
     {
         $loop = React\EventLoop\Factory::create();
-
-        $dnsResolverFactory = new React\Dns\Resolver\Factory();
-        $dns = $dnsResolverFactory->createCached('8.8.8.8', $loop);
-
-        $factory = new Socks\Factory($loop, $dns);
-
-        $this->client = $factory->createClient('127.0.0.1', 9050);
+        $this->client = new Client($loop, '127.0.0.1', 9050);
     }
 
     /**

tests/ClientApiTest.php

@@ -1,21 +1,16 @@
 <?php
 
-use Clue\React\Socks\Factory;
 use React\Stream\Stream;
+use Clue\React\Socks\Client;
+use Clue\React\Socks\Server;
 
 class PairTest extends TestCase
 {
     private $loop;
-    private $factory;
 
     public function setUp()
     {
         $this->loop = React\EventLoop\Factory::create();
-
-        $dnsResolverFactory = new React\Dns\Resolver\Factory();
-        $dns = $dnsResolverFactory->createCached('8.8.8.8', $this->loop);
-
-        $this->factory = new Factory($this->loop, $dns);
     }
 
     public function testClientConnection()
@@ -24,14 +19,14 @@ public function testClientConnection()
         $port = $socket->getPort();
         $this->assertNotEquals(0, $port);
 
-        $server = $this->factory->createServer($socket);
+        $server = new Server($this->loop, $socket);
 
         $server->on('connection', function () use ($socket) {
             // close server socket once first connection has been established
             $socket->shutdown();
         });
 
-        $client = $this->factory->createClient('127.0.0.1', $port);
+        $client = new Client($this->loop, '127.0.0.1', $port);
 
         $that = $this;
         $client->getConnection('www.google.com', 80)->then(