DhanHQ 2.6.2 → 2.6.3

data/lib/DhanHQ/models/option_chain.rb

@@ -28,12 +28,12 @@ module DhanHQ
     #     expiry: "2024-10-31"
     #   )
     #   puts "Underlying LTP: ₹#{chain[:last_price]}"
-    #   nifty_25000 = chain[:oc]["25000.000000"]
-    #   puts "CE LTP: ₹#{nifty_25000['ce'][:last_price]}"
-    #   puts "CE OI: #{nifty_25000['ce'][:oi]}"
+    #   nifty_first_strike = chain[:strikes].first
+    #   puts "Strike: #{nifty_first_strike[:strike]}"
+    #   puts "Call LTP: ₹#{nifty_first_strike[:call][:last_price]}"
     #
     # @example Fetch expiry list for an underlying
-    #   expiries = DhanHQ::Models::OptionChain.fetch_expiry_list(
+    #   expiries = DhanHQ::Models::OptionChain.expiry_list(
     #     underlying_scrip: 13,
     #     underlying_seg: "IDX_I"
     #   )
@@ -45,15 +45,14 @@ module DhanHQ
     #     underlying_seg: "NSE_FNO",
     #     expiry: "2024-12-26"
     #   )
-    #   strike_data = chain[:oc]["25000.000000"]
-    #   ce_greeks = strike_data['ce'][:greeks]
+    #   strike_data = chain[:strikes].find { |s| s[:strike] == 25000.0 }
+    #   ce_greeks = strike_data[:call][:greeks]
     #   puts "Delta: #{ce_greeks[:delta]}"
-    #   puts "Gamma: #{ce_greeks[:gamma]}"
-    #   puts "Theta: #{ce_greeks[:theta]}"
-    #   puts "Vega: #{ce_greeks[:vega]}"
     #
     class OptionChain < BaseModel
-      attr_reader :underlying_scrip, :underlying_seg, :expiry, :last_price, :option_data
+      def validation_contract
+        self.class.validation_contract
+      end
 
       class << self
         ##
@@ -64,6 +63,10 @@ module DhanHQ
           @resource ||= DhanHQ::Resources::OptionChain.new
         end
 
+        def validation_contract
+          @validation_contract ||= DhanHQ::Contracts::OptionChainContract.new
+        end
+
         ##
         # Fetches the entire option chain for a specified underlying instrument and expiry.
         #
@@ -73,129 +76,36 @@ module DhanHQ
         # both Call (CE) and Put (PE) options at each strike price.
         #
         # @param params [Hash{Symbol => Integer, String}] Request parameters for option chain
-        #   @option params [Integer] :underlying_scrip (required) Security ID of the underlying
-        #     instrument. Can be found via the Instruments API.
-        #   @option params [String] :underlying_seg (required) Exchange and segment of underlying
-        #     for which data is to be fetched.
-        #     Valid values: "IDX_I" (Index), "NSE_FNO" (NSE F&O), "BSE_FNO" (BSE F&O), "MCX_FO" (MCX)
-        #   @option params [String] :expiry (required) Expiry date of the option contract for
-        #     which the option chain is requested. Must be in "YYYY-MM-DD" format.
-        #     List of active expiries can be fetched using {fetch_expiry_list}.
+        #   @option params [Integer] :underlying_scrip (required) Security ID of the underlying instrument.
+        #   @option params [String] :underlying_seg (required) Exchange and segment of underlying.
+        #   @option params [String] :expiry (required) Expiry date in "YYYY-MM-DD" format.
         #
-        # @return [HashWithIndifferentAccess] Filtered option chain data.
+        # @return [HashWithIndifferentAccess] Normalized option chain data.
         #   Response structure:
         #   - **:last_price** [Float] Last Traded Price (LTP) of the underlying instrument
