feat: Update Money Machine workflow for multi-timeframe data collection

- Replaced Parse Signal node with enhanced version (regex supports buy 5, buy 15, buy 1h, buy 4h, buy D)
- Updated Execute Trade jsonBody to include all metrics: atr, adx, rsi, volumeRatio, pricePosition, indicatorVersion
- Removed 5min Chart Only filter - execute endpoint now handles routing automatically
- Flow: Webhook → Parse Signal Enhanced → Execute Trade → Telegram
- 5min signals execute trades, 15m/1h/4h/daily save to BlockedSignal for analysis
- User will manually update n8n nodes after JSON changes

workflows/trading/Money_Machine.json

@@ -19,32 +19,12 @@
     },
     {
       "parameters": {
-        "fields": {
-          "values": [
-            {
-              "name": "rawMessage",
-              "stringValue": "={{ $json.body }}"
-            },
-            {
-              "name": "symbol",
-              "stringValue": "={{ $json.body.match(/\\bSOL\\b/i) ? 'SOL-PERP' : ($json.body.match(/\\bBTC\\b/i) ? 'BTC-PERP' : ($json.body.match(/\\bETH\\b/i) ? 'ETH-PERP' : 'SOL-PERP')) }}"
-            },
-            {
-              "name": "direction",
-              "stringValue": "={{ $json.body.match(/\\b(sell|short)\\b/i) ? 'short' : 'long' }}"
-            },
-            {
-              "name": "timeframe",
-              "stringValue": "={{ $json.body.match(/\\.P\\s+(\\d+)/)?.[1] || '15' }}"
-            }
-          ]
-        },
-        "options": {}
+        "jsCode": "// Get the body - it might be a string or nested in an object\nlet body = $json.body || $json.query?.body || JSON.stringify($json);\n\n// If body is an object, stringify it\nif (typeof body === 'object') {\n  body = JSON.stringify(body);\n}\n\n// Parse basic signal (existing logic)\nconst symbolMatch = body.match(/\\b(SOL|BTC|ETH)\\b/i);\nconst symbol = symbolMatch ? symbolMatch[1].toUpperCase() + '-PERP' : 'SOL-PERP';\n\nconst direction = body.match(/\\b(sell|short)\\b/i) ? 'short' : 'long';\n\n// Enhanced timeframe extraction supporting multiple formats:\n// - \"buy 5\" → \"5\"\n// - \"buy 15\" → \"15\"\n// - \"buy 60\" or \"buy 1h\" → \"60\"\n// - \"buy 240\" or \"buy 4h\" → \"240\"\n// - \"buy D\" or \"buy 1d\" → \"D\"\n// - \"buy W\" → \"W\"\nconst timeframeMatch = body.match(/\\b(buy|sell)\\s+(\\d+|D|W|M|1h|4h|1d)\\b/i);\nlet timeframe = '5'; // Default to 5min\n\nif (timeframeMatch) {\n  const tf = timeframeMatch[2];\n  // Convert hour/day notation to minutes\n  if (tf === '1h' || tf === '60') {\n    timeframe = '60';\n  } else if (tf === '4h' || tf === '240') {\n    timeframe = '240';\n  } else if (tf === '1d' || tf.toUpperCase() === 'D') {\n    timeframe = 'D';\n  } else if (tf.toUpperCase() === 'W') {\n    timeframe = 'W';\n  } else if (tf.toUpperCase() === 'M') {\n    timeframe = 'M';\n  } else {\n    timeframe = tf;\n  }\n}\n\n// Parse new context metrics from enhanced format:\n// \"SOLT.P buy 15 | ATR:0.65 | ADX:14.3 | RSI:51.3 | VOL:0.87 | POS:59.3 | IND:v8\"\nconst atrMatch = body.match(/ATR:([\\d.]+)/);\nconst atr = atrMatch ? parseFloat(atrMatch[1]) : 0;\n\nconst adxMatch = body.match(/ADX:([\\d.]+)/);\nconst adx = adxMatch ? parseFloat(adxMatch[1]) : 0;\n\nconst rsiMatch = body.match(/RSI:([\\d.]+)/);\nconst rsi = rsiMatch ? parseFloat(rsiMatch[1]) : 0;\n\nconst volumeMatch = body.match(/VOL:([\\d.]+)/);\nconst volumeRatio = volumeMatch ? parseFloat(volumeMatch[1]) : 0;\n\nconst pricePositionMatch = body.match(/POS:([\\d.]+)/);\nconst pricePosition = pricePositionMatch ? parseFloat(pricePositionMatch[1]) : 0;\n\n// Parse indicator version (optional, backward compatible)\nconst indicatorVersionMatch = body.match(/IND:(v\\d+)/i);\nconst indicatorVersion = indicatorVersionMatch ? indicatorVersionMatch[1] : 'v8';\n\nreturn {\n  rawMessage: body,\n  symbol,\n  direction,\n  timeframe,\n  // Context fields\n  atr,\n  adx,\n  rsi,\n  volumeRatio,\n  pricePosition,\n  // Version tracking (defaults to v8 for backward compatibility)\n  indicatorVersion\n};"
       },
       "id": "97d5b0ad-d078-411f-8f34-c9a81d18d921",
-      "name": "Parse Signal",
-      "type": "n8n-nodes-base.set",
-      "typeVersion": 3.2,
+      "name": "Parse Signal Enhanced",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
       "position": [
         -760,
         580
@@ -150,7 +130,7 @@
         },
         "sendBody": true,
         "specifyBody": "json",
-        "jsonBody": "={\n  \"symbol\": \"{{ $('Parse Signal').item.json.symbol }}\",\n  \"direction\": \"{{ $('Parse Signal').item.json.direction }}\",\n  \"timeframe\": \"{{ $('Parse Signal').item.json.timeframe }}\",\n  \"signalStrength\": \"strong\"\n}",
+        "jsonBody": "={\n  \"symbol\": \"{{ $('Parse Signal Enhanced').item.json.symbol }}\",\n  \"direction\": \"{{ $('Parse Signal Enhanced').item.json.direction }}\",\n  \"timeframe\": \"{{ $('Parse Signal Enhanced').item.json.timeframe }}\",\n  \"atr\": {{ $('Parse Signal Enhanced').item.json.atr }},\n  \"adx\": {{ $('Parse Signal Enhanced').item.json.adx }},\n  \"rsi\": {{ $('Parse Signal Enhanced').item.json.rsi }},\n  \"volumeRatio\": {{ $('Parse Signal Enhanced').item.json.volumeRatio }},\n  \"pricePosition\": {{ $('Parse Signal Enhanced').item.json.pricePosition }},\n  \"indicatorVersion\": \"{{ $('Parse Signal Enhanced').item.json.indicatorVersion }}\",\n  \"signalPrice\": {{ $('Parse Signal Enhanced').item.json.pricePosition }}\n}",
         "options": {
           "timeout": 120000
         }
@@ -634,7 +614,7 @@
       "main": [
         [
           {
-            "node": "5min Chart Only?1",
+            "node": "Execute Trade",
             "type": "main",
             "index": 0
           }