@pdfgeneratorapi/n8n-nodes-pdf-generator-api 0.4.0 → 0.5.1

package/dist/nodes/PdfGeneratorApi/PdfGeneratorApi.node.js

@@ -15,8 +15,8 @@ class PdfGeneratorApi {
             defaults: {
                 name: 'PDF Generator API',
             },
-            inputs: ["main"],
-            outputs: ["main"],
+            inputs: [n8n_workflow_1.NodeConnectionTypes.Main],
+            outputs: [n8n_workflow_1.NodeConnectionTypes.Main],
             usableAsTool: true,
             credentials: [
                 {
@@ -52,6 +52,11 @@ class PdfGeneratorApi {
                             value: 'document',
                             description: 'Generate PDFs from templates with data, manage document storage',
                         },
+                        {
+                            name: 'E-Invoice',
+                            value: 'einvoice',
+                            description: 'Create EN 16931 e-invoices as UBL or CII XML, XRechnung 3.0, or Factur-X PDF',
+                        },
                         {
                             name: 'PDF Service',
                             value: 'pdfServices',
@@ -173,6 +178,44 @@ class PdfGeneratorApi {
                     ],
                     default: 'generate',
                 },
+                {
+                    displayName: 'E-Invoice Operations',
+                    name: 'operation',
+                    type: 'options',
+                    noDataExpression: true,
+                    displayOptions: {
+                        show: {
+                            resource: ['einvoice'],
+                        },
+                    },
+                    options: [
+                        {
+                            name: 'Create E-Invoice',
+                            value: 'createEInvoice',
+                            description: 'Create an EN 16931 e-invoice as UBL or CII XML',
+                            action: 'Create an EN 16931 e invoice',
+                        },
+                        {
+                            name: 'Create Factur-X E-Invoice',
+                            value: 'createFacturX',
+                            description: 'Create a Factur-X PDF with the CII XML embedded',
+                            action: 'Create a FACTUR-X e invoice',
+                        },
+                        {
+                            name: 'Create XRechnung E-Invoice',
+                            value: 'createXRechnung',
+                            description: 'Create an XRechnung 3.0 e-invoice, validated against the German BR-DE rules',
+                            action: 'Create an XRECHNUNG e invoice',
+                        },
+                        {
+                            name: 'Get Schema',
+                            value: 'getEInvoiceSchema',
+                            description: 'Get the JSON schema of the accepted e-invoice payload',
+                            action: 'Get the e invoice payload schema',
+                        },
+                    ],
+                    default: 'createEInvoice',
+                },
                 {
                     displayName: 'Services Operations',
                     name: 'operation',
@@ -1698,6 +1741,260 @@ class PdfGeneratorApi {
                         },
                     ],
                 },
+                {
+                    displayName: 'Template',
+                    name: 'templateId',
+                    type: 'resourceLocator',
+                    default: { mode: 'list', value: '' },
+                    required: true,
+                    displayOptions: {
+                        show: {
+                            resource: ['einvoice'],
+                            operation: ['createFacturX'],
+                        },
+                    },
+                    modes: [
+                        {
+                            displayName: 'From List',
+                            name: 'list',
+                            type: 'list',
+                            hint: 'Select a template from the list',
+                            typeOptions: {
+                                searchListMethod: 'searchTemplates',
+                                searchable: true,
+                                searchFilterRequired: false,
+                            },
+                        },
+                        {
+                            displayName: 'By ID',
+                            name: 'id',
+                            type: 'string',
+                            hint: 'Enter the template ID directly',
+                            validation: [
+                                {
+                                    type: 'regex',
+                                    properties: {
+                                        regex: '^[0-9]+$',
+                                        errorMessage: 'Template ID must be a number',
+                                    },
+                                },
+                            ],
+                        },
+                    ],
+                    description: 'Template used to render the PDF half of the Factur-X file. Use a template whose fields are mapped to UBL element names, because a friendly-name stock template renders blank here.',
+                },
+                {
+                    displayName: 'Invoice Data',
+                    name: 'einvoiceData',
+                    type: 'json',
+                    required: true,
+                    default: '{}',
+                    displayOptions: {
+                        show: {
+                            resource: ['einvoice'],
+                            operation: ['createEInvoice', 'createXRechnung', 'createFacturX'],
+                        },
+                    },
+                    description: 'Peppol BIS Billing 3.0 UBL invoice payload. Run Get Schema for the full structure. For Factur-X it is used both to render the template and to build the embedded CII XML.',
+                },
+                {
+                    displayName: 'Formatting Type',
+                    name: 'einvoiceType',
+                    type: 'options',
+                    options: [
+                        {
+                            name: 'CII',
+                            value: 'CII',
+                            description: 'Cross Industry Invoice XML',
+                        },
+                        {
+                            name: 'UBL',
+                            value: 'UBL',
+                            description: 'Universal Business Language XML',
+                        },
+                    ],
+                    default: 'UBL',
+                    displayOptions: {
+                        show: {
+                            resource: ['einvoice'],
+                            operation: ['createEInvoice', 'createXRechnung'],
+                        },
+                    },
+                    description: 'XML syntax of the generated e-invoice',
+                },
+                {
+                    displayName: 'Output',
+                    name: 'einvoiceOutput',
+                    type: 'options',
+                    options: [
+                        {
+                            name: 'Base64 (JSON)',
+                            value: 'base64',
+                            description: 'The API returns the XML as base64. The node attaches it decoded as binary and returns the metadata as JSON.',
+                        },
+                        {
+                            name: 'File (Binary)',
+                            value: 'file',
+                            description: 'Returns the XML inline as binary data',
+                        },
+                    ],
+                    default: 'base64',
+                    displayOptions: {
+                        show: {
+                            resource: ['einvoice'],
+                            operation: ['createEInvoice', 'createXRechnung'],
+                        },
+                    },
+                    description: 'Response format. Either way the XML is attached as a binary item named "data".',
+                },
+                {
+                    displayName: 'Additional Fields',
+                    name: 'einvoiceAdditionalFields',
+                    type: 'collection',
+                    placeholder: 'Add Field',
+                    default: {},
+                    displayOptions: {
+                        show: {
+                            resource: ['einvoice'],
+                            operation: ['createEInvoice', 'createXRechnung'],
+                        },
+                    },
+                    options: [
+                        {
+                            displayName: 'File Name',
+                            name: 'outputName',
+                            type: 'string',
+                            default: '',
+                            placeholder: 'e.g. Invoice 123',
+                            description: 'Name of the attached XML file, without the extension. Defaults to the operation and syntax, e.g. einvoice-ubl, so set it when a workflow stores many invoices in one place.',
+                        },
+                    ],
+                },
+                {
+                    displayName: 'Profile',
+                    name: 'facturxProfile',
+                    type: 'options',
+                    options: [
+                        {
+                            name: 'Basic',
+                            value: 'basic',
+                            description: 'Core invoice data. Drops item level attributes such as AdditionalItemProperty.',
+                        },
+                        {
+                            name: 'Basic WL',
+                            value: 'basicwl',
+                            description: 'Basic without lines, for accounting entry only',
+                        },
+                        {
+                            name: 'EN 16931',
+                            value: 'en16931',
+                            description: 'Full EN 16931 semantic model. Keeps item level attributes.',
+                        },
+                        {
+                            name: 'Extended',
+                            value: 'extended',
+                            description: 'EN 16931 plus extensions. Keeps item level attributes.',
+                        },
+                        {
+                            name: 'Minimum',
+                            value: 'minimum',
+                            description: 'Header data only, not a compliant invoice in most jurisdictions',
+                        },
+                        {
+                            name: 'XRechnung',
+                            value: 'xrechnung',
+                            description: 'German XRechnung CIUS on top of EN 16931',
+                        },
+                    ],
+                    default: 'en16931',
+                    displayOptions: {
+                        show: {
+                            resource: ['einvoice'],
+                            operation: ['createFacturX'],
+                        },
+                    },
+                    description: 'Factur-X conformance level. Defaults to EN 16931, which keeps per-line attributes. Basic and the lower levels carry less of the invoice in the embedded XML.',
+                },
+                {
+                    displayName: 'Output',
+                    name: 'facturxOutput',
+                    type: 'options',
+                    options: [
+                        {
+                            name: 'Base64 (JSON)',
+                            value: 'base64',
+                            description: 'The API returns the PDF as base64. The node attaches it decoded as binary and returns the metadata as JSON.',
+                        },
+                        {
+                            name: 'File (Binary)',
+                            value: 'file',
+                            description: 'Returns the PDF inline as binary data',
+                        },
+                        {
+                            name: 'URL',
+                            value: 'url',
+                            description: 'Stores the document for 30 days and returns a link',
+                        },
+                        {
+                            name: 'Viewer URL',
+                            value: 'viewer',
+                            description: 'Stores the document for 30 days and returns a viewer link',
+                        },
+                    ],
+                    default: 'base64',
+                    displayOptions: {
+                        show: {
+                            resource: ['einvoice'],
+                            operation: ['createFacturX'],
+                        },
+                    },
+                    description: 'Response format. Base64 and File both attach the PDF as a binary item named "data".',
+                },
+                {
+                    displayName: 'Additional Fields',
+                    name: 'facturxAdditionalFields',
+                    type: 'collection',
+                    placeholder: 'Add Field',
+                    default: {},
+                    displayOptions: {
+                        show: {
+                            resource: ['einvoice'],
+                            operation: ['createFacturX'],
+                        },
+                    },
+                    options: [
+                        {
+                            displayName: 'Author',
+                            name: 'author',
+                            type: 'string',
+                            default: '',
+                            description: 'Document author written into the PDF metadata',
+                        },
+                        {
+                            displayName: 'Document Name',
+                            name: 'outputName',
+                            type: 'string',
+                            default: '',
+                            placeholder: 'e.g. Invoice 123',
+                            description: 'Name of the generated document. The API generates one when this is empty.',
+                        },
+                        {
+                            displayName: 'Language',
+                            name: 'language',
+                            type: 'string',
+                            default: '',
+                            placeholder: 'e.g. en',
+                            description: 'Document language written into the PDF metadata',
+                        },
+                        {
+                            displayName: 'Template Version ID',
+                            name: 'versionId',
+                            type: 'number',
+                            default: 0,
+                            description: 'Pin generation to a specific template version instead of the current one',
+                        },
+                    ],
+                },
             ],
         };
         this.methods = {
@@ -1717,7 +2014,7 @@ class PdfGeneratorApi {
                             },
                             json: true,
                         };