-        #   - **:oc** [Hash{String => Hash}] Option chain data organized by strike price.
-        #     Strike prices are stored as string keys (e.g., "25000.000000").
-        #     Each strike contains:
-        #     - **"ce"** [Hash{Symbol => Float, Integer, Hash}] Call Option data for this strike:
-        #       - **:greeks** [Hash{Symbol => Float}] Option Greeks:
-        #         - **:delta** [Float] Measures the change of option's premium based on
-        #           every 1 rupee change in underlying
-        #         - **:theta** [Float] Measures how quickly an option's value decreases over time
-        #         - **:gamma** [Float] Rate of change in an option's delta in relation to the
-        #           price of the underlying asset
-        #         - **:vega** [Float] Measures the change of option's premium in response to
-        #           a 1% change in implied volatility
-        #       - **:implied_volatility** [Float] Value of expected volatility of a stock
-        #         over the life of the option
-        #       - **:last_price** [Float] Last Traded Price of the Call Option Instrument
-        #       - **:oi** [Integer] Open Interest of the Call Option Instrument
-        #       - **:previous_close_price** [Float] Previous day close price
-        #       - **:previous_oi** [Integer] Previous day Open Interest
-        #       - **:previous_volume** [Integer] Previous day volume
-        #       - **:top_ask_price** [Float] Current best ask price available
-        #       - **:top_ask_quantity** [Integer] Quantity available at current best ask price
-        #       - **:top_bid_price** [Float] Current best bid price available
-        #       - **:top_bid_quantity** [Integer] Quantity available at current best bid price
-        #       - **:volume** [Integer] Day volume for Call Option Instrument
-        #     - **"pe"** [Hash{Symbol => Float, Integer, Hash}] Put Option data for this strike.
-        #       Contains the same fields as "ce" (Call Option data).
-        #
-        # @note Strikes where both CE and PE have zero `last_price` are automatically filtered out.
-        #   This keeps the payload compact and focused on actively traded strikes.
-        #
-        # @example Fetch option chain for NIFTY index options
-        #   chain = DhanHQ::Models::OptionChain.fetch(
-        #     underlying_scrip: 13,
-        #     underlying_seg: "IDX_I",
-        #     expiry: "2024-10-31"
-        #   )
-        #   puts "NIFTY LTP: ₹#{chain[:last_price]}"
+        #   - **:strikes** [Array<Hash>] Sorted array of strike data:
+        #     - **:strike** [Float] The strike price
+        #     - **:call** [Hash] Call Option (CE) data for this strike
+        #     - **:put** [Hash] Put Option (PE) data for this strike
         #
-        # @example Access Call and Put data for a specific strike
-        #   chain = DhanHQ::Models::OptionChain.fetch(
-        #     underlying_scrip: 13,
-        #     underlying_seg: "IDX_I",
-        #     expiry: "2024-10-31"
-        #   )
-        #   strike_25000 = chain[:oc]["25000.000000"]
-        #   ce_data = strike_25000["ce"]
-        #   pe_data = strike_25000["pe"]
-        #   puts "CE LTP: ₹#{ce_data[:last_price]}, OI: #{ce_data[:oi]}"
-        #   puts "PE LTP: ₹#{pe_data[:last_price]}, OI: #{pe_data[:oi]}"
-        #
-        # @example Calculate OI change and analyze Greeks
-        #   chain = DhanHQ::Models::OptionChain.fetch(
-        #     underlying_scrip: 1333,
-        #     underlying_seg: "NSE_FNO",
-        #     expiry: "2024-12-26"
-        #   )
-        #   strike_data = chain[:oc]["25000.000000"]
-        #   ce = strike_data["ce"]
-        #   oi_change = ce[:oi] - ce[:previous_oi]
-        #   puts "OI Change: #{oi_change}"
-        #   puts "Delta: #{ce[:greeks][:delta]}"
-        #   puts "IV: #{ce[:implied_volatility]}%"
-        #
-        # @raise [DhanHQ::ValidationError] If validation fails for any parameter or date format
+        # @raise [DhanHQ::ValidationError] If validation fails for any parameter
         def fetch(params)
           validate_params!(params, DhanHQ::Contracts::OptionChainContract)
 
           response = resource.fetch(params)
           return {}.with_indifferent_access unless response[:status] == "success"
 
