mtproto 0.0.8 → 0.0.10

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_sync
+      @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_sync(
-            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_sync
-          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.8'
+  VERSION = '0.0.10'
 end

data/lib/mtproto.rb

@@ -2,21 +2,25 @@
 
 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/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/type/config'
-require_relative 'mtproto/type/code_settings'
-require_relative 'mtproto/type/sent_code'
+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/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'
@@ -29,21 +33,7 @@ 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'
-require_relative 'mtproto/async/request'
-require_relative 'mtproto/async/request_queue'
-require_relative 'mtproto/async/middleware/base'
-require_relative 'mtproto/async/middleware/flood_wait'
-require_relative 'mtproto/async_client'
 
 module MTProto
 end

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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mtproto
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.10
 platform: ruby
 authors:
 - Artem Levenkov
@@ -10,57 +10,68 @@ cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: base64
+  name: async
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: base64
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.2'
 description: A Ruby library for Telegram MTProto protocol with TCP abridged transport
   support
 email:
 - me@alev.pro
 executables: []
-extensions: []
+extensions:
+- ext/aes_ige/extconf.rb
+- ext/factorization/extconf.rb
 extra_rdoc_files: []
 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
 - ext/factorization/factorization.c
 - lib/mtproto.rb
-- lib/mtproto/async/middleware/base.rb
-- lib/mtproto/async/middleware/flood_wait.rb
-- lib/mtproto/async/request.rb
-- lib/mtproto/async/request_queue.rb
-- lib/mtproto/async_client.rb
 - lib/mtproto/auth_key_generator.rb
+- lib/mtproto/binary.rb
 - lib/mtproto/client.rb
+- 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
+- lib/mtproto/client/api/import_login_token.rb
+- lib/mtproto/client/api/send_code.rb
+- lib/mtproto/client/api/sign_in.rb
 - lib/mtproto/client/rpc.rb
+- lib/mtproto/client/rpc/response.rb
 - lib/mtproto/crypto/aes_ige.rb
 - lib/mtproto/crypto/auth_key_helper.rb
 - lib/mtproto/crypto/dh_key_exchange.rb
@@ -69,62 +80,66 @@ files:
 - lib/mtproto/crypto/message_key.rb
 - lib/mtproto/crypto/rsa_key.rb
 - lib/mtproto/crypto/rsa_pad.rb
+- lib/mtproto/crypto/srp.rb
+- lib/mtproto/delegate_methods.rb
 - lib/mtproto/encrypted_message.rb
 - lib/mtproto/errors.rb
+- lib/mtproto/message/message.rb
 - lib/mtproto/message_id.rb
-- lib/mtproto/rpc/get_config.rb
-- lib/mtproto/rpc/get_contacts.rb
-- lib/mtproto/rpc/get_updates_difference.rb
-- lib/mtproto/rpc/get_updates_state.rb
-- lib/mtproto/rpc/get_users.rb
-- lib/mtproto/rpc/ping.rb
-- lib/mtproto/rpc/send_code.rb
-- lib/mtproto/rpc/send_message.rb
-- lib/mtproto/rpc/sign_in.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
+- lib/mtproto/tl/objects/authorization.rb
+- 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
+- lib/mtproto/tl/objects/server_dh_params.rb
+- lib/mtproto/tl/objects/set_client_dh_params.rb
+- lib/mtproto/tl/objects/sign_in.rb
+- lib/mtproto/tl/objects/update.rb
+- lib/mtproto/tl/objects/update_short.rb
+- lib/mtproto/tl/objects/update_short_message.rb
+- 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/auth_key/dh_gen_response.rb
-- lib/mtproto/type/auth_key/req_dh_params.rb
-- lib/mtproto/type/auth_key/req_pq_multi.rb
-- lib/mtproto/type/auth_key/res_pq.rb
-- lib/mtproto/type/auth_key/server_dh_params.rb
-- lib/mtproto/type/auth_key/set_client_dh_params.rb
-- lib/mtproto/type/bad_msg_notification.rb
-- lib/mtproto/type/client_dh_inner_data.rb
-- lib/mtproto/type/code_settings.rb
-- lib/mtproto/type/config.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/auth/authorization.rb
-- lib/mtproto/type/rpc/auth/send_code.rb
-- lib/mtproto/type/rpc/auth/sent_code.rb
-- lib/mtproto/type/rpc/auth/sign_in.rb
-- lib/mtproto/type/rpc/contacts/contacts.rb
-- lib/mtproto/type/rpc/contacts/get_contacts.rb
-- lib/mtproto/type/rpc/help/config.rb
-- lib/mtproto/type/rpc/help/get_config.rb
-- lib/mtproto/type/rpc/init_connection.rb
-- lib/mtproto/type/rpc/invoke_with_layer.rb
-- lib/mtproto/type/rpc/messages/send_message.rb
-- lib/mtproto/type/rpc/messages/updates.rb
-- lib/mtproto/type/rpc/ping.rb
-- lib/mtproto/type/rpc/pong.rb
-- lib/mtproto/type/rpc/updates/difference.rb
-- lib/mtproto/type/rpc/updates/get_difference.rb
-- lib/mtproto/type/rpc/updates/get_state.rb
-- lib/mtproto/type/rpc/updates/state.rb
-- lib/mtproto/type/rpc/users/get_users.rb
-- lib/mtproto/type/rpc/users/users.rb
-- lib/mtproto/type/rpc_error.rb
-- lib/mtproto/type/sent_code.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
 - tmp/.keep
 homepage: https://github.com/alev-pro/mtproto-ruby
 licenses:

data/lib/mtproto/async/middleware/base.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module MTProto
-  module Async
-    module Middleware
-      class Base
-        def initialize(app)
-          @app = app
-        end
-
-        def call(request, future, retry_fn, retries)
-          @app.call(request, future, retry_fn, retries)
-        end
-      end
-    end
-  end
-end

data/lib/mtproto/async/middleware/flood_wait.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'base'
-
-module MTProto
-  module Async
-    module Middleware
-      class FloodWait < Base
-        def initialize(app, max_retries: 5)
-          super(app)
-          @max_retries = max_retries
-        end
-
-        def call(request, future, retry_fn, retries)
-          wrapped = @app.call(request, future, retry_fn, retries)
-
-          wrapped.rescue do |error|
-            if flood_wait_error?(error) && retries < @max_retries
-              delay = extract_delay(error.error_message)
-              sleep(delay)
-              retry_fn.call.value!
-            else
-              raise error
-            end
-          end
-        end
-
-        private
-
-        def flood_wait_error?(error)
-          error.is_a?(MTProto::RpcError) &&
-            error.error_code == 420 &&
-            error.error_message.start_with?('FLOOD_WAIT_')
-        end
-
-        def extract_delay(error_message)
-          error_message[11..-1].to_i
-        end
-      end
-    end
-  end
-end

data/lib/mtproto/async/request.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module MTProto
-  module Async
-    class Request
-      attr_reader :body, :metadata
-
-      def initialize(body:, metadata: {})
-        @body = body
-        @metadata = metadata
-      end
-
-      def key
-        metadata[:key] || :default
-      end
-    end
-  end
-end

data/lib/mtproto/async/request_queue.rb

@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-
-require 'concurrent-ruby'
-
-module MTProto
-  module Async
-    class RequestQueue
-      def initialize
-        @queues = Concurrent::Hash.new
-        @threads = Concurrent::Hash.new
-        @running = Concurrent::AtomicBoolean.new(true)
-      end
-
-      def call(key:, &blk)
-        ensure_worker_running!(key)
-
-        future = Concurrent::Promises.resolvable_future
-        @queues[key] << [blk, future]
-        future
-      end
-
-      def shutdown
-        @running.make_false
-        @threads.each_value do |thread|
-          thread.join(2)
-          thread.kill if thread.alive?
-        end
-        @threads.clear
-        @queues.clear
-      end
-
-      private
-
-      def ensure_worker_running!(key)
-        return if @threads.key?(key) && @threads[key].alive?
-
-        @queues[key] ||= Queue.new
-        @threads[key] = Thread.new { worker_loop(key) }
-      end
-
-      def worker_loop(key)
-        queue = @queues[key]
-        loop do
-          break unless @running.true?
-
-          begin
-            blk, future = queue.pop(true)
-            result = blk.call
-            if result.is_a?(Concurrent::Promises::Future)
-              result.then { |v| future.fulfill(v) }.rescue { |e| future.reject(e) }
-            else
-              future.fulfill(result)
-            end
-          rescue ThreadError
-            sleep 0.01
-          rescue => e
-            future&.reject(e) if future
-          end
-        end
-      end
-    end
-  end
-end