dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- remove all PHP "_ZMQ_" related dependencies from Pathfinder. PHP´s native Sockets work as replacement

Browse Source 
- added status information for "WebSocket" installations to `/setup` page (e.g. active connections, startup time)
- removed "ext-zmq" as required PHP extension
- removed "react/zmq" as required Composer package
- removed "websoftwares/monolog-zmq-handler" as required Composer package
This commit is contained in:
Mark Friedrich
2019-02-24 22:24:54 +01:00
parent 1d1e0ec213
commit a154fe80e8
23 changed files with 481 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

175
app/main/controller/setup.php
View File

@@ -192,72 +192,6 @@ class Setup extends Controller {
* @throws \Exception
*/
public function init(\Base $f3){
$uri = Config::getSocketUri();
var_dump('Socket URI: ' . $uri);
$loop = \React\EventLoop\Factory::create();
$connector = new \React\Socket\Connector($loop, [
'timeout' => 7.0 // connection timeout
]);
$connector->connect($uri)->then(function(\React\Socket\ConnectionInterface $connection) use ($loop) {
echo "pf: connected" . PHP_EOL;
echo "default_socket_timeout: " . ini_get("default_socket_timeout") . PHP_EOL;
$connection->on('data', function($chunk) use ($connection) {
echo "pf: connection on data:" . PHP_EOL;
echo $chunk. PHP_EOL;
if($chunk == 'DEF'){
//$connection->end('pf: bye1 ');
}
});
$connection->on('end', function(){
echo "pf: connection on end" . PHP_EOL;
});
$connection->on('error', function(\Exception $e){
echo "pf: connection on error" . PHP_EOL;
echo 'error: ' . $e->getMessage();
});
$connection->on('close', function(){
echo "pf: connection on ' close" . PHP_EOL;
});
//$connection->pipe(new \React\Stream\WritableResourceStream(STDOUT, $loop));
/*
$connection->write('PF ABC ');
//$connection->end('pf: bye1 ');
//sleep(2);
$connection->write('PF DEF ');
$connection->end('pf: bye2 ');
*/
$loop->addTimer(1.0, function () use ($connection) {
$connection->write('ABC');
});
$loop->addTimer(3.0, function () use ($connection) {
$connection->write('DEF');
//$connection->end('pf: bye1 ');
});
$loop->addTimer(3.0, function ($test) use ($connection) {
//var_dump($test);
$connection->end('end with timeout');
//$connection->end('pf: bye1 ');
});
});
echo 'loop start' . PHP_EOL;
$loop->run();
echo 'loop end//' . PHP_EOL;
die();
return;
//sleep(6);
//die('END...');
$params = $f3->get('GET');
// enables automatic column fix
@@ -328,7 +262,7 @@ return;
// Socket -----------------------------------------------------------------------------------------------------
// WebSocket information
$f3->set('socketInformation', $this->getSocketInformation());
$f3->set('socketInformation', $this->getSocketInformation($f3));
// Administration ---------------------------------------------------------------------------------------------
// Index information
@@ -626,23 +560,6 @@ return;
'check' => version_compare( phpversion('redis'), $f3->get('REQUIREMENTS.PHP.REDIS'), '>='),
'tooltip' => 'Redis can replace the default file-caching mechanic. It is much faster!'
],
[
'label' => 'ØMQ TCP sockets [optional]'
],
'ext_zmq' => [
'label' => 'ZeroMQ extension',
'required' => $f3->get('REQUIREMENTS.PHP.ZMQ'),
'version' => extension_loaded('zmq') ? phpversion('zmq') : 'missing',
'check' => version_compare( phpversion('zmq'), $f3->get('REQUIREMENTS.PHP.ZMQ'), '>='),
'tooltip' => 'ØMQ PHP extension. Required for WebSocket configuration.'
],
'lib_zmq' => [
'label' => 'ZeroMQ installation',
'required' => $f3->get('REQUIREMENTS.LIBS.ZMQ'),
'version' => (class_exists('ZMQ') && defined('ZMQ::LIBZMQ_VER')) ? \ZMQ::LIBZMQ_VER : 'unknown',
'check' => version_compare( (class_exists('ZMQ') && defined('ZMQ::LIBZMQ_VER')) ? \ZMQ::LIBZMQ_VER : 0, $f3->get('REQUIREMENTS.LIBS.ZMQ'), '>='),
'tooltip' => 'ØMQ version. Required for WebSocket configuration.'
],
[
'label' => 'LibEvent library [optional]'
],
@@ -808,7 +725,7 @@ return;
$getClientInfo = function(\Redis $client, array $conf) : array {
$redisInfo = [
'dsn' => [
'label' => 'DNS',
'label' => 'DSN',
'value' => $conf['host'] . ':' . $conf['port']
],
'connected' => [
@@ -1572,51 +1489,109 @@ return;
/**
* get Socket information (TCP (internal)), (WebSocket (clients))
* @param \Base $f3
* @return array
* @throws \ZMQSocketException
*/
protected function getSocketInformation(){
// $ttl for health check
$ttl = 600;
protected function getSocketInformation(\Base $f3) : array {
$ttl = 0.6;
$task = 'healthCheck';
$healthCheckToken = microtime(true);
// ping TCP Socket with checkToken
self::checkTcpSocket($ttl, $healthCheckToken);
$statusTcp = [
'type' => 'danger',
'label' => 'INIT CONNECTION…',
'class' => 'txt-color-danger'
];
$webSocketStatus = [
'type' => 'danger',
'label' => 'INIT CONNECTION…',
'class' => 'txt-color-danger'
];
$statsTcp = [
'startup' => 0,
'connections' => 0,
'maxConnections' => 0
];
// ping TCP Socket with "healthCheck" task
$f3->webSocket(['timeout' => $ttl])
->write($task, $healthCheckToken)
->then(
function($payload) use ($task, $healthCheckToken, &$statusTcp, &$statsTcp) {
if(
$payload['task'] == $task &&
$payload['load'] == $healthCheckToken
){
$statusTcp['type'] = 'success';
$statusTcp['label'] = 'PING OK';
$statusTcp['class'] = 'txt-color-success';
// statistics (e.g. current connection count)
if(!empty($payload['stats'])){
$statsTcp = $payload['stats'];
}
}else{
$statusTcp['type'] = 'warning';
$statusTcp['label'] = is_string($payload['load']) ? $payload['load'] : 'INVALID RESPONSE';
$statusTcp['class'] = 'txt-color-warning';
}
},
function($payload) use (&$statusTcp) {
$statusTcp['label'] = $payload['load'];
});
$formatTimeInterval = function(int $seconds = 0){
$dtF = new \DateTime('@0');
$dtT = new \DateTime("@" . $seconds);
$diff = $dtF->diff($dtT);
$format = ($d = $diff->format('%d')) ? $d . 'd ' : '';
$format .= ($h = $diff->format('%h')) ? $h . 'h ' : '';
$format .= ($i = $diff->format('%i')) ? $i . 'm ' : '';
$format .= ($s = $diff->format('%s')) ? $s . 's' : '';
return $format;
};
$socketInformation = [
'tcpSocket' => [
'label' => 'Socket (intern) [TCP]',
'online' => true,
'label' => 'Socket (intern) [TCP]',
'status' => $statusTcp,
'stats' => $statsTcp,
'data' => [
[
'label' => 'HOST',
'value' => Config::getEnvironmentData('SOCKET_HOST'),
'value' => Config::getEnvironmentData('SOCKET_HOST') ? : '[missing]',
'check' => !empty( Config::getEnvironmentData('SOCKET_HOST') )
],[
'label' => 'PORT',
'value' => Config::getEnvironmentData('SOCKET_PORT'),
'value' => Config::getEnvironmentData('SOCKET_PORT') ? : '[missing]',
'check' => !empty( Config::getEnvironmentData('SOCKET_PORT') )
],[
'label' => 'URI',
'value' => Config::getSocketUri(),
'value' => Config::getSocketUri() ? : '[missing]',
'check' => !empty( Config::getSocketUri() )
],[
'label' => 'timeout (ms)',
'label' => 'timeout (seconds)',
'value' => $ttl,
'check' => !empty( $ttl )
],[
'label' => 'uptime',
'value' => $formatTimeInterval($statsTcp['startup']),
'check' => $statsTcp['startup'] > 0
]
],
'token' => $healthCheckToken
],
'webSocket' => [
'label' => 'WebSocket (clients) [HTTP]',
'online' => false,
'status' => $webSocketStatus,
'data' => [
[
'label' => 'URI',
'value' => '',
'check' => false
'check' => null // undefined
]
]
]