DhanHQ 2.1.7 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ffcb72b2997f7841ef6c872ad71748c36f4305f9e746a5d4d8f2a3b9429c8da
-  data.tar.gz: 5a72519746d9ca58f6cb295855f9065ccc3b9059c2684347b58c3e998ad8668b
+  metadata.gz: 9a414cb1f2ba6e22e0c4014ea9ca5656607611787d7f4f18e26c50069a8c3811
+  data.tar.gz: 05bbdf626ae74c2a64b963bccbff2ff35bd64972a7ea825491c42ae2069377f3
 SHA512:
-  metadata.gz: 397d51627f7049470332e23926ca7d00d78aad94d88eb0939d25164dc74330d68014a5ad6593453dfedb2da51c4f2a810ecc7e971d5f1735b3b21e96d3d068df
-  data.tar.gz: 2092c00ab1903f18d7718bd27125236251d2129cd536a071b506c3a53d2826a66eb5c9ba737ab89eff52b125e864138b507e577616ffc9e0a034da0a4eb8e37a
+  metadata.gz: b9cb7044f23b775360cc999bec4c3475278d923f8f11d083fc3874827f3565c19dbe8bc1f201da6619b9bd6c1d6911f2774ee0d8e329b0c8f2f7e66155f161d0
+  data.tar.gz: c81c3c6685511cfef78b1083c49e5d4ea4ec692f494d36b2ee6a74580c1de4655aa9e9139c7b63dd3c40a075c02e07bd7137a30b81e6062b83f4ec7000498fc5

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [2.1.8] - 2025-10-30
+
+### Fixed
+- Correctly map `underlying_seg` for option chain APIs:
+  - Index instruments use `IDX_I`.
+  - Stocks map to `NSE_FNO` or `BSE_FNO` based on the instrument's exchange.
+- Implemented via `underlying_segment_for_options` in `DhanHQ::Models::InstrumentHelpers` and applied to `expiry_list` and `option_chain`.
+
 ## [2.1.7] - 2025-01-28
 
 ### Added

data/examples/live_order_updates.rb

@@ -101,7 +101,7 @@ summary_timer = Thread.new do
       end
     end
 
-    puts "\n" + ("=" * 50)
+    puts "\n#{"=" * 50}"
   end
 end
 

data/examples/market_depth_example.rb

@@ -74,14 +74,14 @@ depth_client = DhanHQ::WS::MarketDepth.connect(symbols: symbols) do |depth_data|
   puts "  Ask Levels: #{depth_data[:asks].size}"
 
   # Show top 3 bid/ask levels if available
-  if depth_data[:bids] && depth_data[:bids].size > 0
+  if depth_data[:bids]&.size&.positive?
     puts "  Top Bids:"
     depth_data[:bids].first(3).each_with_index do |bid, i|
       puts "    #{i + 1}. Price: #{bid[:price]}, Qty: #{bid[:quantity]}"
     end
   end
 
-  if depth_data[:asks] && depth_data[:asks].size > 0
+  if depth_data[:asks]&.size&.positive?
     puts "  Top Asks:"
     depth_data[:asks].first(3).each_with_index do |ask, i|
       puts "    #{i + 1}. Price: #{ask[:price]}, Qty: #{ask[:quantity]}"

data/examples/trading_fields_example.rb

@@ -109,7 +109,7 @@ def calculate_margin_requirements(instrument, name, quantity, price)
   puts "   Sell CO Margin Required: ₹#{sell_margin}"
 
   # Calculate MTF leverage
-  if instrument.mtf_leverage > 0
+  if instrument.mtf_leverage.positive?
     mtf_value = total_value * instrument.mtf_leverage
     puts "   MTF Leverage: #{instrument.mtf_leverage}x"
     puts "   MTF Value: ₹#{mtf_value}"

data/lib/DhanHQ/client.rb

@@ -38,7 +38,8 @@ module DhanHQ
     # @return [DhanHQ::Client] A new client instance.
     def initialize(api_type:)
       DhanHQ.configure_with_env if ENV.fetch("CLIENT_ID", nil)
-      @rate_limiter = RateLimiter.new(api_type)
+      # Use shared rate limiter instance per API type to ensure proper coordination
+      @rate_limiter = RateLimiter.for(api_type)
 
       raise "RateLimiter initialization failed" unless @rate_limiter
 

data/lib/DhanHQ/models/instrument_helpers.rb

@@ -8,13 +8,26 @@ module DhanHQ
       ##
       # Fetches last traded price (LTP) for this instrument.
       #