-                        const response = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        const response = await this.helpers.httpRequestWithAuthentication.call(this, 'pdfGeneratorApi', options);
                         if (response && response.response) {
                             for (const template of response.response) {
                                 const displayName = `${template.name} (ID: ${template.id})`;
@@ -1758,6 +2055,43 @@ class PdfGeneratorApi {
                 throw new n8n_workflow_1.NodeOperationError(this.getNode(), `${field} must be valid JSON`);
             }
         };
+        const validationDetails = (errors, message) => {
+            if (!errors || typeof errors !== 'object')
+                return '';
+            const parts = (Array.isArray(errors) ? errors.map((e) => ['', e]) : Object.entries(errors))
+                .map(([field, e]) => [field, [].concat(e).map(String).filter((t) => !message.includes(t)).join(' ')])
+                .filter(([, text]) => text)
+                .map(([field, text]) => (field ? `${field}: ${text}` : text));
+            return parts.length ? ` (${parts.join('; ')})` : '';
+        };
+        const parseErrorBody = (body) => {
+            const text = Buffer.isBuffer(body) ? body.toString('utf8') : body;
+            if (typeof text !== 'string')
+                return (text !== null && text !== void 0 ? text : {});
+            try {
+                return JSON.parse(text);
+            }
+            catch (error) {
+                return text.trimStart().startsWith('<') ? {} : { message: text.trim() };
+            }
+        };
+        const apiRequest = async (options, itemIndex, errorPrefix) => {
+            const response = (await this.helpers.httpRequestWithAuthentication.call(this, 'pdfGeneratorApi', {
+                ...options,
+                returnFullResponse: true,
+                ignoreHttpStatusErrors: true,
+            }));
+            if (response.statusCode >= 400) {
+                const body = parseErrorBody(response.body);
+                const apiMessage = typeof body.message === 'string' ? body.message : '';
+                throw new n8n_workflow_1.NodeApiError(this.getNode(), body, {
+                    httpCode: String(response.statusCode),
+                    itemIndex,
+                    message: errorPrefix && apiMessage ? `${errorPrefix}: ${apiMessage}${validationDetails(body.errors, apiMessage)}` : undefined,
+                });
+            }
+            return options.returnFullResponse ? response : response.body;
+        };
         const getMimeType = (format) => {
             switch (format) {
                 case 'pdf':
@@ -1802,9 +2136,9 @@ class PdfGeneratorApi {
                             url: '/assets/qrcode',
                             body,
                             json: qrOutputFormat !== 'file',
-                            encoding: qrOutputFormat === 'file' ? null : 'utf8',
+                            encoding: qrOutputFormat === 'file' ? 'arraybuffer' : 'json',
                         };
-                        responseData = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        responseData = await apiRequest(options, i);
                         if (responseData) {
                             if (qrOutputFormat === 'file') {
                                 const binaryData = {};
@@ -1818,6 +2152,7 @@ class PdfGeneratorApi {
                                         fileSize: responseData.length,
                                     },
                                     binary: binaryData,
+                                    pairedItem: { item: i },
                                 });
                             }
                             else {
@@ -1827,12 +2162,135 @@ class PdfGeneratorApi {
                                         format: qrOutputFormat,
                                         ...responseData,
                                     },
+                                    pairedItem: { item: i },
                                 });
                             }
                             continue;
                         }
                     }
                 }
