Add auto-trade scheduler with batch locking, commission gross-up, and sync gate
- Auto-trade scheduler fires every 60s; uses Promise.allSettled batch so no new trades fire while any position from the current batch is open
- Commission gross-up: read entryCommission from cash.realizedPnL after fill (fallback 2.5×contracts), grossTarget = target + 2×entryCommission
- Sync gate: TradovateClient.syncComplete flag; scheduler skips tick until every client finishes initial position/balance sync
- Contracts formula changed to Math.ceil so $1500 target = 2 contracts
- Removed all fee caching (perContractFees, recentFills, fillFee handler) from tradovate-class.ts
- Removed firm_fees table, getFirmFees, upsertFirmFee from db.ts
- Deleted instrument-configs API routes; removed Fees UI from firm settings page
- /api/instruments returns full {symbol, enabled}[] objects; dashboard filters to enabled-only for trade selector
- Added auto-trade, debug, orders, settings, and trade API routes
- Instrument selector on dashboard now driven by enabled instruments from DB
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Senofy
co-authored by
Claude Sonnet 4.6
Claude Sonnet 4.6
parent
532c2e2279
commit
b2a1bdd1c3
@@ -0,0 +1,13 @@
|
||||
import { NextResponse } from 'next/server';
|
||||
import { stopScheduler, getSchedulerStatus } from '@/lib/auto-trade';
|
||||
|
||||
/** GET /api/auto-trade — return current scheduler status */
|
||||
export async function GET() {
|
||||
return NextResponse.json(getSchedulerStatus());
|
||||
}
|
||||
|
||||
/** DELETE /api/auto-trade — stop the scheduler */
|
||||
export async function DELETE() {
|
||||
stopScheduler();
|
||||
return NextResponse.json({ ok: true });
|
||||
}
|
||||
@@ -0,0 +1,110 @@
|
||||
import { NextResponse } from 'next/server';
|
||||
import { getClients, resetClients } from '@/lib/clients';
|
||||
import { getFirms } from '@/lib/db';
|
||||
|
||||
export async function GET() {
|
||||
try {
|
||||
const clients = getClients();
|
||||
const firms = getFirms();
|
||||
|
||||
const debug = firms.map((firm) => {
|
||||
const client = clients.get(firm.id);
|
||||
if (!client) return { firmId: firm.id, firmName: firm.name, status: 'no_client' };
|
||||
|
||||
return {
|
||||
firmId: firm.id,
|
||||
firmName: firm.name,
|
||||
status: 'connected',
|
||||
accountCount: client.accountList.length,
|
||||
fetchDaysComplete: (client as any).fetchDaysComplete ?? 'n/a (old instance)',
|
||||
lastFetchErrors: (client as any).lastFetchErrors ?? {},
|
||||
lastFetchRaw: (client as any).lastFetchRaw ?? {},
|
||||
accounts: client.accountList.map((acc) => ({
|
||||
id: acc.id,
|
||||
name: acc.name,
|
||||
cash: client.accountCashBalances[acc.id] ?? null,
|
||||
daysTraded: client.daysTraded[acc.id] ?? '(not set)',
|
||||
dailyPnLEntries: (client.dailyPnL[acc.id] ?? []).length,
|
||||
dailyPnL: client.dailyPnL[acc.id] ?? [],
|
||||
})),
|
||||
recentEntityEvents: client.recentEntityEvents.slice(-3).map((e) => ({
|
||||
ts: new Date(e.ts).toISOString(),
|
||||
entityType: e.entityType,
|
||||
eventType: e.eventType,
|
||||
})),
|
||||
};
|
||||
});
|
||||
|
||||
return NextResponse.json({ ok: true, ts: new Date().toISOString(), firms: debug });
|
||||
} catch (err) {
|
||||
console.error('[GET /api/debug]', err);
|
||||
return NextResponse.json({ error: String(err) }, { status: 500 });
|
||||
}
|
||||
}
|
||||
|
||||
/** POST /api/debug — manually trigger fetchDaysTraded on all clients and return results */
|
||||
export async function POST() {
|
||||
try {
|
||||
const clients = getClients();
|
||||
const firms = getFirms();
|
||||
|
||||
const results = await Promise.all(
|
||||
firms.map(async (firm) => {
|
||||
const client = clients.get(firm.id);
|
||||
if (!client || client.accountList.length === 0) {
|
||||
return { firmId: firm.id, firmName: firm.name, status: 'skipped' };
|
||||
}
|
||||
|
||||
try {
|
||||
await (client as any).fetchDaysTraded();
|
||||
} catch (err) {
|
||||
return { firmId: firm.id, firmName: firm.name, status: 'error', error: String(err) };
|
||||
}
|
||||
|
||||
return {
|
||||
firmId: firm.id,
|
||||
firmName: firm.name,
|
||||
status: 'done',
|
||||
fetchDaysComplete: (client as any).fetchDaysComplete ?? 'n/a',
|
||||
errors: (client as any).lastFetchErrors ?? {},
|
||||
rawSamples: (client as any).lastFetchRaw ?? {},
|
||||
daysTraded: client.daysTraded,
|
||||
dailyPnLCounts: Object.fromEntries(
|
||||
Object.entries(client.dailyPnL).map(([k, v]) => [k, (v as any[]).length])
|
||||
),
|
||||
};
|
||||
})
|
||||
);
|
||||
|
||||
return NextResponse.json({ ok: true, ts: new Date().toISOString(), results });
|
||||
} catch (err) {
|
||||
console.error('[POST /api/debug]', err);
|
||||
return NextResponse.json({ error: String(err) }, { status: 500 });
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* DELETE /api/debug — force-reinitialize all Tradovate clients with fresh instances
|
||||
* Clears the global pool so getClients() recreates everything from DB on next call.
|
||||
*/
|
||||
export async function DELETE() {
|
||||
try {
|
||||
const g = global as any;
|
||||
const oldCount = (g.__tradovateClients as Map<number, any> | undefined)?.size ?? 0;
|
||||
|
||||
// Disconnect all existing WebSocket connections before clearing
|
||||
resetClients();
|
||||
|
||||
// Re-initialize immediately with fresh instances
|
||||
getClients();
|
||||
|
||||
return NextResponse.json({
|
||||
ok: true,
|
||||
message: `Disconnected ${oldCount} old client(s) — fresh instances initializing`,
|
||||
ts: new Date().toISOString(),
|
||||
});
|
||||
} catch (err) {
|
||||
console.error('[DELETE /api/debug]', err);
|
||||
return NextResponse.json({ error: String(err) }, { status: 500 });
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
import { NextRequest, NextResponse } from 'next/server';
|
||||
import { getClients } from '@/lib/clients';
|
||||
import axios from 'axios';
|
||||
|
||||
export async function GET(
|
||||
req: NextRequest,
|
||||
{ params }: { params: Promise<{ id: string }> }
|
||||
) {
|
||||
try {
|
||||
const { id } = await params;
|
||||
const firmId = parseInt(id, 10);
|
||||
const clients = getClients();
|
||||
const client = clients.get(firmId) as any;
|
||||
if (!client) return NextResponse.json({ error: 'Client not found' }, { status: 404 });
|
||||
|
||||
const symbol = req.nextUrl.searchParams.get('symbol') ?? 'NQ';
|
||||
const accessToken = client.accessInfo?.accessToken;
|
||||
if (!accessToken) return NextResponse.json({ error: 'Not authenticated' }, { status: 401 });
|
||||
|
||||
const res = await axios.get(
|
||||
`https://demo.tradovateapi.com/v1/contract/suggest?t=${encodeURIComponent(symbol)}&l=20`,
|
||||
{ headers: { Authorization: `Bearer ${accessToken}` } }
|
||||
);
|
||||
|
||||
return NextResponse.json({
|
||||
symbol,
|
||||
contracts: res.data,
|
||||
recentEntityEvents: client.recentEntityEvents ?? [],
|
||||
});
|
||||
} catch (err: any) {
|
||||
return NextResponse.json({ error: err?.message }, { status: 500 });
|
||||
}
|
||||
}
|
||||
@@ -1,41 +0,0 @@
|
||||
import { NextRequest, NextResponse } from 'next/server';
|
||||
import { upsertFirmInstrumentConfig } from '@/lib/db';
|
||||
|
||||
export async function PUT(
|
||||
req: NextRequest,
|
||||
{ params }: { params: Promise<{ id: string; instrumentId: string }> }
|
||||
) {
|
||||
const { id: idStr, instrumentId: instrIdStr } = await params;
|
||||
const firmId = parseInt(idStr, 10);
|
||||
const instrumentId = parseInt(instrIdStr, 10);
|
||||
|
||||
if (isNaN(firmId) || isNaN(instrumentId)) {
|
||||
return NextResponse.json({ error: 'Invalid id' }, { status: 400 });
|
||||
}
|
||||
|
||||
const body = await req.json() as {
|
||||
allinFee?: number;
|
||||
roundtripFee?: number;
|
||||
banned?: boolean;
|
||||
};
|
||||
|
||||
if (
|
||||
typeof body.allinFee !== 'number' ||
|
||||
typeof body.roundtripFee !== 'number' ||
|
||||
typeof body.banned !== 'boolean'
|
||||
) {
|
||||
return NextResponse.json({ error: 'Invalid body' }, { status: 400 });
|
||||
}
|
||||
|
||||
try {
|
||||
upsertFirmInstrumentConfig(firmId, instrumentId, {
|
||||
allinFee: body.allinFee,
|
||||
roundtripFee: body.roundtripFee,
|
||||
banned: body.banned,
|
||||
});
|
||||
return NextResponse.json({ success: true });
|
||||
} catch (err) {
|
||||
console.error('[PUT /api/firms/:id/instrument-configs/:instrumentId]', err);
|
||||
return NextResponse.json({ error: 'Failed to save config' }, { status: 500 });
|
||||
}
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
import { NextRequest, NextResponse } from 'next/server';
|
||||
import { getFirmFees } from '@/lib/db';
|
||||
|
||||
export async function GET(
|
||||
_req: NextRequest,
|
||||
{ params }: { params: Promise<{ id: string }> }
|
||||
) {
|
||||
const { id: idStr } = await params;
|
||||
const firmId = parseInt(idStr, 10);
|
||||
|
||||
if (isNaN(firmId)) {
|
||||
return NextResponse.json({ error: 'Invalid firm id' }, { status: 400 });
|
||||
}
|
||||
|
||||
try {
|
||||
return NextResponse.json(getFirmFees(firmId));
|
||||
} catch (err) {
|
||||
console.error('[GET /api/firms/:id/instrument-configs]', err);
|
||||
return NextResponse.json({ error: 'Failed to fetch fees' }, { status: 500 });
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
import { NextRequest, NextResponse } from 'next/server';
|
||||
import { getClients } from '@/lib/clients';
|
||||
|
||||
export async function POST(
|
||||
req: NextRequest,
|
||||
{ params }: { params: Promise<{ id: string }> }
|
||||
) {
|
||||
try {
|
||||
const { id } = await params;
|
||||
const firmId = parseInt(id, 10);
|
||||
if (isNaN(firmId)) return NextResponse.json({ error: 'Invalid firm ID' }, { status: 400 });
|
||||
|
||||
const body = await req.json() as {
|
||||
accountId: number;
|
||||
symbol: string; // product name, e.g. "NQ"
|
||||
qty: number;
|
||||
action: 'Buy' | 'Sell';
|
||||
orderType?: 'Market' | 'Limit';
|
||||
price?: number;
|
||||
};
|
||||
|
||||
const { accountId, symbol, qty, action, orderType = 'Market', price } = body;
|
||||
if (!accountId || !symbol || !qty || !action) {
|
||||
return NextResponse.json({ error: 'Missing required fields: accountId, symbol, qty, action' }, { status: 400 });
|
||||
}
|
||||
|
||||
const clients = getClients();
|
||||
const client = clients.get(firmId);
|
||||
if (!client) return NextResponse.json({ error: 'Client not found for firm' }, { status: 404 });
|
||||
|
||||
// 1. Find the front-month contract
|
||||
const contract = await client.findFrontMonthContract(symbol);
|
||||
if (!contract) {
|
||||
return NextResponse.json({ error: `Could not find active front-month contract for ${symbol}` }, { status: 404 });
|
||||
}
|
||||
console.log(`[order] front-month: ${contract.name} (id=${contract.id})`);
|
||||
|
||||
// 2. Place the order — resolves with the fill event (includes commission/fees)
|
||||
const fill = await client.sendOrder(accountId, contract.name, qty, action, orderType, price);
|
||||
console.log(`[order] fill received: price=${fill.price} qty=${fill.qty} commission=$${fill.commission} perContract=$${fill.perContractFee}`);
|
||||
|
||||
return NextResponse.json({ contract: { id: contract.id, name: contract.name }, fill });
|
||||
} catch (err: any) {
|
||||
console.error('[POST /api/firms/[id]/orders]', err);
|
||||
return NextResponse.json({ error: err?.message ?? 'Order failed' }, { status: 500 });
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
import { NextResponse } from 'next/server';
|
||||
import { getInstruments } from '@/lib/db';
|
||||
|
||||
export function GET() {
|
||||
export async function GET() {
|
||||
return NextResponse.json(getInstruments());
|
||||
}
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
import { NextRequest, NextResponse } from 'next/server';
|
||||
import { getSetting, setSetting } from '@/lib/db';
|
||||
|
||||
const VALID_KEYS = ['max_concurrent_accounts'] as const;
|
||||
type SettingKey = typeof VALID_KEYS[number];
|
||||
|
||||
export async function GET() {
|
||||
const result: Record<string, string | null> = {};
|
||||
for (const key of VALID_KEYS) {
|
||||
result[key] = getSetting(key);
|
||||
}
|
||||
return NextResponse.json(result);
|
||||
}
|
||||
|
||||
export async function PATCH(req: NextRequest) {
|
||||
try {
|
||||
const body = await req.json() as Partial<Record<SettingKey, string | number>>;
|
||||
|
||||
for (const key of VALID_KEYS) {
|
||||
if (key in body) {
|
||||
const raw = body[key];
|
||||
if (raw === undefined || raw === null) continue;
|
||||
setSetting(key, String(raw));
|
||||
}
|
||||
}
|
||||
|
||||
return NextResponse.json({ ok: true });
|
||||
} catch (err: any) {
|
||||
return NextResponse.json({ error: err?.message ?? 'Failed to save settings' }, { status: 500 });
|
||||
}
|
||||
}
|
||||
+29
-2
@@ -1,6 +1,14 @@
|
||||
import { NextResponse } from 'next/server';
|
||||
import { getFirms } from '@/lib/db';
|
||||
import { getClients } from '@/lib/clients';
|
||||
import { computeDailyTarget } from '@/lib/trading-logic';
|
||||
import type { AccountConfigRow } from '@/lib/db';
|
||||
|
||||
function getAccountConfig(name: string, accounts: AccountConfigRow[]): AccountConfigRow | undefined {
|
||||
return [...accounts]
|
||||
.sort((a, b) => b.prefix.length - a.prefix.length)
|
||||
.find((a) => name.startsWith(a.prefix));
|
||||
}
|
||||
|
||||
export async function GET() {
|
||||
try {
|
||||
@@ -14,18 +22,37 @@ export async function GET() {
|
||||
}
|
||||
const accounts = client.accountList.map((acc) => {
|
||||
const cash = client.accountCashBalances[acc.id] ?? { amount: 0, realizedPnL: 0 };
|
||||
const dailyPnL: { date: string; pnl: number }[] = client.dailyPnL[acc.id] ?? [];
|
||||
const daysTraded: number = client.daysTraded[acc.id] ?? 0;
|
||||
const totalProfit = dailyPnL.reduce((sum, d) => sum + d.pnl, 0);
|
||||
|
||||
// Determine if today's daily target was hit
|
||||
const cfg = getAccountConfig(acc.name, f.accounts);
|
||||
let targetHit = false;
|
||||
if (cfg) {
|
||||
const target = computeDailyTarget(cfg.profit_target, cfg.consistency, totalProfit, dailyPnL);
|
||||
// Condition 1: profit target already exceeded (target=0), still need days → any activity counts
|
||||
// Condition 2: target > 0 → must have made at least the computed daily target
|
||||
targetHit =
|
||||
// If we are just flipping take any activity as target hit
|
||||
(target.amount === 0 && Math.abs(cash.realizedPnL) > 0 && client.daysTraded[acc.id] <= cfg.min_trading_days) ||
|
||||
(cash.realizedPnL >= target.amount);
|
||||
}
|
||||
|
||||
return {
|
||||
id: acc.id,
|
||||
name: acc.name,
|
||||
active: acc.active,
|
||||
amount: cash.amount,
|
||||
realizedPnL: cash.realizedPnL,
|
||||
daysTraded: client.daysTraded[acc.id] ?? 0,
|
||||
daysTraded,
|
||||
hasPosition: !!client.positions[acc.id],
|
||||
autoLiqThreshold: client.autoLiqThresholds[acc.id] ?? 0,
|
||||
totalProfit,
|
||||
targetHit,
|
||||
};
|
||||
});
|
||||
return { firm: f.name, connected: true, accounts };
|
||||
return { firm: f.name, connected: true, accounts, perContractFees: client.perContractFees };
|
||||
});
|
||||
|
||||
return NextResponse.json(state);
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
import { NextRequest, NextResponse } from 'next/server';
|
||||
import { runTrade, startScheduler } from '@/lib/auto-trade';
|
||||
import { POINT_VALUES } from '@/lib/trading-logic';
|
||||
|
||||
export async function POST(req: NextRequest) {
|
||||
try {
|
||||
const body = await req.json() as { action: 'Buy' | 'Sell'; symbol: string };
|
||||
const { action, symbol } = body;
|
||||
|
||||
if (!action || !symbol) {
|
||||
return NextResponse.json({ error: 'Missing required fields: action, symbol' }, { status: 400 });
|
||||
}
|
||||
|
||||
if (!POINT_VALUES[symbol]) {
|
||||
return NextResponse.json({ error: `Unknown symbol: ${symbol}` }, { status: 400 });
|
||||
}
|
||||
|
||||
// Execute trade immediately for all eligible accounts
|
||||
const results = await runTrade(action, symbol);
|
||||
|
||||
// (Re)start the 60-second scheduler with this action + symbol
|
||||
startScheduler(action, symbol);
|
||||
|
||||
return NextResponse.json(results);
|
||||
} catch (err: any) {
|
||||
console.error('[POST /api/trade]', err);
|
||||
return NextResponse.json({ error: err?.message ?? 'Trade failed' }, { status: 500 });
|
||||
}
|
||||
}
|
||||
@@ -5,13 +5,6 @@ import { useRouter, useParams } from 'next/navigation';
|
||||
|
||||
const SIZE_PRESETS = [5_000, 10_000, 25_000, 50_000, 75_000, 100_000, 150_000];
|
||||
|
||||
interface FirmFee {
|
||||
firmId: number;
|
||||
symbol: string;
|
||||
allinFee: number;
|
||||
roundtripFee: number;
|
||||
}
|
||||
|
||||
interface AccountConfig {
|
||||
id: number;
|
||||
prefix: string;
|
||||
@@ -89,7 +82,6 @@ export default function FirmSettingsPage() {
|
||||
|
||||
const [firmName, setFirmName] = useState('');
|
||||
const [rows, setRows] = useState<RowState[]>([]);
|
||||
const [fees, setFees] = useState<FirmFee[]>([]);
|
||||
const [loadError, setLoadError] = useState('');
|
||||
|
||||
useEffect(() => {
|
||||
@@ -103,11 +95,6 @@ export default function FirmSettingsPage() {
|
||||
setRows(firm.accounts.map(initRow));
|
||||
})
|
||||
.catch(() => setLoadError('Failed to load firm'));
|
||||
|
||||
fetch(`/api/firms/${id}/instrument-configs`)
|
||||
.then((r) => r.json() as Promise<FirmFee[]>)
|
||||
.then(setFees)
|
||||
.catch(() => {});
|
||||
}, [id]);
|
||||
|
||||
const updateRow = (rowId: number, patch: Partial<RowState>) => {
|
||||
@@ -428,37 +415,6 @@ export default function FirmSettingsPage() {
|
||||
</table>
|
||||
</div>
|
||||
|
||||
{/* Fees */}
|
||||
<h2 className="text-sm font-semibold uppercase tracking-wider text-slate-500 mt-8 mb-3">
|
||||
Fees
|
||||
</h2>
|
||||
<div className="bg-white border border-slate-200 rounded-xl overflow-hidden shadow-sm">
|
||||
{fees.length === 0 ? (
|
||||
<div className="px-4 py-8 text-center text-sm text-slate-400 italic">
|
||||
No fees loaded yet
|
||||
</div>
|
||||
) : (
|
||||
<table className="w-full text-sm border-collapse">
|
||||
<thead>
|
||||
<tr className="border-b border-slate-200 bg-slate-50">
|
||||
<th className="px-4 py-3 text-left text-xs font-semibold uppercase tracking-wider text-slate-400">Symbol</th>
|
||||
<th className="px-4 py-3 text-left text-xs font-semibold uppercase tracking-wider text-slate-400">All-In Fee</th>
|
||||
<th className="px-4 py-3 text-left text-xs font-semibold uppercase tracking-wider text-slate-400">Roundtrip Fee</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{fees.map((fee) => (
|
||||
<tr key={fee.symbol} className="border-b border-slate-100 last:border-0">
|
||||
<td className="px-4 py-2.5 font-mono font-semibold text-slate-800">{fee.symbol}</td>
|
||||
<td className="px-4 py-2.5 font-mono text-slate-600">${fee.allinFee.toFixed(4)}</td>
|
||||
<td className="px-4 py-2.5 font-mono text-slate-600">${fee.roundtripFee.toFixed(4)}</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
)}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
+194
-12
@@ -5,6 +5,19 @@ import { useRouter } from 'next/navigation';
|
||||
import Link from 'next/link';
|
||||
import type { FirmConfig, FirmState, AccountState, AccountConfig } from '@/types';
|
||||
|
||||
type SortKey = 'name' | 'balance' | 'dayPnL' | 'daysTraded' | 'target' | 'status';
|
||||
type SortDir = 'asc' | 'desc';
|
||||
|
||||
function statusRank(account: AccountState): number {
|
||||
if (isAccountDead(account)) return 0;
|
||||
if (!account.active) return 1;
|
||||
if (!account.hasPosition) {
|
||||
if (account.targetHit) return 4; // Target Hit — most accomplished
|
||||
return 2; // Flat
|
||||
}
|
||||
return 3; // In Trade
|
||||
}
|
||||
|
||||
function getAccountConfig(name: string, firm: FirmConfig): AccountConfig | undefined {
|
||||
return [...firm.accounts]
|
||||
.sort((a, b) => b.prefix.length - a.prefix.length)
|
||||
@@ -47,6 +60,31 @@ function DetailsIcon() {
|
||||
);
|
||||
}
|
||||
|
||||
function SortHeader({ label, col, sortKey, sortDir, onSort }: {
|
||||
label: string;
|
||||
col: SortKey;
|
||||
sortKey: SortKey | null;
|
||||
sortDir: SortDir;
|
||||
onSort: (col: SortKey) => void;
|
||||
}) {
|
||||
const active = sortKey === col;
|
||||
return (
|
||||
<th
|
||||
className="px-4 py-3 text-left text-xs font-semibold uppercase tracking-wider cursor-pointer select-none transition-colors group"
|
||||
onClick={() => onSort(col)}
|
||||
>
|
||||
<div className="flex items-center gap-1">
|
||||
<span className={active ? 'text-slate-600' : 'text-slate-400 group-hover:text-slate-500'}>
|
||||
{label}
|
||||
</span>
|
||||
<span className={`text-[10px] ${active ? 'text-slate-500' : 'text-slate-300 group-hover:text-slate-400'}`}>
|
||||
{active ? (sortDir === 'asc' ? '↑' : '↓') : '↕'}
|
||||
</span>
|
||||
</div>
|
||||
</th>
|
||||
);
|
||||
}
|
||||
|
||||
function AccountRow({ account, firm, hideDead }: { account: AccountState; firm: FirmConfig; hideDead: boolean }) {
|
||||
const cfg = getAccountConfig(account.name, firm);
|
||||
const dead = isAccountDead(account);
|
||||
@@ -77,10 +115,12 @@ function AccountRow({ account, firm, hideDead }: { account: AccountState; firm:
|
||||
{dead
|
||||
? <span className="inline-block px-2.5 py-0.5 rounded-full text-xs font-semibold bg-slate-800 text-white">Dead</span>
|
||||
: !account.active
|
||||
? <span className="inline-block px-2.5 py-0.5 rounded-full text-xs font-semibold bg-red-100 text-red-700">Inactive</span>
|
||||
? <span className="inline-block px-2.5 py-0.5 rounded-full text-xs font-semibold bg-red-100 text-red-700">Hit DLL</span>
|
||||
: account.hasPosition
|
||||
? <span className="inline-block px-2.5 py-0.5 rounded-full text-xs font-semibold bg-blue-100 text-blue-700">In Trade</span>
|
||||
: <span className="inline-block px-2.5 py-0.5 rounded-full text-xs font-semibold bg-slate-100 text-slate-500">Flat</span>}
|
||||
: account.targetHit
|
||||
? <span className="inline-block px-2.5 py-0.5 rounded-full text-xs font-semibold bg-green-100 text-green-700">Target Hit</span>
|
||||
: <span className="inline-block px-2.5 py-0.5 rounded-full text-xs font-semibold bg-slate-100 text-slate-500">Flat</span>}
|
||||
<Link
|
||||
href={`/accounts/${account.id}`}
|
||||
className="text-slate-400 hover:text-slate-600 hover:bg-slate-200 p-1 rounded-md transition-colors inline-flex"
|
||||
@@ -95,16 +135,35 @@ function AccountRow({ account, firm, hideDead }: { account: AccountState; firm:
|
||||
);
|
||||
}
|
||||
|
||||
function FirmRows({ state, firm, deleteMode, selected, onToggle, hideDead }: {
|
||||
function FirmRows({ state, firm, deleteMode, selected, onToggle, hideDead, sortKey, sortDir }: {
|
||||
state: FirmState;
|
||||
firm: FirmConfig;
|
||||
deleteMode: boolean;
|
||||
selected: boolean;
|
||||
onToggle: () => void;
|
||||
hideDead: boolean;
|
||||
sortKey: SortKey | null;
|
||||
sortDir: SortDir;
|
||||
}) {
|
||||
const [open, setOpen] = useState(true);
|
||||
|
||||
const sortedAccounts = sortKey === null ? state.accounts : [...state.accounts].sort((a, b) => {
|
||||
const dir = sortDir === 'asc' ? 1 : -1;
|
||||
switch (sortKey) {
|
||||
case 'name': return dir * a.name.localeCompare(b.name);
|
||||
case 'balance': return dir * (a.amount - b.amount);
|
||||
case 'dayPnL': return dir * (a.realizedPnL - b.realizedPnL);
|
||||
case 'daysTraded': return dir * (a.daysTraded - b.daysTraded);
|
||||
case 'target': {
|
||||
const at = getAccountConfig(a.name, firm)?.profitTarget ?? 0;
|
||||
const bt = getAccountConfig(b.name, firm)?.profitTarget ?? 0;
|
||||
return dir * (at - bt);
|
||||
}
|
||||
case 'status': return dir * (statusRank(a) - statusRank(b));
|
||||
default: return 0;
|
||||
}
|
||||
});
|
||||
|
||||
return (
|
||||
<>
|
||||
<tr
|
||||
@@ -149,7 +208,7 @@ function FirmRows({ state, firm, deleteMode, selected, onToggle, hideDead }: {
|
||||
</td>
|
||||
</tr>
|
||||
) : (
|
||||
state.accounts.map((acc) => (
|
||||
sortedAccounts.map((acc) => (
|
||||
<AccountRow key={acc.id} account={acc} firm={firm} hideDead={hideDead} />
|
||||
))
|
||||
)
|
||||
@@ -158,6 +217,14 @@ function FirmRows({ state, firm, deleteMode, selected, onToggle, hideDead }: {
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
interface SchedulerStatus {
|
||||
running: boolean;
|
||||
action: 'Buy' | 'Sell';
|
||||
symbol: string;
|
||||
lastRun: string | null;
|
||||
}
|
||||
|
||||
export default function Home() {
|
||||
const router = useRouter();
|
||||
const [config, setConfig] = useState<FirmConfig[]>([]);
|
||||
@@ -165,6 +232,24 @@ export default function Home() {
|
||||
const [deleteMode, setDeleteMode] = useState(false);
|
||||
const [selected, setSelected] = useState<Set<number>>(new Set());
|
||||
const [hideDead, setHideDead] = useState(false);
|
||||
const [sortKey, setSortKey] = useState<SortKey | null>(null);
|
||||
const [sortDir, setSortDir] = useState<SortDir>('asc');
|
||||
|
||||
// Trade controls
|
||||
const [scheduler, setScheduler] = useState<SchedulerStatus>({ running: false, action: 'Buy', symbol: 'NQ', lastRun: null });
|
||||
const [enabledSymbols, setEnabledSymbols] = useState<string[]>([]);
|
||||
const [tradeSymbol, setTradeSymbol] = useState('');
|
||||
const [tradeAction, setTradeAction] = useState<'Buy' | 'Sell'>('Buy');
|
||||
const [tradeLoading, setTradeLoading] = useState(false);
|
||||
|
||||
const handleSort = (col: SortKey) => {
|
||||
if (sortKey === col) {
|
||||
setSortDir((d) => d === 'asc' ? 'desc' : 'asc');
|
||||
} else {
|
||||
setSortKey(col);
|
||||
setSortDir('asc');
|
||||
}
|
||||
};
|
||||
|
||||
const fetchConfig = async () => {
|
||||
try {
|
||||
@@ -178,8 +263,25 @@ export default function Home() {
|
||||
}
|
||||
};
|
||||
|
||||
const fetchScheduler = async () => {
|
||||
try {
|
||||
const res = await fetch('/api/auto-trade');
|
||||
if (res.ok) setScheduler(await res.json());
|
||||
} catch { /* ignore */ }
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
fetch('/api/instruments')
|
||||
.then((r) => r.json() as Promise<{ symbol: string; enabled: boolean }[]>)
|
||||
.then((instruments) => {
|
||||
const syms = instruments.filter((i) => i.enabled).map((i) => i.symbol);
|
||||
setEnabledSymbols(syms);
|
||||
setTradeSymbol((prev) => prev || syms[0] || 'NQ');
|
||||
})
|
||||
.catch(() => {});
|
||||
|
||||
fetchConfig();
|
||||
fetchScheduler();
|
||||
|
||||
const fetchState = async () => {
|
||||
try {
|
||||
@@ -194,10 +296,30 @@ export default function Home() {
|
||||
};
|
||||
|
||||
fetchState();
|
||||
const interval = setInterval(fetchState, 5000);
|
||||
return () => clearInterval(interval);
|
||||
const stateInterval = setInterval(fetchState, 5000);
|
||||
const schedulerInterval = setInterval(fetchScheduler, 5000);
|
||||
return () => { clearInterval(stateInterval); clearInterval(schedulerInterval); };
|
||||
}, []);
|
||||
|
||||
const handleStart = async () => {
|
||||
setTradeLoading(true);
|
||||
try {
|
||||
await fetch('/api/trade', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ action: tradeAction, symbol: tradeSymbol }),
|
||||
});
|
||||
await fetchScheduler();
|
||||
} finally {
|
||||
setTradeLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleStop = async () => {
|
||||
await fetch('/api/auto-trade', { method: 'DELETE' });
|
||||
setScheduler((s) => ({ ...s, running: false, lastRun: null }));
|
||||
};
|
||||
|
||||
// Count dead accounts across all firms for the toggle button label
|
||||
const deadCount = firms.reduce((total, firmState) => {
|
||||
const firmCfg = config.find((c) => c.firm === firmState.firm);
|
||||
@@ -285,16 +407,74 @@ export default function Home() {
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
{/* ── Trade Controls ── */}
|
||||
<div className="bg-white border border-slate-200 rounded-xl px-4 py-3 mb-4 shadow-sm flex items-center gap-3">
|
||||
{scheduler.running ? (
|
||||
<>
|
||||
<span className="w-2 h-2 rounded-full bg-green-500 animate-pulse flex-shrink-0" />
|
||||
<span className="text-sm font-semibold text-green-700">
|
||||
{scheduler.symbol} · {scheduler.action}
|
||||
</span>
|
||||
{scheduler.lastRun && (
|
||||
<span className="text-xs text-slate-400">
|
||||
last run {new Date(scheduler.lastRun).toLocaleTimeString()}
|
||||
</span>
|
||||
)}
|
||||
<button
|
||||
onClick={handleStop}
|
||||
className="ml-auto px-4 py-1.5 bg-red-100 hover:bg-red-200 text-red-700 text-sm font-semibold rounded-lg transition-colors"
|
||||
>
|
||||
■ Stop
|
||||
</button>
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<span className="w-2 h-2 rounded-full bg-slate-300 flex-shrink-0" />
|
||||
<span className="text-sm text-slate-400 font-medium">Idle</span>
|
||||
<div className="flex items-center gap-2 ml-3">
|
||||
<select
|
||||
value={tradeSymbol}
|
||||
onChange={(e) => setTradeSymbol(e.target.value)}
|
||||
className="rounded-lg border border-slate-200 bg-slate-50 px-2.5 py-1.5 text-sm font-mono text-slate-800 focus:outline-none focus:ring-2 focus:ring-blue-500"
|
||||
>
|
||||
{enabledSymbols.map((s) => <option key={s} value={s}>{s}</option>)}
|
||||
</select>
|
||||
<div className="flex rounded-lg border border-slate-200 overflow-hidden text-sm font-semibold">
|
||||
<button
|
||||
onClick={() => setTradeAction('Buy')}
|
||||
className={`px-3 py-1.5 transition-colors ${tradeAction === 'Buy' ? 'bg-green-500 text-white' : 'text-slate-500 hover:bg-slate-50'}`}
|
||||
>
|
||||
Buy
|
||||
</button>
|
||||
<button
|
||||
onClick={() => setTradeAction('Sell')}
|
||||
className={`px-3 py-1.5 transition-colors border-l border-slate-200 ${tradeAction === 'Sell' ? 'bg-red-500 text-white' : 'text-slate-500 hover:bg-slate-50'}`}
|
||||
>
|
||||
Sell
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<button
|
||||
onClick={handleStart}
|
||||
disabled={tradeLoading}
|
||||
className="ml-auto px-4 py-1.5 bg-blue-500 hover:bg-blue-600 disabled:opacity-50 text-white text-sm font-semibold rounded-lg transition-colors"
|
||||
>
|
||||
{tradeLoading ? 'Starting…' : '▶ Start'}
|
||||
</button>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="w-full bg-white border border-slate-200 rounded-xl overflow-hidden shadow-sm">
|
||||
<table className="w-full text-sm border-collapse">
|
||||
<thead>
|
||||
<tr className="border-b border-slate-200 bg-slate-50">
|
||||
<th className="px-4 py-3 text-left text-xs font-semibold uppercase tracking-wider text-slate-400">Account</th>
|
||||
<th className="px-4 py-3 text-left text-xs font-semibold uppercase tracking-wider text-slate-400">Balance</th>
|
||||
<th className="px-4 py-3 text-left text-xs font-semibold uppercase tracking-wider text-slate-400">Day P&L</th>
|
||||
<th className="px-4 py-3 text-left text-xs font-semibold uppercase tracking-wider text-slate-400">Days Traded</th>
|
||||
<th className="px-4 py-3 text-left text-xs font-semibold uppercase tracking-wider text-slate-400">Target</th>
|
||||
<th className="px-4 py-3 text-left text-xs font-semibold uppercase tracking-wider text-slate-400">Status</th>
|
||||
<SortHeader label="Account" col="name" sortKey={sortKey} sortDir={sortDir} onSort={handleSort} />
|
||||
<SortHeader label="Balance" col="balance" sortKey={sortKey} sortDir={sortDir} onSort={handleSort} />
|
||||
<SortHeader label="Day P&L" col="dayPnL" sortKey={sortKey} sortDir={sortDir} onSort={handleSort} />
|
||||
<SortHeader label="Days Traded" col="daysTraded" sortKey={sortKey} sortDir={sortDir} onSort={handleSort} />
|
||||
<SortHeader label="Target" col="target" sortKey={sortKey} sortDir={sortDir} onSort={handleSort} />
|
||||
<SortHeader label="Status" col="status" sortKey={sortKey} sortDir={sortDir} onSort={handleSort} />
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -316,6 +496,8 @@ export default function Home() {
|
||||
selected={selected.has(cfg.id)}
|
||||
onToggle={() => toggleSelected(cfg.id)}
|
||||
hideDead={hideDead}
|
||||
sortKey={sortKey}
|
||||
sortDir={sortDir}
|
||||
/>
|
||||
);
|
||||
})
|
||||
|
||||
@@ -8,13 +8,28 @@ interface Instrument {
|
||||
enabled: boolean;
|
||||
}
|
||||
|
||||
interface AppSettings {
|
||||
max_concurrent_accounts: string | null;
|
||||
}
|
||||
|
||||
export default function SettingsPage() {
|
||||
const [instruments, setInstruments] = useState<Instrument[]>([]);
|
||||
const [maxConcurrent, setMaxConcurrent] = useState<string>('5');
|
||||
const [saving, setSaving] = useState(false);
|
||||
const [saved, setSaved] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
fetch('/api/instruments')
|
||||
.then((r) => r.json())
|
||||
.then(setInstruments);
|
||||
|
||||
fetch('/api/settings')
|
||||
.then((r) => r.json())
|
||||
.then((s: AppSettings) => {
|
||||
if (s.max_concurrent_accounts != null) {
|
||||
setMaxConcurrent(s.max_concurrent_accounts);
|
||||
}
|
||||
});
|
||||
}, []);
|
||||
|
||||
async function toggle(symbol: string, enabled: boolean) {
|
||||
@@ -28,6 +43,19 @@ export default function SettingsPage() {
|
||||
});
|
||||
}
|
||||
|
||||
async function saveSettings() {
|
||||
setSaving(true);
|
||||
setSaved(false);
|
||||
await fetch('/api/settings', {
|
||||
method: 'PATCH',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ max_concurrent_accounts: maxConcurrent }),
|
||||
});
|
||||
setSaving(false);
|
||||
setSaved(true);
|
||||
setTimeout(() => setSaved(false), 2000);
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="min-h-screen bg-slate-50 p-8">
|
||||
<div className="max-w-7xl mx-auto">
|
||||
@@ -42,6 +70,43 @@ export default function SettingsPage() {
|
||||
<h1 className="text-2xl font-bold text-slate-900">Settings</h1>
|
||||
</div>
|
||||
|
||||
{/* ── Trading ── */}
|
||||
<h2 className="text-sm font-semibold uppercase tracking-wider text-slate-500 mb-3">
|
||||
Trading
|
||||
</h2>
|
||||
<div className="bg-white border border-slate-200 rounded-xl shadow-sm mb-8">
|
||||
<div className="flex items-center justify-between px-4 py-3">
|
||||
<div>
|
||||
<p className="text-sm font-medium text-slate-800">Max concurrent accounts</p>
|
||||
<p className="text-xs text-slate-400 mt-0.5">
|
||||
How many accounts trade in parallel per /api/trade call
|
||||
</p>
|
||||
</div>
|
||||
<div className="flex items-center gap-3">
|
||||
<input
|
||||
type="number"
|
||||
min={1}
|
||||
max={500}
|
||||
value={maxConcurrent}
|
||||
onChange={(e) => setMaxConcurrent(e.target.value)}
|
||||
className="w-20 rounded-lg border border-slate-200 bg-slate-50 px-3 py-1.5 text-sm text-right font-mono text-slate-800 focus:outline-none focus:ring-2 focus:ring-blue-500"
|
||||
/>
|
||||
<button
|
||||
onClick={saveSettings}
|
||||
disabled={saving}
|
||||
className={`text-sm px-3 py-1.5 rounded-lg font-medium transition-colors ${
|
||||
saved
|
||||
? 'bg-green-500 text-white'
|
||||
: 'bg-blue-500 hover:bg-blue-600 text-white disabled:opacity-50'
|
||||
}`}
|
||||
>
|
||||
{saved ? 'Saved ✓' : saving ? 'Saving…' : 'Save'}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* ── Instruments ── */}
|
||||
<h2 className="text-sm font-semibold uppercase tracking-wider text-slate-500 mb-3">
|
||||
Instruments
|
||||
</h2>
|
||||
|
||||
Reference in New Issue
Block a user