-      # @return [Hash] Market feed LTP response
+      # @return [Float, nil] Last traded price value, or nil if not available
       # @example
       #   instrument = DhanHQ::Models::Instrument.find("IDX_I", "NIFTY")
-      #   instrument.ltp
+      #   instrument.ltp  # => 26053.9
       def ltp
         params = build_market_feed_params
-        DhanHQ::Models::MarketFeed.ltp(params)
+        response = DhanHQ::Models::MarketFeed.ltp(params)
+
+        # Extract last_price from nested response structure
+        # Response format: {"data" => {"EXCHANGE_SEGMENT" => {"security_id" => {"last_price" => value}}}, "status" => "success"}
+        data = response[:data] || response["data"]
+        return nil unless data
+
+        segment_data = data[exchange_segment] || data[exchange_segment.to_sym]
+        return nil unless segment_data
+
+        security_data = segment_data[security_id] || segment_data[security_id.to_s]
+        return nil unless security_data
+
+        security_data[:last_price] || security_data["last_price"]
       end
 
       ##
@@ -82,7 +95,7 @@ module DhanHQ
       def expiry_list
         params = {
           underlying_scrip: security_id.to_i,
-          underlying_seg: exchange_segment
+          underlying_seg: underlying_segment_for_options
         }
         DhanHQ::Models::OptionChain.fetch_expiry_list(params)
       end
@@ -98,7 +111,7 @@ module DhanHQ
       def option_chain(expiry:)
         params = {
           underlying_scrip: security_id.to_i,
-          underlying_seg: exchange_segment,
+          underlying_seg: underlying_segment_for_options,
           expiry: expiry
         }
         DhanHQ::Models::OptionChain.fetch(params)
@@ -136,6 +149,27 @@ module DhanHQ
 
         params
       end
+
+      ##
+      # Determines the correct underlying segment for option chain APIs.
+      # Index uses IDX_I; stocks map to NSE_FNO or BSE_FNO by exchange.
+      def underlying_segment_for_options
+        seg = exchange_segment.to_s
+        ins = instrument.to_s
+
+        # If already a valid underlying seg, return as-is
+        return seg if %w[IDX_I NSE_FNO BSE_FNO MCX_FO].include?(seg)
+
+        # Index detection by instrument kind or segment
+        return "IDX_I" if ins == "INDEX" || seg == "IDX_I"
+
+        # Map equities/stock-related segments to respective FNO
+        return "NSE_FNO" if seg.start_with?("NSE")
+        return "BSE_FNO" if seg.start_with?("BSE")
+
+        # Fallback to IDX_I to avoid contract rejection
+        "IDX_I"
+      end
     end
   end
 end

data/lib/DhanHQ/rate_limiter.rb

@@ -15,13 +15,31 @@ module DhanHQ
                          per_day: Float::INFINITY }
     }.freeze
 
+    # Thread-safe shared rate limiters per API type
+    @shared_limiters = Concurrent::Map.new
+    @mutexes = Concurrent::Map.new
+
+    class << self
+      attr_reader :shared_limiters, :mutexes
+
+      # Get or create a shared rate limiter instance for the given API type
+      def for(api_type)
+        @shared_limiters[api_type] ||= new(api_type)
+      end
+    end
+
     # Creates a rate limiter for a given API type.
+    # Note: For proper rate limiting coordination, use RateLimiter.for(api_type) instead
+    # of RateLimiter.new(api_type) to get a shared instance.
     #
     # @param api_type [Symbol] One of the keys from {RATE_LIMITS}.
     def initialize(api_type)
       @api_type = api_type
       @buckets = Concurrent::Hash.new
       @buckets[:last_request_time] = Time.at(0) if api_type == :option_chain
+      # Track request timestamps for per-second limiting
+      @request_times = []
+      @window_start = Time.now
       initialize_buckets
       start_cleanup_threads
     end
@@ -30,34 +48,70 @@ module DhanHQ
     #
     # @return [void]
     def throttle!
-      if @api_type == :option_chain
-        last_request_time = @buckets[:last_request_time]
+      mutex.synchronize do
+        if @api_type == :option_chain
+          last_request_time = @buckets[:last_request_time]
 
-        sleep_time = 3 - (Time.now - last_request_time)
-        if sleep_time.positive?
-          if ENV["DHAN_DEBUG"] == "true"
-            puts "Sleeping for #{sleep_time.round(2)} seconds due to option_chain rate limit"
+          sleep_time = 3 - (Time.now - last_request_time)
+          if sleep_time.positive?
+            if ENV["DHAN_DEBUG"] == "true"
+              puts "Sleeping for #{sleep_time.round(2)} seconds due to option_chain rate limit"
+            end
+            sleep(sleep_time)
           end
