beu/TrackManiaControl
1
0
Fork 0
Code Issues 11 Pull Requests Releases Wiki Activity

updated file reader to curl-easy

Browse Source
This commit is contained in:
kremsy 2014-02-18 18:13:59 +01:00 committed by Steffen Schröder
parent d1948f4142
commit 15f0164287
4 changed files with 85 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

236
application/core/Files/AsynchronousFileReader.php
View File

@ -1,6 +1,9 @@
<?php <?php
namespace ManiaControl\Files; namespace ManiaControl\Files;
use cURL\Exception;
use cURL\Request;
use cURL\Response;
use ManiaControl\ManiaControl; use ManiaControl\ManiaControl;
/** /**
@ -9,21 +12,11 @@ use ManiaControl\ManiaControl;
* @author kremsy & steeffeen * @author kremsy & steeffeen
*/ */
class AsynchronousFileReader { class AsynchronousFileReader {
/**
* Constants
*/
const TIMEOUT_ERROR = 'Timed out while reading data';
const RESPONSE_ERROR = 'Connection or response error';
const NO_DATA_ERROR = 'No data returned';
const INVALID_RESULT_ERROR = 'Invalid Result';
const SOCKET_TIMEOUT = 10;
/** /**
* Private Properties * Private Properties
*/ */
private $sockets = array();
private $maniaControl = null; private $maniaControl = null;
private $requests = array();
/** /**
* Construct * Construct
@ -38,141 +31,69 @@ class AsynchronousFileReader {
* Appends the Data * Appends the Data
*/ */
public function appendData() { public function appendData() {
foreach($this->sockets as $key => &$socket) { foreach($this->requests as $key => $request) {
/** @var SocketStructure $socket */ /** @var Request $request */
do { try {
$line = fgets($socket->socket, 4096); if ($request->socketPerform()) {
if (empty($socket->header) && $line == "\r\n") { $request->socketSelect();
$socket->header = $this->parseHeader($socket->streamBuffer);
$socket->streamBuffer = "";
$line = "";
} }
$socket->streamBuffer .= $line; } catch(Exception $e) {
if ($e->getMessage() == "Cannot perform if there are no requests in queue.") {
$chunked = isset($socket->header["transfer-encoding"]) && $socket->header["transfer-encoding"] == "chunked" && $line == "0"; unset($this->requests[$key]);
if ($chunked || isset($socket->header["content-length"]) && strlen($socket->streamBuffer) >= $socket->header["content-length"]) { } else {
fclose($socket->socket); throw $e;
unset($this->sockets[$key]);
$this->handleContent($socket);
continue 2;
} }
$meta = stream_get_meta_data($socket->socket);
} while($meta["unread_bytes"] > 0);
}
}
/**
* Handles the Content
*
* @param $socket
*/
private function handleContent(SocketStructure $socket) { //TODO timeout handling
//if (feof($socket->socket) || time() > ($socket->creationTime + self::SOCKET_TIMEOUT)) {
$result = "";
$error = 0;
/*if (time() > ($socket->creationTime + self::SOCKET_TIMEOUT)) {
$error = self::TIMEOUT_ERROR;
} else*/
if ($socket->header["status"] != "200") {
$error = self::RESPONSE_ERROR;
$result = $this->parseResult($socket);
if (intval($socket->header["status"]) > 300 && intval($socket->header["status"]) < 310) {
$this->maniaControl->errorHandler->triggerDebugNotice("HTTP Error, Code:" . $socket->header["status"] . "URL: " . $socket->url);
}
} else if ($socket->streamBuffer == '') {
$error = self::NO_DATA_ERROR;
} else {
$result = $this->parseResult($socket);
if ($result == self::INVALID_RESULT_ERROR) {
$error = self::INVALID_RESULT_ERROR;
} }
} }
call_user_func($socket->function, $result, $error);
//}
} }
/** /**
* Parse the Stream Result * Load a remote file
* *
* @param SocketStructure $socket * @param string $url
* @internal param $streamBuffer * @param $function
* @return string * @param string $contentType
* @param string $customHeader
* @return bool
*/ */
private function parseResult(SocketStructure $socket) { public function loadFile($url, $function, $contentType = 'UTF-8', $customHeader = '') {
if (!is_callable($function)) {
if (isset($socket->header["transfer-encoding"]) && $socket->header["transfer-encoding"] == "chunked") { $this->maniaControl->log("Function is not callable");
$result = $this->decode_chunked($socket->streamBuffer); return false;
} else {
$result = $socket->streamBuffer;
} }
return $this->decompressData($socket->header, $result); if (!$url) {
} return null;
}
/** $request = new \cURL\Request($url);
* Checks if the data is Compressed and uncompress it
* $request->getOptions()->set(CURLOPT_TIMEOUT, 5) //
* @param $header ->set(CURLOPT_HEADER, false) //
* @param $data ->set(CURLOPT_CRLF, true) //
* @return string //->set(CURLOPT_HTTPHEADER, array("Content-Type: " . $contentType))
*/ ->set(CURLOPT_USERAGENT, 'User-Agent: ManiaControl v' . ManiaControl::VERSION) //
private function decompressData($header, $data) { ->set(CURLOPT_RETURNTRANSFER, true);
if (isset($header["content-encoding"])) {
switch($header["content-encoding"]) {
case "gzip": $request->addListener('complete', function (\cURL\Event $event) use (&$function) {
case "gzip;": /** @var Response $response */
return gzdecode($data); $response = $event->response;
case "deflate":
case "deflate;": $error = "";
return gzinflate($data); $content = "";
if ($response->hasError()) {
$error = $response->getError()->getMessage();
} else {
$content = $response->getContent();
} }
}
return $data;
}
/** call_user_func($function, $content, $error);
* Decode Chunks });
*
* @param $str
* @return string
*/
private function decode_chunked($str) {
for($res = ''; !empty($str); $str = trim($str)) {
$pos = strpos($str, "\r\n");
$len = hexdec(substr($str, 0, $pos));
$res .= substr($str, $pos + 2, $len);
$str = substr($str, $pos + 2 + $len);
}
return $res;
}
/** array_push($this->requests, $request);
* Parse the Header
*
* @param $header
* @return array
*/
function parseHeader($header) {
$headers = explode("\r\n", $header);
$output = array();
if ('HTTP' === substr($headers[0], 0, 4)) { return true;
list(, $output['status'], $output['status_text']) = explode(' ', $headers[0]);
unset($headers[0]);
}
foreach($headers as $v) {
if ($v == "") {
break;
}
$h = preg_split('/:\s*/', $v);
$output[strtolower($h[0])] = $h[1];
}
return $output;
} }
@ -186,7 +107,7 @@ class AsynchronousFileReader {
* @return bool|null * @return bool|null
*/ */
public function postData($url, $function, $content, $compressed = false, $contentType = 'UTF-8') { public function postData($url, $function, $content, $compressed = false, $contentType = 'UTF-8') {
if (!is_callable($function)) { /*if (!is_callable($function)) {
$this->maniaControl->log("Function is not callable"); $this->maniaControl->log("Function is not callable");
return false; return false;
} }
@ -225,57 +146,6 @@ class AsynchronousFileReader {
$socketStructure = new SocketStructure($url, $socket, $function); $socketStructure = new SocketStructure($url, $socket, $function);
array_push($this->sockets, $socketStructure); array_push($this->sockets, $socketStructure);
return true; return true;*/
}
/**
* Load a remote file
*
* @param string $url
* @param $function
* @param string $contentType
* @param string $customHeader
* @return bool
*/
public function loadFile($url, $function, $contentType = 'UTF-8', $customHeader = '') {
if (!is_callable($function)) {
$this->maniaControl->log("Function is not callable");
return false;
}
if (!$url) {
return null;
}
$urlData = parse_url($url);
$port = (isset($urlData['port']) ? $urlData['port'] : 80);
$urlQuery = isset($urlData['query']) ? "?" . $urlData['query'] : "";
$socket = @fsockopen($urlData['host'], $port, $errno, $errstr, 4);
if (!$socket) {
return false;
}
if ($customHeader == '') {
$query = 'GET ' . $urlData['path'] . $urlQuery . ' HTTP/1.1' . PHP_EOL;
$query .= 'Host: ' . $urlData['host'] . PHP_EOL;
$query .= 'Content-Type: ' . $contentType . PHP_EOL;
$query .= 'Connection: close' . PHP_EOL;
$query .= 'User-Agent: ManiaControl v' . ManiaControl::VERSION . PHP_EOL;
$query .= PHP_EOL;
} else {
$query = $customHeader;
}
fwrite($socket, $query);
$success = stream_set_blocking($socket, 0);
if (!$success) {
return false;
}
$socketStructure = new SocketStructure($url, $socket, $function);
array_push($this->sockets, $socketStructure);
return true;
} }
} }

15
application/core/Libs/Symfony/autoload.php Normal file
View File

@ -0,0 +1,15 @@
<?php
if (!defined('EVENT_DISPATCHER_PATH')) {
define('EVENT_DISPATCHER_PATH', __DIR__);
}
spl_autoload_register(
function ($className) {
$classPath = str_replace('\\', DIRECTORY_SEPARATOR, $className);
$filePath = EVENT_DISPATCHER_PATH . DIRECTORY_SEPARATOR . $classPath . '.php';
if (file_exists($filePath)) {
require_once $filePath;
}
});

14
application/core/Libs/curl-easy/autoload.php Normal file
View File

@ -0,0 +1,14 @@
<?php
if (!defined('cURL_PATH')) {
define('cURL_PATH', __DIR__);
}
spl_autoload_register(
function ($className) {
$classPath = str_replace('\\', DIRECTORY_SEPARATOR, $className);
$filePath = cURL_PATH . DIRECTORY_SEPARATOR . $classPath . '.php';
if (file_exists($filePath)) {
require_once $filePath;
}
});

3
application/core/ManiaControl.php
View File

@ -26,6 +26,9 @@ use Maniaplanet\DedicatedServer\Xmlrpc\Exception;
require_once __DIR__ . '/Libs/Maniaplanet/DedicatedServer/Connection.php'; require_once __DIR__ . '/Libs/Maniaplanet/DedicatedServer/Connection.php';
require_once __DIR__ . '/Libs/GbxDataFetcher/gbxdatafetcher.inc.php'; require_once __DIR__ . '/Libs/GbxDataFetcher/gbxdatafetcher.inc.php';
require_once __DIR__ . '/Libs/FML/autoload.php'; require_once __DIR__ . '/Libs/FML/autoload.php';
require_once __DIR__ . '/Libs/Symfony/autoload.php';
require_once __DIR__ . '/Libs/curl-easy/autoload.php';
/** /**
* ManiaControl Server Controller for ManiaPlanet Server * ManiaControl Server Controller for ManiaPlanet Server