Merge branch 'master' into node-1466-overhaul-code-node-p0

packages/@n8n/nodes-langchain/utils/logWrapper.ts

@@ -394,7 +394,6 @@ export function logWrapper(
 					return async (
 						query: string,
 						k?: number,
-						// @ts-ignore
 						filter?: BiquadFilterType | undefined,
 						_callbacks?: Callbacks | undefined,
 					): Promise<Document[]> => {

packages/core/package.json

@@ -42,6 +42,7 @@
     "@sentry/node": "catalog:",
     "aws4": "1.11.0",
     "axios": "catalog:",
+    "chardet": "2.0.0",
     "concat-stream": "2.0.0",
     "cron": "3.1.7",
     "fast-glob": "catalog:",

packages/core/src/NodeExecuteFunctions.ts

@@ -15,6 +15,7 @@ import type {
 import { ClientOAuth2 } from '@n8n/client-oauth2';
 import type { AxiosError, AxiosHeaders, AxiosRequestConfig, AxiosResponse } from 'axios';
 import axios from 'axios';
+import chardet from 'chardet';
 import crypto, { createHmac } from 'crypto';
 import FileType from 'file-type';
 import FormData from 'form-data';
@@ -1050,6 +1051,10 @@ export async function getBinaryDataBuffer(
 	return await Container.get(BinaryDataService).getAsBuffer(binaryData);
 }
 
+export function detectBinaryEncoding(buffer: Buffer): string {
+	return chardet.detect(buffer) as string;
+}
+
 /**
  * Store an incoming IBinaryData & related buffer using the configured binary data manager.
  *

packages/core/src/WorkflowExecute.ts

@@ -1796,16 +1796,13 @@ export class WorkflowExecute {
 								lineResult.json.$json !== undefined
 							) {
 								// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-								// @ts-ignore
 								lineResult.error = lineResult.json.$error as NodeApiError | NodeOperationError;
 								lineResult.json = {
 									// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-									// @ts-ignore
 									error: (lineResult.json.$error as NodeApiError | NodeOperationError).message,
 								};
 							} else if (lineResult.error !== undefined) {
 								// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-								// @ts-ignore
 								lineResult.json = { error: lineResult.error.message };
 							}
 						}

packages/core/src/node-execution-context/execute-context.ts

@@ -37,6 +37,7 @@ import {
 	getSSHTunnelFunctions,
 	getFileSystemHelperFunctions,
 	getCheckProcessedHelperFunctions,
+	detectBinaryEncoding,
 } from '@/NodeExecuteFunctions';
 
 import { BaseExecuteContext } from './base-execute-context';
@@ -96,6 +97,7 @@ export class ExecuteContext extends BaseExecuteContext implements IExecuteFuncti
 				assertBinaryData(inputData, node, itemIndex, propertyName, 0),
 			getBinaryDataBuffer: async (itemIndex, propertyName) =>
 				await getBinaryDataBuffer(inputData, itemIndex, propertyName, 0),
+			detectBinaryEncoding: (buffer: Buffer) => detectBinaryEncoding(buffer),
 		};
 
 		this.nodeHelpers = {

packages/core/src/node-execution-context/execute-single-context.ts

@@ -16,6 +16,7 @@ import { ApplicationError, createDeferredPromise, NodeConnectionType } from 'n8n
 // eslint-disable-next-line import/no-cycle
 import {
 	assertBinaryData,
+	detectBinaryEncoding,
 	getBinaryDataBuffer,
 	getBinaryHelperFunctions,
 	getRequestHelperFunctions,
@@ -69,6 +70,7 @@ export class ExecuteSingleContext extends BaseExecuteContext implements IExecute
 				assertBinaryData(inputData, node, itemIndex, propertyName, inputIndex),
 			getBinaryDataBuffer: async (propertyName, inputIndex = 0) =>
 				await getBinaryDataBuffer(inputData, itemIndex, propertyName, inputIndex),
+			detectBinaryEncoding: (buffer) => detectBinaryEncoding(buffer),
 		};
 	}
 

packages/core/src/node-execution-context/supply-data-context.ts

@@ -24,6 +24,7 @@ import {
 	assertBinaryData,
 	constructExecutionMetaData,
 	copyInputItems,
+	detectBinaryEncoding,
 	getBinaryDataBuffer,
 	getBinaryHelperFunctions,
 	getCheckProcessedHelperFunctions,
@@ -87,6 +88,7 @@ export class SupplyDataContext extends BaseExecuteContext implements ISupplyData
 				assertBinaryData(inputData, node, itemIndex, propertyName, 0),
 			getBinaryDataBuffer: async (itemIndex, propertyName) =>
 				await getBinaryDataBuffer(inputData, itemIndex, propertyName, 0),
+			detectBinaryEncoding: (buffer: Buffer) => detectBinaryEncoding(buffer),
 
 			returnJsonArray,
 			normalizeItems,

packages/editor-ui/src/composables/useMessage.ts

@@ -26,6 +26,7 @@ export function useMessage() {
 			...(config ?? (typeof configOrTitle === 'object' ? configOrTitle : {})),
 			cancelButtonClass: 'btn--cancel',
 			confirmButtonClass: 'btn--confirm',
+			dangerouslyUseHTMLString: true,
 		};
 
 		if (typeof configOrTitle === 'string') {
@@ -49,6 +50,7 @@ export function useMessage() {
 			distinguishCancelAndClose: true,
 			showClose: config?.showClose ?? false,
 			closeOnClickModal: false,
+			dangerouslyUseHTMLString: true,
 			...(config ?? (typeof configOrTitle === 'object' ? configOrTitle : {})),
 		};
 
@@ -74,6 +76,7 @@ export function useMessage() {
 			...(config ?? (typeof configOrTitle === 'object' ? configOrTitle : {})),
 			cancelButtonClass: 'btn--cancel',
 			confirmButtonClass: 'btn--confirm',
+			dangerouslyUseHTMLString: true,
 		};
 
 		if (typeof configOrTitle === 'string') {

packages/editor-ui/src/composables/useWorkflowHelpers.ts

@@ -518,7 +518,6 @@ export function useWorkflowHelpers(options: { router: ReturnType<typeof useRoute
 
 		const nodes: INode[] = [];
 		for (let nodeIndex = 0; nodeIndex < workflowNodes.length; nodeIndex++) {
-			// @ts-ignore
 			nodeData = getNodeDataToSave(workflowNodes[nodeIndex]);
 
 			nodes.push(nodeData);

packages/node-dev/src/Build.ts

@@ -85,9 +85,7 @@ export async function buildFiles({
 
 		// Forward the output of the child process to the main one
 		// that the user can see what is happening
-		// @ts-ignore
 		buildProcess.stdout.pipe(process.stdout);
-		// @ts-ignore
 		buildProcess.stderr.pipe(process.stderr);
 
 		// Make sure that the child process gets also always terminated

packages/nodes-base/credentials/ElasticsearchApi.credentials.ts

@@ -56,7 +56,7 @@ export class ElasticsearchApi implements ICredentialType {
 
 	test: ICredentialTestRequest = {
 		request: {
-			baseURL: '={{$credentials.baseUrl}}',
+			baseURL: '={{$credentials.baseUrl}}'.replace(/\/$/, ''),
 			url: '/_xpack?human=false',
 			skipSslCertificateValidation: '={{$credentials.ignoreSSLIssues}}',
 		},

packages/nodes-base/jest.config.js

@@ -1,3 +1,6 @@
+// Avoid tests failing because of difference between local and GitHub actions timezone
+process.env.TZ = 'UTC';
+
 /** @type {import('jest').Config} */
 module.exports = {
 	...require('../../jest.config'),

packages/nodes-base/nodes/Affinity/GenericFunctions.ts

@@ -66,7 +66,6 @@ export async function affinityApiRequestAllItems(
 
 	do {
 		responseData = await affinityApiRequest.call(this, method, resource, body, query);
-		// @ts-ignore
 		query.page_token = responseData.page_token;
 		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.page_token !== undefined && responseData.page_token !== null);
@@ -84,7 +83,6 @@ export function eventsExist(subscriptions: string[], currentSubsriptions: string
 }
 
 export function mapResource(key: string) {
-	//@ts-ignore
 	return {
 		person: 'persons',
 		list: 'lists',

packages/nodes-base/nodes/Automizy/GenericFunctions.ts

@@ -40,7 +40,6 @@ export async function automizyApiRequest(
 		if (Object.keys(option).length !== 0) {
 			Object.assign(options, option);
 		}
-		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);

packages/nodes-base/nodes/BambooHr/v1/transport/index.ts

@@ -53,7 +53,6 @@ export async function apiRequest(
 	}
 
 	try {
-		//@ts-ignore
 		return await this.helpers.request(options);
 	} catch (error) {
 		const description = error?.response?.headers['x-bamboohr-error-messsage'] || '';

packages/nodes-base/nodes/Box/GenericFunctions.ts

@@ -41,7 +41,6 @@ export async function boxApiRequest(
 			includeCredentialsOnRefreshOnBody: true,
 		};
 
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'boxOAuth2Api', options, oAuth2Options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);

packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts

@@ -43,7 +43,6 @@ export async function webexApiRequest(
 		if (Object.keys(qs).length === 0) {
 			delete options.qs;
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'ciscoWebexOAuth2Api', options, {
 			tokenType: 'Bearer',
 		});

packages/nodes-base/nodes/ClickUp/GenericFunctions.ts

@@ -42,7 +42,6 @@ export async function clickupApiRequest(
 				keepBearer: false,
 				tokenType: 'Bearer',
 			};
-			// @ts-ignore
 			return await this.helpers.requestOAuth2.call(
 				this,
 				'clickUpOAuth2Api',

packages/nodes-base/nodes/Coda/GenericFunctions.ts

@@ -67,7 +67,6 @@ export async function codaApiRequestAllItems(
 	do {
 		responseData = await codaApiRequest.call(this, method, resource, body, query, uri);
 		uri = responseData.nextPageLink;
-		// @ts-ignore
 		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.nextPageLink !== undefined && responseData.nextPageLink !== '');
 

packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts

@@ -37,7 +37,6 @@ export async function coinGeckoApiRequest(
 			delete options.body;
 		}
 
-		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);

packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts

@@ -172,7 +172,7 @@ export class Elasticsearch implements INodeType {
 						} else {
 							responseData = await elasticsearchApiRequest.call(
 								this,
-								'GET',
+								'POST',
 								`/${indexId}/_search`,
 								body,
 								qs,
@@ -184,7 +184,7 @@ export class Elasticsearch implements INodeType {
 
 						responseData = await elasticsearchApiRequest.call(
 							this,
-							'GET',
+							'POST',
 							`/${indexId}/_search`,
 							body,
 							qs,

packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts

@@ -20,7 +20,7 @@ export async function elasticsearchBulkApiRequest(this: IExecuteFunctions, body:
 		method: 'POST',
 		headers: { 'Content-Type': 'application/x-ndjson' },
 		body: bulkBody,
-		url: `${baseUrl}/_bulk`,
+		url: `${baseUrl.replace(/\/$/, '')}/_bulk`,
 		skipSslCertificateValidation: ignoreSSLIssues,
 		returnFullResponse: true,
 		ignoreHttpStatusErrors: true,
@@ -66,7 +66,7 @@ export async function elasticsearchApiRequest(
 		method,
 		body,
 		qs,
-		url: `${baseUrl}${endpoint}`,
+		url: `${baseUrl.replace(/\/$/, '')}${endpoint}`,
 		json: true,
 		skipSslCertificateValidation: ignoreSSLIssues,
 	};

packages/nodes-base/nodes/Elastic/Elasticsearch/tests/GenericFunctions.test.ts

@@ -0,0 +1,112 @@
+import { type IExecuteFunctions, NodeApiError } from 'n8n-workflow';
+
+import { elasticsearchApiRequest } from '../GenericFunctions';
+
+describe('Elasticsearch -> elasticsearchApiRequest', () => {
+	let mockExecuteFunctions: IExecuteFunctions;
+
+	const mockHttpRequestWithAuthentication = jest.fn();
+
+	const setupMockFunctions = () => {
+		mockExecuteFunctions = {
+			getCredentials: jest.fn().mockResolvedValue({
+				baseUrl: 'https://example.com',
+				ignoreSSLIssues: false,
+			}),
+			helpers: {
+				httpRequestWithAuthentication: mockHttpRequestWithAuthentication,
+			},
+			getNode: jest.fn().mockReturnValue({}),
+		} as unknown as IExecuteFunctions;
+		jest.clearAllMocks();
+	};
+
+	beforeEach(() => {
+		setupMockFunctions();
+		mockHttpRequestWithAuthentication.mockClear();
+	});
+
+	const response = { success: true };
+
+	it('should make a successful GET API request', async () => {
+		mockHttpRequestWithAuthentication.mockResolvedValue(response);
+
+		const result = await elasticsearchApiRequest.call(
+			mockExecuteFunctions,
+			'GET',
+			'/test-endpoint',
+		);
+
+		expect(result).toEqual(response);
+		expect(mockExecuteFunctions.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith(
+			'elasticsearchApi',
+			expect.objectContaining({
+				method: 'GET',
+				url: 'https://example.com/test-endpoint',
+				json: true,
+				skipSslCertificateValidation: false,
+			}),
+		);
+	});
+
+	it('should make a successful POST API request', async () => {
+		const body = { key: 'value' };
+
+		mockHttpRequestWithAuthentication.mockResolvedValue(response);
+
+		const result = await elasticsearchApiRequest.call(
+			mockExecuteFunctions,
+			'POST',
+			'/test-endpoint',
+			body,
+		);
+
+		expect(result).toEqual(response);
+		expect(mockExecuteFunctions.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith(
+			'elasticsearchApi',
+			expect.objectContaining({
+				body,
+				method: 'POST',
+				url: 'https://example.com/test-endpoint',
+				json: true,
+				skipSslCertificateValidation: false,
+			}),
+		);
+	});
+
+	it('should handle API request errors', async () => {
+		const errorResponse = { message: 'Error occurred' };
+		mockHttpRequestWithAuthentication.mockRejectedValue(errorResponse);
+
+		await expect(
+			elasticsearchApiRequest.call(mockExecuteFunctions, 'GET', '/test-endpoint'),
+		).rejects.toThrow(NodeApiError);
+
+		expect(mockExecuteFunctions.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith(
+			'elasticsearchApi',
+			expect.objectContaining({
+				method: 'GET',
+				url: 'https://example.com/test-endpoint',
+				json: true,
+				skipSslCertificateValidation: false,
+			}),
+		);
+	});
+
+	it('should ignore trailing slashes in the base URL', async () => {
+		mockHttpRequestWithAuthentication.mockResolvedValue(response);
+
+		mockExecuteFunctions.getCredentials = jest.fn().mockResolvedValue({
+			baseUrl: 'https://elastic.domain.com/',
+			ignoreSSLIssues: false,
+		});
+		await elasticsearchApiRequest.call(mockExecuteFunctions, 'GET', '/test-endpoint');
+
+		expect(mockExecuteFunctions.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith(
+			'elasticsearchApi',
+			expect.objectContaining({
+				url: 'https://elastic.domain.com/test-endpoint',
+			}),
+		);
+	});
+});

packages/nodes-base/nodes/Files/ExtractFromFile/ExtractFromFile.node.ts

@@ -6,9 +6,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import * as spreadsheet from './actions/spreadsheet.operation';
 import * as moveTo from './actions/moveTo.operation';
 import * as pdf from './actions/pdf.operation';
+import * as spreadsheet from './actions/spreadsheet.operation';
 
 export class ExtractFromFile implements INodeType {
 	// eslint-disable-next-line n8n-nodes-base/node-class-description-missing-subtitle