@tradejs/app 2.0.18 → 2.0.19

package/src/app/components/UI/Segment/index.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { SegmentGroup } from '@chakra-ui/react';
-import { Items } from '@tradejs/types';
+import type { Items } from '#app/types/ui';
 
 interface SegmentProps {
   defaultValue: string;

package/src/app/components/UI/Select/index.tsx

@@ -8,7 +8,7 @@ import {
   Select as UISelect,
   createListCollection,
 } from '@chakra-ui/react';
-import { Items } from '@tradejs/types';
+import type { Items } from '#app/types/ui';
 
 interface SelectProps {
   defaultValue: string[];

package/src/app/components/UI/SelectWithSearch/index.tsx

@@ -11,7 +11,7 @@ import {
   useFilter,
   useListCollection,
 } from '@chakra-ui/react';
-import { Items } from '@tradejs/types';
+import type { Items } from '#app/types/ui';
 
 interface SelectWithSearchProps {
   defaultValue: string[];

package/src/app/lib/backtestJobContracts.ts

@@ -0,0 +1,67 @@
+export type BacktestJobStatus =
+  | 'running'
+  | 'pausing'
+  | 'paused'
+  | 'completed'
+  | 'failed'
+  | 'cancelled';
+
+export type BacktestPeriodMode = 'days' | 'range';
+
+export interface BacktestJobRequest {
+  strategyName: string;
+  configId: string;
+  periodMode: BacktestPeriodMode;
+  days?: number;
+  startTime?: number;
+  endTime?: number;
+  ai: boolean;
+  fast: boolean;
+  interval: string;
+  connector: string;
+  tickers?: string;
+  tickersLimit?: number;
+  testsLimit?: number;
+  parallel?: number;
+}
+
+export interface BacktestJobProgress {
+  completed: number;
+  total: number | null;
+  percent: number;
+  averageProfit: number | null;
+  winRate: number | null;
+  successTests: number | null;
+  errorTests: number | null;
+}
+
+export interface BacktestJobRecord {
+  id: string;
+  userName: string;
+  status: BacktestJobStatus;
+  request: BacktestJobRequest;
+  command: string;
+  args: string[];
+  createdAt: string;
+  updatedAt: string;
+  startedAt?: string;
+  finishedAt?: string;
+  pausedAt?: string;
+  cancelledAt?: string;
+  lastHeartbeatAt?: string;
+  pid?: number;
+  exitCode?: number | null;
+  signal?: NodeJS.Signals | null;
+  runCount: number;
+  progress: BacktestJobProgress;
+  logs: string[];
+  error?: string;
+  pauseReason?: string;
+}
+
+export interface BacktestConfigSummary {
+  id: string;
+  strategyName: string;
+  paramCount: number;
+  combinationCount: number;
+}

package/src/app/lib/backtestJobProgress.ts

@@ -0,0 +1,28 @@
+const stripAnsi = (value: string) =>
+  value.replace(
+    /[\u001b\u009b][[\]()#;?]*(?:(?:(?:[a-zA-Z\d]*(?:;[a-zA-Z\d]*)*)?\u0007)|(?:(?:\d{1,4}(?:;\d{0,4})*)?[\dA-PR-TZcf-nq-uy=><~]))/g,
+    '',
+  );
+
+export const parseBacktestProgressLine = (line: string, offset = 0) => {
+  const text = stripAnsi(line);
+  const progressMatch = text.match(
+    /(\d+)\/(\d+).*?\bavg\s+(-?\d+(?:\.\d+)?)\$\s+win\s+(-?\d+(?:\.\d+)?)%/i,
+  );
+  if (progressMatch) {
+    return {
+      completed: offset + Number(progressMatch[1]),
+      total: offset + Number(progressMatch[2]),
+      averageProfit: Number(progressMatch[3]),
+      winRate: Number(progressMatch[4]),
+    };
+  }
+  const testsMatch = text.match(/\btests:\s*(\d+)\b/i);
+  if (testsMatch) return { total: offset + Number(testsMatch[1]) };
+  const successMatch = text.match(/\bSUCCESS TESTS:\s*(\d+)\b/i);
+  if (successMatch) {
+    return { successTests: offset + Number(successMatch[1]) };
+  }
+  const errorMatch = text.match(/\bERRORS:\s*(\d+)\b/i);
+  return errorMatch ? { errorTests: Number(errorMatch[1]) } : null;
+};

package/src/app/lib/backtestJobRequest.ts

@@ -0,0 +1,107 @@
+import type {
+  BacktestJobRequest,
+  BacktestPeriodMode,
+} from './backtestJobContracts';
+
+const DEFAULT_INTERVAL = '15';
+const DEFAULT_CONNECTOR = 'binance';
+const isPlainObject = (value: unknown): value is Record<string, unknown> =>
+  Boolean(value) && typeof value === 'object' && !Array.isArray(value);
+const normalizeText = (value: unknown) =>
+  typeof value === 'string' ? value.trim() : '';
+const toPositiveNumber = (value: unknown) => {
+  const parsed = Number(value);
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : undefined;
+};
+const toPositiveInteger = (value: unknown) => {
+  const parsed = toPositiveNumber(value);
+  return parsed == null ? undefined : Math.trunc(parsed);
+};
+
+export const normalizeBacktestJobRequest = (
+  payload: unknown,
+): BacktestJobRequest => {
+  if (!isPlainObject(payload)) throw new Error('Invalid backtest request');
+  const configId = normalizeText(payload.configId);
+  if (!configId) throw new Error('Backtest config is required');
+  const strategyName =
+    normalizeText(payload.strategyName) || configId.split(':')[0] || configId;
+  const periodMode: BacktestPeriodMode =
+    payload.periodMode === 'range' ? 'range' : 'days';
+  const request: BacktestJobRequest = {
+    strategyName,
+    configId,
+    periodMode,
+    ai: payload.ai === true,
+    fast: payload.fast === true,
+    interval: normalizeText(payload.interval) || DEFAULT_INTERVAL,
+    connector: normalizeText(payload.connector) || DEFAULT_CONNECTOR,
+  };
+  if (periodMode === 'range') {
+    const startTime = toPositiveInteger(payload.startTime);
+    const endTime = toPositiveInteger(payload.endTime);
+    if (!startTime || !endTime || startTime >= endTime) {
+      throw new Error('Valid start and end timestamps are required');
+    }
+    request.startTime = startTime;
+    request.endTime = endTime;
+  } else {
+    request.days = toPositiveNumber(payload.days) ?? 30;
+  }
+
+  const tickers = normalizeText(payload.tickers);
+  const tickersLimit = toPositiveInteger(payload.tickersLimit);
+  const testsLimit = toPositiveInteger(payload.testsLimit);
+  const parallel = toPositiveInteger(payload.parallel);
+  if (tickers) request.tickers = tickers;
+  if (tickersLimit) request.tickersLimit = tickersLimit;
+  if (testsLimit) request.testsLimit = testsLimit;
+  if (parallel) request.parallel = parallel;
+  return request;
+};
+
+export const buildBacktestCommandArgs = ({
+  request,
+  userName,
+  skip = 0,
+}: {
+  request: BacktestJobRequest;
+  userName: string;
+  skip?: number;
+}) => {
+  const args = [
+    'backtest',
+    '--config',
+    request.configId,
+    '--user',
+    userName,
+    '--timeframe',
+    request.interval,
+    '--connector',
+    request.connector,
+    '--progressStep',
+    '1',
+  ];
+  if (request.periodMode === 'range') {
+    args.push(
+      '--startTime',
+      String(request.startTime),
+      '--endTime',
+      String(request.endTime),
+    );
+  } else if (request.days) {
+    args.push('--days', String(request.days));
+  }
+  if (request.ai) args.push('--ai');
+  if (request.fast) args.push('--fast');
+  if (request.tickers) args.push('--tickers', request.tickers);
+  if (request.tickersLimit) {
+    args.push('--tickersLimit', String(request.tickersLimit));
+  }
+  if (request.parallel) args.push('--parallel', String(request.parallel));
+  if (skip > 0) args.push('--skip', String(skip));
+  if (request.testsLimit) {
+    args.push('--tests', String(Math.max(0, request.testsLimit - skip)));
+  }
+  return args;
+};

package/src/app/lib/backtestJobs.ts

@@ -12,81 +12,35 @@ import {
 } from '@tradejs/infra/redis';
 import { logger } from '@tradejs/infra/logger';
 import type { StrategyConfigGrid } from '@tradejs/types';
+import type {
+  BacktestConfigSummary,
+  BacktestJobProgress,
+  BacktestJobRecord,
+  BacktestJobRequest,
+  BacktestJobStatus,
+} from './backtestJobContracts';
+import {
+  buildBacktestCommandArgs,
+  normalizeBacktestJobRequest,
+} from './backtestJobRequest';
+import { parseBacktestProgressLine } from './backtestJobProgress';
+export type {
+  BacktestConfigSummary,
+  BacktestJobProgress,
+  BacktestJobRecord,
+  BacktestJobRequest,
+  BacktestJobStatus,
+  BacktestPeriodMode,
+} from './backtestJobContracts';
+export {
+  buildBacktestCommandArgs,
+  normalizeBacktestJobRequest,
+} from './backtestJobRequest';
+export { parseBacktestProgressLine } from './backtestJobProgress';
 
 const HEARTBEAT_TIMEOUT_MS = 20_000;
 const SWEEP_INTERVAL_MS = 5_000;
 const MAX_LOG_LINES = 220;
-const DEFAULT_INTERVAL = '15';
-const DEFAULT_CONNECTOR = 'binance';
-
-export type BacktestJobStatus =
-  | 'running'
-  | 'pausing'
-  | 'paused'
-  | 'completed'
-  | 'failed'
-  | 'cancelled';
-
-export type BacktestPeriodMode = 'days' | 'range';
-
-export interface BacktestJobRequest {
-  strategyName: string;
-  configId: string;
-  periodMode: BacktestPeriodMode;
-  days?: number;
-  startTime?: number;
-  endTime?: number;
-  ai: boolean;
-  fast: boolean;
-  interval: string;
-  connector: string;
-  tickers?: string;
-  tickersLimit?: number;
-  testsLimit?: number;
-  parallel?: number;
-}
-
-export interface BacktestJobProgress {
-  completed: number;
-  total: number | null;
-  percent: number;
-  averageProfit: number | null;
-  winRate: number | null;
-  successTests: number | null;
-  errorTests: number | null;
-}
-
-export interface BacktestJobRecord {
-  id: string;
-  userName: string;
-  status: BacktestJobStatus;
-  request: BacktestJobRequest;
-  command: string;
-  args: string[];
-  createdAt: string;
-  updatedAt: string;
-  startedAt?: string;
-  finishedAt?: string;
-  pausedAt?: string;
-  cancelledAt?: string;
-  lastHeartbeatAt?: string;
-  pid?: number;
-  exitCode?: number | null;
-  signal?: NodeJS.Signals | null;
-  runCount: number;
-  progress: BacktestJobProgress;
-  logs: string[];
-  error?: string;
-  pauseReason?: string;
-}
-
-export interface BacktestConfigSummary {
-  id: string;
-  strategyName: string;
-  paramCount: number;
-  combinationCount: number;
-}
-
 type BacktestProcessHandle = {
   child: ChildProcess;
   record: BacktestJobRecord;
@@ -136,21 +90,6 @@ const emptyProgress = (): BacktestJobProgress => ({
   errorTests: null,
 });
 
-const toFiniteNumber = (value: unknown): number | null => {
-  const parsed = Number(value);
-  return Number.isFinite(parsed) ? parsed : null;
-};
-
-const toPositiveNumber = (value: unknown): number | undefined => {
-  const parsed = toFiniteNumber(value);
-  return parsed != null && parsed > 0 ? parsed : undefined;
-};
-
-const toPositiveInteger = (value: unknown): number | undefined => {
-  const parsed = toPositiveNumber(value);
-  return parsed == null ? undefined : Math.trunc(parsed);
-};
-
 const normalizeText = (value: unknown) =>
   typeof value === 'string' ? value.trim() : '';
 
@@ -281,47 +220,6 @@ const recalculatePercent = (progress: BacktestJobProgress) => {
   );
 };
 
-export const parseBacktestProgressLine = (line: string, offset = 0) => {
-  const text = stripAnsi(line);
-  const progressMatch = text.match(
-    /(\d+)\/(\d+).*?\bavg\s+(-?\d+(?:\.\d+)?)\$\s+win\s+(-?\d+(?:\.\d+)?)%/i,
-  );
-
-  if (progressMatch) {
-    const completed = Number(progressMatch[1]);
-    const total = Number(progressMatch[2]);
-    return {
-      completed: offset + completed,
-      total: offset + total,
-      averageProfit: Number(progressMatch[3]),
-      winRate: Number(progressMatch[4]),
-    };
-  }
-
-  const testsMatch = text.match(/\btests:\s*(\d+)\b/i);
-  if (testsMatch) {
-    return {
-      total: offset + Number(testsMatch[1]),
-    };
-  }
-
-  const successMatch = text.match(/\bSUCCESS TESTS:\s*(\d+)\b/i);
-  if (successMatch) {
-    return {
-      successTests: offset + Number(successMatch[1]),
-    };
-  }
-
-  const errorMatch = text.match(/\bERRORS:\s*(\d+)\b/i);
-  if (errorMatch) {
-    return {
-      errorTests: Number(errorMatch[1]),
-    };
-  }
-
-  return null;
-};
-
 const applyProgressLine = (
   record: BacktestJobRecord,
   line: string,
@@ -386,136 +284,6 @@ const getLiveRecord = async (userName: string, jobId: string) => {
   return loadJob(userName, jobId);
 };
 
-export const normalizeBacktestJobRequest = (
-  payload: unknown,
-): BacktestJobRequest => {
-  if (!isPlainObject(payload)) {
-    throw new Error('Invalid backtest request');
-  }
-
-  const configId = normalizeText(payload.configId);
-  if (!configId) {
-    throw new Error('Backtest config is required');
-  }
-
-  const derivedStrategyName = configId.split(':')[0] || configId;
-  const strategyName =
-    normalizeText(payload.strategyName) || derivedStrategyName;
-  const periodMode: BacktestPeriodMode =
-    payload.periodMode === 'range' ? 'range' : 'days';
-  const interval = normalizeText(payload.interval) || DEFAULT_INTERVAL;
-  const connector = normalizeText(payload.connector) || DEFAULT_CONNECTOR;
-
-  const request: BacktestJobRequest = {
-    strategyName,
-    configId,
-    periodMode,
-    ai: payload.ai === true,
-    fast: payload.fast === true,
-    interval,
-    connector,
-  };
-
-  if (periodMode === 'range') {
-    const startTime = toPositiveInteger(payload.startTime);
-    const endTime = toPositiveInteger(payload.endTime);
-    if (!startTime || !endTime || startTime >= endTime) {
-      throw new Error('Valid start and end timestamps are required');
-    }
-    request.startTime = startTime;
-    request.endTime = endTime;
-  } else {
-    request.days = toPositiveNumber(payload.days) ?? 30;
-  }
-
-  const tickers = normalizeText(payload.tickers);
-  if (tickers) {
-    request.tickers = tickers;
-  }
-
-  const tickersLimit = toPositiveInteger(payload.tickersLimit);
-  if (tickersLimit) {
-    request.tickersLimit = tickersLimit;
-  }
-
-  const testsLimit = toPositiveInteger(payload.testsLimit);
-  if (testsLimit) {
-    request.testsLimit = testsLimit;
-  }
-
-  const parallel = toPositiveInteger(payload.parallel);
-  if (parallel) {
-    request.parallel = parallel;
-  }
-
-  return request;
-};
-
-export const buildBacktestCommandArgs = ({
-  request,
-  userName,
-  skip = 0,
-}: {
-  request: BacktestJobRequest;
-  userName: string;
-  skip?: number;
-}) => {
-  const args = [
-    'backtest',
-    '--config',
-    request.configId,
-    '--user',
-    userName,
-    '--timeframe',
-    request.interval,
-    '--connector',
-    request.connector,
-    '--progressStep',
-    '1',
-  ];
-
-  if (request.periodMode === 'range') {
-    args.push(
-      '--startTime',
-      String(request.startTime),
-      '--endTime',
-      String(request.endTime),
-    );
-  } else if (request.days) {
-    args.push('--days', String(request.days));
-  }
-
-  if (request.ai) {
-    args.push('--ai');
-  }
-
-  if (request.fast) {
-    args.push('--fast');
-  }
-
-  if (request.tickers) {
-    args.push('--tickers', request.tickers);
-  }
-
-  if (request.tickersLimit) {
-    args.push('--tickersLimit', String(request.tickersLimit));
-  }
-
-  if (request.parallel) {
-    args.push('--parallel', String(request.parallel));
-  }
-
-  if (skip > 0) {
-    args.push('--skip', String(skip));
-  }
-
-  if (request.testsLimit) {
-    args.push('--tests', String(Math.max(0, request.testsLimit - skip)));
-  }
-
-  return args;
-};
-
 const shouldSkipLaunch = (record: BacktestJobRecord, skip: number) =>
   Boolean(record.request.testsLimit && skip >= record.request.testsLimit);