DhanHQ 2.1.10 → 2.2.0

data/lib/DhanHQ/models/order_update.rb

@@ -5,7 +5,6 @@ module DhanHQ
     ##
     # Represents a real-time order update received via WebSocket
     # Parses and provides access to all order update fields as per DhanHQ API documentation
-    # rubocop:disable Metrics/ClassLength
     class OrderUpdate < BaseModel
       # All order update attributes as per API documentation
       attributes :exchange, :segment, :source, :security_id, :client_id,
@@ -206,7 +205,6 @@ module DhanHQ
 
       ##
       # Status summary for logging/debugging
-      # rubocop:disable Metrics/MethodLength
       def status_summary
         {
           order_no: order_no,
@@ -222,7 +220,6 @@ module DhanHQ
           super_order: super_order?
         }
       end
-      # rubocop:enable Metrics/MethodLength
 
       ##
       # Convert to hash for serialization
@@ -230,6 +227,5 @@ module DhanHQ
         @attributes.dup
       end
     end
-    # rubocop:enable Metrics/ClassLength
   end
 end

data/lib/DhanHQ/rate_limiter.rb

@@ -140,25 +140,59 @@ module DhanHQ
 
     # Spawns background threads to reset counters after each interval elapses.
     def start_cleanup_threads
+      @cleanup_threads = []
+      @shutdown = Concurrent::AtomicBoolean.new(false)
+
       # Don't create per_second cleanup thread - we handle it with timestamps
-      Thread.new do
+      @cleanup_threads << Thread.new do
         loop do
+          break if @shutdown.true?
+
           sleep(60)
-          @buckets[:per_minute]&.value = 0
+          break if @shutdown.true?
+
+          mutex.synchronize do
+            @buckets[:per_minute]&.value = 0
+          end
         end
       end
-      Thread.new do
+
+      @cleanup_threads << Thread.new do
         loop do
+          break if @shutdown.true?
+
           sleep(3600)
-          @buckets[:per_hour]&.value = 0
+          break if @shutdown.true?
+
+          mutex.synchronize do
+            @buckets[:per_hour]&.value = 0
+          end
         end
       end
-      Thread.new do
+
+      @cleanup_threads << Thread.new do
         loop do
+          break if @shutdown.true?
+
           sleep(86_400)
-          @buckets[:per_day]&.value = 0
+          break if @shutdown.true?
+
+          mutex.synchronize do
+            @buckets[:per_day]&.value = 0
+          end
         end
       end
     end
+
+    # Shuts down cleanup threads gracefully
+    def shutdown
+      return if @shutdown.true?
+
+      @shutdown.make_true
+      @cleanup_threads&.each do |thread|
+        thread&.wakeup if thread&.alive?
+        thread&.join(5) # Wait up to 5 seconds for thread to finish
+      end
+    end
   end
 end

data/lib/DhanHQ/version.rb

@@ -2,5 +2,5 @@
 
 module DhanHQ
   # Semantic version of the DhanHQ client gem.
-  VERSION = "2.1.10"
+  VERSION = "2.2.0"
 end

data/lib/DhanHQ/ws/client.rb

@@ -27,7 +27,8 @@ module DhanHQ
         @callbacks = Concurrent::Map.new { |h, k| h[k] = [] }
         @started = Concurrent::AtomicBoolean.new(false)
 
-        token = DhanHQ.configuration.access_token or raise "DhanHQ.access_token not set"
+        token = DhanHQ.configuration.resolved_access_token
+        raise DhanHQ::AuthenticationError, "Missing access token" if token.nil? || token.empty?
         cid   = DhanHQ.configuration.client_id or raise "DhanHQ.client_id not set"
         ver   = (DhanHQ.configuration.respond_to?(:ws_version) && DhanHQ.configuration.ws_version) || 2
         @url  = url || "wss://api-feed.dhan.co?version=#{ver}&token=#{token}&clientId=#{cid}&authType=2"
@@ -164,11 +165,16 @@ module DhanHQ
       def prune(hash) = { ExchangeSegment: hash[:ExchangeSegment], SecurityId: hash[:SecurityId] }
 
       def emit(event, payload)
-        begin
-          @callbacks[event].dup
+        # Create a frozen snapshot of callbacks to avoid modification during iteration
+        callbacks_snapshot = begin
+          @callbacks[event].dup.freeze
         rescue StandardError
