Connection: keep-alive

src/main/php/peer/http/Authorizations.class.php

@@ -1,6 +1,5 @@
 <?php namespace peer\http;
 
-use lang\Object;
 use lang\XPClass;
 use lang\reflect\TargetInvocationException;
 use util\Secret;

src/main/php/peer/http/Channel.class.php

@@ -0,0 +1,95 @@
+<?php namespace peer\http;
+
+use peer\SocketInputStream;
+
+class Channel implements \io\streams\InputStream {
+  private $socket;
+  private $reuseable= null;
+
+  /** @param peer.Socket */
+  public function __construct($socket) {
+    $this->socket= $socket;
+  }
+
+  /** @return peer.Socket */
+  public function socket() { return $this->socket; }
+
+  /**
+   * Rebinds to a new socket, closing the existing one if necessary
+   *
+   * @param  peer.Socket
+   * @return void
+   */
+  public function bind($socket) {
+    if ($this->socket->isConnected()) {
+      $this->socket->close();
+    }
+    $this->socket= $socket;
+  }
+
+  /**
+   * Disconnect (if necessary)
+   *
+   * @return void
+   */
+  public function disconnect() {
+    $this->socket->isConnected() && $this->socket->close();
+  }
+
+  /**
+   * Sends a request and returns the response
+   *
+   * @param  peer.http.HttpRequest $request
+   * @param  float $connectTimeout
+   * @param  float $readTimeout
+   * @return peer.http.HttpResponse
+   */
+  public function send($request, $connectTimeout, $readTimeout) {
+
+    // Previous call didn't finish reading all data, connection is not reusable
+    if (false === $this->reuseable) {
+      $this->socket->close();
+    }
+
+    do {
+      if ($this->socket->isConnected()) {
+        $reused= true;
+      } else {
+        $reused= false;
+        $this->socket->setTimeout($readTimeout);
+        $this->socket->connect($connectTimeout);
+      }
+
+      $this->socket->write($request->getRequestString());
+      $this->reuseable= false;
+      $input= new HttpInputStream($this, function() { $this->reuseable= true; });
+
+      // If we reused the connection and we receive EOF, disconnect & retry
+      $line= $input->readLine();
+      if ($this->socket->eof()) {
+        if (!$reused) throw new SocketException('Received EOF (timeout: '.$readTimeout.' seconds)');
+        $this->socket->close();
+        continue;
+      }
+
+      // Success
+      $input->pushBack($line."\r\n");
+      return new HttpResponse($input, true);
+    } while (true);
+  }
+
+  /** @return int */
+  public function available() {
+    return $this->socket->eof() ? 0 : 1;
+  }
+
+  /** @return string */
+  public function read($limit= 8192) {
+    return $this->socket->readBinary($limit);
+  }
+
+  /** @return void */
+  public function close() {
+    // NOOP
+  }
+}

src/main/php/peer/http/HttpConnection.class.php

@@ -2,6 +2,7 @@
 
 use peer\URL;
 use util\log\Traceable;
+use lang\Closeable;
 
 /**
  * HTTP connection
@@ -26,7 +27,7 @@
  * @see   rfc://2616
  * @test  xp://net.xp_framework.unittest.peer.HttpTest
  */
-class HttpConnection implements Traceable {
+class HttpConnection implements Traceable, Closeable {
   protected
     $url          = null,
     $transport    = null,
@@ -260,4 +261,9 @@ public function trace($arg= null, $headers= []) {
   public function setTrace($cat) {
     $this->transport->setTrace($cat);
   }
+
+  /** @return void */
+  public function close() {
+    $this->transport->close();
+  }
 }

src/main/php/peer/http/HttpInputStream.class.php

@@ -8,74 +8,84 @@
  * @test  xp://peer.http.unittest.HttpInputStreamTest
  */
 class HttpInputStream implements InputStream {
-  protected
-    $response  = null,
-    $buffer    = '',
-    $available = 0;
-
+  private $stream;
+  private $buffer= '';
+
   /**
    * Constructor
    *
-   * @param   peer.http.HttpResponse $response
+   * @param  io.streams.InputStream
+   * @param  callable $consumed Optional callback when stream is completely consumed
    */
-  public function __construct(HttpResponse $response) {
-    $this->response= $response;
+  public function __construct(InputStream $stream, $consumed= null) {
+    $this->stream= $stream;
+    $this->consumed= $consumed;
   }
-  
+
   /**
-   * Buffer a chunk if necessary
+   * Put given bytes back into read buffer
    *
-   * @return  int available
+   * @param  string $bytes
+   * @return void
    */
-  protected function buffer() {
-    if (($l= strlen($this->buffer)) > 0) return $l;
-    if (false === ($chunk= $this->response->readData(8192, true))) {
-      $this->available= -1;
-      return 0;
+  public function pushBack($bytes) {
+    $this->buffer= $bytes.$this->buffer;
+  }
+
+  /** @param callable $consumed */
+  public function callback($consumed) {
+    $this->consumed= $consumed;
+  }
+
+  /** @return void */
+  public function consumed() {
+    if ($f= $this->consumed) $f();
+  }
+
+  /** @return bool */
+  public function available() {
+    if ('' === $this->buffer) {
+      return $this->stream->available();
     } else {
-      $this->buffer.= $chunk;
-      $this->available= strlen($this->buffer);
-      return $this->available;
+      return strlen($this->buffer);
     }
   }
 
-  /**
-   * Read a string
-   *
-   * @param   int $limit default 8192
-   * @return  string
-   */
+  /** @return string */
   public function read($limit= 8192) {
-    if (-1 === $this->available) return null;   // At end
-    $this->buffer();
-    $b= substr($this->buffer, 0, $limit);
-    $this->buffer= substr($this->buffer, $limit);
-    return $b;
+    if (null === $this->buffer) {
+      return null;    // EOF
+    } else if ('' === $this->buffer) {
+      $chunk= $this->stream->read($limit);
+      return '' == $chunk ? null : $chunk;
+    } else {
+      $return= substr($this->buffer, 0, $limit);
+      $this->buffer= (string)substr($this->buffer, $limit);
+      return $return;
+    }
   }
 
-  /**
-   * Returns the number of bytes that can be read from this stream 
-   * without blocking.
-   *
-   * @return  int
-   */
-  public function available() {
-    return (-1 === $this->available) ? 0 : $this->buffer();
-  }
+  /** @return string */
+  public function readLine() {
+    if (null === $this->buffer) return null;    // EOF
 
-  /**
-   * Close this buffer
-   */
-  public function close() {
-    $this->response->closeStream();
+    while (false === ($p= strpos($this->buffer, "\r\n"))) {
+      $chunk= $this->stream->read();
+      if ('' == $chunk) {
+        $return= $this->buffer;
+        $this->buffer= null;
+        return $return;
+      }
+      $this->buffer.= $chunk;
+    }
+
+    $return= substr($this->buffer, 0, $p);
+    $this->buffer= substr($this->buffer, $p + 2);
+    return $return;
   }
 
-  /**
-   * Creates a string representation of this Http
-   *
-   * @return  string
-   */
-  public function toString() {
-    return nameof($this).'<'.$this->response->toString().'>';
+  /** @return voud */
+  public function close() {
+    $this->stream->close();
   }
-}
+}