Huge performance improvements and bugfixes

src/danog/MadelineProto/APIFactory.php

@@ -92,7 +92,7 @@ class APIFactory
 
     public function __call($name, $arguments)
     {
-        $this->API->get_config();
+        $this->API->get_config([], ['datacenter' => $this->API->datacenter->curdc]);
 
         return method_exists($this->API, $this->namespace.$name) ? $this->API->{$this->namespace.$name}(...$arguments) : $this->API->method_call($this->namespace.$name, (isset($arguments[0]) && is_array($arguments[0])) ? $arguments[0] : [], (isset($arguments[1]) && is_array($arguments[1])) ? $arguments[1] : ['datacenter' => $this->API->datacenter->curdc]);
     }

src/danog/MadelineProto/MTProto.php

@@ -143,7 +143,7 @@ class MTProto
 
     public function __wakeup()
     {
-        if (debug_backtrace()[0]['file'] === __DIR__.'/Threads/SocketReader.php' || (debug_backtrace()[0]['file'] === __FILE__ && debug_backtrace()[0]['line'] === 117)) {
+        if (isset(debug_backtrace()[0]['file']) && (debug_backtrace()[0]['file'] === __DIR__.'/Threads/SocketReader.php' || (debug_backtrace()[0]['file'] === __FILE__ && debug_backtrace()[0]['line'] === 117))) {
             return;
         }
         $this->bigint = PHP_INT_SIZE < 8;

src/danog/MadelineProto/MTProtoTools/AckHandler.php

@@ -22,8 +22,6 @@ trait AckHandler
         // The server acknowledges that it received my message
         if (!isset($this->datacenter->sockets[$datacenter]->outgoing_messages[$message_id])) {
             \danog\MadelineProto\Logger::log(["WARNING: Couldn't find message id ".$message_id.' in the array of outgoing messages. Maybe try to increase its size?'], \danog\MadelineProto\Logger::WARNING);
-            var_dump($message_id);
-            var_dump(debug_backtrace()[0]['file'], debug_backtrace()[0]['line']);
 
             return false;
         }

src/danog/MadelineProto/MTProtoTools/CallHandler.php

@@ -105,7 +105,6 @@ trait CallHandler
                                 $this->init_authorization();
                                 continue 3;
                         }
-var_dump($this->datacenter->sockets[$aargs['datacenter']]->outgoing_messages);
                         throw new \danog\MadelineProto\RPCErrorException('Received bad_msg_notification: '.$this->bad_msg_error_codes[$server_answer['error_code']], $server_answer['error_code']);
                         break;
                     case 'boolTrue':

src/danog/MadelineProto/MTProtoTools/PeerHandler.php

@@ -90,7 +90,10 @@ trait PeerHandler
 
     public function peer_isset($id)
     {
+    
         try {
+        
+        
             return isset($this->chats[$this->get_info($id)['bot_api_id']]);
         } catch (\danog\MadelineProto\Exception $e) {
             return false;
@@ -134,6 +137,7 @@ trait PeerHandler
 
     public function get_info($id, $recursive = true)
     {
+    
         if (is_array($id)) {
             switch ($id['_']) {
                 case 'inputUserSelf':
@@ -181,6 +185,7 @@ trait PeerHandler
             }
         }
 
+        
         if (preg_match('/^channel#/', $id)) {
             $id = preg_replace('|\D+|', '-100', $id);
         }
@@ -202,7 +207,10 @@ trait PeerHandler
                     return $this->gen_all($this->chats[$id]);
                 }
             }
-            $dbres = json_decode(file_get_contents('https://id.pwrtelegram.xyz/db/getusername?id='.$id), true);
+            $dbres = json_decode(file_get_contents('https://id.pwrtelegram.xyz/db/getusername?id='.$id, false, stream_context_create(['http'=> [
+                    'timeout' => 1,
+                ],
+            ])), true);
             if ($dbres['ok']) {
                 return $this->get_info('@'.$dbres['result']);
             }

src/danog/MadelineProto/MTProtoTools/ResponseHandler.php

@@ -70,15 +70,15 @@ trait ResponseHandler
 
     public function handle_messages($datacenter)
     {
-        $only_updates = false;
-        $first = true;
+        $only_updates = true;
         foreach ($this->datacenter->sockets[$datacenter]->new_incoming as $current_msg_id) {
-            $last_was_updates = false;
             $unset = false;
             \danog\MadelineProto\Logger::log(['Received '.$this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['_'].'.'], \danog\MadelineProto\Logger::VERBOSE);
 
             switch ($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['_']) {
                 case 'msgs_ack':
+                    $this->check_in_seq_no($datacenter, $current_msg_id);
+                    $only_updates = false;
                     foreach ($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['msg_ids'] as $msg_id) {
                         $this->ack_outgoing_message_id($msg_id, $datacenter); // Acknowledge that the server received my message
                     }
@@ -92,19 +92,27 @@ trait ResponseHandler
                     unset($this->datacenter->sockets[$datacenter]->new_incoming[$current_msg_id]);
                     unset($this->datacenter->sockets[$datacenter]->new_outgoing[$this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['req_msg_id']]);
                     $this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content'] = $this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['result'];
+                    $this->check_in_seq_no($datacenter, $current_msg_id);
+                    $only_updates = false;
                     break;
                 case 'future_salts':
+                    $this->check_in_seq_no($datacenter, $current_msg_id);
+                    $only_updates = false;
                     $this->ack_outgoing_message_id($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['req_msg_id'], $datacenter); // Acknowledge that the server received my request
                     $this->datacenter->sockets[$datacenter]->outgoing_messages[$this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['req_msg_id']]['response'] = $current_msg_id;
                     unset($this->datacenter->sockets[$datacenter]->new_incoming[$current_msg_id]);
                     unset($this->datacenter->sockets[$datacenter]->new_outgoing[$this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['req_msg_id']]);
                     break;
                 case 'rpc_error':
+                    $this->check_in_seq_no($datacenter, $current_msg_id);
+                    $only_updates = false;
                     $this->handle_rpc_error($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content'], $datacenter);
                     break;
 
                 case 'bad_server_salt':
                 case 'bad_msg_notification':
+                    $this->check_in_seq_no($datacenter, $current_msg_id);
+                    $only_updates = false;
                     $this->ack_outgoing_message_id($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['bad_msg_id'], $datacenter); // Acknowledge that the server received my request
                     $this->datacenter->sockets[$datacenter]->outgoing_messages[$this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['bad_msg_id']]['response'] = $current_msg_id;
                     unset($this->datacenter->sockets[$datacenter]->new_incoming[$current_msg_id]);
@@ -112,6 +120,8 @@ trait ResponseHandler
                     break;
 
                 case 'pong':
+                    $this->check_in_seq_no($datacenter, $current_msg_id);
+                    $only_updates = false;
                     foreach ($this->datacenter->sockets[$datacenter]->outgoing_messages as $msg_id => &$omessage) {
                         if (isset($omessage['content']['args']['ping_id']) && $omessage['content']['args']['ping_id'] === $this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['ping_id']) {
                             $this->ack_outgoing_message_id($msg_id, $datacenter);
@@ -123,6 +133,8 @@ trait ResponseHandler
                     }
                     break;
                 case 'new_session_created':
+                    $this->check_in_seq_no($datacenter, $current_msg_id);
+                    $only_updates = false;
                     $this->datacenter->sockets[$datacenter]->temp_auth_key['server_salt'] = $this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['server_salt'];
                     $this->ack_incoming_message_id($current_msg_id, $datacenter); // Acknowledge that I received the server's response
                     if ($this->authorized) {
@@ -141,8 +153,12 @@ trait ResponseHandler
                         $this->handle_messages($datacenter);
                     }
                     $unset = true;
+                    $this->check_in_seq_no($datacenter, $current_msg_id);
+                    $only_updates = false;
                     break;
                 case 'msg_copy':
+                    $this->check_in_seq_no($datacenter, $current_msg_id);
+                    $only_updates = false;
                     $this->ack_incoming_message_id($current_msg_id, $datacenter); // Acknowledge that I received the server's response
                     if (isset($this->datacenter->sockets[$datacenter]->incoming_messages[$this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['orig_message']['msg_id']])) {
                         $this->ack_incoming_message_id($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['orig_message']['msg_id'], $datacenter); // Acknowledge that I received the server's response
@@ -157,22 +173,30 @@ trait ResponseHandler
                     $unset = true;
                     break;
                 case 'http_wait':
+                    $this->check_in_seq_no($datacenter, $current_msg_id);
+                    $only_updates = false;
 
                     \danog\MadelineProto\Logger::log([$this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']], \danog\MadelineProto\Logger::NOTICE);
                     unset($this->datacenter->sockets[$datacenter]->new_incoming[$current_msg_id]);
                     $unset = true;
                     break;
                 case 'msgs_state_info':
+                    $this->check_in_seq_no($datacenter, $current_msg_id);
+                    $only_updates = false;
                     $this->datacenter->sockets[$datacenter]->outgoing_messages[$this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['req_msg_id']]['response'] = $current_msg_id;
                     unset($this->datacenter->sockets[$datacenter]->new_incoming[$current_msg_id]);
                     unset($this->datacenter->sockets[$datacenter]->new_outgoing[$this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['req_msg_id']]);
                     $unset = true;
                     break;
                 case 'msgs_state_req':
+                    $this->check_in_seq_no($datacenter, $current_msg_id);
+                    $only_updates = false;
                     unset($this->datacenter->sockets[$datacenter]->new_incoming[$current_msg_id]);
                     $this->send_msgs_state_info($current_msg_id, $this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['msg_ids'], $datacenter);
                     break;
                 case 'msgs_all_info':
+                    $this->check_in_seq_no($datacenter, $current_msg_id);
+                    $only_updates = false;
                     unset($this->datacenter->sockets[$datacenter]->new_incoming[$current_msg_id]);
 
                     foreach ($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['msg_ids'] as $key => $msg_id) {
@@ -190,6 +214,8 @@ trait ResponseHandler
                     }
                     break;
                 case 'msg_detailed_info':
+                    $this->check_in_seq_no($datacenter, $current_msg_id);
+                    $only_updates = false;
                     if (isset($this->datacenter->sockets[$datacenter]->outgoing_messages[$this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['msg_id']])) {
                         if (isset($this->datacenter->sockets[$datacenter]->incoming_messages[$this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['answer_msg_id']])) {
                             $this->datacenter->sockets[$datacenter]->outgoing_messages[$this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['msg_id']]['response'] = $this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['answer_msg_id'];
@@ -197,12 +223,16 @@ trait ResponseHandler
                         }
                     }
                 case 'msg_new_detailed_info':
+                    $this->check_in_seq_no($datacenter, $current_msg_id);
+                    $only_updates = false;
                     if (isset($this->datacenter->sockets[$datacenter]->incoming_messages[$this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['answer_msg_id']])) {
                         $this->ack_incoming_message_id($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['answer_msg_id'], $datacenter);
                     }
                     unset($this->datacenter->sockets[$datacenter]->new_incoming[$current_msg_id]);
                     break;
                 case 'msg_resend_req':
+                    $this->check_in_seq_no($datacenter, $current_msg_id);
+                    $only_updates = false;
                     $ok = true;
                     unset($this->datacenter->sockets[$datacenter]->new_incoming[$current_msg_id]);
                     foreach ($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['msg_ids'] as $msg_id) {
@@ -219,6 +249,8 @@ trait ResponseHandler
                     }
                     break;
                 case 'msg_resend_ans_req':
+                    $this->check_in_seq_no($datacenter, $current_msg_id);
+                    $only_updates = false;
                     unset($this->datacenter->sockets[$datacenter]->new_incoming[$current_msg_id]);
                     $this->send_msgs_state_info($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['msg_ids'], $datacenter);
                     foreach ($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['msg_ids'] as $msg_id) {
@@ -228,6 +260,7 @@ trait ResponseHandler
                     }
                     break;
                 default:
+                    $this->check_in_seq_no($datacenter, $current_msg_id);
                     $this->ack_incoming_message_id($current_msg_id, $datacenter); // Acknowledge that I received the server's response
                     $response_type = $this->constructors->find_by_predicate($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['_'])['type'];
                     switch ($response_type) {
@@ -235,9 +268,10 @@ trait ResponseHandler
                             unset($this->datacenter->sockets[$datacenter]->new_incoming[$current_msg_id]);
                             $unset = true;
                             $this->handle_updates($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']);
-                            $last_was_updates = true;
+                            $only_updates = true && $only_updates;
                             break;
                         default:
+                            $only_updates = false;
                             \danog\MadelineProto\Logger::log(['Trying to assign a response of type '.$response_type.' to its request...'], \danog\MadelineProto\Logger::VERBOSE);
                             foreach ($this->datacenter->sockets[$datacenter]->new_outgoing as $key => $expecting) {
                                 \danog\MadelineProto\Logger::log(['Does the request of return type '.$expecting['type'].' match?'], \danog\MadelineProto\Logger::VERBOSE);
@@ -256,6 +290,7 @@ trait ResponseHandler
                     }
                     break;
             }
+            
             if (isset($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['users'])) {
                 $this->add_users($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['users']);
             }
@@ -276,12 +311,6 @@ trait ResponseHandler
 
                 }
             }
-            $only_updates = ($only_updates || $first) && $last_was_updates;
-            $first = false;
-//var_dump($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['_']);
-            if (isset($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['seq_no']) && ($seq_no = $this->generate_in_seq_no($datacenter, $this->content_related($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['_']))) !== $this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['seq_no']) {
-                //throw new \danog\MadelineProto\SecurityException('Seqno mismatch (should be '.$seq_no.', is '.$this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['seq_no']);
-            }
             if ($unset) {
                 unset($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]);
             }

src/danog/MadelineProto/MTProtoTools/SeqNoHandler.php

@@ -25,13 +25,17 @@ trait SeqNoHandler
 
         return ($value * 2) + $in;
     }
-
+    public function check_in_seq_no($datacenter, $current_msg_id) {
+    
+                    if (isset($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['seq_no']) && ($seq_no = $this->generate_in_seq_no($datacenter, $this->content_related($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['_']))) !== $this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['seq_no']) {
+                        \danog\MadelineProto\Logger::log(['Seqno mismatch (should be '.$seq_no.', is '.$this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['seq_no'].', '.$this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['_'].')'], \danog\MadelineProto\Logger::ERROR);
+                    }
+    }
     public function generate_in_seq_no($datacenter, $content_related)
     {
         $in = $content_related ? 1 : 0;
         $value = $this->datacenter->sockets[$datacenter]->session_in_seq_no;
         $this->datacenter->sockets[$datacenter]->session_in_seq_no += $in;
-
         return ($value * 2) + $in;
     }
 

src/danog/MadelineProto/MTProtoTools/UpdateHandler.php

@@ -308,6 +308,7 @@ trait UpdateHandler
             case 'updateEditMessage':
             case 'updateNewChannelMessage':
             case 'updateEditChannelMessage':
+            
                 if ((isset($update['message']['from_id']) && !$this->peer_isset($update['message']['from_id'])) ||
                     !$this->peer_isset($update['message']['to_id']) ||
                     (isset($update['message']['via_bot_id']) && !$this->peer_isset($update['message']['via_bot_id'])) ||
@@ -345,7 +346,7 @@ trait UpdateHandler
             if ($update['pts'] > $new_pts) {
                 \danog\MadelineProto\Logger::log(['Pts hole. current pts: '.$cur_state['pts'].', pts count: '.(isset($update['pts_count']) ? $update['pts_count'] : 0).', new pts: '.$new_pts.' < update pts: '.$update['pts'].', channel id: '.$channel_id], \danog\MadelineProto\Logger::ERROR);
 
-                $this->cur_state['pending_pts_updates'] = arrray_merge($this->cur_state['pending_pts_updates'], [$update]);
+                $this->cur_state['pending_pts_updates'][] = $update;
 
                 if ($channel_id !== false && $this->peer_isset('-100'.$channel_id)) {
                     $this->get_channel_difference($channel_id);

src/danog/MadelineProto/TL/Conversion/Extension.php

@@ -417,8 +417,7 @@ trait Extension
 
     public function get_extension_from_location($location, $default)
     {
-        $this->switch_dc($location['dc_id']);
-        $res = $this->method_call('upload.getFile', ['location' => $location, 'offset' => 0, 'limit' => 1], ['heavy' => true]);
+        $res = $this->method_call('upload.getFile', ['location' => $location, 'offset' => 0, 'limit' => 1], ['heavy' => true, 'datacenter' => $location['dc_id']]);
         if (!isset($res['type']['_'])) {
             return $default;
         }

src/danog/MadelineProto/Threads/SocketReader.php

@@ -59,7 +59,7 @@ class SocketReader extends \Threaded implements \Collectable
             try {
                 $this->API->recv_message($this->current);
                 $this->handler_pool->submit(new SocketHandler($this->API, $this->current));
-            } catch (\danog\MadelineProto\NothingInTheSocketException $e) {
+            } catch (\danog\MadelineProto\Exception $e) {
             }
         }
         $this->setGarbage();

tests/testing.php

@@ -69,7 +69,7 @@ $message = (getenv('TRAVIS_COMMIT') == '') ? 'I iz works always (io laborare sem
 echo 'Serializing MadelineProto to session.madeline...'.PHP_EOL;
 echo 'Wrote '.\danog\MadelineProto\Serialization::serialize('session.madeline', $MadelineProto).' bytes'.PHP_EOL;
 echo 'Size of MadelineProto instance is '.strlen(serialize($MadelineProto)).' bytes'.PHP_EOL;
-readline();
+
 
 $mention = $MadelineProto->get_info(getenv('TEST_USERNAME')); // Returns an array with all of the constructors that can be extracted from a username or an id
 $mention = $mention['user_id']; // Selects only the numeric user id
@@ -117,7 +117,7 @@ foreach (json_decode(getenv('TEST_DESTINATION_GROUPS'), true) as $peer) {
     \danog\MadelineProto\Logger::log([$sentMessage], \danog\MadelineProto\Logger::NOTICE);
     foreach ($media as $type => $inputMedia) {
         $type = $MadelineProto->messages->sendMedia(['peer' => $peer, 'media' => $inputMedia]);
-        var_dump($MadelineProto->API->MTProto_to_botAPI(end($type['updates'])));
+        
     }
 }