Bolt driver

src/main/php/com/neo4j/BoltProtocol.class.php

@@ -0,0 +1,125 @@
+<?php namespace com\neo4j;
+
+use peer\Socket;
+use peer\URL;
+
+class BoltProtocol extends Protocol {
+  private $sock, $init, $serialization;
+
+  const PREAMBLE            = "\x60\x60\xb0\x17";
+  const INIT                = 0x01;
+  const ACK_FAILURE         = 0x0e;
+  const RESET               = 0x0f;
+  const RUN                 = 0x10;
+  const PULL_ALL            = 0x3f;
+  const NODE                = 0x4e;
+  const PATH                = 0x50;
+  const RELATIONSHIP        = 0x52;
+  const SUCCESS             = 0x70;
+  const RECORD              = 0x71;
+  const UNBOUNDRELATIONSHIP = 0x72;
+  const FAILURE             = 0x7f;
+  const IGNORE              = 0x7e;
+
+  /**
+   * Creates a new Neo4J graph connection
+   *
+   * @param  peer.URL $endpoint
+   */
+  public function __construct(URL $endpoint) {
+    $this->sock= new Socket($endpoint->getHost(), $endpoint->getPort(7687));
+    if ($user= $endpoint->getUser()) {
+      $this->init= ['scheme' => 'basic', 'principal' => $user, 'credentials' => $endpoint->getPassword()];
+    } else {
+      $this->init= ['scheme' => 'none'];
+    }
+    $this->serialization= new Serialization();
+  }
+
+  /** Sends a message */
+  private function send($signature, ... $args) {
+    $chunk= pack('cc', 0xb0 + sizeof($args), $signature);
+    foreach ($args as $arg) {
+      $chunk.= $this->serialization->serialize($arg);
+    }
+
+    $send= pack('n', strlen($chunk)).$chunk."\x00\x00";
+    $this->sock->write($send);
+  }
+
+  /** Receives one answer at a time */
+  private function receive() {
+    $chunk= '';
+    while ("\x00\x00" !== ($length= $this->sock->readBinary(2))) {
+      $chunk.= $this->sock->readBinary(unpack('n', $length)[1]);
+    }
+
+    return $this->serialization->unserialize($chunk);
+  }
+
+  /**
+   * Initialize communication
+   *
+   * @see    https://boltprotocol.org/v1/#handshake
+   * @return void
+   * @throws com.neo4j.UnexpectedResponse
+   */
+  private function init() {
+    $this->sock->write(self::PREAMBLE.pack('NNNN', 1, 0, 0, 0));
+    $protocol= unpack('N', $this->sock->readBinary(4));
+    if (0 === $protocol[1]) {
+      throw new UnexpectedResponse(['Protocol handshake failed, server does not support protocol version']);
+    }
+
+    $this->send(self::INIT, nameof($this), $this->init);
+    $res= $this->receive();
+    if (self::SUCCESS !== $res->signature) {
+      throw new CannotAuthenticate([$res->members['metadata']]);
+    }
+  }
+
+  /** @return [:var][] */
+  private function records() {
+    do {
+      $res= $this->receive();
+      if (self::RECORD === $res->signature) {
+        $records[]= ['row' => $res->members['fields'], 'meta' => null];  // FIXME: Fill meta
+      }
+    } while (self::RECORD === $res->signature);
+    return $records;
+  }
+
+  /**
+   * Commits multiple statements using `transaction/commit` endpoint.
+   *
+   * @param  [:var][] $payload
+   * @return [:var] Results
+   * @throws com.neo4j.UnexpectedResponse
+   */
+  public function commit($payload) {
+    if (!$this->sock->isConnected()) {
+      $this->sock->connect();
+      $this->init();
+    }
+
+    $r= ['results' => [], 'errors' => []];
+    foreach ($payload['statements'] as $s) {
+      $this->send(self::RUN, $s['statement'], isset($s['parameters']) ? $s['parameters'] : []);
+
+      $res= $this->receive();
+      if (self::FAILURE === $res->signature) {
+        $r['errors'][]= $res->members['metadata'];
+        $this->send(self::ACK_FAILURE);
+        $this->receive();
+      } else if (self::IGNORE === $res->signature) {
+        $r['errors'][]= ['Ignored'];
+        $this->send(self::RESET);
+        $this->receive();
+      } else {
+        $this->send(self::PULL_ALL);
+        $r['results'][]= ['columns' => $res->members['metadata']['fields'], 'data' => $this->records()];
+      }
+    }
+    return $r;
+  }
+}

src/main/php/com/neo4j/CannotAuthenticate.class.php

@@ -0,0 +1,8 @@
+<?php namespace com\neo4j;
+
+/**
+ * Indicates auhentication with the server failed
+ */
+class CannotAuthenticate extends UnexpectedResponse {
+
+}

src/main/php/com/neo4j/Graph.class.php

@@ -1,12 +1,5 @@
 <?php namespace com\neo4j;
 