-          []
-        end.each { |cb| cb.call(payload) }
+          [].freeze
+        end
+
+        callbacks_snapshot.each { |cb| cb.call(payload) }
+      rescue StandardError => e
+        DhanHQ.logger&.error("[DhanHQ::WS::Client] Error in event handler for #{event}: #{e.class} #{e.message}")
       end
 
       def install_at_exit_once!

data/lib/DhanHQ/ws/connection.rb

@@ -141,8 +141,20 @@ module DhanHQ
             end
           rescue StandardError => e
             DhanHQ.logger&.error("[DhanHQ::WS] crashed #{e.class} #{e.message}")
+            DhanHQ.logger&.error("[DhanHQ::WS] backtrace: #{e.backtrace&.first(5)&.join("\n")}")
             failed = true
+            # Reset connection state on error
+            @ws = nil
+            @timer = nil
           ensure
+            # Clean up EventMachine resources
+            begin
+              EM.cancel_timer(@timer) if @timer
+              @timer = nil
+            rescue StandardError => e
+              DhanHQ.logger&.debug("[DhanHQ::WS] cleanup error: #{e.message}")
+            end
+
             break if @stop
 
             if got_429
@@ -154,11 +166,13 @@ module DhanHQ
               # exponential backoff with jitter
               sleep_time = [backoff, MAX_BACKOFF].min
               jitter = rand(0.2 * sleep_time)
-              DhanHQ.logger&.warn("[DhanHQ::WS] reconnecting in #{(sleep_time + jitter).round(1)}s")
+              DhanHQ.logger&.warn("[DhanHQ::WS] reconnecting in #{(sleep_time + jitter).round(1)}s (backoff: #{backoff.round(1)}s)")
               sleep(sleep_time + jitter)
               backoff *= 2.0
             else
-              backoff = 2.0 # reset only after a clean session end
+              # Reset backoff only after a clean session end (normal close with code 1000)
+              backoff = 2.0
+              DhanHQ.logger&.debug("[DhanHQ::WS] backoff reset to 2.0s after clean session end")
             end
           end
         end

data/lib/DhanHQ/ws/market_depth/client.rb

@@ -80,7 +80,8 @@ module DhanHQ
         # @param config [Configuration] DhanHQ configuration
         # @return [String] WebSocket URL
         def build_market_depth_url(config)
-          token = config.access_token or raise "DhanHQ.access_token not set"
+          token = config.resolved_access_token
+          raise DhanHQ::AuthenticationError, "Missing access token" if token.nil? || token.empty?
           cid = config.client_id or raise "DhanHQ.client_id not set"
           depth_level = config.market_depth_level || 20 # Default to 20 level depth
 

data/lib/DhanHQ/ws/market_depth.rb

@@ -17,9 +17,9 @@ module DhanHQ
       # @param options [Hash] Connection options
       # @param block [Proc] Callback for depth updates
       # @return [Client] WebSocket client instance
-      def connect(symbols: [], **options, &block)
-        client = Client.new(symbols: symbols, **options)
-        client.on(:depth_update, &block) if block_given?
+      def connect(symbols: [], **, &)
+        client = Client.new(symbols: symbols, **)
+        client.on(:depth_update, &) if block_given?
         client.start
       end
 
@@ -28,8 +28,8 @@ module DhanHQ
       # @param symbols [Array<String>] Symbols to subscribe to
       # @param options [Hash] Connection options
       # @return [Client] New client instance
-      def client(symbols: [], **options)
-        Client.new(symbols: symbols, **options)
+      def client(symbols: [], **)
+        Client.new(symbols: symbols, **)
       end
 
       ##
@@ -38,8 +38,8 @@ module DhanHQ
       # @param handlers [Hash] Event handlers
       # @param options [Hash] Connection options
       # @return [Client] Started client instance
-      def connect_with_handlers(symbols: [], handlers: {}, **options)
-        client = Client.new(symbols: symbols, **options).start
+      def connect_with_handlers(symbols: [], handlers: {}, **)
+        client = Client.new(symbols: symbols, **).start
 
         handlers.each do |event, handler|
           client.on(event, &handler)
@@ -54,8 +54,8 @@ module DhanHQ
       # @param options [Hash] Connection options
       # @param block [Proc] Callback for depth updates
       # @return [Client] Started client instance
-      def subscribe(symbols:, **options, &block)
-        connect(symbols: symbols, **options, &block)
+      def subscribe(symbols:, **, &)
+        connect(symbols: symbols, **, &)
       end
 
       ##
