mtproto 0.0.7 → 0.0.9

data/lib/mtproto/transport/tcp_connection.rb

@@ -5,86 +5,97 @@ require 'timeout'
 
 module MTProto
   module Transport
-    class ConnectionError < StandardError; end
-
     class TCPConnection
-      attr_reader :host, :port, :codec
+      attr_reader :host, :port
+      attr_accessor :wait_timeout, :read_timeout
 
-      def initialize(host, port, codec)
+      def initialize(host, port, codec_class: AbridgedPacketCodec, wait_timeout: 60, read_timeout: 3)
         @host = host
         @port = port
-        @codec = codec
+        @codec_class = codec_class
+        @wait_timeout = wait_timeout
+        @read_timeout = read_timeout
         @socket = nil
+        @codec = nil
       end
 
       def connect!
         return if connected?
 
         @socket = TCPSocket.new(@host, @port)
+        @codec = @codec_class.new(@socket)
 
-        send_init_tag if @codec.class.const_defined?(:TAG)
+        write_init_tag
       end
 
-      def connected?
-        !@socket.nil? && !@socket.closed?
+      def disconnect!
+        return unless @socket
+
+        @socket.close
+      rescue StandardError
+        nil
+      ensure
+        @socket = nil
+        @codec = nil
       end
 
-      def send(data)
-        raise ConnectionError, 'Not connected' unless connected?
+      def not_connected?
+        @socket.nil? || @socket.closed?
+      end
 
-        encoded = @codec.encode_packet(data)
-        @socket.write(encoded)
+      def connected?
+        not not_connected?
       end
 
-      def recv(timeout: 60)
-        raise ConnectionError, 'Not connected' unless connected?
+      def send(packet)
+        raise NotConnectedError, 'Not connected' unless connected?
 
-        Timeout.timeout(timeout) do
-          read_packet
-        end
-      rescue Timeout::Error
-        raise ConnectionError, 'Receive timeout'
+        @codec.send(packet)
       end
 
-      def close
-        return unless @socket
+      def receive(&)
+        raise NotConnectedError, 'Not connected' unless connected?
 
-        @socket.close
-      rescue StandardError
-        nil
-      ensure
-        @socket = nil
+        if block_given?
+          receive_loop(&)
+        else
+          receive_once
+        end
       end
 
       private
 
-      def send_init_tag
-        tag = @codec.class.const_get(:TAG)
-        @socket.write(tag) if tag
-      end
+      def receive_once
+        return nil unless @socket.wait_readable(@wait_timeout)
 
-      def read_packet
-        first_byte = read_exactly(1)
-        length = first_byte.unpack1('C')
+        read_packet
+      end
 
-        if length >= 127
-          length_bytes = read_exactly(3)
-          length = (length_bytes + "\x00").unpack1('L<')
+      def receive_loop
+        loop do
+          @socket.wait_readable
+          packet = read_packet
+          yield packet, nil
+        rescue ConnectionClosedError, NotConnectedError
+          raise
+        rescue PacketReadError => e
+          yield nil, e
         end
+      end
 
-        actual_length = length << 2
-        read_exactly(actual_length)
+      def read_packet
+        Timeout.timeout(@read_timeout) { @codec.scan }
+      rescue Timeout::Error
+        raise PacketReadError, 'Packet read timeout'
+      rescue IOError, Errno::ECONNRESET => e
+        raise ConnectionClosedError, e.message
       end
 
-      def read_exactly(bytes_needed)
-        result = ''.b
-        while result.bytesize < bytes_needed
-          chunk = @socket.read(bytes_needed - result.bytesize)
-          raise ConnectionError, 'EOF while reading' if chunk.nil? || chunk.empty?
+      def write_init_tag
+        return unless @codec_class.const_defined?(:TAG)
 
-          result += chunk
-        end
-        result
+        tag = @codec_class.const_get(:TAG)
+        @socket.write tag if tag
       end
     end
   end

data/lib/mtproto/{tl → type}/bad_msg_notification.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module MTProto
-  module TL
+  module Type
     class BadMsgNotification
       CONSTRUCTOR = 0xa7eff811
 
@@ -28,16 +28,16 @@ module MTProto
 
       def error_message
         case @error_code
