Skip to content

zstd-stream support #1433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

zstd-stream support #1433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ac1ddd
Suggest ext-zstd
valzargaming Nov 21, 2025
d77ba06
zstd-stream decompression
valzargaming Nov 21, 2025
f612517
instanceof => !== false
valzargaming Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@
"ext-ev": "For a faster, and more performant loop.",
"ext-event": "For a faster, and more performant loop.",
"ext-mbstring": "For accurate calculations of string length when handling non-english characters.",
"ext-fileinfo": "For function mime_content_type()."
"ext-fileinfo": "For function mime_content_type().",
"ext-zstd": "For Zstandard compression support."
},
"scripts": {
"pint": ["./vendor/bin/pint --config ./pint.json ./src"],
Expand Down
31 changes: 26 additions & 5 deletions src/Discord/Discord.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,13 @@
use React\Promise\PromiseInterface;
use React\Socket\Connector as SocketConnector;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Zstd\UnCompress\Context as ZstdContext;

use function React\Async\coroutine;
use function React\Promise\all;
use function React\Promise\resolve;
use function Zstd\uncompress_init;
use function Zstd\uncompress_add;

/**
* The Discord client class.
Expand Down Expand Up @@ -315,9 +318,16 @@ class Discord
/**
* zlib decompressor.
*
* @var \InflateContext|false
* @var \InflateContext|false Zlib decompression context
*/
protected $zlibDecompressor;
protected $zlibDecompressor = false;

/**
* zstd decompressor.
*
* @var ZstdContext|false Zstd decompression context when ext-zstd is available
*/
protected $zstdDecompressor = false;

/**
* Tracks the number of payloads the client has sent in the past 60 seconds.
Expand Down Expand Up @@ -705,7 +715,14 @@ public function handleWsMessage(Message $message): void
$payload = $message->getPayload();

if ($message->isBinary()) {
if ($this->zlibDecompressor) {
if ($this->zstdDecompressor !== false) {
$decompressed = uncompress_add($this->zstdDecompressor, $payload);
if ($decompressed !== false) {
$this->processWsMessage($decompressed);
} else {
$this->logger->error('failed to decompress zstd payload', ['payload' => $payload, 'payload hex' => bin2hex($payload)]);
}
} elseif ($this->zlibDecompressor !== false) {
$this->payloadBuffer .= $payload;

if ($message->getPayloadLength() < 4 || substr($payload, -4) !== "\x00\x00\xff\xff") {
Expand Down Expand Up @@ -1612,10 +1629,14 @@ protected function buildParams(Deferred $deferred, string $gateway, ?SessionStar
];

if ($this->useTransportCompression) {
if ($this->zlibDecompressor = inflate_init(ZLIB_ENCODING_DEFLATE)) {
// Prefer zstd-stream if available (better compression), fallback to zlib-stream
if (extension_loaded('zstd') && ($this->zstdDecompressor = uncompress_init())) {
$params['compress'] = 'zstd-stream';
$this->logger->debug('using zstd-stream compression');
} elseif ($this->zlibDecompressor = inflate_init(ZLIB_ENCODING_DEFLATE)) {
$params['compress'] = 'zlib-stream';
$this->logger->debug('using zlib-stream compression');
}
// @todo: add support for zstd-stream
}

$query = http_build_query($params);
Expand Down