mtproto 0.0.9 → 0.0.11

data/lib/mtproto/tl/objects/update_short.rb

@@ -3,8 +3,6 @@
 module MTProto
   module TL
     class UpdateShort
-      CONSTRUCTOR = 0x78d4dec1
-
       attr_reader :update, :date
 
       def initialize(update, date)

data/lib/mtproto/tl/objects/update_short_message.rb

@@ -3,8 +3,6 @@
 module MTProto
   module TL
     class UpdateShortMessage
-      CONSTRUCTOR = 0x313bc7f8
-
       attr_reader :flags, :id, :user_id, :text, :pts, :pts_count, :date
 
       def initialize(flags:, id:, user_id:, text:, pts:, pts_count:, date:)

data/lib/mtproto/tl/objects/updates_difference.rb

@@ -3,11 +3,6 @@
 module MTProto
   module TL
     class UpdatesDifference
-      CONSTRUCTOR_EMPTY = 0x5d75a138
-      CONSTRUCTOR_DIFFERENCE = 0x00f49ca0
-      CONSTRUCTOR_SLICE = 0xa8fb1981
-      CONSTRUCTOR_TOO_LONG = 0x4afe8f6d
-
       attr_reader :type, :date, :seq, :new_messages, :users, :pts, :state
 
       def initialize(type:, date: nil, seq: nil, new_messages: [], users: [], pts: nil, state: nil)
@@ -24,11 +19,11 @@ module MTProto
         constructor = data[0, 4].unpack1('L<')
 
         case constructor
-        when CONSTRUCTOR_EMPTY
+        when Constructors::UPDATES_DIFFERENCE_EMPTY
           parse_empty(data)
-        when CONSTRUCTOR_DIFFERENCE, CONSTRUCTOR_SLICE
+        when Constructors::UPDATES_DIFFERENCE, Constructors::UPDATES_DIFFERENCE_SLICE
           parse_difference(data, constructor)
-        when CONSTRUCTOR_TOO_LONG
+        when Constructors::UPDATES_DIFFERENCE_TOO_LONG
           new(type: :too_long, pts: data[4, 4].unpack1('L<'))
         else
           warn "Unknown Difference constructor: 0x#{constructor.to_s(16)}, treating as empty"
@@ -57,7 +52,7 @@ module MTProto
           users, = parse_users_vector(data, offset)
 
           new(
-            type: constructor == CONSTRUCTOR_DIFFERENCE ? :difference : :slice,
+            type: constructor == Constructors::UPDATES_DIFFERENCE ? :difference : :slice,
             new_messages: messages,
             users: users
           )
@@ -80,7 +75,7 @@ module MTProto
           msg_constructor = data[offset, 4].unpack1('L<')
           offset += 4
 
-          return [nil, offset] unless msg_constructor == 0x452c0e65
+          return [nil, offset] unless msg_constructor == Constructors::MESSAGE
 
           flags = data[offset, 4].unpack1('L<')
           offset += 4
@@ -108,7 +103,7 @@ module MTProto
           count.times do
             user_constructor = data[offset, 4].unpack1('L<')
             offset += 4
-            next unless user_constructor == 0x20b1422
+            next unless user_constructor == Constructors::USER
 
             flags = data[offset, 4].unpack1('L<')
             offset += 4

data/lib/mtproto/tl/objects/updates_state.rb

@@ -3,8 +3,6 @@
 module MTProto
   module TL
     class UpdatesState
-      CONSTRUCTOR = 0xa56c2a3e
-
       attr_accessor :pts, :qts, :date, :seq, :unread_count
 
       def initialize(pts:, qts:, date:, seq:, unread_count:)
@@ -17,7 +15,7 @@ module MTProto
 
       def self.parse(data)
         constructor = data[0, 4].unpack1('L<')
-        raise UnexpectedConstructorError, constructor unless constructor == CONSTRUCTOR
+        raise UnexpectedConstructorError, constructor unless constructor == Constructors::UPDATES_STATE
 
         offset = 4
         pts = data[offset, 4].unpack1('L<')

data/lib/mtproto/tl/objects/users.rb

