n8n-nodes-waapy 0.3.1 → 0.5.0

package/dist/credentials/WaapyApi.credentials.js

@@ -14,7 +14,7 @@ class WaapyApi {
                 type: "string",
                 default: "https://localhost",
                 placeholder: "Please enter the server URL",
-                description: "The base URL of the WaaPy API",
+                description: "The base URL of the WaaPy API. Do not include a trailing slash.",
             },
             {
                 displayName: "API Key",

package/dist/credentials/WaapyApi.credentials.js.map

@@ -1 +1 @@
-{"version":3,"file":"WaapyApi.credentials.js","sourceRoot":"","sources":["../../credentials/WaapyApi.credentials.ts"],"names":[],"mappings":";;;AAOA,MAAa,QAAQ;IAArB;QACE,SAAI,GAAG,UAAU,CAAC;QAClB,gBAAW,GAAG,WAAW,CAAC;QAC1B,qBAAgB,GAAG,kBAAkB,CAAC;QACtC,SAAI,GAAG,oCAA6C,CAAC;QACrD,eAAU,GAAsB;YAC9B;gBACE,WAAW,EAAE,YAAY;gBACzB,IAAI,EAAE,YAAY;gBAClB,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,mBAAmB;gBAC5B,WAAW,EAAE,6BAA6B;gBAC1C,WAAW,EAAE,+BAA+B;aAC7C;YACD;gBACE,WAAW,EAAE,SAAS;gBACtB,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,EAAE;gBACX,WAAW,EAAE;oBACX,QAAQ,EAAE,IAAI;iBACf;gBACD,WAAW,EAAE,wCAAwC;aACtD;SACF,CAAC;QAEF,iBAAY,GAAyB;YACnC,IAAI,EAAE,SAAS;YACf,UAAU,EAAE;gBACV,OAAO,EAAE;oBACP,aAAa,EAAE,iCAAiC;iBACjD;aACF;SACF,CAAC;QAEF,SAAI,GAA2B;YAC7B,OAAO,EAAE;gBACP,OAAO,EAAE,iCAAiC;gBAC1C,GAAG,EAAE,aAAa;gBAClB,MAAM,EAAE,KAAK;aACd;SACF,CAAC;IACJ,CAAC;CAAA;AA1CD,4BA0CC"}
+{"version":3,"file":"WaapyApi.credentials.js","sourceRoot":"","sources":["../../credentials/WaapyApi.credentials.ts"],"names":[],"mappings":";;;AAOA,MAAa,QAAQ;IAArB;QACE,SAAI,GAAG,UAAU,CAAC;QAClB,gBAAW,GAAG,WAAW,CAAC;QAC1B,qBAAgB,GAAG,kBAAkB,CAAC;QACtC,SAAI,GAAG,oCAA6C,CAAC;QACrD,eAAU,GAAsB;YAC9B;gBACE,WAAW,EAAE,YAAY;gBACzB,IAAI,EAAE,YAAY;gBAClB,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,mBAAmB;gBAC5B,WAAW,EAAE,6BAA6B;gBAC1C,WAAW,EAAE,iEAAiE;aAC/E;YACD;gBACE,WAAW,EAAE,SAAS;gBACtB,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,EAAE;gBACX,WAAW,EAAE;oBACX,QAAQ,EAAE,IAAI;iBACf;gBACD,WAAW,EAAE,wCAAwC;aACtD;SACF,CAAC;QAEF,iBAAY,GAAyB;YACnC,IAAI,EAAE,SAAS;YACf,UAAU,EAAE;gBACV,OAAO,EAAE;oBACP,aAAa,EAAE,iCAAiC;iBACjD;aACF;SACF,CAAC;QAEF,SAAI,GAA2B;YAC7B,OAAO,EAAE;gBACP,OAAO,EAAE,iCAAiC;gBAC1C,GAAG,EAAE,aAAa;gBAClB,MAAM,EAAE,KAAK;aACd;SACF,CAAC;IACJ,CAAC;CAAA;AA1CD,4BA0CC"}

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

@@ -4,8 +4,11 @@ export declare class Waapy implements INodeType {
     methods: {
         listSearch: {
             searchConnections(this: ILoadOptionsFunctions, filter?: string): Promise<INodeListSearchResult>;
+            searchWhatsAppConnections(this: ILoadOptionsFunctions, filter?: string): Promise<INodeListSearchResult>;
             searchTemplates(this: ILoadOptionsFunctions, filter?: string): Promise<INodeListSearchResult>;
             searchLabels(this: ILoadOptionsFunctions, filter?: string): Promise<INodeListSearchResult>;
+            searchQueues(this: ILoadOptionsFunctions, filter?: string): Promise<INodeListSearchResult>;
+            searchUsers(this: ILoadOptionsFunctions, filter?: string): Promise<INodeListSearchResult>;
         };
     };
     execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]>;

package/dist/nodes/Waapy/Waapy.node.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Waapy = void 0;
 const n8n_workflow_1 = require("n8n-workflow");
+const normalizeBaseUrl = (url) => url.replace(/\/+$/, "");
 const TEMPLATE_VARIABLE_PATTERN = /\{\{\s*(\d+)\s*\}\}/g;
 const ensureArray = (value) => Array.isArray(value) ? value : [];
 const countTemplateVariables = (value) => {
@@ -145,6 +146,14 @@ class Waapy {
                             name: "Message",
                             value: "message",
                         },
+                        {
+                            name: "Queue",
+                            value: "queue",
+                        },
+                        {
+                            name: "Ticket",
+                            value: "ticket",
+                        },
                     ],
                     default: "message",
                 },
