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
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 };
|
||||
Reference in New Issue
Block a user