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

Stability fixes

Browse Source
This commit is contained in:
Daniil Gentili 2018-04-01 19:23:20 +02:00
parent e3a2c720ef
commit 588aea5c8e
4 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -264,10 +264,11 @@ class Connection
case 'obfuscated2': case 'obfuscated2':
$packet = ''; $packet = '';
while (strlen($packet) < $length) { while (strlen($packet) < $length) {
$packet .= $this->sock->read($length - strlen($packet)); $piece = $this->sock->read($length - strlen($packet));
if ($packet === false || strlen($packet) === 0) { if ($piece === false || strlen($piece) === 0) {
throw new \danog\MadelineProto\NothingInTheSocketException(\danog\MadelineProto\Lang::$current_lang['nothing_in_socket']); throw new \danog\MadelineProto\NothingInTheSocketException(\danog\MadelineProto\Lang::$current_lang['nothing_in_socket']);
} }
$packet .= $piece;
} }
return @$this->obfuscated['decryption']->encrypt($packet); return @$this->obfuscated['decryption']->encrypt($packet);
@ -278,10 +279,11 @@ class Connection
case 'https': case 'https':
$packet = ''; $packet = '';
while (strlen($packet) < $length) { while (strlen($packet) < $length) {
$packet .= $this->sock->read($length - strlen($packet)); $piece = $this->sock->read($length - strlen($packet));
if ($packet === false || strlen($packet) === 0) { if ($piece === false || strlen($piece) === 0) {
throw new \danog\MadelineProto\NothingInTheSocketException(\danog\MadelineProto\Lang::$current_lang['nothing_in_socket']); throw new \danog\MadelineProto\NothingInTheSocketException(\danog\MadelineProto\Lang::$current_lang['nothing_in_socket']);
} }
$packet .= $piece;
} }
return $packet; return $packet;

4
src/danog/MadelineProto/DataCenter.php
View File

@ -145,7 +145,7 @@ class DataCenter
return $all ? array_keys((array) $this->dclist[$test][$ipv6]) : array_keys((array) $this->sockets); return $all ? array_keys((array) $this->dclist[$test][$ipv6]) : array_keys((array) $this->sockets);
} }
public function select() public function select($poll = false)
{ {
$read = []; $read = [];
$write = []; $write = [];
@ -153,7 +153,7 @@ class DataCenter
foreach ($this->sockets as $dc_id => $socket) { foreach ($this->sockets as $dc_id => $socket) {
$read[$dc_id] = $socket->getSocket(); $read[$dc_id] = $socket->getSocket();
} }
\Socket::select($read, $write, $except, $this->settings['all']['timeout']); \Socket::select($read, $write, $except, $poll ? 0 : $this->settings['all']['timeout']);
return array_keys($read); return array_keys($read);
} }

6
src/danog/MadelineProto/MTProtoTools/CallHandler.php
View File

