Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .env-cmdrc-template
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
"MAX_REQUEST_PER_MINUTE": 0,

"SWITCHER_API_LOGGER": false,
"SWITCHER_API_LOGGER_LEVEL": "debug",

"SWITCHER_API_ENABLE": false,
"SWITCHER_API_THROTTLE": 5000,
"SWITCHER_API_URL": "http://localhost:3000",
Expand Down
26 changes: 0 additions & 26 deletions .eslintrc.json

This file was deleted.

2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ services:
- MAX_REQUEST_PER_MINUTE=${MAX_REQUEST_PER_MINUTE}

- SWITCHER_API_LOGGER=${SWITCHER_API_LOGGER}
- SWITCHER_API_LOGGER_LEVEL=${SWITCHER_API_LOGGER_LEVEL}

- SWITCHER_API_ENABLE=${SWITCHER_API_ENABLE}
- SWITCHER_API_URL=${SWITCHER_API_URL}
- SWITCHER_API_KEY=${SWITCHER_API_KEY}
Expand Down
24 changes: 24 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import js from '@eslint/js';
import globals from 'globals';

export default [
{
...js.configs.recommended,
files: ['src/**/*.js']
},
{
files: ['src/**/*.js'],
rules: {
quotes: ['error', 'single'],
semi: ['error', 'always'],
curly: ['error', 'multi-line'],
},
languageOptions: {
ecmaVersion: 2022,
sourceType: 'module',
globals: {
...globals.node
}
}
}
];
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,22 +49,22 @@
"helmet": "^7.1.0",
"jsonwebtoken": "^9.0.2",
"moment": "^2.30.1",
"mongodb": "^6.6.1",
"mongoose": "^8.3.4",
"pino": "^9.0.0",
"mongodb": "^6.6.2",
"mongoose": "^8.4.0",
"pino": "^9.1.0",
"pino-pretty": "^11.0.0",
"swagger-ui-express": "^5.0.0",
"switcher-client": "^4.1.0",
"validator": "^13.12.0"
},
"devDependencies": {
"env-cmd": "^10.1.0",
"eslint": "^8.57.0",
"eslint": "^9.3.0",
"jest": "^29.7.0",
"jest-sonar-reporter": "^2.0.0",
"node-notifier": "^10.0.1",
"nodemon": "^3.1.0",
"sinon": "^17.0.2",
"sinon": "^18.0.0",
"supertest": "^7.0.0"
},
"repository": {
Expand Down
3 changes: 3 additions & 0 deletions src/client/relay/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import axios from 'axios';
import https from 'https';
import { StrategiesToRelayDataType, RelayMethods } from '../../models/config.js';
import { checkHttpsAgent } from '../../external/switcher-api-facade.js';
import Logger from '../../helpers/logger.js';

const agent = async (url) => {
const response = await checkHttpsAgent(url);
Expand Down Expand Up @@ -44,6 +45,7 @@ async function post(url, data, headers) {
try {
return await axios.post(url, data, { httpsAgent: await agent(url), headers });
} catch (error) {
Logger.debug('post', error);
throw new Error(`Failed to reach ${url} via POST`);
}
}
Expand All @@ -52,6 +54,7 @@ async function get(url, data, headers) {
try {
return await axios.get(`${url}${data}`, { httpsAgent: await agent(url), headers });
} catch (error) {
Logger.debug('get', error);
throw new Error(`Failed to reach ${url} via GET`);
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/client/resolvers.js
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,9 @@ function checkFlags(config, group, domain, environment) {
async function checkStrategy(entry, strategies, environment) {
if (strategies) {
for (const strategy of strategies) {
if (!strategy.activated[environment])
if (!strategy.activated[environment]) {
continue;
}

await checkStrategyInput(entry, strategy);
}
Expand Down
3 changes: 2 additions & 1 deletion src/external/switcher-api-facade.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@ export async function getRateLimit(key, component) {
}

export async function checkHttpsAgent(value) {
if (process.env.SWITCHER_API_ENABLE != 'true')
if (process.env.SWITCHER_API_ENABLE != 'true') {
return;
}

return getFeatureFlag(SwitcherKeys.HTTPS_AGENT)
.checkRegex(value)
Expand Down
9 changes: 7 additions & 2 deletions src/helpers/index.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
import Logger from './logger.js';

export function payloadReader(payload) {
let payloadRead = payload + '' === payload || payload || 0;
if (Array.isArray(payloadRead))
if (Array.isArray(payloadRead)) {
return payloadRead.flatMap(p => payloadReader(p));
}

return Object.keys(payloadRead)
.flatMap(field => [field, ...payloadReader(payload[field])
.map(nestedField => `${field}.${nestedField}`)])
.filter(field => isNaN(Number(field)))
.reduce((acc, curr) => {
if (!acc.includes(curr))
if (!acc.includes(curr)) {
acc.push(curr);
}
return acc;
}, []);
}
Expand All @@ -18,6 +22,7 @@ export function parseJSON(str) {
try {
return JSON.parse(str);
} catch (e) {
Logger.debug('parseJSON', e);
return undefined;
}
}
16 changes: 13 additions & 3 deletions src/helpers/logger.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import pino from 'pino';

const logger = pino({
level: process.env.SWITCHER_API_LOGGER_LEVEL || 'info',
transport: {
target: 'pino-pretty'
}
Expand All @@ -12,17 +13,26 @@ export default class Logger {
}

static info(message, obj) {
if (process.env.SWITCHER_API_LOGGER == 'true')
if (process.env.SWITCHER_API_LOGGER == 'true') {
logger.info(obj, message);
}
}

static error(message, err) {
if (process.env.SWITCHER_API_LOGGER == 'true')
if (process.env.SWITCHER_API_LOGGER == 'true') {
logger.error(err, message);
}
}

static debug(message, obj) {
if (process.env.SWITCHER_API_LOGGER == 'true') {
logger.debug(obj, message);
}
}

static httpError(name, code, message, err) {
if (process.env.SWITCHER_API_LOGGER == 'true')
if (process.env.SWITCHER_API_LOGGER == 'true') {
logger.error(err, `${name} [${code}]: ${message}`);
}
}
}
6 changes: 4 additions & 2 deletions src/helpers/timed-match/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ export default class TimedMatch {
let result = false;
let timer, resolveListener;

if (this._isBlackListed({ values, input }))
if (this._isBlackListed({ values, input })) {
return false;
}

const matchPromise = new Promise((resolve) => {
resolveListener = resolve;
Expand Down Expand Up @@ -88,8 +89,9 @@ export default class TimedMatch {
this._worker.kill();
this._worker = this._createChildProcess();

if (this._blacklisted.length == this._maxBlackListed)
if (this._blacklisted.length == this._maxBlackListed) {
this._blacklisted.splice(0, 1);
}

this._blacklisted.push({
res: values,
Expand Down
3 changes: 2 additions & 1 deletion src/middleware/limiter.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ const ERROR_MESSAGE = {
};

const getMaxRate = (rate_limit) => {
if (rate_limit === 0)
if (rate_limit === 0) {
return parseInt(DEFAULT_RATE_LIMIT);
}

return rate_limit;
};
Expand Down
3 changes: 2 additions & 1 deletion src/models/config-strategy.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,9 @@ async function processREGEX(operation, input, values) {

function processPAYLOAD(operation, input, values) {
const inputJson = parseJSON(input);
if (!inputJson)
if (!inputJson) {
return false;
}

const keys = payloadReader(inputJson);
switch(operation) {
Expand Down
12 changes: 8 additions & 4 deletions src/services/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,26 @@ export async function getConfigs(where) {
export function isRelayValid(relay) {
const bypass = process.env.RELAY_BYPASS_HTTPS === 'true' || false;

if (bypass || !relay.endpoint)
if (bypass || !relay.endpoint) {
return;
}

const foundNotHttps = Object.values(relay.endpoint)
.filter(endpoint => !endpoint.toLowerCase().startsWith('https'));

if (foundNotHttps.length)
if (foundNotHttps.length) {
throw new BadRequestError('HTTPS required');
}
}

export function isRelayVerified(relay, environment) {
const bypass = process.env.RELAY_BYPASS_VERIFICATION === 'true' || false;

if (bypass)
if (bypass) {
return;
}

if (!relay.verified[environment])
if (!relay.verified[environment]) {
throw new BadRequestError('Relay not verified');
}
}