@@ -64,9 +64,9 @@ module DhanHQ
       # @param options [Hash] Connection options
       # @param block [Proc] Callback for snapshot data
       # @return [Client] Started client instance
-      def snapshot(symbols:, **options, &block)
-        client = Client.new(symbols: symbols, **options)
-        client.on(:depth_snapshot, &block) if block_given?
+      def snapshot(symbols:, **, &)
+        client = Client.new(symbols: symbols, **)
+        client.on(:depth_snapshot, &) if block_given?
         client.start
       end
     end

data/lib/DhanHQ/ws/orders/client.rb

@@ -9,12 +9,20 @@ module DhanHQ
       ##
       # Enhanced WebSocket client for real-time order updates
       # Provides comprehensive order state tracking and event handling
-      # rubocop:disable Metrics/ClassLength
       class Client
+        # Maximum number of orders to keep in tracker (default: 10,000)
+        MAX_TRACKED_ORDERS = ENV.fetch("DHAN_WS_MAX_TRACKED_ORDERS", 10_000).to_i
+
+        # Maximum age of orders in tracker in seconds (default: 7 days)
+        MAX_ORDER_AGE = ENV.fetch("DHAN_WS_MAX_ORDER_AGE", 604_800).to_i
+
         def initialize(url: nil, **options)
           @callbacks = Concurrent::Map.new { |h, k| h[k] = [] }
           @started = Concurrent::AtomicBoolean.new(false)
           @order_tracker = Concurrent::Map.new
+          @order_timestamps = Concurrent::Map.new
+          @cleanup_mutex = Mutex.new
+          @cleanup_thread = nil
           cfg = DhanHQ.configuration
           @url = url || cfg.ws_order_url
           @connection_options = options
@@ -33,6 +41,7 @@ module DhanHQ
           @conn.on(:error) { |error| emit(:error, error) }
           @conn.on(:message) { |msg| handle_message(msg) }
           @conn.start
+          start_cleanup_thread
           DhanHQ::WS::Registry.register(self) if defined?(DhanHQ::WS::Registry)
           self
         end
@@ -44,6 +53,7 @@ module DhanHQ
           return unless @started.true?
 
           @started.make_false
+          stop_cleanup_thread
           @conn&.stop
           emit(:close, true)
           DhanHQ::WS::Registry.unregister(self) if defined?(DhanHQ::WS::Registry)
@@ -147,13 +157,16 @@ module DhanHQ
         ##
         # Handle order update and track state changes
         # @param order_update [OrderUpdate] Parsed order update
-        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         def handle_order_update(order_update)
           order_no = order_update.order_no
           previous_state = @order_tracker[order_no]
 
-          # Update order tracker
+          # Update order tracker with timestamp
           @order_tracker[order_no] = order_update
+          @order_timestamps[order_no] = Time.now
+
+          # Cleanup if tracker exceeds max size
+          cleanup_old_orders if @order_tracker.size > MAX_TRACKED_ORDERS
 
           # Emit update event
           emit(:update, order_update)
@@ -180,14 +193,12 @@ module DhanHQ
           # Emit specific status events
           emit_status_specific_events(order_update, previous_state)
         end
-        # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
         ##
         # Emit status-specific events
         #
         # @param order_update [OrderUpdate] Current order update
         # @param _previous_state [OrderUpdate, nil] Previous order state (unused parameter)
-        # rubocop:disable Metrics/MethodLength
         def emit_status_specific_events(order_update, _previous_state)
           case order_update.status
           when "TRANSIT"
@@ -204,24 +215,78 @@ module DhanHQ
             emit(:order_expired, order_update)
           end
         end
-        # rubocop:enable Metrics/MethodLength
 
         ##
         # Emit events to registered callbacks
         # @param event [Symbol] Event type
         # @param payload [Object] Event payload
         def emit(event, payload)
-          list = begin
-            @callbacks[event]
+          # Create a snapshot of callbacks to avoid modification during iteration
+          callbacks_snapshot = begin
+            @callbacks[event].dup.freeze
           rescue StandardError
-            []
+            [].freeze
           end
-          list.each { |cb| cb.call(payload) }
+
+          callbacks_snapshot.each { |cb| cb.call(payload) }
         rescue StandardError => e
           DhanHQ.logger&.error("[DhanHQ::WS::Orders] Error in event handler: #{e.class} #{e.message}")
         end
