noccy
/
react-command-bus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed message parsing bug

This commit is contained in:
Chris 2024-03-01 21:48:28 +01:00
parent c4f3e8ae50
commit b2494c3163
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/CommandBus.php
View File

@ -51,8 +51,10 @@ class CommandBus implements CommandBusInterface
$this->connections->attach($client);
$client->on('data', function ($data) use ($client) {
try {
$message = Message::fromString($data);
$this->onClientMessage($client, $message);
$messages = Message::fromStringMulti($data);
foreach ($messages as $message) {
$this->onClientMessage($client, $message);
}
} catch (MessageException $e) {
$client->end('{"msg":"error","data":{"error":"Bad message format"}}');
}
@ -71,6 +73,9 @@ class CommandBus implements CommandBusInterface
$this->executeContext($context)->then(
function ($result) use ($message, $client) {
$client->write($message->asResult($result)->toJson()."\n");
},
function (\Throwable $error) use ($message, $client) {
$client->write($message->asError($error->getMessage())->toJson()."\n");
}
);
break;

9
src/CommandBusClient.php
View File

@ -74,7 +74,8 @@ class CommandBusClient implements CommandBusInterface
$this->connection = $connection;
$this->emit(self::EVENT_CONNECTED);
$connection->on('error', function ($error) {
$this->emit(self::EVENT_DISCONNECTED, [ $error ]);
$this->emit(self::EVENT_ERROR, [ $error ]);
$this->emit(self::EVENT_DISCONNECTED);
if ($this->autoReconnect) {
Loop::addTimer(1, $this->reconnect(...));
}
@ -89,8 +90,10 @@ class CommandBusClient implements CommandBusInterface
});
$connection->on('data', function ($data) use ($connection) {
try {
$message = Message::fromString($data);
$this->onServerMessage($message);
$messages = Message::fromStringMulti($data);
foreach ($messages as $message) {
$this->onServerMessage($message);
}
} catch (MessageException $e) {
$connection->end('{"msg":"error","data":{"error":"Bad message format"}}');
}

12
src/Message.php
View File

@ -66,6 +66,11 @@ class Message implements JsonSerializable
return new Message($json['msg'], $json['data'], $json['uuid']??false);
}
public static function fromStringMulti(string $data): array
{
return array_map(fn($v) => Message::fromString($v), array_filter(explode("\n", $data)));
}
public function asResult($result): Message
{
return new Message(self::MSGTYPE_RESULT, [
@ -73,6 +78,13 @@ class Message implements JsonSerializable
], $this->uuid);
}
public function asError($error): Message
{
return new Message(self::MSGTYPE_ERROR, [
'error' => $error
], $this->uuid);
}
public function toJson(): string
{
return json_encode($this, JSON_UNESCAPED_SLASHES);