-          filter_valid_strikes(response[:data]).with_indifferent_access
+          normalize_chain(response[:data]).with_indifferent_access
         end
 
         ##
         # Fetches the list of active expiry dates for an underlying instrument.
         #
-        # Retrieves all expiry dates for which option instruments are active for the given
-        # underlying. This list is useful for selecting valid expiry dates when fetching
-        # option chains.
-        #
         # @param params [Hash{Symbol => Integer, String}] Request parameters for expiry list
-        #   @option params [Integer] :underlying_scrip (required) Security ID of the underlying
-        #     instrument. Can be found via the Instruments API.
-        #   @option params [String] :underlying_seg (required) Exchange and segment of underlying
-        #     for which expiry list is to be fetched.
-        #     Valid values: "IDX_I" (Index), "NSE_FNO" (NSE F&O), "BSE_FNO" (BSE F&O), "MCX_FO" (MCX)
+        #   @option params [Integer] :underlying_scrip (required) Security ID of the underlying instrument.
+        #   @option params [String] :underlying_seg (required) Exchange and segment of underlying.
         #
         # @return [Array<String>] Array of expiry dates in "YYYY-MM-DD" format.
-        #   Returns empty array if the API response status is not "success" or if no expiries are found.
-        #
-        # @example Fetch expiry list for NIFTY index
-        #   expiries = DhanHQ::Models::OptionChain.fetch_expiry_list(
-        #     underlying_scrip: 13,
-        #     underlying_seg: "IDX_I"
-        #   )
-        #   puts "Available expiries:"
-        #   expiries.each { |expiry| puts "  #{expiry}" }
-        #
-        # @example Use expiry list to fetch option chains
-        #   expiries = DhanHQ::Models::OptionChain.fetch_expiry_list(
-        #     underlying_scrip: 1333,
-        #     underlying_seg: "NSE_FNO"
-        #   )
-        #   nearest_expiry = expiries.first
-        #   chain = DhanHQ::Models::OptionChain.fetch(
-        #     underlying_scrip: 1333,
-        #     underlying_seg: "NSE_FNO",
-        #     expiry: nearest_expiry
-        #   )
-        #
-        # @raise [DhanHQ::ValidationError] If validation fails for any parameter
         def fetch_expiry_list(params)
           validate_params!(params, DhanHQ::Contracts::OptionChainExpiryListContract)
 
@@ -203,51 +113,41 @@ module DhanHQ
           response[:status] == "success" ? response[:data] : []
         end
 
+        alias expiry_list fetch_expiry_list
+
         private
 
         ##
-        # Filters valid strikes where at least one of CE or PE has a non-zero last_price.
-        #
-        # Removes strikes from the option chain where both Call (CE) and Put (PE) options
-        # have zero `last_price`, keeping only actively traded strikes. This keeps the
-        # payload compact and focused on relevant data.
-        #
-        # @param data [Hash] The API response data containing option chain information
-        # @return [Hash] The filtered option chain data with original strike price keys preserved
-        #
-        # @api private
-        def filter_valid_strikes(data)
+        # Normalizes the raw API option chain data.
+        # - Converts strike keys to numeric
+        # - Renames 'ce' to 'call' and 'pe' to 'put'
+        # - Filters strikes with zero prices
+        # - Sorts strikes ascending
+        #
+        # @param data [Hash] The raw API response data
+        # @return [Hash] Normalized option chain
+        def normalize_chain(data)
           return {} unless data.is_a?(Hash) && data.key?(:oc)
 
-          filtered_oc = data[:oc].each_with_object({}) do |(strike_price, strike_data), result|
-            ce_last_price = strike_data.dig("ce", "last_price").to_f
-            pe_last_price = strike_data.dig("pe", "last_price").to_f
+          strikes = data[:oc].filter_map do |strike_price, strike_data|
+            ce = strike_data["ce"] || strike_data[:ce]
+            pe = strike_data["pe"] || strike_data[:pe]
 
-            # Only keep strikes where at least one of CE or PE has a valid last_price
-            result[strike_price] = strike_data if ce_last_price.positive? || pe_last_price.positive?
-          end
+            next if ce["last_price"].to_f.zero? && pe["last_price"].to_f.zero?
 
