n8n-nodes-mautic-advanced 1.1.0 → 1.2.1

package/dist/nodes/MauticAdvanced/CompanyDescription.js

@@ -226,6 +226,16 @@ exports.companyFields = [
                 type: 'number',
                 default: 0,
             },
+            {
+                displayName: 'Owner Name or ID',
+                name: 'owner',
+                type: 'options',
+                description: 'User to assign as company owner. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
+                typeOptions: {
+                    loadOptionsMethod: 'getOwners',
+                },
+                default: '',
+            },
             {
                 displayName: 'Overwrite With Blank',
                 name: 'overwriteWithBlank',
@@ -431,6 +441,16 @@ exports.companyFields = [
                 type: 'number',
                 default: 0,
             },
+            {
+                displayName: 'Owner Name or ID',
+                name: 'owner',
+                type: 'options',
+                description: 'User to assign as company owner. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
+                typeOptions: {
+                    loadOptionsMethod: 'getOwners',
+                },
+                default: '',
+            },
             {
                 displayName: 'Overwrite With Blank',
                 name: 'overwriteWithBlank',

package/dist/nodes/MauticAdvanced/ContactDescription.js

@@ -446,11 +446,14 @@ exports.contactFields = [
                 default: '',
             },
             {
-                displayName: 'Owner ID',
-                name: 'ownerId',
-                type: 'string',
+                displayName: 'Owner Name or ID',
+                name: 'owner',
+                type: 'options',
+                description: 'User to assign as contact owner. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
+                typeOptions: {
+                    loadOptionsMethod: 'getOwners',
+                },
                 default: '',
-                description: 'ID of a Mautic user to assign this contact to',
             },
             {
                 displayName: 'Phone',
@@ -1002,16 +1005,19 @@ exports.contactFields = [
                 default: '',
             },
             {
-                displayName: 'Owner ID',
-                name: 'ownerId',
-                type: 'string',
+                displayName: 'Owner Name or ID',
+                name: 'owner',
+                type: 'options',
+                description: 'User to assign as contact owner. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
+                typeOptions: {
+                    loadOptionsMethod: 'getOwners',
+                },
                 displayOptions: {
                     show: {
                         '/jsonParameters': [false],
                     },
                 },
                 default: '',
-                description: 'ID of a Mautic user to assign this contact to',
             },
             {
                 displayName: 'Phone',
@@ -1392,7 +1398,7 @@ exports.contactFields = [
                 name: 'fieldsToReturn',
                 type: 'multiOptions',
                 typeOptions: {
-                    loadOptionsMethod: 'getContactFields',
+                    loadOptionsMethod: 'getContactFieldsToReturn',
                 },
                 default: [],
                 description: 'Select which fields to include in the output. Leave empty to return all fields.',
@@ -1487,7 +1493,7 @@ exports.contactFields = [
                 name: 'fieldsToReturn',
                 type: 'multiOptions',
                 typeOptions: {
-                    loadOptionsMethod: 'getContactFields',
+                    loadOptionsMethod: 'getContactFieldsToReturn',
                 },
                 default: [],
                 description: 'Select which fields to include in the output. Leave empty to return all fields.',

package/dist/nodes/MauticAdvanced/GenericFunctions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateJSON = exports.serialiseMauticWhere = exports.mauticApiRequestAllItems = exports.mauticApiRequest = void 0;
+exports.validateJSON = exports.serialiseMauticWhere = exports.mauticApiRequestAllItems = exports.DEFAULT_MAUTIC_PAGE_SIZE = exports.mauticApiRequest = void 0;
 const n8n_workflow_1 = require("n8n-workflow");
 const authenticatedRequest_1 = require("./utils/authenticatedRequest");
 async function mauticApiRequest(method, endpoint, body = {}, query, uri, headers) {
@@ -40,40 +40,62 @@ exports.mauticApiRequest = mauticApiRequest;
  * Make an API request to paginated mautic endpoint
  * and return all results
  */
-// Optional: Slightly improved error handling
+exports.DEFAULT_MAUTIC_PAGE_SIZE = 100;
+function toPositiveInteger(value) {
+    const numericValue = typeof value === 'number' ? value : typeof value === 'string' ? Number(value) : undefined;
+    if (numericValue === undefined || !Number.isFinite(numericValue) || numericValue <= 0) {
+        return undefined;
+    }
+    return Math.floor(numericValue);
+}
+function getPaginationStart(value) {
+    const start = toPositiveInteger(value);
+    return start ?? 0;
+}
+function getResponseItems(responseData, propertyName) {
+    const responseProperty = responseData[propertyName];
+    if (!responseProperty || typeof responseProperty !== 'object') {
+        return [];
+    }
+    if (Array.isArray(responseProperty)) {
+        return responseProperty;
+    }
+    return Object.values(responseProperty);
+}
 async function mauticApiRequestAllItems(propertyName, method, endpoint, body = {}, query = {}, maxResults) {
     const returnData = [];
-    let responseData;
-    query.limit = 30;
-    query.start = 0;
-    while (true) {
+    const baseQuery = { ...query };
+    const requestedStart = getPaginationStart(baseQuery.start);
+    const totalLimit = toPositiveInteger(maxResults);
+    delete baseQuery.start;
+    delete baseQuery.limit;
+    let currentStart = requestedStart;
+    while (totalLimit === undefined || returnData.length < totalLimit) {
+        const remaining = totalLimit === undefined ? undefined : totalLimit - returnData.length;
+        const pageLimit = remaining === undefined
+            ? exports.DEFAULT_MAUTIC_PAGE_SIZE
+            : Math.min(exports.DEFAULT_MAUTIC_PAGE_SIZE, remaining);
+        const pageQuery = {
+            ...baseQuery,
+            limit: pageLimit,
+            start: currentStart,
+        };
         try {
-            responseData = await mauticApiRequest.call(this, method, endpoint, body, query);
+            const responseData = await mauticApiRequest.call(this, method, endpoint, body, pageQuery);
             if (responseData.errors) {
                 throw new n8n_workflow_1.NodeApiError(this.getNode(), responseData);
             }
-            const pageItems = responseData[propertyName]
-                ? Object.values(responseData[propertyName])
-                : [];
+            const pageItems = getResponseItems(responseData, propertyName);
             if (!pageItems.length) {
                 break;
             }
-            if (maxResults !== undefined && returnData.length + pageItems.length > maxResults) {
-                const needed = maxResults - returnData.length;
-                returnData.push(...pageItems.slice(0, needed));
-                break;
-            }
-            else {
-                returnData.push(...pageItems);
-            }
-            query.start = Number(query.start) + pageItems.length;
-            // If less than limit returned, no more data
-            if (pageItems.length < Number(query.limit)) {
+            returnData.push(...pageItems);
+            if (pageItems.length < pageLimit) {
                 break;
             }
+            currentStart += pageItems.length;
         }
         catch (error) {
-            // Optional: Only wrap non-NodeApiError errors
             if (error instanceof n8n_workflow_1.NodeApiError || error instanceof n8n_workflow_1.NodeOperationError) {
                 throw error;
             }

package/dist/nodes/MauticAdvanced/MauticAdvanced.node.js

@@ -25,6 +25,7 @@ const ContactSegmentDescription_1 = require("./ContactSegmentDescription");
 const EmailDescription_1 = require("./EmailDescription");
 const FieldDescription_1 = require("./FieldDescription");
 const GenericFunctions_1 = require("./GenericFunctions");
+const loadOptionsCache_1 = require("./utils/loadOptionsCache");
 const NoteDescription_1 = require("./NoteDescription");
 const NotificationDescription_1 = require("./NotificationDescription");
 const SegmentEmailDescription_1 = require("./SegmentEmailDescription");
@@ -230,7 +231,7 @@ class MauticAdvanced {
                 // select them easily
                 async getTags() {
                     const returnData = [];
-                    const tags = await GenericFunctions_1.mauticApiRequestAllItems.call(this, 'tags', 'GET', '/tags');
+                    const tags = await (0, loadOptionsCache_1.getCachedMauticLoadOptions)(this, 'tags', () => GenericFunctions_1.mauticApiRequestAllItems.call(this, 'tags', 'GET', '/tags'));
                     for (const tag of tags) {
                         returnData.push({
                             name: tag.tag,
@@ -243,7 +244,7 @@ class MauticAdvanced {
                 // select them easily
                 async getStages() {
                     const returnData = [];
-                    const stages = await GenericFunctions_1.mauticApiRequestAllItems.call(this, 'stages', 'GET', '/stages');
+                    const stages = await (0, loadOptionsCache_1.getCachedMauticLoadOptions)(this, 'stages', () => GenericFunctions_1.mauticApiRequestAllItems.call(this, 'stages', 'GET', '/stages'));
                     for (const stage of stages) {
                         returnData.push({
                             name: stage.name,
@@ -256,7 +257,7 @@ class MauticAdvanced {
                 // select them easily
                 async getCompanyFields() {
                     const returnData = [];
-                    const fields = await GenericFunctions_1.mauticApiRequestAllItems.call(this, 'fields', 'GET', '/fields/company');
+                    const fields = await (0, loadOptionsCache_1.getCachedMauticLoadOptions)(this, 'fields:company', () => GenericFunctions_1.mauticApiRequestAllItems.call(this, 'fields', 'GET', '/fields/company'));
                     for (const field of fields) {
                         returnData.push({
                             name: field.label,
@@ -267,7 +268,7 @@ class MauticAdvanced {
                 },
                 async getIndustries() {
                     const returnData = [];
-                    const fields = await GenericFunctions_1.mauticApiRequestAllItems.call(this, 'fields', 'GET', '/fields/company');
+                    const fields = await (0, loadOptionsCache_1.getCachedMauticLoadOptions)(this, 'fields:company', () => GenericFunctions_1.mauticApiRequestAllItems.call(this, 'fields', 'GET', '/fields/company'));
                     for (const field of fields) {
                         if (field.alias === 'companyindustry') {
                             for (const { label, value } of field.properties.list) {
@@ -284,6 +285,15 @@ class MauticAdvanced {
                 // select them easily
                 async getContactFields() {
                     const returnData = [];
+                    const seen = new Set();
+                    const addField = (field) => {
+                        const value = String(field.value);
+                        if (seen.has(value)) {
+                            return;
+                        }
+                        seen.add(value);
+                        returnData.push(field);
+                    };
                     // Add key system fields manually (except last_active, which is already present)
                     const systemFields = [
                         { name: 'Date Added', value: 'date_added' },
@@ -291,11 +301,57 @@ class MauticAdvanced {
                         { name: 'ID', value: 'id' },
                         { name: 'Owner ID', value: 'owner_id' },
                     ];
-                    returnData.push(...systemFields);
+                    systemFields.forEach(addField);
                     // Fetch custom and other fields from Mautic
-                    const fields = await GenericFunctions_1.mauticApiRequestAllItems.call(this, 'fields', 'GET', '/fields/contact');
+                    const fields = await (0, loadOptionsCache_1.getCachedMauticLoadOptions)(this, 'fields:contact', () => GenericFunctions_1.mauticApiRequestAllItems.call(this, 'fields', 'GET', '/fields/contact'));
                     for (const field of fields) {
-                        returnData.push({
+                        addField({
+                            name: field.label,
+                            value: field.alias,
+                        });
+                    }
+                    return returnData;
+                },
+                // Get all contact output fields, including raw top-level properties that are
+                // not returned by Mautic's contact fields endpoint.
+                async getContactFieldsToReturn() {
+                    const returnData = [];
+                    const seen = new Set();
+                    const addField = (field) => {
+                        const value = String(field.value);
+                        if (seen.has(value)) {
+                            return;
+                        }
+                        seen.add(value);
+                        returnData.push(field);
+                    };
+                    const rawContactFields = [
+                        { name: 'Date Added', value: 'date_added' },
+                        { name: 'Date Modified', value: 'date_modified' },
+                        { name: 'ID', value: 'id' },
+                        { name: 'Owner ID', value: 'owner_id' },
+                        { name: 'Color', value: 'color' },
+                        { name: 'Created By', value: 'createdBy' },
+                        { name: 'Created By User', value: 'createdByUser' },
+                        { name: 'Date Identified', value: 'date_identified' },
+                        { name: 'Do Not Contact', value: 'doNotContact' },
+                        { name: 'Frequency Rules', value: 'frequencyRules' },
+                        { name: 'IP Addresses', value: 'ipAddresses' },
+                        { name: 'Is Published', value: 'isPublished' },
+                        { name: 'Last Active', value: 'last_active' },
+                        { name: 'Modified By', value: 'modifiedBy' },
+                        { name: 'Modified By User', value: 'modifiedByUser' },
+                        { name: 'Owner', value: 'owner' },
+                        { name: 'Points', value: 'points' },
+                        { name: 'Preferred Profile Image', value: 'preferredProfileImage' },
+                        { name: 'Stage', value: 'stage' },
+                        { name: 'Tags', value: 'tags' },
+                        { name: 'UTM Tags', value: 'utmtags' },
+                    ];
+                    rawContactFields.forEach(addField);
+                    const fields = await (0, loadOptionsCache_1.getCachedMauticLoadOptions)(this, 'fields:contact', () => GenericFunctions_1.mauticApiRequestAllItems.call(this, 'fields', 'GET', '/fields/contact'));
+                    for (const field of fields) {
+                        addField({
                             name: field.label,
                             value: field.alias,
                         });
@@ -306,7 +362,7 @@ class MauticAdvanced {
                 // select them easily
                 async getSegments() {
                     const returnData = [];
-                    const segments = await GenericFunctions_1.mauticApiRequestAllItems.call(this, 'lists', 'GET', '/segments');
+                    const segments = await (0, loadOptionsCache_1.getCachedMauticLoadOptions)(this, 'segments', () => GenericFunctions_1.mauticApiRequestAllItems.call(this, 'lists', 'GET', '/segments'));
                     for (const segment of segments) {
                         returnData.push({
                             name: segment.name,
@@ -318,7 +374,7 @@ class MauticAdvanced {
                 // Get all the available segments (by alias) for search filtering
                 async getSegmentAliases() {
                     const returnData = [];
-                    const segments = await GenericFunctions_1.mauticApiRequestAllItems.call(this, 'lists', 'GET', '/segments');
+                    const segments = await (0, loadOptionsCache_1.getCachedMauticLoadOptions)(this, 'segments', () => GenericFunctions_1.mauticApiRequestAllItems.call(this, 'lists', 'GET', '/segments'));
                     for (const segment of segments) {
                         // Use alias if available, otherwise skip (alias is required for search syntax)
                         const alias = segment.alias || segment.id?.toString();
@@ -334,15 +390,13 @@ class MauticAdvanced {
                 // Get all the available owners (users) for filtering
                 async getOwners() {
                     const returnData = [];
-                    const response = await GenericFunctions_1.mauticApiRequest.call(this, 'GET', '/contacts/list/owners');
-                    const owners = response || [];
-                    for (const owner of owners) {
-                        returnData.push({
-                            name: `${owner.firstName || ''} ${owner.lastName || ''}`.trim() ||
-                                owner.username ||
-                                `User ${owner.id}`,
-                            value: owner.id,
-                        });
+                    const response = await GenericFunctions_1.mauticApiRequest.call(this, 'GET', '/users');
+                    const users = response?.users ? Object.values(response.users) : [];
+                    for (const user of users) {
+                        const fullName = `${user.firstName || ''} ${user.lastName || ''}`.trim();
+                        const display = fullName || user.username || `User ${user.id}`;
+                        const label = user.email ? `${display} (${user.email})` : display;
+                        returnData.push({ name: label, value: user.id });
                     }
                     return returnData;
                 },
@@ -350,7 +404,7 @@ class MauticAdvanced {
                 // select them easily
                 async getCampaigns() {
                     const returnData = [];
-                    const campaings = await GenericFunctions_1.mauticApiRequestAllItems.call(this, 'campaigns', 'GET', '/campaigns');
+                    const campaings = await (0, loadOptionsCache_1.getCachedMauticLoadOptions)(this, 'campaigns', () => GenericFunctions_1.mauticApiRequestAllItems.call(this, 'campaigns', 'GET', '/campaigns'));
                     for (const campaign of campaings) {
                         returnData.push({
                             name: campaign.name,
@@ -363,7 +417,7 @@ class MauticAdvanced {
                 // select them easily
                 async getEmails() {
                     const returnData = [];
-                    const emails = await GenericFunctions_1.mauticApiRequestAllItems.call(this, 'emails', 'GET', '/emails');
+                    const emails = await (0, loadOptionsCache_1.getCachedMauticLoadOptions)(this, 'emails', () => GenericFunctions_1.mauticApiRequestAllItems.call(this, 'emails', 'GET', '/emails'));
                     for (const email of emails) {
                         returnData.push({
                             name: email.name,
@@ -376,7 +430,7 @@ class MauticAdvanced {
                 // select them easily
                 async getSegmentEmails() {
                     const returnData = [];
-                    const emails = await GenericFunctions_1.mauticApiRequestAllItems.call(this, 'emails', 'GET', '/emails');
+                    const emails = await (0, loadOptionsCache_1.getCachedMauticLoadOptions)(this, 'emails', () => GenericFunctions_1.mauticApiRequestAllItems.call(this, 'emails', 'GET', '/emails'));
                     for (const email of emails) {
                         if (email.emailType === 'list') {
                             returnData.push({
@@ -391,7 +445,7 @@ class MauticAdvanced {
                 // select them easily
                 async getCampaignEmails() {
                     const returnData = [];
-                    const emails = await GenericFunctions_1.mauticApiRequestAllItems.call(this, 'emails', 'GET', '/emails');
+                    const emails = await (0, loadOptionsCache_1.getCachedMauticLoadOptions)(this, 'emails', () => GenericFunctions_1.mauticApiRequestAllItems.call(this, 'emails', 'GET', '/emails'));
                     for (const email of emails) {
                         if (email.emailType === 'template') {
                             returnData.push({
@@ -406,7 +460,7 @@ class MauticAdvanced {
                 // select them easily
                 async getEmailCategories() {
                     const returnData = [];
-                    const categories = await GenericFunctions_1.mauticApiRequestAllItems.call(this, 'categories', 'GET', '/categories');
+                    const categories = await (0, loadOptionsCache_1.getCachedMauticLoadOptions)(this, 'categories', () => GenericFunctions_1.mauticApiRequestAllItems.call(this, 'categories', 'GET', '/categories'));
                     for (const category of categories) {
                         // Filter for email bundle categories
                         if (category.bundle === 'email' || category.bundle === 'global') {
@@ -422,7 +476,7 @@ class MauticAdvanced {
                 // select them easily
                 async getForms() {
                     const returnData = [];
-                    const forms = await GenericFunctions_1.mauticApiRequestAllItems.call(this, 'forms', 'GET', '/forms');
+                    const forms = await (0, loadOptionsCache_1.getCachedMauticLoadOptions)(this, 'forms', () => GenericFunctions_1.mauticApiRequestAllItems.call(this, 'forms', 'GET', '/forms'));
                     for (const form of forms) {
                         returnData.push({
                             name: form.name,
@@ -435,7 +489,7 @@ class MauticAdvanced {
                 // select them easily
                 async getAssets() {
                     const returnData = [];
-                    const assets = await GenericFunctions_1.mauticApiRequestAllItems.call(this, 'assets', 'GET', '/assets');
+                    const assets = await (0, loadOptionsCache_1.getCachedMauticLoadOptions)(this, 'assets', () => GenericFunctions_1.mauticApiRequestAllItems.call(this, 'assets', 'GET', '/assets'));
                     for (const asset of assets) {
                         returnData.push({
                             name: asset.title,

package/dist/nodes/MauticAdvanced/operations/CompanyOperations.js

@@ -38,7 +38,7 @@ async function createCompany(context, itemIndex) {
     const name = (0, ApiHelpers_1.getRequiredParam)(context, 'name', itemIndex);
     const body = { companyname: name };
     const additionalFields = (0, ApiHelpers_1.getOptionalParam)(context, 'additionalFields', itemIndex, {});
-    const { addressUi, customFieldsUi, companyEmail, fax, industry, numberOfEmployees, phone, website, annualRevenue, description, ...rest } = additionalFields;
+    const { addressUi, customFieldsUi, companyEmail, fax, industry, numberOfEmployees, owner, phone, website, annualRevenue, description, ...rest } = additionalFields;
     if (addressUi?.addressValues) {
         const { addressValues } = addressUi;
         body.companyaddress1 = addressValues.address1;
@@ -56,6 +56,8 @@ async function createCompany(context, itemIndex) {
         body.companyindustry = industry;
     if (numberOfEmployees)
         body.companynumber_of_employees = numberOfEmployees;
+    if (owner)
+        body.owner = owner;
     if (phone)
         body.companyphone = phone;
     if (website)
@@ -73,7 +75,7 @@ async function createCompany(context, itemIndex) {
     const response = await (0, ApiHelpers_1.makeApiRequest)(context, 'POST', '/companies/new', body);
     let result = response.company;
     if (simple) {
-        result = result.fields.all;
+        result = toSimpleCompany(result);
     }
     return result;
 }
@@ -82,7 +84,7 @@ async function updateCompany(context, itemIndex) {
     const simple = (0, ApiHelpers_1.getOptionalParam)(context, 'simple', itemIndex, false);
     const body = {};
     const updateFields = (0, ApiHelpers_1.getOptionalParam)(context, 'updateFields', itemIndex, {});
-    const { addressUi, customFieldsUi, companyEmail, name, fax, industry, numberOfEmployees, phone, website, annualRevenue, description, ...rest } = updateFields;
+    const { addressUi, customFieldsUi, companyEmail, name, fax, industry, numberOfEmployees, owner, phone, website, annualRevenue, description, ...rest } = updateFields;
     if (addressUi?.addressValues) {
         const { addressValues } = addressUi;
         body.companyaddress1 = addressValues.address1;
@@ -102,6 +104,8 @@ async function updateCompany(context, itemIndex) {
         body.companyindustry = industry;
     if (numberOfEmployees)
         body.companynumber_of_employees = numberOfEmployees;
+    if (owner)
+        body.owner = owner;
     if (phone)
         body.companyphone = phone;
     if (website)
@@ -119,7 +123,7 @@ async function updateCompany(context, itemIndex) {
     const response = await (0, ApiHelpers_1.makeApiRequest)(context, 'PATCH', `/companies/${companyId}/edit`, body);
     let result = response.company;
     if (simple) {
-        result = result.fields.all;
+        result = toSimpleCompany(result);
     }
     return result;
 }
@@ -129,7 +133,7 @@ async function getCompany(context, itemIndex) {
     const response = await (0, ApiHelpers_1.makeApiRequest)(context, 'GET', `/companies/${companyId}`);
     let result = response.company;
     if (simple) {
-        result = result.fields.all;
+        result = toSimpleCompany(result);
     }
     return (0, DataHelpers_1.convertNumericStrings)(result);
 }
@@ -154,7 +158,7 @@ async function getAllCompanies(context, itemIndex) {
         responseData = (response.companies ? Object.values(response.companies) : []);
     }
     if (simple) {
-        responseData = responseData.map((item) => item.fields.all);
+        responseData = responseData.map((item) => toSimpleCompany(item));
     }
     return (0, DataHelpers_1.convertNumericStrings)(responseData);
 }
@@ -164,7 +168,14 @@ async function deleteCompany(context, itemIndex) {
     const response = await (0, ApiHelpers_1.makeApiRequest)(context, 'DELETE', `/companies/${companyId}/delete`);
     let result = response.company;
     if (simple) {
-        result = result.fields.all;
+        result = toSimpleCompany(result);
     }
     return result;
 }
+function toSimpleCompany(company) {
+    return {
+        id: company.id,
+        owner: company.owner ?? null,
+        ...company.fields.all,
+    };
+}

package/dist/nodes/MauticAdvanced/operations/ContactOperations.js

@@ -5,6 +5,7 @@ const n8n_workflow_1 = require("n8n-workflow");
 const change_case_1 = require("change-case");
 const ApiHelpers_1 = require("../utils/ApiHelpers");
 const DataHelpers_1 = require("../utils/DataHelpers");
+const GenericFunctions_1 = require("../GenericFunctions");
 async function executeContactOperation(context, operation, i) {
     let responseData;
     try {
@@ -245,7 +246,8 @@ async function getAllContacts(context, itemIndex) {
     const anyDncOnly = options.anyDncOnly === true;
     const useDncPostFilter = emailDncOnly || smsDncOnly || anyDncOnly;
     if (useDncPostFilter) {
-        responseData = await getContactsWithDncFilter(context, qs, options, returnAll ? undefined : options.limit);
+        const limit = returnAll ? undefined : (0, ApiHelpers_1.getOptionalParam)(context, 'limit', itemIndex, 30);
+        responseData = await getContactsWithDncFilter(context, qs, options, limit);
     }
     else {
         if (returnAll) {
@@ -622,13 +624,15 @@ async function getContactsWithDncFilter(context, qs, options, limit) {
     const emailDncOnly = options.emailDncOnly === true;
     const smsDncOnly = options.smsDncOnly === true;
     const anyDncOnly = options.anyDncOnly === true;
-    const start = qs.start || 0;
-    const finalLimit = limit || qs.limit || 30;
+    const requestedStart = Number(qs.start ?? 0);
+    const maxResults = typeof limit === 'number' && limit > 0 ? Math.floor(limit) : undefined;
     const contacts = [];
-    let remaining = finalLimit;
-    let currentStart = start;
-    while (remaining > 0) {
-        const pageLimit = Math.min(remaining, 30);
+    let remaining = maxResults;
+    let currentStart = Number.isFinite(requestedStart) && requestedStart > 0 ? requestedStart : 0;
+    while (remaining === undefined || remaining > 0) {
+        const pageLimit = remaining === undefined
+            ? GenericFunctions_1.DEFAULT_MAUTIC_PAGE_SIZE
+            : Math.min(remaining, GenericFunctions_1.DEFAULT_MAUTIC_PAGE_SIZE);
         const pageQs = { ...qs, start: currentStart, limit: pageLimit };
         const pageResponse = await (0, ApiHelpers_1.makeApiRequest)(context, 'GET', '/contacts', {}, pageQs);
         const pageContacts = pageResponse.contacts ? Object.values(pageResponse.contacts) : [];
@@ -644,17 +648,19 @@ async function getContactsWithDncFilter(context, qs, options, limit) {
                 return hasEmailDnc || hasSmsDnc;
             return true;
         });
-        const toAdd = filtered.slice(0, remaining);
+        const toAdd = remaining === undefined ? filtered : filtered.slice(0, remaining);
         contacts.push(...toAdd);
+        if (remaining !== undefined) {
+            remaining -= toAdd.length;
+        }
         if (pageContacts.length < pageLimit)
             break;
-        remaining -= toAdd.length;
-        currentStart += pageLimit;
+        currentStart += pageContacts.length;
     }
     return contacts;
 }
 async function getContactOwners(context) {
-    const response = await (0, ApiHelpers_1.makeApiRequest)(context, 'GET', '/contacts/list/owners');
+    const response = await (0, ApiHelpers_1.makeApiRequest)(context, 'GET', '/users');
     return (0, DataHelpers_1.convertNumericStrings)(response);
 }
 async function getContactFields(context) {

package/dist/nodes/MauticAdvanced/utils/ApiHelpers.js

@@ -17,10 +17,24 @@ async function makeApiRequest(context, method, endpoint, body = {}, query = {},
     }
 }
 exports.makeApiRequest = makeApiRequest;
+function toOptionalPositiveInteger(value) {
+    const numericValue = typeof value === 'number' ? value : typeof value === 'string' ? Number(value) : undefined;
+    if (numericValue === undefined || !Number.isFinite(numericValue) || numericValue <= 0) {
+        return undefined;
+    }
+    return Math.floor(numericValue);
+}
+function preparePaginatedQuery(query, explicitLimit) {
+    const queryForPagination = { ...query };
+    const limit = explicitLimit ?? toOptionalPositiveInteger(queryForPagination.limit);
+    delete queryForPagination.limit;
+    return { query: queryForPagination, limit };
+}
 // Standardized paginated API request wrapper
 async function makePaginatedRequest(context, resource, method, endpoint, body = {}, query = {}, limit) {
+    const pagination = preparePaginatedQuery(query, limit);
     try {
-        return await GenericFunctions_1.mauticApiRequestAllItems.call(context, resource, method, endpoint, body, query, limit);
+        return await GenericFunctions_1.mauticApiRequestAllItems.call(context, resource, method, endpoint, body, pagination.query, pagination.limit);
     }
     catch (error) {
         if (error instanceof n8n_workflow_1.NodeApiError || error instanceof n8n_workflow_1.NodeOperationError) {

package/dist/nodes/MauticAdvanced/utils/DataHelpers.js

@@ -25,27 +25,77 @@ function wrapSingleItem(data) {
 exports.wrapSingleItem = wrapSingleItem;
 // Process contact fields data for simple mode
 function processContactFields(responseData, options, fieldsToReturn) {
+    const sourceData = Array.isArray(responseData) ? responseData : [responseData];
+    const filterFields = fieldsToReturn ?? options.fieldsToReturn;
     if (options.rawData === true) {
-        return responseData;
+        if (Array.isArray(filterFields) && filterFields.length > 0) {
+            return sourceData.map((item) => filterContactFields(item, item, filterFields));
+        }
+        return sourceData;
     }
-    const processedData = Array.isArray(responseData)
-        ? responseData.map((item) => item.fields?.all || item)
-        : [responseData.fields?.all || responseData];
-    const filterFields = fieldsToReturn || options.fieldsToReturn;
+    const processedData = sourceData.map((item) => {
+        const all = item.fields?.all;
+        if (!all)
+            return item;
+        return { id: item.id, owner: item.owner ?? null, ...all };
+    });
     if (Array.isArray(filterFields) && filterFields.length > 0) {
-        return processedData.map((item) => {
-            const filtered = {};
-            for (const field of filterFields) {
-                if (Object.prototype.hasOwnProperty.call(item, field)) {
-                    filtered[field] = item[field];
-                }
-            }
-            return filtered;
-        });
+        return processedData.map((item, index) => filterContactFields(item, sourceData[index], filterFields));
     }
     return processedData;
 }
 exports.processContactFields = processContactFields;
+function filterContactFields(preferredSource, originalSource, filterFields) {
+    const filtered = {};
+    for (const field of filterFields) {
+        const preferredLookup = readContactField(preferredSource, field);
+        const lookup = preferredLookup.found
+            ? preferredLookup
+            : readContactField(originalSource, field);
+        if (lookup.found && lookup.value !== undefined) {
+            filtered[field] = lookup.value;
+        }
+    }
+    return filtered;
+}
+function readContactField(source, field) {
+    if (!source) {
+        return { found: false };
+    }
+    if (Object.prototype.hasOwnProperty.call(source, field)) {
+        return { found: true, value: source[field] };
+    }
+    const rawField = readRawContactFieldAlias(source, field);
+    if (rawField.found) {
+        return rawField;
+    }
+    const fieldsAll = source.fields?.all;
+    if (fieldsAll && Object.prototype.hasOwnProperty.call(fieldsAll, field)) {
+        return { found: true, value: fieldsAll[field] };
+    }
+    return { found: false };
+}
+function readRawContactFieldAlias(source, field) {
+    const rawAliasMap = {
+        date_added: ['dateAdded'],
+        date_identified: ['dateIdentified'],
+        date_modified: ['dateModified'],
+        last_active: ['lastActive'],
+    };
+    for (const alias of rawAliasMap[field] || []) {
+        if (Object.prototype.hasOwnProperty.call(source, alias)) {
+            return { found: true, value: source[alias] };
+        }
+    }
+    if (field === 'owner_id' && Object.prototype.hasOwnProperty.call(source, 'owner')) {
+        const owner = source.owner;
+        if (owner && typeof owner === 'object' && Object.prototype.hasOwnProperty.call(owner, 'id')) {
+            return { found: true, value: owner.id };
+        }
+        return { found: true, value: owner };
+    }
+    return { found: false };
+}
 // Validate and parse JSON input parameters
 function validateJsonParameter(context, paramName, itemIndex) {
     const jsonString = context.getNodeParameter(paramName, itemIndex);

package/dist/nodes/MauticAdvanced/utils/authenticatedRequest.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.requestMauticAuthenticated = void 0;
 const oauthRequestQueue_1 = require("./oauthRequestQueue");
+const authErrorHelpers_1 = require("./authErrorHelpers");
 function trimTrailingSlash(url) {
     return url.endsWith('/') ? url.slice(0, -1) : url;
 }
@@ -34,6 +35,11 @@ function getOAuthCredentialQueueKey(node) {
     const keyPart = credentialRefPart(credentialRef) ?? 'unknown';
     return `mauticAdvancedOAuth2Api:${keyPart}`;
 }
+async function requestOAuth2WithMauticOptions(context, helperContext, requestOptions) {
+    return (await helperContext.helpers.requestOAuth2.call(context, 'mauticAdvancedOAuth2Api', requestOptions, {
+        includeCredentialsOnRefreshOnBody: true,
+    }));
+}
 async function requestMauticAuthenticated(context, authenticationMethod, options) {
     const credentialType = authenticationMethod === 'credentials' ? 'mauticAdvancedApi' : 'mauticAdvancedOAuth2Api';
     const credentials = await context.getCredentials(credentialType);
@@ -43,10 +49,18 @@ async function requestMauticAuthenticated(context, authenticationMethod, options
         return (await helperContext.helpers.requestWithAuthentication.call(context, 'mauticAdvancedApi', requestOptions));
     }
     const queueKey = getOAuthCredentialQueueKey(context.getNode());
-    return await (0, oauthRequestQueue_1.runWithCredentialLock)(queueKey, async () => {
-        return (await helperContext.helpers.requestOAuth2.call(context, 'mauticAdvancedOAuth2Api', requestOptions, {
-            includeCredentialsOnRefreshOnBody: true,
-        }));
-    });
+    try {
+        return await (0, oauthRequestQueue_1.runTrackedCredentialRequest)(queueKey, async () => requestOAuth2WithMauticOptions(context, helperContext, requestOptions));
+    }
+    catch (error) {
+        if (!(0, authErrorHelpers_1.isInvalidGrantError)(error)) {
+            throw error;
+        }
+        await (0, oauthRequestQueue_1.waitForTrackedCredentialRequests)(queueKey);
+        return await (0, oauthRequestQueue_1.runWithCredentialLock)(queueKey, async () => {
+            await (0, oauthRequestQueue_1.waitForTrackedCredentialRequests)(queueKey);
+            return await requestOAuth2WithMauticOptions(context, helperContext, requestOptions);
+        });
+    }
 }
 exports.requestMauticAuthenticated = requestMauticAuthenticated;

package/dist/nodes/MauticAdvanced/utils/loadOptionsCache.js

@@ -0,0 +1,102 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.clearMauticLoadOptionsCacheForTests = exports.getCachedMauticLoadOptions = exports.MAUTIC_LOAD_OPTIONS_CACHE_TTL_MS = void 0;
+exports.MAUTIC_LOAD_OPTIONS_CACHE_TTL_MS = 60000;
+const loadOptionsCache = new Map();
+function getCredentialType(authenticationMethod) {
+    return authenticationMethod === 'credentials' ? 'mauticAdvancedApi' : 'mauticAdvancedOAuth2Api';
+}
+function withoutTrailingSlashes(value) {
+    return value.replace(/\/+$/, '');
+}
+function normalizeCredentialUrl(value) {
+    if (typeof value !== 'string') {
+        return '';
+    }
+    const trimmed = value.trim();
+    if (!trimmed) {
+        return '';
+    }
+    try {
+        const url = new URL(trimmed);
+        url.protocol = url.protocol.toLowerCase();
+        url.hostname = url.hostname.toLowerCase();
+        url.hash = '';
+        url.search = '';
+        url.pathname = withoutTrailingSlashes(url.pathname);
+        return withoutTrailingSlashes(url.toString());
+    }
+    catch {
+        return withoutTrailingSlashes(trimmed);
+    }
+}
+function getMauticVersion(credentials) {
+    return String(credentials.mauticVersion || 'v6');
+}
+function credentialRefPart(value) {
+    if (typeof value === 'string' && value) {
+        return value;
+    }
+    if (typeof value !== 'object' || value === null) {
+        return undefined;
+    }
+    const credentialRef = value;
+    if (credentialRef.id) {
+        return credentialRef.id;
+    }
+    if (credentialRef.name) {
+        return credentialRef.name;
+    }
+    return undefined;
+}
+function getCredentialReference(context, credentialType) {
+    const contextWithNode = context;
+    const credentialRef = contextWithNode.getNode?.().credentials?.[credentialType];
+    const nodeCredentialPart = credentialRefPart(credentialRef);
+    if (nodeCredentialPart) {
+        return nodeCredentialPart;
+    }
+    return 'unknown';
+}
+function getCacheKey(authenticationMethod, credentialType, credentialReference, credentials, datasetKey) {
+    return JSON.stringify([
+        authenticationMethod,
+        credentialType,
+        credentialReference,
+        normalizeCredentialUrl(credentials.url),
+        getMauticVersion(credentials),
+        datasetKey,
+    ]);
+}
+async function getCachedMauticLoadOptions(context, datasetKey, loadOptions, ttlMs = exports.MAUTIC_LOAD_OPTIONS_CACHE_TTL_MS) {
+    const authenticationMethod = context.getNodeParameter('authentication', 'credentials');
+    const credentialType = getCredentialType(authenticationMethod);
+    const credentials = await context.getCredentials(credentialType);
+    const credentialReference = getCredentialReference(context, credentialType);
+    const cacheKey = getCacheKey(authenticationMethod, credentialType, credentialReference, credentials, datasetKey);
+    const now = Date.now();
+    const cachedEntry = loadOptionsCache.get(cacheKey);
+    if (cachedEntry && cachedEntry.expiresAt > now) {
+        return await cachedEntry.promise;
+    }
+    if (cachedEntry) {
+        loadOptionsCache.delete(cacheKey);
+    }
+    const promise = (async () => loadOptions())().catch((error) => {
+        const latestEntry = loadOptionsCache.get(cacheKey);
+        if (latestEntry?.promise === promise) {
+            loadOptionsCache.delete(cacheKey);
+        }
+        throw error;
+    });
+    loadOptionsCache.set(cacheKey, {
+        expiresAt: now + ttlMs,
+        promise,
+    });
+    return await promise;
+}
+exports.getCachedMauticLoadOptions = getCachedMauticLoadOptions;
+function clearMauticLoadOptionsCacheForTests() {
+    loadOptionsCache.clear();
+}
+exports.clearMauticLoadOptionsCacheForTests = clearMauticLoadOptionsCacheForTests;

package/dist/nodes/MauticAdvanced/utils/oauthRequestQueue.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._getOAuthRequestQueueSizeForTests = exports.runWithCredentialLock = void 0;
+exports._getTrackedOAuthRequestCountForTests = exports._getOAuthRequestQueueSizeForTests = exports.waitForTrackedCredentialRequests = exports.runTrackedCredentialRequest = exports.runWithCredentialLock = void 0;
 const oauthRequestQueue = new Map();
+const oauthInFlightRequests = new Map();
 async function runWithCredentialLock(key, fn) {
     const previous = oauthRequestQueue.get(key) ?? Promise.resolve();
     const run = (async () => {
@@ -20,7 +21,33 @@ async function runWithCredentialLock(key, fn) {
     }
 }
 exports.runWithCredentialLock = runWithCredentialLock;
+async function runTrackedCredentialRequest(key, fn) {
+    const run = Promise.resolve().then(fn);
+    const tracker = run.then(() => undefined, () => undefined);
+    const requests = oauthInFlightRequests.get(key) ?? new Set();
+    requests.add(tracker);
+    oauthInFlightRequests.set(key, requests);
+    try {
+        return await run;
+    }
+    finally {
+        requests.delete(tracker);
+        if (requests.size === 0) {
+            oauthInFlightRequests.delete(key);
+        }
+    }
+}
+exports.runTrackedCredentialRequest = runTrackedCredentialRequest;
+async function waitForTrackedCredentialRequests(key) {
+    const requests = Array.from(oauthInFlightRequests.get(key) ?? []);
+    await Promise.all(requests.map(async (request) => await request.catch(() => undefined)));
+}
+exports.waitForTrackedCredentialRequests = waitForTrackedCredentialRequests;
 function _getOAuthRequestQueueSizeForTests() {
     return oauthRequestQueue.size;
 }
 exports._getOAuthRequestQueueSizeForTests = _getOAuthRequestQueueSizeForTests;
+function _getTrackedOAuthRequestCountForTests(key) {
+    return oauthInFlightRequests.get(key)?.size ?? 0;
+}
+exports._getTrackedOAuthRequestCountForTests = _getTrackedOAuthRequestCountForTests;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-mautic-advanced",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "Enhanced n8n node for Mautic with comprehensive API coverage including tags, campaigns, categories, and advanced contact management",
   "keywords": [
     "n8n",