Accidentally checked for "reply" prop instead of "result"

[irc/unrealircd/unrealircd-rpc-php.git] / lib / Connection.php

diff --git a/lib/Connection.php b/lib/Connection.php
index 4b12361be44fde1f2cbdd3c06e3e9f1ce805044c..3b0066c03450d47a9e82c169e1927293353f62aa 100644 (file)
--- a/lib/Connection.php
+++ b/lib/Connection.php
@@ -1,48 +1,73 @@
 <?php
 
-namespace UnrealIRCdRPC;
+namespace UnrealIRCd;
 
+use Exception;
 use WebSocket;
 
 class Connection
 {
-       protected $conn;
-
-       public function __construct(string $uri, string $api_login, array $options = [])
-       {
-               if (isset($options["context"]))
-                       $context = $options["context"];
-               else
-                       $context = stream_context_create();
-
-               if (isset($options["tls_verify"]) && ($options["tls_verify"] == FALSE))
-               {
-                       stream_context_set_option($context, 'ssl', 'verify_peer', false);
-                       stream_context_set_option($context, 'ssl', 'verify_peer_name', false);
-               }
-
-               $this->conn = new WebSocket\Client($uri, [
-                       'context' => $context,
-                       'headers' => [
-                               'Authorization' => 'Basic '.base64_encode($api_login),
-                       ],
-                       'timeout' => 10,
-               ]);
-
-       }
-
-       public function query(string $method, array $params = [])
-       {
-               $rpc = Array("jsonrpc" => "2.0",
-                            "method" => $method,
-                            "params" => $params,
-                            "id" => 123);
-               $json_rpc = json_encode($rpc);
-               $this->conn->text($json_rpc);
-               $reply = $this->conn->receive();
-               $reply = json_decode($reply);
-               if ($reply->response)
-                       return $reply->response;
-               return FALSE; // throw error?
-       }
+    protected WebSocket\Client $connection;
+
+    public function __construct(string $uri, string $api_login, array $options = null)
+    {
+        $context = $options["context"] ?? stream_context_create();
+
+        if (isset($options["tls_verify"]) && !$options["tls_verify"]) {
+            stream_context_set_option($context, 'ssl', 'verify_peer', false);
+            stream_context_set_option($context, 'ssl', 'verify_peer_name', false);
+        }
+
+        $this->connection = new WebSocket\Client($uri, [
+            'context' => $context,
+            'headers' => [
+                'Authorization' => sprintf('Basic %s', base64_encode($api_login)),
+            ],
+            'timeout' => 10,
+        ]);
+
+    }
+
+    /**
+     * Encode and send a query to the RPC server.
+     *
+     * @note I'm not sure on the response type except that it may be either an object or array.
+     *
+     * @param  string  $method
+     * @param  array|null  $params
+     *
+     * @return object|array|bool
+     * @throws Exception
+     */
+    public function query(string $method, array|null $params = null): object|array|bool
+    {
+        $id = random_int(1, 99999);
+
+        $rpc = [
+            "jsonrpc" => "2.0",
+            "method" => $method,
+            "params" => $params,
+            "id" => $id
+        ];
+
+        $json_rpc = json_encode($rpc);
+
+        $this->connection->text($json_rpc);
+        $reply = $this->connection->receive();
+
+        $reply = json_decode($reply);
+
+        if (property_exists($reply, 'result')) {
+            if($id !== $reply->id) {
+                throw new Exception('Invalid ID. This is not the expected reply.');
+            }
+            return $reply->response;
+        }
+
+        if(property_exists($reply, 'error')) {
+            return $reply->error;
+        }
+
+        return false;
+    }
 }