danog/MadelineProto
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid memory leaking

Browse Source
This commit is contained in:
Daniil Gentili 2020-01-03 16:47:57 +01:00
parent a63131583b
commit becc68f41b
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
4 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/danog/MadelineProto/DataCenterConnection.php
View File

@ -451,7 +451,11 @@ class DataCenterConnection implements JsonSerializable
{
$backup = $this->connections[$id]->backupSession();
$list = '';
foreach ($backup as $message) {
foreach ($backup as $k => $message) {
if (($message['_'] ?? '') === 'msgs_state_req') {
unset($backup[$k]);
continue;
}
$list .= $message['_'] ?? '-';
$list .= ', ';
}

10
src/danog/MadelineProto/Loop/Connection/CheckLoop.php
View File

@ -66,6 +66,7 @@ class CheckLoop extends ResumableSignalLoop
$shared = $this->datacenterConnection;
$timeout = $shared->getSettings()['timeout'];
$timeoutResend = $timeout * $timeout; // Typically 25 seconds, good enough
while (true) {
while (empty($connection->new_outgoing)) {
if (yield $this->waitSignal($this->pause())) {
@ -82,7 +83,7 @@ class CheckLoop extends ResumableSignalLoop
foreach (\array_chunk($full_message_ids, 8192) as $message_ids) {
$deferred = new Deferred();
$deferred->promise()->onResolve(
function ($e, $result) use ($message_ids, $API, $connection, $datacenter) {
function ($e, $result) use ($message_ids, $API, $connection, $datacenter, $timeoutResend) {
if ($e) {
$API->logger("Got exception in check loop for DC $datacenter");
$API->logger((string) $e);
@ -117,7 +118,12 @@ class CheckLoop extends ResumableSignalLoop
break;
case 4:
if ($chr & 32) {
$API->logger->logger('Message '.$connection->outgoing_messages[$message_id]['_'].' with message ID '.($message_id).' received by server and is being processed, waiting...', \danog\MadelineProto\Logger::ERROR);
if ($connection->new_outgoing[$message_id]['sent'] + $timeoutResend < \time()) {
$API->logger->logger('Message '.$connection->outgoing_messages[$message_id]['_'].' with message ID '.($message_id).' received by server and is being processed for way too long, resending request...', \danog\MadelineProto\Logger::ERROR);
$connection->methodRecall('', ['message_id' => $message_id, 'postpone' => true]);
} else {
$API->logger->logger('Message '.$connection->outgoing_messages[$message_id]['_'].' with message ID '.($message_id).' received by server and is being processed, waiting...', \danog\MadelineProto\Logger::ERROR);
}
} elseif ($chr & 64) {
$API->logger->logger('Message '.$connection->outgoing_messages[$message_id]['_'].' with message ID '.($message_id).' received by server and was already processed, requesting reply...', \danog\MadelineProto\Logger::ERROR);
$reply[] = $message_id;

26
src/danog/MadelineProto/MTProtoSession/AckHandler.php
View File

@ -92,14 +92,18 @@ trait AckHandler
$settings = $this->shared->getSettings();
$timeout = $settings['timeout'];
$pfs = $settings['pfs'];
$unencrypted = !$this->shared->hasTempAuthKey();
$notBound = !$this->shared->isBound();
$pfsNotBound = $pfs && $notBound;
foreach ($this->new_outgoing as $message_id) {
if (isset($this->outgoing_messages[$message_id]['sent'])
&& $this->outgoing_messages[$message_id]['sent'] + $timeout < \time()
&& $this->shared->hasTempAuthKey() === !$this->outgoing_messages[$message_id]['unencrypted']
&& $unencrypted === $this->outgoing_messages[$message_id]['unencrypted']
&& $this->outgoing_messages[$message_id]['_'] !== 'msgs_state_req'
) {
if ($pfs && !$this->shared->isBound() && $this->outgoing_messages[$message_id]['_'] !== 'auth.bindTempAuthKey') {
if ($pfsNotBound && $this->outgoing_messages[$message_id]['_'] !== 'auth.bindTempAuthKey') {
continue;
}
@ -111,7 +115,7 @@ trait AckHandler
}
/**
* Get all pending calls.
* Get all pending calls (also clear pending state requests).
*
* @return array
*/
@ -120,15 +124,23 @@ trait AckHandler
$settings = $this->shared->getSettings();
$timeout = $settings['timeout'];
$pfs = $settings['pfs'];
$unencrypted = !$this->shared->hasTempAuthKey();
$notBound = !$this->shared->isBound();
$pfsNotBound = $pfs && $notBound;
$result = [];
foreach ($this->new_outgoing as $message_id) {
foreach ($this->new_outgoing as $k => $message_id) {
if (isset($this->outgoing_messages[$message_id]['sent'])
&& $this->outgoing_messages[$message_id]['sent'] + $timeout < \time()
&& $this->shared->hasTempAuthKey() === !$this->outgoing_messages[$message_id]['unencrypted']
&& $this->outgoing_messages[$message_id]['_'] !== 'msgs_state_req'
&& $unencrypted === $this->outgoing_messages[$message_id]['unencrypted']
) {
if ($pfs && !$this->shared->isBound() && $this->outgoing_messages[$message_id]['_'] !== 'auth.bindTempAuthKey') {
if ($pfsNotBound && $this->outgoing_messages[$message_id]['_'] !== 'auth.bindTempAuthKey') {
continue;
}
if ($this->outgoing_messages[$message_id]['_'] === 'msgs_state_req') {
unset($this->new_outgoing[$k], $this->outgoing_messages[$message_id]);
continue;
}

2
src/danog/MadelineProto/MTProtoSession/CallHandler.php
View File

@ -40,7 +40,7 @@ trait CallHandler
*
* @return void
*/
public function methodRecall(string $watcherId, array $args)
public function methodRecall(string $watcherId, array $args): void
{
$message_id = $args['message_id'];
$postpone = $args['postpone'] ?? false;