+                else if (resource === 'einvoice') {
+                    const callEInvoice = async (requestOptions) => await apiRequest(requestOptions, i, 'PDF Generator API e-invoice request failed');
+                    const pushDocument = async (payload, output, fallbackName, fallbackMimeType) => {
+                        if (output === 'file') {
+                            const binary = {};
+                            binary.data = await this.helpers.prepareBinaryData(payload, fallbackName, fallbackMimeType);
+                            returnData.push({
+                                json: {
+                                    success: true,
+                                    filename: fallbackName,
+                                    format: output,
+                                    fileSize: payload.length,
+                                },
+                                binary,
+                                pairedItem: { item: i },
+                            });
+                            return;
+                        }
+                        const { response, ...rest } = payload;
+                        const meta = payload.meta || {};
+                        const fileName = meta.name || fallbackName;
+                        const mimeType = meta['content-type'] || fallbackMimeType;
+                        const binary = {};
+                        binary.data = await this.helpers.prepareBinaryData(Buffer.from(response, 'base64'), fileName, mimeType);
+                        returnData.push({
+                            json: {
+                                success: true,
+                                filename: fileName,
+                                format: output,
+                                ...rest,
+                            },
+                            binary,
+                            pairedItem: { item: i },
+                        });
+                    };
+                    if (operation === 'createEInvoice' || operation === 'createXRechnung') {
+                        const data = this.getNodeParameter('einvoiceData', i);
+                        const output = this.getNodeParameter('einvoiceOutput', i, 'base64');
+                        const additionalFields = this.getNodeParameter('einvoiceAdditionalFields', i, {});
+                        const type = String(this.getNodeParameter('einvoiceType', i, 'UBL') || 'UBL').toUpperCase();
+                        if (!['UBL', 'CII'].includes(type)) {
+                            throw new n8n_workflow_1.NodeOperationError(this.getNode(), `Formatting Type must be UBL or CII, got "${type}"`, {
+                                itemIndex: i,
+                            });
+                        }
+                        const body = {
+                            data: parseJSON(data, 'Invoice Data'),
+                            type,
+                            output,
+                        };
+                        const options = {
+                            method: 'POST',
+                            baseURL,
+                            url: operation === 'createXRechnung' ? '/einvoice/xrechnung' : '/einvoice',
+                            body,
+                            json: output !== 'file',
+                            encoding: output === 'file' ? 'arraybuffer' : 'json',
+                        };
+                        responseData = await callEInvoice(options);
+                        if (responseData) {
+                            const prefix = operation === 'createXRechnung' ? 'xrechnung' : 'einvoice';
+                            const baseName = String(additionalFields.outputName || `${prefix}-${type.toLowerCase()}`).replace(/\.xml$/i, '');
+                            await pushDocument(responseData, output, `${baseName}.xml`, 'application/xml');
+                            continue;
+                        }
+                    }
+                    else if (operation === 'createFacturX') {
+                        const templateIdParam = this.getNodeParameter('templateId', i);
+                        const templateId = typeof templateIdParam === 'string' ? templateIdParam : templateIdParam.value;
+                        const data = this.getNodeParameter('einvoiceData', i);
+                        const profile = this.getNodeParameter('facturxProfile', i, 'en16931');
+                        const output = this.getNodeParameter('facturxOutput', i, 'base64');
+                        const additionalFields = this.getNodeParameter('facturxAdditionalFields', i, {});
+                        const id = Number(templateId);
+                        if (!templateId || !Number.isInteger(id) || id <= 0) {
+                            throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Template is required for Factur-X and must be a numeric ID', { itemIndex: i });
+                        }
+                        const template = {
+                            id,
+                            data: parseJSON(data, 'Invoice Data'),
+                        };
+                        if (additionalFields.versionId)
+                            template.version_id = Number(additionalFields.versionId);
+                        const body = {
+                            template,
+                            profile,
+                            output,
+                        };
+                        if (additionalFields.outputName)
+                            body.name = additionalFields.outputName;
+                        if (additionalFields.author || additionalFields.language) {
+                            body.metadata = {};
+                            if (additionalFields.author)
+                                body.metadata.author = additionalFields.author;
+                            if (additionalFields.language)
+                                body.metadata.language = additionalFields.language;
+                        }
+                        const options = {
+                            method: 'POST',
+                            baseURL,
+                            url: '/einvoice/facturx',
+                            body,
+                            json: output !== 'file',
+                            encoding: output === 'file' ? 'arraybuffer' : 'json',
+                        };
+                        responseData = await callEInvoice(options);
+                        if (responseData && (output === 'base64' || output === 'file')) {
+                            const fallbackName = `${additionalFields.outputName || 'facturx-invoice'}.pdf`;
+                            await pushDocument(responseData, output, fallbackName, 'application/pdf');
+                            continue;
+                        }
+                    }
+                    else if (operation === 'getEInvoiceSchema') {
+                        const options = {
+                            method: 'GET',
+                            baseURL,
+                            url: '/einvoice/schema',
+                            json: true,
+                        };
+                        responseData = await callEInvoice(options);
+                    }
+                }
                 else if (resource === 'conversion') {
                     const conversionOptions = this.getNodeParameter('conversionOptions', i, {});
                     const filename = this.getNodeParameter('filename', i);
@@ -1872,9 +2330,9 @@ class PdfGeneratorApi {
                             url: '/conversion/html2pdf',
                             body,
                             json: body.output !== 'file',
-                            encoding: body.output === 'file' ? null : 'utf8',
+                            encoding: body.output === 'file' ? 'arraybuffer' : 'json',
                         };
-                        responseData = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        responseData = await apiRequest(options, i);
                     }
                     else if (operation === 'urlToPdf') {
                         const url = this.getNodeParameter('url', i);
@@ -1885,9 +2343,9 @@ class PdfGeneratorApi {
                             url: '/conversion/url2pdf',
                             body,
                             json: body.output !== 'file',
-                            encoding: body.output === 'file' ? null : 'utf8',
+                            encoding: body.output === 'file' ? 'arraybuffer' : 'json',
                         };
-                        responseData = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        responseData = await apiRequest(options, i);
                     }
                     if (responseData) {
                         const outputFormat = body.output || 'base64';
@@ -1903,6 +2361,7 @@ class PdfGeneratorApi {
                                     fileSize: responseData.length,
                                 },
                                 binary: binaryData,
+                                pairedItem: { item: i },
                             });
                         }
                         else {
@@ -1913,6 +2372,7 @@ class PdfGeneratorApi {
                                     format: outputFormat,
                                     ...responseData,
                                 },
+                                pairedItem: { item: i },
                             });
                         }
                         continue;
