mtproto 0.0.7 → 0.0.8

data/lib/mtproto/client.rb

@@ -5,13 +5,15 @@ require 'digest'
 require 'base64'
 require_relative 'transport/tcp_connection'
 require_relative 'transport/abridged_packet_codec'
-require_relative 'tl/message'
+require_relative 'type/message'
 require_relative 'client/rpc'
-require_relative 'tl/method_builder'
+require_relative 'type/rpc/help/get_config'
+require_relative 'type/rpc/help/config'
+require_relative 'type/rpc/invoke_with_layer'
+require_relative 'type/rpc/init_connection'
 
 module MTProto
   class Client
-    include TL::MethodBuilder
 
     attr_reader :connection, :server_key, :auth_key, :server_salt, :time_offset, :session, :timeout, :user_id, :access_hash, :dc_number
     attr_accessor :api_id, :api_hash, :device_model, :system_version, :app_version, :system_lang_code, :lang_pack, :lang_code
@@ -50,6 +52,10 @@ module MTProto
       @connection.connect!
     end
 
+    def connected?
+      @connection&.connected?
+    end
+
     def disconnect!
       @connection.close if @connection
     end
@@ -72,8 +78,37 @@ module MTProto
       @rpc ||= RPC.new(self)
     end
 
-    def save_session
-      raise 'Cannot save session: auth_key not set' unless @auth_key
+    def call(body, content_related: true)
+      rpc.call(body, content_related: content_related)
+    end
+
+    def init_connection!
+      return if @connection_initialized
+
+      query = Type::RPC::InvokeWithLayer.build(
+        layer: 214,
+        query: Type::RPC::InitConnection.build(
+          api_id: api_id,
+          device_model: device_model,
+          system_version: system_version,
+          app_version: app_version,
+          system_lang_code: system_lang_code,
+          lang_pack: lang_pack,
+          lang_code: lang_code,
+          query: Type::RPC::Help::GetConfig.build
+        )
+      )
+
+      response = rpc.call_sync(query)
+      config = Type::RPC::Help::Config.parse(response)
+
+      @connection_initialized = true
+
+      config
+    end
+
+    def save_auth_data
+      raise 'Cannot save auth_data: auth_key not set' unless @auth_key
 
       {
         auth_key: Base64.strict_encode64(@auth_key),
@@ -85,18 +120,17 @@ module MTProto
       }
     end
 
-    def load_session(session_data)
-      raise ArgumentError, 'session_data must be a Hash' unless session_data.is_a?(Hash)
-      raise ArgumentError, 'auth_key is required' unless session_data[:auth_key]
-      raise ArgumentError, 'server_salt is required' unless session_data[:server_salt]
+    def load_auth_data(auth_data)
+      raise ArgumentError, 'auth_data must be a Hash' unless auth_data.is_a?(Hash)
+      raise ArgumentError, 'auth_key is required' unless auth_data[:auth_key]
+      raise ArgumentError, 'server_salt is required' unless auth_data[:server_salt]
 
-      @auth_key = Base64.strict_decode64(session_data[:auth_key])
-      @server_salt = session_data[:server_salt]
-      @time_offset = session_data[:time_offset] || 0
-      @user_id = session_data[:user_id]
-      @access_hash = session_data[:access_hash]
+      @auth_key = Base64.strict_decode64(auth_data[:auth_key])
+      @server_salt = auth_data[:server_salt]
+      @time_offset = auth_data[:time_offset] || 0
+      @user_id = auth_data[:user_id]
+      @access_hash = auth_data[:access_hash]
 
-      # Create a fresh session for the new connection
       @session = Session.new
 
       true

data/lib/mtproto/rpc/get_config.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../tl/rpc/help/get_config'
-require_relative '../tl/rpc/help/config'
+require_relative '../type/rpc/help/get_config'
+require_relative '../type/rpc/help/config'
 
 module MTProto
   module RPC
@@ -11,26 +11,23 @@ module MTProto
       end
 
       def call
-        query = TL::RPC::Help::GetConfig.build
-
-        unless @client.instance_variable_get(:@connection_initialized)
-          query = @client.init_connection(
-            api_id: @client.api_id,
-            device_model: @client.device_model,
-            system_version: @client.system_version,
-            app_version: @client.app_version,
-            system_lang_code: @client.system_lang_code,
-            lang_pack: @client.lang_pack,
-            lang_code: @client.lang_code,
-            query: query
-          )
-          query = @client.invoke_with_layer(214, query)
-          @client.instance_variable_set(:@connection_initialized, true)
-        end
-
-        response = @client.rpc.call(query)
-
-        TL::RPC::Help::Config.parse(response)
+        query = build_query
+
+        @client.rpc.call(query)
+      end
+
+      def call_sync
+        query = build_query
+
+        response = @client.rpc.call_sync(query)
+
+        Type::RPC::Help::Config.parse(response)
+      end
+
+      private
+
+      def build_query
+        Type::RPC::Help::GetConfig.build
       end
     end
   end

