@tradejs/connectors 3.0.1 → 3.1.0

package/dist/index.js

@@ -51,21 +51,34 @@ module.exports = __toCommonJS(index_exports);
 // src/ByBit/index.ts
 var import_lodash = __toESM(require("lodash"));
 var import_chalk = __toESM(require("chalk"));
-var import_async2 = require("@tradejs/core/async");
-var import_constants2 = require("@tradejs/core/constants");
-var import_data2 = require("@tradejs/core/data");
+var import_async = require("@tradejs/core/async");
+var import_constants = require("@tradejs/core/constants");
+var import_data = require("@tradejs/core/data");
 var import_math = require("@tradejs/core/math");
 var import_tickers = require("@tradejs/core/tickers");
-var import_time3 = require("@tradejs/core/time");
-var import_logger3 = require("@tradejs/infra/logger");
+var import_time2 = require("@tradejs/core/time");
 
 // src/ByBit/client.ts
 var import_bybit_api = require("bybit-api");
-var import_logger = require("@tradejs/infra/logger");
-var import_tradingAccounts = require("@tradejs/infra/tradingAccounts");
+
+// src/shared/runtime.ts
+var noop = () => void 0;
+var silentConnectorLogger = {
+  log: noop,
+  info: noop,
+  warn: noop,
+  error: noop
+};
+var getConnectorLogger = (runtime) => runtime?.logger ?? silentConnectorLogger;
+var getConnectorAccountResolver = (runtime) => runtime?.resolveTradingAccount ?? (async () => null);
+var decorateConnectorKline = (runtime, options) => runtime?.createCachedKline(options) ?? options.request;
+
+// src/ByBit/client.ts
 var PRIVATE_RECV_WINDOW_MS = 1e4;