@@ -1939,7 +2399,7 @@ class PdfGeneratorApi {
                             qs,
                             json: true,
                         };
-                        responseData = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        responseData = await apiRequest(options, i);
                     }
                     else if (operation === 'get') {
                         const publicId = this.getNodeParameter('publicId', i);
@@ -1949,7 +2409,7 @@ class PdfGeneratorApi {
                             url: `/documents/${publicId}`,
                             json: true,
                         };
-                        responseData = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        responseData = await apiRequest(options, i);
                     }
                     else if (operation === 'delete') {
                         const publicId = this.getNodeParameter('publicId', i);
@@ -1959,7 +2419,7 @@ class PdfGeneratorApi {
                             url: `/documents/${publicId}`,
                             json: true,
                         };
-                        await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        await apiRequest(options, i);
                         responseData = {
                             success: true,
                             message: 'Document deleted successfully',
@@ -1991,9 +2451,9 @@ class PdfGeneratorApi {
                             url: '/documents/generate',
                             body,
                             json: output !== 'file',
-                            encoding: output === 'file' ? null : 'utf8',
+                            encoding: output === 'file' ? 'arraybuffer' : 'json',
                         };
-                        responseData = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        responseData = await apiRequest(options, i);
                         if (responseData && output !== 'url' && output !== 'viewer') {
                             if (output === 'file') {
                                 const binaryData = {};
@@ -2007,6 +2467,7 @@ class PdfGeneratorApi {
                                         fileSize: responseData.length,
                                     },
                                     binary: binaryData,
+                                    pairedItem: { item: i },
                                 });
                                 continue;
                             }
@@ -2018,6 +2479,7 @@ class PdfGeneratorApi {
                                         format: output,
                                         ...responseData,
                                     },
+                                    pairedItem: { item: i },
                                 });
                                 continue;
                             }