-        when 16 then "msg_id too low (client time is wrong)"
-        when 17 then "msg_id too high (client time needs sync)"
-        when 18 then "incorrect two lower order msg_id bits (must be divisible by 4)"
-        when 19 then "container msg_id is the same as previously received"
-        when 20 then "message too old"
-        when 32 then "msg_seqno too low"
-        when 33 then "msg_seqno too high"
-        when 34 then "even msg_seqno expected but odd received"
-        when 35 then "odd msg_seqno expected but even received"
-        when 48 then "incorrect server salt"
+        when 16 then 'msg_id too low (client time is wrong)'
+        when 17 then 'msg_id too high (client time needs sync)'
+        when 18 then 'incorrect two lower order msg_id bits (must be divisible by 4)'
+        when 19 then 'container msg_id is the same as previously received'
+        when 20 then 'message too old'
+        when 32 then 'msg_seqno too low'
+        when 33 then 'msg_seqno too high'
+        when 34 then 'even msg_seqno expected but odd received'
+        when 35 then 'odd msg_seqno expected but even received'
+        when 48 then 'incorrect server salt'
         else "unknown error code #{@error_code}"
         end
       end

data/lib/mtproto/{tl → type}/client_dh_inner_data.rb

@@ -3,7 +3,7 @@
 require_relative 'serializer'
 
 module MTProto
-  module TL
+  module Type
     class ClientDHInnerData
       CONSTRUCTOR = 0x6643b654
 

data/lib/mtproto/{tl → type}/gzip_packed.rb

@@ -4,7 +4,7 @@ require 'zlib'
 require 'stringio'
 
 module MTProto
-  module TL
+  module Type
     module GzipPacked
       CONSTRUCTOR = 0x3072cfa1
 
@@ -19,11 +19,11 @@ module MTProto
 
         if length_byte == 254
           length_bytes = data[offset, 3]
-          length = (length_bytes + "\x00").unpack1('L<')
+          length = "#{length_bytes}\u0000".unpack1('L<')
           offset += 3
           puts "    [GZIP] Extended length: #{length} bytes" if $DEBUG
         elsif length_byte == 255
-          raise "Invalid TL string length: 255"
+          raise 'Invalid TL string length: 255'
         else
           length = length_byte
           puts "    [GZIP] Short length: #{length} bytes" if $DEBUG
@@ -32,7 +32,9 @@ module MTProto
         raise "Invalid length: #{length.inspect}" unless length.is_a?(Integer) && length > 0
 
         compressed_data = data[offset, length]
-        raise "Not enough data: expected #{length}, got #{compressed_data&.bytesize}" if compressed_data.nil? || compressed_data.bytesize < length
+        if compressed_data.nil? || compressed_data.bytesize < length
+          raise "Not enough data: expected #{length}, got #{compressed_data&.bytesize}"
+        end
 
         Zlib::GzipReader.new(StringIO.new(compressed_data)).read.force_encoding(Encoding::BINARY)
       end

data/lib/mtproto/{tl → type}/message.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module MTProto
-  module TL
+  module Type
     class Message
       attr_reader :auth_key_id, :msg_id, :body
 
@@ -22,8 +22,8 @@ module MTProto
       def self.deserialize(data)
         if data.bytesize < 20
           raise(ArgumentError,
-            "Invalid MTProto message: expected at least 20 bytes, got #{data.bytesize} bytes (hex: #{data.unpack1('H*')})",
-          )
+            'Invalid MTProto message: expected at least 20 bytes, ' \
+            "got #{data.bytesize} bytes (hex: #{data.unpack1('H*')})")
         end
 
         auth_key_id = data[0, 8].unpack1('Q<')

data/lib/mtproto/{tl → type}/msg_container.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module MTProto
-  module TL
+  module Type
     class MsgContainer
       CONSTRUCTOR = 0x73f1f8dc
 

data/lib/mtproto/{tl → type}/new_session_created.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module MTProto
-  module TL
+  module Type
     class NewSessionCreated
       CONSTRUCTOR = 0x9ec20908
 

data/lib/mtproto/{tl/p_q_inner_data.rb → type/pq_inner_data.rb}

@@ -3,7 +3,7 @@
 require_relative 'serializer'
 
 module MTProto
-  module TL
+  module Type
     class PQInnerData
       CONSTRUCTOR_DC = 0xa9f55f95
       CONSTRUCTOR_TEMP_DC = 0x56fddf88

data/lib/mtproto/{tl → type}/rpc_error.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module MTProto
-  module TL
+  module Type
     class RpcError
       CONSTRUCTOR = 0x2144ca19
 
@@ -16,7 +16,6 @@ module MTProto
         offset += 1
 
         error_message = data[offset, message_length]
-        offset += message_length
 
         new(error_code: error_code, error_message: error_message)
       end

data/lib/mtproto/{tl → type}/serializer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module MTProto
-  module TL
+  module Type
     module Serializer
       module_function
 