@ -143,7 +143,11 @@ trait CallHandler
$server_answer = null; $server_answer = null;
$update_count = 0; $update_count = 0;
$only_updates = false; $only_updates = false;
while ($server_answer === null && $res_count++ < $this->settings['max_tries']['response'] + 1) { $response_tries = $this->settings['max_tries']['response'] + 1;
if ($last_recv) {
$response_tries += (int) floor((time() - $last_recv)/10);
}
while ($server_answer === null && $res_count++ < $response_tries) {
// Loop until we get a response, loop for a max of $this->settings['max_tries']['response'] times // Loop until we get a response, loop for a max of $this->settings['max_tries']['response'] times
try { try {
\danog\MadelineProto\Logger::log('Getting response (try number '.$res_count.' for '.$method.')...', \danog\MadelineProto\Logger::ULTRA_VERBOSE); \danog\MadelineProto\Logger::log('Getting response (try number '.$res_count.' for '.$method.')...', \danog\MadelineProto\Logger::ULTRA_VERBOSE);

24
src/danog/MadelineProto/MTProtoTools/UpdateHandler.php
View File

@ -61,12 +61,13 @@ trait UpdateHandler
$time = microtime(true); $time = microtime(true);
try { try {
if (!$this->is_http($this->datacenter->curdc) || $this->altervista) { if (!$this->is_http($this->datacenter->curdc) && !$this->altervista) {
try { try {
$waiting = $this->datacenter->select(); $waiting = $this->datacenter->select();
$dc = count($waiting) ? $waiting[0] : $this->datacenter->curdc;
$last_recv = $this->datacenter->sockets[$dc]->last_recv;
if (count($waiting)) { if (count($waiting)) {
$tries = 10;
while (count($waiting) && $tries--) {
$dc = $waiting[0];
if (($error = $this->recv_message($dc)) !== true) { if (($error = $this->recv_message($dc)) !== true) {
if ($error === -404) { if ($error === -404) {
if ($this->datacenter->sockets[$dc]->temp_auth_key !== null) { if ($this->datacenter->sockets[$dc]->temp_auth_key !== null) {
@ -81,11 +82,18 @@ trait UpdateHandler
throw new \danog\MadelineProto\RPCErrorException($error, $error); throw new \danog\MadelineProto\RPCErrorException($error, $error);
} }
$only_updates = $this->handle_messages($dc); $only_updates = $this->handle_messages($dc);
$waiting = $this->datacenter->select(true);
}
} else {
$this->get_updates_difference();
} }
} catch (\danog\MadelineProto\NothingInTheSocketException $e) { } catch (\danog\MadelineProto\NothingInTheSocketException $e) {
$this->get_updates_difference();
} }
} else {
$this->get_updates_difference();
} }
if ($this->is_http($dc) || $this->altervista && time() - $this->last_getdifference > $this->settings['updates']['getdifference_interval']) { if (time() - $this->last_getdifference > $this->settings['updates']['getdifference_interval']) {
$this->get_updates_difference(); $this->get_updates_difference();
} }
} catch (\danog\MadelineProto\RPCErrorException $e) { } catch (\danog\MadelineProto\RPCErrorException $e) {
@ -294,7 +302,7 @@ trait UpdateHandler
\danog\MadelineProto\Logger::log('Fetching normal difference...', \danog\MadelineProto\Logger::ULTRA_VERBOSE); \danog\MadelineProto\Logger::log('Fetching normal difference...', \danog\MadelineProto\Logger::ULTRA_VERBOSE);
while (!isset($difference)) { while (!isset($difference)) {
try { try {
$difference = $this->method_call('updates.getDifference', ['pts' => $this->load_update_state()['pts'], 'date' => $this->load_update_state()['date'], 'qts' => $this->load_update_state()['qts']], ['datacenter' => $this->datacenter->curdc]); $difference = $this->method_call('updates.getDifference', ['pts' => $this->load_update_state()['pts'], 'date' => $this->load_update_state()['date'], 'qts' => $this->load_update_state()['qts']], ['datacenter' => $this->settings['connection_settings']['default_dc']]);
} catch (\danog\MadelineProto\PTSException $e) { } catch (\danog\MadelineProto\PTSException $e) {
$this->updates_state['sync_loading'] = false; $this->updates_state['sync_loading'] = false;
$this->got_state = false; $this->got_state = false;
@ -348,8 +356,8 @@ trait UpdateHandler
$this->updates_state['sync_loading'] = true; $this->updates_state['sync_loading'] = true;
try { try {
$data = $this->method_call('updates.getState', [], ['datacenter' => $this->datacenter->curdc]); $data = $this->method_call('updates.getState', [], ['datacenter' => $this->settings['connection_settings']['default_dc']]);
$this->get_cdn_config($this->datacenter->curdc); $this->get_cdn_config( $this->settings['connection_settings']['default_dc']);
} finally { } finally {
$this->updates_state['sync_loading'] = $last; $this->updates_state['sync_loading'] = $last;
} }
@ -565,7 +573,7 @@ trait UpdateHandler
return false; return false;
} }
\danog\MadelineProto\Logger::log('Applying qts: '.$update['qts'].' over current qts '.$cur_state['qts'].', chat id: '.$update['message']['chat_id'], \danog\MadelineProto\Logger::VERBOSE); \danog\MadelineProto\Logger::log('Applying qts: '.$update['qts'].' over current qts '.$cur_state['qts'].', chat id: '.$update['message']['chat_id'], \danog\MadelineProto\Logger::VERBOSE);
$this->method_call('messages.receivedQueue', ['max_qts' => $cur_state['qts'] = $update['qts']], ['datacenter' => $this->datacenter->curdc]); $this->method_call('messages.receivedQueue', ['max_qts' => $cur_state['qts'] = $update['qts']], ['datacenter' => $this->settings['connection_settings']['default_dc']]);
$this->handle_encrypted_update($update); $this->handle_encrypted_update($update);
return; return;