data/lib/mtproto/rpc/get_contacts.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../tl/rpc/contacts/get_contacts'
-require_relative '../tl/rpc/contacts/contacts'
+require_relative '../type/rpc/contacts/get_contacts'
+require_relative '../type/rpc/contacts/contacts'
 
 module MTProto
   module RPC
@@ -13,9 +13,16 @@ module MTProto
       def call(hash: 0)
         raise 'Auth key not generated' unless @client.auth_key
 
-        query = TL::RPC::Contacts::GetContacts.build(hash: hash)
-        response = @client.rpc.call(query)
-        TL::RPC::Contacts::Contacts.parse(response)
+        query = Type::RPC::Contacts::GetContacts.build(hash: hash)
+        @client.rpc.call(query)
+      end
+
+      def call_sync(hash: 0)
+        raise 'Auth key not generated' unless @client.auth_key
+
+        query = Type::RPC::Contacts::GetContacts.build(hash: hash)
+        response = @client.rpc.call_sync(query)
+        Type::RPC::Contacts::Contacts.parse(response)
       end
     end
   end

data/lib/mtproto/rpc/get_updates_difference.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../tl/rpc/updates/get_difference'
-require_relative '../tl/rpc/updates/difference'
+require_relative '../type/rpc/updates/get_difference'
+require_relative '../type/rpc/updates/difference'
 
 module MTProto
   module RPC
@@ -16,7 +16,7 @@ module MTProto
         raise ArgumentError, 'date is required' if date.nil?
         raise ArgumentError, 'qts is required' if qts.nil?
 