data/lib/mtproto/{tl → type}/server_dh_inner_data.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module MTProto
-  module TL
+  module Type
     class ServerDHInnerData
       CONSTRUCTOR = 0xb5890dba
 

data/lib/mtproto/updates_poller.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'rpc/get_updates_state'
-require_relative 'rpc/get_updates_difference'
-
 module MTProto
   class UpdatesPoller
     attr_reader :state, :running
@@ -14,7 +11,7 @@ module MTProto
       @running = false
       @on_message_callbacks = []
       @on_update_callbacks = []
-      @users_cache = {} # Cache user_id => access_hash
+      @users_cache = {}
     end
 
     def on_message(&block)
@@ -27,11 +24,11 @@ module MTProto
 
     def start
       raise 'Already running' if @running
-      raise 'Auth key not generated' unless @client.auth_key
+      raise 'Auth key not set' unless @client.auth_key?
 
       @running = true
 
-      @state = RPC::GetUpdatesState.new(@client).call
+      @state = call_with_retry { @client.api.get_updates_state }
 
       poll_loop
     end
@@ -45,65 +42,72 @@ module MTProto
     def poll_loop
       while @running
         begin
-          difference = RPC::GetUpdatesDifference.new(@client).call(
-            pts: @state[:pts],
-            date: @state[:date],
-            qts: @state[:qts]
-          )
+          difference = call_with_retry do
+            @client.api.get_updates_difference(
+              pts: @state.pts,
+              date: @state.date,
+              qts: @state.qts
+            )
+          end
 
           process_difference(difference)
 
-          if difference[:state]
-            @state = @state.merge(difference[:state])
-          elsif difference[:type] == :too_long
-            @state = RPC::GetUpdatesState.new(@client).call
-          elsif difference[:date]
-            @state[:date] = difference[:date]
+          if difference.state
+            @state = difference.state
+          elsif difference.type == :too_long
+            @state = call_with_retry { @client.api.get_updates_state }
+          elsif difference.date
+            @state.date = difference.date
           end
 
           sleep @poll_interval
         rescue MTProto::RpcError => e
-          puts "RPC Error during polling: #{e.message}"
+          warn "RPC Error during polling: #{e.message}"
           sleep @poll_interval
         rescue StandardError => e
-          puts "Error during polling: #{e.class} - #{e.message}"
-          puts e.backtrace.first(5)
+          warn "Error during polling: #{e.class} - #{e.message}"
+          warn e.backtrace.first(5).join("\n")
           sleep @poll_interval
         end
       end
     end
 
+    def call_with_retry(max_retries: 5)
+      retries = 0
+      begin
+        yield
+      rescue MTProto::UnexpectedConstructorError, RuntimeError
+        retries += 1
+        retry if retries < max_retries
+        raise
+      end
+    end
+
     def process_difference(difference)
-      case difference[:type]
+      case difference.type
       when :empty
         nil
       when :difference, :slice, :short_message
-        if difference[:users]
-          difference[:users].each do |user|
-            if user[:access_hash]
-              @users_cache[user[:id]] = user[:access_hash]
-            end
-          end
+        difference.users&.each do |user|
+          @users_cache[user[:id]] = user[:access_hash] if user[:access_hash]
         end
 
-        if difference[:new_messages] && !difference[:new_messages].empty?
-          difference[:new_messages].each do |message|
+        if difference.new_messages && !difference.new_messages.empty?
+          difference.new_messages.each do |message|
             process_message(message)
           end
         end
 
         @on_update_callbacks.each { |callback| callback.call(difference) }
       when :too_long
-        puts "Update gap too long (pts=#{difference[:pts]}), refreshing state..."
+        puts "Update gap too long (pts=#{difference.pts}), refreshing state..."
       end
     end
 
     def process_message(message)
       return unless message
 
-      if message[:user_id] && @users_cache[message[:user_id]]
-        message[:access_hash] = @users_cache[message[:user_id]]
-      end
+      message[:access_hash] = @users_cache[message[:user_id]] if message[:user_id] && @users_cache[message[:user_id]]
 
       @on_message_callbacks.each { |callback| callback.call(message) }
     end

data/lib/mtproto/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MTProto
-  VERSION = '0.0.7'
+  VERSION = '0.0.9'
 end

data/lib/mtproto.rb

@@ -2,21 +2,29 @@
 
 require_relative 'mtproto/version'
 require_relative 'mtproto/errors'
+require_relative 'mtproto/binary'
+require_relative 'mtproto/delegate_methods'
+require_relative 'mtproto/transport/errors'
+require_relative 'mtproto/transport/packet'
 require_relative 'mtproto/transport/abridged_packet_codec'
 require_relative 'mtproto/transport/tcp_connection'