@@ -200,6 +209,144 @@ class Waapy {
                     ],
                     default: "assignLabel",
                 },
+                {
+                    displayName: "Operation",
+                    name: "operation",
+                    type: "options",
+                    noDataExpression: true,
+                    displayOptions: {
+                        show: {
+                            resource: ["queue"],
+                        },
+                    },
+                    options: [
+                        {
+                            name: "Assign Queue",
+                            value: "assignQueue",
+                            description: "Assign a ticket to a queue",
+                            action: "Assign a queue",
+                        },
+                    ],
+                    default: "assignQueue",
+                },
+                {
+                    displayName: "Operation",
+                    name: "operation",
+                    type: "options",
+                    noDataExpression: true,
+                    displayOptions: {
+                        show: {
+                            resource: ["ticket"],
+                        },
+                    },
+                    options: [
+                        {
+                            name: "Update Status",
+                            value: "updateStatus",
+                            description: "Update the status of a ticket",
+                            action: "Update ticket status",
+                        },
+                    ],
+                    default: "updateStatus",
+                },
+                {
+                    displayName: "Ticket ID",
+                    name: "ticketId",
+                    type: "string",
+                    required: true,
+                    displayOptions: {
+                        show: {
+                            resource: ["ticket"],
+                            operation: ["updateStatus"],
+                        },
+                    },
+                    default: "",
+                    description: "The ticket ID to update",
+                },
+                {
+                    displayName: "Status",
+                    name: "status",
+                    type: "options",
+                    required: true,
+                    options: [
+                        {
+                            name: "Open",
+                            value: "IN_PROGRESS",
+                        },
+                        {
+                            name: "Pending",
+                            value: "PENDING",
+                        },
+                        {
+                            name: "Closed",
+                            value: "CLOSED",
+                        },
+                    ],
+                    default: "IN_PROGRESS",
+                    displayOptions: {
+                        show: {
+                            resource: ["ticket"],
+                            operation: ["updateStatus"],
+                        },
+                    },
+                    description: "The new status for the ticket",
+                },
+                {
+                    displayName: "User Email",
+                    name: "userEmail",
+                    type: "string",
+                    required: true,
+                    default: "",
+                    placeholder: "user@example.com",
+                    displayOptions: {
+                        show: {
+                            resource: ["ticket"],
+                            operation: ["updateStatus"],
+                            status: ["IN_PROGRESS"],
+                        },
+                    },
+                    description: "The email of the user to assign the ticket to",
+                },
+                {
+                    displayName: "Ticket ID",
+                    name: "ticketId",
+                    type: "string",
+                    required: true,
+                    displayOptions: {
+                        show: {
+                            resource: ["queue"],
+                            operation: ["assignQueue"],
+                        },
+                    },
+                    default: "",
+                    description: "The ticket ID to assign to the queue",
+                },
+                {
+                    displayName: "Queue",
+                    name: "queueId",
+                    type: "resourceLocator",
+                    default: { mode: "list", value: "" },
+                    required: true,
+                    modes: [
+                        {
+                            displayName: "From List",
+                            name: "list",
+                            type: "list",
+                            hint: "Select a queue",
+                            typeOptions: {
+                                searchListMethod: "searchQueues",
+                                searchable: true,
+                            },
+                        },
+                    ],
+                    displayOptions: {
+                        show: {
+                            resource: ["queue"],
+                            operation: ["assignQueue"],
+                        },
+                    },
+                    description: "The queue to assign the ticket to",
+                },
                 {
                     displayName: "Ticket ID",
                     name: "ticketId",
@@ -377,11 +524,37 @@ class Waapy {
                     displayOptions: {
                         show: {
                             resource: ["message"],
-                            operation: ["sendText", "sendImage", "sendTemplate"],
+                            operation: ["sendText", "sendImage"],
                         },
                     },
                     description: "The connection to use for sending the message",
                 },
+                {
+                    displayName: "WhatsApp Connection",
+                    name: "whatsappConnectionName",
+                    type: "resourceLocator",
+                    default: { mode: "list", value: "" },
+                    required: true,
+                    modes: [
+                        {
+                            displayName: "From List",
+                            name: "list",
+                            type: "list",
+                            hint: "Select a WhatsApp connection",
+                            typeOptions: {
+                                searchListMethod: "searchWhatsAppConnections",
+                                searchable: true,
+                            },
+                        },
+                    ],
+                    displayOptions: {
+                        show: {
+                            resource: ["message"],
+                            operation: ["sendTemplate"],
+                        },
+                    },
+                    description: "The WhatsApp connection to use for sending the template message",
+                },
                 {
                     displayName: "Recipient Number",
                     name: "toNumber",
@@ -699,29 +872,6 @@ class Waapy {
                     },
                     description: "Optional reply buttons for this text message. Maximum 10 buttons.",
                 },
-                {
-                    displayName: "Image Source",
-                    name: "imageUploadMethod",
-                    type: "options",
-                    options: [
-                        {
-                            name: "From URL",
-                            value: "url",
-                        },
-                        {
-                            name: "Upload File",
-                            value: "upload",
-                        },
-                    ],
-                    default: "url",
-                    displayOptions: {
-                        show: {
-                            resource: ["message"],
-                            operation: ["sendImage"],
-                        },
-                    },
-                    description: "Whether to send an image from a URL or upload a file",
-                },
                 {
                     displayName: "Image URL",
                     name: "mediaUrl",
@@ -731,27 +881,11 @@ class Waapy {
                         show: {
                             resource: ["message"],
                             operation: ["sendImage"],
-                            imageUploadMethod: ["url"],
                         },
                     },
                     default: "",
                     description: "The URL of the image to send",
                 },
-                {
-                    displayName: "Input Binary Field",
-                    name: "binaryPropertyName",
-                    type: "string",
-                    default: "data",
-                    required: true,
-                    displayOptions: {
-                        show: {
-                            resource: ["message"],
-                            operation: ["sendImage"],
-                            imageUploadMethod: ["upload"],
-                        },
-                    },
-                    description: "Name of the binary property containing the image data",
-                },
                 {
                     displayName: "Caption",
                     name: "caption",
@@ -771,7 +905,7 @@ class Waapy {
             listSearch: {
                 async searchConnections(filter) {
                     const credentials = await this.getCredentials("waapyApi");
-                    const baseUrl = credentials["server-url"];
+                    const baseUrl = normalizeBaseUrl(credentials["server-url"]);
                     let url = `${baseUrl}/n8n/connections`;
                     if (filter) {
                         url += `?searchParam=${encodeURIComponent(filter)}`;
@@ -796,9 +930,39 @@ class Waapy {
                         throw new n8n_workflow_1.NodeApiError(this.getNode(), error);
                     }
                 },
+                async searchWhatsAppConnections(filter) {
+                    const credentials = await this.getCredentials("waapyApi");
+                    const baseUrl = normalizeBaseUrl(credentials["server-url"]);
+                    let url = `${baseUrl}/n8n/connections`;
+                    if (filter) {
+                        url += `?searchParam=${encodeURIComponent(filter)}`;
+                    }
+                    try {
+                        const responseData = await this.helpers.httpRequestWithAuthentication.call(this, "waapyApi", {
+                            method: "GET",
+                            url,
+                            json: true,
+                        });
+                        const results = ensureArray(responseData.connections)
+                            .filter((connection) => typeof connection.name === "string" &&
+                            connection.name.length > 0 &&
+                            typeof connection.type === "string" &&
+                            connection.type.toUpperCase().startsWith("WHATSAPP"))
+                            .map((connection) => ({
+                            name: connection.name,
+                            value: connection.name,
+                        }));
+                        return {
+                            results,
+                        };
+                    }
+                    catch (error) {
+                        throw new n8n_workflow_1.NodeApiError(this.getNode(), error);
+                    }
+                },
                 async searchTemplates(filter) {
                     const credentials = await this.getCredentials("waapyApi");
-                    const baseUrl = credentials["server-url"];
+                    const baseUrl = normalizeBaseUrl(credentials["server-url"]);
                     let url = `${baseUrl}/n8n/templates`;
                     if (filter) {
                         url += `?searchName=${encodeURIComponent(filter)}`;
@@ -830,7 +994,7 @@ class Waapy {
                 },
                 async searchLabels(filter) {
                     const credentials = await this.getCredentials("waapyApi");
-                    const baseUrl = credentials["server-url"];
+                    const baseUrl = normalizeBaseUrl(credentials["server-url"]);
                     let url = `${baseUrl}/n8n/labels`;
                     if (filter) {
                         url += `?searchName=${encodeURIComponent(filter)}`;
@@ -859,6 +1023,68 @@ class Waapy {
                         throw new n8n_workflow_1.NodeApiError(this.getNode(), error);
                     }
                 },
+                async searchQueues(filter) {
+                    const credentials = await this.getCredentials("waapyApi");
+                    const baseUrl = normalizeBaseUrl(credentials["server-url"]);
+                    let url = `${baseUrl}/n8n/queues`;
+                    if (filter) {
+                        url += `?searchName=${encodeURIComponent(filter)}`;
+                    }
+                    try {
+                        const responseData = await this.helpers.httpRequestWithAuthentication.call(this, "waapyApi", {
+                            method: "GET",
+                            url,
+                            json: true,
+                        });
+                        const queues = ensureArray(responseData.queues);
+                        const results = queues
+                            .map((queue) => {
+                            var _a, _b, _c;
+                            return ({
+                                name: (_b = (_a = queue.name) !== null && _a !== void 0 ? _a : queue.id) !== null && _b !== void 0 ? _b : "Unnamed Queue",
+                                value: (_c = queue.id) !== null && _c !== void 0 ? _c : "",
+                            });
+                        })
+                            .filter((queue) => queue.value !== "");
+                        return {
+                            results,
+                        };
+                    }
+                    catch (error) {
+                        throw new n8n_workflow_1.NodeApiError(this.getNode(), error);
+                    }
+                },
+                async searchUsers(filter) {
+                    const credentials = await this.getCredentials("waapyApi");
+                    const baseUrl = normalizeBaseUrl(credentials["server-url"]);
+                    let url = `${baseUrl}/n8n/users`;
+                    if (filter) {
+                        url += `?searchName=${encodeURIComponent(filter)}`;
+                    }
+                    try {
+                        const responseData = await this.helpers.httpRequestWithAuthentication.call(this, "waapyApi", {
+                            method: "GET",
+                            url,
+                            json: true,
+                        });
+                        const users = ensureArray(responseData.users);
+                        const results = users
+                            .map((user) => {
+                            var _a, _b, _c, _d;
+                            return ({
+                                name: (_c = (_b = (_a = user.name) !== null && _a !== void 0 ? _a : user.email) !== null && _b !== void 0 ? _b : user.id) !== null && _c !== void 0 ? _c : "Unnamed User",
+                                value: (_d = user.id) !== null && _d !== void 0 ? _d : "",
+                            });
+                        })
+                            .filter((user) => user.value !== "");
+                        return {
+                            results,
+                        };
+                    }
+                    catch (error) {
+                        throw new n8n_workflow_1.NodeApiError(this.getNode(), error);
+                    }
+                },
             },
         };
     }
@@ -877,7 +1103,7 @@ class Waapy {
                         const target = this.getNodeParameter("target", i);
                         const action = this.getNodeParameter("action", i);
                         const credentials = await this.getCredentials("waapyApi");
-                        const baseUrl = credentials["server-url"];
+                        const baseUrl = normalizeBaseUrl(credentials["server-url"]);
                         if (ticketId.length === 0) {
                             throw new n8n_workflow_1.NodeOperationError(this.getNode(), "Ticket ID is required.", { itemIndex: i });
                         }
@@ -919,10 +1145,65 @@ class Waapy {
                             });
                     }
                 }
+                else if (resource === "queue") {
+                    if (operation === "assignQueue") {
+                        const ticketId = `${this.getNodeParameter("ticketId", i)}`.trim();
+                        const queueId = `${this.getNodeParameter("queueId", i, "", {
+                            extractValue: true,
+                        })}`.trim();
+                        const credentials = await this.getCredentials("waapyApi");
+                        const baseUrl = normalizeBaseUrl(credentials["server-url"]);
+                        if (ticketId.length === 0) {
+                            throw new n8n_workflow_1.NodeOperationError(this.getNode(), "Ticket ID is required.", { itemIndex: i });
+                        }
+                        if (queueId.length === 0) {
+                            throw new n8n_workflow_1.NodeOperationError(this.getNode(), "Queue is required.", { itemIndex: i });
+                        }
+                        responseData =
+                            await this.helpers.httpRequestWithAuthentication.call(this, "waapyApi", {
+                                method: "POST",
+                                url: `${baseUrl}/n8n/tickets/queue`,
+                                body: {
+                                    ticketId,
+                                    queueId,
+                                },
+                                json: true,
+                            });
+                    }
+                }
+                else if (resource === "ticket") {
+                    if (operation === "updateStatus") {
+                        const ticketId = `${this.getNodeParameter("ticketId", i)}`.trim();
+                        const status = this.getNodeParameter("status", i);
+                        const credentials = await this.getCredentials("waapyApi");
+                        const baseUrl = normalizeBaseUrl(credentials["server-url"]);
+                        if (ticketId.length === 0) {
+                            throw new n8n_workflow_1.NodeOperationError(this.getNode(), "Ticket ID is required.", { itemIndex: i });
+                        }
+                        const body = {
+                            ticketId,
+                            status,
+                        };
+                        if (status === "IN_PROGRESS") {
+                            const userEmail = `${this.getNodeParameter("userEmail", i, "")}`.trim();
+                            if (userEmail.length === 0) {
+                                throw new n8n_workflow_1.NodeOperationError(this.getNode(), "User Email is required when status is Open.", { itemIndex: i });
+                            }
+                            body.userEmail = userEmail;
+                        }
+                        responseData =
+                            await this.helpers.httpRequestWithAuthentication.call(this, "waapyApi", {
+                                method: "POST",
+                                url: `${baseUrl}/n8n/tickets/status`,
+                                body,
+                                json: true,
+                            });
+                    }
+                }
                 else if (resource === "message") {
                     const toNumber = this.getNodeParameter("toNumber", i);
                     const credentials = await this.getCredentials("waapyApi");
-                    const baseUrl = credentials["server-url"];
+                    const baseUrl = normalizeBaseUrl(credentials["server-url"]);
                     if (operation === "sendText") {
                         const text = this.getNodeParameter("text", i);
                         const textButtons = (_a = this.getNodeParameter("textButtons", i, {}).values) !== null && _a !== void 0 ? _a : [];
@@ -965,7 +1246,6 @@ class Waapy {
                             });
                     }
                     else if (operation === "sendImage") {
-                        const imageUploadMethod = this.getNodeParameter("imageUploadMethod", i);
                         const caption = this.getNodeParameter("caption", i);
                         const body = {
                             connectionName: this.getNodeParameter("connectionName", i, "", {
@@ -975,16 +1255,9 @@ class Waapy {
                             message: {
                                 body: caption,
                                 type: "text",
+                                mediaUrl: this.getNodeParameter("mediaUrl", i),
                             },
                         };
-                        if (imageUploadMethod === "url") {
-                            body.message.mediaUrl = this.getNodeParameter("mediaUrl", i);
-                        }
-                        else {
-                            const binaryPropertyName = this.getNodeParameter("binaryPropertyName", i);
-                            const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
-                            body.message.mediaBase64 = `data:${binaryData.mimeType};base64,${binaryData.data}`;
-                        }
                         responseData =
                             await this.helpers.httpRequestWithAuthentication.call(this, "waapyApi", {
                                 method: "POST",
@@ -1042,7 +1315,7 @@ class Waapy {
                         const normalizedButtonParameters = buttonParameters;
                         const fetchTemplateDetail = async (templateId) => await this.helpers.httpRequestWithAuthentication.call(this, "waapyApi", {
                             method: "GET",
-                            url: `${baseUrl}/n8n/templates/${templateId}?connectionName=${this.getNodeParameter("connectionName", i, "", {
+                            url: `${baseUrl}/n8n/templates/${templateId}?connectionName=${this.getNodeParameter("whatsappConnectionName", i, "", {
                                 extractValue: true,
                             })}`,
                             json: true,
@@ -1146,7 +1419,7 @@ class Waapy {
                                 method: "POST",
                                 url: `${baseUrl}/n8n/messages/send-template`,
                                 body: {
-                                    connectionName: this.getNodeParameter("connectionName", i, "", {
+                                    connectionName: this.getNodeParameter("whatsappConnectionName", i, "", {
                                         extractValue: true,
                                     }),
                                     recipient: toNumber,