Fully remove BinaryUtils dependency

Author: dktapps

composer.json

@@ -7,9 +7,9 @@
 		"php": "^8.1",
 		"php-ipv6": "*",
 		"php-64bit": "*",
+		"ext-encoding": "~1.0.0",
 		"ext-sockets": "*",
-		"pocketmine/log": "^0.3.0 || ^0.4.0",
-		"pocketmine/binaryutils": "^0.2.0"
+		"pocketmine/log": "^0.3.0 || ^0.4.0"
 	},
 	"require-dev": {
 		"phpstan/phpstan": "2.1.0",

src/protocol/EncapsulatedPacket.php

@@ -20,8 +20,8 @@
 use pmmp\encoding\Byte;
 use pmmp\encoding\ByteBufferReader;
 use pmmp\encoding\ByteBufferWriter;
+use pmmp\encoding\DataDecodeException;
 use pmmp\encoding\LE;
-use pocketmine\utils\BinaryDataException;
 use function ceil;
 use function strlen;
 
@@ -43,7 +43,7 @@ class EncapsulatedPacket{
 	public ?int $identifierACK = null;
 
 	/**
-	 * @throws BinaryDataException
+	 * @throws DataDecodeException
 	 */
 	public static function fromBinary(ByteBufferReader $stream) : EncapsulatedPacket{
 		$packet = new EncapsulatedPacket();
@@ -54,7 +54,7 @@ public static function fromBinary(ByteBufferReader $stream) : EncapsulatedPacket
 
 		$length = (int) ceil(BE::readUnsignedShort($stream) / 8);
 		if($length === 0){
-			throw new BinaryDataException("Encapsulated payload length cannot be zero");
+			throw new DataDecodeException("Encapsulated payload length cannot be zero");
 		}
 
 		if(PacketReliability::isReliable($reliability)){

src/protocol/OfflineMessage.php

@@ -18,7 +18,7 @@
 
 use pmmp\encoding\ByteBufferReader;
 use pmmp\encoding\ByteBufferWriter;
-use pocketmine\utils\BinaryDataException;
+use pmmp\encoding\DataDecodeException;
 
 abstract class OfflineMessage extends Packet{
 
@@ -31,7 +31,7 @@ abstract class OfflineMessage extends Packet{
 
 	/**
 	 * @return void
-	 * @throws BinaryDataException
+	 * @throws DataDecodeException
 	 */
 	protected function readMagic(ByteBufferReader $in){
 		$this->magic = $in->readByteArray(16);

src/protocol/Packet.php

@@ -19,7 +19,7 @@
 use pmmp\encoding\Byte;
 use pmmp\encoding\ByteBufferReader;
 use pmmp\encoding\ByteBufferWriter;
-use pocketmine\utils\BinaryDataException;
+use pmmp\encoding\DataDecodeException;
 
 abstract class Packet{
 	/** @var int */
@@ -37,22 +37,22 @@ protected function encodeHeader(ByteBufferWriter $out) : void{
 	abstract protected function encodePayload(ByteBufferWriter $out) : void;
 
 	/**
-	 * @throws BinaryDataException
+	 * @throws DataDecodeException
 	 */
 	public function decode(ByteBufferReader $in) : void{
 		$this->decodeHeader($in);
 		$this->decodePayload($in);
 	}
 
 	/**
-	 * @throws BinaryDataException
+	 * @throws DataDecodeException
 	 */
 	protected function decodeHeader(ByteBufferReader $in) : void{
 		Byte::readUnsigned($in); //PID
 	}
 
 	/**
-	 * @throws BinaryDataException
+	 * @throws DataDecodeException
 	 */
 	abstract protected function decodePayload(ByteBufferReader $in) : void;
 }

src/protocol/PacketSerializer.php

@@ -20,9 +20,8 @@
 use pmmp\encoding\Byte;
 use pmmp\encoding\ByteBufferReader;
 use pmmp\encoding\ByteBufferWriter;
+use pmmp\encoding\DataDecodeException;
 use pmmp\encoding\LE;
-use pocketmine\utils\BinaryDataException;
-use pocketmine\utils\BinaryStream;
 use raklib\utils\InternetAddress;
 use function assert;
 use function count;
@@ -32,17 +31,20 @@
 use function strlen;
 use const AF_INET6;
 
-final class PacketSerializer extends BinaryStream{
+final class PacketSerializer{
+	private function __construct(){
+		//NOOP
+	}
 
 	/**
-	 * @throws BinaryDataException
+	 * @throws DataDecodeException
 	 */
 	public static function getString(ByteBufferReader $in) : string{
 		return $in->readByteArray(BE::readUnsignedShort($in));
 	}
 
 	/**
-	 * @throws BinaryDataException
+	 * @throws DataDecodeException
 	 */
 	public static function getAddress(ByteBufferReader $in) : InternetAddress{
 		$version = Byte::readUnsigned($in);
@@ -57,12 +59,12 @@ public static function getAddress(ByteBufferReader $in) : InternetAddress{
 			BE::readUnsignedInt($in); //flow info
 			$addr = inet_ntop($in->readByteArray(16));
 			if($addr === false){
-				throw new BinaryDataException("Failed to parse IPv6 address");
+				throw new DataDecodeException("Failed to parse IPv6 address");
 			}
 			BE::readUnsignedInt($in); //scope ID
 			return new InternetAddress($addr, $port, $version);
 		}else{
-			throw new BinaryDataException("Unknown IP address version $version");
+			throw new DataDecodeException("Unknown IP address version $version");
 		}
 	}
 

src/server/Server.php

@@ -18,7 +18,7 @@
 
 use pmmp\encoding\ByteBufferReader;
 use pmmp\encoding\ByteBufferWriter;
-use pocketmine\utils\BinaryDataException;
+use pmmp\encoding\DataDecodeException;
 use raklib\generic\DisconnectReason;
 use raklib\generic\PacketHandlingException;
 use raklib\generic\Session;
@@ -304,7 +304,7 @@ private function receivePacket() : bool{
 					$this->logger->debug("Ignored packet from $address due to no session opened (0x" . bin2hex($buffer[0]) . ")");
 				}
 			}
-		}catch(BinaryDataException $e){
+		}catch(DataDecodeException $e){
 			if($this->packetErrorsSinceLastUpdate < $this->packetErrorSuppressionThreshold){
 				$logFn = function() use ($address, $e, $buffer) : void{
 					$this->logger->debug("Packet from $address (" . strlen($buffer) . " bytes): 0x" . bin2hex($buffer));

src/server/UnconnectedMessageHandler.php

@@ -17,7 +17,7 @@
 namespace raklib\server;
 
 use pmmp\encoding\ByteBufferReader;
-use pocketmine\utils\BinaryDataException;
+use pmmp\encoding\DataDecodeException;
 use raklib\generic\Session;
 use raklib\protocol\IncompatibleProtocolVersion;
 use raklib\protocol\MessageIdentifiers;
@@ -51,7 +51,7 @@ public function __construct(
 	}
 
 	/**
-	 * @throws BinaryDataException
+	 * @throws DataDecodeException
 	 */
 	public function handleRaw(string $payload, InternetAddress $address) : bool{
 		if($payload === ""){

tools/proxy.php

@@ -21,17 +21,11 @@
 
 declare(strict_types=1);
 
-use pocketmine\utils\Limits;
 use raklib\client\ClientSocket;
 use raklib\generic\SocketException;
 use raklib\protocol\MessageIdentifiers;
-use raklib\protocol\UnconnectedPong;
-use raklib\server\ProtocolAcceptor;
-use raklib\server\Server;
 use raklib\server\ServerSocket;
-use raklib\server\SimpleProtocolAcceptor;
 use raklib\utils\InternetAddress;
-use raklib\generic\Socket;
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
@@ -127,7 +121,7 @@ function serverToClientRelay(ClientSession $client, ServerSocket $clientProxySoc
 /** @var ClientSession[][] $clients */
 $clients = [];
 
-$serverId = mt_rand(0, Limits::INT32_MAX);
+$serverId = mt_rand(0, 0x7f_ff_ff_ff);
 $mostRecentPong = null;
 
 while(true){

tools/scan.php

@@ -3,10 +3,8 @@
 declare(strict_types=1);
 
 use pmmp\encoding\ByteBufferWriter;
-use pocketmine\utils\Limits;
 use raklib\generic\SocketException;
 use raklib\protocol\MessageIdentifiers;
-use raklib\protocol\PacketSerializer;
 use raklib\protocol\UnconnectedPing;
 use raklib\server\ServerSocket;
 use raklib\utils\InternetAddress;
@@ -29,7 +27,7 @@
 
 $socket = new ServerSocket($bindAddress);
 $socket->enableBroadcast();
-$clientId = mt_rand(0, Limits::INT32_MAX);
+$clientId = mt_rand(0, 0x7f_ff_ff_ff);
 \GlobalLogger::get()->info("Listening on " . $bindAddress);
 \GlobalLogger::get()->info("Press CTRL+C to stop");