First step towards unifying socket addresses

Author: clue

Datagram/Factory.php

@@ -19,14 +19,13 @@ public function __construct(LoopInterface $loop, Resolver $resolver = null)
         $this->resolver = $resolver;
     }
 
-    public function createClient($host, $port)
+    public function createClient($address)
     {
         $factory = $this;
         $loop = $this->loop;
 
-        return $this->resolve($host)->then(function ($ip) use ($loop, $port, $factory) {
-            $address = $factory->createAddress($ip, $port);
-            $socket = stream_socket_client('udp://' . $address, $errno, $errstr);
+        return $this->resolve($address)->then(function ($address) use ($loop) {
+            $socket = stream_socket_client($address, $errno, $errstr);
             if (!$socket) {
                 throw new Exception('Unable to create client socket: ' . $errstr, $errno);
             }
@@ -35,15 +34,13 @@ public function createClient($host, $port)
         });
     }
 
-    public function createServer($port, $host = '127.0.0.1')
+    public function createServer($address)
     {
         $factory = $this;
         $loop = $this->loop;
 
-        return $this->resolve($host)->then(function ($ip) use ($loop, $port, $factory) {
-            $address = $factory->createAddress($ip, $port);
-
-            $socket = stream_socket_server("udp://" . $address, $errno, $errstr, STREAM_SERVER_BIND);
+        return $this->resolve($address)->then(function ($address) use ($loop) {
+            $socket = stream_socket_server($address, $errno, $errstr, STREAM_SERVER_BIND);
             if (!$socket) {
                 throw new Exception('Unable to create server socket: ' . $errstr, $errno);
             }
@@ -52,8 +49,12 @@ public function createServer($port, $host = '127.0.0.1')
         });
     }
 
-    protected function resolve($host)
+    protected function resolve($address)
     {
+        if (strpos($address, '://') === false) {
+            $address = 'udp://' . $address;
+        }
+        $parts = parse_url($address);
         // there's no need to resolve if the host is already given as an IP address
         if (false !== filter_var($host, FILTER_VALIDATE_IP)) {
             return When::resolve($host);