diff --git a/backend/src/main.ts b/backend/src/main.ts index 1349d259..746c5f1f 100644 --- a/backend/src/main.ts +++ b/backend/src/main.ts @@ -1,17 +1,17 @@ -import cors from 'cors'; import express from 'express'; -import { ScenarioAPIConfig, addScenarioApi } from './scenarios/scenario.interface'; +import { + ScenarioAPIConfig, + addScenarioApi, +} from './scenarios/scenario.interface'; // import { parseCode } from './parser/scenarioParser'; -import { peruFactory } from './usr/peru/peru'; -import { peruShortFactory } from './usr/peru_short/peru'; -import { peruCachedFactory } from './usr/peru_cached/peru'; +import config from './config.json'; import { chileFactory } from './usr/chile/chile'; -import { chileShortFactory } from './usr/chile_short/chileShort'; import { chileCachedFactory } from './usr/chile_cached/chile'; +import { chileShortFactory } from './usr/chile_short/chileShort'; import { ecuadorFactory } from './usr/ecuador/ecuador'; -import config from "./config.json"; - - +import { peruFactory } from './usr/peru/peru'; +import { peruCachedFactory } from './usr/peru_cached/peru'; +import { peruShortFactory } from './usr/peru_short/peru'; const port = config.port; @@ -19,19 +19,27 @@ const configuration: ScenarioAPIConfig = { logDir: config.logDir, storeDir: config.storeDir, maxStoreLifeTimeMinutes: parseInt(config.maxStoreLifeTimeMinutes), - sender: config.sender || "info@test.com", - sendMailTo: config.sendMailTo.split(","), + sender: config.sender || 'info@test.com', + sendMailTo: config.sendMailTo.split(','), maxLogAgeMinutes: parseInt(config.maxLogAgeMinutes), - verbosity: config.verbosity === "silent" ? "silent" : "verbose" -} + verbosity: config.verbosity === 'silent' ? 'silent' : 'verbose', +}; async function main() { // Setting up express const app = express(); - app.use(cors()); - + // app.use(cors()); <-- not necessary; already done by reverse proxy + // const scenarioFactories = await parseCode(scriptDir); - const scenarioFactories = [chileFactory, chileShortFactory, chileCachedFactory, ecuadorFactory, peruFactory, peruShortFactory, peruCachedFactory]; + const scenarioFactories = [ + chileFactory, + chileShortFactory, + chileCachedFactory, + ecuadorFactory, + peruFactory, + peruShortFactory, + peruCachedFactory, + ]; // Checking that all scenarios are ready // for (const factory of scenarioFactories) { @@ -47,7 +55,9 @@ async function main() { // Adding API-endpoints to express app addScenarioApi(app, scenarioFactories, configuration); - const server = app.listen(port, () => console.log(`app now listening on port ${port}`)); + const server = app.listen(port, () => + console.log(`app now listening on port ${port}`) + ); } main(); diff --git a/backend/src/scenarios/scenario.interface.ts b/backend/src/scenarios/scenario.interface.ts index f088aac9..87f554e3 100644 --- a/backend/src/scenarios/scenario.interface.ts +++ b/backend/src/scenarios/scenario.interface.ts @@ -39,7 +39,7 @@ export function addScenarioApi( }) ); app.use((req, res, next) => { - console.log(req.originalUrl); + console.log('>>>> New request:', req.originalUrl); res.setHeader( 'Expires', new Date(Date.now() + 1 * 60 * 1000).toUTCString()