@@ -3,15 +3,12 @@
 module MTProto
   module TL
     class Users
-      VECTOR_CONSTRUCTOR = 0x1cb5c415
-      USER_CONSTRUCTOR = 0x020b1422
-
       User = Struct.new(:id, :access_hash, :first_name, :last_name, :username, :phone, :flags, :flags2,
         keyword_init: true)
 
       def self.parse(data)
         constructor = data[0, 4].unpack1('L<')
-        raise "Expected Vector constructor, got 0x#{constructor.to_s(16)}" unless constructor == VECTOR_CONSTRUCTOR
+        raise "Expected Vector constructor, got 0x#{constructor.to_s(16)}" unless constructor == Constructors::VECTOR
 
         offset = 4
         count = data[offset, 4].unpack1('L<')
@@ -21,7 +18,7 @@ module MTProto
         count.times do
           user_constructor = data[offset, 4].unpack1('L<')
           offset += 4
-          next unless user_constructor == USER_CONSTRUCTOR
+          next unless user_constructor == Constructors::USER
 
           flags = data[offset, 4].unpack1('L<')
           offset += 4

data/lib/mtproto/tl/schema.rb

@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+require 'json'
+
+module MTProto
+  module TL
+    class Schema
+      PRIMITIVES = {
+        'int' => 4, 'long' => 8, 'double' => 8,
+        'int128' => 16, 'int256' => 32
+      }.freeze
+
+      def initialize(path)
+        raw = JSON.parse(File.read(path))
+        @constructors = {}
+        raw['constructors'].each do |c|
+          uid = c['id'].to_i & 0xFFFFFFFF
+          @constructors[uid] = c['params']
+        end
+      end
+
+      def skip(data, offset)
+        constructor = data[offset, 4].unpack1('L<')
+        offset += 4
+        skip_params(data, offset, constructor)
+      end
+
+      def skip_vector(data, offset, &block)
+        offset += 4 # vector constructor 0x1cb5c415
+        count = data[offset, 4].unpack1('L<')
+        offset += 4
+        count.times { offset = block ? yield(data, offset) : skip(data, offset) }
+        offset
+      end
+
+      def skip_params(data, offset, constructor)
+        params = @constructors[constructor]
+        raise "Unknown constructor: 0x#{constructor.to_s(16).rjust(8, '0')}" unless params
+
+        flag_values = {}
+
+        params.each do |param|
+          type = param['type']
+
+          if type == '#'
+            flag_values[param['name']] = data[offset, 4].unpack1('L<')
+            offset += 4
+            next
+          end
+
+          if (m = type.match(/\A(\w+)\.(\d+)\?(.+)\z/))
+            flag_name = m[1]
+            bit = m[2].to_i
+            inner_type = m[3]
+            next if inner_type == 'true'
+            next unless flag_values[flag_name]&.anybits?(1 << bit)
+
+            offset = skip_type(data, offset, inner_type)
+          else
+            offset = skip_type(data, offset, type)
+          end
+        end
+        offset
+      end
+
+      private
+
+      def skip_type(data, offset, type)
+        if (size = PRIMITIVES[type])
+          return offset + size
+        end
+
+        case type
+        when 'string', 'bytes'
+          skip_tl_string(data, offset)
+        when 'Bool'
+          offset + 4
+        when /\AVector<(.+)>\z/
+          inner = Regexp.last_match(1)
+          skip_vector(data, offset) { |d, o| skip_type(d, o, inner) }
+        else
+          skip(data, offset)
+        end
+      end
+
+      def skip_tl_string(data, offset)
+        first_byte = data.getbyte(offset)
+        if first_byte == 254
+          len = data.getbyte(offset + 1) |
+                (data.getbyte(offset + 2) << 8) |
+                (data.getbyte(offset + 3) << 16)
+          total = 4 + len
+        else
+          len = first_byte
+          total = 1 + len
+        end
+        padding = (4 - (total % 4)) % 4
+        offset + total + padding
+      end
+    end
+  end
+end

data/lib/mtproto/version.rb

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

data/lib/mtproto.rb

