@tradejs/connectors 1.0.6 → 1.0.8

package/dist/index.js

@@ -48,14 +48,12 @@ module.exports = __toCommonJS(index_exports);
 var import_lodash = __toESM(require("lodash"));
 var import_chalk = __toESM(require("chalk"));
 var import_async = require("@tradejs/core/async");
-var import_constants2 = require("@tradejs/core/constants");
-var import_data = require("@tradejs/core/data");
+var import_constants3 = require("@tradejs/core/constants");
 var import_data2 = require("@tradejs/core/data");
 var import_math = require("@tradejs/core/math");
 var import_tickers = require("@tradejs/core/tickers");
-var import_time2 = require("@tradejs/core/time");
-var import_logger2 = require("@tradejs/infra/logger");
-var import_timescale = require("@tradejs/infra/timescale");
+var import_time3 = require("@tradejs/core/time");
+var import_logger3 = require("@tradejs/infra/logger");
 
 // src/ByBit/client.ts
 var import_bybit_api = require("bybit-api");
@@ -83,11 +81,242 @@ var getClient = async ({ userName }, access = "private") => {
   return client;
 };
 
-// src/ByBit/utils.ts
+// src/shared/timescaleKlineCache.ts
 var import_constants = require("@tradejs/core/constants");
+var import_data = require("@tradejs/core/data");
 var import_time = require("@tradejs/core/time");
