mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 02:08:21 +00:00
Code Issues Projects Releases Wiki Activity

Improved batch handling

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-07-13 12:04:47 +01:00
parent 5283975f20
commit 72d1948f30
4 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/pocketmine/network/CompressBatchedTask.php
View File

@ -33,10 +33,14 @@ class CompressBatchedTask extends AsyncTask{
public $data;
public $targets;
public function __construct(BatchPacket $batch, array $targets, $level = 7){
/**
* @param BatchPacket $batch
* @param string[] $targets
*/
public function __construct(BatchPacket $batch, array $targets){
$this->data = $batch->payload;
$this->targets = serialize($targets);
$this->level = $level;
$this->level = $batch->getCompressionLevel();
}
public function onRun(){
@ -44,7 +48,7 @@ class CompressBatchedTask extends AsyncTask{
$batch->payload = $this->data;
$this->data = null;
$batch->compress($this->level);
$batch->setCompressionLevel($this->level);
$batch->encode();
$this->setResult($batch->buffer, false);
@ -53,7 +57,6 @@ class CompressBatchedTask extends AsyncTask{
public function onCompletion(Server $server){
$pk = new BatchPacket($this->getResult());
$pk->isEncoded = true;
$pk->compressed = true;
$server->broadcastPacketsCallback($pk, unserialize($this->targets));
}
}

55
src/pocketmine/network/mcpe/protocol/BatchPacket.php
View File

@ -29,13 +29,17 @@ namespace pocketmine\network\mcpe\protocol;
use pocketmine\network\mcpe\NetworkSession;
#ifndef COMPILE
use pocketmine\utils\Binary;
use pocketmine\utils\BinaryStream;
#endif
class BatchPacket extends DataPacket{
const NETWORK_ID = 0xfe;
public $payload;
public $compressed = false;
/** @var string */
public $payload = "";
/** @var int */
protected $compressionLevel = 7;
public function canBeBatched() : bool{
return false;
@ -46,12 +50,16 @@ class BatchPacket extends DataPacket{
}
public function decodePayload(){
$this->payload = $this->getRemaining();
$data = $this->getRemaining();
try{
$this->payload = zlib_decode($data, 1024 * 1024 * 64); //Max 64MB
}catch(\ErrorException $e){ //zlib decode error
$this->payload = "";
}
}
public function encodePayload(){
assert($this->compressed);
$this->put($this->payload);
$this->put(zlib_encode($this->payload, ZLIB_ENCODING_DEFLATE, $this->compressionLevel));
}
/**
@ -68,31 +76,30 @@ class BatchPacket extends DataPacket{
$this->payload .= Binary::writeUnsignedVarInt(strlen($packet->buffer)) . $packet->buffer;
}
public function compress(int $level = 7){
assert(!$this->compressed);
$this->payload = zlib_encode($this->payload, ZLIB_ENCODING_DEFLATE, $level);
$this->compressed = true;
/**
* @return \Generator
*/
public function getPackets(){
$stream = new BinaryStream($this->payload);
while(!$stream->feof()){
yield $stream->getString();
}
}
public function getCompressionLevel() : int{
return $this->compressionLevel;
}
public function setCompressionLevel(int $level){
$this->compressionLevel = $level;
}
public function handle(NetworkSession $session) : bool{
if(strlen($this->payload) < 2){
if($this->payload === ""){
return false;
}
try{
$str = zlib_decode($this->payload, 1024 * 1024 * 64); //Max 64MB
}catch(\ErrorException $e){
return false;
}
if(strlen($str) === 0){
throw new \InvalidStateException("Decoded BatchPacket payload is empty");
}
$this->setBuffer($str, 0);
while(!$this->feof()){
$buf = $this->getString();
foreach($this->getPackets() as $buf){
$pk = PacketPool::getPacketById(ord($buf{0}));
if(!$pk->canBeBatched()){