@@ -11,20 +11,16 @@ require_relative 'mtproto/transport/tcp_connection'
 require_relative 'mtproto/transport/connection'
 require_relative 'mtproto/message/message'
 require_relative 'mtproto/tl/constructors'
+require_relative 'mtproto/tl/constructor_names'
 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/tl/objects/message'
+require_relative 'mtproto/tl/objects/msg_container'
+require_relative 'mtproto/tl/objects/new_session_created'
+require_relative 'mtproto/tl/objects/rpc_error'
+require_relative 'mtproto/tl/objects/gzip_packed'
 require_relative 'mtproto/crypto/rsa_key'
 require_relative 'mtproto/crypto/factorization'
 require_relative 'mtproto/crypto/aes_ige'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mtproto
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
 platform: ruby
 authors:
 - Artem Levenkov
@@ -50,6 +50,7 @@ files:
 - ".env.example"
 - ".ruby-version"
 - Rakefile
+- data/tl-schema.json
 - ext/aes_ige/aes_ige.c
 - ext/aes_ige/extconf.rb
 - ext/factorization/extconf.rb
@@ -61,6 +62,8 @@ files:
 - lib/mtproto/client/api.rb
 - lib/mtproto/client/api/check_password.rb
 - lib/mtproto/client/api/export_login_token.rb
+- lib/mtproto/client/api/get_dialogs.rb
+- lib/mtproto/client/api/get_history.rb
 - lib/mtproto/client/api/get_updates_difference.rb
 - lib/mtproto/client/api/get_updates_state.rb
 - lib/mtproto/client/api/get_users.rb
@@ -84,6 +87,7 @@ files:
 - lib/mtproto/message/message.rb
 - lib/mtproto/message_id.rb
 - lib/mtproto/session.rb
+- lib/mtproto/tl/constructor_names.rb
 - lib/mtproto/tl/constructors.rb
 - lib/mtproto/tl/object.rb
 - lib/mtproto/tl/objects/account_password.rb
@@ -91,21 +95,30 @@ files:
 - lib/mtproto/tl/objects/check_password.rb
 - lib/mtproto/tl/objects/client_dh_inner_data.rb
 - lib/mtproto/tl/objects/dh_gen_response.rb
+- lib/mtproto/tl/objects/dialogs.rb
 - lib/mtproto/tl/objects/export_login_token.rb
 - lib/mtproto/tl/objects/get_config.rb
+- lib/mtproto/tl/objects/get_dialogs.rb
 - lib/mtproto/tl/objects/get_difference.rb
+- lib/mtproto/tl/objects/get_history.rb
 - lib/mtproto/tl/objects/get_password.rb
 - lib/mtproto/tl/objects/get_state.rb
 - lib/mtproto/tl/objects/get_users.rb
+- lib/mtproto/tl/objects/gzip_packed.rb
 - lib/mtproto/tl/objects/help_config.rb
 - lib/mtproto/tl/objects/import_login_token.rb
 - lib/mtproto/tl/objects/init_connection.rb
 - lib/mtproto/tl/objects/invoke_with_layer.rb
 - lib/mtproto/tl/objects/login_token.rb
+- lib/mtproto/tl/objects/message.rb
+- lib/mtproto/tl/objects/messages.rb
+- lib/mtproto/tl/objects/msg_container.rb
+- lib/mtproto/tl/objects/new_session_created.rb
 - lib/mtproto/tl/objects/pq_inner_data.rb
 - lib/mtproto/tl/objects/req_dh_params.rb
 - lib/mtproto/tl/objects/req_pq_multi.rb
 - lib/mtproto/tl/objects/res_pq.rb
+- lib/mtproto/tl/objects/rpc_error.rb
 - lib/mtproto/tl/objects/send_code.rb
 - lib/mtproto/tl/objects/sent_code.rb
 - lib/mtproto/tl/objects/server_dh_inner_data.rb
@@ -118,21 +131,12 @@ files:
 - lib/mtproto/tl/objects/updates_difference.rb
 - lib/mtproto/tl/objects/updates_state.rb
 - lib/mtproto/tl/objects/users.rb