-use peer\http\HttpConnection;
-use peer\http\HttpRequest;
-use peer\http\RequestData;
-use text\json\Json;
-use text\json\Format;
-use text\json\StreamInput;
-
 /**
  * Neo4J interface using its HTTP API
  * 
@@ -15,40 +8,16 @@
  * @test  xp://com.neo4j.unittest.GraphTest
  */
 class Graph implements \lang\Value {
-  private $conn, $cypher, $json, $base;
+  private $protocol, $cypher;
 
   /**
    * Creates a new Neo4J graph connection
    *
-   * @param  string|peer.URL|peer.http.HttpConnection $endpoint
+   * @param  string|peer.URL|com.neo4j.Protocol $endpoint
    */
   public function __construct($endpoint) {
-    $this->conn= $endpoint instanceof HttpConnection ? $endpoint : new HttpConnection($endpoint);
+    $this->protocol= $endpoint instanceof Protocol ? $endpoint : Protocol::forEndpoint($endpoint);
     $this->cypher= new Cypher();
-    $this->json= Format::dense();
-    $this->base= rtrim($this->conn->getURL()->getPath(), '/');
-  }
-
-  /**
-   * Commits multiple statements using `transaction/commit` endpoint.
-   *
-   * @param  [:var][] $payload
-   * @return [:var] Results
-   */
-  protected function commit($payload) {
-    $req= $this->conn->create(new HttpRequest());
-    $req->setMethod('POST');
-    $req->setTarget($this->base.'/transaction/commit');
-    $req->setHeader('X-Stream', 'true');
-    $req->setHeader('Content-Type', 'application/json');
-    $req->setParameters(new RequestData(Json::of($payload, $this->json)));
-
-    $res= $this->conn->send($req);
-    if (200 !== $res->statusCode()) {
-      throw new QueryFailed(['Unexpected HTTP response status '.$res->statusCode()]);
-    }
-
-    return Json::read(new StreamInput($res->in()));
   }
 
   /**
@@ -103,7 +72,7 @@ public function execute($statements) {
       $list[]= is_array($statement) ? $statement : ['statement' => $statement];
     }
 
-    $response= $this->commit(['statements' => $list]);
+    $response= $this->protocol->commit(['statements' => $list]);
     if (empty($response['errors'])) {
       return $response['results'];
     } else {

src/main/php/com/neo4j/HttpProtocol.class.php

@@ -0,0 +1,55 @@
+<?php namespace com\neo4j;
+
+use peer\URL;
+use peer\http\HttpConnection;
+use peer\http\HttpRequest;
+use peer\http\RequestData;
+use text\json\Json;
+use text\json\Format;
+use text\json\StreamInput;
+use io\IOException;
+
+class HttpProtocol extends Protocol {
+  private $conn, $json, $base;
+
+  /**
+   * Creates a new Neo4J graph connection
+   *
+   * @param  peer.URL $endpoint
+   */
+  public function __construct(URL $endpoint) {
+    $this->conn= new HttpConnection($endpoint);
+    $this->json= Format::dense();
+    $this->base= rtrim($this->conn->getURL()->getPath(), '/');
+  }
+
+  /**
+   * Commits multiple statements using `transaction/commit` endpoint.
+   *
+   * @param  [:var][] $payload
+   * @return [:var] Results
+   * @throws com.neo4j.UnexpectedResponse
+   */
+  public function commit($payload) {
+    $req= $this->conn->create(new HttpRequest());
+    $req->setMethod('POST');
+    $req->setTarget($this->base.'/transaction/commit');
+    $req->setHeader('X-Stream', 'true');
+    $req->setHeader('Content-Type', 'application/json');
+    $req->setParameters(new RequestData(Json::of($payload, $this->json)));
+
+    try {
+      $res= $this->conn->send($req);
+    } catch (IOException $e) {
+      throw new QueryFailed(['I/O error'], $e);
+    }
+
+    if (200 === $res->statusCode()) {
+      return Json::read(new StreamInput($res->in()));
+    } else if (401 === $res->statusCode()) {
+      throw new CannotAuthenticate([$res->readData()]);
+    } else {
+      throw new UnexpectedResponse(['Unexpected HTTP response status '.$res->statusCode(), $res->readData()]);
+    }
+  }
+}

src/main/php/com/neo4j/Protocol.class.php

@@ -0,0 +1,25 @@
+<?php namespace com\neo4j;
+
+use lang\IllegalArgumentException;
+use peer\URL;
+
+abstract class Protocol {
+
+  /**
+   * Factory method
+   *
+   * @param  peer.URL|string $endpoint
+   * @return self
+   */
+  public static function forEndpoint($endpoint) {
+    $url= $endpoint instanceof URL ? $endpoint : new URL($endpoint);
+    switch ($url->getScheme()) {
+      case 'http': case 'https': return new HttpProtocol($url);
+      case 'bolt': return new BoltProtocol($url);
+      default: throw new IllegalArgumentException('Unsupported protocol "'.$url->getScheme().'"');
+    }
+  }
+
+  /** Commits a payload and returns records */
+  public abstract function commit($payload);
+}

src/main/php/com/neo4j/QueryFailed.class.php

@@ -1,13 +1,8 @@
 <?php namespace com\neo4j;
 
-use lang\XPException;
-use lang\Throwable;
-use util\Objects;
+/**
+ * Indicates a Cypher query failed on the server
+ */
+class QueryFailed extends UnexpectedResponse {
 
-class QueryFailed extends XPException {
-
-  /** Creates a new instance */
-  public function __construct(array $errors, Throwable $cause= null) {
-    parent::__construct('Query failed '.Objects::stringOf($errors), $cause);
-  }
 }