-          data.merge(oc: filtered_oc)
-        end
+            {
+              strike: strike_price.to_f,
+              call: ce,
+              put: pe
+            }
+          end
 
-        # Validation contract for option chain
-        #
-        # @return [DhanHQ::Contracts::OptionChainContract]
-        # @api private
-        def validation_contract
-          DhanHQ::Contracts::OptionChainContract.new
+          {
+            last_price: data[:last_price],
+            strikes: strikes.sort_by { |s| s[:strike] }
+          }
         end
       end
-
-      private
-
-      # Validation contract for option chain
-      #
-      # @return [DhanHQ::Contracts::OptionChainContract]
-      # @api private
-      def validation_contract
-        DhanHQ::Contracts::OptionChainContract.new
-      end
     end
   end
 end

data/lib/DhanHQ/models/order.rb

@@ -370,9 +370,17 @@ module DhanHQ
       #
       # @raise [RuntimeError] If order ID is missing
       # @raise [DhanHQ::ValidationError] If validation fails for any parameter
+      # @raise [DhanHQ::ModificationLimitError] If this instance has already been modified 25 times (Dhan API cap)
+      # @note Count is per Order instance in this process; a fresh find() resets it.
       def modify(new_params)
         raise "Order ID is required to modify an order" unless id
 
+        count = @modification_count || 0
+        if count >= Constants::RateLimit::ORDER_MODIFICATIONS_PER_ORDER
+          raise ModificationLimitError,
+                "Order modification limit reached (#{Constants::RateLimit::ORDER_MODIFICATIONS_PER_ORDER} per order)"
+        end
+
         warn_invalid_state if order_status_invalid_for_modification?
 
         filtered_payload = prepare_modify_payload(new_params)
@@ -384,6 +392,7 @@ module DhanHQ
 
         return DhanHQ::ErrorObject.new(response) unless success_response?(response)
 
+        @modification_count = count + 1
         @attributes.merge!(normalize_keys(response))
         assign_attributes
         self
@@ -543,13 +552,15 @@ module DhanHQ
       private
 
       def save_new_order
-        DhanHQ.logger&.info("[DhanHQ::Models::Order] Placing order: #{attributes.slice(:transaction_type, :exchange_segment, :security_id, :quantity, :price).inspect}")
+        slice_attrs = attributes.slice(:transaction_type, :exchange_segment, :security_id, :quantity, :price)
+        DhanHQ.logger&.info("[DhanHQ::Models::Order] Placing order: #{slice_attrs.inspect}")
         response = self.class.resource.create(to_request_params)
         handle_api_response(response, success_key: "orderId", context: "[DhanHQ::Models::Order] Order placement")
       end
 
       def modify_existing_order
-        DhanHQ.logger&.info("[DhanHQ::Models::Order] Modifying order #{id}: #{attributes.slice(:price, :quantity, :order_type).inspect}")
+        slice_attrs = attributes.slice(:price, :quantity, :order_type)
+        DhanHQ.logger&.info("[DhanHQ::Models::Order] Modifying order #{id}: #{slice_attrs.inspect}")
         response = self.class.resource.update(id, to_request_params)
         handle_api_response(response, success_key: "orderStatus", context: "[DhanHQ::Models::Order] Order modification")
       end
@@ -559,7 +570,9 @@ module DhanHQ
       end
 
       def warn_invalid_state
-        DhanHQ.logger&.warn("[DhanHQ::Models::Order] Attempting to modify order #{id} in #{order_status} state - API will reject")
+        DhanHQ.logger&.warn(
+          "[DhanHQ::Models::Order] Attempting to modify order #{id} in #{order_status} state - API will reject"
+        )
       end
 
       def prepare_modify_payload(new_params)
@@ -576,7 +589,9 @@ module DhanHQ
 
         # Don't send trigger_price when it's 0 for non–stop-loss orders (API default; avoids validation noise).
         order_type = filtered_payload[:order_type].to_s
