@jep182/n8n-nodes-whatsthat 0.5.0 → 0.5.1

package/README.md

@@ -2,9 +2,9 @@
 
 WhatsThat lets you connect one or more WhatsApp numbers inside n8n, link chats or groups with simple names, send messages, and react to incoming events.
 
-You will mainly use:
+In the n8n node picker, you will find:
 
-- `WhatsThat`
+- `WhatsThat` actions
 - `WhatsThat Trigger`
 
 You also need one credential:
@@ -21,10 +21,16 @@ Create `WhatsThat Runtime` credentials and choose a persistent storage path, for
 
 This folder is used to store session files and local metadata.
 
+The action nodes all appear under the same name, `WhatsThat`, but with different purposes:
+
+- session actions
+- linked chat actions
+- message actions
+
 ## How To Connect Your Number
 
 1. Add a `WhatsThat` node.
-2. Set `Resource` to `Session`.
+2. Choose the action for sessions.
 3. Set `Operation` to `Connect Session`.
 4. Fill in:
    - `Session Name`: a stable internal name like `main-phone`
@@ -54,7 +60,7 @@ WhatsApp Number: 393331234567
 
 After `Connect Session`, add another `WhatsThat` node:
 
-1. Set `Resource` to `Session`
+1. Choose the action for sessions
 2. Set `Operation` to `Wait Until Connect`
 3. Use the same `Session Name`
 4. Choose how many seconds to wait in `Timeout Seconds`
@@ -64,7 +70,7 @@ This second node waits for the already-started session to become fully connected
 ## How To Link A Group Or Chat Manually
 
 1. Add a `WhatsThat` node
-2. Set `Resource` to `Linked Chat`
+2. Choose the action for linked chats
 3. Start with `Operation = List Discovered Chats`
 4. Pick the chat or group you want to use
 5. Change to `Operation = Link Chat`
@@ -103,7 +109,7 @@ This is useful when you want users to self-register a group without opening n8n.
 ## How To Send A Message To A Linked Chat
 
 1. Add a `WhatsThat` node
-2. Set `Resource` to `Send Message`
+2. Choose the action for sending messages
 3. Set `Session Name`
 4. Set `Send Message To` to `Linked Chat`
 5. Choose a linked chat from the dropdown
@@ -122,7 +128,7 @@ Message: Hello from n8n
 ## How To Send A Message To A Number
 
 1. Add a `WhatsThat` node
-2. Set `Resource` to `Send Message`
+2. Choose the action for sending messages
 3. Set `Send Message To` to `WhatsApp Number`
 4. Enter the number with country code, digits only, without `00` and without `+`
 
@@ -135,7 +141,7 @@ WhatsApp Number: 393331234567
 ## How To Send A Message To Yourself
 
 1. Add a `WhatsThat` node
-2. Set `Resource` to `Send Message`
+2. Choose the action for sending messages
 3. Set `Send Message To` to `Yourself`
 
 WhatsThat uses the number already connected for that session.

package/dist/index.d.ts

@@ -1,3 +1,5 @@
 export * from './credentials/WhatsThatRuntime.credentials';
-export * from './nodes/WhatsThat/WhatsThat.node';
+export * from './nodes/WhatsThatSession/WhatsThatSession.node';
+export * from './nodes/WhatsThatTargets/WhatsThatTargets.node';
+export * from './nodes/WhatsThatMessage/WhatsThatMessage.node';
 export * from './nodes/WhatsThatTrigger/WhatsThatTrigger.node';

package/dist/index.js

@@ -15,5 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./credentials/WhatsThatRuntime.credentials"), exports);
-__exportStar(require("./nodes/WhatsThat/WhatsThat.node"), exports);
+__exportStar(require("./nodes/WhatsThatSession/WhatsThatSession.node"), exports);
+__exportStar(require("./nodes/WhatsThatTargets/WhatsThatTargets.node"), exports);
+__exportStar(require("./nodes/WhatsThatMessage/WhatsThatMessage.node"), exports);
 __exportStar(require("./nodes/WhatsThatTrigger/WhatsThatTrigger.node"), exports);

package/dist/nodes/WhatsThatMessage/WhatsThatMessage.node.d.ts

@@ -1,5 +1,10 @@
-import type { IExecuteFunctions, INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
+import type { IExecuteFunctions, ILoadOptionsFunctions, INodeExecutionData, INodePropertyOptions, INodeType, INodeTypeDescription } from 'n8n-workflow';
 export declare class WhatsThatMessage implements INodeType {
+    methods: {
+        loadOptions: {
+            getLinkedChats(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]>;
+        };
+    };
     description: INodeTypeDescription;
     execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]>;
 }