-require_relative 'mtproto/tl/message'
-require_relative 'mtproto/tl/serializer'
-require_relative 'mtproto/tl/p_q_inner_data'
-require_relative 'mtproto/tl/server_dh_inner_data'
-require_relative 'mtproto/tl/client_dh_inner_data'
-require_relative 'mtproto/tl/bad_msg_notification'
-require_relative 'mtproto/tl/msg_container'
-require_relative 'mtproto/tl/new_session_created'
-require_relative 'mtproto/tl/rpc_error'
-require_relative 'mtproto/tl/gzip_packed'
-require_relative 'mtproto/tl/config'
-require_relative 'mtproto/tl/code_settings'
-require_relative 'mtproto/tl/sent_code'
+require_relative 'mtproto/transport/connection'
+require_relative 'mtproto/message/message'
+require_relative 'mtproto/tl/constructors'
+require_relative 'mtproto/tl/object'
+require_relative 'mtproto/tl/objects/update'
+require_relative 'mtproto/tl/objects/update_short'
+require_relative 'mtproto/tl/objects/update_short_message'
+require_relative 'mtproto/type/message'
+require_relative 'mtproto/type/serializer'
+require_relative 'mtproto/type/pq_inner_data'
+require_relative 'mtproto/type/server_dh_inner_data'
+require_relative 'mtproto/type/client_dh_inner_data'
+require_relative 'mtproto/type/bad_msg_notification'
+require_relative 'mtproto/type/msg_container'
+require_relative 'mtproto/type/new_session_created'
+require_relative 'mtproto/type/rpc_error'
+require_relative 'mtproto/type/gzip_packed'
 require_relative 'mtproto/crypto/rsa_key'
 require_relative 'mtproto/crypto/factorization'
 require_relative 'mtproto/crypto/aes_ige'
@@ -29,15 +37,6 @@ require_relative 'mtproto/auth_key_generator'
 require_relative 'mtproto/session'
 require_relative 'mtproto/encrypted_message'
 require_relative 'mtproto/client'
-require_relative 'mtproto/rpc/ping'
-require_relative 'mtproto/rpc/get_config'
-require_relative 'mtproto/rpc/send_code'
-require_relative 'mtproto/rpc/sign_in'
-require_relative 'mtproto/rpc/get_users'
-require_relative 'mtproto/rpc/send_message'
-require_relative 'mtproto/rpc/get_updates_state'
-require_relative 'mtproto/rpc/get_updates_difference'
-require_relative 'mtproto/rpc/get_contacts'
 require_relative 'mtproto/updates_poller'
 
 module MTProto

data/scripts/generate_constructors.rb

@@ -0,0 +1,65 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'json'
+require 'net/http'
+require 'uri'
+
+SCHEMAS = {
+  'https://core.telegram.org/schema/mtproto-json' => 'MTProto',
+  'https://core.telegram.org/schema/json' => 'API'
+}.freeze
+
+def fetch_schema(url)
+  uri = URI(url)
+  response = Net::HTTP.get(uri)
+  JSON.parse(response)
+end
+
+def signed_to_unsigned(id)
+  id = id.to_i
+  id < 0 ? id + (2**32) : id
+end
+
+entries = {}
+
+SCHEMAS.each do |url, label|
+  schema = fetch_schema(url)
+  puts "#{label}: #{schema['constructors'].size} constructors, #{schema['methods'].size} methods"
+
+  schema['constructors'].each do |c|
+    hex = signed_to_unsigned(c['id'])
+    entries[hex] = c['predicate']
+  end
+
+  schema['methods'].each do |m|
+    hex = signed_to_unsigned(m['id'])
+    entries[hex] = m['method']
+  end
+end
+
+puts "Total: #{entries.size} entries"
+
+lines = entries.sort_by { |hex, _| hex }.map do |hex, name|
+  "        0x#{hex.to_s(16).rjust(8, '0')} => '#{name}'"
+end
+
+output = <<~RUBY
+  # frozen_string_literal: true
+
+  # Auto-generated from Telegram TL schemas.
+  # Run: ruby scripts/generate_constructors.rb
+
+  module MTProto
+    module TL
+      module Constructors
+        NAMES = {
+  #{lines.join(",\n")}
+        }.freeze
+      end
+    end
+  end
+RUBY
+
+File.write(File.expand_path('../lib/mtproto/tl/constructors.rb', __dir__), output)
+puts 'Written to lib/mtproto/tl/constructors.rb'