DhanHQ 2.6.2 → 2.7.0

data/lib/DhanHQ/resources/forever_orders.rb

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
+require_relative "../concerns/order_audit"
+
 module DhanHQ
   module Resources
     # Resource client for GTT/forever order management.
     class ForeverOrders < BaseAPI
+      include DhanHQ::Concerns::OrderAudit
+
       # Uses the trading API tier.
       API_TYPE = :order_api
       # Root path for forever order operations.
@@ -21,6 +25,8 @@ module DhanHQ
       # @param params [Hash]
       # @return [Hash]
       def create(params)
+        ensure_live_trading!
+        log_order_context("DHAN_FOREVER_ORDER_ATTEMPT", params)
         post("/orders", params: params)
       end
 
@@ -38,6 +44,8 @@ module DhanHQ
       # @param params [Hash]
       # @return [Hash]
       def update(order_id, params)
+        ensure_live_trading!
+        log_order_context("DHAN_FOREVER_ORDER_MODIFY_ATTEMPT", params.merge(order_id: order_id))
         put("/orders/#{order_id}", params: params)
       end
 
@@ -46,6 +54,8 @@ module DhanHQ
       # @param order_id [String]
       # @return [Hash]
       def cancel(order_id)
+        ensure_live_trading!
+        log_order_context("DHAN_FOREVER_ORDER_CANCEL_ATTEMPT", { order_id: order_id })
         delete("/orders/#{order_id}")
       end
     end

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

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
+require_relative "../concerns/order_audit"
+
 module DhanHQ
   module Resources
     # Handles order placement, modification, and cancellation
     class Orders < BaseAPI
+      include DhanHQ::Concerns::OrderAudit
+
       API_TYPE = :order_api
       HTTP_PATH = "/v2/orders"
 
@@ -12,21 +16,29 @@ module DhanHQ
       # --------------------------------------------------
 
       def create(params)
+        ensure_live_trading!
+        log_order_context("DHAN_ORDER_ATTEMPT", params)
         validate_place_order!(params)
         post("", params: params)
       end
 
       def update(order_id, params)
+        ensure_live_trading!
+        log_order_context("DHAN_ORDER_MODIFY_ATTEMPT", params.merge(order_id: order_id))
         validate_modify_order!(params.merge(order_id: order_id))
         put("/#{order_id}", params: params)
       end
 
       def slicing(params)
+        ensure_live_trading!
+        log_order_context("DHAN_ORDER_SLICING_ATTEMPT", params)
         validate_place_order!(params)
         post("/slicing", params: params)
       end
 
       def cancel(order_id)
+        ensure_live_trading!
+        log_order_context("DHAN_ORDER_CANCEL_ATTEMPT", { order_id: order_id })
         delete("/#{order_id}")
       end
 
@@ -63,7 +75,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/pnl_exit.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
+require_relative "../concerns/order_audit"
+
 module DhanHQ
   module Resources
     # Resource for P&L Based Exit endpoints per https://dhanhq.co/docs/v2/traders-control/
     # POST /v2/pnlExit — configure, DELETE /v2/pnlExit — stop, GET /v2/pnlExit — status.
     class PnlExit < BaseAPI
+      include DhanHQ::Concerns::OrderAudit
+
       API_TYPE  = :order_api
       HTTP_PATH = "/v2/pnlExit"
 
@@ -14,6 +18,8 @@ module DhanHQ
       # @param params [Hash] Request body with profitValue, lossValue, productType, enableKillSwitch.
       # @return [Hash] API response containing pnlExitStatus and message.
       def configure(params)
+        ensure_live_trading!
+        log_order_context("DHAN_PNL_EXIT_CONFIGURE_ATTEMPT", params)
         post("", params: params)
       end
 
@@ -22,6 +28,8 @@ module DhanHQ
       #
       # @return [Hash] API response containing pnlExitStatus and message.
       def stop
+        ensure_live_trading!
+        log_order_context("DHAN_PNL_EXIT_STOP_ATTEMPT")
         delete("")
       end
 

data/lib/DhanHQ/resources/super_orders.rb

@@ -1,14 +1,20 @@
 # frozen_string_literal: true
 
+require_relative "../concerns/order_audit"
+
 module DhanHQ
   module Resources
     # Resource client for multi-leg super orders.
     class SuperOrders < BaseAPI
+      include DhanHQ::Concerns::OrderAudit
+
       # Super orders are executed via the trading API.
       API_TYPE = :order_api
       # Base path for super order endpoints.
       HTTP_PATH = "/v2/super/orders"
 
