Instances were started by hand and updated by hand, so they drifted behind master silently. Now: PM2 supervises the dashboard and the clicker, a logon task brings them up, and a 5-minute task pulls, rebuilds and restarts when master moves. Restarting on every push is only safe because the scheduler now survives it. It was pure in-memory state (_global.__autoTrader), so any restart silently stopped automated trading with the dashboard simply showing it as off. It now mirrors running/action/symbol/stopAfterAll to the settings table, and resumeSchedulerIfPersisted() picks it back up from the getClients() bootstrap. No sync-wait was needed there: tick() already skips while a client reports !syncComplete and while any account holds a position. A failed build is never deployed — the build runs before anything restarts, so a broken push leaves the previous build serving. start-all and update-check both warm the app with a request afterwards. That is load-bearing: getClients() is lazily bootstrapped, so until something makes an HTTP request the Tradovate clients, the reporter and the resumed schedule never start. That was already true of manual restarts. Logic lives in Node so a macOS or Linux port only needs an equivalent of install-autostart.ps1. Python deps are hash-guarded, so the common path is one hash and one import with no network, and failure is non-fatal since only the clicker needs them. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
115 lines
4.2 KiB
TypeScript
115 lines
4.2 KiB
TypeScript
import { TradovateClient } from './tradovate-class';
|
|
import { getFirms, getInstruments } from './db';
|
|
import { resolveContracts } from './contract-resolver';
|
|
import { startReporter } from './reporter';
|
|
import { resumeSchedulerIfPersisted } from './auto-trade';
|
|
|
|
// Use global to persist the client pool across HMR reloads in dev mode
|
|
const g = global as typeof globalThis & {
|
|
__tradovateClients?: Map<number, TradovateClient>;
|
|
__tradovateClientsInitialized?: boolean;
|
|
__contractResolverTimer?: ReturnType<typeof setInterval>;
|
|
};
|
|
|
|
function ensureMap(): Map<number, TradovateClient> {
|
|
if (!g.__tradovateClients) {
|
|
g.__tradovateClients = new Map();
|
|
}
|
|
return g.__tradovateClients;
|
|
}
|
|
|
|
export function initClient(id: number, username: string, password: string, firmName: string): TradovateClient {
|
|
const map = ensureMap();
|
|
const client = new TradovateClient(username, password, async () => {
|
|
console.log(`[${firmName}] sync complete — ${client.accountList.length} account(s)`);
|
|
});
|
|
map.set(id, client);
|
|
return client;
|
|
}
|
|
|
|
export function removeClient(id: number): void {
|
|
const client = ensureMap().get(id);
|
|
client?.disconnect();
|
|
ensureMap().delete(id);
|
|
}
|
|
|
|
/** Disconnect all clients and clear the pool so they are recreated on next getClients() call. */
|
|
export function resetClients(): void {
|
|
const map = g.__tradovateClients;
|
|
if (map) {
|
|
for (const client of map.values()) {
|
|
try { client.disconnect(); } catch { /* ignore */ }
|
|
}
|
|
}
|
|
g.__tradovateClients = undefined;
|
|
g.__tradovateClientsInitialized = false;
|
|
}
|
|
|
|
export function getClients(): Map<number, TradovateClient> {
|
|
const map = ensureMap();
|
|
if (!g.__tradovateClientsInitialized) {
|
|
g.__tradovateClientsInitialized = true;
|
|
try {
|
|
const firms = getFirms();
|
|
for (const firm of firms) {
|
|
initClient(firm.id, firm.username, firm.password, firm.name);
|
|
}
|
|
console.log(`[clients] Initialized ${firms.length} Tradovate client(s)`);
|
|
|
|
// Auto-resolve contracts after clients have time to authenticate
|
|
setTimeout(() => triggerContractResolve(), 15_000);
|
|
|
|
// Schedule daily resolve at midnight
|
|
scheduleDailyResolve();
|
|
|
|
// Start master dashboard reporter
|
|
startReporter();
|
|
|
|
// Pick the auto-trade schedule back up if it was running before restart
|
|
resumeSchedulerIfPersisted();
|
|
} catch (err) {
|
|
console.error('[clients] Failed to initialize clients', err);
|
|
}
|
|
}
|
|
return map;
|
|
}
|
|
|
|
// ── Contract auto-resolve ────────────────────────────────────────────────────
|
|
|
|
function triggerContractResolve(): void {
|
|
const map = ensureMap();
|
|
// Find first client with a valid access token
|
|
let accessToken: string | null = null;
|
|
for (const [, c] of map) {
|
|
const token = (c as any).accessInfo?.accessToken;
|
|
if (token) { accessToken = token; break; }
|
|
}
|
|
if (!accessToken) {
|
|
console.log('[contract-resolver] No authenticated client yet — skipping resolve');
|
|
return;
|
|
}
|
|
|
|
const symbols = getInstruments().filter((i) => i.enabled).map((i) => i.symbol);
|
|
console.log(`[contract-resolver] Resolving ${symbols.length} instruments...`);
|
|
resolveContracts(symbols, accessToken)
|
|
.then((results) => {
|
|
const rolled = Object.entries(results).filter(([, v]) => v?.alternative);
|
|
console.log(`[contract-resolver] Done — ${rolled.length} contract(s) rolled via price match`);
|
|
})
|
|
.catch((err) => console.error('[contract-resolver] Resolve failed:', err));
|
|
}
|
|
|
|
function scheduleDailyResolve(): void {
|
|
// Clear any existing timer (HMR safety)
|
|
if (g.__contractResolverTimer) clearInterval(g.__contractResolverTimer);
|
|
|
|
// Check every minute if it's midnight (00:00)
|
|
g.__contractResolverTimer = setInterval(() => {
|
|
const now = new Date();
|
|
if (now.getHours() === 0 && now.getMinutes() === 0) {
|
|
console.log('[contract-resolver] Midnight resolve triggered');
|
|
triggerContractResolve();
|
|
}
|
|
}, 60_000);
|
|
}
|