+
+        ##
+        # Start cleanup thread to periodically remove old orders
+        def start_cleanup_thread
+          return if @cleanup_thread&.alive?
+
+          @cleanup_thread = Thread.new do
+            loop do
+              break unless @started.true?
+
+              sleep(3600) # Run cleanup every hour
+              break unless @started.true?
+
+              cleanup_old_orders
+            end
+          end
+        end
+
+        ##
+        # Stop cleanup thread
+        def stop_cleanup_thread
+          return unless @cleanup_thread&.alive?
+
+          @cleanup_thread.wakeup
+          @cleanup_thread.join(5) # Wait up to 5 seconds
+          @cleanup_thread = nil
+        end
+
+        ##
+        # Clean up old orders from tracker
+        def cleanup_old_orders
+          @cleanup_mutex.synchronize do
+            now = Time.now
+            orders_to_remove = []
+
+            # Find orders to remove (too old or if tracker is too large)
+            @order_timestamps.each do |order_no, timestamp|
+              age = now - timestamp
+              if age > MAX_ORDER_AGE || (@order_tracker.size > MAX_TRACKED_ORDERS && orders_to_remove.size < @order_tracker.size - MAX_TRACKED_ORDERS)
+                orders_to_remove << order_no
+              end
+            end
+
+            # Remove old orders
+            orders_to_remove.each do |order_no|
+              @order_tracker.delete(order_no)
+              @order_timestamps.delete(order_no)
+            end
+
+            if orders_to_remove.any?
+              DhanHQ.logger&.debug("[DhanHQ::WS::Orders] Cleaned up #{orders_to_remove.size} old orders")
+            end
+          end
+        end
       end
-      # rubocop:enable Metrics/ClassLength
     end
   end
 end

data/lib/DhanHQ/ws/orders/connection.rb

@@ -86,7 +86,8 @@ module DhanHQ
               Secret: cfg.partner_secret
             }
           else
