DhanHQ 2.6.1 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b6e949dc3b147daabce77b5d808d5dcdeb4953e9751322eb8cd671d70201c57
-  data.tar.gz: 12327daca50d50836d724f4eeb5cf664abee766767c7bdec31f51b07b78ddc00
+  metadata.gz: 4469f87602b1825aa53ac5d53ef3493fb3a6fd40b00fd58199f23ba3c4a3e129
+  data.tar.gz: 7b5c65ab06cf2f945f488af2ab63499eb9a5fe2cea6ec04579db12a227ac121e
 SHA512:
-  metadata.gz: 0ba1d351594f83a0824961dff0e8cfb28ce9b6fd6e65daa9124bf0ceab651c49aaefd00674cdbfdd78a48f9e7c2032395b4981b0b613bfccbee49b7c46ba319d
-  data.tar.gz: 2e5ca5a81905c9e4fa861296f247eaa2411bf548f84cd94e348c51a079b406280ae9247838c013173552e6564c625ded0fd4504284d097b27892b55ecb9380ca
+  metadata.gz: 13683dc64df357c014a4427bbf3ee9981f3c52ad12795cd7f08d02e3d2cab3597efdb3668f63521f3bd2d43d616ac5ba577b11e104b304738c1b1c0769438bd2
+  data.tar.gz: cc2992611f9d3d4c785be89edc8bb3c33bffb6170a2575a20c532c8ff4ee9838bc1bf0021cdec6327349ff008fa7ae278b8e56d7cc2286310df3d0f4cd604292

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [2.6.2] - 2026-03-07
+
+### Changed
+
+- **Release from main** after merging add-sandbox-support. Includes sandbox REST base URL, `ensure_configuration!`, payload non-mutation, Rakefile/VCR fixes, and docs. Full feature list is under [2.6.0](#260---2026-03-06); 2.6.0 and 2.6.1 are already on RubyGems.
+
+---
+
 ## [2.6.1] - 2026-03-07
 
 ### Changed
@@ -8,6 +16,22 @@
 
 ## [2.6.0] - 2026-03-06
 
+### Sandbox & configuration
+
+- **Sandbox environment**: `DhanHQ.configuration.sandbox` (or `ENV["DHAN_SANDBOX"]=true`) switches REST base URL to `https://sandbox.dhan.co/v2`. Only `GET /v2/profile` and `GET /v2/fundlimit` are verified on sandbox; other REST endpoints are unverified. See `docs/ENDPOINTS_AND_SANDBOX.md`.
+- **WebSocket**: Sandbox does **not** support WebSocket. Order updates, market feed, and market depth always use production URLs regardless of `sandbox`; no sandbox WS URLs are published.
+- **Env-only bootstrap**: `DhanHQ.ensure_configuration!` ensures configuration exists (from ENV when nil). Called automatically in `Client#initialize` so apps using only `DHAN_CLIENT_ID` / `DHAN_ACCESS_TOKEN` work without calling `configure_with_env`.
+
+### Fixed
+
+- **Payload mutation**: `prepare_payload` no longer mutates the caller's hash when injecting `dhanClientId` for DATA APIs; uses a duplicate so frozen or reused hashes are safe.
+- **VCR**: Removed erroneous `/v2/v2/` market feed cassette entries (404 responses).
+- **Rakefile**: Single RuboCop task; removed redundant `rubocop:fix` / `rubocop:fix_all` and deprecated `--auto-correct-all` flag.
+
+### Added
+
+- **docs/ENDPOINTS_AND_SANDBOX.md**: Lists all REST/WebSocket endpoints, sandbox behavior, and endpoints verified vs not supported on sandbox.
+
 ### Fixed (API docs alignment)
 
 - **Kill Switch**: Manage API now uses query parameter per [dhanhq.co/docs/v2/traders-control](https://dhanhq.co/docs/v2/traders-control/). `Resources::KillSwitch#update(status)` sends `POST /v2/killswitch?killSwitchStatus=ACTIVATE` (or `DEACTIVATE`) with no body. `Models::KillSwitch.update("ACTIVATE")` / `.activate` / `.deactivate` unchanged.

data/Rakefile

@@ -7,6 +7,8 @@ RSpec::Core::RakeTask.new(:spec)
 
 require "rubocop/rake_task"
 
-RuboCop::RakeTask.new
+# Single RuboCop task; the gem also registers rubocop:autocorrect and rubocop:autocorrect_all.
+desc "Run RuboCop"
+RuboCop::RakeTask.new(:rubocop)
 
 task default: %i[spec rubocop]

data/docs/ENDPOINTS_AND_SANDBOX.md

@@ -0,0 +1,103 @@
+# DhanHQ gem — Endpoints and sandbox support
+
+## Sandbox behavior
+
+- **REST:** When `DhanHQ.configuration.sandbox == true` (or `ENV["DHAN_SANDBOX"]=true`), the client uses `https://sandbox.dhan.co/v2` as the base URL for **all** requests that go through `DhanHQ::Client`. Every wrapped REST endpoint listed below is therefore **sent** to the sandbox host when sandbox is enabled.
+- **Sandbox does NOT support WebSocket.** Order updates, market feed, and market depth are **production-only**. The gem always uses production WebSocket URLs regardless of the `sandbox` setting. There are no sandbox WebSocket endpoints in the Dhan v2 API; do not rely on sandbox for real-time streams.
+- **Auth endpoints** (`DhanHQ::Auth`) do **not** use sandbox. They always call:
+  - `https://auth.dhan.co` — token generation
+  - `https://api.dhan.co/v2` — token renewal  
+  So token generation/renewal always hit production; only data/order REST calls follow the sandbox flag.
+
+---
+
+## Sandbox: verified vs not working / unverified
+
+| Status    | Endpoints |
+|-----------|-----------|
+| **Verified on sandbox** (gem specs) | `GET /v2/profile`, `GET /v2/fundlimit` |
+| **Sandbox connectivity spec** | `spec/dhan_hq/sandbox_connectivity_spec.rb` — uses VCR `record: :new_episodes`. In CI, use committed cassettes or skip without sandbox credentials; locally, run with `VCR_RECORD=new_episodes` and sandbox credentials to record. |
+| **Not supported in sandbox** | All WebSocket endpoints (order updates, market feed, market depth). Use production only. |
+| **Not verified on sandbox** | All other REST endpoints below. They may fail, return differently, or be unavailable in sandbox. Use Dhan documentation or manual testing before relying on them in sandbox. |
+
+**REST endpoints not verified / may not work on sandbox** (only profile and funds are verified):
+
+- `/v2/ledger`, `/v2/trades/{from}/{to}/{page}` (statements)
+- `/v2/orders` (all order CRUD, slicing, external)
+- `/v2/positions`, `/v2/positions/convert`
+- `/v2/holdings`
+- `/v2/trades`, `/v2/trades/{order_id}`
+- `/v2/forever/orders` (all)
+- `/v2/super/orders` (all)
+- `/v2/killswitch`
+- `/trader-control`
+- `/ip/getIP`, `/ip/setIP`, `/ip/modifyIP`
+- `/edis/tpin`, `/edis/form`, `/edis/bulkform`, `/edis/inquire/{isin}`
+- `/alerts/orders`
+- `/v2/pnlExit`
+- `/v2/margincalculator`, `/v2/margincalculator/multi`
+- `/v2/instrument/{segment}`
+- `/v2/marketfeed/ltp`, `/v2/marketfeed/ohlc`, `/v2/marketfeed/quote`
+- `/v2/optionchain`, `/v2/optionchain/expirylist`
+- `/v2/charts/historical`, `/v2/charts/intraday`, `/v2/charts/rollingoption`
+
+---
+
+## REST endpoints integrated in the gem
+
+Paths are as built by the gem (HTTP_PATH + endpoint). Base URL is either `https://api.dhan.co/v2` (production) or `https://sandbox.dhan.co/v2` (sandbox).
+
+| Resource / model           | Path(s)                                      | Methods   | API type        |
+|---------------------------|----------------------------------------------|-----------|-----------------|
+| **Profile**               | `/v2/profile`                               | GET       | non_trading_api |
+| **Funds**                 | `/v2/fundlimit`                              | GET       | non_trading_api |
+| **Statements**            | `/v2/ledger`, `/v2/trades/{from}/{to}/{page}`| GET       | non_trading_api |
+| **Orders**                | `/v2/orders`, `/v2/orders/{id}`, `/v2/orders/external/{correlation_id}`, `/v2/orders/slicing` | GET, POST, PUT, DELETE | order_api |
+| **Positions**             | `/v2/positions`, `/v2/positions/convert`     | GET, POST, DELETE | order_api |
+| **Holdings**              | `/v2/holdings`                               | GET       | order_api       |
+| **Trades**                | `/v2/trades`, `/v2/trades/{order_id}`        | GET       | order_api       |
+| **Forever orders**        | `/v2/forever/orders`, `/v2/forever/orders/{id}` | GET, POST, PUT, DELETE | order_api |
+| **Super orders**          | `/v2/super/orders`, `/v2/super/orders/{id}`, leg delete | GET, POST, PUT, DELETE | order_api |
+| **Kill switch**           | `/v2/killswitch`                             | GET, POST | order_api       |
+| **Trader control**        | `/trader-control`                            | GET, POST | order_api       |
+| **IP setup**              | `/ip/getIP`, `/ip/setIP`, `/ip/modifyIP`     | GET, POST, PUT | order_api |
+| **EDIS**                  | `/edis/tpin`, `/edis/form`, `/edis/bulkform`, `/edis/inquire/{isin}` | GET, POST | order_api |
+| **Alert orders**          | `/alerts/orders`                             | GET, POST, PUT, DELETE | order_api |
+| **PnL exit**              | `/v2/pnlExit`                                | GET, POST, DELETE | order_api |
+| **Margin calculator**     | `/v2/margincalculator`, `/v2/margincalculator/multi` | POST      | order_api       |
+| **Instruments**           | `/v2/instrument/{segment}` (redirect to CSV) | GET       | data_api        |
+| **Market feed**           | `/v2/marketfeed/ltp`, `/v2/marketfeed/ohlc`, `/v2/marketfeed/quote` | POST      | data_api / quote_api |
+| **Option chain**          | `/v2/optionchain`, `/v2/optionchain/expirylist` | POST      | data_api        |
+| **Historical data**       | `/v2/charts/historical`, `/v2/charts/intraday` | POST      | data_api        |
+| **Expired options data**  | `/v2/charts/rollingoption`                   | POST      | data_api        |
+
+---
+
+## Auth (outside main client base URL)
+
+| Purpose           | URL / path                     | Method |
+|-------------------|--------------------------------|--------|
+| Generate token    | `https://auth.dhan.co/app/generateAccessToken` | POST   |
+| Renew token       | `https://api.dhan.co/v2/RenewToken`           | POST   |
+
+These are **not** sandbox-aware; they always use the URLs above.
+
+---
+
+## WebSocket endpoints (production only; sandbox not supported)
+
+| Purpose        | URL |
+|----------------|-----|
+| Order updates  | `wss://api-order-update.dhan.co` |
+| Market feed    | `wss://api-feed.dhan.co` |
+| Market depth   | `wss://depth-api-feed.dhan.co/twentydepth` |
+
+**Sandbox:** Dhan sandbox does **not** provide WebSocket services. These endpoints are production-only. The gem never switches WS URLs based on `sandbox`; you can still override via `DhanHQ.configuration.ws_order_url`, `ws_market_feed_url`, `ws_market_depth_url`, or env vars `DHAN_WS_ORDER_URL`, `DHAN_WS_MARKET_FEED_URL`, `DHAN_WS_MARKET_DEPTH_URL` if you have a different production URL.
+
+---
+
+## Summary
+
+- **REST:** When `sandbox` is true, all REST calls go to `https://sandbox.dhan.co/v2`. Only `GET /v2/profile` and `GET /v2/fundlimit` are verified working on sandbox; other REST endpoints are not verified — see "Sandbox: verified vs not working / unverified" above.
+- **Auth:** Token generation and renewal always use production hosts.
+- **WebSockets:** Sandbox does **not** support WebSocket. Order updates, market feed, and market depth always use production URLs; the gem does not publish or use any sandbox WebSocket URLs.

data/lib/DhanHQ/client.rb

@@ -40,29 +40,15 @@ module DhanHQ
     # @return [DhanHQ::Client] A new client instance.
     # @raise [DhanHQ::Error] If configuration is invalid or rate limiter initialization fails
     def initialize(api_type:)
-      # Configure from ENV if DHAN_CLIENT_ID is present (backward compatible behavior)
-      # Validation happens at request time in build_headers, not here
-      DhanHQ.configure_with_env if ENV.fetch("DHAN_CLIENT_ID", nil)
-
+      DhanHQ.ensure_configuration!
       # Use shared rate limiter instance per API type to ensure proper coordination
       @rate_limiter = RateLimiter.for(api_type)
 
       raise DhanHQ::Error, "RateLimiter initialization failed" unless @rate_limiter
 
-      # Get timeout values from configuration or environment, with sensible defaults
-      connect_timeout = ENV.fetch("DHAN_CONNECT_TIMEOUT", 10).to_i
-      read_timeout = ENV.fetch("DHAN_READ_TIMEOUT", 30).to_i
-      write_timeout = ENV.fetch("DHAN_WRITE_TIMEOUT", 30).to_i
-
-      @connection = Faraday.new(url: DhanHQ.configuration.base_url) do |conn|
-        conn.request :json, parser_options: { symbolize_names: true }
-        conn.response :json, content_type: /\bjson$/
-        conn.response :logger if ENV["DHAN_DEBUG"] == "true"
-        conn.options.timeout = read_timeout
-        conn.options.open_timeout = connect_timeout
-        conn.options.write_timeout = write_timeout
-        conn.adapter Faraday.default_adapter
-      end
+      # Store initial URL to detect changes
+      @last_base_url = DhanHQ.configuration.base_url
+      @connection = build_connection(@last_base_url)
     end
 
     # Sends an HTTP request to the API with automatic retry for transient errors.
@@ -77,13 +63,15 @@ module DhanHQ
       @token_manager&.ensure_valid_token!
       @rate_limiter.throttle! # **Ensure we don't hit rate limit before calling API**
 
+      # Ensure connection matches current configuration (e.g. sandbox toggle)
+      refresh_connection!
+
       attempt = 0
       auth_retry_done = false
       begin
-        response = connection.send(method) do |req|
-          req.url path
+        response = connection.send(method, path) do |req|
           req.headers.merge!(build_headers(path))
-          prepare_payload(req, payload, method)
+          prepare_payload(req, payload, method, path)
         end
 
         handle_response(response)
@@ -201,6 +189,31 @@ module DhanHQ
 
     private
 
+    def refresh_connection!
+      current_url = DhanHQ.configuration.base_url
+      return if @last_base_url == current_url
+
+      @last_base_url = current_url
+      @connection = build_connection(current_url)
+    end
+
+    def build_connection(url)
+      # Get timeout values from configuration or environment, with sensible defaults
+      connect_timeout = ENV.fetch("DHAN_CONNECT_TIMEOUT", 10).to_i
+      read_timeout = ENV.fetch("DHAN_READ_TIMEOUT", 30).to_i
+      write_timeout = ENV.fetch("DHAN_WRITE_TIMEOUT", 30).to_i
+
+      Faraday.new(url: url) do |conn|
+        conn.request :json, parser_options: { symbolize_names: true }
+        conn.response :json, content_type: /\bjson$/
+        conn.response :logger if ENV["DHAN_DEBUG"] == "true"
+        conn.options.timeout = read_timeout
+        conn.options.open_timeout = connect_timeout
+        conn.options.write_timeout = write_timeout
+        conn.adapter Faraday.default_adapter
+      end
+    end
+
     # Calculates exponential backoff time
     #
     # @param attempt [Integer] Current attempt number (1-based)

data/lib/DhanHQ/configuration.rb

@@ -12,6 +12,10 @@ module DhanHQ
     #
     # @return [String]
     BASE_URL = "https://api.dhan.co/v2"
+
+    # Default Sandbox API host.
+    # @return [String]
+    SANDBOX_URL = "https://sandbox.dhan.co/v2"
     # The client ID for API authentication.
     # @return [String, nil] The client ID or `nil` if not set.
     attr_accessor :client_id
@@ -32,8 +36,11 @@ module DhanHQ
     attr_accessor :on_token_expired
 
     # The base URL for API requests.
-    # @return [String] The base URL for the DhanHQ API.
-    attr_accessor :base_url
+    # @return [String]
+    attr_writer :base_url
+
+    # Whether to use the sandbox environment.
+    attr_accessor :sandbox
 
     # URL for the compact CSV format of instruments.
     # @return [String] URL for compact CSV.
@@ -48,21 +55,33 @@ module DhanHQ
     attr_accessor :ws_version
 
     # Websocket order updates endpoint.
+    # Sandbox does not support WebSocket; always returns production URL unless overridden.
     # @return [String]
-    attr_accessor :ws_order_url
+    def ws_order_url
+      @ws_order_url || "wss://api-order-update.dhan.co"
+    end
 
     # Websocket market feed endpoint.
+    # Sandbox does not support WebSocket; always returns production URL unless overridden.
     # @return [String]
-    attr_accessor :ws_market_feed_url
+    def ws_market_feed_url
+      @ws_market_feed_url || "wss://api-feed.dhan.co"
+    end
 
     # Websocket market depth endpoint.
+    # Sandbox does not support WebSocket; always returns production URL unless overridden.
     # @return [String]
-    attr_accessor :ws_market_depth_url
+    def ws_market_depth_url
+      @ws_market_depth_url || "wss://depth-api-feed.dhan.co/twentydepth"
+    end
 
     # Market depth level (20 or 200).
     # @return [Integer]
     attr_accessor :market_depth_level
 
+    # Setters for websocket URLs
+    attr_writer :ws_order_url, :ws_market_feed_url, :ws_market_depth_url
+
     # Websocket user type for order updates.
     # @return [String] "SELF" or "PARTNER".
     attr_accessor :ws_user_type
@@ -91,6 +110,21 @@ module DhanHQ
       end
     end
 
+    # Returns the base URL to use. If {#sandbox} is true and {#base_url}
+    # is nil or the default production URL, returns {SANDBOX_URL}.
+    # @return [String]
+    def base_url
+      if sandbox? && (@base_url.nil? || @base_url == BASE_URL)
+        SANDBOX_URL
+      else
+        @base_url || BASE_URL
+      end
+    end
+
+    def sandbox?
+      @sandbox == true
+    end
+
     # Initializes a new configuration instance with default values.
     #
     # @example
@@ -100,11 +134,12 @@ module DhanHQ
     def initialize
       @client_id = ENV.fetch("DHAN_CLIENT_ID", nil)
       @access_token = ENV.fetch("DHAN_ACCESS_TOKEN", nil)
-      @base_url       = ENV.fetch("DHAN_BASE_URL", "https://api.dhan.co/v2")
+      @sandbox        = ENV.fetch("DHAN_SANDBOX", "false").to_s.casecmp("true").zero?
+      @base_url       = ENV.fetch("DHAN_BASE_URL", nil)
       @ws_version     = ENV.fetch("DHAN_WS_VERSION", 2).to_i
-      @ws_order_url = ENV.fetch("DHAN_WS_ORDER_URL", "wss://api-order-update.dhan.co")
-      @ws_market_feed_url = ENV.fetch("DHAN_WS_MARKET_FEED_URL", "wss://api-feed.dhan.co")
-      @ws_market_depth_url = ENV.fetch("DHAN_WS_MARKET_DEPTH_URL", "wss://depth-api-feed.dhan.co/twentydepth")
+      @ws_order_url = ENV.fetch("DHAN_WS_ORDER_URL", nil)
+      @ws_market_feed_url = ENV.fetch("DHAN_WS_MARKET_FEED_URL", nil)
+      @ws_market_depth_url = ENV.fetch("DHAN_WS_MARKET_DEPTH_URL", nil)
       @market_depth_level = ENV.fetch("DHAN_MARKET_DEPTH_LEVEL", "20").to_i
       @ws_user_type   = ENV.fetch("DHAN_WS_USER_TYPE", "SELF")
       @partner_id     = ENV.fetch("DHAN_PARTNER_ID", nil)

data/lib/DhanHQ/constants.rb

@@ -417,7 +417,11 @@ module DhanHQ
     DATA_API_PREFIXES = [
       "/v2/marketfeed/",
       "/v2/optionchain",
-      "/v2/instrument/"
+      "/v2/instrument/",
+      "/v2/charts",
+      "/v2/margincalculator",
+      "/v2/profile",
+      "/v2/fundlimit"
     ].freeze
 
     # Mapping of exchange and segment combinations to canonical exchange segment names.

data/lib/DhanHQ/core/base_api.rb

@@ -88,9 +88,10 @@ module DhanHQ
 
     # Format parameters based on API endpoint
     def format_params(endpoint, params)
-      return params if marketfeed_api?(endpoint) || params.empty?
+      full_path = build_path(endpoint)
+      return params if marketfeed_api?(full_path) || params.empty?
 
-      optionchain_api?(endpoint) ? titleize_keys(params) : camelize_keys(params)
+      optionchain_api?(full_path) ? titleize_keys(params) : camelize_keys(params)
     end
 
     # Determines if the API endpoint is for Option Chain

data/lib/DhanHQ/helpers/request_helper.rb

@@ -39,7 +39,7 @@ module DhanHQ
         "access-token" => token
       }
 
-      # Add client-id for DATA APIs
+      # Add client-id for DATA APIs (now including sandbox profile/funds)
       if data_api?(path)
         client_id = DhanHQ.configuration&.client_id
         unless client_id
@@ -70,18 +70,31 @@ module DhanHQ
     # @param req [Faraday::Request] The request object.
     # @param payload [Hash] The request payload.
     # @param method [Symbol] The HTTP method.
-    def prepare_payload(req, payload, method)
-      return if payload.nil? || payload.empty?
+    def prepare_payload(req, payload, method, path = nil)
+      return if payload.nil? || (payload.empty? && (path.nil? || !data_api?(path)))
 
       unless payload.is_a?(Hash)
         raise DhanHQ::InputExceptionError,
               "Invalid payload: Expected a Hash, got #{payload.class}"
       end
 
+      out = payload
+      if path && data_api?(path) && %i[post put patch].include?(method)
+        client_id = DhanHQ.configuration&.client_id
+        if client_id && !payload.key?(:dhanClientId) && !payload.key?("dhanClientId")
+          out = payload.dup
+          if out.keys.any?(String)
+            out["dhanClientId"] = client_id
+          else
+            out[:dhanClientId] = client_id
+          end
+        end
+      end
+
       case method
       when :delete then req.params = {}
-      when :get then req.params = payload
-      else req.body = payload.to_json
+      when :get then req.params = out
+      else req.body = out.to_json
       end
     end
   end

data/lib/DhanHQ/models/forever_order.rb

@@ -218,7 +218,8 @@ module DhanHQ
         def create(params)
           # Normalize params and auto-inject dhan_client_id from configuration if not provided
           normalized_params = snake_case(params)
-          normalized_params[:dhan_client_id] ||= DhanHQ.configuration.client_id if DhanHQ.configuration.client_id
+          config = DhanHQ.configuration
+          normalized_params[:dhan_client_id] ||= config.client_id if config&.client_id
           response = resource.create(normalized_params)
           return nil unless response.is_a?(Hash) && response["orderId"]
 

data/lib/DhanHQ/models/super_order.rb

@@ -207,9 +207,9 @@ module DhanHQ
         #   )
         #
         def create(params)
-          # Normalize params and auto-inject dhan_client_id from configuration if not provided
           normalized_params = snake_case(params)
-          normalized_params[:dhan_client_id] ||= DhanHQ.configuration.client_id if DhanHQ.configuration.client_id
+          config = DhanHQ.configuration
+          normalized_params[:dhan_client_id] ||= config.client_id if config&.client_id
           response = resource.create(normalized_params)
           return nil unless response.is_a?(Hash) && response["orderId"]
 

data/lib/DhanHQ/version.rb

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

data/lib/DhanHQ/ws/client.rb

@@ -32,7 +32,8 @@ module DhanHQ
 
         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"
+        base  = url || DhanHQ.configuration.ws_market_feed_url
+        @url  = base.include?("?") ? base : "#{base}?version=#{ver}&token=#{token}&clientId=#{cid}&authType=2"
       end
 
       # Starts the WebSocket connection and event loop.

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

@@ -86,11 +86,12 @@ module DhanHQ
           cid = config.client_id or raise "DhanHQ.client_id not set"
           depth_level = config.market_depth_level || 20 # Default to 20 level depth
 
-          if depth_level == 200
-            "wss://full-depth-api.dhan.co/twohundreddepth?token=#{token}&clientId=#{cid}&authType=2"
-          else
-            "wss://depth-api-feed.dhan.co/twentydepth?token=#{token}&clientId=#{cid}&authType=2"
-          end
+          base = if depth_level == 200
+                   "wss://full-depth-api.dhan.co/twohundreddepth"
+                 else
+                   config.ws_market_depth_url
+                 end
+          base.include?("?") ? base : "#{base}?token=#{token}&clientId=#{cid}&authType=2"
         end
 
         ##

data/lib/dhan_hq.rb

@@ -4,6 +4,7 @@ require "json"
 require "logger"
 require "zeitwerk"
 require "dotenv/load"
+require "faraday"
 # Minimal eager requires for backward-compatible constants.
 # These are widely referenced (e.g. `DhanHQ::BaseAPI`) and should not depend on
 # the autoloader being fully configured.
@@ -12,6 +13,7 @@ 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/core/base_api"
 require_relative "DhanHQ/core/base_model"
 require_relative "DhanHQ/core/base_resource"
@@ -89,15 +91,21 @@ module DhanHQ
     #
     # @return [void]
     def configure_with_env
+      self.configuration = Configuration.new
+    end
+
+    # Ensures configuration exists, bootstrapping from ENV when nil.
+    # Called automatically when building a Client so env-only integrations work without
+    # an explicit configure/configure_with_env call. Idempotent when configuration is already set.
+    #
+    # @return [DhanHQ::Configuration]
+    def ensure_configuration!
       self.configuration ||= Configuration.new
-      configuration.access_token = ENV.fetch("DHAN_ACCESS_TOKEN", nil)
-      configuration.client_id = ENV.fetch("DHAN_CLIENT_ID", nil)
-      configuration.base_url = ENV.fetch("DHAN_BASE_URL", BASE_URL)
-      configuration.ws_version = ENV.fetch("DHAN_WS_VERSION", configuration.ws_version || 2).to_i
-      configuration.ws_order_url = ENV.fetch("DHAN_WS_ORDER_URL", configuration.ws_order_url)
-      configuration.ws_user_type = ENV.fetch("DHAN_WS_USER_TYPE", configuration.ws_user_type)
-      configuration.partner_id = ENV.fetch("DHAN_PARTNER_ID", configuration.partner_id)
-      configuration.partner_secret = ENV.fetch("DHAN_PARTNER_SECRET", configuration.partner_secret)
+    end
+
+    # Resets the configuration to nil.
+    def reset_configuration!
+      self.configuration = nil
     end
 
     # Configures the DhanHQ client by fetching credentials from a token endpoint.
@@ -120,12 +128,12 @@ module DhanHQ
       base_url ||= ENV.fetch("DHAN_TOKEN_ENDPOINT_BASE_URL", nil)
       bearer_token ||= ENV.fetch("DHAN_TOKEN_ENDPOINT_BEARER", nil)
 
-      raise TokenEndpointError, "base_url and bearer_token (or ENV DHAN_TOKEN_ENDPOINT_*) are required" if base_url.to_s.empty? || bearer_token.to_s.empty?
+      raise DhanHQ::TokenEndpointError, "base_url and bearer_token (or ENV DHAN_TOKEN_ENDPOINT_*) are required" if base_url.to_s.empty? || bearer_token.to_s.empty?
 
       url = "#{base_url.to_s.chomp("/")}/auth/dhan/token"
-      conn = Faraday.new(url: url) do |c|
+      conn = ::Faraday.new(url: url) do |c|
         c.response :json, content_type: /\bjson$/
-        c.adapter Faraday.default_adapter
+        c.adapter ::Faraday.default_adapter
       end
 
       response = conn.get("") do |req|
@@ -144,7 +152,7 @@ module DhanHQ
                  end
                end
         msg = body["error"] || body["message"] || body["errorMessage"] || response.body.to_s
-        raise TokenEndpointError, "Token endpoint returned #{response.status}: #{msg}"
+        raise DhanHQ::TokenEndpointError, "Token endpoint returned #{response.status}: #{msg}"
       end
 
       data = if response.body.is_a?(Hash)
@@ -160,7 +168,7 @@ module DhanHQ
 
       access_token = data["access_token"] || data[:access_token]
       client_id = data["client_id"] || data[:client_id]
-      raise TokenEndpointError, "Token endpoint response missing access_token or client_id" if access_token.to_s.empty? || client_id.to_s.empty?
+      raise DhanHQ::TokenEndpointError, "Token endpoint response missing access_token or client_id" if access_token.to_s.empty? || client_id.to_s.empty?
 
       self.configuration ||= Configuration.new
       configuration.access_token = access_token.to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: DhanHQ
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.2
 platform: ruby
 authors:
 - Shubham Taywade
@@ -214,6 +214,7 @@ files:
 - docs/CONFIGURATION.md
 - docs/CONSTANTS_REFERENCE.md
 - docs/DATA_API_PARAMETERS.md
+- docs/ENDPOINTS_AND_SANDBOX.md
 - docs/LIVE_ORDER_UPDATES.md
 - docs/RAILS_INTEGRATION.md
 - docs/RAILS_WEBSOCKET_INTEGRATION.md