@tradejs/infra 1.0.6 → 1.0.8

package/dist/redis.d.mts

@@ -17,6 +17,8 @@ declare class RedisWriteBlockedError extends Error {
 }
 declare const delKeyWithOptions: (key: string, options?: DelKeyOptions) => Promise<boolean>;
 declare const setData: <T>(key: string, data: T, options?: Options) => Promise<void>;
+declare const createScreenshotSessionToken: (userName: string) => Promise<string | null>;
+declare const consumeScreenshotSessionToken: (token: string) => Promise<string | null>;
 declare const redisKeys: {
     users: () => string;
     user: (userName: string) => string;
@@ -31,14 +33,28 @@ declare const redisKeys: {
     testOrders: (userName: string, strategyName: string, testName: string) => string;
     testConfig: (userName: string, strategyName: string, testName: string) => string;
     testStat: (userName: string, strategyName: string, testName: string) => string;
+    testSummaries: (userName: string) => string;
     cacheChunk: (userName: string, chunkId: string) => string;
     cacheOrders: (userName: string, orderLogId: string) => string;
     cachePositions: (userName: string, orderLogId: string) => string;
     signal: (symbol: string, signalId: string) => string;
     signalsBySymbol: (symbol: string) => string;
     storeSignal: (symbol: string, signalId: string) => string;
+    runtimeSignals: (userName: string) => string;
+    runtimeSignal: (userName: string, signalId: string) => string;
+    runtimeSignalEvaluations: (userName: string) => string;
+    runtimeSignalEvaluation: (userName: string, evaluationId: string) => string;
+    runtimeTrades: (userName: string) => string;
+    runtimeTrade: (userName: string, orderId: string) => string;
+    runtimeActiveTrades: (userName: string) => string;
+    runtimeActiveTrade: (userName: string, symbol: string) => string;
+    aiChatHistory: (userName: string, symbolKey: string) => string;
     analysis: (symbol: string, signalId: string) => string;
+    screenshotSessionToken: (token: string) => string;
     backtestResults: (userName: string, config: string, timestamp: string) => string;
+    researchRuns: (userName: string) => string;
+    researchRun: (userName: string, runId: string) => string;
+    researchLatestRun: (userName: string, strategyName: string) => string;
     mlSignalsByStrategy: (strategyName: string) => string;
     mlSignals: () => string;
     mlSignal: (strategyName: string, signalId: string) => string;
@@ -47,4 +63,4 @@ declare const redisKeys: {
     mlResult: (strategyName: string, signalId: string) => string;
 };
 
-export { RedisWriteBlockedError, delKey, delKeyWithOptions, getData, getKeys, redisKeys, setData };
+export { RedisWriteBlockedError, consumeScreenshotSessionToken, createScreenshotSessionToken, delKey, delKeyWithOptions, getData, getKeys, redisKeys, setData };

package/dist/redis.d.ts

@@ -17,6 +17,8 @@ declare class RedisWriteBlockedError extends Error {
 }
 declare const delKeyWithOptions: (key: string, options?: DelKeyOptions) => Promise<boolean>;
 declare const setData: <T>(key: string, data: T, options?: Options) => Promise<void>;
+declare const createScreenshotSessionToken: (userName: string) => Promise<string | null>;
+declare const consumeScreenshotSessionToken: (token: string) => Promise<string | null>;
 declare const redisKeys: {
     users: () => string;
     user: (userName: string) => string;
@@ -31,14 +33,28 @@ declare const redisKeys: {
     testOrders: (userName: string, strategyName: string, testName: string) => string;
     testConfig: (userName: string, strategyName: string, testName: string) => string;
     testStat: (userName: string, strategyName: string, testName: string) => string;
+    testSummaries: (userName: string) => string;
     cacheChunk: (userName: string, chunkId: string) => string;
     cacheOrders: (userName: string, orderLogId: string) => string;
     cachePositions: (userName: string, orderLogId: string) => string;
     signal: (symbol: string, signalId: string) => string;
     signalsBySymbol: (symbol: string) => string;
     storeSignal: (symbol: string, signalId: string) => string;
+    runtimeSignals: (userName: string) => string;
+    runtimeSignal: (userName: string, signalId: string) => string;
+    runtimeSignalEvaluations: (userName: string) => string;
+    runtimeSignalEvaluation: (userName: string, evaluationId: string) => string;
+    runtimeTrades: (userName: string) => string;
+    runtimeTrade: (userName: string, orderId: string) => string;
+    runtimeActiveTrades: (userName: string) => string;
+    runtimeActiveTrade: (userName: string, symbol: string) => string;
+    aiChatHistory: (userName: string, symbolKey: string) => string;
     analysis: (symbol: string, signalId: string) => string;
+    screenshotSessionToken: (token: string) => string;
     backtestResults: (userName: string, config: string, timestamp: string) => string;
+    researchRuns: (userName: string) => string;
+    researchRun: (userName: string, runId: string) => string;
+    researchLatestRun: (userName: string, strategyName: string) => string;
     mlSignalsByStrategy: (strategyName: string) => string;
     mlSignals: () => string;
     mlSignal: (strategyName: string, signalId: string) => string;
@@ -47,4 +63,4 @@ declare const redisKeys: {
     mlResult: (strategyName: string, signalId: string) => string;
 };
 
-export { RedisWriteBlockedError, delKey, delKeyWithOptions, getData, getKeys, redisKeys, setData };
+export { RedisWriteBlockedError, consumeScreenshotSessionToken, createScreenshotSessionToken, delKey, delKeyWithOptions, getData, getKeys, redisKeys, setData };

package/dist/redis.js

@@ -31,6 +31,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var redis_exports = {};
 __export(redis_exports, {
   RedisWriteBlockedError: () => RedisWriteBlockedError,
+  consumeScreenshotSessionToken: () => consumeScreenshotSessionToken,
+  createScreenshotSessionToken: () => createScreenshotSessionToken,
   delKey: () => delKey,
   delKeyWithOptions: () => delKeyWithOptions,
   getData: () => getData,
@@ -39,8 +41,10 @@ __export(redis_exports, {
   setData: () => setData
 });
 module.exports = __toCommonJS(redis_exports);
+var import_crypto = require("crypto");
 var import_ioredis = __toESM(require("ioredis"));
 var TTL_1D = 86400;
+var SCREENSHOT_TOKEN_TTL_SECONDS = 15 * 60;
 var toJson = (value) => JSON.stringify(value);
 var logger = {
   log: (level, message, ...args) => {
@@ -296,6 +300,36 @@ var setData = async (key, data, options = {}) => {
     }
   }
 };
+var createScreenshotSessionToken = async (userName) => {
+  const token = (0, import_crypto.randomBytes)(24).toString("hex");
+  await setData(
+    redisKeys.screenshotSessionToken(token),
+    {
+      userName,
+      createdAt: (/* @__PURE__ */ new Date()).toISOString()
+    },
+    {
+      expire: SCREENSHOT_TOKEN_TTL_SECONDS
+    }
+  );
+  return token;
+};
+var consumeScreenshotSessionToken = async (token) => {
+  const normalizedToken = token.trim();
+  if (!normalizedToken) {
+    return null;
+  }
+  const key = redisKeys.screenshotSessionToken(normalizedToken);
+  const payload = await getData(
+    key,
+    null
+  );
+  if (!payload?.userName) {
+    return null;
+  }
+  await delKey(key);
+  return payload.userName;
+};
 var redisKeys = {
   users: () => "users:index:",
   user: (userName) => `users:index:${userName}`,
@@ -310,14 +344,28 @@ var redisKeys = {
   testOrders: (userName, strategyName, testName) => `users:${userName}:tests:${strategyName}:${testName}:orders`,
   testConfig: (userName, strategyName, testName) => `users:${userName}:tests:${strategyName}:${testName}:config`,
   testStat: (userName, strategyName, testName) => `users:${userName}:tests:${strategyName}:${testName}:stat`,
+  testSummaries: (userName) => `users:${userName}:tests:index:summary`,
   cacheChunk: (userName, chunkId) => `users:${userName}:cache:tests:chunks:${chunkId}`,
   cacheOrders: (userName, orderLogId) => `users:${userName}:cache:tests:orders:${orderLogId}`,
   cachePositions: (userName, orderLogId) => `users:${userName}:cache:tests:positions:${orderLogId}`,
   signal: (symbol, signalId) => `signals:${symbol}:${signalId}`,
   signalsBySymbol: (symbol) => `signals:${symbol}:`,
   storeSignal: (symbol, signalId) => `store:signals:${symbol}:${signalId}`,
+  runtimeSignals: (userName) => `users:${userName}:runtime:signals:`,
+  runtimeSignal: (userName, signalId) => `users:${userName}:runtime:signals:${signalId}`,
+  runtimeSignalEvaluations: (userName) => `users:${userName}:runtime:signal-evaluations:`,
+  runtimeSignalEvaluation: (userName, evaluationId) => `users:${userName}:runtime:signal-evaluations:${evaluationId}`,
+  runtimeTrades: (userName) => `users:${userName}:runtime:trade-records:`,
+  runtimeTrade: (userName, orderId) => `users:${userName}:runtime:trade-records:${orderId}`,
+  runtimeActiveTrades: (userName) => `users:${userName}:runtime:active-trades:`,
+  runtimeActiveTrade: (userName, symbol) => `users:${userName}:runtime:active-trades:${symbol}`,
+  aiChatHistory: (userName, symbolKey) => `users:${userName}:ai:chats:${symbolKey}`,
   analysis: (symbol, signalId) => `analysis:${symbol}:${signalId}`,
+  screenshotSessionToken: (token) => `auth:screenshot:${token}`,
   backtestResults: (userName, config, timestamp) => `users:${userName}:backtests:results:${config}:${timestamp}`,
+  researchRuns: (userName) => `users:${userName}:research:runs:`,
+  researchRun: (userName, runId) => `users:${userName}:research:runs:${runId}`,
+  researchLatestRun: (userName, strategyName) => `users:${userName}:research:latest:${strategyName}`,
   mlSignalsByStrategy: (strategyName) => `ml:${strategyName}:signals:`,
   mlSignals: () => "ml:",
   mlSignal: (strategyName, signalId) => `ml:${strategyName}:signals:${signalId}`,
@@ -328,6 +376,8 @@ var redisKeys = {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   RedisWriteBlockedError,
+  consumeScreenshotSessionToken,
+  createScreenshotSessionToken,
   delKey,
   delKeyWithOptions,
   getData,

package/dist/redis.mjs

@@ -1,14 +1,18 @@
 import {
   RedisWriteBlockedError,
+  consumeScreenshotSessionToken,
+  createScreenshotSessionToken,
   delKey,
   delKeyWithOptions,
   getData,
   getKeys,
   redisKeys,
   setData
-} from "./chunk-EFARW5QE.mjs";
+} from "./chunk-DSTV67R5.mjs";
 export {
   RedisWriteBlockedError,
+  consumeScreenshotSessionToken,
+  createScreenshotSessionToken,
   delKey,
   delKeyWithOptions,
   getData,

package/dist/timescale.d.mts

@@ -1,10 +1,11 @@
 import { Pool } from 'pg';
-import { DerivativesInterval, KlineChartData, DerivativesRow, SpreadRow } from '@tradejs/types';
+import { DerivativesInterval, DerivativesRow, KlineChartData, SpreadRow } from '@tradejs/types';
 
 declare global {
     var __pgPool__: Pool | undefined;
 }
 type CandleRow = {
+    provider: string;
     symbol: string;
     interval: number;
     ts: Date;
@@ -15,10 +16,20 @@ type CandleRow = {
     volume?: number | null;
     turnover?: number | null;
 };
-declare const toRows: (symbol: string, interval: number, data: KlineChartData) => CandleRow[];
+declare const toRows: (provider: string, symbol: string, interval: number, data: KlineChartData) => CandleRow[];
 declare function upsertCandles(rows: CandleRow[]): Promise<void>;
 declare function upsertDerivatives(rows: DerivativesRow[]): Promise<void>;
 declare function getDerivativesRangeForSymbols(symbols: string[], interval: DerivativesInterval, startMs: number, endMs: number): Promise<any[]>;
+declare function getDerivativesDataEdgesForSymbols(symbols: string[], interval: DerivativesInterval): Promise<Map<string, {
+    min?: number;
+    max?: number;
+}>>;
+declare function getDerivativesWindow(params: {
+    symbol: string;
+    intervals: DerivativesInterval[];
+    endMs: number;
+    lookbackMs: number;
+}): Promise<Partial<Record<DerivativesInterval, DerivativesRow[]>>>;
 declare function getDerivativesSummary(hours?: number, limit?: number): Promise<{
     rows: any[];
     aggregates: any[];
@@ -31,17 +42,17 @@ declare function getSpreadSummary(hours?: number, limit?: number): Promise<{
     aggregates: any[];
     hours: number;
 }>;
-declare function getCandlesRange(symbol: string, interval: number, startMs: number, endMs: number): Promise<any[]>;
-declare function getDataEdges(symbol: string, interval: number): Promise<{
+declare function getCandlesRange(provider: string, symbol: string, interval: number, startMs: number, endMs: number): Promise<any[]>;
+declare function getDataEdges(provider: string, symbol: string, interval: number): Promise<{
     min: number | undefined;
     max: number | undefined;
 }>;
 declare function waitForDbReady(attempts?: number, delayMs?: number): Promise<void>;
-declare function deleteCandles(symbol: string, interval: number): Promise<void>;
-declare function findContinuityGap(symbol: string, interval: number): Promise<{
+declare function deleteCandles(provider: string, symbol: string, interval: number): Promise<void>;
+declare function findContinuityGap(provider: string, symbol: string, interval: number): Promise<{
     ts: number;
     prevTs: number;
     diffSeconds: number;
 } | null>;
 
-export { type CandleRow, deleteCandles, findContinuityGap, getCandlesRange, getDataEdges, getDerivativesRangeForSymbols, getDerivativesSummary, getSpreadRangeForSymbols, getSpreadSummary, toRows, upsertCandles, upsertDerivatives, upsertSpreadRows, waitForDbReady };
+export { type CandleRow, deleteCandles, findContinuityGap, getCandlesRange, getDataEdges, getDerivativesDataEdgesForSymbols, getDerivativesRangeForSymbols, getDerivativesSummary, getDerivativesWindow, getSpreadRangeForSymbols, getSpreadSummary, toRows, upsertCandles, upsertDerivatives, upsertSpreadRows, waitForDbReady };

package/dist/timescale.d.ts

@@ -1,10 +1,11 @@
 import { Pool } from 'pg';
-import { DerivativesInterval, KlineChartData, DerivativesRow, SpreadRow } from '@tradejs/types';
+import { DerivativesInterval, DerivativesRow, KlineChartData, SpreadRow } from '@tradejs/types';
 
 declare global {
     var __pgPool__: Pool | undefined;
 }
 type CandleRow = {
+    provider: string;
     symbol: string;
     interval: number;
     ts: Date;
@@ -15,10 +16,20 @@ type CandleRow = {
     volume?: number | null;
     turnover?: number | null;
 };
-declare const toRows: (symbol: string, interval: number, data: KlineChartData) => CandleRow[];
+declare const toRows: (provider: string, symbol: string, interval: number, data: KlineChartData) => CandleRow[];
 declare function upsertCandles(rows: CandleRow[]): Promise<void>;
 declare function upsertDerivatives(rows: DerivativesRow[]): Promise<void>;
 declare function getDerivativesRangeForSymbols(symbols: string[], interval: DerivativesInterval, startMs: number, endMs: number): Promise<any[]>;
+declare function getDerivativesDataEdgesForSymbols(symbols: string[], interval: DerivativesInterval): Promise<Map<string, {
+    min?: number;
+    max?: number;
+}>>;
+declare function getDerivativesWindow(params: {
+    symbol: string;
+    intervals: DerivativesInterval[];
+    endMs: number;
+    lookbackMs: number;
+}): Promise<Partial<Record<DerivativesInterval, DerivativesRow[]>>>;
 declare function getDerivativesSummary(hours?: number, limit?: number): Promise<{
     rows: any[];
     aggregates: any[];
@@ -31,17 +42,17 @@ declare function getSpreadSummary(hours?: number, limit?: number): Promise<{
     aggregates: any[];
     hours: number;
 }>;
-declare function getCandlesRange(symbol: string, interval: number, startMs: number, endMs: number): Promise<any[]>;
-declare function getDataEdges(symbol: string, interval: number): Promise<{
+declare function getCandlesRange(provider: string, symbol: string, interval: number, startMs: number, endMs: number): Promise<any[]>;
+declare function getDataEdges(provider: string, symbol: string, interval: number): Promise<{
     min: number | undefined;
     max: number | undefined;
 }>;
 declare function waitForDbReady(attempts?: number, delayMs?: number): Promise<void>;
-declare function deleteCandles(symbol: string, interval: number): Promise<void>;
-declare function findContinuityGap(symbol: string, interval: number): Promise<{
+declare function deleteCandles(provider: string, symbol: string, interval: number): Promise<void>;
+declare function findContinuityGap(provider: string, symbol: string, interval: number): Promise<{
     ts: number;
     prevTs: number;
     diffSeconds: number;
 } | null>;
 
-export { type CandleRow, deleteCandles, findContinuityGap, getCandlesRange, getDataEdges, getDerivativesRangeForSymbols, getDerivativesSummary, getSpreadRangeForSymbols, getSpreadSummary, toRows, upsertCandles, upsertDerivatives, upsertSpreadRows, waitForDbReady };
+export { type CandleRow, deleteCandles, findContinuityGap, getCandlesRange, getDataEdges, getDerivativesDataEdgesForSymbols, getDerivativesRangeForSymbols, getDerivativesSummary, getDerivativesWindow, getSpreadRangeForSymbols, getSpreadSummary, toRows, upsertCandles, upsertDerivatives, upsertSpreadRows, waitForDbReady };

package/dist/timescale.js

@@ -24,8 +24,10 @@ __export(timescale_exports, {
   findContinuityGap: () => findContinuityGap,
   getCandlesRange: () => getCandlesRange,
   getDataEdges: () => getDataEdges,
+  getDerivativesDataEdgesForSymbols: () => getDerivativesDataEdgesForSymbols,
   getDerivativesRangeForSymbols: () => getDerivativesRangeForSymbols,
   getDerivativesSummary: () => getDerivativesSummary,
+  getDerivativesWindow: () => getDerivativesWindow,
   getSpreadRangeForSymbols: () => getSpreadRangeForSymbols,
   getSpreadSummary: () => getSpreadSummary,
   toRows: () => toRows,
@@ -58,22 +60,33 @@ var getPool = () => {
 };
 var derivativesSchemaReady = false;
 var spreadSchemaReady = false;
-var toRows = (symbol, interval, data) => data.map((i) => ({
-  symbol,
-  interval,
-  ts: new Date(i.timestamp),
-  // ms -> Date
-  open: i.open,
-  high: i.high,
-  low: i.low,
-  close: i.close,
-  volume: i.volume ?? null,
-  turnover: i.turnover ?? null
-}));
+var normalizeCandleProvider = (provider) => String(provider || "").trim().toLowerCase();
+var normalizeCandleSymbol = (symbol) => String(symbol || "").trim().toUpperCase();
+var toRows = (provider, symbol, interval, data) => {
+  const normalizedProvider = normalizeCandleProvider(provider);
+  if (!normalizedProvider) {
+    throw new Error("Candle provider is required");
+  }
+  const normalizedSymbol = normalizeCandleSymbol(symbol);
+  return data.map((i) => ({
+    provider: normalizedProvider,
+    symbol: normalizedSymbol,
+    interval,
+    ts: new Date(i.timestamp),
+    // ms -> Date
+    open: i.open,
+    high: i.high,
+    low: i.low,
+    close: i.close,
+    volume: i.volume ?? null,
+    turnover: i.turnover ?? null
+  }));
+};
 async function upsertCandles(rows) {
   if (!rows.length) return;
   const pool = getPool();
   const cols = [
+    "provider",
     "symbol",
     "interval",
     "ts",
@@ -95,7 +108,8 @@ async function upsertCandles(rows) {
     (_, i) => `(${cols.map((__, j) => `$${i * cols.length + j + 1}`).join(",")})`
   ).join(",");
   const flat = rows.flatMap((r) => [
-    r.symbol,
+    normalizeCandleProvider(r.provider),
+    normalizeCandleSymbol(r.symbol),
     r.interval,
     r.ts,
     r.open,
@@ -108,7 +122,7 @@ async function upsertCandles(rows) {
   const sql = `
     INSERT INTO candles (${cols.join(",")})
     VALUES ${valuesSql}
-    ON CONFLICT (symbol, interval, ts) DO UPDATE SET
+    ON CONFLICT (provider, symbol, interval, ts) DO UPDATE SET
       open = EXCLUDED.open,
       high = EXCLUDED.high,
       low  = EXCLUDED.low,
@@ -259,6 +273,82 @@ async function getDerivativesRangeForSymbols(symbols, interval, startMs, endMs)
   const res = await pool.query(sql, [symbols, interval, startMs, endMs]);
   return res.rows;
 }
+async function getDerivativesDataEdgesForSymbols(symbols, interval) {
+  const normalizedSymbols = [
+    ...new Set(
+      symbols.map(
+        (symbol) => String(symbol || "").trim().toUpperCase()
+      ).filter(Boolean)
+    )
+  ];
+  const edges = /* @__PURE__ */ new Map();
+  if (!normalizedSymbols.length) return edges;
+  await ensureDerivativesSchema();
+  const pool = getPool();
+  const sql = `
+    SELECT
+      symbol,
+      extract(epoch from MIN(ts))*1000 AS min,
+      extract(epoch from MAX(ts))*1000 AS max
+    FROM derivatives_market
+    WHERE symbol = ANY($1)
+      AND interval = $2
+    GROUP BY symbol
+  `;
+  const res = await pool.query(sql, [normalizedSymbols, interval]);
+  for (const row of res.rows) {
+    const min = Number(row.min);
+    const max = Number(row.max);
+    edges.set(String(row.symbol).toUpperCase(), {
+      min: Number.isFinite(min) ? min : void 0,
+      max: Number.isFinite(max) ? max : void 0
+    });
+  }
+  return edges;
+}
+async function getDerivativesWindow(params) {
+  const { symbol, intervals, endMs, lookbackMs } = params;
+  const normalizedSymbol = String(symbol || "").trim().toUpperCase();
+  const normalizedIntervals = [...new Set(intervals)].filter(Boolean);
+  if (!normalizedSymbol || !normalizedIntervals.length) {
+    return {};
+  }
+  await ensureDerivativesSchema();
+  const startMs = endMs - Math.max(0, lookbackMs);
+  const pool = getPool();
+  const sql = `
+    SELECT symbol, interval, ts, open_interest, funding_rate, liq_long, liq_short, liq_total, source
+    FROM derivatives_market
+    WHERE symbol = $1
+      AND interval = ANY($2)
+      AND ts >= to_timestamp($3/1000.0)
+      AND ts <= to_timestamp($4/1000.0)
+    ORDER BY interval ASC, ts ASC
+  `;
+  const res = await pool.query(sql, [
+    normalizedSymbol,
+    normalizedIntervals,
+    startMs,
+    endMs
+  ]);
+  const rowsByInterval = {};
+  for (const row of res.rows) {
+    const interval = row.interval;
+    rowsByInterval[interval] ??= [];
+    rowsByInterval[interval]?.push({
+      symbol: row.symbol,
+      interval,
+      ts: row.ts,
+      openInterest: row.open_interest,
+      fundingRate: row.funding_rate,
+      liqLong: row.liq_long,
+      liqShort: row.liq_short,
+      liqTotal: row.liq_total,
+      source: row.source
+    });
+  }
+  return rowsByInterval;
+}
 async function getDerivativesSummary(hours = 24, limit = 500) {
   await ensureDerivativesSchema();
   const pool = getPool();
@@ -398,39 +488,49 @@ async function getSpreadSummary(hours = 24, limit = 500) {
     hours: cappedHours
   };
 }
-async function getCandlesRange(symbol, interval, startMs, endMs) {
+async function getCandlesRange(provider, symbol, interval, startMs, endMs) {
   const pool = getPool();
+  const normalizedProvider = normalizeCandleProvider(provider);
+  const normalizedSymbol = normalizeCandleSymbol(symbol);
   const sql = `
     SELECT symbol, interval, ts,
            open, high, low, close, volume, turnover
     FROM candles
-    WHERE symbol = $1 AND interval = $2
-      AND ts >= to_timestamp($3/1000.0)
-      AND ts <= to_timestamp($4/1000.0)
+    WHERE provider = $1 AND symbol = $2 AND interval = $3
+      AND ts >= to_timestamp($4/1000.0)
+      AND ts <= to_timestamp($5/1000.0)
     ORDER BY ts ASC
   `;
-  const res = await pool.query(sql, [symbol, interval, startMs, endMs]);
+  const res = await pool.query(sql, [
+    normalizedProvider,
+    normalizedSymbol,
+    interval,
+    startMs,
+    endMs
+  ]);
   return res.rows;
 }
-async function getDataEdges(symbol, interval) {
+async function getDataEdges(provider, symbol, interval) {
   const pool = getPool();
+  const normalizedProvider = normalizeCandleProvider(provider);
+  const normalizedSymbol = normalizeCandleSymbol(symbol);
   const sqlMin = `
     SELECT extract(epoch from ts)*1000 AS ms
     FROM candles
-    WHERE symbol=$1 AND interval=$2
+    WHERE provider=$1 AND symbol=$2 AND interval=$3
     ORDER BY ts ASC
     LIMIT 1
   `;
   const sqlMax = `
     SELECT extract(epoch from ts)*1000 AS ms
     FROM candles
-    WHERE symbol=$1 AND interval=$2
+    WHERE provider=$1 AND symbol=$2 AND interval=$3
     ORDER BY ts DESC
     LIMIT 1
   `;
   const [minQ, maxQ] = await Promise.all([
-    pool.query(sqlMin, [symbol, interval]),
-    pool.query(sqlMax, [symbol, interval])
+    pool.query(sqlMin, [normalizedProvider, normalizedSymbol, interval]),
+    pool.query(sqlMax, [normalizedProvider, normalizedSymbol, interval])
   ]);
   const minRaw = minQ.rows[0]?.ms;
   const maxRaw = maxQ.rows[0]?.ms;
@@ -452,16 +552,20 @@ async function waitForDbReady(attempts = 20, delayMs = 1e3) {
   }
   throw lastError;
 }
-async function deleteCandles(symbol, interval) {
+async function deleteCandles(provider, symbol, interval) {
   const pool = getPool();
+  const normalizedProvider = normalizeCandleProvider(provider);
+  const normalizedSymbol = normalizeCandleSymbol(symbol);
   const sql = `
     DELETE FROM candles
-    WHERE symbol = $1 AND interval = $2
+    WHERE provider = $1 AND symbol = $2 AND interval = $3
   `;
-  await pool.query(sql, [symbol, interval]);
+  await pool.query(sql, [normalizedProvider, normalizedSymbol, interval]);
 }
-async function findContinuityGap(symbol, interval) {
+async function findContinuityGap(provider, symbol, interval) {
   const pool = getPool();
+  const normalizedProvider = normalizeCandleProvider(provider);
+  const normalizedSymbol = normalizeCandleSymbol(symbol);
   const expectedSeconds = interval * 60;
   const sql = `
     WITH ordered AS (
@@ -469,7 +573,7 @@ async function findContinuityGap(symbol, interval) {
         ts,
         LAG(ts) OVER (ORDER BY ts) AS prev_ts
       FROM candles
-      WHERE symbol = $1 AND interval = $2
+      WHERE provider = $1 AND symbol = $2 AND interval = $3
     )
     SELECT
       ts,
@@ -477,11 +581,16 @@ async function findContinuityGap(symbol, interval) {
       EXTRACT(EPOCH FROM (ts - prev_ts))::int AS diff_seconds
     FROM ordered
     WHERE prev_ts IS NOT NULL
-      AND EXTRACT(EPOCH FROM (ts - prev_ts))::int <> $3
+      AND EXTRACT(EPOCH FROM (ts - prev_ts))::int <> $4
     ORDER BY ts ASC
     LIMIT 1
   `;
-  const res = await pool.query(sql, [symbol, interval, expectedSeconds]);
+  const res = await pool.query(sql, [
+    normalizedProvider,
+    normalizedSymbol,
+    interval,
+    expectedSeconds
+  ]);
   const row = res.rows[0];
   if (!row) return null;
   return {
@@ -496,8 +605,10 @@ async function findContinuityGap(symbol, interval) {
   findContinuityGap,
   getCandlesRange,
   getDataEdges,
+  getDerivativesDataEdgesForSymbols,
   getDerivativesRangeForSymbols,
   getDerivativesSummary,
+  getDerivativesWindow,
   getSpreadRangeForSymbols,
   getSpreadSummary,
   toRows,