+      SUPER_ORDER_LEGS = %w[ENTRY_LEG STOP_LOSS_LEG TARGET_LEG].freeze
+
       # Lists all configured super orders.
       #
       # @return [Array<Hash>]
@@ -21,6 +27,8 @@ module DhanHQ
       # @param params [Hash]
       # @return [Hash]
       def create(params)
+        ensure_live_trading!
+        log_order_context("DHAN_SUPER_ORDER_ATTEMPT", params)
         post("", params: params)
       end
 
@@ -30,16 +38,27 @@ module DhanHQ
       # @param params [Hash]
       # @return [Hash]
       def update(order_id, params)
+        ensure_live_trading!
+        log_order_context("DHAN_SUPER_ORDER_MODIFY_ATTEMPT", params.merge(order_id: order_id))
         put("/#{order_id}", params: params)
       end
 
       # 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
+        unless SUPER_ORDER_LEGS.include?(normalized)
+          raise DhanHQ::ValidationError,
+                "leg_name must be one of: #{SUPER_ORDER_LEGS.join(", ")}"
+        end
+
+        ensure_live_trading!
+        log_order_context("DHAN_SUPER_ORDER_CANCEL_ATTEMPT", { order_id: order_id, leg_name: 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/utils/network_inspector.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require "net/http"
+require "socket"
+
+module DhanHQ
+  module Utils
+    # Collects network and environment metadata for order audit logging.
+    #
+    # Results are memoized at class level so that repeated calls within a single
+    # process do not incur additional HTTP round-trips to the IP-lookup services.
+    #
+    # @example
+    #   DhanHQ::Utils::NetworkInspector.public_ipv4  # => "122.171.22.40"
+    #   DhanHQ::Utils::NetworkInspector.hostname     # => "DESKTOP-SHUBHAM"
+    #   DhanHQ::Utils::NetworkInspector.environment  # => "production"
+    class NetworkInspector
+      IPV4_URI = URI("https://api.ipify.org")
+      IPV6_URI = URI("https://api64.ipify.org")
+
+      class << self
+        # Returns the public IPv4 address of this machine.
+        # Cached after the first successful lookup. Returns "unknown" on failure.
+        #
+        # @return [String]
+        def public_ipv4
+          @public_ipv4 ||= fetch_ip(IPV4_URI)
+        end
+
+        # Returns the public IPv6 address of this machine.
+        # Cached after the first successful lookup. Returns "unknown" on failure.
+        #
+        # @return [String]
+        def public_ipv6
+          @public_ipv6 ||= fetch_ip(IPV6_URI)
+        end
+
+        # Returns the system hostname.
+        #
+        # @return [String]
+        def hostname
+          Socket.gethostname
+        end
+
+        # Returns the current runtime environment name.
+        # Checks RAILS_ENV, RACK_ENV, APP_ENV in order; falls back to "unknown".
+        #
+        # @return [String]
+        def environment
+          ENV["RAILS_ENV"] || ENV["RACK_ENV"] || ENV["APP_ENV"] || "unknown"
+        end
+
+        # Clears the memoized IP cache (useful in tests or when the IP may change).
+        #
+        # @return [void]
+        def reset_cache!
+          @public_ipv4 = nil
+          @public_ipv6 = nil
+        end
+
+        private
+
+        def fetch_ip(uri)
+          Net::HTTP.get(uri).strip
+        rescue StandardError
+          "unknown"
+        end
+      end
+    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.7.0"
 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

data/lib/ta/indicators.rb

@@ -16,13 +16,12 @@ module TA
 
     def rsi(series, period)
       if defined?(RubyTechnicalAnalysis) && RubyTechnicalAnalysis.const_defined?(:RSI)
-        return RubyTechnicalAnalysis::RSI.new(series: series, period: period).call
+        RubyTechnicalAnalysis::RSI.new(series: series, period: period).call
+      elsif defined?(TechnicalAnalysis) && TechnicalAnalysis.respond_to?(:rsi)
+        TechnicalAnalysis.rsi(series, period: period)
+      else
+        simple_rsi(series, period)
       end
-      if defined?(TechnicalAnalysis) && TechnicalAnalysis.respond_to?(:rsi)
-        return TechnicalAnalysis.rsi(series, period: period)
-      end
-
-      simple_rsi(series, period)
     end
 
     def macd(series, fast, slow, signal)
@@ -56,24 +55,22 @@ module TA
 
     def adx(high, low, close, period)
       if defined?(RubyTechnicalAnalysis) && RubyTechnicalAnalysis.const_defined?(:ADX)
-        return RubyTechnicalAnalysis::ADX.new(high: high, low: low, close: close, period: period).call
-      end
-      if defined?(TechnicalAnalysis) && TechnicalAnalysis.respond_to?(:adx)
-        return TechnicalAnalysis.adx(high: high, low: low, close: close, period: period)
+        RubyTechnicalAnalysis::ADX.new(high: high, low: low, close: close, period: period).call
+      elsif defined?(TechnicalAnalysis) && TechnicalAnalysis.respond_to?(:adx)
+        TechnicalAnalysis.adx(high: high, low: low, close: close, period: period)
+      else
+        simple_adx(high, low, close, period)
       end
-
-      simple_adx(high, low, close, period)
     end
 
     def atr(high, low, close, period)
       if defined?(RubyTechnicalAnalysis) && RubyTechnicalAnalysis.const_defined?(:ATR)
-        return RubyTechnicalAnalysis::ATR.new(high: high, low: low, close: close, period: period).call
-      end
-      if defined?(TechnicalAnalysis) && TechnicalAnalysis.respond_to?(:atr)
-        return TechnicalAnalysis.atr(high: high, low: low, close: close, period: period)
+        RubyTechnicalAnalysis::ATR.new(high: high, low: low, close: close, period: period).call
+      elsif defined?(TechnicalAnalysis) && TechnicalAnalysis.respond_to?(:atr)
+        TechnicalAnalysis.atr(high: high, low: low, close: close, period: period)
+      else
+        simple_atr(high, low, close, period)
       end
-
-      simple_atr(high, low, close, period)
     end
 
     def simple_rsi(series, period)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: DhanHQ
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.7.0
 platform: ruby
 authors:
 - Shubham Taywade
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-03-07 00:00:00.000000000 Z
+date: 2026-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -191,25 +191,20 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- AGENTS.md
+- ARCHITECTURE.md
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
-- CODE_REVIEW_ISSUES.md
-- FIXES_APPLIED.md
 - GUIDE.md
 - LICENSE.txt
 - README.md
-- RELEASING.md
-- REVIEW_SUMMARY.md
 - Rakefile
 - TAGS
-- VERSION_UPDATE.md
 - config/initializers/order_update_hub.rb
 - core
 - diagram.html
-- diagram.md
 - docs/API_DOCS_GAPS.md
 - docs/API_VERIFICATION.md
-- docs/ARCHIVE_README.md
 - docs/AUTHENTICATION.md
 - docs/CONFIGURATION.md
 - docs/CONSTANTS_REFERENCE.md
@@ -232,15 +227,19 @@ files:
 - lib/DhanHQ/auth/token_manager.rb
 - lib/DhanHQ/auth/token_renewal.rb
 - lib/DhanHQ/client.rb
+- lib/DhanHQ/concerns/order_audit.rb
 - lib/DhanHQ/configuration.rb
 - lib/DhanHQ/constants.rb
 - lib/DhanHQ/contracts/alert_order_contract.rb
 - lib/DhanHQ/contracts/base_contract.rb
 - lib/DhanHQ/contracts/edis_contract.rb
 - lib/DhanHQ/contracts/expired_options_data_contract.rb
+- lib/DhanHQ/contracts/forever_order_contract.rb
 - lib/DhanHQ/contracts/historical_data_contract.rb
 - lib/DhanHQ/contracts/instrument_list_contract.rb
+- lib/DhanHQ/contracts/intraday_historical_data_contract.rb
 - lib/DhanHQ/contracts/margin_calculator_contract.rb
+- lib/DhanHQ/contracts/market_feed_contract.rb
 - lib/DhanHQ/contracts/modify_order_contract.rb
 - lib/DhanHQ/contracts/multi_scrip_margin_calc_request_contract.rb
 - lib/DhanHQ/contracts/option_chain_contract.rb
@@ -316,6 +315,7 @@ files:
 - lib/DhanHQ/resources/super_orders.rb
 - lib/DhanHQ/resources/trader_control.rb
 - lib/DhanHQ/resources/trades.rb
+- lib/DhanHQ/utils/network_inspector.rb
 - lib/DhanHQ/version.rb
 - lib/DhanHQ/ws.rb
 - lib/DhanHQ/ws/base_connection.rb