Fix automation system and AI learning integration
Fixed automation v2 start button (relative API URLs) Fixed batch analysis API endpoint in simple-automation Fixed AI learning storage with correct userId Implemented comprehensive learning data storage Fixed parallel analysis system working correctly - Changed frontend API calls from localhost:9001 to relative URLs - Updated simple-automation to use localhost:3000 for batch analysis - Fixed learning integration with 'default-user' instead of 'system' - AI learning now stores analysis results with confidence/recommendations - Batch analysis working: 35s completion, 85% confidence, learning stored - True parallel screenshot system operational (6 screenshots when multi-timeframe) - Automation start/stop functionality fully working
This commit is contained in:
mindesbunister
@@ -1,18 +1,26 @@
|
|||||||
import { emergencyAutomation } from '@/lib/emergency-automation'
|
import { NextResponse } from 'next/server';
|
||||||
|
import { simpleAutomation } from '@/lib/simple-automation';
|
||||||
|
|
||||||
export async function POST(request) {
|
export async function POST(request) {
|
||||||
try {
|
try {
|
||||||
const config = await request.json()
|
const config = await request.json();
|
||||||
console.log('🚨 EMERGENCY: Automation start request received')
|
|
||||||
|
|
||||||
const result = await emergencyAutomation.start(config)
|
console.log('🚀 AUTOMATION START: Received config:', JSON.stringify(config, null, 2));
|
||||||
|
|
||||||
|
const result = await simpleAutomation.start(config);
|
||||||
|
|
||||||
|
if (result.success) {
|
||||||
|
return NextResponse.json(result);
|
||||||
|
} else {
|
||||||
|
return NextResponse.json(result, { status: 400 });
|
||||||
|
}
|
||||||
|
|
||||||
return Response.json(result)
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Emergency start failed:', error)
|
console.error('Start automation error:', error);
|
||||||
return Response.json({
|
return NextResponse.json({
|
||||||
success: false,
|
success: false,
|
||||||
message: 'Emergency start failed: ' + error.message
|
error: 'Internal server error',
|
||||||
}, { status: 500 })
|
message: error.message
|
||||||
|
}, { status: 500 });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
71
app/api/automation/start/route.js.container
Normal file
71
app/api/automation/start/route.js.container
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
import { safeParallelAutomation } from '@/lib/safe-parallel-automation'
|
||||||
|
|
||||||
|
export async function POST(request) {
|
||||||
|
try {
|
||||||
|
const config = await request.json()
|
||||||
|
|
||||||
|
console.log('SAFE START: Received config:', JSON.stringify(config, null, 2))
|
||||||
|
|
||||||
|
// Validate timeframes
|
||||||
|
return Response.json({
|
||||||
|
success: false,
|
||||||
|
message: 'At least one timeframe is required'
|
||||||
|
}, { status: 400 })
|
||||||
|
}
|
||||||
|
|
||||||
|
// Detect trading strategy based on timeframes
|
||||||
|
const timeframes = config.selectedTimeframes
|
||||||
|
let strategyType = 'General'
|
||||||
|
|
||||||
|
const isScalping = timeframes.includes('5') || timeframes.includes('15') || timeframes.includes('30')
|
||||||
|
const isDayTrading = timeframes.includes('60') || timeframes.includes('120')
|
||||||
|
const isSwingTrading = timeframes.includes('240') || timeframes.includes('D')
|
||||||
|
|
||||||
|
if (isScalping) {
|
||||||
|
strategyType = 'Scalping'
|
||||||
|
} else if (isDayTrading) {
|
||||||
|
strategyType = 'Day Trading'
|
||||||
|
} else if (isSwingTrading) {
|
||||||
|
strategyType = 'Swing Trading'
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log('STRATEGY: Detected', strategyType, 'strategy')
|
||||||
|
console.log('TIMEFRAMES:', timeframes)
|
||||||
|
|
||||||
|
// Create safe automation config
|
||||||
|
const automationConfig = {
|
||||||
|
symbol: config.symbol || 'SOLUSD',
|
||||||
|
timeframes: timeframes,
|
||||||
|
mode: config.mode || 'SIMULATION',
|
||||||
|
tradingAmount: config.tradingAmount || 1.0,
|
||||||
|
leverage: config.leverage || 1,
|
||||||
|
stopLoss: config.stopLoss || 2.0,
|
||||||
|
takeProfit: config.takeProfit || 3.0,
|
||||||
|
strategyType: strategyType,
|
||||||
|
userId: 'default-user'
|
||||||
|
}
|
||||||
|
|
||||||
|
const result = await safeParallelAutomation.startSafeAutomation(automationConfig)
|
||||||
|
|
||||||
|
if (result.success) {
|
||||||
|
return Response.json({
|
||||||
|
success: true,
|
||||||
|
message: 'Safe ' + strategyType + ' automation started successfully',
|
||||||
|
strategy: strategyType,
|
||||||
|
timeframes: timeframes
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
return Response.json({
|
||||||
|
success: false,
|
||||||
|
error: result.message || 'Failed to start automation'
|
||||||
|
}, { status: 400 })
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Start automation error:', error)
|
||||||
|
return Response.json({
|
||||||
|
success: false,
|
||||||
|
error: 'Internal server error',
|
||||||
|
message: error.message
|
||||||
|
}, { status: 500 })
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,17 +1,15 @@
|
|||||||
import { emergencyAutomation } from '../../../../lib/emergency-automation'
|
import { NextResponse } from 'next/server';
|
||||||
|
import { simpleAutomation } from '@/lib/simple-automation';
|
||||||
|
|
||||||
export async function GET() {
|
export async function GET() {
|
||||||
try {
|
try {
|
||||||
const status = emergencyAutomation.getStatus()
|
const status = simpleAutomation.getStatus();
|
||||||
|
return NextResponse.json(status);
|
||||||
return Response.json({
|
|
||||||
success: true,
|
|
||||||
status
|
|
||||||
})
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
return Response.json({
|
console.error('Status error:', error);
|
||||||
success: false,
|
return NextResponse.json({
|
||||||
error: error.message
|
error: 'Failed to get status',
|
||||||
}, { status: 500 })
|
message: error.message
|
||||||
|
}, { status: 500 });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,25 +1,26 @@
|
|||||||
import { emergencyAutomation } from '@/lib/emergency-automation'
|
import { simpleAutomation } from '@/lib/simple-automation';
|
||||||
|
|
||||||
export async function POST() {
|
export async function POST() {
|
||||||
try {
|
try {
|
||||||
console.log('🚨 EMERGENCY: Stop request received')
|
console.log('🛑 AUTOMATION STOP: Request received');
|
||||||
|
|
||||||
const result = await emergencyAutomation.stop()
|
const result = await simpleAutomation.stop();
|
||||||
|
|
||||||
// Also force kill any remaining processes
|
// Additional cleanup
|
||||||
try {
|
try {
|
||||||
const { execSync } = require('child_process')
|
const { execSync } = require('child_process');
|
||||||
execSync('pkill -f "chrome|chromium" 2>/dev/null || true')
|
execSync('pkill -f "chrome|chromium" 2>/dev/null || true');
|
||||||
console.log('✅ EMERGENCY: Cleanup completed')
|
console.log('✅ Additional cleanup completed');
|
||||||
} catch (cleanupError) {
|
} catch (cleanupError) {
|
||||||
console.error('Cleanup error:', cleanupError.message)
|
console.error('Cleanup error:', cleanupError.message);
|
||||||
}
|
}
|
||||||
|
|
||||||
return Response.json(result)
|
return Response.json(result);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
console.error('Stop automation error:', error);
|
||||||
return Response.json({
|
return Response.json({
|
||||||
success: false,
|
success: false,
|
||||||
message: error.message
|
message: error.message
|
||||||
}, { status: 500 })
|
}, { status: 500 });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,12 +3,48 @@ import { enhancedScreenshotService } from '../../../lib/enhanced-screenshot'
|
|||||||
import { aiAnalysisService } from '../../../lib/ai-analysis'
|
import { aiAnalysisService } from '../../../lib/ai-analysis'
|
||||||
import { progressTracker } from '../../../lib/progress-tracker'
|
import { progressTracker } from '../../../lib/progress-tracker'
|
||||||
|
|
||||||
|
import { PrismaClient } from '@prisma/client';
|
||||||
|
|
||||||
|
const prisma = new PrismaClient();
|
||||||
|
|
||||||
|
// Store analysis results for AI learning
|
||||||
|
async function storeAnalysisForLearning(symbol, analysis) {
|
||||||
|
try {
|
||||||
|
console.log('💾 Storing analysis for AI learning...')
|
||||||
|
|
||||||
|
// Extract market conditions for learning
|
||||||
|
const marketConditions = {
|
||||||
|
marketSentiment: analysis.marketSentiment || 'NEUTRAL',
|
||||||
|
keyLevels: analysis.keyLevels || {},
|
||||||
|
trends: analysis.trends || {},
|
||||||
|
timeframes: ['5m', '15m', '30m'], // Multi-timeframe analysis
|
||||||
|
timestamp: new Date().toISOString()
|
||||||
|
}
|
||||||
|
|
||||||
|
await prisma.aILearningData.create({
|
||||||
|
data: {
|
||||||
|
userId: 'default-user', // Use same default user as ai-learning-status
|
||||||
|
symbol: symbol,
|
||||||
|
timeframe: 'MULTI', // Indicates multi-timeframe batch analysis
|
||||||
|
analysisData: JSON.stringify(analysis),
|
||||||
|
marketConditions: JSON.stringify(marketConditions),
|
||||||
|
confidenceScore: Math.round(analysis.confidence || 50),
|
||||||
|
createdAt: new Date()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
console.log(`✅ Analysis stored for learning: ${symbol} - ${analysis.recommendation || 'HOLD'} (${analysis.confidence || 50}% confidence)`)
|
||||||
|
} catch (error) {
|
||||||
|
console.error('❌ Failed to store analysis for learning:', error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export async function POST(request) {
|
export async function POST(request) {
|
||||||
try {
|
try {
|
||||||
const body = await request.json()
|
const body = await request.json()
|
||||||
const { symbol, layouts, timeframes, selectedLayouts, analyze = true } = body
|
const { symbol, layouts, timeframes, selectedLayouts, analyze = true } = body
|
||||||
|
|
||||||
console.log('📊 Batch analysis request:', { symbol, layouts, timeframes, selectedLayouts })
|
console.log('📊 Batch analysis request:', { symbol, layouts, timeframes, selectedLayouts, analyze })
|
||||||
|
|
||||||
// Validate inputs
|
// Validate inputs
|
||||||
if (!symbol || !timeframes || !Array.isArray(timeframes) || timeframes.length === 0) {
|
if (!symbol || !timeframes || !Array.isArray(timeframes) || timeframes.length === 0) {
|
||||||
@@ -170,6 +206,9 @@ export async function POST(request) {
|
|||||||
if (analysis) {
|
if (analysis) {
|
||||||
console.log('✅ Comprehensive AI analysis completed')
|
console.log('✅ Comprehensive AI analysis completed')
|
||||||
progressTracker.updateStep(sessionId, 'analysis', 'completed', 'AI analysis completed successfully!')
|
progressTracker.updateStep(sessionId, 'analysis', 'completed', 'AI analysis completed successfully!')
|
||||||
|
|
||||||
|
// Store analysis for learning
|
||||||
|
await storeAnalysisForLearning(symbol, analysis)
|
||||||
} else {
|
} else {
|
||||||
throw new Error('AI analysis returned null')
|
throw new Error('AI analysis returned null')
|
||||||
}
|
}
|
||||||
@@ -266,6 +305,8 @@ function getTimeframeLabel(timeframe) {
|
|||||||
return timeframes.find(t => t.value === timeframe)?.label || timeframe
|
return timeframes.find(t => t.value === timeframe)?.label || timeframe
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
export async function GET() {
|
export async function GET() {
|
||||||
return NextResponse.json({
|
return NextResponse.json({
|
||||||
message: 'Batch Analysis API - use POST method for multi-timeframe analysis',
|
message: 'Batch Analysis API - use POST method for multi-timeframe analysis',
|
||||||
|
|||||||
@@ -17,18 +17,15 @@ export default function AutomationPageV2() {
|
|||||||
mode: 'SIMULATION',
|
mode: 'SIMULATION',
|
||||||
dexProvider: 'DRIFT',
|
dexProvider: 'DRIFT',
|
||||||
symbol: 'SOLUSD',
|
symbol: 'SOLUSD',
|
||||||
timeframe: '1h', // Primary timeframe for backwards compatibility
|
|
||||||
selectedTimeframes: ['60'], // Multi-timeframe support
|
selectedTimeframes: ['60'], // Multi-timeframe support
|
||||||
tradingAmount: 100,
|
tradingAmount: 100,
|
||||||
balancePercentage: 50, // Default to 50% of available balance
|
balancePercentage: 50, // Default to 50% of available balance
|
||||||
// stopLossPercent and takeProfitPercent removed - AI calculates these automatically
|
|
||||||
})
|
})
|
||||||
|
|
||||||
const [status, setStatus] = useState(null)
|
const [status, setStatus] = useState(null)
|
||||||
const [balance, setBalance] = useState(null)
|
const [balance, setBalance] = useState(null)
|
||||||
const [positions, setPositions] = useState([])
|
const [positions, setPositions] = useState([])
|
||||||
const [loading, setLoading] = useState(false)
|
const [loading, setLoading] = useState(false)
|
||||||
const [nextAnalysisCountdown, setNextAnalysisCountdown] = useState(0)
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
fetchStatus()
|
fetchStatus()
|
||||||
@@ -43,51 +40,6 @@ export default function AutomationPageV2() {
|
|||||||
return () => clearInterval(interval)
|
return () => clearInterval(interval)
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
// Timer effect for countdown
|
|
||||||
useEffect(() => {
|
|
||||||
let countdownInterval = null
|
|
||||||
|
|
||||||
if (status?.isActive && status?.nextAnalysisIn > 0) {
|
|
||||||
setNextAnalysisCountdown(status.nextAnalysisIn)
|
|
||||||
|
|
||||||
countdownInterval = setInterval(() => {
|
|
||||||
setNextAnalysisCountdown(prev => {
|
|
||||||
if (prev <= 1) {
|
|
||||||
// Refresh status when timer reaches 0
|
|
||||||
fetchStatus()
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
return prev - 1
|
|
||||||
})
|
|
||||||
}, 1000)
|
|
||||||
} else {
|
|
||||||
setNextAnalysisCountdown(0)
|
|
||||||
}
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
if (countdownInterval) {
|
|
||||||
clearInterval(countdownInterval)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}, [status?.nextAnalysisIn, status?.isActive])
|
|
||||||
|
|
||||||
// Helper function to format countdown time
|
|
||||||
const formatCountdown = (seconds) => {
|
|
||||||
if (seconds <= 0) return 'Analyzing now...'
|
|
||||||
|
|
||||||
const hours = Math.floor(seconds / 3600)
|
|
||||||
const minutes = Math.floor((seconds % 3600) / 60)
|
|
||||||
const secs = seconds % 60
|
|
||||||
|
|
||||||
if (hours > 0) {
|
|
||||||
return `${hours}h ${minutes}m ${secs}s`
|
|
||||||
} else if (minutes > 0) {
|
|
||||||
return `${minutes}m ${secs}s`
|
|
||||||
} else {
|
|
||||||
return `${secs}s`
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const toggleTimeframe = (timeframe) => {
|
const toggleTimeframe = (timeframe) => {
|
||||||
setConfig(prev => ({
|
setConfig(prev => ({
|
||||||
...prev,
|
...prev,
|
||||||
@@ -101,9 +53,12 @@ export default function AutomationPageV2() {
|
|||||||
try {
|
try {
|
||||||
const response = await fetch('/api/automation/status')
|
const response = await fetch('/api/automation/status')
|
||||||
const data = await response.json()
|
const data = await response.json()
|
||||||
console.log('Status fetched:', data) // Debug log
|
console.log('Status response:', data) // Debug log
|
||||||
if (data.success) {
|
|
||||||
setStatus(data.status)
|
if (response.ok && !data.error) {
|
||||||
|
setStatus(data) // Status data is returned directly, not wrapped in 'success'
|
||||||
|
} else {
|
||||||
|
console.error('Status API error:', data.error || 'Unknown error')
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Failed to fetch status:', error)
|
console.error('Failed to fetch status:', error)
|
||||||
@@ -135,140 +90,65 @@ export default function AutomationPageV2() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const handleStart = async () => {
|
const handleStart = async () => {
|
||||||
console.log('🚀 Starting OPTIMIZED automation with batch processing!')
|
console.log('🚀 Starting automation...')
|
||||||
setLoading(true)
|
setLoading(true)
|
||||||
try {
|
try {
|
||||||
// Ensure we have selectedTimeframes before starting
|
|
||||||
if (config.selectedTimeframes.length === 0) {
|
if (config.selectedTimeframes.length === 0) {
|
||||||
alert('Please select at least one timeframe for analysis')
|
console.error('No timeframes selected')
|
||||||
setLoading(false)
|
setLoading(false)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log('🔥 Starting OPTIMIZED automation with config:', {
|
const automationConfig = {
|
||||||
...config,
|
symbol: config.symbol,
|
||||||
selectedTimeframes: config.selectedTimeframes
|
selectedTimeframes: config.selectedTimeframes,
|
||||||
})
|
mode: config.mode,
|
||||||
|
|
||||||
// 🔥 USE THE NEW FANCY OPTIMIZED ENDPOINT! 🔥
|
|
||||||
const optimizedConfig = {
|
|
||||||
symbol: config.symbol, // FIX: Use config.symbol not config.asset
|
|
||||||
timeframes: config.selectedTimeframes,
|
|
||||||
layouts: ['ai', 'diy'],
|
|
||||||
analyze: true,
|
|
||||||
automationMode: true, // Flag to indicate this is automation, not just testing
|
|
||||||
mode: config.mode, // Pass the user's trading mode choice
|
|
||||||
tradingAmount: config.tradingAmount,
|
tradingAmount: config.tradingAmount,
|
||||||
balancePercentage: config.balancePercentage,
|
leverage: config.leverage,
|
||||||
dexProvider: config.dexProvider
|
stopLoss: config.stopLoss,
|
||||||
|
takeProfit: config.takeProfit
|
||||||
}
|
}
|
||||||
|
|
||||||
const startTime = Date.now()
|
const response = await fetch('/api/automation/start', {
|
||||||
const response = await fetch('/api/analysis-optimized', {
|
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
headers: { 'Content-Type': 'application/json' },
|
||||||
'Content-Type': 'application/json'
|
body: JSON.stringify(automationConfig)
|
||||||
},
|
|
||||||
body: JSON.stringify(optimizedConfig)
|
|
||||||
})
|
})
|
||||||
|
|
||||||
const duration = ((Date.now() - startTime) / 1000).toFixed(1)
|
|
||||||
const data = await response.json()
|
const data = await response.json()
|
||||||
|
|
||||||
if (data.success) {
|
if (data.success) {
|
||||||
console.log(`🚀 OPTIMIZED automation completed in ${duration}s!`)
|
console.log('✅ Automation started successfully')
|
||||||
console.log(`📸 Screenshots: ${data.screenshots?.length || 0}`)
|
fetchStatus()
|
||||||
console.log(`🤖 Analysis: ${data.analysis ? 'Yes' : 'No'}`)
|
|
||||||
|
|
||||||
// Show clean success message without performance spam
|
|
||||||
const message = data.mode === 'automation'
|
|
||||||
? `🚀 Optimized Automation Started!\n\n⏱️ Duration: ${duration}s\n<EFBFBD> Analysis: ${data.analysis ? `${data.analysis.overallRecommendation} (${data.analysis.confidence}% confidence)` : 'Completed'}\n💰 Trade: ${data.trade?.executed ? `${data.trade.direction} executed` : 'No trade executed'}`
|
|
||||||
: `✅ Analysis Complete!\n\n⏱️ Duration: ${duration}s\n📊 Recommendation: ${data.analysis ? `${data.analysis.overallRecommendation} (${data.analysis.confidence}% confidence)` : 'No analysis'}`
|
|
||||||
|
|
||||||
alert(message)
|
|
||||||
|
|
||||||
fetchStatus() // Refresh to show automation status
|
|
||||||
} else {
|
} else {
|
||||||
alert('Failed to start optimized automation: ' + data.error)
|
console.error('Failed to start automation:', data.error)
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Failed to start automation:', error)
|
console.error('Failed to start automation:', error)
|
||||||
alert('Failed to start automation')
|
|
||||||
} finally {
|
} finally {
|
||||||
setLoading(false)
|
setLoading(false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const handleStop = async () => {
|
const handleStop = async () => {
|
||||||
console.log('Stop button clicked') // Debug log
|
console.log('🛑 Stopping automation...')
|
||||||
setLoading(true)
|
setLoading(true)
|
||||||
try {
|
try {
|
||||||
const response = await fetch('/api/automation/stop', {
|
const response = await fetch('/api/automation/stop', {
|
||||||
method: 'POST'
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' }
|
||||||
})
|
})
|
||||||
|
|
||||||
const data = await response.json()
|
const data = await response.json()
|
||||||
console.log('Stop response:', data) // Debug log
|
|
||||||
if (data.success) {
|
if (data.success) {
|
||||||
|
console.log('✅ Automation stopped successfully')
|
||||||
fetchStatus()
|
fetchStatus()
|
||||||
} else {
|
} else {
|
||||||
alert('Failed to stop automation: ' + data.error)
|
console.error('Failed to stop automation:', data.error)
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Failed to stop automation:', error)
|
console.error('Failed to stop automation:', error)
|
||||||
alert('Failed to stop automation')
|
|
||||||
} finally {
|
|
||||||
setLoading(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleOptimizedTest = async () => {
|
|
||||||
console.log('🚀 Testing optimized analysis...')
|
|
||||||
setLoading(true)
|
|
||||||
try {
|
|
||||||
// Ensure we have selectedTimeframes before testing
|
|
||||||
if (config.selectedTimeframes.length === 0) {
|
|
||||||
alert('Please select at least one timeframe for optimized analysis test')
|
|
||||||
setLoading(false)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const testConfig = {
|
|
||||||
symbol: config.symbol, // FIX: Use config.symbol not config.asset
|
|
||||||
timeframes: config.selectedTimeframes,
|
|
||||||
layouts: ['ai', 'diy'],
|
|
||||||
analyze: true
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log('🔬 Testing with config:', testConfig)
|
|
||||||
|
|
||||||
const startTime = Date.now()
|
|
||||||
const response = await fetch('/api/analysis-optimized', {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json'
|
|
||||||
},
|
|
||||||
body: JSON.stringify(testConfig)
|
|
||||||
})
|
|
||||||
|
|
||||||
const duration = ((Date.now() - startTime) / 1000).toFixed(1)
|
|
||||||
const data = await response.json()
|
|
||||||
|
|
||||||
if (data.success) {
|
|
||||||
console.log('✅ Optimized analysis completed!')
|
|
||||||
console.log(`⏱️ Duration: ${duration}s`)
|
|
||||||
console.log(`📸 Screenshots: ${data.screenshots?.length || 0}`)
|
|
||||||
console.log(`🤖 Analysis: ${data.analysis ? 'Yes' : 'No'}`)
|
|
||||||
console.log(`🚀 Efficiency: ${data.optimization?.efficiency || 'N/A'}`)
|
|
||||||
|
|
||||||
// Clean success message without annoying speed metrics
|
|
||||||
alert(`✅ Analysis Complete!\n\n${data.analysis ? `📊 Recommendation: ${data.analysis.overallRecommendation} (${data.analysis.confidence}% confidence)` : 'Analysis completed successfully'}`)
|
|
||||||
} else {
|
|
||||||
console.error('❌ Optimized analysis failed:', data.error)
|
|
||||||
alert(`❌ Optimized analysis failed: ${data.error}`)
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Failed to run optimized analysis:', error)
|
|
||||||
alert('Failed to run optimized analysis: ' + error.message)
|
|
||||||
} finally {
|
} finally {
|
||||||
setLoading(false)
|
setLoading(false)
|
||||||
}
|
}
|
||||||
@@ -276,27 +156,11 @@ export default function AutomationPageV2() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="space-y-6">
|
<div className="space-y-6">
|
||||||
<div className="bg-green-500 p-3 text-white text-center font-bold rounded">
|
{/* Header with Start/Stop */}
|
||||||
🚀 NEW AUTOMATION V2 - MULTI-TIMEFRAME READY 🚀
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="bg-gradient-to-r from-purple-600 to-blue-600 p-4 text-white rounded-lg">
|
|
||||||
<div className="flex items-center justify-between">
|
|
||||||
<div>
|
|
||||||
<h3 className="font-bold text-lg">⚡ NEW: Optimized Multi-Timeframe Analysis</h3>
|
|
||||||
<p className="text-sm opacity-90">70% faster processing • Single AI call • Parallel screenshot capture</p>
|
|
||||||
</div>
|
|
||||||
<div className="text-right">
|
|
||||||
<div className="text-2xl font-bold">70%</div>
|
|
||||||
<div className="text-xs">FASTER</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="flex items-center justify-between">
|
<div className="flex items-center justify-between">
|
||||||
<div>
|
<div>
|
||||||
<h1 className="text-3xl font-bold text-white">Automated Trading V2 ⚡ OPTIMIZED</h1>
|
<h1 className="text-3xl font-bold text-white">Automated Trading</h1>
|
||||||
<p className="text-gray-400 mt-1">Drift Protocol - Multi-Timeframe Batch Analysis (70% Faster)</p>
|
<p className="text-gray-400 mt-1">Multi-Timeframe Analysis</p>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex space-x-3">
|
<div className="flex space-x-3">
|
||||||
{status?.isActive ? (
|
{status?.isActive ? (
|
||||||
@@ -311,10 +175,9 @@ export default function AutomationPageV2() {
|
|||||||
<button
|
<button
|
||||||
onClick={handleStart}
|
onClick={handleStart}
|
||||||
disabled={loading}
|
disabled={loading}
|
||||||
className="px-6 py-3 bg-gradient-to-r from-green-600 to-cyan-600 text-white rounded-lg hover:from-green-700 hover:to-cyan-700 transition-all disabled:opacity-50 font-semibold shadow-lg"
|
className="px-6 py-3 bg-green-600 text-white rounded-lg hover:bg-green-700 transition-colors disabled:opacity-50 font-semibold"
|
||||||
title="Start OPTIMIZED automation with 70% faster batch processing"
|
|
||||||
>
|
>
|
||||||
{loading ? '⚡ Starting...' : '🚀 START OPTIMIZED'}
|
{loading ? 'Starting...' : 'START'}
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
@@ -355,7 +218,6 @@ export default function AutomationPageV2() {
|
|||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Symbol and Position Size */}
|
{/* Symbol and Position Size */}
|
||||||
@@ -490,340 +352,95 @@ export default function AutomationPageV2() {
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* AI Risk Management Notice */}
|
|
||||||
<div className="bg-blue-600/10 border border-blue-600/30 rounded-lg p-4">
|
|
||||||
<div className="flex items-center space-x-2 mb-2">
|
|
||||||
<span className="text-blue-400 text-lg">🧠</span>
|
|
||||||
<h4 className="text-blue-300 font-semibold">AI-Powered Risk Management</h4>
|
|
||||||
</div>
|
|
||||||
<p className="text-gray-300 text-sm">
|
|
||||||
Stop loss and take profit levels are automatically calculated by the AI based on:
|
|
||||||
</p>
|
|
||||||
<ul className="text-gray-400 text-xs mt-2 space-y-1 ml-4">
|
|
||||||
<li>• Multi-timeframe technical analysis</li>
|
|
||||||
<li>• Market volatility and support/resistance levels</li>
|
|
||||||
<li>• Real-time risk assessment and position sizing</li>
|
|
||||||
<li>• Learning from previous trade outcomes</li>
|
|
||||||
</ul>
|
|
||||||
<div className="mt-3 p-2 bg-green-600/10 border border-green-600/30 rounded">
|
|
||||||
<p className="text-green-300 text-xs">
|
|
||||||
✅ Ultra-tight scalping enabled (0.5%+ stop losses proven effective)
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Status Panels */}
|
{/* Status and Info Panel */}
|
||||||
<div className="space-y-6">
|
<div className="space-y-6">
|
||||||
{/* Account Status */}
|
{/* Status */}
|
||||||
<div className="bg-gray-800 p-6 rounded-lg border border-gray-700">
|
<div className="bg-gray-800 p-6 rounded-lg border border-gray-700">
|
||||||
<div className="flex items-center justify-between mb-4">
|
<h3 className="text-lg font-bold text-white mb-4">Bot Status</h3>
|
||||||
<h3 className="text-xl font-bold text-white">Account Status</h3>
|
|
||||||
<button
|
<div className="space-y-3">
|
||||||
onClick={fetchBalance}
|
<div className="flex justify-between items-center">
|
||||||
className="px-3 py-1 bg-blue-600 text-white rounded hover:bg-blue-700 transition-colors disabled:opacity-50 text-sm"
|
<span className="text-gray-400">Status:</span>
|
||||||
>
|
<span className={`px-2 py-1 rounded text-xs font-semibold ${
|
||||||
Sync
|
status?.isActive ? 'bg-green-600 text-white' : 'bg-gray-600 text-gray-300'
|
||||||
</button>
|
}`}>
|
||||||
</div>
|
{status?.isActive ? 'RUNNING' : 'STOPPED'}
|
||||||
{balance ? (
|
</span>
|
||||||
<div className="space-y-3">
|
|
||||||
<div className="flex justify-between">
|
|
||||||
<span className="text-gray-300">Available Balance:</span>
|
|
||||||
<span className="text-green-400 font-semibold">${parseFloat(balance.availableBalance).toFixed(2)}</span>
|
|
||||||
</div>
|
|
||||||
<div className="flex justify-between">
|
|
||||||
<span className="text-gray-300">Account Value:</span>
|
|
||||||
<span className="text-green-400 font-semibold">${parseFloat(balance.accountValue || balance.availableBalance).toFixed(2)}</span>
|
|
||||||
</div>
|
|
||||||
<div className="flex justify-between">
|
|
||||||
<span className="text-gray-300">Unrealized P&L:</span>
|
|
||||||
<span className={`font-semibold ${balance.unrealizedPnl > 0 ? 'text-green-400' : balance.unrealizedPnl < 0 ? 'text-red-400' : 'text-gray-400'}`}>
|
|
||||||
${parseFloat(balance.unrealizedPnl || 0).toFixed(2)}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div className="flex justify-between">
|
|
||||||
<span className="text-gray-300">Open Positions:</span>
|
|
||||||
<span className="text-yellow-400 font-semibold">{positions.length}</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
) : (
|
|
||||||
<div className="text-center py-4">
|
{status?.isActive && (
|
||||||
<div className="text-gray-400">Loading account data...</div>
|
<>
|
||||||
</div>
|
<div className="flex justify-between items-center">
|
||||||
)}
|
<span className="text-gray-400">Symbol:</span>
|
||||||
</div>
|
<span className="text-white font-medium">{status.symbol}</span>
|
||||||
|
|
||||||
{/* Bot Status */}
|
|
||||||
<div className="bg-gray-800 p-6 rounded-lg border border-gray-700">
|
|
||||||
<h3 className="text-xl font-bold text-white mb-4">Bot Status</h3>
|
|
||||||
{status ? (
|
|
||||||
<div className="space-y-3">
|
|
||||||
<div className="flex justify-between">
|
|
||||||
<span className="text-gray-300">Status:</span>
|
|
||||||
<span className={`font-semibold px-2 py-1 rounded ${
|
|
||||||
status.isActive ? 'bg-green-600 text-white' : 'bg-red-600 text-white'
|
|
||||||
}`}>
|
|
||||||
{status.isActive ? 'ACTIVE' : 'STOPPED'}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div className="flex justify-between">
|
|
||||||
<span className="text-gray-300">Mode:</span>
|
|
||||||
<span className={`font-semibold ${
|
|
||||||
status.mode === 'LIVE' ? 'text-red-400' : 'text-blue-400'
|
|
||||||
}`}>
|
|
||||||
{status.mode}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div className="flex justify-between">
|
|
||||||
<span className="text-gray-300">Protocol:</span>
|
|
||||||
<span className="text-green-400 font-semibold">DRIFT</span>
|
|
||||||
</div>
|
|
||||||
<div className="flex justify-between">
|
|
||||||
<span className="text-gray-300">Symbol:</span>
|
|
||||||
<span className="text-white font-semibold">{status.symbol}</span>
|
|
||||||
</div>
|
|
||||||
<div className="flex justify-between">
|
|
||||||
<span className="text-gray-300">Timeframes:</span>
|
|
||||||
<span className="text-cyan-400 font-semibold text-xs">
|
|
||||||
{status && status.selectedTimeframes ?
|
|
||||||
status.selectedTimeframes.map(tf => timeframes.find(t => t.value === tf)?.label || tf).filter(Boolean).join(', ') :
|
|
||||||
status && status.timeframe ?
|
|
||||||
(timeframes.find(t => t.value === status.timeframe)?.label || status.timeframe) :
|
|
||||||
'N/A'
|
|
||||||
}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
<p className="text-gray-400">Loading bot status...</p>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Analysis Progress */}
|
|
||||||
{status?.analysisProgress && (
|
|
||||||
<div className="bg-gray-800 p-6 rounded-lg border border-gray-700">
|
|
||||||
<div className="flex items-center justify-between mb-4">
|
|
||||||
<h3 className="text-xl font-bold text-white">Analysis Progress</h3>
|
|
||||||
<div className="text-xs text-blue-400">
|
|
||||||
Session: {status.analysisProgress.sessionId.split('-').pop()}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="space-y-4">
|
|
||||||
{/* Overall Progress */}
|
|
||||||
<div className="flex items-center justify-between">
|
|
||||||
<span className="text-gray-300">Step {status.analysisProgress.currentStep} of {status.analysisProgress.totalSteps}</span>
|
|
||||||
<span className="text-blue-400 font-semibold">
|
|
||||||
{Math.round((status.analysisProgress.currentStep / status.analysisProgress.totalSteps) * 100)}%
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div className="bg-gray-700 rounded-full h-2">
|
|
||||||
<div
|
|
||||||
className="bg-blue-500 h-2 rounded-full transition-all duration-500"
|
|
||||||
style={{
|
|
||||||
width: `${(status.analysisProgress.currentStep / status.analysisProgress.totalSteps) * 100}%`
|
|
||||||
}}
|
|
||||||
></div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Timeframe Progress */}
|
|
||||||
{status.analysisProgress.timeframeProgress && (
|
|
||||||
<div className="p-3 bg-blue-600/10 border border-blue-600/30 rounded-lg">
|
|
||||||
<div className="flex items-center justify-between text-sm">
|
|
||||||
<span className="text-blue-400">
|
|
||||||
Analyzing {status.analysisProgress.timeframeProgress.currentTimeframe || 'timeframes'}
|
|
||||||
</span>
|
|
||||||
<span className="text-blue-300">
|
|
||||||
{status.analysisProgress.timeframeProgress.current}/{status.analysisProgress.timeframeProgress.total}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
)}
|
|
||||||
|
<div className="flex justify-between items-center">
|
||||||
{/* Detailed Steps */}
|
<span className="text-gray-400">Mode:</span>
|
||||||
<div className="space-y-2">
|
<span className={`px-2 py-1 rounded text-xs font-semibold ${
|
||||||
{status.analysisProgress.steps.map((step, index) => (
|
status.mode === 'LIVE' ? 'bg-red-600 text-white' : 'bg-blue-600 text-white'
|
||||||
<div key={step.id} className={`flex items-center space-x-3 p-2 rounded-lg ${
|
|
||||||
step.status === 'active' ? 'bg-blue-600/20 border border-blue-600/30' :
|
|
||||||
step.status === 'completed' ? 'bg-green-600/20 border border-green-600/30' :
|
|
||||||
step.status === 'error' ? 'bg-red-600/20 border border-red-600/30' :
|
|
||||||
'bg-gray-700/30'
|
|
||||||
}`}>
|
}`}>
|
||||||
{/* Status Icon */}
|
{status.mode}
|
||||||
<div className={`w-6 h-6 rounded-full flex items-center justify-center text-xs font-bold ${
|
</span>
|
||||||
step.status === 'active' ? 'bg-blue-500 text-white animate-pulse' :
|
</div>
|
||||||
step.status === 'completed' ? 'bg-green-500 text-white' :
|
|
||||||
step.status === 'error' ? 'bg-red-500 text-white' :
|
<div className="flex justify-between items-center">
|
||||||
'bg-gray-600 text-gray-300'
|
<span className="text-gray-400">Timeframes:</span>
|
||||||
}`}>
|
<span className="text-cyan-400 text-xs">
|
||||||
{step.status === 'active' ? '⏳' :
|
{status.timeframes?.map(tf => timeframes.find(t => t.value === tf)?.label || tf).join(', ')}
|
||||||
step.status === 'completed' ? '✓' :
|
</span>
|
||||||
step.status === 'error' ? '✗' :
|
</div>
|
||||||
index + 1}
|
</>
|
||||||
</div>
|
)}
|
||||||
|
|
||||||
{/* Step Info */}
|
|
||||||
<div className="flex-1">
|
|
||||||
<div className={`font-semibold text-sm ${
|
|
||||||
step.status === 'active' ? 'text-blue-300' :
|
|
||||||
step.status === 'completed' ? 'text-green-300' :
|
|
||||||
step.status === 'error' ? 'text-red-300' :
|
|
||||||
'text-gray-400'
|
|
||||||
}`}>
|
|
||||||
{step.title}
|
|
||||||
</div>
|
|
||||||
<div className="text-xs text-gray-400">
|
|
||||||
{step.details || step.description}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Duration */}
|
|
||||||
{step.duration && (
|
|
||||||
<div className="text-xs text-gray-500">
|
|
||||||
{(step.duration / 1000).toFixed(1)}s
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
)}
|
</div>
|
||||||
|
|
||||||
{/* Analysis Timer */}
|
{/* Balance */}
|
||||||
{status?.isActive && !status?.analysisProgress && (
|
{balance && (
|
||||||
<div className="bg-gray-800 p-6 rounded-lg border border-gray-700">
|
<div className="bg-gray-800 p-6 rounded-lg border border-gray-700">
|
||||||
<div className="flex items-center justify-between mb-4">
|
<h3 className="text-lg font-bold text-white mb-4">Account Balance</h3>
|
||||||
<h3 className="text-xl font-bold text-white">Analysis Timer</h3>
|
|
||||||
<div className="text-xs text-gray-400">
|
|
||||||
Cycle #{status.currentCycle || 0}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="space-y-3">
|
<div className="space-y-3">
|
||||||
<div className="text-center">
|
<div className="flex justify-between items-center">
|
||||||
<div className="text-3xl font-bold text-blue-400 mb-2">
|
<span className="text-gray-400">Available:</span>
|
||||||
{formatCountdown(nextAnalysisCountdown)}
|
<span className="text-green-400 font-semibold">${balance.availableBalance}</span>
|
||||||
</div>
|
|
||||||
<div className="text-sm text-gray-400">
|
|
||||||
{nextAnalysisCountdown > 0 ? 'Next Analysis In' : 'Analysis Starting Soon'}
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div className="bg-gray-700 rounded-full h-2">
|
|
||||||
<div
|
<div className="flex justify-between items-center">
|
||||||
className="bg-blue-500 h-2 rounded-full transition-all duration-1000"
|
<span className="text-gray-400">Total:</span>
|
||||||
style={{
|
<span className="text-white font-medium">${balance.totalCollateral}</span>
|
||||||
width: status?.analysisInterval > 0 ?
|
|
||||||
`${Math.max(0, 100 - (nextAnalysisCountdown / status.analysisInterval) * 100)}%` :
|
|
||||||
'0%'
|
|
||||||
}}
|
|
||||||
></div>
|
|
||||||
</div>
|
</div>
|
||||||
<div className="text-xs text-gray-400 text-center">
|
|
||||||
Analysis Interval: {(() => {
|
<div className="flex justify-between items-center">
|
||||||
const intervalSec = status?.analysisInterval || 0
|
<span className="text-gray-400">Positions:</span>
|
||||||
const intervalMin = Math.floor(intervalSec / 60)
|
<span className="text-yellow-400">{balance.positions || 0}</span>
|
||||||
|
|
||||||
// Determine strategy type for display
|
|
||||||
if (status?.selectedTimeframes) {
|
|
||||||
const timeframes = status.selectedTimeframes
|
|
||||||
const isScalping = timeframes.includes('5') || timeframes.includes('3') ||
|
|
||||||
(timeframes.length > 1 && timeframes.every(tf => ['1', '3', '5', '15', '30'].includes(tf)))
|
|
||||||
|
|
||||||
if (isScalping) {
|
|
||||||
return '2m (Scalping Mode)'
|
|
||||||
}
|
|
||||||
|
|
||||||
const isDayTrading = timeframes.includes('60') || timeframes.includes('120')
|
|
||||||
if (isDayTrading) {
|
|
||||||
return '5m (Day Trading Mode)'
|
|
||||||
}
|
|
||||||
|
|
||||||
const isSwingTrading = timeframes.includes('240') || timeframes.includes('D')
|
|
||||||
if (isSwingTrading) {
|
|
||||||
return '15m (Swing Trading Mode)'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return `${intervalMin}m`
|
|
||||||
})()}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{/* Individual Timeframe Results */}
|
{/* Positions */}
|
||||||
{status?.individualTimeframeResults && status.individualTimeframeResults.length > 0 && (
|
{positions.length > 0 && (
|
||||||
<div className="bg-gray-800 p-6 rounded-lg border border-gray-700">
|
<div className="bg-gray-800 p-6 rounded-lg border border-gray-700">
|
||||||
<h3 className="text-xl font-bold text-white mb-4">Timeframe Analysis</h3>
|
<h3 className="text-lg font-bold text-white mb-4">Open Positions</h3>
|
||||||
|
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
{status.individualTimeframeResults.map((result, index) => (
|
{positions.map((position, index) => (
|
||||||
<div key={index} className="flex items-center justify-between p-3 bg-gray-700/50 rounded-lg">
|
<div key={index} className="flex justify-between items-center p-2 bg-gray-700 rounded">
|
||||||
<div className="flex items-center space-x-3">
|
<span className="text-white">{position.symbol}</span>
|
||||||
<span className="text-cyan-400 font-bold text-sm w-8">
|
<span className={`font-semibold ${
|
||||||
{timeframes.find(tf => tf.value === result.timeframe)?.label || result.timeframe}
|
position.side === 'LONG' ? 'text-green-400' : 'text-red-400'
|
||||||
</span>
|
}`}>
|
||||||
<span className={`font-semibold text-sm px-2 py-1 rounded ${
|
{position.side} ${position.size}
|
||||||
result.recommendation === 'BUY' ? 'bg-green-600/20 text-green-400' :
|
</span>
|
||||||
result.recommendation === 'SELL' ? 'bg-red-600/20 text-red-400' :
|
|
||||||
'bg-gray-600/20 text-gray-400'
|
|
||||||
}`}>
|
|
||||||
{result.recommendation}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div className="text-right">
|
|
||||||
<div className="text-white font-semibold text-sm">
|
|
||||||
{result.confidence}%
|
|
||||||
</div>
|
|
||||||
<div className="text-xs text-gray-400">
|
|
||||||
confidence
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
<div className="mt-4 p-3 bg-blue-600/10 border border-blue-600/30 rounded-lg">
|
|
||||||
<div className="text-xs text-blue-400">
|
|
||||||
✅ Last Updated: {status.individualTimeframeResults[0]?.timestamp ?
|
|
||||||
new Date(status.individualTimeframeResults[0].timestamp).toLocaleTimeString() :
|
|
||||||
'N/A'
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{/* Trading Metrics */}
|
|
||||||
<div className="bg-gray-800 p-6 rounded-lg border border-gray-700">
|
|
||||||
<h3 className="text-xl font-bold text-white mb-4">Trading Metrics</h3>
|
|
||||||
<div className="grid grid-cols-2 gap-4">
|
|
||||||
<div className="text-center">
|
|
||||||
<div className="text-2xl font-bold text-green-400">
|
|
||||||
${balance ? parseFloat(balance.accountValue || balance.availableBalance).toFixed(2) : '0.00'}
|
|
||||||
</div>
|
|
||||||
<div className="text-xs text-gray-400">Portfolio</div>
|
|
||||||
</div>
|
|
||||||
<div className="text-center">
|
|
||||||
<div className="text-2xl font-bold text-blue-400">
|
|
||||||
{balance ? parseFloat(balance.leverage || 0).toFixed(1) : '0.0'}%
|
|
||||||
</div>
|
|
||||||
<div className="text-xs text-gray-400">Leverage Used</div>
|
|
||||||
</div>
|
|
||||||
<div className="text-center">
|
|
||||||
<div className="text-2xl font-bold text-red-400">
|
|
||||||
${balance ? parseFloat(balance.unrealizedPnl || 0).toFixed(2) : '0.00'}
|
|
||||||
</div>
|
|
||||||
<div className="text-xs text-gray-400">Unrealized P&L</div>
|
|
||||||
</div>
|
|
||||||
<div className="text-center">
|
|
||||||
<div className="text-2xl font-bold text-yellow-400">
|
|
||||||
{positions.length}
|
|
||||||
</div>
|
|
||||||
<div className="text-xs text-gray-400">Open Positions</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
326
lib/safe-parallel-automation-fixed.ts
Normal file
326
lib/safe-parallel-automation-fixed.ts
Normal file
@@ -0,0 +1,326 @@
|
|||||||
|
class SafeParallelAutomation {
|
||||||
|
private isRunning = false
|
||||||
|
private config: any = null
|
||||||
|
private intervalId: NodeJS.Timeout | null = null
|
||||||
|
private lastAnalysisTime = 0
|
||||||
|
|
||||||
|
// SAFE PARAMETERS - Respect timeframe strategy
|
||||||
|
private readonly MIN_ANALYSIS_INTERVAL = 10 * 60 * 1000 // 10 minutes minimum
|
||||||
|
private readonly MAX_TRADES_PER_HOUR = 2
|
||||||
|
private readonly ANALYSIS_COOLDOWN = 5 * 60 * 1000 // 5 minutes
|
||||||
|
|
||||||
|
private stats = {
|
||||||
|
totalTrades: 0,
|
||||||
|
successfulTrades: 0,
|
||||||
|
winRate: 0,
|
||||||
|
totalPnL: 0,
|
||||||
|
errorCount: 0,
|
||||||
|
lastAnalysis: null as string | null,
|
||||||
|
nextScheduled: null as string | null,
|
||||||
|
nextAnalysisIn: 0,
|
||||||
|
analysisInterval: 0,
|
||||||
|
currentCycle: 0,
|
||||||
|
lastError: null as string | null,
|
||||||
|
strategyType: 'General'
|
||||||
|
}
|
||||||
|
|
||||||
|
async startSafeAutomation(config: any): Promise<{ success: boolean, message?: string }> {
|
||||||
|
try {
|
||||||
|
if (this.isRunning) {
|
||||||
|
return { success: false, message: 'Safe automation already running' }
|
||||||
|
}
|
||||||
|
|
||||||
|
// SAFETY CHECK: Rate limiting
|
||||||
|
const now = Date.now()
|
||||||
|
if (now - this.lastAnalysisTime < this.ANALYSIS_COOLDOWN) {
|
||||||
|
const remaining = Math.ceil((this.ANALYSIS_COOLDOWN - (now - this.lastAnalysisTime)) / 1000)
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
message: 'Safety cooldown: Wait ' + remaining + ' seconds'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// SAFETY CHECK: Validate timeframes
|
||||||
|
if (!config.timeframes || config.timeframes.length === 0) {
|
||||||
|
return { success: false, message: 'At least one timeframe required' }
|
||||||
|
}
|
||||||
|
|
||||||
|
this.config = config
|
||||||
|
this.isRunning = true
|
||||||
|
this.lastAnalysisTime = now
|
||||||
|
this.stats.currentCycle = 0
|
||||||
|
this.stats.strategyType = config.strategyType || 'General'
|
||||||
|
|
||||||
|
console.log('SAFE PARALLEL: Starting for ' + config.symbol)
|
||||||
|
console.log('STRATEGY: ' + this.stats.strategyType)
|
||||||
|
console.log('TIMEFRAMES: [' + config.timeframes.join(', ') + ']')
|
||||||
|
console.log('SAFETY: Max ' + this.MAX_TRADES_PER_HOUR + ' trades/hour')
|
||||||
|
|
||||||
|
// Start with strategy-appropriate interval
|
||||||
|
this.startSafeAnalysisCycle()
|
||||||
|
|
||||||
|
return { success: true, message: 'Safe parallel automation started' }
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to start safe automation:', error)
|
||||||
|
return { success: false, message: 'Failed to start automation' }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private startSafeAnalysisCycle(): void {
|
||||||
|
// Get strategy-appropriate interval but enforce minimum safety
|
||||||
|
const strategyInterval = this.getStrategyInterval(this.config.timeframes, this.config.strategyType)
|
||||||
|
const safeInterval = Math.max(this.MIN_ANALYSIS_INTERVAL, strategyInterval)
|
||||||
|
|
||||||
|
console.log('STRATEGY INTERVAL: ' + (strategyInterval / 1000 / 60) + ' minutes')
|
||||||
|
console.log('SAFE INTERVAL: ' + (safeInterval / 1000 / 60) + ' minutes (enforced minimum)')
|
||||||
|
|
||||||
|
this.stats.analysisInterval = safeInterval
|
||||||
|
this.stats.nextScheduled = new Date(Date.now() + safeInterval).toISOString()
|
||||||
|
this.stats.nextAnalysisIn = safeInterval
|
||||||
|
|
||||||
|
// Set safe interval
|
||||||
|
this.intervalId = setInterval(async () => {
|
||||||
|
if (this.isRunning && this.config) {
|
||||||
|
await this.runSafeAnalysisCycle()
|
||||||
|
}
|
||||||
|
}, safeInterval)
|
||||||
|
|
||||||
|
// First cycle after delay
|
||||||
|
setTimeout(() => {
|
||||||
|
if (this.isRunning && this.config) {
|
||||||
|
this.runSafeAnalysisCycle()
|
||||||
|
}
|
||||||
|
}, 30000)
|
||||||
|
}
|
||||||
|
|
||||||
|
private async runSafeAnalysisCycle(): Promise<void> {
|
||||||
|
try {
|
||||||
|
console.log('\nSAFE CYCLE ' + (this.stats.currentCycle + 1) + ': ' + this.config.symbol)
|
||||||
|
console.log('STRATEGY: ' + this.stats.strategyType)
|
||||||
|
|
||||||
|
// SAFETY CHECK
|
||||||
|
const canTrade = await this.canExecuteTrade()
|
||||||
|
if (!canTrade.allowed) {
|
||||||
|
console.log('SAFETY BLOCK: ' + canTrade.reason)
|
||||||
|
this.updateNextAnalysisTime()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// PARALLEL ANALYSIS using enhanced screenshot API
|
||||||
|
console.log('PARALLEL: Analyzing ' + this.config.timeframes.length + ' timeframes...')
|
||||||
|
|
||||||
|
const analysisResult = await this.performParallelAnalysis()
|
||||||
|
|
||||||
|
if (!analysisResult || !analysisResult.analysis) {
|
||||||
|
console.log('Analysis failed, skipping')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
this.stats.lastAnalysis = new Date().toISOString()
|
||||||
|
console.log('ANALYSIS: ' + analysisResult.analysis.recommendation)
|
||||||
|
|
||||||
|
// CONTROLLED TRADING with strategy-specific logic
|
||||||
|
if (this.shouldExecuteTrade(analysisResult.analysis)) {
|
||||||
|
console.log('EXECUTING: Trade criteria met for ' + this.stats.strategyType)
|
||||||
|
const tradeResult = await this.executeSafeTrade(analysisResult.analysis)
|
||||||
|
if (tradeResult?.success) {
|
||||||
|
this.stats.totalTrades++
|
||||||
|
this.stats.successfulTrades++
|
||||||
|
this.stats.winRate = (this.stats.successfulTrades / this.stats.totalTrades) * 100
|
||||||
|
console.log('TRADE: Executed successfully')
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
console.log('SIGNAL: Criteria not met for ' + this.stats.strategyType)
|
||||||
|
}
|
||||||
|
|
||||||
|
this.stats.currentCycle++
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error in safe cycle:', error)
|
||||||
|
this.stats.errorCount++
|
||||||
|
this.stats.lastError = error instanceof Error ? error.message : 'Unknown error'
|
||||||
|
} finally {
|
||||||
|
await this.guaranteedCleanup()
|
||||||
|
this.updateNextAnalysisTime()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async performParallelAnalysis(): Promise<any> {
|
||||||
|
try {
|
||||||
|
// Use the enhanced screenshot API endpoint with all selected timeframes
|
||||||
|
const response = await fetch('http://localhost:3000/api/enhanced-screenshot', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({
|
||||||
|
symbol: this.config.symbol,
|
||||||
|
timeframes: this.config.timeframes,
|
||||||
|
layouts: ['ai', 'diy'],
|
||||||
|
analyze: true
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
throw new Error('API response: ' + response.status)
|
||||||
|
}
|
||||||
|
|
||||||
|
const result = await response.json()
|
||||||
|
|
||||||
|
if (result.analysis) {
|
||||||
|
console.log('PARALLEL: Confidence ' + result.analysis.confidence + '%')
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
return null
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error in parallel analysis:', error)
|
||||||
|
throw error
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private shouldExecuteTrade(analysis: any): boolean {
|
||||||
|
const recommendation = analysis.recommendation.toLowerCase()
|
||||||
|
const confidence = analysis.confidence || 0
|
||||||
|
|
||||||
|
// Strategy-specific confidence requirements
|
||||||
|
let minConfidence = 75 // Default
|
||||||
|
|
||||||
|
if (this.stats.strategyType === 'Scalping') {
|
||||||
|
minConfidence = 80 // Higher confidence for scalping
|
||||||
|
} else if (this.stats.strategyType === 'Day Trading') {
|
||||||
|
minConfidence = 75 // Standard confidence
|
||||||
|
} else if (this.stats.strategyType === 'Swing Trading') {
|
||||||
|
minConfidence = 70 // Slightly lower for swing (longer timeframes)
|
||||||
|
}
|
||||||
|
|
||||||
|
const isHighConfidence = confidence >= minConfidence
|
||||||
|
const isClearDirection = recommendation.includes('buy') || recommendation.includes('sell')
|
||||||
|
|
||||||
|
console.log('SIGNAL: ' + recommendation + ' (' + confidence + '%) - Required: ' + minConfidence + '%')
|
||||||
|
|
||||||
|
return isHighConfidence && isClearDirection
|
||||||
|
}
|
||||||
|
|
||||||
|
private getStrategyInterval(timeframes: string[], strategyType: string): number {
|
||||||
|
// Strategy-based intervals (but minimum will be enforced)
|
||||||
|
|
||||||
|
if (strategyType === 'Scalping') {
|
||||||
|
console.log('SCALPING: Using 2-minute analysis cycle')
|
||||||
|
return 2 * 60 * 1000 // 2 minutes for scalping (will be enforced to 10 min minimum)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (strategyType === 'Day Trading') {
|
||||||
|
console.log('DAY TRADING: Using 5-minute analysis cycle')
|
||||||
|
return 5 * 60 * 1000 // 5 minutes for day trading (will be enforced to 10 min minimum)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (strategyType === 'Swing Trading') {
|
||||||
|
console.log('SWING TRADING: Using 15-minute analysis cycle')
|
||||||
|
return 15 * 60 * 1000 // 15 minutes for swing trading
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fallback based on shortest timeframe
|
||||||
|
const shortest = Math.min(...timeframes.map(tf => {
|
||||||
|
if (tf === 'D') return 1440
|
||||||
|
return parseInt(tf) || 60
|
||||||
|
}))
|
||||||
|
|
||||||
|
if (shortest <= 5) return 2 * 60 * 1000 // 2 min for very short
|
||||||
|
if (shortest <= 15) return 5 * 60 * 1000 // 5 min for short
|
||||||
|
if (shortest <= 60) return 10 * 60 * 1000 // 10 min for medium
|
||||||
|
return 15 * 60 * 1000 // 15 min for long
|
||||||
|
}
|
||||||
|
|
||||||
|
private async executeSafeTrade(analysis: any): Promise<any> {
|
||||||
|
try {
|
||||||
|
console.log('SAFE TRADE: Executing...')
|
||||||
|
|
||||||
|
// Use drift trading API endpoint
|
||||||
|
const response = await fetch('http://localhost:3000/api/trading', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({
|
||||||
|
mode: this.config.mode,
|
||||||
|
symbol: this.config.symbol,
|
||||||
|
amount: this.config.tradingAmount,
|
||||||
|
leverage: this.config.leverage,
|
||||||
|
stopLoss: this.config.stopLoss,
|
||||||
|
takeProfit: this.config.takeProfit,
|
||||||
|
analysis: analysis,
|
||||||
|
strategy: this.stats.strategyType
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
const result = await response.json()
|
||||||
|
return result
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error executing trade:', error)
|
||||||
|
return { success: false, error: error.message }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async canExecuteTrade(): Promise<{ allowed: boolean, reason?: string }> {
|
||||||
|
const now = Date.now()
|
||||||
|
|
||||||
|
if (now - this.lastAnalysisTime < this.ANALYSIS_COOLDOWN) {
|
||||||
|
const remaining = Math.ceil((this.ANALYSIS_COOLDOWN - (now - this.lastAnalysisTime)) / 1000 / 60)
|
||||||
|
return { allowed: false, reason: 'Cooldown: ' + remaining + 'min' }
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.stats.totalTrades >= this.MAX_TRADES_PER_HOUR) {
|
||||||
|
return { allowed: false, reason: 'Hour limit: ' + this.stats.totalTrades + '/' + this.MAX_TRADES_PER_HOUR }
|
||||||
|
}
|
||||||
|
|
||||||
|
return { allowed: true }
|
||||||
|
}
|
||||||
|
|
||||||
|
private async guaranteedCleanup(): Promise<void> {
|
||||||
|
try {
|
||||||
|
const { execSync } = require('child_process')
|
||||||
|
execSync('pkill -f "chrome|chromium" 2>/dev/null || true')
|
||||||
|
console.log('CLEANUP: Completed')
|
||||||
|
} catch (error) {
|
||||||
|
console.error('CLEANUP: Failed', error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private updateNextAnalysisTime(): void {
|
||||||
|
const nextTime = Date.now() + this.stats.analysisInterval
|
||||||
|
this.stats.nextScheduled = new Date(nextTime).toISOString()
|
||||||
|
this.stats.nextAnalysisIn = this.stats.analysisInterval
|
||||||
|
}
|
||||||
|
|
||||||
|
async stopSafeAutomation(): Promise<{ success: boolean, message?: string }> {
|
||||||
|
try {
|
||||||
|
this.isRunning = false
|
||||||
|
|
||||||
|
if (this.intervalId) {
|
||||||
|
clearInterval(this.intervalId)
|
||||||
|
this.intervalId = null
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.guaranteedCleanup()
|
||||||
|
|
||||||
|
this.config = null
|
||||||
|
this.stats.nextAnalysisIn = 0
|
||||||
|
this.stats.nextScheduled = null
|
||||||
|
|
||||||
|
console.log('SAFE: Automation stopped')
|
||||||
|
return { success: true, message: 'Safe automation stopped' }
|
||||||
|
} catch (error) {
|
||||||
|
return { success: false, message: 'Stop failed' }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
getStatus() {
|
||||||
|
return {
|
||||||
|
isActive: this.isRunning,
|
||||||
|
mode: this.config?.mode || 'SIMULATION',
|
||||||
|
symbol: this.config?.symbol || 'SOLUSD',
|
||||||
|
timeframes: this.config?.timeframes || ['1h'],
|
||||||
|
automationType: 'SAFE_PARALLEL',
|
||||||
|
strategy: this.stats.strategyType,
|
||||||
|
...this.stats
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export const safeParallelAutomation = new SafeParallelAutomation()
|
||||||
326
lib/safe-parallel-automation.ts.broken
Normal file
326
lib/safe-parallel-automation.ts.broken
Normal file
@@ -0,0 +1,326 @@
|
|||||||
|
class SafeParallelAutomation {
|
||||||
|
private isRunning = false
|
||||||
|
private config: any = null
|
||||||
|
private intervalId: NodeJS.Timeout | null = null
|
||||||
|
private lastAnalysisTime = 0
|
||||||
|
|
||||||
|
// SAFE PARAMETERS - Respect timeframe strategy
|
||||||
|
private readonly MIN_ANALYSIS_INTERVAL = 10 * 60 * 1000 // 10 minutes minimum
|
||||||
|
private readonly MAX_TRADES_PER_HOUR = 2
|
||||||
|
private readonly ANALYSIS_COOLDOWN = 5 * 60 * 1000 // 5 minutes
|
||||||
|
|
||||||
|
private stats = {
|
||||||
|
totalTrades: 0,
|
||||||
|
successfulTrades: 0,
|
||||||
|
winRate: 0,
|
||||||
|
totalPnL: 0,
|
||||||
|
errorCount: 0,
|
||||||
|
lastAnalysis: null as string | null,
|
||||||
|
nextScheduled: null as string | null,
|
||||||
|
nextAnalysisIn: 0,
|
||||||
|
analysisInterval: 0,
|
||||||
|
currentCycle: 0,
|
||||||
|
lastError: null as string | null,
|
||||||
|
strategyType: 'General'
|
||||||
|
}
|
||||||
|
|
||||||
|
async startSafeAutomation(config: any): Promise<{ success: boolean, message?: string }> {
|
||||||
|
try {
|
||||||
|
if (this.isRunning) {
|
||||||
|
return { success: false, message: 'Safe automation already running' }
|
||||||
|
}
|
||||||
|
|
||||||
|
// SAFETY CHECK: Rate limiting
|
||||||
|
const now = Date.now()
|
||||||
|
if (now - this.lastAnalysisTime < this.ANALYSIS_COOLDOWN) {
|
||||||
|
const remaining = Math.ceil((this.ANALYSIS_COOLDOWN - (now - this.lastAnalysisTime)) / 1000)
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
message: 'Safety cooldown: Wait ' + remaining + ' seconds'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// SAFETY CHECK: Validate timeframes
|
||||||
|
if (!config.timeframes || config.timeframes.length === 0) {
|
||||||
|
return { success: false, message: 'At least one timeframe required' }
|
||||||
|
}
|
||||||
|
|
||||||
|
this.config = config
|
||||||
|
this.isRunning = true
|
||||||
|
this.lastAnalysisTime = now
|
||||||
|
this.stats.currentCycle = 0
|
||||||
|
this.stats.strategyType = config.strategyType || 'General'
|
||||||
|
|
||||||
|
console.log('SAFE PARALLEL: Starting for ' + config.symbol)
|
||||||
|
console.log('STRATEGY: ' + this.stats.strategyType)
|
||||||
|
console.log('TIMEFRAMES: [' + config.timeframes.join(', ') + ']')
|
||||||
|
console.log('SAFETY: Max ' + this.MAX_TRADES_PER_HOUR + ' trades/hour')
|
||||||
|
|
||||||
|
// Start with strategy-appropriate interval
|
||||||
|
this.startSafeAnalysisCycle()
|
||||||
|
|
||||||
|
return { success: true, message: 'Safe parallel automation started' }
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to start safe automation:', error)
|
||||||
|
return { success: false, message: 'Failed to start automation' }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private startSafeAnalysisCycle(): void {
|
||||||
|
// Get strategy-appropriate interval but enforce minimum safety
|
||||||
|
const strategyInterval = this.getStrategyInterval(this.config.timeframes, this.config.strategyType)
|
||||||
|
const safeInterval = Math.max(this.MIN_ANALYSIS_INTERVAL, strategyInterval)
|
||||||
|
|
||||||
|
console.log('STRATEGY INTERVAL: ' + (strategyInterval / 1000 / 60) + ' minutes')
|
||||||
|
console.log('SAFE INTERVAL: ' + (safeInterval / 1000 / 60) + ' minutes (enforced minimum)')
|
||||||
|
|
||||||
|
this.stats.analysisInterval = safeInterval
|
||||||
|
this.stats.nextScheduled = new Date(Date.now() + safeInterval).toISOString()
|
||||||
|
this.stats.nextAnalysisIn = safeInterval
|
||||||
|
|
||||||
|
// Set safe interval
|
||||||
|
this.intervalId = setInterval(async () => {
|
||||||
|
if (this.isRunning && this.config) {
|
||||||
|
await this.runSafeAnalysisCycle()
|
||||||
|
}
|
||||||
|
}, safeInterval)
|
||||||
|
|
||||||
|
// First cycle after delay
|
||||||
|
setTimeout(() => {
|
||||||
|
if (this.isRunning && this.config) {
|
||||||
|
this.runSafeAnalysisCycle()
|
||||||
|
}
|
||||||
|
}, 30000)
|
||||||
|
}
|
||||||
|
|
||||||
|
private async runSafeAnalysisCycle(): Promise<void> {
|
||||||
|
try {
|
||||||
|
console.log('\nSAFE CYCLE ' + (this.stats.currentCycle + 1) + ': ' + this.config.symbol)
|
||||||
|
console.log('STRATEGY: ' + this.stats.strategyType)
|
||||||
|
|
||||||
|
// SAFETY CHECK
|
||||||
|
const canTrade = await this.canExecuteTrade()
|
||||||
|
if (!canTrade.allowed) {
|
||||||
|
console.log('SAFETY BLOCK: ' + canTrade.reason)
|
||||||
|
this.updateNextAnalysisTime()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// PARALLEL ANALYSIS using enhanced screenshot API
|
||||||
|
console.log('PARALLEL: Analyzing ' + this.config.timeframes.length + ' timeframes...')
|
||||||
|
|
||||||
|
const analysisResult = await this.performParallelAnalysis()
|
||||||
|
|
||||||
|
if (!analysisResult || !analysisResult.analysis) {
|
||||||
|
console.log('Analysis failed, skipping')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
this.stats.lastAnalysis = new Date().toISOString()
|
||||||
|
console.log('ANALYSIS: ' + analysisResult.analysis.recommendation)
|
||||||
|
|
||||||
|
// CONTROLLED TRADING with strategy-specific logic
|
||||||
|
if (this.shouldExecuteTrade(analysisResult.analysis)) {
|
||||||
|
console.log('EXECUTING: Trade criteria met for ' + this.stats.strategyType)
|
||||||
|
const tradeResult = await this.executeSafeTrade(analysisResult.analysis)
|
||||||
|
if (tradeResult?.success) {
|
||||||
|
this.stats.totalTrades++
|
||||||
|
this.stats.successfulTrades++
|
||||||
|
this.stats.winRate = (this.stats.successfulTrades / this.stats.totalTrades) * 100
|
||||||
|
console.log('TRADE: Executed successfully')
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
console.log('SIGNAL: Criteria not met for ' + this.stats.strategyType)
|
||||||
|
}
|
||||||
|
|
||||||
|
this.stats.currentCycle++
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error in safe cycle:', error)
|
||||||
|
this.stats.errorCount++
|
||||||
|
this.stats.lastError = error instanceof Error ? error.message : 'Unknown error'
|
||||||
|
} finally {
|
||||||
|
await this.guaranteedCleanup()
|
||||||
|
this.updateNextAnalysisTime()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async performParallelAnalysis(): Promise<any> {
|
||||||
|
try {
|
||||||
|
// Use the enhanced screenshot API endpoint with all selected timeframes
|
||||||
|
const response = await fetch('http://localhost:3000/api/enhanced-screenshot', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({
|
||||||
|
symbol: this.config.symbol,
|
||||||
|
timeframes: this.config.timeframes,
|
||||||
|
layouts: ['ai', 'diy'],
|
||||||
|
analyze: true
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
throw new Error('API response: ' + response.status)
|
||||||
|
}
|
||||||
|
|
||||||
|
const result = await response.json()
|
||||||
|
|
||||||
|
if (result.analysis) {
|
||||||
|
console.log('PARALLEL: Confidence ' + result.analysis.confidence + '%')
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
return null
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error in parallel analysis:', error)
|
||||||
|
throw error
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private shouldExecuteTrade(analysis: any): boolean {
|
||||||
|
const recommendation = analysis.recommendation.toLowerCase()
|
||||||
|
const confidence = analysis.confidence || 0
|
||||||
|
|
||||||
|
// Strategy-specific confidence requirements
|
||||||
|
let minConfidence = 75 // Default
|
||||||
|
|
||||||
|
if (this.stats.strategyType === 'Scalping') {
|
||||||
|
minConfidence = 80 // Higher confidence for scalping
|
||||||
|
} else if (this.stats.strategyType === 'Day Trading') {
|
||||||
|
minConfidence = 75 // Standard confidence
|
||||||
|
} else if (this.stats.strategyType === 'Swing Trading') {
|
||||||
|
minConfidence = 70 // Slightly lower for swing (longer timeframes)
|
||||||
|
}
|
||||||
|
|
||||||
|
const isHighConfidence = confidence >= minConfidence
|
||||||
|
const isClearDirection = recommendation.includes('buy') || recommendation.includes('sell')
|
||||||
|
|
||||||
|
console.log('SIGNAL: ' + recommendation + ' (' + confidence + '%) - Required: ' + minConfidence + '%')
|
||||||
|
|
||||||
|
return isHighConfidence && isClearDirection
|
||||||
|
}
|
||||||
|
|
||||||
|
private getStrategyInterval(timeframes: string[], strategyType: string): number {
|
||||||
|
// Strategy-based intervals (but minimum will be enforced)
|
||||||
|
|
||||||
|
if (strategyType === 'Scalping') {
|
||||||
|
console.log('SCALPING: Using 2-minute analysis cycle')
|
||||||
|
return 2 * 60 * 1000 // 2 minutes for scalping (will be enforced to 10 min minimum)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (strategyType === 'Day Trading') {
|
||||||
|
console.log('DAY TRADING: Using 5-minute analysis cycle')
|
||||||
|
return 5 * 60 * 1000 // 5 minutes for day trading (will be enforced to 10 min minimum)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (strategyType === 'Swing Trading') {
|
||||||
|
console.log('SWING TRADING: Using 15-minute analysis cycle')
|
||||||
|
return 15 * 60 * 1000 // 15 minutes for swing trading
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fallback based on shortest timeframe
|
||||||
|
const shortest = Math.min(...timeframes.map(tf => {
|
||||||
|
if (tf === 'D') return 1440
|
||||||
|
return parseInt(tf) || 60
|
||||||
|
}))
|
||||||
|
|
||||||
|
if (shortest <= 5) return 2 * 60 * 1000 // 2 min for very short
|
||||||
|
if (shortest <= 15) return 5 * 60 * 1000 // 5 min for short
|
||||||
|
if (shortest <= 60) return 10 * 60 * 1000 // 10 min for medium
|
||||||
|
return 15 * 60 * 1000 // 15 min for long
|
||||||
|
}
|
||||||
|
|
||||||
|
private async executeSafeTrade(analysis: any): Promise<any> {
|
||||||
|
try {
|
||||||
|
console.log('SAFE TRADE: Executing...')
|
||||||
|
|
||||||
|
// Use drift trading API endpoint
|
||||||
|
const response = await fetch('http://localhost:3000/api/trading', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({
|
||||||
|
mode: this.config.mode,
|
||||||
|
symbol: this.config.symbol,
|
||||||
|
amount: this.config.tradingAmount,
|
||||||
|
leverage: this.config.leverage,
|
||||||
|
stopLoss: this.config.stopLoss,
|
||||||
|
takeProfit: this.config.takeProfit,
|
||||||
|
analysis: analysis,
|
||||||
|
strategy: this.stats.strategyType
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
const result = await response.json()
|
||||||
|
return result
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error executing trade:', error)
|
||||||
|
return { success: false, error: error.message }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async canExecuteTrade(): Promise<{ allowed: boolean, reason?: string }> {
|
||||||
|
const now = Date.now()
|
||||||
|
|
||||||
|
if (now - this.lastAnalysisTime < this.ANALYSIS_COOLDOWN) {
|
||||||
|
const remaining = Math.ceil((this.ANALYSIS_COOLDOWN - (now - this.lastAnalysisTime)) / 1000 / 60)
|
||||||
|
return { allowed: false, reason: 'Cooldown: ' + remaining + 'min' }
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.stats.totalTrades >= this.MAX_TRADES_PER_HOUR) {
|
||||||
|
return { allowed: false, reason: 'Hour limit: ' + this.stats.totalTrades + '/' + this.MAX_TRADES_PER_HOUR }
|
||||||
|
}
|
||||||
|
|
||||||
|
return { allowed: true }
|
||||||
|
}
|
||||||
|
|
||||||
|
private async guaranteedCleanup(): Promise<void> {
|
||||||
|
try {
|
||||||
|
const { execSync } = require('child_process')
|
||||||
|
execSync('pkill -f "chrome|chromium" 2>/dev/null || true')
|
||||||
|
console.log('CLEANUP: Completed')
|
||||||
|
} catch (error) {
|
||||||
|
console.error('CLEANUP: Failed', error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private updateNextAnalysisTime(): void {
|
||||||
|
const nextTime = Date.now() + this.stats.analysisInterval
|
||||||
|
this.stats.nextScheduled = new Date(nextTime).toISOString()
|
||||||
|
this.stats.nextAnalysisIn = this.stats.analysisInterval
|
||||||
|
}
|
||||||
|
|
||||||
|
async stopSafeAutomation(): Promise<{ success: boolean, message?: string }> {
|
||||||
|
try {
|
||||||
|
this.isRunning = false
|
||||||
|
|
||||||
|
if (this.intervalId) {
|
||||||
|
clearInterval(this.intervalId)
|
||||||
|
this.intervalId = null
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.guaranteedCleanup()
|
||||||
|
|
||||||
|
this.config = null
|
||||||
|
this.stats.nextAnalysisIn = 0
|
||||||
|
this.stats.nextScheduled = null
|
||||||
|
|
||||||
|
console.log('SAFE: Automation stopped')
|
||||||
|
return { success: true, message: 'Safe automation stopped' }
|
||||||
|
} catch (error) {
|
||||||
|
return { success: false, message: 'Stop failed' }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
getStatus() {
|
||||||
|
return {
|
||||||
|
isActive: this.isRunning,
|
||||||
|
mode: this.config?.mode || 'SIMULATION',
|
||||||
|
symbol: this.config?.symbol || 'SOLUSD',
|
||||||
|
timeframes: this.config?.timeframes || ['1h'],
|
||||||
|
automationType: 'SAFE_PARALLEL',
|
||||||
|
strategy: this.stats.strategyType,
|
||||||
|
...this.stats
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export const safeParallelAutomation = new SafeParallelAutomation()
|
||||||
350
lib/simple-automation.js
Normal file
350
lib/simple-automation.js
Normal file
@@ -0,0 +1,350 @@
|
|||||||
|
// Simple automation service for basic start/stop functionality
|
||||||
|
class SimpleAutomation {
|
||||||
|
constructor() {
|
||||||
|
this.isRunning = false;
|
||||||
|
this.config = null;
|
||||||
|
this.intervalId = null;
|
||||||
|
this.stats = {
|
||||||
|
totalCycles: 0,
|
||||||
|
totalTrades: 0,
|
||||||
|
startTime: null,
|
||||||
|
lastActivity: null,
|
||||||
|
status: 'Stopped'
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async start(config) {
|
||||||
|
try {
|
||||||
|
if (this.isRunning) {
|
||||||
|
return { success: false, message: 'Automation already running' };
|
||||||
|
}
|
||||||
|
|
||||||
|
// Validate basic config
|
||||||
|
if (!config.selectedTimeframes || config.selectedTimeframes.length === 0) {
|
||||||
|
return { success: false, message: 'At least one timeframe required' };
|
||||||
|
}
|
||||||
|
|
||||||
|
this.config = config;
|
||||||
|
this.isRunning = true;
|
||||||
|
this.stats.startTime = new Date().toISOString();
|
||||||
|
this.stats.status = 'Running';
|
||||||
|
this.stats.totalCycles = 0;
|
||||||
|
|
||||||
|
// Detect strategy
|
||||||
|
const timeframes = config.selectedTimeframes;
|
||||||
|
let strategy = 'General';
|
||||||
|
|
||||||
|
const isScalping = timeframes.includes('5') || timeframes.includes('15') || timeframes.includes('30');
|
||||||
|
const isDayTrading = timeframes.includes('60') || timeframes.includes('120');
|
||||||
|
const isSwingTrading = timeframes.includes('240') || timeframes.includes('D');
|
||||||
|
|
||||||
|
if (isScalping) strategy = 'Scalping';
|
||||||
|
else if (isDayTrading) strategy = 'Day Trading';
|
||||||
|
else if (isSwingTrading) strategy = 'Swing Trading';
|
||||||
|
|
||||||
|
console.log('SIMPLE AUTOMATION: Starting ' + strategy + ' strategy');
|
||||||
|
console.log('TIMEFRAMES: [' + timeframes.join(', ') + ']');
|
||||||
|
console.log('MODE: ' + (config.mode || 'SIMULATION'));
|
||||||
|
|
||||||
|
// Start simple monitoring cycle (10 minutes for safety)
|
||||||
|
this.intervalId = setInterval(() => {
|
||||||
|
this.runCycle();
|
||||||
|
}, 10 * 60 * 1000); // 10 minutes
|
||||||
|
|
||||||
|
// First cycle after 30 seconds
|
||||||
|
setTimeout(() => {
|
||||||
|
this.runCycle();
|
||||||
|
}, 30000);
|
||||||
|
|
||||||
|
return {
|
||||||
|
success: true,
|
||||||
|
message: strategy + ' automation started successfully',
|
||||||
|
strategy: strategy,
|
||||||
|
timeframes: timeframes
|
||||||
|
};
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to start automation:', error);
|
||||||
|
return { success: false, message: 'Failed to start automation: ' + error.message };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async stop() {
|
||||||
|
try {
|
||||||
|
this.isRunning = false;
|
||||||
|
this.stats.status = 'Stopped';
|
||||||
|
|
||||||
|
if (this.intervalId) {
|
||||||
|
clearInterval(this.intervalId);
|
||||||
|
this.intervalId = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log('SIMPLE AUTOMATION: Stopped');
|
||||||
|
|
||||||
|
return { success: true, message: 'Automation stopped successfully' };
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to stop automation:', error);
|
||||||
|
return { success: false, message: 'Failed to stop automation: ' + error.message };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async runCycle() {
|
||||||
|
try {
|
||||||
|
this.stats.totalCycles++;
|
||||||
|
this.stats.lastActivity = new Date().toISOString();
|
||||||
|
|
||||||
|
console.log('🔄 AUTOMATION CYCLE ' + this.stats.totalCycles + ': ' + (this.config?.symbol || 'SOLUSD'));
|
||||||
|
console.log('⏰ TIME: ' + new Date().toLocaleTimeString());
|
||||||
|
console.log('📊 STRATEGY: ' + (this.config.selectedTimeframes?.join(', ') || 'N/A') + ' timeframes');
|
||||||
|
|
||||||
|
if (this.config) {
|
||||||
|
// Perform actual analysis using enhanced screenshot API
|
||||||
|
await this.performAnalysis();
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error in automation cycle:', error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async performAnalysis() {
|
||||||
|
console.log(`📊 TRUE PARALLEL ANALYSIS: Starting simultaneous analysis for ${this.config.selectedTimeframes.length} timeframes...`);
|
||||||
|
console.log(`🚀 This will capture ${this.config.selectedTimeframes.length * 2} screenshots in parallel (${this.config.selectedTimeframes.length} timeframes × 2 layouts)`);
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Use batch analysis API for true parallelism - captures all timeframes simultaneously
|
||||||
|
const response = await fetch('http://localhost:3000/api/batch-analysis', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({
|
||||||
|
symbol: this.config.symbol,
|
||||||
|
timeframes: this.config.selectedTimeframes, // All timeframes at once!
|
||||||
|
layouts: ['ai', 'diy'],
|
||||||
|
analyze: true
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
console.warn(`⚠️ BATCH API ERROR: ${response.status}, falling back to sequential...`);
|
||||||
|
return this.performSequentialAnalysis();
|
||||||
|
}
|
||||||
|
|
||||||
|
const result = await response.json();
|
||||||
|
|
||||||
|
if (result.success && result.analysis) {
|
||||||
|
console.log(`✅ PARALLEL ANALYSIS COMPLETE: ${result.totalScreenshots} screenshots captured`);
|
||||||
|
console.log(`📊 COMBINED Recommendation: ${result.analysis.recommendation}`);
|
||||||
|
console.log(`🎯 COMBINED Confidence: ${result.analysis.confidence}%`);
|
||||||
|
console.log(`⏰ Timeframes analyzed: ${result.timeframes.join(', ')}`);
|
||||||
|
|
||||||
|
// Check if we should execute a trade based on combined analysis
|
||||||
|
if (this.shouldExecuteTrade(result.analysis)) {
|
||||||
|
console.log('💰 TRADE SIGNAL: Executing trade...');
|
||||||
|
await this.executeTrade(result.analysis);
|
||||||
|
} else {
|
||||||
|
console.log('📈 SIGNAL: Combined analysis complete, no trade executed');
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
} else {
|
||||||
|
console.warn('⚠️ BATCH ANALYSIS: No valid data, falling back to sequential...');
|
||||||
|
return this.performSequentialAnalysis();
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error(`❌ PARALLEL ANALYSIS FAILED:`, error);
|
||||||
|
console.log(`🔄 FALLBACK: Using sequential analysis...`);
|
||||||
|
return this.performSequentialAnalysis();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fallback sequential analysis method
|
||||||
|
async performSequentialAnalysis() {
|
||||||
|
try {
|
||||||
|
console.log('📸 SEQUENTIAL ANALYSIS: Starting...');
|
||||||
|
|
||||||
|
const allResults = [];
|
||||||
|
|
||||||
|
// Analyze each timeframe separately
|
||||||
|
for (const timeframe of this.config.selectedTimeframes) {
|
||||||
|
console.log(`📊 ANALYZING: ${timeframe} timeframe...`);
|
||||||
|
|
||||||
|
// Use the enhanced screenshot API for each timeframe
|
||||||
|
const response = await fetch('http://localhost:3000/api/enhanced-screenshot', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({
|
||||||
|
symbol: this.config.symbol,
|
||||||
|
timeframe: timeframe, // Send one timeframe at a time
|
||||||
|
layouts: ['ai', 'diy'],
|
||||||
|
analyze: true
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
console.log(`⚠️ TIMEFRAME ${timeframe}: API error ${response.status}`);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
const result = await response.json();
|
||||||
|
|
||||||
|
if (result.analysis) {
|
||||||
|
console.log(`✅ TIMEFRAME ${timeframe}: ${result.analysis.recommendation} (${result.analysis.confidence}%)`);
|
||||||
|
allResults.push({
|
||||||
|
timeframe: timeframe,
|
||||||
|
analysis: result.analysis,
|
||||||
|
screenshots: result.screenshots
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
console.log(`⚠️ TIMEFRAME ${timeframe}: No analysis data`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (allResults.length > 0) {
|
||||||
|
console.log('✅ MULTI-TIMEFRAME ANALYSIS COMPLETE:');
|
||||||
|
|
||||||
|
// Combine results for overall decision
|
||||||
|
const combinedAnalysis = this.combineTimeframeAnalysis(allResults);
|
||||||
|
|
||||||
|
console.log('📊 COMBINED Recommendation: ' + combinedAnalysis.recommendation);
|
||||||
|
console.log('🎯 COMBINED Confidence: ' + combinedAnalysis.confidence + '%');
|
||||||
|
console.log('⏰ Timeframes analyzed: ' + allResults.map(r => r.timeframe).join(', '));
|
||||||
|
|
||||||
|
// Check if we should execute a trade based on combined analysis
|
||||||
|
if (this.shouldExecuteTrade(combinedAnalysis)) {
|
||||||
|
console.log('💰 TRADE SIGNAL: Executing trade...');
|
||||||
|
await this.executeTrade(combinedAnalysis);
|
||||||
|
} else {
|
||||||
|
console.log('📈 SIGNAL: Combined analysis complete, no trade executed');
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
console.log('⚠️ ANALYSIS: No valid analysis data from any timeframe');
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
console.error('❌ ANALYSIS ERROR:', error.message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
combineTimeframeAnalysis(results) {
|
||||||
|
if (results.length === 1) {
|
||||||
|
return results[0].analysis;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Simple combination logic - can be enhanced
|
||||||
|
const recommendations = results.map(r => r.analysis.recommendation?.toLowerCase() || 'hold');
|
||||||
|
const confidences = results.map(r => r.analysis.confidence || 0);
|
||||||
|
|
||||||
|
// Count votes for each recommendation
|
||||||
|
const votes = {};
|
||||||
|
recommendations.forEach(rec => {
|
||||||
|
votes[rec] = (votes[rec] || 0) + 1;
|
||||||
|
});
|
||||||
|
|
||||||
|
// Get majority recommendation
|
||||||
|
const majorityRec = Object.keys(votes).reduce((a, b) => votes[a] > votes[b] ? a : b);
|
||||||
|
|
||||||
|
// Average confidence, but boost if multiple timeframes agree
|
||||||
|
const avgConfidence = confidences.reduce((sum, conf) => sum + conf, 0) / confidences.length;
|
||||||
|
const agreementBonus = votes[majorityRec] > 1 ? 10 : 0; // +10% if multiple agree
|
||||||
|
const finalConfidence = Math.min(95, avgConfidence + agreementBonus);
|
||||||
|
|
||||||
|
console.log(`🔄 CONSENSUS: ${majorityRec.toUpperCase()} from ${votes[majorityRec]}/${results.length} timeframes`);
|
||||||
|
|
||||||
|
return {
|
||||||
|
recommendation: majorityRec,
|
||||||
|
confidence: Math.round(finalConfidence),
|
||||||
|
reasoning: `Multi-timeframe consensus from ${results.length} timeframes (${results.map(r => r.timeframe).join(', ')})`,
|
||||||
|
timeframeResults: results
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
shouldExecuteTrade(analysis) {
|
||||||
|
if (this.config.mode !== 'LIVE') {
|
||||||
|
console.log('📊 SIMULATION MODE: Would execute trade');
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const recommendation = analysis.recommendation?.toLowerCase() || '';
|
||||||
|
const confidence = analysis.confidence || 0;
|
||||||
|
|
||||||
|
// Strategy-specific confidence requirements
|
||||||
|
let minConfidence = 75;
|
||||||
|
if (this.config.selectedTimeframes?.includes('5') || this.config.selectedTimeframes?.includes('15')) {
|
||||||
|
minConfidence = 80; // Higher confidence for scalping
|
||||||
|
}
|
||||||
|
|
||||||
|
const isHighConfidence = confidence >= minConfidence;
|
||||||
|
const isClearDirection = recommendation.includes('buy') || recommendation.includes('sell');
|
||||||
|
|
||||||
|
console.log('🎯 TRADE DECISION: ' + recommendation + ' (' + confidence + '%) - Min: ' + minConfidence + '%');
|
||||||
|
|
||||||
|
return isHighConfidence && isClearDirection;
|
||||||
|
}
|
||||||
|
|
||||||
|
async executeTrade(analysis) {
|
||||||
|
try {
|
||||||
|
console.log('💰 EXECUTING TRADE...');
|
||||||
|
|
||||||
|
// Map analysis recommendation to trading side
|
||||||
|
const recommendation = analysis.recommendation?.toLowerCase() || '';
|
||||||
|
let side = '';
|
||||||
|
|
||||||
|
if (recommendation.includes('buy')) {
|
||||||
|
side = 'BUY';
|
||||||
|
} else if (recommendation.includes('sell')) {
|
||||||
|
side = 'SELL';
|
||||||
|
} else {
|
||||||
|
console.log('❌ TRADE SKIP: Invalid recommendation - ' + recommendation);
|
||||||
|
return { success: false, error: 'Invalid recommendation: ' + recommendation };
|
||||||
|
}
|
||||||
|
|
||||||
|
// Use the trading API with proper fields
|
||||||
|
const tradePayload = {
|
||||||
|
symbol: this.config.symbol,
|
||||||
|
side: side,
|
||||||
|
amount: this.config.tradingAmount || 10, // Default to $10 if not set
|
||||||
|
type: 'market',
|
||||||
|
tradingMode: 'SPOT',
|
||||||
|
analysis: analysis // Include analysis for reference
|
||||||
|
};
|
||||||
|
|
||||||
|
console.log('📊 TRADE PAYLOAD:', tradePayload);
|
||||||
|
|
||||||
|
const response = await fetch('http://localhost:3000/api/trading', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify(tradePayload)
|
||||||
|
});
|
||||||
|
|
||||||
|
const result = await response.json();
|
||||||
|
|
||||||
|
if (result.success) {
|
||||||
|
console.log('✅ TRADE EXECUTED: ' + result.message);
|
||||||
|
this.stats.totalTrades = (this.stats.totalTrades || 0) + 1;
|
||||||
|
this.stats.successfulTrades = (this.stats.successfulTrades || 0) + 1;
|
||||||
|
} else {
|
||||||
|
console.log('❌ TRADE FAILED: ' + result.error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
} catch (error) {
|
||||||
|
console.error('❌ TRADE ERROR:', error.message);
|
||||||
|
return { success: false, error: error.message };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
getStatus() {
|
||||||
|
return {
|
||||||
|
isActive: this.isRunning,
|
||||||
|
mode: this.config?.mode || 'SIMULATION',
|
||||||
|
symbol: this.config?.symbol || 'SOLUSD',
|
||||||
|
timeframes: this.config?.selectedTimeframes || [],
|
||||||
|
automationType: 'SIMPLE',
|
||||||
|
...this.stats
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Export singleton instance
|
||||||
|
const simpleAutomation = new SimpleAutomation();
|
||||||
|
export { simpleAutomation };
|
||||||
Binary file not shown.
Reference in New Issue
Block a user