eswyft/php-jobd-client
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Client: improve error handling, improve phpdoc

Browse Source
This commit is contained in:
Evgeny Zinoviev 2021-02-26 18:10:35 +03:00
parent c3fa113769
commit 13756f74eb
1 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/Client.php
View File

@ -20,6 +20,7 @@ class Client {
* @param int $port * @param int $port
* @param string $host * @param string $host
* @param string $password * @param string $password
* @throws \Exception
*/ */
public function __construct(int $port, string $host = '127.0.0.1', string $password = '') { public function __construct(int $port, string $host = '127.0.0.1', string $password = '') {
$this->port = $port; $this->port = $port;
@ -32,7 +33,8 @@ class Client {
} }
/** /**
* @return mixed * @return ResponseMessage
* @throws \Exception
*/ */
public function ping() { public function ping() {
$this->send(new RequestMessage('ping')); $this->send(new RequestMessage('ping'));
@ -41,7 +43,8 @@ class Client {
/** /**
* @param array $targets * @param array $targets
* @return mixed * @return ResponseMessage
* @throws \Exception
*/ */
public function poke(array $targets) { public function poke(array $targets) {
$this->send(new RequestMessage('poke', ['targets' => $targets])); $this->send(new RequestMessage('poke', ['targets' => $targets]));
@ -49,13 +52,19 @@ class Client {
} }
/** /**
* @return mixed * @return ResponseMessage
* @throws \Exception
*/ */
public function status() { public function status() {
$this->send(new RequestMessage('status')); $this->send(new RequestMessage('status'));
return $this->recv(); return $this->recv();
} }
/**
* @param array $targets
* @return ResponseMessage
* @throws \Exception
*/
public function poll(array $targets) { public function poll(array $targets) {
$this->send(new RequestMessage('poll', ['targets' => $targets])); $this->send(new RequestMessage('poll', ['targets' => $targets]));
return $this->recv(); return $this->recv();
@ -63,7 +72,7 @@ class Client {
/** /**
* @param int $id * @param int $id
* @return mixed * @return ResponseMessage
*/ */
public function runManual(int $id) { public function runManual(int $id) {
$this->send(new RequestMessage('run-manual', ['id' => $id])); $this->send(new RequestMessage('run-manual', ['id' => $id]));
@ -83,7 +92,8 @@ class Client {
} }
/** /**
* @return mixed * @return ResponseMessage
* @throws \Exception
*/ */
public function recv() { public function recv() {
$messages = []; $messages = [];
@ -113,13 +123,25 @@ class Client {
if (count($messages) > 1) if (count($messages) > 1)
trigger_error(__METHOD__.": received more than one message"); trigger_error(__METHOD__.": received more than one message");
return self::parseMessage($messages[0]); $response = self::parseMessage($messages[0]);
if (!($response instanceof ResponseMessage))
throw new \Exception('Unexpected message type');
if ($error = $response->getError())
throw new \Exception('jobd error: '.$response->getError());
return $response;
} }
/**
* @param string $raw_string
* @return RequestMessage|ResponseMessage
* @throws \Exception
*/
protected static function parseMessage(string $raw_string) { protected static function parseMessage(string $raw_string) {
$raw = json_decode($raw_string, true); $raw = json_decode($raw_string, true);
if (!is_array($raw) || count($raw) != 2) if (!is_array($raw) || count($raw) != 2)
throw new \Exception("Malformed response: {$raw_string}"); throw new \Exception("Malformed message: {$raw_string}");
list($type, $data) = $raw; list($type, $data) = $raw;
@ -140,6 +162,9 @@ class Client {
$message = new ResponseMessage(...$data); $message = new ResponseMessage(...$data);
return $message; return $message;
default:
throw new \Exception("Malformed message: unexpected type {$type}");
} }
} }