+- lib/mtproto/tl/schema.rb
 - lib/mtproto/transport/abridged_packet_codec.rb
 - lib/mtproto/transport/connection.rb
 - lib/mtproto/transport/errors.rb
 - lib/mtproto/transport/packet.rb
 - lib/mtproto/transport/tcp_connection.rb
-- lib/mtproto/type/bad_msg_notification.rb
-- lib/mtproto/type/client_dh_inner_data.rb
-- lib/mtproto/type/gzip_packed.rb
-- lib/mtproto/type/message.rb
-- lib/mtproto/type/msg_container.rb
-- lib/mtproto/type/new_session_created.rb
-- lib/mtproto/type/pq_inner_data.rb
-- lib/mtproto/type/rpc_error.rb
-- lib/mtproto/type/serializer.rb
-- lib/mtproto/type/server_dh_inner_data.rb
 - lib/mtproto/updates_poller.rb
 - lib/mtproto/version.rb
 - scripts/generate_constructors.rb

data/lib/mtproto/type/bad_msg_notification.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-module MTProto
-  module Type
-    class BadMsgNotification
-      CONSTRUCTOR = 0xa7eff811
-
-      attr_reader :bad_msg_id, :bad_msg_seqno, :error_code
-
-      def self.deserialize(data)
-        offset = 4
-        bad_msg_id = data[offset, 8].unpack1('Q<')
-        offset += 8
-
-        bad_msg_seqno = data[offset, 4].unpack1('L<')
-        offset += 4
-
-        error_code = data[offset, 4].unpack1('L<')
-
-        new(bad_msg_id: bad_msg_id, bad_msg_seqno: bad_msg_seqno, error_code: error_code)
-      end
-
-      def initialize(bad_msg_id:, bad_msg_seqno:, error_code:)
-        @bad_msg_id = bad_msg_id
-        @bad_msg_seqno = bad_msg_seqno
-        @error_code = error_code
-      end
-
-      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'
-        else "unknown error code #{@error_code}"
-        end
-      end
-    end
-  end
-end

data/lib/mtproto/type/client_dh_inner_data.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'serializer'
-
-module MTProto
-  module Type
-    class ClientDHInnerData
-      CONSTRUCTOR = 0x6643b654
-
-      attr_reader :nonce, :server_nonce, :retry_id, :g_b
-
-      def initialize(nonce:, server_nonce:, retry_id:, g_b:)
-        @nonce = nonce
-        @server_nonce = server_nonce
-        @retry_id = retry_id
-        @g_b = g_b
-      end
-
-      def serialize
-        data = Serializer.serialize_int(CONSTRUCTOR)
-        data += @nonce
-        data += @server_nonce
-        data += Serializer.serialize_long(@retry_id)
-        data += Serializer.serialize_bytes(@g_b)
-        data
-      end
-    end
-  end
-end

data/lib/mtproto/type/pq_inner_data.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'serializer'
-
-module MTProto
-  module Type
-    class PQInnerData
-      CONSTRUCTOR_DC = 0xa9f55f95
-      CONSTRUCTOR_TEMP_DC = 0x56fddf88
-
-      attr_reader :pq, :p, :q, :nonce, :server_nonce, :new_nonce, :dc, :expires_in
-
-      def initialize(pq:, p:, q:, nonce:, server_nonce:, new_nonce:, dc:, expires_in: nil)
-        @pq = pq
-        @p = p
-        @q = q
-        @nonce = nonce
-        @server_nonce = server_nonce
-        @new_nonce = new_nonce
-        @dc = dc
-        @expires_in = expires_in
-      end
-
-      def serialize
-        constructor = @expires_in ? CONSTRUCTOR_TEMP_DC : CONSTRUCTOR_DC
-
-        data = Serializer.serialize_int(constructor)
-        data += Serializer.serialize_bytes(Serializer.integer_to_bytes(@pq))
-        data += Serializer.serialize_bytes(Serializer.integer_to_bytes(@p))
-        data += Serializer.serialize_bytes(Serializer.integer_to_bytes(@q))
-        data += @nonce
-        data += @server_nonce
-        data += @new_nonce
-
-        data += Serializer.serialize_int(@expires_in) if @expires_in
-
-        data + Serializer.serialize_int(@dc)
-      end
-    end
-  end
-end