+var import_logger2 = require("@tradejs/infra/logger");
+var import_timescale = require("@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" ? (0, import_data.mergeData)(partData, accumulated) : (0, import_data.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" ? (0, import_time.getItemTimestamp)(partData[0]) - intervalMs : (0, import_time.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) {
+      import_logger2.logger.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 (0, import_timescale.upsertCandles)((0, import_timescale.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) {
+      import_logger2.logger.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 (0, import_timescale.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 (0, import_timescale.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 (0, import_timescale.upsertCandles)((0, import_timescale.toRows)(provider, symbol, intMinutes, olderData));
+          dataStart = normStart;
+        }
+      }
+      if (needNewerData) {
+        const fallbackStart = (0, import_time.getTimestamp)(import_constants.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 (0, import_timescale.upsertCandles)((0, import_timescale.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;
+          import_logger2.logger.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 (0, import_timescale.getCandlesRange)(
+        provider,
+        symbol,
+        intMinutes,
+        finalStart,
+        finalEnd
+      );
+      if (isTimescaleFallbackMode) {
+        isTimescaleFallbackMode = false;
+        import_logger2.logger.log("info", "TimescaleDB connection restored for kline cache");
+      }
+      return rowsToKline(dbData);
+    } catch (error) {
+      if (!isTimescaleFallbackMode) {
+        isTimescaleFallbackMode = true;
+        import_logger2.logger.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
+var import_constants2 = require("@tradejs/core/constants");
+var import_time2 = require("@tradejs/core/time");
 var parseKlineItem = (item) => ({
-  dt: (0, import_time.formatUnix)(parseInt(item[0])),
+  dt: (0, import_time2.formatUnix)(parseInt(item[0])),
   timestamp: parseInt(item[0]),
   open: parseFloat(item[1]),
   high: parseFloat(item[2]),
@@ -113,7 +342,7 @@ var getSymbolMeta = async (client, symbol) => {
   const cached = symbolMetaCache.get(symbol);
   if (cached) return cached;
   const res = await client.getInstrumentsInfo({
-    category: import_constants.MARKET_CATEGORY,
+    category: import_constants2.MARKET_CATEGORY,
     symbol
   });
   const item = res?.result?.list?.[0];
@@ -176,7 +405,6 @@ 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;
@@ -219,7 +447,6 @@ var resolveKlineRetryDelayMs = (res, attempt) => {
 };
 var ByBitConnectorCreator = async (config) => {
   let state = {};
-  let isTimescaleFallbackMode = false;
   let publicClientPromise = null;
   let privateClientPromise = null;
   const getPublicClient = async () => {
@@ -238,7 +465,7 @@ var ByBitConnectorCreator = async (config) => {
     silent
   }) => {
     const normalizedStart = (0, import_math.round)(
-      start || (0, import_time2.getTimestamp)(import_constants2.PRELOAD_FALLBACK_DAYS),
+      start || (0, import_time3.getTimestamp)(import_constants3.PRELOAD_FALLBACK_DAYS),
       0
     );
     const normalizedEnd = (0, import_math.round)(end || Date.now());
@@ -250,7 +477,7 @@ var ByBitConnectorCreator = async (config) => {
       }
       for (let attempt = 1; attempt <= KLINE_RATE_LIMIT_MAX_ATTEMPTS; attempt += 1) {
         const kline = await client.getKline({
-          category: import_constants2.MARKET_CATEGORY,
+          category: import_constants3.MARKET_CATEGORY,
           symbol,
           interval,
           start: normalizedStart,
@@ -260,7 +487,7 @@ var ByBitConnectorCreator = async (config) => {
         if (isKlineRateLimited(kline)) {
           if (attempt < KLINE_RATE_LIMIT_MAX_ATTEMPTS) {
             const waitMs = resolveKlineRetryDelayMs(kline, attempt);
-            import_logger2.logger.log(
+            import_logger3.logger.log(
               "warn",
               "kline rate limited for %s %s: attempt=%s/%s waitMs=%s",
               symbol,
@@ -275,7 +502,7 @@ var ByBitConnectorCreator = async (config) => {
         }
         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}` : "";
-          import_logger2.logger.log(
+          import_logger3.logger.log(
             "error",
             "empty kline.list for %s %s%s",
             symbol,
@@ -284,11 +511,11 @@ var ByBitConnectorCreator = async (config) => {
           );
           return [];
         }
-        if (!silent) {
-          import_logger2.logger.log(
+        if (!silent && (process.stdout.isTTY || process.env.TRADEJS_LOG_KLINE_REQUESTS === "1")) {
+          import_logger3.logger.log(
             "info",
             "%s %s %s %s",
-            import_chalk.default.yellow((0, import_time2.formatUnix)(normalizedEnd)),
+            import_chalk.default.yellow((0, import_time3.formatUnix)(normalizedEnd)),
             import_chalk.default.cyan(symbol),
             import_chalk.default.cyan(interval),
             import_chalk.default.yellow(kline.result.list.length)
@@ -298,7 +525,7 @@ var ByBitConnectorCreator = async (config) => {
       }
       return [];
     } catch (error) {
-      import_logger2.logger.log(
+      import_logger3.logger.log(
         "error",
         "request kline: %s %s %s",
         normalizedStart,
@@ -308,86 +535,9 @@ 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 (import_lodash.default.isEmpty(partData)) {
-        fulfilled = true;
-        break;
-      }
-      accumulated = direction === "older" ? (0, import_data.mergeData)(partData, accumulated) : (0, import_data.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" ? (0, import_time2.getItemTimestamp)(partData[0]) - intervalMs : (0, import_time2.getItemTimestamp)(partData[partData.length - 1]) + intervalMs;
-      if (!Number.isFinite(nextPointer) || nextPointer === currentPointer) {
-        fulfilled = true;
-        break;
-      }
-      pointer = nextPointer;
-    }
-    return accumulated;
-  };
-  const intervalMsOf = (interval) => interval * 6e4;
-  const intervalToMinutes = (interval) => {
+  const intervalToMinutes3 = (interval) => {
     return INTERVAL_TO_MINUTES[String(interval)] ?? null;
   };
-  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 ({
-    symbol,
-    interval,
-    silent,
-    tailCount = 2
-  }) => {
-    const intMinutes = intervalToMinutes(interval);
-    if (!intMinutes) {
-      import_logger2.logger.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 (0, import_timescale.upsertCandles)((0, import_timescale.toRows)(symbol, intMinutes, part));
-    }
-  };
   const getPositionSnapshot = async (symbol) => {
     const client = await getPrivateClient();
     if (!client) {
@@ -395,10 +545,10 @@ var ByBitConnectorCreator = async (config) => {
     }
     const positionRes = await client.getPositionInfo({
       symbol,
-      category: import_constants2.MARKET_CATEGORY
+      category: import_constants3.MARKET_CATEGORY
     });
     if (positionRes.retCode !== 0) {
-      import_logger2.logger.log(
+      import_logger3.logger.log(
         getLogLevel(positionRes),
         "position retCode: %s, %s",
         symbol,
@@ -411,7 +561,7 @@ var ByBitConnectorCreator = async (config) => {
       return null;
     }
     const position = positions[0];
-    import_logger2.logger.log(
+    import_logger3.logger.log(
       "debug",
       "position: %s %s qty=%s price=%s",
       position.symbol,
@@ -440,7 +590,7 @@ var ByBitConnectorCreator = async (config) => {
     const meta = await getSymbolMeta(marketDataClient, symbol);
     const positionQty = qty ?? (await getPositionSnapshot(symbol))?.qty ?? 0;
     if (!Number.isFinite(positionQty) || positionQty <= 0) {
-      import_logger2.logger.log(
+      import_logger3.logger.log(
         "warn",
         "setTakeProfits: missing position qty: %s",
         (0, import_data2.toJson)({ symbol, qty, positionQty, takeProfits }, true)
@@ -455,7 +605,7 @@ var ByBitConnectorCreator = async (config) => {
         meta
       );
       if (!tpSizeNum || tpSizeNum < meta.minOrderQty) {
-        import_logger2.logger.log(
+        import_logger3.logger.log(
           "warn",
           "tp skipped: size too small %s",
           (0, import_data2.toJson)(
@@ -472,7 +622,7 @@ var ByBitConnectorCreator = async (config) => {
       );
       const isFullMode = takeProfits.length === 1 && tp.rate === 1;
       const tpRes = await client.setTradingStop({
-        category: import_constants2.MARKET_CATEGORY,
+        category: import_constants3.MARKET_CATEGORY,
         symbol,
         tpSize: isFullMode ? void 0 : tpSizeStr,
         tpslMode: isFullMode ? "Full" : "Partial",
@@ -482,7 +632,7 @@ var ByBitConnectorCreator = async (config) => {
         positionIdx: 0
       });
       if (isTradingStopNotModified(tpRes)) {
-        import_logger2.logger.log(
+        import_logger3.logger.log(
           "debug",
           "tp unchanged: %s %s price=%s rate=%s",
           symbol,
@@ -491,7 +641,7 @@ var ByBitConnectorCreator = async (config) => {
           tp.rate
         );
       } else if (tpRes.retCode === 0) {
-        import_logger2.logger.log(
+        import_logger3.logger.log(
           "info",
           "tp updated: %s %s price=%s rate=%s",
           symbol,
@@ -500,7 +650,7 @@ var ByBitConnectorCreator = async (config) => {
           tp.rate
         );
       } else {
-        import_logger2.logger.log(
+        import_logger3.logger.log(
           "error",
           "tp failed: %s %s price=%s rate=%s %s",
           symbol,
@@ -537,7 +687,7 @@ var ByBitConnectorCreator = async (config) => {
       meta
     );
     const slRes = await client.setTradingStop({
-      category: import_constants2.MARKET_CATEGORY,
+      category: import_constants3.MARKET_CATEGORY,
       symbol,
       tpslMode: "Full",
       stopLoss: slNormalized.priceStr,
@@ -545,7 +695,7 @@ var ByBitConnectorCreator = async (config) => {
       positionIdx: 0
     });
     if (isTradingStopNotModified(slRes)) {
-      import_logger2.logger.log(
+      import_logger3.logger.log(
         "debug",
         "sl unchanged: %s %s stopLoss=%s",
         symbol,
@@ -553,7 +703,7 @@ var ByBitConnectorCreator = async (config) => {
         slNormalized.priceStr
       );
     } else if (slRes.retCode === 0) {
-      import_logger2.logger.log(
+      import_logger3.logger.log(
         "info",
         "sl updated: %s %s stopLoss=%s",
         symbol,
@@ -561,7 +711,7 @@ var ByBitConnectorCreator = async (config) => {
         slNormalized.priceStr
       );
     } else {
-      import_logger2.logger.log(
+      import_logger3.logger.log(
         "error",
         "sl failed: %s %s stopLoss=%s %s",
         symbol,
@@ -577,136 +727,12 @@ var ByBitConnectorCreator = async (config) => {
     setState: async (newState) => {
       state = { ...state, ...newState };
     },
-    kline: async ({
-      symbol,
-      interval,
-      start: defaultStart,
-      end: defaultEnd,
-      silent = false,
-      cacheOnly = false,
-      warmOnly = false
-    }) => {
-      const intMinutes = intervalToMinutes(interval);
-      if (!intMinutes) {
-        import_logger2.logger.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 (0, import_timescale.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 (0, import_timescale.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 (0, import_timescale.upsertCandles)((0, import_timescale.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 (0, import_timescale.upsertCandles)((0, import_timescale.toRows)(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;
-            import_logger2.logger.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 (0, import_timescale.getCandlesRange)(
-          symbol,
-          intMinutes,
-          finalStart,
-          finalEnd
-        );
-        if (isTimescaleFallbackMode) {
-          isTimescaleFallbackMode = false;
-          import_logger2.logger.log("info", "TimescaleDB connection restored for kline cache");
-        }
-        return rowsToKline(dbData);
-      } catch (error) {
-        if (!isTimescaleFallbackMode) {
-          isTimescaleFallbackMode = true;
-          import_logger2.logger.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
-        });
-      }
-    },
+    kline: createTimescaleCachedKline({
+      provider: "bybit",
+      request,
+      intervalToMinutes: intervalToMinutes3,
+      limit: LIMIT
+    }),
     getPosition: async (symbol) => getPositionSnapshot(symbol),
     getPositions: async () => {
       const client = await getPrivateClient();
@@ -714,11 +740,11 @@ var ByBitConnectorCreator = async (config) => {
         return [];
       }
       const positionRes = await client.getPositionInfo({
-        category: import_constants2.MARKET_CATEGORY,
+        category: import_constants3.MARKET_CATEGORY,
         settleCoin: "USDT"
       });
       if (positionRes.retCode !== 0) {
-        import_logger2.logger.log(
+        import_logger3.logger.log(
           getLogLevel(positionRes),
           "positions retCode: %s, %s",
           positionRes.retCode
@@ -731,7 +757,94 @@ var ByBitConnectorCreator = async (config) => {
       }
       return positions;
     },
-    placeOrder: async ({ symbol, price, qty, direction, isLimit }) => {
+    getOpenPositionPnl: async () => {
+      const client = await getPrivateClient();
+      if (!client) {
+        return [];
+      }
+      const positionRes = await client.getPositionInfo({
+        category: import_constants3.MARKET_CATEGORY,
+        settleCoin: "USDT"
+      });
+      if (positionRes.retCode !== 0) {
+        import_logger3.logger.log(
+          getLogLevel(positionRes),
+          "positions pnl retCode: %s, %s",
+          positionRes.retCode
+        );
+        return [];
+      }
+      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 [];
+      }
+      const response = await client.getClosedPnL({
+        category: import_constants3.MARKET_CATEGORY,
+        startTime,
+        endTime,
+        symbol,
+        limit: Math.min(Math.max(1, Math.trunc(limit)), 100)
+      });
+      if (response.retCode !== 0) {
+        import_logger3.logger.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, orderId }) => {
       const client = await getPrivateClient();
       const marketDataClient = await getPublicClient();
       if (!client || !marketDataClient) {
@@ -741,7 +854,7 @@ var ByBitConnectorCreator = async (config) => {
       const meta = await getSymbolMeta(marketDataClient, symbol);
       const { qtyNum: orderQty, qtyStr: orderQtyStr } = normalizeQty(qty, meta);
       if (orderQty < meta.minOrderQty) {
-        import_logger2.logger.log(
+        import_logger3.logger.log(
           "warn",
           "placeOrder: qty too small: %s",
           (0, import_data2.toJson)(
@@ -752,7 +865,7 @@ var ByBitConnectorCreator = async (config) => {
         return false;
       }
       const entryNormalized = isLimit ? normalizePrice(price, "ENTRY", meta) : void 0;
-      import_logger2.logger.log(
+      import_logger3.logger.log(
         "info",
         "placeOrder: %s",
         (0, import_data2.toJson)(
@@ -768,21 +881,22 @@ var ByBitConnectorCreator = async (config) => {
         )
       );
       await client.setLeverage({
-        category: import_constants2.MARKET_CATEGORY,
+        category: import_constants3.MARKET_CATEGORY,
         symbol,
         buyLeverage: "10",
         sellLeverage: "10"
       });
       const orderRes = await client.submitOrder({
-        category: import_constants2.MARKET_CATEGORY,
+        category: import_constants3.MARKET_CATEGORY,
         symbol,
         price: entryNormalized?.priceStr || void 0,
         side: isLong ? "Buy" : "Sell",
         orderType: isLimit ? "Limit" : "Market",
         qty: orderQtyStr,
-        orderFilter: "Order"
+        orderFilter: "Order",
+        orderLinkId: typeof orderId === "string" && orderId.trim() ? orderId : void 0
       });
-      import_logger2.logger.log(
+      import_logger3.logger.log(
         getLogLevel(orderRes),
         "placeOrder:response: %s",
         (0, import_data2.toJson)(orderRes, true)
@@ -800,14 +914,14 @@ var ByBitConnectorCreator = async (config) => {
         return false;
       }
       const closeRes = await client.submitOrder({
-        category: import_constants2.MARKET_CATEGORY,
+        category: import_constants3.MARKET_CATEGORY,
         symbol,
         side: direction === "LONG" ? "Sell" : "Buy",
         orderType: "Market",
         qty: "0",
         reduceOnly: true
       });
-      import_logger2.logger.log(
+      import_logger3.logger.log(
         getLogLevel(closeRes),
         "closePosition: %s, %s, %s",
         symbol,
@@ -825,7 +939,7 @@ var ByBitConnectorCreator = async (config) => {
         return [];
       }
       const data = await client.getTickers({
-        category: import_constants2.MARKET_CATEGORY
+        category: import_constants3.MARKET_CATEGORY
       });
       return data.result.list.map((item) => (0, import_tickers.normalizeTickerData)(item));
     }
@@ -868,58 +982,74 @@ 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 (0, import_http.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 (0, import_http.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,
@@ -1003,6 +1133,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"];
@@ -1029,58 +1163,70 @@ 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 (0, import_http2.fetchWithRetry)(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 (0, import_http2.fetchWithRetry)(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,