-        query = TL::RPC::Updates::GetDifference.build(
+        query = Type::RPC::Updates::GetDifference.build(
           pts: pts,
           pts_limit: pts_limit,
           pts_total_limit: pts_total_limit,
@@ -25,8 +25,26 @@ module MTProto
           qts_limit: qts_limit
         )
 
-        response = @client.rpc.call(query)
-        TL::RPC::Updates::Difference.parse(response)
+        @client.rpc.call(query)
+      end
+
+      def call_sync(pts:, date:, qts:, pts_limit: 100, qts_limit: 100, pts_total_limit: nil)
+        raise 'Auth key not generated' unless @client.auth_key
+        raise ArgumentError, 'pts is required' if pts.nil?
+        raise ArgumentError, 'date is required' if date.nil?
+        raise ArgumentError, 'qts is required' if qts.nil?
+
+        query = Type::RPC::Updates::GetDifference.build(
+          pts: pts,
+          pts_limit: pts_limit,
+          pts_total_limit: pts_total_limit,
+          date: date,
+          qts: qts,
+          qts_limit: qts_limit
+        )
+
+        response = @client.rpc.call_sync(query)
+        Type::RPC::Updates::Difference.parse(response)
       end
     end
   end

data/lib/mtproto/rpc/get_updates_state.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../tl/rpc/updates/get_state'
-require_relative '../tl/rpc/updates/state'
+require_relative '../type/rpc/updates/get_state'
+require_relative '../type/rpc/updates/state'
 
 module MTProto
   module RPC
@@ -13,9 +13,16 @@ module MTProto
       def call
         raise 'Auth key not generated' unless @client.auth_key
 
-        query = TL::RPC::Updates::GetState.build
-        response = @client.rpc.call(query)
-        TL::RPC::Updates::State.parse(response)
+        query = Type::RPC::Updates::GetState.build
+        @client.rpc.call(query)
+      end
+
+      def call_sync
+        raise 'Auth key not generated' unless @client.auth_key
+
+        query = Type::RPC::Updates::GetState.build
+        response = @client.rpc.call_sync(query)
+        Type::RPC::Updates::State.parse(response)
       end
     end
   end

data/lib/mtproto/rpc/get_users.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../tl/rpc/users/get_users'
-require_relative '../tl/rpc/users/users'
+require_relative '../type/rpc/users/get_users'
+require_relative '../type/rpc/users/users'
 
 module MTProto
   module RPC
@@ -13,9 +13,16 @@ module MTProto
       def call
         raise 'Auth key not generated' unless @client.auth_key
 
-        query = TL::RPC::Users::GetUsers.build
-        response = @client.rpc.call(query)
-        TL::RPC::Users::Users.parse(response)
+        query = Type::RPC::Users::GetUsers.build
+        @client.rpc.call(query)
+      end
+
+      def call_sync
+        raise 'Auth key not generated' unless @client.auth_key
+
+        query = Type::RPC::Users::GetUsers.build
+        response = @client.rpc.call_sync(query)
+        Type::RPC::Users::Users.parse(response)
       end
     end
   end

data/lib/mtproto/rpc/ping.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../tl/rpc/ping'
-require_relative '../tl/rpc/pong'
+require_relative '../type/rpc/ping'
+require_relative '../type/rpc/pong'
 
 module MTProto
   module RPC
@@ -12,10 +12,17 @@ module MTProto
 
       def call(ping_id = nil)
         ping_id ||= rand(2**63)
-        body = TL::RPC::Ping.build(ping_id)
+        body = Type::RPC::Ping.build(ping_id)
 
-        response_body = @client.rpc.call(body)
-        pong = TL::RPC::Pong.parse(response_body)
+        @client.rpc.call(body)
+      end
+
+      def call_sync(ping_id = nil)
+        ping_id ||= rand(2**63)
+        body = Type::RPC::Ping.build(ping_id)
+
+        response_body = @client.rpc.call_sync(body)
+        pong = Type::RPC::Pong.parse(response_body)
 
         raise PingMismatchError unless pong[:ping_id] == ping_id
 

data/lib/mtproto/rpc/send_code.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../tl/rpc/auth/send_code'
-require_relative '../tl/rpc/auth/sent_code'
+require_relative '../type/rpc/auth/send_code'
+require_relative '../type/rpc/auth/sent_code'
 
 module MTProto
   module RPC
@@ -11,33 +11,30 @@ module MTProto
       end
 
       def call(phone_number, code_settings: {})
+        query = build_query(phone_number, code_settings)
+
+        @client.rpc.call(query)
+      end
+
+      def call_sync(phone_number, code_settings: {})
+        query = build_query(phone_number, code_settings)
+
+        response = @client.rpc.call_sync(query)
+
+        Type::RPC::Auth::SentCode.parse(response)
+      end
+
+      private
+
+      def build_query(phone_number, code_settings)
         raise ArgumentError, 'phone_number is required' if phone_number.nil? || phone_number.empty?
 
-        query = TL::RPC::Auth::SendCode.build(
+        Type::RPC::Auth::SendCode.build(
           phone_number: phone_number,
           api_id: @client.api_id,
           api_hash: @client.api_hash,
           code_settings: code_settings
         )
-
-        unless @client.instance_variable_get(:@connection_initialized)
-          query = @client.init_connection(
-            api_id: @client.api_id,
-            device_model: @client.device_model,
-            system_version: @client.system_version,
-            app_version: @client.app_version,
-            system_lang_code: @client.system_lang_code,
-            lang_pack: @client.lang_pack,
-            lang_code: @client.lang_code,
-            query: query
-          )
-          query = @client.invoke_with_layer(214, query)
-          @client.instance_variable_set(:@connection_initialized, true)
-        end
-
-        response = @client.rpc.call(query)
-
-        TL::RPC::Auth::SentCode.parse(response)
       end
     end
   end

data/lib/mtproto/rpc/send_message.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../tl/rpc/messages/send_message'
-require_relative '../tl/rpc/messages/updates'
+require_relative '../type/rpc/messages/send_message'
+require_relative '../type/rpc/messages/updates'
 
 module MTProto
   module RPC
@@ -16,15 +16,31 @@ module MTProto
         raise ArgumentError, 'access_hash is required' if access_hash.nil?
         raise ArgumentError, 'message is required and cannot be empty' if message.nil? || message.empty?
 
-        query = TL::RPC::Messages::SendMessage.build(
+        query = Type::RPC::Messages::SendMessage.build(
           user_id: user_id,
           access_hash: access_hash,
           message: message,
           random_id: random_id
         )
 
-        response = @client.rpc.call(query)
-        TL::RPC::Messages::Updates.parse(response)
+        @client.rpc.call(query)
+      end
+
+      def call_sync(user_id:, access_hash:, message:, random_id: nil)
+        raise 'Auth key not generated' unless @client.auth_key
+        raise ArgumentError, 'user_id is required' if user_id.nil?
+        raise ArgumentError, 'access_hash is required' if access_hash.nil?
+        raise ArgumentError, 'message is required and cannot be empty' if message.nil? || message.empty?
+
+        query = Type::RPC::Messages::SendMessage.build(
+          user_id: user_id,
+          access_hash: access_hash,
+          message: message,
+          random_id: random_id
+        )
+
+        response = @client.rpc.call_sync(query)
+        Type::RPC::Messages::Updates.parse(response)
       end
     end
   end

data/lib/mtproto/rpc/sign_in.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../tl/rpc/auth/sign_in'
-require_relative '../tl/rpc/auth/authorization'
+require_relative '../type/rpc/auth/sign_in'
+require_relative '../type/rpc/auth/authorization'
 
 module MTProto
   module RPC
@@ -11,42 +11,38 @@ module MTProto
       end
 
       def call(phone_number:, phone_code_hash:, phone_code:)
-        raise ArgumentError, 'phone_number is required' if phone_number.nil? || phone_number.empty?
-        raise ArgumentError, 'phone_code_hash is required' if phone_code_hash.nil? || phone_code_hash.empty?
-        raise ArgumentError, 'phone_code is required' if phone_code.nil? || phone_code.empty?
+        query = build_query(phone_number, phone_code_hash, phone_code)
 
-        query = TL::RPC::Auth::SignIn.build(
-          phone_number: phone_number,
-          phone_code_hash: phone_code_hash,
-          phone_code: phone_code
-        )
+        @client.rpc.call(query)
+      end
 
-        unless @client.instance_variable_get(:@connection_initialized)
-          query = @client.init_connection(
-            api_id: @client.api_id,
-            device_model: @client.device_model,
-            system_version: @client.system_version,
-            app_version: @client.app_version,
-            system_lang_code: @client.system_lang_code,
-            lang_pack: @client.lang_pack,
-            lang_code: @client.lang_code,
-            query: query
-          )
-          query = @client.invoke_with_layer(214, query)
-          @client.instance_variable_set(:@connection_initialized, true)
-        end
+      def call_sync(phone_number:, phone_code_hash:, phone_code:)
+        query = build_query(phone_number, phone_code_hash, phone_code)
 
-        response = @client.rpc.call(query)
+        response = @client.rpc.call_sync(query)
 
-        result = TL::RPC::Auth::Authorization.parse(response)
+        result = Type::RPC::Auth::Authorization.parse(response)
 
-        # Update client with user data if authorization was successful
         if result[:authorization] && result[:user_id]
           @client.update_user(user_id: result[:user_id], access_hash: result[:access_hash])
         end
 
         result
       end
+
+      private
+
+      def build_query(phone_number, phone_code_hash, phone_code)
+        raise ArgumentError, 'phone_number is required' if phone_number.nil? || phone_number.empty?
+        raise ArgumentError, 'phone_code_hash is required' if phone_code_hash.nil? || phone_code_hash.empty?
+        raise ArgumentError, 'phone_code is required' if phone_code.nil? || phone_code.empty?
+
+        Type::RPC::Auth::SignIn.build(
+          phone_number: phone_number,
+          phone_code_hash: phone_code_hash,
+          phone_code: phone_code
+        )
+      end
     end
   end
 end

data/lib/mtproto/{tl → type}/auth_key/dh_gen_response.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module MTProto
-  module TL
+  module Type
     module AuthKey
       class DHGenResponse
         CONSTRUCTOR_DH_GEN_OK = 0x3bcbf734

data/lib/mtproto/{tl → type}/auth_key/req_dh_params.rb

@@ -3,7 +3,7 @@
 require_relative '../serializer'
 
 module MTProto
-  module TL
+  module Type
     module AuthKey
       class ReqDHParams
         CONSTRUCTOR = 0xd712e4be

data/lib/mtproto/{tl → type}/auth_key/req_pq_multi.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module MTProto
-  module TL
+  module Type
     module AuthKey
       class ReqPqMulti
         CONSTRUCTOR = 0xbe7e8ef1

data/lib/mtproto/{tl → type}/auth_key/res_pq.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module MTProto
-  module TL
+  module Type
     module AuthKey
       class ResPq
         CONSTRUCTOR = 0x05162463

data/lib/mtproto/{tl → type}/auth_key/server_dh_params.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module MTProto
-  module TL
+  module Type
     module AuthKey
       class ServerDHParams
         CONSTRUCTOR = 0xd0e8075c

data/lib/mtproto/{tl → type}/auth_key/set_client_dh_params.rb

@@ -3,7 +3,7 @@
 require_relative '../serializer'
 
 module MTProto
-  module TL
+  module Type
     module AuthKey
       class SetClientDHParams
         CONSTRUCTOR = 0xf5045f1f

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
 

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}/code_settings.rb

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

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module MTProto
-  module TL
+  module Type
     class Config
       CONSTRUCTOR = 0xcc1a241e
       CONSTRUCTOR_ALT = 0x3072cfa1

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
 

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
 

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