-            token = cfg.access_token or raise "DhanHQ.access_token not set"
+            token = cfg.resolved_access_token
+            raise DhanHQ::AuthenticationError, "Missing access token" if token.nil? || token.empty?
             cid = cfg.client_id or raise "DhanHQ.client_id not set"
             payload = {
               LoginReq: { MsgCode: 42, ClientId: cid, Token: token },

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: DhanHQ
 version: !ruby/object:Gem::Version
-  version: 2.1.10
+  version: 2.2.0
 platform: ruby
 authors:
 - Shubham Taywade
+autorequire:
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -162,20 +163,31 @@ files:
 - ".rubocop_todo.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
+- CODE_REVIEW_ISSUES.md
+- FIXES_APPLIED.md
 - GUIDE.md
 - LICENSE.txt
 - README.md
 - README1.md
+- RELEASING.md
+- REVIEW_SUMMARY.md
 - Rakefile
 - TAGS
 - TODO-1.md
 - TODO.md
+- VERSION_UPDATE.md
 - app/services/live/order_update_guard_support.rb
 - app/services/live/order_update_hub.rb
 - app/services/live/order_update_persistence_support.rb
 - config/initializers/order_update_hub.rb
+- core
 - diagram.html
 - diagram.md
+- docs/AUTHENTICATION.md
+- docs/DATA_API_PARAMETERS.md
+- docs/PR_2.2.0.md
+- docs/RELEASE_GUIDE.md
+- docs/TESTING_GUIDE.md
 - docs/live_order_updates.md
 - docs/rails_integration.md
 - docs/rails_websocket_integration.md
@@ -200,7 +212,6 @@ files:
 - lib/DhanHQ/contracts/instrument_list_contract.rb
 - lib/DhanHQ/contracts/margin_calculator_contract.rb
 - lib/DhanHQ/contracts/modify_order_contract.rb
-- lib/DhanHQ/contracts/modify_order_contract_copy.rb
 - lib/DhanHQ/contracts/option_chain_contract.rb
 - lib/DhanHQ/contracts/order_contract.rb
 - lib/DhanHQ/contracts/place_order_contract.rb
@@ -312,6 +323,7 @@ metadata:
   source_code_uri: https://github.com/shubhamtaywade82/dhanhq-client
   changelog_uri: https://github.com/shubhamtaywade82/dhanhq-client/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -319,14 +331,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.5.11
+signing_key:
 specification_version: 4
 summary: DhanHQ is a simple CLI for DhanHQ API.
 test_files: []

data/lib/DhanHQ/contracts/modify_order_contract_copy.rb

@@ -1,100 +0,0 @@
-# frozen_string_literal: true
-
-module DhanHQ
-  module Contracts
-    # Validation contract for modifying an existing order via Dhanhq's API.
-    #
-    # This contract validates input parameters for the Modify Order API,
-    # ensuring that all required fields are provided and optional fields follow
-    # the correct constraints. It also applies custom validation rules based on
-    # the type of order.
-    #
-    # Example usage:
-    #   contract = Dhanhq::Contracts::ModifyOrderContract.new
-    #   result = contract.call(
-    #     dhanClientId: "123456",
-    #     orderId: "1001",
-    #     orderType: "STOP_LOSS",
-    #     legName: "ENTRY_LEG",
-    #     quantity: 10,
-    #     price: 150.0,
-    #     triggerPrice: 140.0,
-    #     validity: "DAY"
-    #   )
-    #   result.success? # => true or false
-    #
-    # @see https://dhanhq.co/docs/v2/ Dhanhq API Documentation
-    class ModifyOrderContract < BaseContract
-      # Parameters and validation rules for the Modify Order request.
-      #
-      # @!attribute [r] orderId
-      #   @return [String] Required. Unique identifier for the order to be modified.
-      # @!attribute [r] orderType
-      #   @return [String] Required. Type of the order.
-      #     Must be one of: LIMIT, MARKET, STOP_LOSS, STOP_LOSS_MARKET.
-      # @!attribute [r] legName
-      #   @return [String] Optional. Leg name for complex orders.
-      #     Must be one of: ENTRY_LEG, TARGET_LEG, STOP_LOSS_LEG, NA.
-      # @!attribute [r] quantity
-      #   @return [Integer] Required. Quantity to be modified, must be greater than 0.
-      # @!attribute [r] price
-      #   @return [Float] Optional. Price to be modified, must be greater than 0 if provided.
-      # @!attribute [r] disclosedQuantity
-      #   @return [Integer] Optional. Disclosed quantity, must be >= 0 if provided.
-      # @!attribute [r] triggerPrice
-      #   @return [Float] Optional. Trigger price for stop-loss orders, must be greater than 0 if provided.
-      # @!attribute [r] validity
-      #   @return [String] Required. Validity of the order.
-      #     Must be one of: DAY, IOC, GTC, GTD.
-      params do
-        required(:orderId).filled(:string)
-        required(:orderType).filled(:string, included_in?: %w[LIMIT MARKET STOP_LOSS STOP_LOSS_MARKET])
-        optional(:legName).maybe(:string, included_in?: %w[ENTRY_LEG TARGET_LEG STOP_LOSS_LEG NA])
-        required(:quantity).filled(:integer, gt?: 0)
-        optional(:price).maybe(:float, gt?: 0)
-        optional(:disclosedQuantity).maybe(:integer, gteq?: 0)
-        optional(:triggerPrice).maybe(:float, gt?: 0)
-        required(:validity).filled(:string, included_in?: %w[DAY IOC GTC GTD])
-      end
-
-      # Custom validation to ensure a trigger price is provided for stop-loss orders.
-      #
-      # @example Invalid stop-loss order:
-      #   orderType: "STOP_LOSS", triggerPrice: nil
-      #   => Adds failure message "is required for orderType STOP_LOSS or STOP_LOSS_MARKET".
-      #
-      # @param triggerPrice [Float] The price at which the order will be triggered.
-      # @param orderType [String] The type of the order.
-      rule(:triggerPrice, :orderType) do
-        if values[:orderType].start_with?("STOP_LOSS") && !values[:triggerPrice]
-          key(:triggerPrice).failure("is required for orderType STOP_LOSS or STOP_LOSS_MARKET")
-        end
-      end
-
-      # Custom validation to ensure a leg name is provided for CO or BO order types.
-      #
-      # @example Invalid CO order:
-      #   orderType: "CO", legName: nil
-      #   => Adds failure message "is required for orderType CO or BO".
-      #
-      # @param legName [String] The leg name of the order.
-      # @param orderType [String] The type of the order.
-      rule(:legName, :orderType) do
-        if %w[CO BO].include?(values[:orderType]) && !values[:legName]
-          key(:legName).failure("is required for orderType CO or BO")
-        end
-      end
-
-      # Custom validation to ensure the price is valid if provided.
-      #
-      # @example Invalid price:
-      #   price: 0
-      #   => Adds failure message "must be greater than 0 if provided".
-      #
-      # @param price [Float] The price of the order.
-      rule(:price) do
-        key(:price).failure("must be greater than 0 if provided") if values[:price].nil? || values[:price] <= 0
-      end
-    end
-  end
-end