@tradejs/connectors 1.0.5 → 1.0.8

package/dist/index.mjs

@@ -1,29 +1,29 @@
 // src/ByBit/index.ts
 import _ from "lodash";
 import chalk from "chalk";
+import { delay } from "@tradejs/core/async";
 import {
   MARKET_CATEGORY as MARKET_CATEGORY2,
-  PRELOAD_FALLBACK_DAYS
+  PRELOAD_FALLBACK_DAYS as PRELOAD_FALLBACK_DAYS2
 } from "@tradejs/core/constants";
-import { mergeData } from "@tradejs/core/data";
 import { toJson } from "@tradejs/core/data";
 import { round } from "@tradejs/core/math";
 import { normalizeTickerData } from "@tradejs/core/tickers";
-import { formatUnix as formatUnix2, getItemTimestamp, getTimestamp } from "@tradejs/core/time";
-import { logger as logger2 } from "@tradejs/infra/logger";
-import {
-  getCandlesRange,
-  getDataEdges,
-  upsertCandles,
-  toRows
-} from "@tradejs/infra/timescale";
+import { formatUnix as formatUnix2, getTimestamp as getTimestamp2 } from "@tradejs/core/time";
+import { logger as logger3 } from "@tradejs/infra/logger";
 
 // src/ByBit/client.ts
 import { RestClientV5 } from "bybit-api";
 import { logger } from "@tradejs/infra/logger";
 import { getData, redisKeys } from "@tradejs/infra/redis";
 var useTestnet = false;
