@orderly.network/ui-tradingview 2.8.10-alpha.0 → 2.8.11-alpha.0

package/dist/index.js

@@ -1078,16 +1078,37 @@ var _HistoryProvider = class _HistoryProvider {
               countBack
             );
             if (needsFallback) {
-              const klineResult = await this._tryKlineFallback(
-                requestParams,
-                countBack
-              );
-              if (klineResult !== null) {
-                result = klineResult;
-                usedHistoryResult = false;
-                this._klinePreference.set(preferenceKey, true);
+              const earliestTime = this._getEarliestTime(result.bars);
+              if (earliestTime !== null) {
+                const remainingCountBack = Math.max(
+                  0,
+                  countBack - result.bars.length
+                );
+                const mergedResult = await this._tryKlineFallbackWithMerge(
+                  requestParams,
+                  remainingCountBack,
+                  earliestTime,
+                  result
+                );
+                if (mergedResult !== null) {
+                  result = mergedResult;
+                  usedHistoryResult = false;
+                  this._klinePreference.set(preferenceKey, true);
+                } else {
+                  this._klinePreference.set(preferenceKey, false);
+                }
               } else {
-                this._klinePreference.set(preferenceKey, false);
+                const klineResult = await this._tryKlineFallback(
+                  requestParams,
+                  countBack
+                );
+                if (klineResult !== null) {
+                  result = klineResult;
+                  usedHistoryResult = false;
+                  this._klinePreference.set(preferenceKey, true);
+                } else {
+                  this._klinePreference.set(preferenceKey, false);
+                }
               }
             } else {
               this._klinePreference.set(preferenceKey, false);
@@ -1302,6 +1323,106 @@ var _HistoryProvider = class _HistoryProvider {
     }
     return params;
   }
+  /**
+   * Get the earliest time from bars array
+   * @param bars - Array of bars
+   * @returns Earliest timestamp in seconds, or null if bars array is empty
+   */
+  _getEarliestTime(bars) {
+    if (bars.length === 0) {
+      return null;
+    }
+    return bars[0].time / 1e3;
+  }
+  /**
+   * Try kline fallback with merge logic
+   * Requests kline data from the earliest time in history result to the original end time,
+   * then merges the kline data with history data
+   * @param requestParams - Original request parameters
+   * @param countBack - Count back value
+   * @param earliestTime - Earliest time from history result (in seconds)
+   * @param historyResult - History result to merge with
+   * @returns Merged result or null if kline request fails
+   */
+  async _tryKlineFallbackWithMerge(requestParams, countBack, earliestTime, historyResult) {
+    try {
+      const klineParams = {
+        ...requestParams,
+        from: requestParams.from,
+        to: earliestTime
+      };
+      const klineResult = await this._requestKlineHistory(
+        this._buildKlineParams(klineParams, countBack)
+      );
+      if (klineResult.bars.length === 0) {
+        return null;
+      }
+      return this._mergeBars(historyResult, klineResult);
+    } catch {
+      return null;
+    }
+  }
+  /**
+   * Merge history bars with kline bars
+   * Optimized for the case where klineBars are earlier data than historyBars
+   * Uses direct concatenation when no overlap, otherwise uses two-pointer merge
+   * Assumes both arrays are sorted by time (ascending, earliest first)
+   * Kline data takes precedence when timestamps match
+   * @param historyResult - History result (later time range)
+   * @param klineResult - Kline result (earlier time range)
+   * @returns Merged result with sorted bars
+   */
+  _mergeBars(historyResult, klineResult) {
+    const historyBars = historyResult.bars;
+    const klineBars = klineResult.bars;
+    if (historyBars.length === 0) {
+      return klineResult;
+    }
+    if (klineBars.length === 0) {
+      return historyResult;
+    }
+    const latestKlineTime = klineBars[klineBars.length - 1].time;
+    const earliestHistoryTime = historyBars[0].time;
+    let mergedBars;
+    if (latestKlineTime < earliestHistoryTime) {
+      mergedBars = [...klineBars, ...historyBars];
+    } else if (latestKlineTime === earliestHistoryTime) {
+      mergedBars = [...klineBars, ...historyBars.slice(1)];
+    } else {
+      mergedBars = [];
+      let historyIdx = 0;
+      let klineIdx = 0;
+      while (historyIdx < historyBars.length && klineIdx < klineBars.length) {
+        const historyBar = historyBars[historyIdx];
+        const klineBar = klineBars[klineIdx];
+        if (historyBar.time < klineBar.time) {
+          mergedBars.push(historyBar);
+          historyIdx++;
+        } else if (historyBar.time > klineBar.time) {
+          mergedBars.push(klineBar);
+          klineIdx++;
+        } else {
+          mergedBars.push(klineBar);
+          historyIdx++;
+          klineIdx++;
+        }
+      }
+      while (historyIdx < historyBars.length) {
+        mergedBars.push(historyBars[historyIdx++]);
+      }
+      while (klineIdx < klineBars.length) {
+        mergedBars.push(klineBars[klineIdx++]);
+      }
+    }
+    const meta = {
+      noData: klineResult.meta.noData && historyResult.meta.noData,
+      nextTime: klineResult.meta.nextTime ?? historyResult.meta.nextTime
+    };
+    return {
+      bars: mergedBars,
+      meta
+    };
+  }
   async _tryKlineFallback(requestParams, countBack) {
     try {
       const result = await this._requestKlineHistory(
@@ -2467,6 +2588,8 @@ var limitOrdersByInterval = (orders, interval) => {
   });
   return res;
 };
+
+// src/tradingviewAdapter/renderer/execution.service.ts
 var ExecutionService = class _ExecutionService {
   constructor(instance, broker) {
     this.interval = "1D";
@@ -2525,7 +2648,8 @@ var ExecutionService = class _ExecutionService {
     try {
       this.instance.activeChart().onIntervalChanged().unsubscribe(null, changeInterval);
     } catch (e) {
-      if (e instanceof Error && e.message === "Cannot read properties of null (reading 'tradingViewApi')") ;
+      const errorString = e?.toString() || String(e);
+      if (errorString.includes("tradingViewApi") || errorString.includes("Cannot read properties of null") || errorString.includes("Cannot read property") || e instanceof TypeError && errorString.includes("null")) ;
     }
   }
   destroy() {
@@ -2648,9 +2772,31 @@ var _OrderLineService = class _OrderLineService {
       orderLine.remove();
     }
   }
+  /**
+   * Creates a base order line with default styling.
+   * Returns null if the chart is not ready (e.g., during initialization, hot reload, or chart switching).
+   *
+   * @returns IOrderLineAdapter instance or null if chart is not available
+   */
   getBaseOrderLine() {
-    const colorConfig = this.broker.colorConfig;
-    return this.instance.activeChart().createOrderLine().setCancelTooltip(i18n.i18n.t("orders.cancelOrder")).setQuantityTextColor(colorConfig.qtyTextColor).setQuantityBackgroundColor(colorConfig.chartBG).setBodyBackgroundColor(colorConfig.chartBG).setCancelButtonBackgroundColor(colorConfig.chartBG).setLineStyle(1).setBodyFont(colorConfig.font).setQuantityFont(colorConfig.font);
+    try {
+      const activeChart = this.instance.activeChart();
+      if (!activeChart) {
+        return null;
+      }
+      const colorConfig = this.broker.colorConfig;
+      const orderLine = activeChart.createOrderLine();
+      if (!orderLine) {
+        return null;
+      }
+      return orderLine.setCancelTooltip(i18n.i18n.t("orders.cancelOrder")).setQuantityTextColor(colorConfig.qtyTextColor).setQuantityBackgroundColor(colorConfig.chartBG).setBodyBackgroundColor(colorConfig.chartBG).setCancelButtonBackgroundColor(colorConfig.chartBG).setLineStyle(1).setBodyFont(colorConfig.font).setQuantityFont(colorConfig.font);
+    } catch (e) {
+      const errorString = e?.toString() || String(e);
+      if (errorString.includes("Value is null") || errorString.includes("tradingViewApi") || errorString.includes("Cannot read properties of null") || errorString.includes("Cannot read property") || e instanceof TypeError && errorString.includes("null")) {
+        return null;
+      }
+      throw e;
+    }
   }
   static getCombinationType(order) {
     const { algo_type: algoType, type } = order;
@@ -2732,7 +2878,11 @@ var _OrderLineService = class _OrderLineService {
       return null;
     }
     const colorConfig = this.broker.colorConfig;
-    const orderLine = this.pendingOrderLineMap.get(orderId) ?? this.getBaseOrderLine();
+    const existingOrderLine = this.pendingOrderLineMap.get(orderId);
+    const orderLine = existingOrderLine ?? this.getBaseOrderLine();
+    if (!orderLine) {
+      return null;
+    }
     const color = pendingOrder.side === "BUY" /* BUY */ ? colorConfig.upColor : colorConfig.downColor;
     pendingOrder.side === "BUY" /* BUY */ ? colorConfig.pnlUpColor : colorConfig.pnlDownColor;
     const price = _OrderLineService.getOrderPrice(pendingOrder);
@@ -4370,5 +4520,5 @@ var TradingviewWidget = React3.forwardRef((props, ref) => {
 exports.TradingviewUI = TradingviewUI;
 exports.TradingviewWidget = TradingviewWidget;
 exports.useTradingviewScript = useTradingviewScript;
-//# sourceMappingURL=out.js.map
+//# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map