data/lib/mtproto/type/serializer.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-module MTProto
-  module Type
-    module Serializer
-      module_function
-
-      def serialize_int(value)
-        [value].pack('L<')
-      end
-
-      def serialize_long(value)
-        [value].pack('Q<')
-      end
-
-      def serialize_int128(value)
-        value.is_a?(String) ? value : [value].pack('Q<Q<')
-      end
-
-      def serialize_int256(value)
-        value.is_a?(String) ? value : [value].pack('Q<Q<Q<Q<')
-      end
-
-      def serialize_bytes(bytes)
-        length = bytes.bytesize
-
-        if length <= 253
-          [length].pack('C').b + bytes.b + padding(length + 1)
-        else
-          [254].pack('C').b + [length].pack('L<')[0, 3].b + bytes.b + padding(length + 4)
-        end
-      end
-
-      def serialize_string(str)
-        serialize_bytes(str)
-      end
-
-      def padding(current_length)
-        pad_length = (4 - (current_length % 4)) % 4
-        ("\x00" * pad_length).b
-      end
-
-      def integer_to_bytes(int)
-        return "\x00" if int.zero?
-
-        bytes = []
-        while int > 0
-          bytes.unshift(int & 0xff)
-          int >>= 8
-        end
-        bytes.pack('C*')
-      end
-    end
-  end
-end

data/lib/mtproto/type/server_dh_inner_data.rb

@@ -1,85 +0,0 @@
-# frozen_string_literal: true
-
-module MTProto
-  module Type
-    class ServerDHInnerData
-      CONSTRUCTOR = 0xb5890dba
-
-      attr_reader :nonce, :server_nonce, :g, :dh_prime, :g_a, :server_time
-
-      def self.deserialize(data)
-        constructor = data[0, 4].unpack1('L<')
-        raise "Unexpected constructor: 0x#{constructor.to_s(16)}" unless constructor == CONSTRUCTOR
-
-        offset = 4
-
-        nonce = data[offset, 16]
-        offset += 16
-
-        server_nonce = data[offset, 16]
-        offset += 16
-
-        g = data[offset, 4].unpack1('L<')
-        offset += 4
-
-        dh_prime_length_byte = data[offset].ord
-        offset += 1
-
-        if dh_prime_length_byte == 254
-          length_bytes = data[offset, 3].bytes
-          dh_prime_length = length_bytes[0] | (length_bytes[1] << 8) | (length_bytes[2] << 16)
-          offset += 3
-        else
-          dh_prime_length = dh_prime_length_byte
-        end
-
-        dh_prime = data[offset, dh_prime_length]
-        offset += dh_prime_length
-        offset += padding_length(dh_prime_length_byte == 254 ? dh_prime_length + 4 : dh_prime_length + 1)
-
-        g_a_length_byte = data[offset].ord
-        offset += 1
-
-        if g_a_length_byte == 254
-          length_bytes = data[offset, 3].bytes
-          g_a_length = length_bytes[0] | (length_bytes[1] << 8) | (length_bytes[2] << 16)
-          offset += 3
-        else
-          g_a_length = g_a_length_byte
-        end
-
-        g_a = data[offset, g_a_length]
-        offset += g_a_length
-        offset += padding_length(g_a_length_byte == 254 ? g_a_length + 4 : g_a_length + 1)
-
-        server_time = data[offset, 4].unpack1('L<')
-
-        new(
-          nonce: nonce,
-          server_nonce: server_nonce,
-          g: g,
-          dh_prime: dh_prime,
-          g_a: g_a,
-          server_time: server_time
-        )
-      end
-
-      def initialize(nonce:, server_nonce:, g:, dh_prime:, g_a:, server_time:)
-        @nonce = nonce
-        @server_nonce = server_nonce
-        @g = g
-        @dh_prime = dh_prime
-        @g_a = g_a
-        @server_time = server_time
-      end
-
-      def self.padding_length(length)
-        (4 - (length % 4)) % 4
-      end
-
-      def padding_length(length)
-        self.class.padding_length(length)
-      end
-    end
-  end
-end