Skip to content

Self-improving AI Employees for everyone

feat(whatsapp): Add self filter for send/receive nodes

trohitg33f5e110d1e8
diff --git a/CLAUDE.md b/CLAUDE.md
index da87aec1..02cec666 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -851,7 +851,7 @@ Android device connection is configured via the Credentials Modal (Android panel
- **mediaControl**: Media playback control - volume control, playback control, play media files
### WhatsApp Nodes (3 nodes)
-- **whatsappSend**: **Dual-purpose node** - Send WhatsApp messages (text, image, video, audio, document, sticker, location, contact). Works as workflow node OR AI Agent tool. Group: `['whatsapp', 'tool']`. Full parameter schema for recipient type, message type, media URL, location coordinates, contact vCard.
+- **whatsappSend**: **Dual-purpose node** - Send WhatsApp messages (text, image, video, audio, document, sticker, location, contact). Works as workflow node OR AI Agent tool. Group: `['whatsapp', 'tool']`. Recipient types: Self (connected phone), Phone Number, Group. Full parameter schema for message type, media URL, location coordinates, contact vCard.
- **whatsappDb**: **Dual-purpose node** - Comprehensive WhatsApp database query node with 6 operations. Works as workflow node OR AI Agent tool. Group: `['whatsapp', 'tool']`. Operations:
- `chat_history`: Retrieve messages from individual or group chats with filtering and pagination
- `search_groups`: Search groups by name
@@ -859,7 +859,7 @@ Android device connection is configured via the Credentials Modal (Android panel
- `get_contact_info`: Get full contact info (name, phone, profile picture) for sending/replying
- `list_contacts`: List all contacts with saved names
- `check_contacts`: Check WhatsApp registration status for phone numbers
-- **whatsappReceive**: Event-driven trigger that waits for incoming WhatsApp messages with filters (message type, sender, group, keywords, forwarded status). Marked with `['whatsapp', 'trigger']` group for n8n-style trigger identification. Stores group/sender names alongside JID/phone for display persistence. The Go RPC resolves LIDs to phone numbers before sending events - `sender_phone` field is already resolved. Filter options: All Messages, From Any Contact (Non-Group), From Specific Contact, From Specific Group, Contains Keywords
+- **whatsappReceive**: Event-driven trigger that waits for incoming WhatsApp messages with filters (message type, sender, group, keywords, forwarded status). Marked with `['whatsapp', 'trigger']` group for n8n-style trigger identification. Stores group/sender names alongside JID/phone for display persistence. The Go RPC resolves LIDs to phone numbers before sending events - `sender_phone` field is already resolved. Filter options: All Messages, From Self (notes to self chat only), From Any Contact (Non-Group), From Specific Contact, From Specific Group, Contains Keywords
### Social Nodes (2 nodes)
Unified social messaging nodes for multi-platform communication. Supports WhatsApp, Telegram, Discord, Slack, Signal, SMS, Webchat, Email, Matrix, Teams.
diff --git a/client/package.json b/client/package.json
index 99226d6e..5e7d76a4 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,7 +1,7 @@
{
"name": "react-flow-client",
"private": true,
- "version": "0.0.22",
+ "version": "0.0.31",
"type": "module",
"scripts": {
"start": "vite --host 0.0.0.0",
diff --git a/client/src/contexts/WebSocketContext.tsx b/client/src/contexts/WebSocketContext.tsx
index 791fbec9..a8c372b7 100644
--- a/client/src/contexts/WebSocketContext.tsx
+++ b/client/src/contexts/WebSocketContext.tsx
@@ -86,6 +86,7 @@ export interface WhatsAppStatus {
running: boolean;
pairing: boolean;
device_id?: string;
+ connected_phone?: string;
qr?: string;
timestamp?: number;
}
diff --git a/client/src/hooks/useParameterPanel.ts b/client/src/hooks/useParameterPanel.ts
index 4f830878..ddf06ae0 100644
--- a/client/src/hooks/useParameterPanel.ts
+++ b/client/src/hooks/useParameterPanel.ts
@@ -137,7 +137,6 @@ export const useParameterPanel = () => {
}, [originalParameters, setSelectedNode]);
const nodeDefinition = selectedNode?.type ? nodeDefinitions[selectedNode.type] : null;
- console.log('[useParameterPanel] selectedNode.type:', selectedNode?.type, 'nodeDefinition.name:', nodeDefinition?.name);
return {
selectedNode,
diff --git a/client/src/nodeDefinitions/whatsappNodes.ts b/client/src/nodeDefinitions/whatsappNodes.ts
index 7b6b5eb5..83f79f17 100644
--- a/client/src/nodeDefinitions/whatsappNodes.ts
+++ b/client/src/nodeDefinitions/whatsappNodes.ts
@@ -112,11 +112,12 @@ export const whatsappNodes: Record<string, INodeTypeDescription> = {
name: 'recipient_type',
type: 'options',
options: [
+ { name: 'Self (Connected Phone)', value: 'self' },
{ name: 'Phone Number', value: 'phone' },
{ name: 'Group', value: 'group' }
],
- default: 'phone',
- description: 'Send to individual or group'
+ default: 'self',
+ description: 'Send to self, individual, or group'
},
{
displayName: 'Phone Number',
@@ -429,6 +430,7 @@ export const whatsappNodes: Record<string, INodeTypeDescription> = {
type: 'options',
options: [
{ name: 'All Messages', value: 'all' },
+ { name: 'From Self (Connected Phone)', value: 'self' },
{ name: 'From Any Contact (Non-Group)', value: 'any_contact' },
{ name: 'From Specific Contact', value: 'contact' },
{ name: 'From Specific Group', value: 'group' },
@@ -491,7 +493,10 @@ export const whatsappNodes: Record<string, INodeTypeDescription> = {
name: 'ignoreOwnMessages',
type: 'boolean',
default: true,
- description: 'Do not trigger on messages sent by this device'
+ description: 'Do not trigger on messages sent by this device',
+ displayOptions: {
+ show: { filter: ['all', 'any_contact', 'contact', 'group', 'keywords'] }
+ }
},
{
displayName: 'Forwarded Messages',
diff --git a/package.json b/package.json
index 765a2d56..fb1d112c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "machinaos",
- "version": "0.0.22",
+ "version": "0.0.31",
"description": "Open source workflow automation platform with AI agents, React Flow, and n8n-inspired architecture",
"type": "module",
"keywords": [
diff --git a/scripts/start.js b/scripts/start.js
index 4404903e..66f8a6e0 100755
--- a/scripts/start.js
+++ b/scripts/start.js
@@ -4,7 +4,7 @@
* Works on: Windows, macOS, Linux, WSL, Git Bash
*/
import { spawn } from 'child_process';
-import { readFileSync, existsSync, copyFileSync } from 'fs';
+import { readFileSync, existsSync, copyFileSync, rmSync } from 'fs';
import { resolve, dirname } from 'path';
import { fileURLToPath } from 'url';
import findProcess from 'find-process';
@@ -119,6 +119,17 @@ async function main() {
}
}
+ // Clear Vite dependency cache to prevent "Outdated Optimize Dep" errors
+ const viteCachePath = resolve(ROOT, 'client', 'node_modules', '.vite');
+ if (existsSync(viteCachePath)) {
+ try {
+ rmSync(viteCachePath, { recursive: true, force: true });
+ log('Cleared Vite cache');
+ } catch (err) {
+ log(`Warning: Could not clear Vite cache: ${err.message}`);
+ }
+ }
+
// Start services
log('Starting services...');
log('Press Ctrl+C to stop\n');
diff --git a/server/models/nodes.py b/server/models/nodes.py
index e6fa566e..78ee2aca 100644
--- a/server/models/nodes.py
+++ b/server/models/nodes.py
@@ -143,8 +143,13 @@ class WhatsAppReceiveParams(BaseNodeParams):
type: Literal["whatsappReceive"]
message_type_filter: str = Field(default="all", alias="messageTypeFilter")
sender_filter: str = Field(default="all", alias="filter")
+ contact_phone: str = Field(default="", alias="contactPhone")
+ group_id: str = Field(default="", alias="group_id")
+ sender_number: str = Field(default="", alias="senderNumber")
+ keywords: str = Field(default="")
ignore_own: bool = Field(default=True, alias="ignoreOwnMessages")
include_media: bool = Field(default=False, alias="includeMediaData")
+ forwarded_filter: str = Field(default="all", alias="forwardedFilter")
class WhatsAppDbParams(BaseNodeParams):
diff --git a/server/routers/websocket.py b/server/routers/websocket.py
index db00ec51..10c6cf1b 100644
--- a/server/routers/websocket.py
+++ b/server/routers/websocket.py
@@ -1617,6 +1617,7 @@ async def handle_validate_maps_key(data: Dict[str, Any], websocket: WebSocket) -
from routers.whatsapp import (
handle_whatsapp_status as _wa_status,
+ handle_whatsapp_connected_phone as _wa_connected_phone,
handle_whatsapp_qr as _wa_qr,
handle_whatsapp_send as _wa_send,
handle_whatsapp_start as _wa_start,
@@ -1632,6 +1633,11 @@ async def handle_whatsapp_status(data: Dict[str, Any], websocket: WebSocket) ->
return await _wa_status()
+async def handle_whatsapp_connected_phone(data: Dict[str, Any], websocket: WebSocket) -> Dict[str, Any]:
+ """Get the connected WhatsApp phone number."""
+ return await _wa_connected_phone()
+
+
async def handle_whatsapp_qr(data: Dict[str, Any], websocket: WebSocket) -> Dict[str, Any]:
return await _wa_qr()
@@ -2603,6 +2609,7 @@ MESSAGE_HANDLERS: Dict[str, MessageHandler] = {
# WhatsApp operations
"whatsapp_status": handle_whatsapp_status,
+ "whatsapp_connected_phone": handle_whatsapp_connected_phone,
"whatsapp_qr": handle_whatsapp_qr,
"whatsapp_send": handle_whatsapp_send,
"whatsapp_start": handle_whatsapp_start,
diff --git a/server/routers/whatsapp.py b/server/routers/whatsapp.py
index 433729ba..c8f084b6 100644
--- a/server/routers/whatsapp.py
+++ b/server/routers/whatsapp.py
@@ -36,6 +36,27 @@ logger = logging.getLogger(__name__)
WHATSAPP_RPC_URL = os.getenv("WHATSAPP_RPC_URL", "ws://localhost:9400/ws/rpc")
+def extract_phone_from_jid(jid: str | None) -> str | None:
+ """Extract phone number from WhatsApp JID.
+
+ Args:
+ jid: WhatsApp JID like '[email protected]' or '1234567890:[email protected]'
+
+ Returns:
+ Phone number string or None if invalid
+ """
+ if not jid:
+ return None
+ # Remove the @s.whatsapp.net or @c.us suffix
+ phone_part = jid.split('@')[0]
+ # Handle device ID suffix like '1234567890:0'
+ phone = phone_part.split(':')[0]
+ # Return only if it looks like a phone number (digits only)
+ if phone.isdigit():
+ return phone
+ return None
+
+
# Inline RPC Client with async event handling
class RPCClient:
def __init__(self, url: str):
@@ -315,11 +336,15 @@ async def handle_whatsapp_status() -> dict:
qr=None # QR code comes from event.qr_code events
)
+ device_id = status_data.get("device_id")
+ connected_phone = extract_phone_from_jid(device_id)
+
return {
"success": True,
"data": status_data,
"connected": status_data.get("connected", False),
- "device_id": status_data.get("device_id"),
+ "device_id": device_id,
+ "connected_phone": connected_phone,
"timestamp": time.time()
}
except Exception as e:
@@ -335,6 +360,43 @@ async def handle_whatsapp_status() -> dict:
}
+async def handle_whatsapp_connected_phone() -> dict:
+ """Get the connected WhatsApp phone number.
+
+ Returns the phone number of the currently connected WhatsApp account,
+ extracted from the device JID.
+ """
+ try:
+ client = await get_client()
+ status_data = await client.call("status")
+
+ if not status_data.get("connected"):
+ return {
+ "success": False,
+ "error": "WhatsApp not connected",
+ "connected_phone": None,
+ "timestamp": time.time()
+ }
+
+ device_id = status_data.get("device_id")
+ connected_phone = extract_phone_from_jid(device_id)
+
+ return {
+ "success": True,
+ "connected_phone": connected_phone,
+ "device_id": device_id,
+ "timestamp": time.time()
+ }
+ except Exception as e:
+ logger.error(f"WhatsApp connected phone check failed: {e}")
+ return {
+ "success": False,
+ "error": str(e),
+ "connected_phone": None,
+ "timestamp": time.time()
+ }
+
+
async def handle_whatsapp_qr() -> dict:
"""Get WhatsApp QR code for authentication via direct RPC."""
try:
@@ -387,7 +449,7 @@ async def handle_whatsapp_send(params: dict) -> dict:
Uses _send_lock to serialize sends - Go service processes sequentially.
Params from frontend node (snake_case):
- - recipient_type: 'phone' or 'group'
+ - recipient_type: 'self', 'phone', or 'group'
- phone: recipient phone number (if recipient_type='phone')
- group_id: group JID (if recipient_type='group')
- message_type: text, image, video, audio, document, sticker, location, contact
@@ -405,12 +467,21 @@ async def handle_whatsapp_send(params: dict) -> dict:
rpc_params: dict[str, Any] = {}
# Recipient (snake_case)
- recipient_type = params.get("recipient_type", "phone")
+ recipient_type = params.get("recipient_type", "self")
if recipient_type == "group":
group_id = params.get("group_id")
if not group_id:
return {"success": False, "error": "group_id is required"}
rpc_params["group_id"] = group_id
+ elif recipient_type == "self":
+ # Send to connected phone (self)
+ client = await get_client()
+ status = await client.call("status")
+ device_id = status.get("device_id")
+ phone = extract_phone_from_jid(device_id)
+ if not phone:
+ return {"success": False, "error": "WhatsApp not connected - cannot send to self"}
+ rpc_params["phone"] = phone
else:
phone = params.get("phone")
if not phone:
diff --git a/server/services/event_waiter.py b/server/services/event_waiter.py
index 908d5ab1..0366987f 100644
--- a/server/services/event_waiter.py
+++ b/server/services/event_waiter.py
@@ -208,6 +208,17 @@ def build_whatsapp_filter(params: Dict) -> Callable[[Dict], bool]:
return False
# Sender filter - for contact filter, use actual phone number
+ if sender_filter == 'self':
+ # Only accept messages in self-chat (notes to self)
+ # Must be from me AND in a chat with myself (not replies to others)
+ if not m.get('is_from_me'):
+ return False
+ # Check chat_id matches sender (self-chat)
+ chat_id = m.get('chat_id', '')
+ sender = m.get('sender', '')
+ if chat_id != sender:
+ return False
+
if sender_filter == 'any_contact':
# Only accept non-group messages (individual/contact messages)
if is_group:
@@ -233,8 +244,8 @@ def build_whatsapp_filter(params: Dict) -> Callable[[Dict], bool]:
if not any(kw in text for kw in keywords):
return False
- # Ignore own messages (schema field: is_from_me)
- if ignore_own and m.get('is_from_me'):
+ # Ignore own messages (schema field: is_from_me) - but not when filtering for 'self'
+ if ignore_own and sender_filter != 'self' and m.get('is_from_me'):
return False
# Forwarded message filter (schema field: is_forwarded)
diff --git a/server/services/handlers/whatsapp.py b/server/services/handlers/whatsapp.py
index cf6d79b1..e6100d5f 100644
--- a/server/services/handlers/whatsapp.py
+++ b/server/services/handlers/whatsapp.py
@@ -34,13 +34,21 @@ async def handle_whatsapp_send(
try:
# Determine recipient (snake_case parameters)
- recipient_type = parameters.get('recipient_type', 'phone')
- group_id = parameters.get('group_id')
- recipient = parameters.get('phone') if recipient_type == 'phone' else group_id
+ recipient_type = parameters.get('recipient_type', 'self')
message_type = parameters.get('message_type', 'text')
- if not recipient:
- raise ValueError(f"{'Phone number' if recipient_type == 'phone' else 'Group ID'} is required")
+ # Determine recipient based on type
+ if recipient_type == 'self':
+ # Self will be resolved by the router using connected phone
+ recipient = 'self'
+ elif recipient_type == 'group':
+ recipient = parameters.get('group_id')
+ if not recipient:
+ raise ValueError("Group ID is required")
+ else: # phone
+ recipient = parameters.get('phone')
+ if not recipient:
+ raise ValueError("Phone number is required")
# For text messages, validate message content
if message_type == 'text' and not parameters.get('message'):