mirror of
https://github.com/n8n-io/n8n.git
synced 2025-03-05 20:50:17 -08:00
⚡ Improve error handling for headers
This commit is contained in:
parent
fcd87affad
commit
8015f99211
|
@ -29,7 +29,7 @@
|
||||||
/* eslint-disable no-await-in-loop */
|
/* eslint-disable no-await-in-loop */
|
||||||
|
|
||||||
import * as express from 'express';
|
import * as express from 'express';
|
||||||
import { readFileSync } from 'fs';
|
import { existsSync, readFileSync } from 'fs';
|
||||||
import { readFile } from 'fs/promises';
|
import { readFile } from 'fs/promises';
|
||||||
import { cloneDeep } from 'lodash';
|
import { cloneDeep } from 'lodash';
|
||||||
import { dirname as pathDirname, join as pathJoin, resolve as pathResolve } from 'path';
|
import { dirname as pathDirname, join as pathJoin, resolve as pathResolve } from 'path';
|
||||||
|
@ -1503,10 +1503,13 @@ class App {
|
||||||
async (req: express.Request, res: express.Response): Promise<object | void> => {
|
async (req: express.Request, res: express.Response): Promise<object | void> => {
|
||||||
const packagesPath = pathJoin(__dirname, '..', '..', '..');
|
const packagesPath = pathJoin(__dirname, '..', '..', '..');
|
||||||
const headersPath = pathJoin(packagesPath, 'nodes-base', 'dist', 'nodes', 'headers');
|
const headersPath = pathJoin(packagesPath, 'nodes-base', 'dist', 'nodes', 'headers');
|
||||||
|
|
||||||
|
if (!existsSync(`${headersPath}.js`)) return;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
return require(headersPath);
|
return require(headersPath);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
res.status(500).send('Failed to find headers file');
|
res.status(500).send('Failed to load headers file');
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
|
|
@ -2742,12 +2742,8 @@ export default mixins(
|
||||||
await Promise.all(loadPromises);
|
await Promise.all(loadPromises);
|
||||||
|
|
||||||
if (this.defaultLocale !== 'en') {
|
if (this.defaultLocale !== 'en') {
|
||||||
try {
|
|
||||||
const headers = await this.restApi().getNodeTranslationHeaders();
|
const headers = await this.restApi().getNodeTranslationHeaders();
|
||||||
addHeaders(headers, this.defaultLocale);
|
if (headers) addHeaders(headers, this.defaultLocale);
|
||||||
} catch (_) {
|
|
||||||
// no headers available
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.$showError(
|
this.$showError(
|
||||||
|
|
Loading…
Reference in a new issue