-        filtered_payload.delete(:trigger_price) if !%w[STOP_LOSS STOP_LOSS_MARKET].include?(order_type) && filtered_payload[:trigger_price].to_f.zero?
+        trigger_zero = filtered_payload[:trigger_price].to_f.zero?
+        drop_trigger = !%w[STOP_LOSS STOP_LOSS_MARKET].include?(order_type) && trigger_zero
+        filtered_payload.delete(:trigger_price) if drop_trigger
 
         filtered_payload.compact
       end

data/lib/DhanHQ/resources/alert_orders.rb

@@ -5,7 +5,7 @@ module DhanHQ
     # Resource for alert/conditional orders per API docs: /alerts/orders (GET/POST/PUT/DELETE).
     class AlertOrders < BaseResource
       API_TYPE  = :order_api
-      HTTP_PATH = "/alerts/orders"
+      HTTP_PATH = "/v2/alerts/orders"
     end
   end
 end

data/lib/DhanHQ/resources/edis.rb

@@ -3,11 +3,12 @@
 module DhanHQ
   module Resources
     # Resource for EDIS per https://dhanhq.co/docs/v2/edis/
-    # GET /edis/tpin, POST /edis/form (body: isin, qty, exchange, segment, bulk),
-    # POST /edis/bulkform, GET /edis/inquire/{isin}.
+    # GET /edis/tpin (generate T-PIN, 202 Accepted), POST /edis/form (body: isin, qty, exchange, segment, bulk),
+    # POST /edis/bulkform, GET /edis/inquire/{isin} (or "ALL").
+    # Form response: dhanClientId, edisFormHtml. Inquire response: clientId, isin, totalQty, aprvdQty, status, remarks.
     class Edis < BaseAPI
       API_TYPE  = :order_api
-      HTTP_PATH = "/edis"
+      HTTP_PATH = "/v2/edis"
 
       def form(params)
         post("/form", params: params)

data/lib/DhanHQ/resources/instruments.rb

@@ -19,9 +19,10 @@ module DhanHQ
         resp = client.connection.get(path)
         if resp.status.between?(300, 399) && resp.headers["location"]
           redirect_url = resp.headers["location"]
-          return Faraday.get(redirect_url).body
+          Faraday.get(redirect_url).body
+        else
+          resp.body
         end
-        resp.body
       end
     end
   end

data/lib/DhanHQ/resources/ip_setup.rb

@@ -4,9 +4,12 @@ module DhanHQ
   module Resources
     # Resource for IP whitelist per API docs: GET /v2/ip/getIP, POST /v2/ip/setIP, PUT /v2/ip/modifyIP.
     # Set/Modify require dhanClientId, ip, ipFlag (PRIMARY | SECONDARY). See dhanhq.co/docs/v2/authentication/#setup-static-ip
+    #
+    # GET /v2/ip/getIP response: modifyDateSecondary, secondaryIP, modifyDatePrimary, primaryIP
+    # (dates are YYYY-MM-DD from which the IP can be modified; IPs are IPv4 or IPv6).
     class IPSetup < BaseAPI
       API_TYPE  = :order_api
-      HTTP_PATH = "/ip"
+      HTTP_PATH = "/v2/ip"
 
       def current
         get("/getIP")

data/lib/DhanHQ/resources/kill_switch.rb

@@ -10,12 +10,18 @@ module DhanHQ
       API_TYPE  = :order_api
       HTTP_PATH = "/v2/killswitch"
 
+      KILL_SWITCH_STATUSES = %w[ACTIVATE DEACTIVATE].freeze
+
       # Enables or disables the kill switch via query parameter (doc: no body).
       #
       # @param status [String] "ACTIVATE" or "DEACTIVATE"
       # @return [Hash]
+      # @raise [DhanHQ::ValidationError] if status is not ACTIVATE or DEACTIVATE
       def update(status)
-        query = "?killSwitchStatus=#{CGI.escape(status.to_s)}"
+        normalized = status.to_s.upcase.strip
+        raise DhanHQ::ValidationError, "killSwitchStatus must be one of: #{KILL_SWITCH_STATUSES.join(", ")}" unless KILL_SWITCH_STATUSES.include?(normalized)
+
+        query = "?killSwitchStatus=#{CGI.escape(normalized)}"
         handle_response(client.post(build_path(query), {}))
       end
 

