Move end() logic to Buffer and simplify its logic

Author: clue

Datagram/Buffer.php

@@ -12,6 +12,7 @@ class Buffer extends EventEmitter
     private $socket;
     private $listening = false;
     private $outgoing = array();
+    private $writable = true;
 
     public function __construct(LoopInterface $loop, $socket)
     {
@@ -21,7 +22,7 @@ public function __construct(LoopInterface $loop, $socket)
 
     public function send($data, $remoteAddress = null)
     {
-        if ($this->socket === false) {
+        if ($this->writable === false) {
             return;
         }
 
@@ -70,13 +71,22 @@ public function close()
             $this->listening = false;
         }
 
+        $this->writable = false;
         $this->socket = false;
         $this->outgoing = array();
         $this->removeAllListeners();
     }
 
     public function end()
     {
+        if ($this->writable === false) {
+            return;
+        }
 
+        $this->writable = false;
+
+        if (!$this->listening) {
+            $this->close();
+        }
     }
 }

Datagram/Socket.php

@@ -11,7 +11,6 @@ class Socket extends EventEmitter implements SocketInterface
     protected $socket;
 
     protected $buffer;
-    protected $writable = true;
 
     public $bufferSize = 65536;
 
@@ -94,7 +93,6 @@ public function close()
         $this->pause();
 
         fclose($this->socket);
-        $this->writable = false;
         $this->socket = false;
         $this->buffer->close();
 
@@ -103,18 +101,6 @@ public function close()
 
     public function end()
     {
-        if (!$this->writable) {
-            return;
-        }
-
-        $this->writable = false;
-
-        $that = $this;
-
-        $this->buffer->on('close', function () use ($that) {
-            $that->close();
-        });
-
         $this->buffer->end();
     }
 

Datagram/SocketInterface.php

@@ -10,7 +10,6 @@
  * @event message($data, $remoteAddress, $thisSocket)
  * @event error($exception, $thisSocket)
  * @event close($thisSocket)
- * @event end($thisSocket);
  */
 interface SocketInterface extends EventEmitterInterface
 {