danog/MadelineProto
1
0
Fork 0
mirror of https://github.com/danog/MadelineProto.git synced 2024-11-26 19:24:42 +01:00
Code Issues Projects Releases Wiki Activity

Fix: timeout for outgoing messages & possible fatal error for media downloads

Browse Source
This commit is contained in:
Alexander Pankratov 2024-05-18 19:18:33 +02:00
parent a2e77db9aa
commit 682e072a17
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/MTProtoSession/AckHandler.php
View File

@ -98,7 +98,7 @@ trait AckHandler
{
$settings = $this->shared->getSettings();
$global = $this->shared->getGenericSettings();
$dropTimeout = $global->getRpc()->getRpcDropTimeout();
$dropTimeout = (int)($global->getRpc()->getRpcDropTimeout() * 1_000_000_000.0);
$timeout = (int) ($settings->getTimeout() * 1_000_000_000.0);
$pfs = $global->getAuth()->getPfs();
$unencrypted = !$this->shared->hasTempAuthKey();
@ -122,6 +122,7 @@ trait AckHandler
continue;
}
if ($message->getSent() + $dropTimeout < hrtime(true)) {
Logger::log('No reply for message: ' . $message, Logger::WARNING);
$this->handleReject($message, static fn () => new TimeoutException('Request timeout'));
continue;
}

4
src/MTProtoTools/Files.php
View File

@ -1140,10 +1140,10 @@ trait Files
foreach ($params as $key => $param) {
$cancellation?->throwIfRequested();
$param['previous_promise'] = $previous_promise;
$previous_promise = async($this->downloadPart(...), $messageMedia, $cdn, $datacenter, $old_dc, $ige, $cb, $param, $callable, $seekable, $cancellation);
$previous_promise = async($this->downloadPart(...), $messageMedia, $cdn, $datacenter, $old_dc, $ige, $cb, $param, $callable, $seekable, $cancellation)->ignore();
$previous_promise->map(static function (int $res) use (&$size): void {
$size += $res;
});
})->ignore();
$promises[] = $previous_promise;
if (\count($promises) === $parallel_chunks) {
// 20 mb at a time, for a typical bandwidth of 1gbps