@@ -2058,7 +2520,7 @@ class PdfGeneratorApi {
                             body,
                             json: true,
                         };
-                        responseData = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        responseData = await apiRequest(options, i);
                     }
                     else if (operation === 'generateBatch') {
                         const templates = this.getNodeParameter('templates', i);
@@ -2087,9 +2549,9 @@ class PdfGeneratorApi {
                             url: '/documents/generate/batch',
                             body,
                             json: output !== 'file',
-                            encoding: output === 'file' ? null : 'utf8',
+                            encoding: output === 'file' ? 'arraybuffer' : 'json',
                         };
-                        responseData = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        responseData = await apiRequest(options, i);
                         if (responseData && output !== 'url' && output !== 'viewer') {
                             if (output === 'file') {
                                 const binaryData = {};
@@ -2103,6 +2565,7 @@ class PdfGeneratorApi {
                                         fileSize: responseData.length,
                                     },
                                     binary: binaryData,
+                                    pairedItem: { item: i },
                                 });
                                 continue;
                             }
@@ -2114,6 +2577,7 @@ class PdfGeneratorApi {
                                         format: output,
                                         ...responseData,
                                     },
+                                    pairedItem: { item: i },
                                 });
                                 continue;
                             }
@@ -2156,7 +2620,7 @@ class PdfGeneratorApi {
                             body,
                             json: true,
                         };
