third-party-mirrors/EDDN
1
0 Fork 0
mirror of https://github.com/EDCD/EDDN.git synced 2026-11-14 01:32:22 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update clients so both versions have same output

Browse Source
This commit is contained in:
AnthorNet committed 2015-04-29 14:22:26 +02:00
1 parent 341266357f
commit 8d150171e1
4 files changed
+288 -67
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

examples/PHP/Client.php
+91 -57
View File
@@ -3,7 +3,15 @@
* Configuration
*/
$relayEDDN = 'tcp://eddn-relay.elite-markets.net:9500';
$logFile = dirname(__FILE__) . '/Logs_EDDN_%DATE%.htm';
$timeoutEDDN = 600000;
// Set to false if you do not want verbose logging
$logVerboseFile = dirname(__FILE__) . '/Logs_Verbose_EDDN_%DATE%.htm';
//$logVerboseFile = false;
// Set to false if you do not want JSON logging
$logJSONFile = dirname(__FILE__) . '/Logs_JSON_EDDN_%DATE%.log';
//$logJSONFile = false;
// A sample list of authorised softwares
$authorisedSoftwares = array(
@@ -19,21 +27,23 @@ $excludedSoftwares = array(
'My Awesome Market Uploader'
);
/**
* START
*/
$oldTime = false;
function echoLog($str)
{
global $oldTime, $logFile;
global $oldTime, $logVerboseFile;
$logFileParsed = str_replace('%DATE%', date('Y-m-d'), $logFile);
if($logVerboseFile !== false)
$logVerboseFileParsed = str_replace('%DATE%', date('Y-m-d'), $logVerboseFile);
if(!file_exists($logFileParsed))
if($logVerboseFile !== false && !file_exists($logVerboseFileParsed))
{
file_put_contents(
$logFileParsed,
$logVerboseFileParsed,
'<style type="text/css">html { white-space: pre; font-family: Courier New,Courier,Lucida Sans Typewriter,Lucida Typewriter,monospace; }</style>'
);
}
@@ -48,82 +58,101 @@ function echoLog($str)
fwrite(STDOUT, $str . PHP_EOL);
file_put_contents(
$logFileParsed,
$str . PHP_EOL,
FILE_APPEND
);
if($logVerboseFile !== false)
file_put_contents(
$logVerboseFileParsed,
$str . PHP_EOL,
FILE_APPEND
);
}
function echoLogJSON($json)
{
global $logJSONFile;
if($logJSONFile !== false)
{
$logJSONFileParsed = str_replace('%DATE%', date('Y-m-d'), $logJSONFile);
file_put_contents(
$logJSONFileParsed,
$json . PHP_EOL,
FILE_APPEND
);
}
}
// UTC
date_default_timezone_set('UTC');
echoLog('Starting EDDN Subscribe');
echoLog('Starting EDDN Subscriber');
echoLog('');
$context = new ZMQContext();
$socket = $context->getSocket(ZMQ::SOCKET_SUB);
$socket->setSockOpt(ZMQ::SOCKOPT_SUBSCRIBE, "");
$socket->setSockOpt(ZMQ::SOCKOPT_RCVTIMEO, 600000);
$context = new ZMQContext();
$subscriber = $context->getSocket(ZMQ::SOCKET_SUB);
$subscriber->setSockOpt(ZMQ::SOCKOPT_SUBSCRIBE, "");
$subscriber->setSockOpt(ZMQ::SOCKOPT_RCVTIMEO, $timeoutEDDN);
while (true)
{
try
{
$socket->connect($relayEDDN);
$subscriber->connect($relayEDDN);
while (true)
{
$message = $socket->recv();
$message = $subscriber->recv();
if ($message === false)
{
$socket->disconnect($relayEDDN);
$subscriber->disconnect($relayEDDN);
break;
}
$json = zlib_decode($message);
$array = json_decode($json, true);
$message = zlib_decode($message);
$json = json_decode($message, true);
$converted = false;
// Handle commodity v1
if($array['$schemaRef'] == 'http://schemas.elite-markets.net/eddn/commodity/1')
if($json['$schemaRef'] == 'http://schemas.elite-markets.net/eddn/commodity/1')
{
echoLogJSON($message);
echoLog('Receiving commodity-v1 message...');
echoLog(' - Converting to v2...');
$temp = array();
$temp['$schemaRef'] = 'http://schemas.elite-markets.net/eddn/commodity/2';
$temp['header'] = $array['header'];
$temp['header'] = $json['header'];
$temp['message'] = array();
$temp['message']['systemName'] = $array['message']['systemName'];
$temp['message']['stationName'] = $array['message']['stationName'];
$temp['message']['timestamp'] = $array['message']['timestamp'];
$temp['message']['systemName'] = $json['message']['systemName'];
$temp['message']['stationName'] = $json['message']['stationName'];
$temp['message']['timestamp'] = $json['message']['timestamp'];
$temp['message']['commodities'] = array();
$commodity = array();
if(array_key_exists('itemName', $array['message']))
$commodity['name'] = $array['message']['itemName'];
if(array_key_exists('itemName', $json['message']))
$commodity['name'] = $json['message']['itemName'];
if(array_key_exists('buyPrice', $array['message']))
$commodity['buyPrice'] = $array['message']['buyPrice'];
if(array_key_exists('stationStock', $array['message']))
$commodity['supply'] = $array['message']['stationStock'];
if(array_key_exists('supplyLevel', $array['message']))
$commodity['supplyLevel'] = $array['message']['supplyLevel'];
if(array_key_exists('buyPrice', $json['message']))
$commodity['buyPrice'] = $json['message']['buyPrice'];
if(array_key_exists('stationStock', $json['message']))
$commodity['supply'] = $json['message']['stationStock'];
if(array_key_exists('supplyLevel', $json['message']))
$commodity['supplyLevel'] = $json['message']['supplyLevel'];
if(array_key_exists('sellPrice', $array['message']))
$commodity['sellPrice'] = $array['message']['sellPrice'];
if(array_key_exists('demand', $array['message']))
$commodity['demand'] = $array['message']['demand'];
if(array_key_exists('demandLevel', $array['message']))
$commodity['demandLevel'] = $array['message']['demandLevel'];
if(array_key_exists('sellPrice', $json['message']))
$commodity['sellPrice'] = $json['message']['sellPrice'];
if(array_key_exists('demand', $json['message']))
$commodity['demand'] = $json['message']['demand'];
if(array_key_exists('demandLevel', $json['message']))
$commodity['demandLevel'] = $json['message']['demandLevel'];
$temp['message']['commodities'][] = $commodity;
$array = $temp;
$json = $temp;
unset($temp, $commodity);
$converted = true;
@@ -131,21 +160,23 @@ while (true)
// Handle commodity v2
if($array['$schemaRef'] == 'http://schemas.elite-markets.net/eddn/commodity/2')
if($json['$schemaRef'] == 'http://schemas.elite-markets.net/eddn/commodity/2')
{
if($converted === false)
{
echoLogJSON($message);
echoLog('Receiving commodity-v2 message...');
unset($converted);
}
$authorised = false;
$excluded = false;
if(in_array($array['header']['softwareName'], $authorisedSoftwares))
if(in_array($json['header']['softwareName'], $authorisedSoftwares))
$authorised = true;
if(in_array($array['header']['softwareName'], $excludedSoftwares))
if(in_array($json['header']['softwareName'], $excludedSoftwares))
$excluded = true;
echoLog(' - Software: ' . $array['header']['softwareName'] . ' / ' . $array['header']['softwareVersion']);
echoLog(' - Software: ' . $json['header']['softwareName'] . ' / ' . $json['header']['softwareVersion']);
echoLog(' - ' . (($authorised === true)
? 'AUTHORISED'
: (( $excluded === true) ? 'EXCLUDED' : 'UNAUTHORISED')
@@ -157,21 +188,21 @@ while (true)
// Have fun !
// For example
echoLog(' - Timestamp: ' . $array['message']['timestamp']);
echoLog(' - System Name: ' . $array['message']['systemName']);
echoLog(' - Station Name: ' . $array['message']['stationName']);
echoLog(' - Timestamp: ' . $json['message']['timestamp']);
echoLog(' - System Name: ' . $json['message']['systemName']);
echoLog(' - Station Name: ' . $json['message']['stationName']);
foreach($array['message']['commodities'] AS $commodity)
foreach($json['message']['commodities'] AS $commodity)
{
echoLog(' - Name: ' . $commodity['name']);
echoLog(' - Buy Price: ' . $commodity['buyPrice']);
echoLog(' - Supply: ' . $commodity['supply'] . (
(array_key_exists('supplyLevel', $commodity)) ? ' (' . $commodity['supplyLevel'] . ')' : ''
));
echoLog(' - Supply: ' . $commodity['supply']
. ((array_key_exists('supplyLevel', $commodity)) ? ' (' . $commodity['supplyLevel'] . ')' : '')
);
echoLog(' - Sell Price: ' . $commodity['sellPrice']);
echoLog(' - Demand: ' . $commodity['demand'] . (
(array_key_exists('demandLevel', $commodity)) ? ' (' . $commodity['demandLevel'] . ')' : ''
));
echoLog(' - Demand: ' . $commodity['demand']
. ((array_key_exists('demandLevel', $commodity)) ? ' (' . $commodity['demandLevel'] . ')' : '')
);
}
// End example
}
@@ -179,13 +210,16 @@ while (true)
unset($authorised, $excluded);
}
unset($converted);
echoLog('');
echoLog('');
}
}
catch (ZMQSocketException $e)
{
echoLog('');
echoLog('ZMQSocketException: ' . $e);
echoLog('');
sleep(10);
}
}