data/lib/DhanHQ/resources/orders.rb

@@ -63,7 +63,7 @@ module DhanHQ
       end
 
       def raise_validation_error!(result)
-        raise DhanHQ::Error, "Validation Error: #{result.errors.to_h}"
+        raise DhanHQ::ValidationError, "Invalid parameters: #{result.errors.to_h}"
       end
     end
   end

data/lib/DhanHQ/resources/super_orders.rb

@@ -33,13 +33,19 @@ module DhanHQ
         put("/#{order_id}", params: params)
       end
 
+      SUPER_ORDER_LEGS = %w[ENTRY_LEG STOP_LOSS_LEG TARGET_LEG].freeze
+
       # Cancels a specific leg from a super order.
       #
       # @param order_id [String]
-      # @param leg_name [String]
+      # @param leg_name [String] One of ENTRY_LEG, STOP_LOSS_LEG, TARGET_LEG (per API path enum)
       # @return [Hash]
+      # @raise [DhanHQ::ValidationError] if leg_name is not a valid leg
       def cancel(order_id, leg_name)
-        delete("/#{order_id}/#{leg_name}")
+        normalized = leg_name.to_s.upcase.strip
+        raise DhanHQ::ValidationError, "leg_name must be one of: #{SUPER_ORDER_LEGS.join(", ")}" unless SUPER_ORDER_LEGS.include?(normalized)
+
+        delete("/#{order_id}/#{normalized}")
       end
     end
   end

data/lib/DhanHQ/resources/trader_control.rb

@@ -2,21 +2,30 @@
 
 module DhanHQ
   module Resources
-    # Resource for trader control (kill switch): status (GET), enable/disable (POST /trader-control).
+    # The path /trader-control is not part of the Dhan v2 API (https://dhanhq.co/docs/v2).
+    # Trader's Control in the docs is implemented via:
+    #   - Kill Switch: GET/POST /v2/killswitch → use DhanHQ::Models::KillSwitch or DhanHQ::Resources::KillSwitch
+    #   - P&L Exit:    GET/POST/DELETE /v2/pnlExit → use DhanHQ::Models::PnlExit
+    #
+    # This class is kept for backward compatibility but raises when used.
     class TraderControl < BaseAPI
       API_TYPE  = :order_api
       HTTP_PATH = "/trader-control"
 
+      MSG = "The /trader-control endpoint is not part of the Dhan v2 API. " \
+            "Use DhanHQ::Models::KillSwitch or DhanHQ::Resources::KillSwitch for kill switch " \
+            "(GET/POST /v2/killswitch). See https://dhanhq.co/docs/v2"
+
       def status
-        get("")
+        raise DhanHQ::Error, MSG
       end
 
       def enable
-        post("", params: { action: "ENABLE" })
+        raise DhanHQ::Error, MSG
       end
 
       def disable
-        post("", params: { action: "DISABLE" })
+        raise DhanHQ::Error, MSG
       end
     end
   end

data/lib/DhanHQ/version.rb

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

data/lib/DhanHQ/ws/base_connection.rb

@@ -173,7 +173,7 @@ module DhanHQ
       def default_headers
         {
           "User-Agent" => "DhanHQ-Ruby-Client/#{DhanHQ::VERSION}",
-          "Origin" => "https://dhanhq.co"
+          "Origin" => Constants::Urls::ORIGIN
         }
       end
 

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

@@ -87,7 +87,7 @@ module DhanHQ
           depth_level = config.market_depth_level || 20 # Default to 20 level depth
 
           base = if depth_level == 200
-                   "wss://full-depth-api.dhan.co/twohundreddepth"
+                   Constants::Urls::WS_DEPTH_200
                  else
                    config.ws_market_depth_url
                  end
@@ -164,7 +164,10 @@ module DhanHQ
 
             send_message(subscription_message)
             @subscriptions[label] = resolution