package/dist/nodes/WhatsThatMessage/WhatsThatMessage.node.js

@@ -7,18 +7,24 @@ const runtime_1 = require("../../shared/runtime");
 const validation_1 = require("../../shared/validation");
 function buildPayload(context, itemIndex) {
     const messageType = context.getNodeParameter('messageType', itemIndex);
-    const targetMode = context.getNodeParameter('targetMode', itemIndex);
+    const sendMessageTo = context.getNodeParameter('sendMessageTo', itemIndex);
     const deliveryMode = context.getNodeParameter('deliveryMode', itemIndex, 'native');
     const payload = {
         sessionId: (0, validation_1.requireSessionId)(context.getNodeParameter('sessionId', itemIndex)),
         type: messageType,
     };
-    if (targetMode === 'alias') {
-        payload.channelAlias = context.getNodeParameter('alias', itemIndex);
+    if (sendMessageTo === 'linkedChat') {
+        payload.channelAlias = context.getNodeParameter('linkedAlias', itemIndex);
     }
-    else {
+    else if (sendMessageTo === 'jid') {
         payload.jid = context.getNodeParameter('jid', itemIndex);
     }
+    else if (sendMessageTo === 'number') {
+        payload.phoneNumber = (0, validation_1.requireWhatsappNumber)(context.getNodeParameter('phoneNumber', itemIndex));
+    }
+    else if (sendMessageTo === 'yourself') {
+        payload.sendToSelf = true;
+    }
     payload.message = context.getNodeParameter('message', itemIndex, '');
     payload.replyToMessageId = context.getNodeParameter('replyToMessageId', itemIndex, '');
     if (['image', 'video', 'audio', 'document'].includes(messageType)) {
@@ -61,49 +67,93 @@ function buildPayload(context, itemIndex) {
 }
 class WhatsThatMessage {
     constructor() {
+        this.methods = {
+            loadOptions: {
+                async getLinkedChats() {
+                    const access = await (0, access_1.buildAccess)(this);
+                    const sessionId = (0, validation_1.requireSessionId)(this.getNodeParameter('sessionId'));
+                    const linked = await runtime_1.registry.listLinkedTargets(access, sessionId);
+                    return linked.map((item) => ({
+                        name: `${item.alias} (${item.displayName})`,
+                        value: item.alias,
+                    }));
+                },
+            },
+        };
         this.description = {
-            displayName: 'WhatsThat Message',
+            displayName: 'WhatsThat',
             name: 'whatsThatMessage',
             icon: 'file:../WhatsThatSession/whatsthat.svg',
             group: ['transform'],
             version: 1,
-            description: 'Send messages and media through an embedded WhatsThat session',
-            defaults: { name: 'WhatsThat Message' },
+            description: 'Send WhatsApp messages and media',
+            defaults: { name: 'Send Message' },
             inputs: ['main'],
             outputs: ['main'],
             credentials: [{ name: 'whatsThatRuntime', required: true }],
             properties: [
                 {
-                    displayName: 'Session ID (Internal)',
+                    displayName: 'Session Name',
                     name: 'sessionId',
                     type: 'string',
                     default: '',
                     required: true,
-                    description: 'The unique session ID created in the WhatsThat Session node.',
+                    description: 'The connected session that will send the message.',
                 },
                 {
-                    displayName: 'Target Mode',
-                    name: 'targetMode',
+                    displayName: 'Send Message To',
+                    name: 'sendMessageTo',
                     type: 'options',
-                    default: 'alias',
+                    default: 'linkedChat',
                     options: [
-                        { name: 'Linked Alias', value: 'alias' },
+                        { name: 'Linked Chat', value: 'linkedChat' },
+                        { name: 'WhatsApp Number', value: 'number' },
                         { name: 'Raw JID', value: 'jid' },
+                        { name: 'Yourself', value: 'yourself' },
                     ],
                 },
                 {
-                    displayName: 'Alias',
-                    name: 'alias',
+                    displayName: 'Linked Chat',
+                    name: 'linkedAlias',
+                    type: 'options',
+                    default: '',
+                    description: 'Choose one of the chats already linked for this session.',
+                    typeOptions: {
+                        loadOptionsMethod: 'getLinkedChats',
+                    },
+                    displayOptions: {
+                        show: { sendMessageTo: ['linkedChat'] },
+                    },
+                },
+                {
+                    displayName: 'WhatsApp Number',
+                    name: 'phoneNumber',
                     type: 'string',
                     default: '',
-                    displayOptions: { show: { targetMode: ['alias'] } },
+                    description: 'Full number with country code, digits only, without 00 or +. Example: 393331234567.',
+                    displayOptions: {
+                        show: { sendMessageTo: ['number'] },
+                    },
                 },
                 {
                     displayName: 'JID',
                     name: 'jid',
                     type: 'string',
                     default: '',
-                    displayOptions: { show: { targetMode: ['jid'] } },
+                    description: 'Raw WhatsApp JID, for example 393331234567@s.whatsapp.net.',
+                    displayOptions: {
+                        show: { sendMessageTo: ['jid'] },
+                    },
+                },
+                {
+                    displayName: 'Send To Yourself',
+                    name: 'yourselfNotice',
+                    type: 'notice',
+                    default: '',
+                    description: 'The message will be sent to the WhatsApp number already connected for this session.',
+                    displayOptions: {
+                        show: { sendMessageTo: ['yourself'] },
+                    },
                 },
                 {
                     displayName: 'Message Type',
@@ -139,6 +189,7 @@ class WhatsThatMessage {
                     type: 'string',
                     typeOptions: { rows: 4 },
                     default: '',
+                    description: 'Main text body for the outbound message.',
                     displayOptions: { hide: { messageType: ['location', 'contact', 'poll'] } },
                 },
                 {
@@ -146,6 +197,7 @@ class WhatsThatMessage {
                     name: 'mediaUrl',
                     type: 'string',
                     default: '',
+                    description: 'Public URL or reachable file URL for the media to send.',
                     displayOptions: { show: { messageType: ['image', 'video', 'audio', 'document'] } },
                 },
                 {
@@ -169,7 +221,13 @@ class WhatsThatMessage {
                     default: '',
                     displayOptions: { show: { messageType: ['image', 'video', 'document'] } },
                 },
-                { displayName: 'Reply To Message ID', name: 'replyToMessageId', type: 'string', default: '' },
+                {
+                    displayName: 'Reply To Message ID',
+                    name: 'replyToMessageId',
+                    type: 'string',
+                    default: '',
+                    description: 'Optional. Reply or react to a specific WhatsApp message ID.',
+                },
                 {
                     displayName: 'Reaction Text',
                     name: 'reactionText',
@@ -240,7 +298,7 @@ class WhatsThatMessage {
                     type: 'number',
                     default: 1,
                     displayOptions: { show: { messageType: ['poll'] } },
-                }
+                },
             ],
         };
     }

package/dist/nodes/WhatsThatSession/WhatsThatSession.node.js

@@ -5,16 +5,43 @@ const n8n_workflow_1 = require("n8n-workflow");
 const access_1 = require("../../shared/access");
 const runtime_1 = require("../../shared/runtime");
 const validation_1 = require("../../shared/validation");
+function formatSessionOutput(value) {
+    if (Array.isArray(value)) {
+        return value.map((item) => formatSessionOutput(item));
+    }
+    if (!value || typeof value !== 'object') {
+        return value;
+    }
+    const record = value;
+    if (!('sessionId' in record) || !('status' in record)) {
+        return value;
+    }
+    return {
+        qrCodeUrl: record.qrCodeUrl,
+        sessionId: record.sessionId,
+        status: record.status,
+        pairingCode: record.pairingCode,
+        qr: record.qr,
+        qrDataUrl: record.qrDataUrl,
+        phone: record.phone,
+        label: record.label,
+        phoneNumberForPairing: record.phoneNumberForPairing,
+        lastDisconnectReason: record.lastDisconnectReason,
+        createdAt: record.createdAt,
+        updatedAt: record.updatedAt,
+        lastSeenAt: record.lastSeenAt,
+    };
+}
 class WhatsThatSession {
     constructor() {
         this.description = {
-            displayName: 'WhatsThat Session',
+            displayName: 'WhatsThat',
             name: 'whatsThatSession',
             icon: 'file:whatsthat.svg',
             group: ['transform'],
             version: 1,
-            description: 'Create, connect, and manage embedded Baileys sessions for WhatsThat',
-            defaults: { name: 'WhatsThat Session' },
+            description: 'Connect and manage WhatsApp sessions',
+            defaults: { name: 'Connect Session' },
             inputs: ['main'],
             outputs: ['main'],
             credentials: [{ name: 'whatsThatRuntime', required: true }],
@@ -26,56 +53,42 @@ class WhatsThatSession {
                     default: 'connect',
                     options: [
                         { name: 'Connect Session', value: 'connect' },
-                        { name: 'Ensure Session', value: 'ensure' },
+                        { name: 'Wait Until Connect', value: 'ensure' },
                         { name: 'List Sessions', value: 'list' },
-                        { name: 'Get Session Status', value: 'status' },
+                        { name: 'Get Session', value: 'status' },
                         { name: 'Disconnect Session', value: 'disconnect' },
                         { name: 'Remove Session', value: 'remove' },
                     ],
                 },
                 {
-                    displayName: 'Session ID (Internal)',
+                    displayName: 'Session Name',
                     name: 'sessionId',
                     type: 'string',
                     default: '',
                     required: true,
-                    description: 'Required unique ID for this session. Use a stable internal value such as "main-phone" or "support-team".',
+                    description: 'Stable internal name for this session, for example main-phone or support-phone.',
                     displayOptions: {
                         hide: { operation: ['list'] },
                     },
                 },
                 {
-                    displayName: 'Label (Visible Name)',
+                    displayName: 'Display Name',
                     name: 'label',
                     type: 'string',
                     default: '',
-                    description: 'Human-readable name shown in results. Example: "Luca personal phone" or "Support number".',
+                    description: 'Friendly label for this session, for example Luca phone or Support phone.',
                     displayOptions: {
-                        show: { operation: ['connect', 'ensure'] },
+                        show: { operation: ['connect'] },
                     },
                 },
                 {
-                    displayName: 'Phone Number For Pairing',
+                    displayName: 'WhatsApp Number',
                     name: 'phoneNumberForPairing',
                     type: 'string',
                     default: '',
-                    description: 'Optional. Full phone number with country code, digits only, without 00 or +. Example: 393331234567.',
-                    displayOptions: {
-                        show: { operation: ['connect', 'ensure'] },
-                    },
-                },
-                {
-                    displayName: 'Return When',
-                    name: 'waitFor',
-                    type: 'options',
-                    default: 'pairing_or_connected',
-                    options: [
-                        { name: 'Pairing Is Ready Or Connected', value: 'pairing_or_connected' },
-                        { name: 'Connected', value: 'connected' },
-                    ],
-                    description: 'Return as soon as pairing data is ready, or wait until the session is fully connected.',
+                    description: 'Optional. Full number with country code, digits only, without 00 or +. Open qrCodeUrl if available.',
                     displayOptions: {
-                        show: { operation: ['ensure'] },
+                        show: { operation: ['connect'] },
                     },
                 },
                 {
@@ -85,8 +98,8 @@ class WhatsThatSession {
                     typeOptions: {
                         minValue: 1,
                     },
-                    default: 20,
-                    description: 'Maximum time to wait before returning the latest known session status.',
+                    default: 300,
+                    description: 'How long to wait for the already-started session to become connected.',
                     displayOptions: {
                         show: { operation: ['ensure'] },
                     },
@@ -117,16 +130,12 @@ class WhatsThatSession {
                         break;
                     }
                     case 'ensure': {
-                        const label = this.getNodeParameter('label', itemIndex, '').trim();
-                        const phoneNumberForPairing = this.getNodeParameter('phoneNumberForPairing', itemIndex, '').trim();
-                        const waitFor = this.getNodeParameter('waitFor', itemIndex);
-                        const timeoutSeconds = this.getNodeParameter('timeoutSeconds', itemIndex, 20);
+                        const timeoutSeconds = this.getNodeParameter('timeoutSeconds', itemIndex, 300);
                         json = await runtime_1.registry.ensureConnectedSession(access.paths.root, access, {
                             sessionId,
-                            label: label || sessionId,
-                            phoneNumberForPairing,
+                            label: sessionId,
                         }, {
-                            waitFor,
+                            waitFor: 'connected',
                             timeoutMs: timeoutSeconds * 1000,
                         });
                         break;
@@ -146,7 +155,7 @@ class WhatsThatSession {
                     default:
                         throw new Error(`Unsupported operation ${operation}`);
                 }
-                returnData.push({ json: json, pairedItem: itemIndex });
+                returnData.push({ json: formatSessionOutput(json), pairedItem: itemIndex });
             }
             catch (error) {
                 if (this.continueOnFail()) {

package/dist/nodes/WhatsThatTargets/WhatsThatTargets.node.js

@@ -8,13 +8,13 @@ const validation_1 = require("../../shared/validation");
 class WhatsThatTargets {
     constructor() {
         this.description = {
-            displayName: 'WhatsThat Targets',
+            displayName: 'WhatsThat',
             name: 'whatsThatTargets',
             icon: 'file:../WhatsThatSession/whatsthat.svg',
             group: ['transform'],
             version: 1,
-            description: 'Discover, link, and manage chats and groups for WhatsThat',
-            defaults: { name: 'WhatsThat Targets' },
+            description: 'Link chats and groups with simple names',
+            defaults: { name: 'Link Chat' },
             inputs: ['main'],
             outputs: ['main'],
             credentials: [{ name: 'whatsThatRuntime', required: true }],
@@ -25,34 +25,36 @@ class WhatsThatTargets {
                     type: 'options',
                     default: 'listDiscovered',
                     options: [
-                        { name: 'List Discovered Targets', value: 'listDiscovered' },
-                        { name: 'List Linked Targets', value: 'listLinked' },
-                        { name: 'Link Target', value: 'link' },
-                        { name: 'Unlink Target', value: 'unlink' },
+                        { name: 'List Discovered Chats', value: 'listDiscovered' },
+                        { name: 'List Linked Chats', value: 'listLinked' },
+                        { name: 'Link Chat', value: 'link' },
+                        { name: 'Unlink Chat', value: 'unlink' },
                     ],
                 },
                 {
-                    displayName: 'Session ID (Internal)',
+                    displayName: 'Session Name',
                     name: 'sessionId',
                     type: 'string',
                     default: '',
                     required: true,
-                    description: 'The unique session ID created in the WhatsThat Session node.',
+                    description: 'The session that owns these chats and groups.',
                 },
                 {
-                    displayName: 'Target JID',
+                    displayName: 'Chat JID',
                     name: 'jid',
                     type: 'string',
                     default: '',
+                    description: 'Raw WhatsApp chat or group JID. Usually copied from List Discovered Chats.',
                     displayOptions: {
                         show: { operation: ['link'] },
                     },
                 },
                 {
-                    displayName: 'Alias',
+                    displayName: 'Linked Chat',
                     name: 'alias',
                     type: 'string',
                     default: '',
+                    description: 'Simple name you will use later, for example support, sales, or team.',
                     displayOptions: {
                         show: { operation: ['link', 'unlink'] },
                     },

package/dist/nodes/WhatsThatTrigger/WhatsThatTrigger.node.js

@@ -19,12 +19,12 @@ class WhatsThatTrigger {
             credentials: [{ name: 'whatsThatRuntime', required: true }],
             properties: [
                 {
-                    displayName: 'Session ID (Internal)',
+                    displayName: 'Session Name',
                     name: 'sessionId',
                     type: 'string',
                     default: '',
                     required: true,
-                    description: 'The unique session ID used in the WhatsThat node resource Session.',
+                    description: 'The session that owns the incoming events for this trigger.',
                 },
                 {
                     displayName: 'Event',
@@ -62,7 +62,7 @@ class WhatsThatTrigger {
     async trigger() {
         const sessionId = (0, validation_1.requireSessionId)(this.getNodeParameter('sessionId'));
         const eventName = this.getNodeParameter('eventName');
-        const linkCommand = this.getNodeParameter('linkCommand', '');
+        const linkCommand = this.getNodeParameter('linkCommand') || '/link-whatsthat';
         const access = await (0, access_1.buildAccess)(this);
         const handler = async (event) => {
             if (event.sessionId !== sessionId)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jep182/n8n-nodes-whatsthat",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "n8n community nodes with embedded Baileys runtime for multi-session chat automation",
   "license": "MIT",
   "main": "dist/index.js",
@@ -57,7 +57,9 @@
       "dist/credentials/WhatsThatRuntime.credentials.js"
     ],
     "nodes": [
-      "dist/nodes/WhatsThat/WhatsThat.node.js",
+      "dist/nodes/WhatsThatSession/WhatsThatSession.node.js",
+      "dist/nodes/WhatsThatTargets/WhatsThatTargets.node.js",
+      "dist/nodes/WhatsThatMessage/WhatsThatMessage.node.js",
       "dist/nodes/WhatsThatTrigger/WhatsThatTrigger.node.js"
     ]
   }