-          sleep(sleep_time)
+
+          @buckets[:last_request_time] = Time.now
+          return
         end
 
-        @buckets[:last_request_time] = Time.now
-        return
-      end
+        # For per-second limits, use timestamp-based sliding window
+        per_second_limit = RATE_LIMITS[@api_type][:per_second]
+        if per_second_limit && per_second_limit != Float::INFINITY
+          now = Time.now
+          # Remove requests older than 1 second
+          @request_times.reject! { |t| now - t >= 1.0 }
+
+          # Check if we've hit the per-second limit
+          if @request_times.size >= per_second_limit
+            # Calculate how long to wait until the oldest request is 1 second old
+            oldest_time = @request_times.min
+            wait_time = 1.0 - (now - oldest_time)
+
+            if wait_time.positive?
+              sleep(wait_time)
+              # Recalculate after sleep
+              now = Time.now
+              @request_times.reject! { |t| now - t >= 1.0 }
+            end
+          end
 
-      loop do
-        break if allow_request?
+          # Record this request time
+          @request_times << Time.now
+        end
 
-        sleep(0.1)
+        # Check other limits (per_minute, per_hour, per_day)
+        loop do
+          break if allow_request?
+
+          sleep(0.1)
+        end
+        record_request
       end
-      record_request
     end
 
     private
 
+    # Gets or creates a mutex for this API type for thread-safe throttling
+    def mutex
+      self.class.mutexes[@api_type] ||= Mutex.new
+    end
+
     # Prepares the counters used for each interval in {RATE_LIMITS}.
     def initialize_buckets
       RATE_LIMITS[@api_type].each_key do |interval|
+        # Skip per_second as we handle it with timestamps
+        next if interval == :per_second
+
         @buckets[interval] = Concurrent::AtomicFixnum.new(0)
       end
     end
@@ -67,6 +121,9 @@ module DhanHQ
     # @return [Boolean]
     def allow_request?
       RATE_LIMITS[@api_type].all? do |interval, limit|
+        # Skip per_second check as it's handled in throttle! with timestamps
+        next true if interval == :per_second
+
         @buckets[interval].value < limit
       end
     end
@@ -74,34 +131,32 @@ module DhanHQ
     # Increments the counters for each time window once a request is made.
     def record_request
       RATE_LIMITS[@api_type].each_key do |interval|
+        # Skip per_second as it's handled with timestamps
+        next if interval == :per_second
+
         @buckets[interval].increment
       end
     end
 
     # Spawns background threads to reset counters after each interval elapses.
     def start_cleanup_threads
-      Thread.new do
-        loop do
-          sleep(1)
-          @buckets[:per_second].value = 0
-        end
-      end
+      # Don't create per_second cleanup thread - we handle it with timestamps
       Thread.new do
         loop do
           sleep(60)
-          @buckets[:per_minute].value = 0
+          @buckets[:per_minute]&.value = 0
         end
       end
       Thread.new do
         loop do
           sleep(3600)
-          @buckets[:per_hour].value = 0
+          @buckets[:per_hour]&.value = 0
         end
       end
       Thread.new do
         loop do
           sleep(86_400)
-          @buckets[:per_day].value = 0
+          @buckets[:per_day]&.value = 0
         end
       end
     end

data/lib/DhanHQ/version.rb

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

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

@@ -213,7 +213,9 @@ module DhanHQ
 
           instrument = find_instrument(symbol_code, segment_hint)
           unless instrument
-            DhanHQ.logger&.warn("[DhanHQ::WS::MarketDepth] Unable to locate instrument for #{symbol_code} (segment hint: #{segment_hint || 'AUTO'})")
+            DhanHQ.logger&.warn(
+              "[DhanHQ::WS::MarketDepth] Unable to locate instrument for #{symbol_code} (segment hint: #{segment_hint || "AUTO"})"
+            )
             return nil
           end
 

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

@@ -13,9 +13,6 @@ module DhanHQ
         # Initialize Orders WebSocket connection
         # @param url [String] WebSocket endpoint URL
         # @param options [Hash] Connection options
-        def initialize(url:, **options)
-          super
-        end
 
         private
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: DhanHQ
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.8
 platform: ruby
 authors:
 - Shubham Taywade