-            DhanHQ.logger&.info("[DhanHQ::WS::MarketDepth] Subscribed to #{resolution[:original_label]} (#{resolution[:exchange_segment]}:#{resolution[:security_id]})")
+            DhanHQ.logger&.info(
+              "[DhanHQ::WS::MarketDepth] Subscribed to #{resolution[:original_label]} " \
+              "(#{resolution[:exchange_segment]}:#{resolution[:security_id]})"
+            )
           rescue StandardError => e
             DhanHQ.logger&.error("[DhanHQ::WS::MarketDepth] Subscription error for #{symbol.inspect}: #{e.class} #{e.message}")
           end
@@ -192,7 +195,10 @@ module DhanHQ
 
             send_message(unsubscribe_message)
             @subscriptions.delete(label)
-            DhanHQ.logger&.info("[DhanHQ::WS::MarketDepth] Unsubscribed from #{security_data[:original_label]} (#{security_data[:exchange_segment]}:#{security_data[:security_id]})")
+            DhanHQ.logger&.info(
+              "[DhanHQ::WS::MarketDepth] Unsubscribed from #{security_data[:original_label]} " \
+              "(#{security_data[:exchange_segment]}:#{security_data[:security_id]})"
+            )
           rescue StandardError => e
             DhanHQ.logger&.error("[DhanHQ::WS::MarketDepth] Unsubscribe error for #{symbol.inspect}: #{e.class} #{e.message}")
           end
@@ -217,7 +223,8 @@ 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::WS::MarketDepth] Unable to locate instrument for #{symbol_code} " \
+              "(segment hint: #{segment_hint || "AUTO"})"
             )
             return nil
           end

data/lib/dhan_hq.rb

@@ -12,8 +12,9 @@ require_relative "DhanHQ/helpers/api_helper"
 require_relative "DhanHQ/helpers/attribute_helper"
 require_relative "DhanHQ/helpers/validation_helper"
 require_relative "DhanHQ/helpers/request_helper"
-require_relative "DhanHQ/helpers/response_helper"
 require_relative "DhanHQ/errors"
+require_relative "DhanHQ/version"
+require_relative "DhanHQ/helpers/response_helper"
 require_relative "DhanHQ/core/base_api"
 require_relative "DhanHQ/core/base_model"
 require_relative "DhanHQ/core/base_resource"
@@ -49,7 +50,7 @@ module DhanHQ
     # Default REST API host used when no custom base URL is provided.
     #
     # @return [String]
-    BASE_URL = "https://api.dhan.co/v2"
+    BASE_URL = Constants::Urls::REST_API_BASE
     # The current configuration instance.
     #
     # @return [DhanHQ::Configuration, nil] The current configuration or `nil` if not set.
@@ -142,28 +143,12 @@ module DhanHQ
       end
 
       unless response.success?
-        body = if response.body.is_a?(Hash)
-                 response.body
-               else
-                 begin
-                   JSON.parse(response.body.to_s)
-                 rescue StandardError
-                   {}
-                 end
-               end
+        body = parse_json_body(response.body)
         msg = body["error"] || body["message"] || body["errorMessage"] || response.body.to_s
         raise DhanHQ::TokenEndpointError, "Token endpoint returned #{response.status}: #{msg}"
       end
 
-      data = if response.body.is_a?(Hash)
-               response.body
-             else
-               begin
-                 JSON.parse(response.body.to_s)
-               rescue StandardError
-                 {}
-               end
-             end
+      data = parse_json_body(response.body)
       data = data.transform_keys(&:to_s) if data.is_a?(Hash)
 
       access_token = data["access_token"] || data[:access_token]
@@ -177,5 +162,17 @@ module DhanHQ
       configuration.base_url = dhan_base.to_s if dhan_base.to_s != ""
       configuration
     end
+
+    # @param body [String, Hash] Raw response body
+    # @return [Hash] Parsed hash; empty hash on parse failure or empty string
+    def parse_json_body(body)
+      return {} if body.nil?
+      return body if body.is_a?(Hash)
+      return {} if body.to_s.strip.empty?
+
+      JSON.parse(body.to_s)
+    rescue StandardError
+      {}
+    end
   end
 end