-                        responseData = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        responseData = await apiRequest(options, i);
                     }
                 }
                 else if (resource === 'template') {
@@ -2180,7 +2644,7 @@ class PdfGeneratorApi {
                             qs,
                             json: true,
                         };
-                        responseData = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        responseData = await apiRequest(options, i);
                     }
                     else if (operation === 'get') {
                         const templateIdParam = this.getNodeParameter('templateId', i);
@@ -2191,7 +2655,7 @@ class PdfGeneratorApi {
                             url: `/templates/${templateId}`,
                             json: true,
                         };
-                        responseData = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        responseData = await apiRequest(options, i);
                     }
                     else if (operation === 'create') {
                         const templateConfiguration = this.getNodeParameter('templateConfiguration', i);
@@ -2203,7 +2667,7 @@ class PdfGeneratorApi {
                             body,
                             json: true,
                         };
-                        responseData = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        responseData = await apiRequest(options, i);
                     }
                     else if (operation === 'update') {
                         const templateIdParam = this.getNodeParameter('templateId', i);
@@ -2217,7 +2681,7 @@ class PdfGeneratorApi {
                             body,
                             json: true,
                         };
-                        responseData = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        responseData = await apiRequest(options, i);
                     }
                     else if (operation === 'delete') {
                         const templateIdParam = this.getNodeParameter('templateId', i);
@@ -2228,7 +2692,7 @@ class PdfGeneratorApi {
                             url: `/templates/${templateId}`,
                             json: true,
                         };
-                        await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        await apiRequest(options, i);
                         responseData = {
                             success: true,
                             message: 'Template deleted successfully',
@@ -2248,7 +2712,7 @@ class PdfGeneratorApi {
                             body,
                             json: true,
                         };
-                        responseData = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        responseData = await apiRequest(options, i);
                     }
                     else if (operation === 'getDataFields') {
                         const templateIdParam = this.getNodeParameter('templateId', i);
@@ -2259,7 +2723,7 @@ class PdfGeneratorApi {
                             url: `/templates/${templateId}/data`,
                             json: true,
                         };
-                        responseData = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        responseData = await apiRequest(options, i);
                     }
                     else if (operation === 'getTemplateSchema') {
                         const options = {
@@ -2268,7 +2732,7 @@ class PdfGeneratorApi {
                             url: '/templates/schema',
                             json: true,
                         };
-                        responseData = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        responseData = await apiRequest(options, i);
                     }
                     else if (operation === 'copy') {
                         const templateIdParam = this.getNodeParameter('templateId', i);
@@ -2284,7 +2748,7 @@ class PdfGeneratorApi {
                             body,
                             json: true,
                         };
-                        responseData = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        responseData = await apiRequest(options, i);
                     }
                     else if (operation === 'openEditor') {
                         const templateIdParam = this.getNodeParameter('templateId', i);
@@ -2302,7 +2766,7 @@ class PdfGeneratorApi {
                             body,
                             json: true,
                         };
-                        responseData = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        responseData = await apiRequest(options, i);
                     }
                 }
                 else if (resource === 'pdfServices') {
@@ -2366,9 +2830,9 @@ class PdfGeneratorApi {
                             url: '/pdfservices/watermark',
                             body,
                             json: outputFormat !== 'file',
-                            encoding: outputFormat === 'file' ? null : 'utf8',
+                            encoding: outputFormat === 'file' ? 'arraybuffer' : 'json',
                         };
-                        responseData = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        responseData = await apiRequest(options, i);
                     }
                     else if (operation === 'encrypt') {
                         const ownerPassword = this.getNodeParameter('ownerPassword', i);
@@ -2383,9 +2847,9 @@ class PdfGeneratorApi {
                             url: '/pdfservices/encrypt',
                             body,
                             json: outputFormat !== 'file',
-                            encoding: outputFormat === 'file' ? null : 'utf8',
+                            encoding: outputFormat === 'file' ? 'arraybuffer' : 'json',
                         };
-                        responseData = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        responseData = await apiRequest(options, i);
                     }
                     else if (operation === 'decrypt') {
                         const decryptionPassword = this.getNodeParameter('decryptionPassword', i);
@@ -2397,9 +2861,9 @@ class PdfGeneratorApi {
                             url: '/pdfservices/decrypt',
                             body,
                             json: outputFormat !== 'file',
-                            encoding: outputFormat === 'file' ? null : 'utf8',
+                            encoding: outputFormat === 'file' ? 'arraybuffer' : 'json',
                         };
-                        responseData = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        responseData = await apiRequest(options, i);
                     }
                     else if (operation === 'extractFormFields') {
                         const options = {
@@ -2409,7 +2873,7 @@ class PdfGeneratorApi {
                             body,
                             json: true,
                         };
-                        responseData = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        responseData = await apiRequest(options, i);
                     }
                     else if (operation === 'fillFormFields') {
                         const formFieldsData = this.getNodeParameter('formFieldsData', i);
@@ -2421,9 +2885,9 @@ class PdfGeneratorApi {
                             url: '/pdfservices/form/fill',
                             body,
                             json: outputFormat !== 'file',
-                            encoding: outputFormat === 'file' ? null : 'utf8',
+                            encoding: outputFormat === 'file' ? 'arraybuffer' : 'json',
                         };
-                        responseData = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        responseData = await apiRequest(options, i);
                     }
                     else if (operation === 'optimize') {
                         const options = {
@@ -2432,10 +2896,10 @@ class PdfGeneratorApi {
                             url: '/pdfservices/optimize',
                             body,
                             json: outputFormat !== 'file',
-                            encoding: outputFormat === 'file' ? null : 'utf8',
-                            resolveWithFullResponse: true,
+                            encoding: outputFormat === 'file' ? 'arraybuffer' : 'json',
+                            returnFullResponse: true,
                         };
-                        const fullResponse = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        const fullResponse = await apiRequest(options, i);
                         responseData = fullResponse.body;
                         const headers = fullResponse.headers || {};
                         const originalSize = headers['x-original-size'] ? parseInt(headers['x-original-size'], 10) : null;
@@ -2454,6 +2918,7 @@ class PdfGeneratorApi {
                                     operation,
                                     ...responseData,
                                 },
+                                pairedItem: { item: i },
                             });
                         }
                         else if (outputFormat === 'file') {
@@ -2478,6 +2943,7 @@ class PdfGeneratorApi {
                             returnData.push({
                                 json: jsonResponse,
                                 binary: binaryData,
+                                pairedItem: { item: i },
                             });
                         }
                         else {
@@ -2497,6 +2963,7 @@ class PdfGeneratorApi {
                             }
                             returnData.push({
                                 json: jsonResponse,
+                                pairedItem: { item: i },
                             });
                         }
                         continue;
@@ -2517,7 +2984,7 @@ class PdfGeneratorApi {
                             qs,
                             json: true,
                         };
-                        responseData = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        responseData = await apiRequest(options, i);
                     }
                     else if (operation === 'create') {
                         const identifier = this.getNodeParameter('identifier', i);
@@ -2531,7 +2998,7 @@ class PdfGeneratorApi {
                             body,
                             json: true,
                         };
-                        responseData = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        responseData = await apiRequest(options, i);
                     }
                     else if (operation === 'get') {
                         const workspaceIdentifier = this.getNodeParameter('workspaceIdentifier', i);
@@ -2541,7 +3008,7 @@ class PdfGeneratorApi {
                             url: `/workspaces/${encodeURIComponent(workspaceIdentifier)}`,
                             json: true,
                         };
-                        responseData = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        responseData = await apiRequest(options, i);
                     }
                     else if (operation === 'delete') {
                         const workspaceIdentifier = this.getNodeParameter('workspaceIdentifier', i);
@@ -2551,7 +3018,11 @@ class PdfGeneratorApi {
                             url: `/workspaces/${encodeURIComponent(workspaceIdentifier)}`,
                             json: true,
                         };
-                        responseData = await this.helpers.requestWithAuthentication.call(this, 'pdfGeneratorApi', options);
+                        responseData = (await apiRequest(options, i)) || {
+                            success: true,
+                            message: 'Workspace deleted successfully',
+                            workspaceIdentifier,
+                        };
                     }
                 }
                 if (responseData === undefined) {
@@ -2566,7 +3037,10 @@ class PdfGeneratorApi {
                     returnData.push(...executionErrorData);
                     continue;
                 }
-                throw error;
+                if (error instanceof n8n_workflow_1.NodeOperationError) {
+                    throw new n8n_workflow_1.NodeOperationError(this.getNode(), error, { itemIndex: i });
+                }
+                throw new n8n_workflow_1.NodeApiError(this.getNode(), error, { itemIndex: i });
             }
         }
         return [returnData];