-var getClient = async ({ userName }) => {
+var getClient = async ({ userName }, access = "private") => {
+  if (access === "public") {
+    return new RestClientV5({
+      parseAPIRateLimits: true,
+      testnet: useTestnet
+    });
+  }
   const user = await getData(redisKeys.user(userName));
   if (!user) {
     logger.log("error", "connection config not found: %s", userName);
@@ -32,11 +32,248 @@ var getClient = async ({ userName }) => {
   const client = new RestClientV5({
     key: user.BYBIT_API_KEY,
     secret: user.BYBIT_API_SECRET,
+    parseAPIRateLimits: true,
     testnet: useTestnet
   });
   return client;
 };
 
+// src/shared/timescaleKlineCache.ts
+import { PRELOAD_FALLBACK_DAYS } from "@tradejs/core/constants";
+import { mergeData } from "@tradejs/core/data";
+import { getItemTimestamp, getTimestamp } from "@tradejs/core/time";
+import { logger as logger2 } from "@tradejs/infra/logger";
+import {
+  getCandlesRange,
+  getDataEdges,
+  toRows,
+  upsertCandles
+} from "@tradejs/infra/timescale";
+var DEFAULT_LIMIT = 1e3;
+var DEFAULT_CACHE_FALLBACK_WINDOW = 1e3;
+var intervalMsOf = (interval) => interval * 6e4;
+var clampToClosedCandle = (value, intervalMs) => Math.floor(value / intervalMs) * intervalMs;
+var normalizeRangeToClosed = (intervalMs, start, end) => {
+  const lastClosed = Math.floor(Date.now() / intervalMs) * intervalMs;
+  const normStart = start !== void 0 ? clampToClosedCandle(start, intervalMs) : 0;
+  const cappedEnd = Math.min(end ?? Date.now(), lastClosed);
+  const normEnd = clampToClosedCandle(cappedEnd, intervalMs);
+  return { normStart, normEnd };
+};
+var rowsToKline = (rows) => rows.map(({ ts, ...data }) => ({
+  timestamp: new Date(ts).getTime(),
+  ...data
+}));
+var createTimescaleCachedKline = ({
+  provider,
+  request,
+  intervalToMinutes: intervalToMinutes3,
+  limit = DEFAULT_LIMIT,
+  cacheFallbackWindow = DEFAULT_CACHE_FALLBACK_WINDOW
+}) => {
+  let isTimescaleFallbackMode = false;
+  const loadData = async (direction, pointer, limitBoundary, requestParams, intervalMs) => {
+    if (pointer === void 0) return [];
+    let accumulated = [];
+    let fulfilled = false;
+    while (!fulfilled) {
+      const currentPointer = pointer;
+      const params = {
+        symbol: requestParams.symbol,
+        interval: requestParams.interval,
+        silent: requestParams.silent,
+        end: requestParams.end
+      };
+      if (direction === "older") {
+        params.end = pointer;
+        if (limitBoundary !== void 0) params.start = limitBoundary;
+      } else {
+        params.start = pointer;
+        if (limitBoundary !== void 0) params.end = limitBoundary;
+      }
+      const partData = await request(params);
+      if (!partData.length) {
+        fulfilled = true;
+        break;
+      }
+      accumulated = direction === "older" ? mergeData(partData, accumulated) : mergeData(accumulated, partData);
+      const boundaryReached = limitBoundary !== void 0 && (direction === "older" && currentPointer <= limitBoundary || direction === "newer" && currentPointer >= limitBoundary);
+      if (partData.length < limit || boundaryReached) {
+        fulfilled = true;
+        break;
+      }
+      const nextPointer = direction === "older" ? getItemTimestamp(partData[0]) - intervalMs : getItemTimestamp(partData[partData.length - 1]) + intervalMs;
+      if (!Number.isFinite(nextPointer) || nextPointer === currentPointer) {
+        fulfilled = true;
+        break;
+      }
+      pointer = nextPointer;
+    }
+    return accumulated;
+  };
+  const refreshTail = async ({
+    symbol,
+    interval,
+    silent,
+    tailCount = 2
+  }) => {
+    const intMinutes = intervalToMinutes3(interval);
+    if (!intMinutes) {
+      logger2.log("error", "refreshTail: invalid interval %s", interval);
+      return;
+    }
+    const intervalMs = intervalMsOf(intMinutes);
+    const lastClosed = Math.floor(Date.now() / intervalMs) * intervalMs;
+    const tailEnd = lastClosed + intervalMs;
+    const tailStart = tailEnd - tailCount * intervalMs;
+    const part = await request({
+      symbol,
+      interval,
+      start: tailStart,
+      end: tailEnd,
+      silent
+    });
+    if (part.length) {
+      await upsertCandles(toRows(provider, symbol, intMinutes, part));
+    }
+  };
+  return async ({
+    symbol,
+    interval,
+    start: defaultStart,
+    end: defaultEnd,
+    silent = false,
+    cacheOnly = false,
+    warmOnly = false
+  }) => {
+    const intMinutes = intervalToMinutes3(interval);
+    if (!intMinutes) {
+      logger2.log("error", "kline: invalid interval %s", interval);
+      return [];
+    }
+    if (defaultStart !== void 0 && defaultEnd !== void 0 && defaultEnd <= defaultStart) {
+      return [];
+    }
+    const intervalMs = intervalMsOf(intMinutes);
+    try {
+      const edges = await getDataEdges(provider, symbol, intMinutes);
+      let dataStart = edges.min;
+      let dataEnd = edges.max;
+      const { normStart, normEnd } = normalizeRangeToClosed(
+        intervalMs,
+        defaultStart,
+        defaultEnd
+      );
+      if (cacheOnly) {
+        const base = edges.max ?? Date.now();
+        const s = Math.max(
+          defaultStart ?? base - cacheFallbackWindow * intervalMs,
+          0
+        );
+        const e = defaultEnd ?? base;
+        const dbData2 = await getCandlesRange(
+          provider,
+          symbol,
+          intMinutes,
+          s,
+          e
+        );
+        return rowsToKline(dbData2);
+      }
+      const needOlderData = defaultStart !== void 0 && (dataStart === void 0 || normStart < dataStart);
+      const needNewerData = defaultEnd !== void 0 && (dataEnd === void 0 || normEnd > dataEnd);
+      if (needOlderData) {
+        const pointerForOlder = dataStart ?? normEnd ?? Date.now();
+        const olderData = await loadData(
+          "older",
+          pointerForOlder,
+          normStart,
+          {
+            symbol,
+            interval,
+            silent,
+            start: normStart,
+            end: pointerForOlder
+          },
+          intervalMs
+        );
+        if (olderData.length) {
+          await upsertCandles(toRows(provider, symbol, intMinutes, olderData));
+          dataStart = normStart;
+        }
+      }
+      if (needNewerData) {
+        const fallbackStart = getTimestamp(PRELOAD_FALLBACK_DAYS);
+        const pointerForNewer = dataEnd ?? (defaultStart !== void 0 ? normStart : fallbackStart) ?? 0;
+        const newerData = await loadData(
+          "newer",
+          pointerForNewer,
+          normEnd,
+          {
+            symbol,
+            interval,
+            silent,
+            start: pointerForNewer,
+            end: normEnd
+          },
+          intervalMs
+        );
+        if (newerData.length) {
+          await upsertCandles(toRows(provider, symbol, intMinutes, newerData));
+          dataEnd = normEnd;
+        }
+      }
+      const isRightEdgeQuery = defaultEnd === void 0 || defaultEnd && defaultEnd >= Date.now() - intervalMs;
+      if (!cacheOnly && isRightEdgeQuery) {
+        await refreshTail({ symbol, interval, silent });
+      }
+      if (warmOnly) {
+        if (isTimescaleFallbackMode) {
+          isTimescaleFallbackMode = false;
+          logger2.log("info", "TimescaleDB connection restored for kline cache");
+        }
+        return [];
+      }
+      const rangeStart = defaultStart ?? dataStart ?? 0;
+      const rangeEnd = defaultEnd ?? dataEnd ?? Date.now();
+      const { normStart: finalStart, normEnd: finalEnd } = normalizeRangeToClosed(intervalMs, rangeStart, rangeEnd);
+      const dbData = await getCandlesRange(
+        provider,
+        symbol,
+        intMinutes,
+        finalStart,
+        finalEnd
+      );
+      if (isTimescaleFallbackMode) {
+        isTimescaleFallbackMode = false;
+        logger2.log("info", "TimescaleDB connection restored for kline cache");
+      }
+      return rowsToKline(dbData);
+    } catch (error) {
+      if (!isTimescaleFallbackMode) {
+        isTimescaleFallbackMode = true;
+        logger2.log(
+          "warn",
+          "TimescaleDB unavailable for %s %s: %s. Falling back to exchange API.",
+          symbol,
+          interval,
+          String(error)
+        );
+      }
+      if (cacheOnly || warmOnly) {
+        return [];
+      }
+      return request({
+        symbol,
+        interval,
+        start: defaultStart,
+        end: defaultEnd,
+        silent
+      });
+    }
+  };
+};
+
 // src/ByBit/utils.ts
 import { MARKET_CATEGORY } from "@tradejs/core/constants";
 import { formatUnix } from "@tradejs/core/time";
@@ -130,7 +367,12 @@ var mapPositionData = (data) => {
 
 // src/ByBit/index.ts
 var LIMIT = 1e3;
-var CACHE_FALLBACK_WINDOW = 1e3;
+var BYBIT_RATE_LIMIT_RETCODE = 10006;
+var BYBIT_TRADING_STOP_NOT_MODIFIED_RETCODE = 34040;
+var KLINE_RATE_LIMIT_MAX_ATTEMPTS = 3;
+var KLINE_RATE_LIMIT_BASE_DELAY_MS = 800;
+var KLINE_RATE_LIMIT_MAX_DELAY_MS = 1e4;
+var KLINE_RATE_LIMIT_RESET_BUFFER_MS = 50;
 var INTERVAL_TO_MINUTES = {
   "1": 1,
   "3": 3,
@@ -147,9 +389,36 @@ var INTERVAL_TO_MINUTES = {
   M: 43200
 };
 var getLogLevel = (res) => res.retCode === 0 ? "info" : "error";
+var isTradingStopNotModified = (res) => res?.retCode === BYBIT_TRADING_STOP_NOT_MODIFIED_RETCODE;
+var isTradingStopAccepted = (res) => res?.retCode === 0 || isTradingStopNotModified(res);
+var isKlineRateLimited = (res) => res?.retCode === BYBIT_RATE_LIMIT_RETCODE;
+var resolveKlineRetryDelayMs = (res, attempt) => {
+  const resetAtRaw = Number(res?.rateLimitApi?.resetAtTimestamp);
+  if (Number.isFinite(resetAtRaw) && resetAtRaw > 0) {
+    return Math.max(
+      KLINE_RATE_LIMIT_RESET_BUFFER_MS,
+      resetAtRaw - Date.now() + KLINE_RATE_LIMIT_RESET_BUFFER_MS
+    );
+  }
+  const jitterMs = Math.round(Math.random() * 250);
+  const backoffMs = Math.min(
+    KLINE_RATE_LIMIT_MAX_DELAY_MS,
+    KLINE_RATE_LIMIT_BASE_DELAY_MS * 2 ** (attempt - 1)
+  );
+  return backoffMs + jitterMs;
+};
 var ByBitConnectorCreator = async (config) => {
   let state = {};
-  let isTimescaleFallbackMode = false;
+  let publicClientPromise = null;
+  let privateClientPromise = null;
+  const getPublicClient = async () => {
+    publicClientPromise ??= getClient(config, "public");
+    return publicClientPromise;
+  };
+  const getPrivateClient = async () => {
+    privateClientPromise ??= getClient(config, "private");
+    return privateClientPromise;
+  };
   const request = async ({
     symbol,
     interval,
@@ -158,48 +427,67 @@ var ByBitConnectorCreator = async (config) => {
     silent
   }) => {
     const normalizedStart = round(
-      start || getTimestamp(PRELOAD_FALLBACK_DAYS),
+      start || getTimestamp2(PRELOAD_FALLBACK_DAYS2),
       0
     );
     const normalizedEnd = round(end || Date.now());
     try {
-      const client = await getClient(config);
+      const client = await getPublicClient();
       if (!client) return [];
       if (normalizedEnd <= normalizedStart) {
         return [];
       }
-      const kline = await client.getKline({
-        category: MARKET_CATEGORY2,
-        symbol,
-        interval,
-        start: normalizedStart,
-        end: normalizedEnd,
-        limit: LIMIT
-      });
-      if (!kline?.result?.list) {
-        const responseError = typeof kline?.retMsg === "string" && kline.retMsg !== "OK" ? `${kline.retMsg}${typeof kline?.retCode === "number" ? ` (retCode: ${kline.retCode})` : ""}` : typeof kline?.retCode === "number" && kline.retCode !== 0 ? `retCode: ${kline.retCode}` : "";
-        logger2.log(
-          "error",
-          "empty kline.list for %s %s%s",
+      for (let attempt = 1; attempt <= KLINE_RATE_LIMIT_MAX_ATTEMPTS; attempt += 1) {
+        const kline = await client.getKline({
+          category: MARKET_CATEGORY2,
           symbol,
           interval,
-          responseError ? `: ${responseError}` : ""
-        );
-        return [];
-      }
-      if (!silent) {
-        logger2.log(
-          "info",
-          "%s %s %s %s",
-          chalk.yellow(formatUnix2(normalizedEnd)),
-          chalk.cyan(symbol),
-          chalk.cyan(interval),
-          chalk.yellow(kline.result.list.length)
-        );
+          start: normalizedStart,
+          end: normalizedEnd,
+          limit: LIMIT
+        });
+        if (isKlineRateLimited(kline)) {
+          if (attempt < KLINE_RATE_LIMIT_MAX_ATTEMPTS) {
+            const waitMs = resolveKlineRetryDelayMs(kline, attempt);
+            logger3.log(
+              "warn",
+              "kline rate limited for %s %s: attempt=%s/%s waitMs=%s",
+              symbol,
+              interval,
+              attempt,
+              KLINE_RATE_LIMIT_MAX_ATTEMPTS,
+              waitMs
+            );
+            await delay(waitMs);
+            continue;
+          }
+        }
+        if (!kline?.result?.list) {
+          const responseError = typeof kline?.retMsg === "string" && kline.retMsg !== "OK" ? `${kline.retMsg}${typeof kline?.retCode === "number" ? ` (retCode: ${kline.retCode})` : ""}` : typeof kline?.retCode === "number" && kline.retCode !== 0 ? `retCode: ${kline.retCode}` : "";
+          logger3.log(
+            "error",
+            "empty kline.list for %s %s%s",
+            symbol,
+            interval,
+            responseError ? `: ${responseError}` : ""
+          );
+          return [];
+        }
+        if (!silent && (process.stdout.isTTY || process.env.TRADEJS_LOG_KLINE_REQUESTS === "1")) {
+          logger3.log(
+            "info",
+            "%s %s %s %s",
+            chalk.yellow(formatUnix2(normalizedEnd)),
+            chalk.cyan(symbol),
+            chalk.cyan(interval),
+            chalk.yellow(kline.result.list.length)
+          );
+        }
+        return mapKlineToChartData(kline.result.list.reverse());
       }
-      return mapKlineToChartData(kline.result.list.reverse());
+      return [];
     } catch (error) {
-      logger2.log(
+      logger3.log(
         "error",
         "request kline: %s %s %s",
         normalizedStart,
@@ -209,245 +497,230 @@ var ByBitConnectorCreator = async (config) => {
       return [];
     }
   };
-  const loadData = async (direction, pointer, limitBoundary, requestParams, intervalMs) => {
-    if (pointer === void 0) return [];
-    let accumulated = [];
-    let fulfilled = false;
-    while (!fulfilled) {
-      const currentPointer = pointer;
-      const params = {
-        symbol: requestParams.symbol,
-        interval: requestParams.interval,
-        silent: requestParams.silent
-      };
-      if (direction === "older") {
-        params.end = pointer;
-        if (limitBoundary !== void 0) params.start = limitBoundary;
-      } else {
-        params.start = pointer;
-        if (limitBoundary !== void 0) params.end = limitBoundary;
-      }
-      const partData = await request(params);
-      if (_.isEmpty(partData)) {
-        fulfilled = true;
-        break;
+  const intervalToMinutes3 = (interval) => {
+    return INTERVAL_TO_MINUTES[String(interval)] ?? null;
+  };
+  const getPositionSnapshot = async (symbol) => {
+    const client = await getPrivateClient();
+    if (!client) {
+      return null;
+    }
+    const positionRes = await client.getPositionInfo({
+      symbol,
+      category: MARKET_CATEGORY2
+    });
+    if (positionRes.retCode !== 0) {
+      logger3.log(
+        getLogLevel(positionRes),
+        "position retCode: %s, %s",
+        symbol,
+        positionRes.retCode
+      );
+      return null;
+    }
+    const positions = mapPositionData(positionRes.result.list);
+    if (!positions || _.isEmpty(positions)) {
+      return null;
+    }
+    const position = positions[0];
+    logger3.log(
+      "debug",
+      "position: %s %s qty=%s price=%s",
+      position.symbol,
+      position.direction,
+      position.qty,
+      position.price
+    );
+    return {
+      ...position
+    };
+  };
+  const setTakeProfits = async ({
+    symbol,
+    direction,
+    qty,
+    takeProfits
+  }) => {
+    const client = await getPrivateClient();
+    const marketDataClient = await getPublicClient();
+    if (!client || !marketDataClient) {
+      return false;
+    }
+    if (!Array.isArray(takeProfits) || takeProfits.length === 0) {
+      return true;
+    }
+    const meta = await getSymbolMeta(marketDataClient, symbol);
+    const positionQty = qty ?? (await getPositionSnapshot(symbol))?.qty ?? 0;
+    if (!Number.isFinite(positionQty) || positionQty <= 0) {
+      logger3.log(
+        "warn",
+        "setTakeProfits: missing position qty: %s",
+        toJson({ symbol, qty, positionQty, takeProfits }, true)
+      );
+      return false;
+    }
+    const isLong = direction === "LONG";
+    for (const tp of takeProfits) {
+      const tpSizeRaw = positionQty * tp.rate;
+      const { qtyNum: tpSizeNum, qtyStr: tpSizeStr } = normalizeQty(
+        tpSizeRaw,
+        meta
+      );
+      if (!tpSizeNum || tpSizeNum < meta.minOrderQty) {
+        logger3.log(
+          "warn",
+          "tp skipped: size too small %s",
+          toJson(
+            { symbol, tp, tpSizeNum, minOrderQty: meta.minOrderQty },
+            true
+          )
+        );
+        continue;
       }
-      accumulated = direction === "older" ? mergeData(partData, accumulated) : mergeData(accumulated, partData);
-      const boundaryReached = limitBoundary !== void 0 && (direction === "older" && currentPointer <= limitBoundary || direction === "newer" && currentPointer >= limitBoundary);
-      if (partData.length < LIMIT || boundaryReached) {
-        fulfilled = true;
-        break;
+      const tpPriceNorm = normalizePrice(
+        tp.price,
+        isLong ? "TP_LONG" : "TP_SHORT",
+        meta
+      );
+      const isFullMode = takeProfits.length === 1 && tp.rate === 1;
+      const tpRes = await client.setTradingStop({
+        category: MARKET_CATEGORY2,
+        symbol,
+        tpSize: isFullMode ? void 0 : tpSizeStr,
+        tpslMode: isFullMode ? "Full" : "Partial",
+        takeProfit: tpPriceNorm.priceStr,
+        tpTriggerBy: "MarkPrice",
+        tpOrderType: "Market",
+        positionIdx: 0
+      });
+      if (isTradingStopNotModified(tpRes)) {
+        logger3.log(
+          "debug",
+          "tp unchanged: %s %s price=%s rate=%s",
+          symbol,
+          direction,
+          tpPriceNorm.priceStr,
+          tp.rate
+        );
+      } else if (tpRes.retCode === 0) {
+        logger3.log(
+          "info",
+          "tp updated: %s %s price=%s rate=%s",
+          symbol,
+          direction,
+          tpPriceNorm.priceStr,
+          tp.rate
+        );
+      } else {
+        logger3.log(
+          "error",
+          "tp failed: %s %s price=%s rate=%s %s",
+          symbol,
+          direction,
+          tpPriceNorm.priceStr,
+          tp.rate,
+          toJson(tpRes, true)
+        );
       }
-      const nextPointer = direction === "older" ? getItemTimestamp(partData[0]) - intervalMs : getItemTimestamp(partData[partData.length - 1]) + intervalMs;
-      if (!Number.isFinite(nextPointer) || nextPointer === currentPointer) {
-        fulfilled = true;
-        break;
+      if (!isTradingStopAccepted(tpRes)) {
+        return false;
       }
-      pointer = nextPointer;
     }
-    return accumulated;
-  };
-  const intervalMsOf = (interval) => interval * 6e4;
-  const intervalToMinutes = (interval) => {
-    return INTERVAL_TO_MINUTES[String(interval)] ?? null;
+    return true;
   };
-  const clampToClosedCandle = (value, intervalMs) => Math.floor(value / intervalMs) * intervalMs;
-  const normalizeRangeToClosed = (intervalMs, start, end) => {
-    const lastClosed = Math.floor(Date.now() / intervalMs) * intervalMs;
-    const normStart = start !== void 0 ? clampToClosedCandle(start, intervalMs) : 0;
-    const cappedEnd = Math.min(end ?? Date.now(), lastClosed);
-    const normEnd = clampToClosedCandle(cappedEnd, intervalMs);
-    return { normStart, normEnd, lastClosed };
-  };
-  const rowsToKline = (rows) => rows.map(({ ts, ...data }) => ({
-    timestamp: new Date(ts).getTime(),
-    ...data
-  }));
-  const refreshTail = async ({
+  const setStopLoss = async ({
     symbol,
-    interval,
-    silent,
-    tailCount = 2
+    direction,
+    stopLossPrice
   }) => {
-    const intMinutes = intervalToMinutes(interval);
-    if (!intMinutes) {
-      logger2.log("error", "refreshTail: invalid interval %s", interval);
-      return;
+    const client = await getPrivateClient();
+    const marketDataClient = await getPublicClient();
+    if (!client || !marketDataClient) {
+      return false;
     }
-    const intervalMs = intervalMsOf(intMinutes);
-    const lastClosed = Math.floor(Date.now() / intervalMs) * intervalMs;
-    const tailEnd = lastClosed + intervalMs;
-    const tailStart = tailEnd - tailCount * intervalMs;
-    const part = await request({
+    if (typeof stopLossPrice !== "number" || !Number.isFinite(stopLossPrice)) {
+      return true;
+    }
+    const meta = await getSymbolMeta(marketDataClient, symbol);
+    const isLong = direction === "LONG";
+    const slNormalized = normalizePrice(
+      stopLossPrice,
+      isLong ? "SL_LONG" : "SL_SHORT",
+      meta
+    );
+    const slRes = await client.setTradingStop({
+      category: MARKET_CATEGORY2,
       symbol,
-      interval,
-      start: tailStart,
-      end: tailEnd,
-      silent
+      tpslMode: "Full",
+      stopLoss: slNormalized.priceStr,
+      slTriggerBy: "LastPrice",
+      positionIdx: 0
     });
-    if (part.length) {
-      await upsertCandles(toRows(symbol, intMinutes, part));
+    if (isTradingStopNotModified(slRes)) {
+      logger3.log(
+        "debug",
+        "sl unchanged: %s %s stopLoss=%s",
+        symbol,
+        direction,
+        slNormalized.priceStr
+      );
+    } else if (slRes.retCode === 0) {
+      logger3.log(
+        "info",
+        "sl updated: %s %s stopLoss=%s",
+        symbol,
+        direction,
+        slNormalized.priceStr
+      );
+    } else {
+      logger3.log(
+        "error",
+        "sl failed: %s %s stopLoss=%s %s",
+        symbol,
+        direction,
+        slNormalized.priceStr,
+        toJson(slRes, true)
+      );
     }
+    return isTradingStopAccepted(slRes);
   };
   return {
     getState: async () => state,
     setState: async (newState) => {
       state = { ...state, ...newState };
     },
-    kline: async ({
-      symbol,
-      interval,
-      start: defaultStart,
-      end: defaultEnd,
-      silent = false,
-      cacheOnly = false
-    }) => {
-      const intMinutes = intervalToMinutes(interval);
-      if (!intMinutes) {
-        logger2.log("error", "kline: invalid interval %s", interval);
-        return [];
-      }
-      if (defaultStart !== void 0 && defaultEnd !== void 0 && defaultEnd <= defaultStart) {
-        return [];
-      }
-      const intervalMs = intervalMsOf(intMinutes);
-      try {
-        const edges = await getDataEdges(symbol, intMinutes);
-        let dataStart = edges.min;
-        let dataEnd = edges.max;
-        const { normStart, normEnd } = normalizeRangeToClosed(
-          intervalMs,
-          defaultStart,
-          defaultEnd
-        );
-        if (cacheOnly) {
-          const base = edges.max ?? Date.now();
-          const s = Math.max(
-            defaultStart ?? base - CACHE_FALLBACK_WINDOW * intervalMs,
-            0
-          );
-          const e = defaultEnd ?? base;
-          const dbData2 = await getCandlesRange(symbol, intMinutes, s, e);
-          return rowsToKline(dbData2);
-        }
-        const needOlderData = defaultStart !== void 0 && (dataStart === void 0 || normStart < dataStart);
-        const needNewerData = defaultEnd !== void 0 && (dataEnd === void 0 || normEnd > dataEnd);
-        if (needOlderData) {
-          const pointerForOlder = dataStart ?? normEnd ?? Date.now();
-          const olderData = await loadData(
-            "older",
-            pointerForOlder,
-            normStart,
-            {
-              symbol,
-              interval,
-              silent,
-              start: normStart,
-              end: pointerForOlder
-            },
-            intervalMs
-          );
-          if (olderData.length) {
-            await upsertCandles(toRows(symbol, intMinutes, olderData));
-            dataStart = normStart;
-          }
-        }
-        if (needNewerData) {
-          const pointerForNewer = dataEnd ?? normStart ?? 0;
-          const newerData = await loadData(
-            "newer",
-            pointerForNewer,
-            normEnd,
-            {
-              symbol,
-              interval,
-              silent,
-              start: pointerForNewer,
-              end: normEnd
-            },
-            intervalMs
-          );
-          if (newerData.length) {
-            await upsertCandles(toRows(symbol, intMinutes, newerData));
-            dataEnd = normEnd;
-          }
-        }
-        const isRightEdgeQuery = defaultEnd === void 0 || defaultEnd && defaultEnd >= Date.now() - intervalMs;
-        if (!cacheOnly && isRightEdgeQuery) {
-          await refreshTail({ symbol, interval, silent });
-        }
-        const rangeStart = defaultStart ?? dataStart ?? 0;
-        const rangeEnd = defaultEnd ?? dataEnd ?? Date.now();
-        const { normStart: finalStart, normEnd: finalEnd } = normalizeRangeToClosed(intervalMs, rangeStart, rangeEnd);
-        const dbData = await getCandlesRange(
-          symbol,
-          intMinutes,
-          finalStart,
-          finalEnd
-        );
-        if (isTimescaleFallbackMode) {
-          isTimescaleFallbackMode = false;
-          logger2.log("info", "TimescaleDB connection restored for kline cache");
-        }
-        return rowsToKline(dbData);
-      } catch (error) {
-        if (!isTimescaleFallbackMode) {
-          isTimescaleFallbackMode = true;
-          logger2.log(
-            "warn",
-            "TimescaleDB unavailable for %s %s: %s. Falling back to exchange API.",
-            symbol,
-            interval,
-            String(error)
-          );
-        }
-        if (cacheOnly) {
-          return [];
-        }
-        return request({
-          symbol,
-          interval,
-          start: defaultStart,
-          end: defaultEnd,
-          silent
-        });
-      }
-    },
-    getPosition: async (symbol) => {
-      const client = await getClient(config);
+    kline: createTimescaleCachedKline({
+      provider: "bybit",
+      request,
+      intervalToMinutes: intervalToMinutes3,
+      limit: LIMIT
+    }),
+    getPosition: async (symbol) => getPositionSnapshot(symbol),
+    getPositions: async () => {
+      const client = await getPrivateClient();
       if (!client) {
-        return null;
+        return [];
       }
       const positionRes = await client.getPositionInfo({
-        symbol,
-        category: MARKET_CATEGORY2
+        category: MARKET_CATEGORY2,
+        settleCoin: "USDT"
       });
-      logger2.log(
-        getLogLevel(positionRes),
-        "position retCode: %s, %s",
-        symbol,
-        positionRes.retCode
-      );
       if (positionRes.retCode !== 0) {
-        return null;
+        logger3.log(
+          getLogLevel(positionRes),
+          "positions retCode: %s, %s",
+          positionRes.retCode
+        );
+        return [];
       }
       const positions = mapPositionData(positionRes.result.list);
       if (!positions || _.isEmpty(positions)) {
-        return null;
+        return [];
       }
-      const position = positions[0];
-      logger2.log(
-        getLogLevel(positionRes),
-        "position: %s, %s",
-        symbol,
-        toJson(positionRes, true)
-      );
-      return {
-        ...position
-      };
+      return positions;
     },
-    getPositions: async () => {
-      const client = await getClient(config);
+    getOpenPositionPnl: async () => {
+      const client = await getPrivateClient();
       if (!client) {
         return [];
       }
@@ -455,30 +728,95 @@ var ByBitConnectorCreator = async (config) => {
         category: MARKET_CATEGORY2,
         settleCoin: "USDT"
       });
-      logger2.log(
-        getLogLevel(positionRes),
-        "positions retCode: %s, %s",
-        positionRes.retCode
-      );
       if (positionRes.retCode !== 0) {
+        logger3.log(
+          getLogLevel(positionRes),
+          "positions pnl retCode: %s, %s",
+          positionRes.retCode
+        );
         return [];
       }
-      const positions = mapPositionData(positionRes.result.list);
-      if (!positions || _.isEmpty(positions)) {
+      return (positionRes.result?.list ?? []).map((item) => {
+        const qty = Number(item.size ?? Number.NaN);
+        const entryPrice = Number(item.avgPrice ?? Number.NaN);
+        const currentPrice = Number(item.markPrice ?? Number.NaN);
+        const unrealizedPnl = Number(item.unrealisedPnl ?? Number.NaN);
+        const side = String(item.side ?? "");
+        if (!Number.isFinite(qty) || qty <= 0 || !Number.isFinite(entryPrice) || !Number.isFinite(currentPrice) || !Number.isFinite(unrealizedPnl) || side !== "Buy" && side !== "Sell") {
+          return null;
+        }
+        return {
+          symbol: String(item.symbol ?? ""),
+          qty,
+          price: entryPrice,
+          currentPrice,
+          unrealizedPnl,
+          direction: side === "Buy" ? "LONG" : "SHORT"
+        };
+      }).filter(
+        (item) => item != null && item.symbol.length > 0
+      );
+    },
+    getClosedPnl: async ({
+      startTime,
+      endTime,
+      symbol,
+      limit = 100
+    }) => {
+      const client = await getPrivateClient();
+      if (!client) {
         return [];
       }
-      return positions;
+      const response = await client.getClosedPnL({
+        category: MARKET_CATEGORY2,
+        startTime,
+        endTime,
+        symbol,
+        limit: Math.min(Math.max(1, Math.trunc(limit)), 100)
+      });
+      if (response.retCode !== 0) {
+        logger3.log(
+          "error",
+          "closedPnl retCode: %s, %s",
+          response.retCode,
+          response.retMsg
+        );
+        return [];
+      }
+      return (response.result?.list ?? []).map((item) => {
+        const qty = Number(item.qty ?? item.closedSize ?? Number.NaN);
+        const entryPrice = Number(item.avgEntryPrice ?? Number.NaN);
+        const exitPrice = Number(item.avgExitPrice ?? Number.NaN);
+        const closedPnl = Number(item.closedPnl ?? Number.NaN);
+        const closedAt = Number(
+          item.updatedTime ?? item.createdTime ?? Number.NaN
+        );
+        const orderId = typeof item.orderId === "string" && item.orderId.trim() ? item.orderId : null;
+        if (!String(item.symbol ?? "").trim() || !Number.isFinite(qty) || !Number.isFinite(closedPnl) || !Number.isFinite(closedAt)) {
+          return null;
+        }
+        return {
+          symbol: String(item.symbol),
+          qty,
+          entryPrice: Number.isFinite(entryPrice) ? entryPrice : null,
+          exitPrice: Number.isFinite(exitPrice) ? exitPrice : null,
+          closedPnl,
+          closedAt,
+          ...orderId ? { orderId } : {}
+        };
+      }).filter((item) => item != null);
     },
-    placeOrder: async ({ symbol, price, qty, direction, isLimit }, TP = [], slPrice) => {
-      const client = await getClient(config);
-      if (!client) {
+    placeOrder: async ({ symbol, price, qty, direction, isLimit, orderId }) => {
+      const client = await getPrivateClient();
+      const marketDataClient = await getPublicClient();
+      if (!client || !marketDataClient) {
         return false;
       }
       const isLong = direction === "LONG";
-      const meta = await getSymbolMeta(client, symbol);
+      const meta = await getSymbolMeta(marketDataClient, symbol);
       const { qtyNum: orderQty, qtyStr: orderQtyStr } = normalizeQty(qty, meta);
       if (orderQty < meta.minOrderQty) {
-        logger2.log(
+        logger3.log(
           "warn",
           "placeOrder: qty too small: %s",
           toJson(
@@ -489,10 +827,7 @@ var ByBitConnectorCreator = async (config) => {
         return false;
       }
       const entryNormalized = isLimit ? normalizePrice(price, "ENTRY", meta) : void 0;
-      const slNormalized = slPrice ? normalizePrice(slPrice, isLong ? "SL_LONG" : "SL_SHORT", meta) : void 0;
-      const firstTP = TP?.[0];
-      const tpNormalized = firstTP && firstTP.rate === 1 ? normalizePrice(firstTP.price, isLong ? "TP_LONG" : "TP_SHORT", meta) : void 0;
-      logger2.log(
+      logger3.log(
         "info",
         "placeOrder: %s",
         toJson(
@@ -502,10 +837,7 @@ var ByBitConnectorCreator = async (config) => {
             qty,
             direction,
             orderQty,
-            orderQtyStr,
-            slPrice,
-            slPriceNorm: slNormalized?.priceStr,
-            TP
+            orderQtyStr
           },
           true
         )
@@ -520,16 +852,13 @@ var ByBitConnectorCreator = async (config) => {
         category: MARKET_CATEGORY2,
         symbol,
         price: entryNormalized?.priceStr || void 0,
-        takeProfit: tpNormalized?.priceStr || void 0,
-        tpTriggerBy: "MarkPrice",
-        stopLoss: slNormalized?.priceStr || void 0,
-        slTriggerBy: "LastPrice",
         side: isLong ? "Buy" : "Sell",
         orderType: isLimit ? "Limit" : "Market",
         qty: orderQtyStr,
-        orderFilter: "Order"
+        orderFilter: "Order",
+        orderLinkId: typeof orderId === "string" && orderId.trim() ? orderId : void 0
       });
-      logger2.log(
+      logger3.log(
         getLogLevel(orderRes),
         "placeOrder:response: %s",
         toJson(orderRes, true)
@@ -537,53 +866,12 @@ var ByBitConnectorCreator = async (config) => {
       if (orderRes.retCode !== 0) {
         return false;
       }
-      if (!isLimit) {
-        for (const tp of TP) {
-          const tpSizeRaw = orderQty * tp.rate;
-          const { qtyNum: tpSizeNum, qtyStr: tpSizeStr } = normalizeQty(
-            tpSizeRaw,
-            meta
-          );
-          if (!tpSizeNum || tpSizeNum < meta.minOrderQty) {
-            logger2.log(
-              "warn",
-              "tp skipped: size too small %s",
-              toJson(
-                { symbol, tp, tpSizeNum, minOrderQty: meta.minOrderQty },
-                true
-              )
-            );
-            continue;
-          }
-          const tpPriceNorm = normalizePrice(
-            tp.price,
-            isLong ? "TP_LONG" : "TP_SHORT",
-            meta
-          );
-          const isFullMode = TP.length === 1 && tp.rate === 1;
-          const tpRes = await client.setTradingStop({
-            category: MARKET_CATEGORY2,
-            symbol,
-            tpSize: isFullMode ? void 0 : tpSizeStr,
-            tpslMode: isFullMode ? "Full" : "Partial",
-            takeProfit: tpPriceNorm.priceStr,
-            stopLoss: isFullMode && slNormalized ? slNormalized.priceStr : void 0,
-            slTriggerBy: "LastPrice",
-            tpOrderType: "Market",
-            positionIdx: 0
-          });
-          logger2.log(
-            getLogLevel(tpRes),
-            "tp: %s %s",
-            toJson(tp, true),
-            toJson(tpRes, true)
-          );
-        }
-      }
       return true;
     },
+    setTakeProfits,
+    setStopLoss,
     closePosition: async ({ symbol, direction }) => {
-      const client = await getClient(config);
+      const client = await getPrivateClient();
       if (!client) {
         return false;
       }
@@ -595,7 +883,7 @@ var ByBitConnectorCreator = async (config) => {
         qty: "0",
         reduceOnly: true
       });
-      logger2.log(
+      logger3.log(
         getLogLevel(closeRes),
         "closePosition: %s, %s, %s",
         symbol,
@@ -608,7 +896,7 @@ var ByBitConnectorCreator = async (config) => {
       return true;
     },
     getTickers: async () => {
-      const client = await getClient(config);
+      const client = await getPublicClient();
       if (!client) {
         return [];
       }
@@ -656,59 +944,77 @@ var toNum = (value, fallback = 0) => {
   const num = Number(value);
   return Number.isFinite(num) ? num : fallback;
 };
+var intervalToMinutes = (interval) => {
+  const intervalMs = INTERVAL_MS[String(interval)];
+  return intervalMs ? Math.floor(intervalMs / 6e4) : null;
+};
 var BinanceConnectorCreator = async () => {
   let state = {};
+  const requestKline = async ({
+    symbol,
+    interval,
+    start,
+    end
+  }) => {
+    const intervalToken = INTERVAL_MAP[String(interval)];
+    if (!intervalToken) return [];
+    const intervalMs = INTERVAL_MS[String(interval)] ?? 9e5;
+    const normalizedEnd = end ?? Date.now();
+    const baseUrl = process.env.BINANCE_BASE_URL?.trim() || "https://api.binance.com";
+    let cursor = start ?? Math.max(0, normalizedEnd - intervalMs * 1e3);
+    const rows = [];
+    while (cursor <= normalizedEnd) {
+      const url = new URL(`${baseUrl}/api/v3/klines`);
+      url.searchParams.set("symbol", symbol);
+      url.searchParams.set("interval", intervalToken);
+      url.searchParams.set("startTime", String(cursor));
+      url.searchParams.set("endTime", String(normalizedEnd));
+      url.searchParams.set("limit", "1000");
+      const response = await fetchWithRetry(url.toString(), {
+        headers: { "User-Agent": "tradejs/binance-connector" }
+      });
+      if (!response.ok) break;
+      const payload = await response.json();
+      if (!Array.isArray(payload) || !payload.length) break;
+      let lastTs = cursor;
+      for (const item of payload) {
+        if (!Array.isArray(item)) continue;
+        const ts = toNum(item[0], 0);
+        if (!ts) continue;
+        rows.push({
+          timestamp: ts,
+          open: toNum(item[1]),
+          high: toNum(item[2]),
+          low: toNum(item[3]),
+          close: toNum(item[4]),
+          volume: toNum(item[5]),
+          turnover: toNum(item[7]),
+          dt: new Date(ts).toISOString()
+        });
+        lastTs = ts;
+      }
+      if (payload.length < 1e3) break;
+      cursor = lastTs + intervalMs;
+    }
+    rows.sort((a, b) => a.timestamp - b.timestamp);
+    return rows;
+  };
   return {
     getState: async () => state,
     setState: async (newState) => {
       state = { ...state, ...newState };
     },
-    kline: async ({ symbol, interval, start, end }) => {
-      const intervalToken = INTERVAL_MAP[String(interval)];
-      if (!intervalToken) return [];
-      const intervalMs = INTERVAL_MS[String(interval)] ?? 9e5;
-      const baseUrl = process.env.BINANCE_BASE_URL?.trim() || "https://api.binance.com";
-      let cursor = start ?? Math.max(0, end - intervalMs * 1e3);
-      const rows = [];
-      while (cursor <= end) {
-        const url = new URL(`${baseUrl}/api/v3/klines`);
-        url.searchParams.set("symbol", symbol);
-        url.searchParams.set("interval", intervalToken);
-        url.searchParams.set("startTime", String(cursor));
-        url.searchParams.set("endTime", String(end));
-        url.searchParams.set("limit", "1000");
-        const response = await fetchWithRetry(url.toString(), {
-          headers: { "User-Agent": "tradejs/binance-connector" }
-        });
-        if (!response.ok) break;
-        const payload = await response.json();
-        if (!Array.isArray(payload) || !payload.length) break;
-        let lastTs = cursor;
-        for (const item of payload) {
-          if (!Array.isArray(item)) continue;
-          const ts = toNum(item[0], 0);
-          if (!ts) continue;
-          rows.push({
-            timestamp: ts,
-            open: toNum(item[1]),
-            high: toNum(item[2]),
-            low: toNum(item[3]),
-            close: toNum(item[4]),
-            volume: toNum(item[5]),
-            turnover: toNum(item[7]),
-            dt: new Date(ts).toISOString()
-          });
-          lastTs = ts;
-        }
-        if (payload.length < 1e3) break;
-        cursor = lastTs + intervalMs;
-      }
-      rows.sort((a, b) => a.timestamp - b.timestamp);
-      return rows;
-    },
+    kline: createTimescaleCachedKline({
+      provider: "binance",
+      request: requestKline,
+      intervalToMinutes
+    }),
     getPosition: async () => null,
     getPositions: async () => [],
+    getOpenPositionPnl: async () => [],
     placeOrder: async () => false,
+    setTakeProfits: async () => false,
+    setStopLoss: async () => false,
     closePosition: async () => false,
     getTickers: async () => {
       const baseUrl = process.env.BINANCE_BASE_URL?.trim() || "https://api.binance.com";
@@ -789,6 +1095,10 @@ var toNum2 = (value, fallback = 0) => {
   const num = Number(value);
   return Number.isFinite(num) ? num : fallback;
 };
+var intervalToMinutes2 = (interval) => {
+  const intervalMs = INTERVAL_MS2[String(interval)];
+  return intervalMs ? Math.floor(intervalMs / 6e4) : null;
+};
 var toCoinbaseProduct = (symbol) => {
   const upper = symbol.toUpperCase();
   const quoteSuffixes = ["USDT", "USDC", "BUSD", "USD"];
@@ -815,59 +1125,73 @@ var MAJOR_PRODUCTS = [
 ];
 var CoinbaseConnectorCreator = async () => {
   let state = {};
+  const requestKline = async ({
+    symbol,
+    interval,
+    start,
+    end
+  }) => {
+    const granularity = GRANULARITY_MAP[String(interval)];
+    if (!granularity) return [];
+    const product = toCoinbaseProduct(symbol);
+    if (!product) return [];
+    const baseUrl = process.env.COINBASE_BASE_URL?.trim() || "https://api.exchange.coinbase.com";
+    const normalizedEnd = end ?? Date.now();
+    const stepMs = granularity * 1e3 * 300;
+    const fromMs = start ?? Math.max(0, normalizedEnd - INTERVAL_MS2[String(interval)] * 1e3);
+    let cursorEnd = normalizedEnd;
+    const rows = [];
+    while (cursorEnd >= fromMs) {
+      const chunkStart = Math.max(fromMs, cursorEnd - stepMs);
+      const url = new URL(`${baseUrl}/products/${product}/candles`);
+      url.searchParams.set("granularity", String(granularity));
+      url.searchParams.set("start", new Date(chunkStart).toISOString());
+      url.searchParams.set("end", new Date(cursorEnd).toISOString());
+      const response = await fetchWithRetry2(url.toString(), {
+        headers: { "User-Agent": "tradejs/coinbase-connector" }
+      });
+      if (!response.ok) break;
+      const payload = await response.json();
+      if (Array.isArray(payload)) {
+        for (const item of payload) {
+          if (!Array.isArray(item)) continue;
+          const ts = toNum2(item[0]) * 1e3;
+          rows.push({
+            timestamp: ts,
+            low: toNum2(item[1]),
+            high: toNum2(item[2]),
+            open: toNum2(item[3]),
+            close: toNum2(item[4]),
+            volume: toNum2(item[5]),
+            turnover: 0,
+            dt: new Date(ts).toISOString()
+          });
+        }
+      }
+      cursorEnd = chunkStart - 1;
+    }
+    const dedup = /* @__PURE__ */ new Map();
+    for (const row of rows) {
+      dedup.set(row.timestamp, row);
+    }
+    return [...dedup.values()].sort((a, b) => a.timestamp - b.timestamp);
+  };
   return {
     getState: async () => state,
     setState: async (newState) => {
       state = { ...state, ...newState };
     },
-    kline: async ({ symbol, interval, start, end }) => {
-      const granularity = GRANULARITY_MAP[String(interval)];
-      if (!granularity) return [];
-      const product = toCoinbaseProduct(symbol);
-      if (!product) return [];
-      const baseUrl = process.env.COINBASE_BASE_URL?.trim() || "https://api.exchange.coinbase.com";
-      const stepMs = granularity * 1e3 * 300;
-      const fromMs = start ?? Math.max(0, end - INTERVAL_MS2[String(interval)] * 1e3);
-      let cursorEnd = end;
-      const rows = [];
-      while (cursorEnd >= fromMs) {
-        const chunkStart = Math.max(fromMs, cursorEnd - stepMs);
-        const url = new URL(`${baseUrl}/products/${product}/candles`);
-        url.searchParams.set("granularity", String(granularity));
-        url.searchParams.set("start", new Date(chunkStart).toISOString());
-        url.searchParams.set("end", new Date(cursorEnd).toISOString());
-        const response = await fetchWithRetry2(url.toString(), {
-          headers: { "User-Agent": "tradejs/coinbase-connector" }
-        });
-        if (!response.ok) break;
-        const payload = await response.json();
-        if (Array.isArray(payload)) {
-          for (const item of payload) {
-            if (!Array.isArray(item)) continue;
-            const ts = toNum2(item[0]) * 1e3;
-            rows.push({
-              timestamp: ts,
-              low: toNum2(item[1]),
-              high: toNum2(item[2]),
-              open: toNum2(item[3]),
-              close: toNum2(item[4]),
-              volume: toNum2(item[5]),
-              turnover: 0,
-              dt: new Date(ts).toISOString()
-            });
-          }
-        }
-        cursorEnd = chunkStart - 1;
-      }
-      const dedup = /* @__PURE__ */ new Map();
-      for (const row of rows) {
-        dedup.set(row.timestamp, row);
-      }
-      return [...dedup.values()].sort((a, b) => a.timestamp - b.timestamp);
-    },
+    kline: createTimescaleCachedKline({
+      provider: "coinbase",
+      request: requestKline,
+      intervalToMinutes: intervalToMinutes2
+    }),
     getPosition: async () => null,
     getPositions: async () => [],
+    getOpenPositionPnl: async () => [],
     placeOrder: async () => false,
+    setTakeProfits: async () => false,
+    setStopLoss: async () => false,
     closePosition: async () => false,
     getTickers: async () => {
       const baseUrl = process.env.COINBASE_BASE_URL?.trim() || "https://api.exchange.coinbase.com";
@@ -1083,7 +1407,7 @@ var binanceCoinbaseSpreadProvider = {
 };
 
 // src/marketData/providers/coinalyze.ts
-import { delay } from "@tradejs/core/async";
+import { delay as delay2 } from "@tradejs/core/async";
 import {
   coinalyzePointsToRows,
   mergeCoinalyzeMetrics
@@ -1137,12 +1461,8 @@ var normalizeMetricPayload = (metric, raw) => {
   }));
 };
 var fetchCoinalyzeSeries = async (params) => {
-  const { endpoint, metric, symbol, interval, fromMs, toMs } = params;
+  const { endpoint, metric, symbol, apiKey, interval, fromMs, toMs } = params;
   const baseUrl = process.env.COINALYZE_BASE_URL?.trim() || "https://api.coinalyze.net/v1";
-  const apiKey = process.env.COINALYZE_API_KEY?.trim();
-  if (!apiKey) {
-    throw new Error("Missing COINALYZE_API_KEY");
-  }
   const url = new URL(`${baseUrl}${endpoint}`);
   url.searchParams.set("symbols", symbol);
   url.searchParams.set("interval", coinalyzeIntervalMap[interval] || interval);
@@ -1160,7 +1480,7 @@ var fetchCoinalyzeSeries = async (params) => {
       lastRequestTs + coinalyzeMinRequestDelayMs - now
     );
     if (waitMs > 0) {
-      await delay(waitMs);
+      await delay2(waitMs);
     }
     lastRequestTs = Date.now();
     const response = await fetch(url.toString(), { headers });
@@ -1174,7 +1494,7 @@ var fetchCoinalyzeSeries = async (params) => {
     const transient = response.status === 429 || response.status >= 500;
     if (attempt < coinalyzeMaxRetries && transient) {
       const backoffMs = Math.min(1e4, 750 * 2 ** attempt);
-      await delay(retryAfterMs ?? backoffMs);
+      await delay2(retryAfterMs ?? backoffMs);
       continue;
     }
     throw new Error(`Coinalyze ${endpoint} ${response.status}: ${text}`);
@@ -1183,15 +1503,27 @@ var fetchCoinalyzeSeries = async (params) => {
 };
 var coinalyzeProvider = {
   name: "coinalyze",
-  fetchWindow: async ({ symbol, marketSymbol, interval, fromMs, toMs }) => {
+  fetchWindow: async ({
+    symbol,
+    marketSymbol,
+    apiKey,
+    interval,
+    fromMs,
+    toMs
+  }) => {
+    if (!apiKey?.trim()) {
+      throw new Error("Missing COINALYZE_API_KEY in user settings");
+    }
     const oiPath = process.env.COINALYZE_OI_PATH?.trim() || "/open-interest-history";
     const fundingPath = process.env.COINALYZE_FUNDING_PATH?.trim() || "/funding-rate-history";
     const liqPath = process.env.COINALYZE_LIQ_PATH?.trim() || "/liquidation-history";
     const requestSymbol = (marketSymbol || symbol).trim().toUpperCase();
+    const normalizedApiKey = apiKey.trim();
     const oiRaw = await fetchCoinalyzeSeries({
       endpoint: oiPath,
       metric: "oi",
       symbol: requestSymbol,
+      apiKey: normalizedApiKey,
       interval,
       fromMs,
       toMs
@@ -1200,6 +1532,7 @@ var coinalyzeProvider = {
       endpoint: fundingPath,
       metric: "funding",
       symbol: requestSymbol,
+      apiKey: normalizedApiKey,
       interval,
       fromMs,
       toMs
@@ -1208,6 +1541,7 @@ var coinalyzeProvider = {
       endpoint: liqPath,
       metric: "liq",
       symbol: requestSymbol,
+      apiKey: normalizedApiKey,
       interval,
       fromMs,
       toMs