-var getClient = async (config, access = "private") => {
-  const account = access === "public" && !config.accountId ? null : await (0, import_tradingAccounts.resolveTradingAccount)({
+var getClient = async (config, access = "private", runtime) => {
+  const logger = getConnectorLogger(runtime);
+  const resolveTradingAccount = getConnectorAccountResolver(runtime);
+  const account = access === "public" && !config.accountId ? null : await resolveTradingAccount({
     userName: config.userName,
     accountId: config.accountId,
     provider: "bybit",
@@ -80,14 +93,14 @@ var getClient = async (config, access = "private") => {
   }
   if (!account?.apiKey || !account.apiSecret) {
     if (config.accountId) {
-      import_logger.logger.log(
+      logger.log(
         "error",
         "Bybit trading account config not found: user=%s account=%s",
         config.userName,
         config.accountId
       );
     } else {
-      import_logger.logger.log("error", "connection config not found: %s", config.userName);
+      logger.log("error", "connection config not found: %s", config.userName);
     }
     return null;
   }
@@ -104,310 +117,11 @@ var getClient = async (config, access = "private") => {
   return client;
 };
 
-// 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_async = require("@tradejs/core/async");
-var import_logger2 = require("@tradejs/infra/logger");
-var import_candles = require("@tradejs/infra/timescale/candles");
-var DEFAULT_LIMIT = 1e3;
-var DEFAULT_CACHE_FALLBACK_WINDOW = 1e3;
-var DEFAULT_TIMESCALE_RETRIES = 2;
-var DEFAULT_TIMESCALE_RETRY_DELAY_MS = 1e3;
-var resolveNonNegativeInt = (value, fallback) => {
-  const parsed = Number(value);
-  if (!Number.isFinite(parsed) || parsed < 0) {
-    return fallback;
-  }
-  return Math.floor(parsed);
-};
-var getTimescaleRetryCount = () => resolveNonNegativeInt(
-  process.env.TIMESCALE_KLINE_RETRIES,
-  DEFAULT_TIMESCALE_RETRIES
-);
-var getTimescaleRetryDelayMs = () => resolveNonNegativeInt(
-  process.env.TIMESCALE_KLINE_RETRY_DELAY_MS,
-  DEFAULT_TIMESCALE_RETRY_DELAY_MS
-);
-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 runTimescaleOperation = async (operation) => {
-    const retries = getTimescaleRetryCount();
-    const retryDelayMs = getTimescaleRetryDelayMs();
-    for (let attempt = 0; ; attempt += 1) {
-      try {
-        return await operation();
-      } catch (error) {
-        if (attempt >= retries) {
-          throw error;
-        }
-        const waitMs = retryDelayMs * 2 ** attempt;
-        if (waitMs > 0) {
-          await (0, import_async.delay)(waitMs);
-        }
-      }
-    }
-  };
-  const loadData = async (direction, pointer, limitBoundary, requestParams, intervalMs, options = {}) => {
-    if (pointer === void 0) return { data: [], loaded: false };
-    let accumulated = [];
-    let fulfilled = false;
-    let loaded = false;
-    const shouldAccumulate = options.accumulate ?? true;
-    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;
-      }
-      loaded = true;
-      if (options.onPartData) {
-        await options.onPartData(partData);
-      }
-      if (shouldAccumulate) {
-        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 { data: accumulated, loaded };
-  };
-  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 runTimescaleOperation(
-        () => (0, import_candles.upsertCandles)((0, import_candles.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 runTimescaleOperation(
-        () => (0, import_candles.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 runTimescaleOperation(
-          () => (0, import_candles.getCandlesRange)(provider, symbol, intMinutes, s, e)
-        );
-        return rowsToKline(dbData2);
-      }
-      const needOlderData = defaultStart !== void 0 && (dataStart === void 0 || normStart < dataStart);
-      const persistPartData = warmOnly ? (partData) => runTimescaleOperation(
-        () => (0, import_candles.upsertCandles)((0, import_candles.toRows)(provider, symbol, intMinutes, partData))
-      ) : void 0;
-      if (needOlderData) {
-        const pointerForOlder = dataStart ?? normEnd ?? Date.now();
-        const olderResult = await loadData(
-          "older",
-          pointerForOlder,
-          normStart,
-          {
-            symbol,
-            interval,
-            silent,
-            start: normStart,
-            end: pointerForOlder
-          },
-          intervalMs,
-          {
-            accumulate: !warmOnly,
-            onPartData: persistPartData
-          }
-        );
-        if (warmOnly && olderResult.loaded) {
-          dataStart = normStart;
-          if (dataEnd === void 0) {
-            dataEnd = normEnd;
-          }
-        } else if (olderResult.data.length) {
-          await runTimescaleOperation(
-            () => (0, import_candles.upsertCandles)(
-              (0, import_candles.toRows)(provider, symbol, intMinutes, olderResult.data)
-            )
-          );
-          dataStart = normStart;
-          if (dataEnd === void 0) {
-            dataEnd = normEnd;
-          }
-        }
-      }
-      const needNewerData = defaultEnd !== void 0 && (dataEnd === void 0 || normEnd > dataEnd);
-      if (needNewerData) {
-        const fallbackStart = (0, import_time.getTimestamp)(import_constants.PRELOAD_FALLBACK_DAYS);
-        const pointerForNewer = dataEnd ?? (defaultStart !== void 0 ? normStart : fallbackStart) ?? 0;
-        const newerResult = await loadData(
-          "newer",
-          pointerForNewer,
-          normEnd,
-          {
-            symbol,
-            interval,
-            silent,
-            start: pointerForNewer,
-            end: normEnd
-          },
-          intervalMs,
-          {
-            accumulate: !warmOnly,
-            onPartData: persistPartData
-          }
-        );
-        if (warmOnly && newerResult.loaded) {
-          dataEnd = normEnd;
-        } else if (newerResult.data.length) {
-          await runTimescaleOperation(
-            () => (0, import_candles.upsertCandles)(
-              (0, import_candles.toRows)(provider, symbol, intMinutes, newerResult.data)
-            )
-          );
-          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 runTimescaleOperation(
-        () => (0, import_candles.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_time2 = require("@tradejs/core/time");
+var import_time = require("@tradejs/core/time");
 var BYBIT_CATEGORY = "linear";
 var parseKlineItem = (item) => ({
-  dt: (0, import_time2.formatUnix)(parseInt(item[0])),
+  dt: (0, import_time.formatUnix)(parseInt(item[0])),
   timestamp: parseInt(item[0]),
   open: parseFloat(item[1]),
   high: parseFloat(item[2]),
@@ -598,7 +312,8 @@ var loadFundingFeeRows = async ({
   client,
   startTime,
   endTime,
-  symbol
+  symbol,
+  logger
 }) => {
   if (typeof client.getTransactionLog !== "function") {
     return [];
@@ -617,7 +332,7 @@ var loadFundingFeeRows = async ({
         ...cursor ? { cursor } : {}
       });
       if (response?.retCode !== 0) {
-        import_logger3.logger.log(
+        logger.log(
           "debug",
           "funding transaction log retCode: %s, %s",
           response?.retCode,
@@ -649,7 +364,7 @@ var loadFundingFeeRows = async ({
     }
     return rows;
   } catch (error) {
-    import_logger3.logger.log("debug", "funding transaction log failed: %s", error);
+    logger.log("debug", "funding transaction log failed: %s", error);
     return [];
   }
 };
@@ -696,7 +411,8 @@ var resolveKlineRetryDelayMs = (res, attempt) => {
   );
   return backoffMs + jitterMs;
 };
-var ByBitConnectorCreator = async (config) => {
+var ByBitConnectorCreator = async (config, runtime) => {
+  const logger = getConnectorLogger(runtime);
   let state = {};
   const universe = (0, import_types.resolveConnectorUniverse)(
     BYBIT_CAPABILITIES,
@@ -707,11 +423,11 @@ var ByBitConnectorCreator = async (config) => {
   const positionSnapshotCache = /* @__PURE__ */ new Map();
   const inflightPositionSnapshots = /* @__PURE__ */ new Map();
   const getPublicClient = async () => {
-    publicClientPromise ??= getClient(config, "public");
+    publicClientPromise ??= getClient(config, "public", runtime);
     return publicClientPromise;
   };
   const getPrivateClient = async () => {
-    privateClientPromise ??= getClient(config, "private");
+    privateClientPromise ??= getClient(config, "private", runtime);
     return privateClientPromise;
   };
   const instrumentCache = /* @__PURE__ */ new Map();
@@ -839,7 +555,7 @@ var ByBitConnectorCreator = async (config) => {
     silent
   }) => {
     const normalizedStart = (0, import_math.round)(
-      start || (0, import_time3.getTimestamp)(import_constants2.PRELOAD_FALLBACK_DAYS),
+      start || (0, import_time2.getTimestamp)(import_constants.PRELOAD_FALLBACK_DAYS),
       0
     );
     const normalizedEnd = (0, import_math.round)(end || Date.now());
@@ -861,7 +577,7 @@ var ByBitConnectorCreator = async (config) => {
         if (isKlineRateLimited(kline)) {
           if (attempt < KLINE_RATE_LIMIT_MAX_ATTEMPTS) {
             const waitMs = resolveKlineRetryDelayMs(kline, attempt);
-            import_logger3.logger.log(
+            logger.log(
               "warn",
               "kline rate limited for %s %s: attempt=%s/%s waitMs=%s",
               symbol,
@@ -870,13 +586,13 @@ var ByBitConnectorCreator = async (config) => {
               KLINE_RATE_LIMIT_MAX_ATTEMPTS,
               waitMs
             );
-            await (0, import_async2.delay)(waitMs);
+            await (0, import_async.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}` : "";
-          import_logger3.logger.log(
+          logger.log(
             "error",
             "empty kline.list for %s %s%s",
             symbol,
@@ -886,10 +602,10 @@ var ByBitConnectorCreator = async (config) => {
           return [];
         }
         if (!silent && (process.stdout.isTTY || process.env.TRADEJS_LOG_KLINE_REQUESTS === "1")) {
-          import_logger3.logger.log(
+          logger.log(
             "info",
             "%s %s %s %s",
-            import_chalk.default.yellow((0, import_time3.formatUnix)(normalizedEnd)),
+            import_chalk.default.yellow((0, import_time2.formatUnix)(normalizedEnd)),
             import_chalk.default.cyan(symbol),
             import_chalk.default.cyan(interval),
             import_chalk.default.yellow(kline.result.list.length)
@@ -899,7 +615,7 @@ var ByBitConnectorCreator = async (config) => {
       }
       return [];
     } catch (error) {
-      import_logger3.logger.log(
+      logger.log(
         "error",
         "request kline: %s %s %s",
         normalizedStart,
@@ -927,7 +643,7 @@ var ByBitConnectorCreator = async (config) => {
         `bybit getPositionInfo ${symbol}`
       );
       if (positionRes.retCode !== 0) {
-        import_logger3.logger.log(
+        logger.log(
           getLogLevel(positionRes),
           "position retCode: %s, %s",
           symbol,
@@ -940,7 +656,7 @@ var ByBitConnectorCreator = async (config) => {
         return null;
       }
       const position = positions[0];
-      import_logger3.logger.log(
+      logger.log(
         "debug",
         "position: %s %s qty=%s price=%s",
         position.symbol,
@@ -952,7 +668,7 @@ var ByBitConnectorCreator = async (config) => {
         ...position
       };
     } catch (error) {
-      import_logger3.logger.log("error", "getPositionSnapshot failed: %s %s", symbol, error);
+      logger.log("error", "getPositionSnapshot failed: %s %s", symbol, error);
       return null;
     }
   };
@@ -991,10 +707,10 @@ 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_logger3.logger.log(
+      logger.log(
         "warn",
         "setTakeProfits: missing position qty: %s",
-        (0, import_data2.toJson)({ symbol, qty, positionQty, takeProfits }, true)
+        (0, import_data.toJson)({ symbol, qty, positionQty, takeProfits }, true)
       );
       return false;
     }
@@ -1006,10 +722,10 @@ var ByBitConnectorCreator = async (config) => {
         meta
       );
       if (!tpSizeNum || tpSizeNum < meta.minOrderQty) {
-        import_logger3.logger.log(
+        logger.log(
           "warn",
           "tp skipped: size too small %s",
-          (0, import_data2.toJson)(
+          (0, import_data.toJson)(
             { symbol, tp, tpSizeNum, minOrderQty: meta.minOrderQty },
             true
           )
@@ -1033,7 +749,7 @@ var ByBitConnectorCreator = async (config) => {
         positionIdx: 0
       });
       if (isTradingStopNotModified(tpRes)) {
-        import_logger3.logger.log(
+        logger.log(
           "debug",
           "tp unchanged: %s %s price=%s rate=%s",
           symbol,
@@ -1042,7 +758,7 @@ var ByBitConnectorCreator = async (config) => {
           tp.rate
         );
       } else if (tpRes.retCode === 0) {
-        import_logger3.logger.log(
+        logger.log(
           "info",
           "tp updated: %s %s price=%s rate=%s",
           symbol,
@@ -1051,14 +767,14 @@ var ByBitConnectorCreator = async (config) => {
           tp.rate
         );
       } else {
-        import_logger3.logger.log(
+        logger.log(
           "error",
           "tp failed: %s %s price=%s rate=%s %s",
           symbol,
           direction,
           tpPriceNorm.priceStr,
           tp.rate,
-          (0, import_data2.toJson)(tpRes, true)
+          (0, import_data.toJson)(tpRes, true)
         );
       }
       if (!isTradingStopAccepted(tpRes)) {
@@ -1096,7 +812,7 @@ var ByBitConnectorCreator = async (config) => {
       positionIdx: 0
     });
     if (isTradingStopNotModified(slRes)) {
-      import_logger3.logger.log(
+      logger.log(
         "debug",
         "sl unchanged: %s %s stopLoss=%s",
         symbol,
@@ -1104,7 +820,7 @@ var ByBitConnectorCreator = async (config) => {
         slNormalized.priceStr
       );
     } else if (slRes.retCode === 0) {
-      import_logger3.logger.log(
+      logger.log(
         "info",
         "sl updated: %s %s stopLoss=%s",
         symbol,
@@ -1112,13 +828,13 @@ var ByBitConnectorCreator = async (config) => {
         slNormalized.priceStr
       );
     } else {
-      import_logger3.logger.log(
+      logger.log(
         "error",
         "sl failed: %s %s stopLoss=%s %s",
         symbol,
         direction,
         slNormalized.priceStr,
-        (0, import_data2.toJson)(slRes, true)
+        (0, import_data.toJson)(slRes, true)
       );
     }
     return isTradingStopAccepted(slRes);
@@ -1133,7 +849,7 @@ var ByBitConnectorCreator = async (config) => {
     setState: async (newState) => {
       state = { ...state, ...newState };
     },
-    kline: createTimescaleCachedKline({
+    kline: decorateConnectorKline(runtime, {
       provider: "bybit",
       request,
       intervalToMinutes: intervalToMinutes3,
@@ -1150,7 +866,7 @@ var ByBitConnectorCreator = async (config) => {
         settleCoin: "USDT"
       });
       if (positionRes.retCode !== 0) {
-        import_logger3.logger.log(
+        logger.log(
           getLogLevel(positionRes),
           "positions retCode: %s, %s",
           positionRes.retCode
@@ -1173,7 +889,7 @@ var ByBitConnectorCreator = async (config) => {
         settleCoin: "USDT"
       });
       if (positionRes.retCode !== 0) {
-        import_logger3.logger.log(
+        logger.log(
           getLogLevel(positionRes),
           "positions pnl retCode: %s, %s",
           positionRes.retCode
@@ -1233,7 +949,7 @@ var ByBitConnectorCreator = async (config) => {
           ...cursor ? { cursor } : {}
         });
         if (response.retCode !== 0) {
-          import_logger3.logger.log(
+          logger.log(
             "error",
             "closedPnl retCode: %s, %s",
             response.retCode,
@@ -1255,7 +971,8 @@ var ByBitConnectorCreator = async (config) => {
         client,
         startTime,
         endTime,
-        symbol
+        symbol,
+        logger
       });
       return closedPnlRows.map((item) => {
         const qty = Number(item.qty ?? item.closedSize ?? Number.NaN);
@@ -1330,7 +1047,7 @@ var ByBitConnectorCreator = async (config) => {
           ...cursor ? { cursor } : {}
         });
         if (response.retCode !== 0) {
-          import_logger3.logger.log(
+          logger.log(
             "error",
             "entryExecutions retCode: %s, %s",
             response.retCode,
@@ -1352,7 +1069,8 @@ var ByBitConnectorCreator = async (config) => {
         client,
         startTime,
         endTime,
-        symbol
+        symbol,
+        logger
       });
       return executionRows.map((item) => {
         const qty = Number(item.execQty ?? item.orderQty ?? Number.NaN);
@@ -1414,10 +1132,10 @@ var ByBitConnectorCreator = async (config) => {
           if (signal) {
             signal.orderFailureReason = failureReason;
           }
-          import_logger3.logger.log(
+          logger.log(
             "warn",
             "placeOrder: rejected position increase: %s",
-            (0, import_data2.toJson)(
+            (0, import_data.toJson)(
               {
                 symbol,
                 direction,
@@ -1439,10 +1157,10 @@ var ByBitConnectorCreator = async (config) => {
           signal.orderValue = normalizedQty.qtyNum * price;
           signal.orderFailureReason = "QTY_BELOW_MIN_ORDER";
         }
-        import_logger3.logger.log(
+        logger.log(
           "warn",
           "placeOrder: rejected qty below minOrderQty: %s",
-          (0, import_data2.toJson)(
+          (0, import_data.toJson)(
             {
               symbol,
               qty,
@@ -1461,10 +1179,10 @@ var ByBitConnectorCreator = async (config) => {
         signal.orderValue = orderQty * price;
       }
       const entryNormalized = isLimit ? normalizePrice(price, "ENTRY", meta) : void 0;
-      import_logger3.logger.log(
+      logger.log(
         "info",
         "placeOrder: %s",
-        (0, import_data2.toJson)(
+        (0, import_data.toJson)(
           {
             symbol,
             price,
@@ -1494,10 +1212,10 @@ var ByBitConnectorCreator = async (config) => {
         orderFilter: "Order",
         orderLinkId: typeof orderId === "string" && orderId.trim() ? orderId : void 0
       });
-      import_logger3.logger.log(
+      logger.log(
         getLogLevel(orderRes),
         "placeOrder:response: %s",
-        (0, import_data2.toJson)(orderRes, true)
+        (0, import_data.toJson)(orderRes, true)
       );
       if (orderRes.retCode !== 0) {
         if (signal) {
@@ -1527,12 +1245,12 @@ var ByBitConnectorCreator = async (config) => {
         qty: "0",
         reduceOnly: true
       });
-      import_logger3.logger.log(
+      logger.log(
         getLogLevel(closeRes),
         "closePosition: %s, %s, %s",
         symbol,
         direction,
-        (0, import_data2.toJson)(closeRes, true)
+        (0, import_data.toJson)(closeRes, true)
       );
       if (closeRes.retCode !== 0) {
         return false;
@@ -1638,7 +1356,6 @@ var ByBitConnectorCreator = async (config) => {
 };
 
 // src/Binance/index.ts
-var import_http = require("@tradejs/infra/http");
 var import_types2 = require("@tradejs/types");
 
 // src/shared/binancePublicApi.ts
@@ -1646,6 +1363,7 @@ var DEFAULT_BINANCE_PUBLIC_API_URL = "https://data-api.binance.vision";
 var getBinancePublicApiUrl = () => process.env.BINANCE_BASE_URL?.trim() || DEFAULT_BINANCE_PUBLIC_API_URL;
 
 // src/Binance/index.ts
+var import_http = require("@tradejs/core/http");
 var INTERVAL_MAP = {
   "1": "1m",
   "3": "3m",
@@ -1692,7 +1410,7 @@ var capabilities = {
   supportedUniverses: ["crypto"],
   defaultUniverse: "crypto"
 };
-var BinanceConnectorCreator = async (config) => {
+var BinanceConnectorCreator = async (config, runtime) => {
   let state = {};
   const universe = (0, import_types2.resolveConnectorUniverse)(capabilities, config.universe);
   const requestKline = async ({
@@ -1820,7 +1538,7 @@ var BinanceConnectorCreator = async (config) => {
     setState: async (newState) => {
       state = { ...state, ...newState };
     },
-    kline: createTimescaleCachedKline({
+    kline: decorateConnectorKline(runtime, {
       provider: "binance",
       request: requestKline,
       intervalToMinutes
@@ -1915,8 +1633,8 @@ var BinanceConnectorCreator = async (config) => {
 };
 
 // src/Coinbase/index.ts
-var import_http2 = require("@tradejs/infra/http");
 var import_types3 = require("@tradejs/types");
+var import_http2 = require("@tradejs/core/http");
 var INTERVAL_MS2 = {
   "1": 6e4,
   "3": 18e4,
@@ -1983,7 +1701,7 @@ var capabilities2 = {
   supportedUniverses: ["crypto"],
   defaultUniverse: "crypto"
 };
-var CoinbaseConnectorCreator = async (config) => {
+var CoinbaseConnectorCreator = async (config, runtime) => {
   let state = {};
   const universe = (0, import_types3.resolveConnectorUniverse)(capabilities2, config.universe);
   const requestKline = async ({
@@ -2111,7 +1829,7 @@ var CoinbaseConnectorCreator = async (config) => {
     setState: async (newState) => {
       state = { ...state, ...newState };
     },
-    kline: createTimescaleCachedKline({
+    kline: decorateConnectorKline(runtime, {
       provider: "coinbase",
       request: requestKline,
       intervalToMinutes: intervalToMinutes2
@@ -2131,7 +1849,7 @@ var CoinbaseConnectorCreator = async (config) => {
 };
 
 // src/marketData/spotKlineProviders.ts
-var import_http3 = require("@tradejs/infra/http");
+var import_http3 = require("@tradejs/core/http");
 var toIntervalToken = (interval) => interval === "1h" ? "1h" : "15m";
 var mapBinanceKline = (payload) => payload.map((item) => {
   if (!Array.isArray(item)) return null;
@@ -2235,9 +1953,7 @@ var spotKlineProviders = {
 
 // src/ByBit/klineStream.ts
 var import_bybit_api2 = require("bybit-api");
-var import_time4 = require("@tradejs/core/time");
-var import_logger4 = require("@tradejs/infra/logger");
-var import_tradingAccounts2 = require("@tradejs/infra/tradingAccounts");
+var import_time3 = require("@tradejs/core/time");
 var CATEGORY = "linear";
 var SUBSCRIPTION_BATCH_SIZE = 100;
 var KLINE_TOPIC_PATTERN = /^kline\.([^.]+)\.(.+)$/;
@@ -2277,7 +1993,7 @@ var parseBybitKlineEvent = (value, receivedAt = Date.now()) => {
         symbol: symbol.toUpperCase(),
         interval,
         candle: {
-          dt: (0, import_time4.formatUnix)(timestamp),
+          dt: (0, import_time3.formatUnix)(timestamp),
           timestamp,
           open,
           high,
@@ -2294,22 +2010,23 @@ var parseBybitKlineEvent = (value, receivedAt = Date.now()) => {
 };
 var createBybitKlineStreamWithClient = ({
   client,
-  onEvent
+  onEvent,
+  logger = getConnectorLogger()
 }) => {
   let topics = /* @__PURE__ */ new Set();
   let closed = false;
   client.on("update", (value) => {
     for (const event of parseBybitKlineEvent(value)) {
       void Promise.resolve(onEvent(event)).catch((error) => {
-        import_logger4.logger.error("Bybit kline stream handler failed: %s", String(error));
+        logger.error("Bybit kline stream handler failed: %s", String(error));
       });
     }
   });
   client.on("reconnected", ({ wsKey }) => {
-    import_logger4.logger.info("Bybit kline stream reconnected: %s", wsKey);
+    logger.info("Bybit kline stream reconnected: %s", wsKey);
   });
   client.on("exception", (error) => {
-    import_logger4.logger.error("Bybit kline stream exception: %s", String(error));
+    logger.error("Bybit kline stream exception: %s", String(error));
   });
   return {
     setSubscriptions: (symbols, interval) => {
@@ -2323,16 +2040,16 @@ var createBybitKlineStreamWithClient = ({
       const removed = [...topics].filter((topic) => !nextTopics.has(topic));
       for (const batch of chunk(removed, SUBSCRIPTION_BATCH_SIZE)) {
         void Promise.all(client.unsubscribeV5(batch, CATEGORY)).catch(
-          (error) => import_logger4.logger.error("Bybit kline unsubscribe failed: %s", String(error))
+          (error) => logger.error("Bybit kline unsubscribe failed: %s", String(error))
         );
       }
       for (const batch of chunk(added, SUBSCRIPTION_BATCH_SIZE)) {
         void Promise.all(client.subscribeV5(batch, CATEGORY)).catch(
-          (error) => import_logger4.logger.error("Bybit kline subscribe failed: %s", String(error))
+          (error) => logger.error("Bybit kline subscribe failed: %s", String(error))
         );
       }
       topics = nextTopics;
-      import_logger4.logger.info(
+      logger.info(
         "Bybit kline stream subscriptions: topics=%s added=%s removed=%s",
         topics.size,
         added.length,
@@ -2353,9 +2070,11 @@ var createBybitKlineStreamWithClient = ({
 };
 var createBybitKlineStream = async ({
   config,
-  onEvent
+  onEvent,
+  runtime
 }) => {
-  const account = config.accountId ? await (0, import_tradingAccounts2.resolveTradingAccount)({
+  const resolveTradingAccount = getConnectorAccountResolver(runtime);
+  const account = config.accountId ? await resolveTradingAccount({
     userName: config.userName,
     accountId: config.accountId,
     provider: "bybit",
@@ -2368,7 +2087,11 @@ var createBybitKlineStream = async ({
       Number(process.env.BYBIT_WS_RECONNECT_TIMEOUT_MS ?? 1e3)
     )
   });
-  return createBybitKlineStreamWithClient({ client, onEvent });
+  return createBybitKlineStreamWithClient({
+    client,
+    onEvent,
+    logger: getConnectorLogger(runtime)
+  });
 };
 
 // src/marketData/providers/binanceCoinbaseSpread.ts
@@ -2427,7 +2150,7 @@ var binanceCoinbaseSpreadProvider = {
 };
 
 // src/marketData/providers/coinalyze.ts
-var import_async3 = require("@tradejs/core/async");
+var import_async2 = require("@tradejs/core/async");
 var import_indicators2 = require("@tradejs/core/indicators");
 var coinalyzeIntervalMap = {
   "15m": "15min",
@@ -2497,7 +2220,7 @@ var fetchCoinalyzeSeries = async (params) => {
       lastRequestTs + coinalyzeMinRequestDelayMs - now
     );
     if (waitMs > 0) {
-      await (0, import_async3.delay)(waitMs);
+      await (0, import_async2.delay)(waitMs);
     }
     lastRequestTs = Date.now();
     const response = await fetch(url.toString(), { headers });
@@ -2511,7 +2234,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 (0, import_async3.delay)(retryAfterMs ?? backoffMs);
+      await (0, import_async2.delay)(retryAfterMs ?? backoffMs);
       continue;
     }
     throw new Error(`Coinalyze ${endpoint} ${response.status}: ${text}`);