nsq/nsqphp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Send client_id, hostname and user_agent to NSQ on connect

Browse Source
This commit is contained in:
Konstantin Grachev
2021-01-23 00:34:15 +03:00
parent fb7857291e
commit eaab94286d
2 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@ -14,6 +14,7 @@
"php": ">=7.4", "php": ">=7.4",
"ext-json": "*", "ext-json": "*",
"clue/socket-raw": "^1.5", "clue/socket-raw": "^1.5",
"composer/semver": "^3.2",
"phpinnacle/buffer": "^1.2" "phpinnacle/buffer": "^1.2"
}, },
"require-dev": { "require-dev": {

44
src/Connection.php
View File

@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Nsq; namespace Nsq;
use Composer\InstalledVersions;
use PHPinnacle\Buffer\ByteBuffer; use PHPinnacle\Buffer\ByteBuffer;
use Socket\Raw\Factory; use Socket\Raw\Factory;
use Socket\Raw\Socket; use Socket\Raw\Socket;
@ -31,7 +32,6 @@ abstract class Connection
protected const BYTES_ATTEMPTS = 2; protected const BYTES_ATTEMPTS = 2;
protected const BYTES_TIMESTAMP = 8; protected const BYTES_TIMESTAMP = 8;
protected const BYTES_ID = 16; protected const BYTES_ID = 16;
private const MAGIC_V2 = ' V2';
public ?Socket $socket = null; public ?Socket $socket = null;
@ -39,18 +39,35 @@ abstract class Connection
private Config $config; private Config $config;
public function __construct(string $address) /**
{ * @var array{client_id: string, hostname: string, user_agent: string}
*/
private array $features;
public function __construct(
string $address,
string $clientId = null,
string $hostname = null,
string $userAgent = null
) {
$this->config = new Config($address); $this->config = new Config($address);
$this->features = [
'client_id' => $clientId ?? '',
'hostname' => $hostname ?? '',
'user_agent' => $userAgent ?? 'nsqphp/'.InstalledVersions::getPrettyVersion('nsq/nsq'),
];
} }
/**
* @psalm-suppress UnsafeInstantiation
*/
public function connect(): void public function connect(): void
{ {
$this->socket = (new Factory())->createClient($this->config->address); $this->socket = (new Factory())->createClient($this->config->address);
$this->socket->write(self::MAGIC_V2); $this->send(' V2');
$body = json_encode($this->features, JSON_THROW_ON_ERROR | JSON_FORCE_OBJECT);
$size = pack('N', \strlen($body));
$this->send('IDENTIFY '.PHP_EOL.$size.$body)->expectResponse(self::OK);
} }
/** /**
@ -80,19 +97,6 @@ abstract class Connection
return $this->closed; return $this->closed;
} }
/**
* @psalm-param array<string, string|numeric> $arr
*
* @psalm-suppress PossiblyFalseOperand
*/
protected function identify(array $arr): string
{
$body = json_encode($arr, JSON_THROW_ON_ERROR | JSON_FORCE_OBJECT);
$size = pack('N', \strlen($body));
return 'IDENTIFY '.PHP_EOL.$size.$body;
}
/** /**
* @psalm-suppress PossiblyFalseOperand * @psalm-suppress PossiblyFalseOperand
*/ */