Merge branch 'master' into ai-assistant-improvements

* master: (24 commits)
  feat(core): Switch to MJML for email templates (#10518)
  fix(Gmail Trigger Node): Don't return date instances, but date strings instead (#10582)
  fix(core): Deduplicate sentry events using error stacktraces instead (no-changelog) (#10590)
  feat(editor): Implement new app layout (#10548)
  refactor(core): Standardize filename casing for services and Public API (no-changelog) (#10579)
  🚀 Release 1.57.0 (#10587)
  fix(editor): Add tooltips to workflow history button (#10570)
  ci: Fix provenance generation during NPM publish (no-changelog) (#10586)
  feat(core): Expose queue metrics for Prometheus (#10559)
  refactor(core): Map out pubsub messages (no-changelog) (#10566)
  fix: Fix scenario prefix not being passed (no-changelog) (#10575)
  refactor(core): Convert `verbose` to `debug` logs (#10574)
  refactor(core): Use `@/databases/` instead of `@db/` (no-changelog) (#10573)
  ci: Fix destroy benchmark env workflow (no-changelog) (#10572)
  feat: Add benchmarking of pooled sqlite (no-changelog) (#10550)
  refactor(editor): User journey link to n8n.io (#10331)
  fix(Wait Node): Prevent waiting until invalid date (#10523)
  refactor(core): Standardize filename casing for controllers and databases (no-changelog) (#10564)
  refactor(core): Allow custom types on getCredentials (no-changelog) (#10567)
  fix(editor): Scale output item selector input width with value (#10555)
  ...

# Conflicts:
#	packages/editor-ui/src/stores/assistant.store.ts

.github/workflows/benchmark-destroy-nightly.yml

@@ -2,7 +2,7 @@ name: Destroy Benchmark Env
 
 on:
   schedule:
-    - cron: '30 4 * * *'
+    - cron: '0 1 * * *'
   workflow_dispatch:
 
 permissions:
@@ -25,16 +25,15 @@ jobs:
           tenant-id: ${{ secrets.BENCHMARK_ARM_TENANT_ID }}
           subscription-id: ${{ secrets.BENCHMARK_ARM_SUBSCRIPTION_ID }}
 
-      - run: Setup node
+      - run: corepack enable
       - uses: actions/setup-node@v4.0.2
         with:
           node-version: 20.x
-          cache: pnpm
+          cache: 'pnpm'
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
 
       - name: Destroy cloud env
-        if: github.event.inputs.debug == 'true'
         run: pnpm destroy-cloud-env
         working-directory: packages/@n8n/benchmark

.github/workflows/benchmark-nightly.yml

@@ -60,10 +60,10 @@ jobs:
 
       - name: Run the benchmark with debug logging
         if: github.event.inputs.debug == 'true'
-        run: pnpm run-in-cloud sqlite --debug
+        run: pnpm run-in-cloud --debug
         working-directory: packages/@n8n/benchmark
 
       - name: Run the benchmark
         if: github.event.inputs.debug != 'true'
-        run: pnpm run-in-cloud sqlite
+        run: pnpm run-in-cloud
         working-directory: packages/@n8n/benchmark

.github/workflows/release-publish.yml

@@ -13,6 +13,8 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.pull_request.merged == true
     timeout-minutes: 10
+    permissions:
+      id-token: write
     env:
       NPM_CONFIG_PROVENANCE: true
     outputs:

.vscode/extensions.json

@@ -5,6 +5,7 @@
 		"dbaeumer.vscode-eslint",
 		"EditorConfig.EditorConfig",
 		"esbenp.prettier-vscode",
+		"mjmlio.vscode-mjml",
 		"Vue.volar"
 	]
 }

CHANGELOG.md

@@ -1,3 +1,34 @@
+# [1.57.0](https://github.com/n8n-io/n8n/compare/n8n@1.56.0...n8n@1.57.0) (2024-08-28)
+
+
+### Bug Fixes
+
+* **AI Agent Node:** Allow AWS Bedrock Chat to be used with conversational agent ([#10489](https://github.com/n8n-io/n8n/issues/10489)) ([bdcc657](https://github.com/n8n-io/n8n/commit/bdcc657965af5f604aac1eaff7d937f69a08ce1c))
+* **core:** Make boolean config value parsing backward-compatible ([#10560](https://github.com/n8n-io/n8n/issues/10560)) ([70b410f](https://github.com/n8n-io/n8n/commit/70b410f4b00dd599fcd4249aa105098aa262da66))
+* **core:** Restore Redis cache key ([#10520](https://github.com/n8n-io/n8n/issues/10520)) ([873056a](https://github.com/n8n-io/n8n/commit/873056a92e52cc629d2873c960656d5f06d4728e))
+* **core:** Scheduler tasks should not trigger on follower instances ([#10507](https://github.com/n8n-io/n8n/issues/10507)) ([3428f28](https://github.com/n8n-io/n8n/commit/3428f28a732f79e067b3cb515cc59d835de246a6))
+* **core:** Stop explicit redis client disconnect on shutdown ([#10551](https://github.com/n8n-io/n8n/issues/10551)) ([f712812](https://github.com/n8n-io/n8n/commit/f71281221efb79d65d8d7610c292bc90cef13d7a))
+* **editor:** Ensure `Datatable` component renders `All` option ([#10525](https://github.com/n8n-io/n8n/issues/10525)) ([bc27beb](https://github.com/n8n-io/n8n/commit/bc27beb6629883003a8991d7e840ffaa066d41ac))
+* **editor:** Prevent Safari users from accessing the frontend over insecure contexts ([#10510](https://github.com/n8n-io/n8n/issues/10510)) ([a73b9a3](https://github.com/n8n-io/n8n/commit/a73b9a38d6c48e2f78593328e7d9933f2493dbb6))
+* **editor:** Scale output item selector input width with value ([#10555](https://github.com/n8n-io/n8n/issues/10555)) ([52c574d](https://github.com/n8n-io/n8n/commit/52c574d83f344f03b0e39984bbc3ac0402e50791))
+* **Google Sheets Trigger Node:** Show sheet name is too long error ([#10542](https://github.com/n8n-io/n8n/issues/10542)) ([4e15007](https://github.com/n8n-io/n8n/commit/4e1500757700ec984cdad8b9cfcd76ee00ae127e))
+* **Wait Node:** Prevent waiting until invalid date ([#10523](https://github.com/n8n-io/n8n/issues/10523)) ([c0e7620](https://github.com/n8n-io/n8n/commit/c0e7620036738f8d0b382d0d0610b981dcbc29e0))
+
+
+### Features
+
+* Add new credentials for the HTTP Request node ([#9833](https://github.com/n8n-io/n8n/issues/9833)) ([26f1af3](https://github.com/n8n-io/n8n/commit/26f1af397b2b25e3394fc2dae91a5c281bf33d66))
+* **AI Agent Node:** Add tutorial link to agent node ([#10493](https://github.com/n8n-io/n8n/issues/10493)) ([5c7cc36](https://github.com/n8n-io/n8n/commit/5c7cc36c23e58a47a1e71911e7303a1bd54f167e))
+* **core:** Expose queue metrics for Prometheus ([#10559](https://github.com/n8n-io/n8n/issues/10559)) ([008c510](https://github.com/n8n-io/n8n/commit/008c510b7623fefb8c60730c7eac54dd9bb2e3fc))
+* **editor:** Implement workflowSelector parameter type ([#10482](https://github.com/n8n-io/n8n/issues/10482)) ([84e54be](https://github.com/n8n-io/n8n/commit/84e54beac763f25399c9687f695f1e658e3ce434))
+
+
+### Performance Improvements
+
+* **core:** Make execution queries faster ([#9817](https://github.com/n8n-io/n8n/issues/9817)) ([dc7dc99](https://github.com/n8n-io/n8n/commit/dc7dc995d5e2ea8fbd0dcb54cfa8aa93ecb437c9))
+
+
+
 # [1.56.0](https://github.com/n8n-io/n8n/compare/n8n@1.55.0...n8n@1.56.0) (2024-08-21)
 
 

cypress/e2e/17-sharing.cy.ts

@@ -7,7 +7,7 @@ import {
 	WorkflowSharingModal,
 	WorkflowsPage,
 } from '../pages';
-import { getVisibleDropdown, getVisibleSelect } from '../utils';
+import { getVisibleDropdown, getVisiblePopper, getVisibleSelect } from '../utils';
 import * as projects from '../composables/projects';
 
 /**
@@ -180,7 +180,8 @@ describe('Sharing', { disableAutoLogin: true }, () => {
 		).should('be.visible');
 
 		credentialsModal.getters.usersSelect().click();
-		cy.getByTestId('project-sharing-info')
+		getVisiblePopper()
+			.find('[data-test-id="project-sharing-info"]')
 			.filter(':visible')
 			.should('have.length', 3)
 			.contains(INSTANCE_ADMIN.email)

cypress/e2e/45-ai-assistant.cy.ts

@@ -34,7 +34,7 @@ describe('AI Assistant::enabled', () => {
 		aiAssistant.getters.chatInputWrapper().should('not.exist');
 		aiAssistant.getters.closeChatButton().should('be.visible');
 		aiAssistant.getters.closeChatButton().click();
-		aiAssistant.getters.askAssistantChat().should('not.exist');
+		aiAssistant.getters.askAssistantChat().should('not.be.visible');
 	});
 
 	it('should resize assistant chat up', () => {
@@ -162,13 +162,13 @@ describe('AI Assistant::enabled', () => {
 		cy.createFixtureWorkflow('aiAssistant/test_workflow.json');
 		wf.actions.openNode('Edit Fields');
 		ndv.getters.nodeExecuteButton().click();
-		aiAssistant.getters.nodeErrorViewAssistantButton().click();
+		aiAssistant.getters.nodeErrorViewAssistantButton().click({ force: true });
 		cy.wait('@chatRequest');
 		aiAssistant.getters.closeChatButton().click();
 		ndv.getters.backToCanvas().click();
 		wf.actions.openNode('Stop and Error');
 		ndv.getters.nodeExecuteButton().click();
-		aiAssistant.getters.nodeErrorViewAssistantButton().click();
+		aiAssistant.getters.nodeErrorViewAssistantButton().click({ force: true });
 		// Since we already have an active session, a warning should be shown
 		aiAssistant.getters.newAssistantSessionModal().should('be.visible');
 		aiAssistant.getters

cypress/e2e/46-n8n.io-iframe.cy.ts

@@ -0,0 +1,35 @@
+import { WorkflowsPage } from '../pages';
+
+const workflowsPage = new WorkflowsPage();
+
+describe('n8n.io iframe', () => {
+	describe('when telemetry is disabled', () => {
+		it('should not load the iframe when visiting /home/workflows', () => {
+			cy.overrideSettings({ telemetry: { enabled: false } });
+
+			cy.visit(workflowsPage.url);
+
+			cy.get('iframe').should('not.exist');
+		});
+	});
+
+	describe('when telemetry is enabled', () => {
+		it('should load the iframe when visiting /home/workflows', () => {
+			const testInstanceId = 'test-instance-id';
+
+			cy.overrideSettings({ telemetry: { enabled: true }, instanceId: testInstanceId });
+
+			const testUserId = Cypress.env('currentUserId');
+
+			const iframeUrl = `https://n8n.io/self-install?instanceId=${testInstanceId}&userId=${testUserId}`;
+
+			cy.intercept(iframeUrl, (req) => req.reply(200)).as('iframeRequest');
+
+			cy.visit(workflowsPage.url);
+
+			cy.get('iframe').should('exist').and('have.attr', 'src', iframeUrl);
+
+			cy.wait('@iframeRequest').its('response.statusCode').should('eq', 200);
+		});
+	});
+});

cypress/e2e/5-ndv.cy.ts

@@ -199,7 +199,7 @@ describe('NDV', () => {
 					.contains(key)
 					.should('be.visible');
 			});
-			getObjectValueItem().find('label').click();
+			getObjectValueItem().find('label').click({ force: true });
 			expandedObjectProps.forEach((key) => {
 				ndv.getters
 					.outputPanel()

cypress/support/commands.ts

@@ -59,14 +59,18 @@ Cypress.Commands.add('waitForLoad', (waitForIntercepts = true) => {
 
 Cypress.Commands.add('signin', ({ email, password }) => {
 	void Cypress.session.clearAllSavedSessions();
-	cy.session([email, password], () =>
-		cy.request({
-			method: 'POST',
-			url: `${BACKEND_BASE_URL}/rest/login`,
-			body: { email, password },
-			failOnStatusCode: false,
-		}),
-	);
+	cy.session([email, password], () => {
+		return cy
+			.request({
+				method: 'POST',
+				url: `${BACKEND_BASE_URL}/rest/login`,
+				body: { email, password },
+				failOnStatusCode: false,
+			})
+			.then((response) => {
+				Cypress.env('currentUserId', response.body.data.id);
+			});
+	});
 });
 
 Cypress.Commands.add('signinAsOwner', () => cy.signin(INSTANCE_OWNER));

package.json

@@ -1,6 +1,6 @@
 {
   "name": "n8n-monorepo",
-  "version": "1.56.0",
+  "version": "1.57.0",
   "private": true,
   "engines": {
     "node": ">=20.15",

packages/@n8n/benchmark/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@n8n/n8n-benchmark",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Cli for running benchmark tests for n8n",
   "main": "dist/index",
   "scripts": {

packages/@n8n/benchmark/scripts/runInCloud.mjs

@@ -15,7 +15,7 @@
 // @ts-check
 import fs from 'fs';
 import minimist from 'minimist';
-import { $, sleep, which } from 'zx';
+import { sleep, which } from 'zx';
 import path from 'path';
 import { SshClient } from './sshClient.mjs';
 import { TerraformClient } from './terraformClient.mjs';
@@ -61,7 +61,6 @@ async function ensureDependencies() {
 }
 
 /**
- *
  * @param {Config} config
  * @param {BenchmarkEnv} benchmarkEnv
  */
@@ -86,7 +85,32 @@ async function runBenchmarksOnVm(config, benchmarkEnv) {
 	// Give some time for the VM to be ready
 	await sleep(1000);
 
-	console.log('Running benchmarks...');
+	if (config.n8nSetupToUse === 'all') {
+		const availableSetups = readAvailableN8nSetups();
+
+		for (const n8nSetup of availableSetups) {
+			await runBenchmarkForN8nSetup({
+				config,
+				sshClient,
+				scriptsDir,
+				n8nSetup,
+			});
+		}
+	} else {
+		await runBenchmarkForN8nSetup({
+			config,
+			sshClient,
+			scriptsDir,
+			n8nSetup: config.n8nSetupToUse,
+		});
+	}
+}
+
+/**
+ * @param {{ config: Config; sshClient: any; scriptsDir: string; n8nSetup: string; }} opts
+ */
+async function runBenchmarkForN8nSetup({ config, sshClient, scriptsDir, n8nSetup }) {
+	console.log(`Running benchmarks for ${n8nSetup}...`);
 	const runScriptPath = path.join(scriptsDir, 'runOnVm.mjs');
 
 	const flags = {
@@ -100,7 +124,7 @@ async function runBenchmarksOnVm(config, benchmarkEnv) {
 		.map(([key, value]) => `--${key}=${value}`)
 		.join(' ');
 
-	await sshClient.ssh(`npx zx ${runScriptPath} ${flagsString} ${config.n8nSetupToUse}`, {
+	await sshClient.ssh(`npx zx ${runScriptPath} ${flagsString} ${n8nSetup}`, {
 		// Test run should always log its output
 		verbose: true,
 	});
@@ -138,10 +162,15 @@ function readAvailableN8nSetups() {
  * @returns {Promise<Config>}
  */
 async function parseAndValidateConfig() {
-	const args = minimist(process.argv.slice(2), {
-		boolean: ['debug'],
+	const args = minimist(process.argv.slice(3), {
+		boolean: ['debug', 'help'],
 	});
 
+	if (args.help) {
+		printUsage();
+		process.exit(0);
+	}
+
 	const n8nSetupToUse = await getAndValidateN8nSetup(args);
 	const isVerbose = args.debug || false;
 	const n8nTag = args.n8nTag || process.env.N8N_DOCKER_TAG || 'latest';
@@ -163,10 +192,8 @@ async function parseAndValidateConfig() {
 async function getAndValidateN8nSetup(args) {
 	// Last parameter is the n8n setup to use
 	const n8nSetupToUse = args._[args._.length - 1];
-
-	if (!n8nSetupToUse) {
-		printUsage();
-		process.exit(1);
+	if (!n8nSetupToUse || n8nSetupToUse === 'all') {
+		return 'all';
 	}
 
 	const availableSetups = readAvailableN8nSetups();
@@ -182,19 +209,20 @@ async function getAndValidateN8nSetup(args) {
 function printUsage() {
 	const availableSetups = readAvailableN8nSetups();
 
-	console.log('Usage: zx scripts/runInCloud.mjs <n8n setup name>');
-	console.log('   eg: zx scripts/runInCloud.mjs sqlite');
+	console.log('Usage: zx scripts/runInCloud.mjs [n8n setup name]');
+	console.log('   eg: zx scripts/runInCloud.mjs');
 	console.log('');
 	console.log('Options:');
+	console.log(
+		`  [n8n setup name]     Against which n8n setup to run the benchmarks. One of: ${['all', ...availableSetups].join(', ')}. Default is all`,
+	);
 	console.log('  --debug              Enable verbose output');
 	console.log('  --n8nTag             Docker tag for n8n image. Default is latest');
 	console.log('  --benchmarkTag       Docker tag for benchmark cli image. Default is latest');
 	console.log(
-		'  --k6ApiToken         API token for k6 cloud. Default is read from K6_API_TOKEN env var. If omitted, k6 cloud will not be used.',
+		'  --k6ApiToken         API token for k6 cloud. Default is read from K6_API_TOKEN env var. If omitted, k6 cloud will not be used',
 	);
 	console.log('');
-	console.log('Available setups:');
-	console.log(`  ${availableSetups.join(', ')}`);
 }
 
 main().catch(console.error);

packages/@n8n/benchmark/scripts/runOnVm/bootstrap.sh

@@ -10,8 +10,8 @@ CURRENT_USER=$(whoami)
 # Mount the data disk
 if [ -d "/n8n" ]; then
 	echo "Data disk already mounted. Clearing it..."
-	rm -rf /n8n/*
-	rm -rf /n8n/.[!.]*
+	sudo rm -rf /n8n/*
+	sudo rm -rf /n8n/.[!.]*
 else
 	sudo mkdir -p /n8n
 	sudo parted /dev/sdc --script mklabel gpt mkpart xfspart xfs 0% 100%

packages/@n8n/benchmark/scripts/runOnVm/n8nSetups/sqlite-legacy/docker-compose.yml

@@ -0,0 +1,17 @@
+services:
+  n8n:
+    image: ghcr.io/n8n-io/n8n:${N8N_VERSION:-latest}
+    environment:
+      - N8N_DIAGNOSTICS_ENABLED=false
+      - N8N_USER_FOLDER=/n8n
+    ports:
+      - 5678:5678
+    volumes:
+      - /n8n:/n8n
+  benchmark:
+    image: ghcr.io/n8n-io/n8n-benchmark:${N8N_BENCHMARK_VERSION:-latest}
+    depends_on:
+      - n8n
+    environment:
+      - N8N_BASE_URL=http://n8n:5678
+      - K6_API_TOKEN=${K6_API_TOKEN}

packages/@n8n/benchmark/scripts/runOnVm/n8nSetups/sqlite/docker-compose.yml

@@ -4,6 +4,8 @@ services:
     environment:
       - N8N_DIAGNOSTICS_ENABLED=false
       - N8N_USER_FOLDER=/n8n
+      - DB_SQLITE_POOL_SIZE=3
+      - DB_SQLITE_ENABLE_WAL=true
     ports:
       - 5678:5678
     volumes: