ti2 1.0.47 → 1.0.49

package/controllers/allotment.js

@@ -27,6 +27,7 @@ const queryAllotment = plugins => async (req, res, next) => {
     const results = await app.queryAllotment({
       token,
       payload: query,
+      requestId: req.requestId,
     });
     return res.json(results);
   } catch (err) {

package/controllers/app.js

@@ -190,6 +190,7 @@ const validateAppToken = plugins => async (req, res, next) => {
     assert(app.validateToken, `could not find the validateToken method for ${appKey}`);
     const valid = await app.validateToken({
       token,
+      requestId: req.requestId,
     });
     return res.json({ valid });
   } catch (err) {

package/controllers/bookings.js

@@ -38,6 +38,7 @@ const bookingsSearch = plugins => async (req, res, next) => {
       token,
       payload: body,
       typeDefsAndQueries,
+      requestId: req.requestId,
     });
     return res.json(results);
   } catch (err) {
@@ -66,6 +67,7 @@ const bookingsCancel = plugins => async (req, res, next) => {
       token,
       payload: body,
       typeDefsAndQueries,
+      requestId: req.requestId,
     });
     return res.json(results);
   } catch (err) {
@@ -78,6 +80,7 @@ const $bookingsProductSearch = plugins => async ({
   userId,
   hint,
   payload,
+  requestId,
 }) => {
   const app = plugins.find(({ name }) => name === appKey);
   // const app = load(appKey);
@@ -94,6 +97,7 @@ const $bookingsProductSearch = plugins => async ({
     token,
     payload,
     typeDefsAndQueries,
+    requestId,
   });
   return results;
 };
@@ -102,9 +106,10 @@ const bookingsProductSearch = plugins => async (req, res, next) => {
   const {
     params,
     body: payload,
+    requestId,
   } = req;
   try {
-    return res.json(await $bookingsProductSearch(plugins)({ ...params, payload }));
+    return res.json(await $bookingsProductSearch(plugins)({ ...params, payload, requestId }));
   } catch (err) {
     return next(err);
   }
@@ -131,6 +136,7 @@ const bookingsAvailabilitySearch = plugins => async (req, res, next) => {
       token,
       payload,
       typeDefsAndQueries,
+      requestId: req.requestId,
     });
     return res.json(results);
   } catch (err) {
@@ -143,6 +149,7 @@ const $bookingsAvailabilityCalendar = plugins => async ({
   userId,
   hint,
   payload,
+  requestId,
 }) => {
   const app = plugins.find(({ name }) => name === appKey);
   // const app = load(appKey);
@@ -159,6 +166,7 @@ const $bookingsAvailabilityCalendar = plugins => async ({
     token,
     payload,
     typeDefsAndQueries,
+    requestId,
   });
 };
 
@@ -166,9 +174,14 @@ const bookingsAvailabilityCalendar = plugins => async (req, res, next) => {
   const {
     params,
     body: payload,
+    requestId,
   } = req;
   try {
-    return res.json(await $bookingsAvailabilityCalendar(plugins)({ ...params, payload }));
+    return res.json(await $bookingsAvailabilityCalendar(plugins)({
+      ...params,
+      payload,
+      requestId,
+    }));
   } catch (err) {
     return next(err);
   }
@@ -196,6 +209,7 @@ const searchQuote = plugins => async (req, res, next) => {
       token,
       payload,
       typeDefsAndQueries,
+      requestId: req.requestId,
     });
     return res.json(results);
   } catch (err) {
@@ -225,6 +239,7 @@ const createBooking = plugins => async (req, res, next) => {
       token,
       payload,
       typeDefsAndQueries,
+      requestId: req.requestId,
     });
     return res.json(results);
   } catch (err) {
@@ -253,6 +268,7 @@ const getAffiliateAgents = plugins => async (req, res, next) => {
     const results = await app.getAffiliateAgents({
       token,
       payload,
+      requestId: req.requestId,
     });
     return res.json(results);
   } catch (err) {
@@ -281,6 +297,7 @@ const getAffiliateDesks = plugins => async (req, res, next) => {
     const results = await app.getAffiliateDesks({
       token,
       payload,
+      requestId: req.requestId,
     });
     return res.json(results);
   } catch (err) {

package/controllers/user.js

@@ -23,7 +23,11 @@ const getAllFuncs = toCheck => {
   } while (obj = Object.getPrototypeOf(obj));
 
   return props.sort().filter((e, i, arr) => {
-    if (e !== arr[i + 1] && typeof toCheck[e] === 'function') return true;
+    try {
+      if (e !== arr[i + 1] && typeof toCheck[e] === 'function') return true;
+    } catch {
+      return undefined;
+    }
     return undefined;
   });
 };
@@ -42,6 +46,7 @@ const getAppMethods = plugins => async (req, res, next) => {
 };
 
 module.exports = plugins => ({
-  userAppList,
+  getAllFuncs,
   getAppMethods: getAppMethods(plugins),
+  userAppList,
 });

package/index.js

@@ -8,6 +8,11 @@ const { pickBy } = require('ramda');
 const bb = require('bluebird');
 const { Op } = require('sequelize');
 const R = require('ramda');
+const { v4: uuidv4 } = require('uuid');
+const EventEmitter = require('eventemitter2');
+
+const ti2Events = new EventEmitter({ captureRejections: true, wildcard: true });
+ti2Events.on('event error', console.error);
 
 const schema = yaml.load(fs.readFileSync(`${__dirname}/api.yml`));
 
@@ -29,8 +34,6 @@ const isNumber = value => !Number.isNaN(Number(value));
 
 module.exports = async ({
   apiDocs = true,
-  elasticLogIndex = 'apilog_ti2',
-  elasticLogsClient,
   plugins: pluginsParam = {},
   port: portParam,
   startServer = true,
@@ -50,7 +53,7 @@ module.exports = async ({
       const nuName = attr.replace(/_/g, '-').replace(`ti2-${pluginName}-`, '');
       params[nuName] = value;
     });
-    const pluginInstance = await new Plugin({ name: pluginName, ...params });
+    const pluginInstance = await new Plugin({ name: pluginName, events: ti2Events, ...params });
     return pluginInstance;
   });
   if (worker) {
@@ -129,110 +132,43 @@ module.exports = async ({
       notFound: (req, res) => res.sendStatus(404),
       notImplemented: (req, res) => res.sendStatus(501),
     });
-    if (elasticLogsClient) { // API request logs are saved on elastic
-      const mappings = {
-        dynamic: true,
-        properties: {
-          body: { type: 'object' },
-          client: { type: 'keyword' },
-          date: { type: 'long' },
-          method: { type: 'keyword' },
-          operationId: { type: 'keyword' },
-          params: { type: 'object' },
-          query: { type: 'object' },
-          url: { type: 'text' },
-          responseStatusCode: { type: 'long' },
-          responseTimeInMs: { type: 'long' },
-        },
+    const eventHandlerPlugins = plugins.filter(currentPlugin => (api.getAllFuncs(currentPlugin).indexOf('eventHandler') > -1));
+    eventHandlerPlugins.forEach(plugin => {
+      plugin.eventHandler(ti2Events);
+    });
+
+    app.use((req, res, next) => {
+      const startHrTime = process.hrtime();
+      const requestId = uuidv4();
+      const body = {
+        requestId,
+        date: Math.floor(Date.now() / 1e3),
+        url: req.url,
+        body: req.body,
+        params: req.pathParams,
+        query: req.query,
+        appRecord: req.appRecord,
+        method: req.method,
+        operationId: R.path(['openapi', 'operation', 'operationId'], req),
+        client: req.headers['x-forwarded-for'] || req.connection.remoteAddress,
       };
-      // setup the index
-      elasticLogsClient.indices.existsTemplate({
-        name: 'apilog',
-      }).then(async ({ body }) => {
-        if (!body) {
-          // the template has to be created
-          console.log('=- creating index template -=');
-          await elasticLogsClient.indices.putTemplate({
-            name: 'apilog',
-            body: {
-              index_patterns: [`${elasticLogIndex}*`],
-              settings: {
-                number_of_shards: 1,
-              },
-              mappings,
-            },
-          });
-          console.log('index template created');
-        } else {
-          // index exists, we might have to updated it
-          const current = R.path(
-            ['body', 'apilog', 'mappings'],
-            await elasticLogsClient.indices.getTemplate({
-              name: 'apilog',
-            }),
-          );
-          if (!R.equals(current, mappings)) {
-            console.log('=- updating index template -=');
-            await elasticLogsClient.indices.putTemplate({
-              name: 'apilog',
-              body: {
-                index_patterns: [`${elasticLogIndex}*`],
-                settings: {
-                  number_of_shards: 1,
-                },
-                mappings,
-              },
-            });
-            console.log('updated');
-          }
-        }
-        const exists = await elasticLogsClient.indices.exists({
-          index: elasticLogIndex,
+      ti2Events.emit('request.start', body);
+      req.requestId = requestId;
+      res.on('finish', () => {
+        const elapsedHrTime = process.hrtime(startHrTime);
+        const responseTimeInMs = parseInt(
+          elapsedHrTime[0] * 1e3 + elapsedHrTime[1] / 1e6,
+          10,
+        );
+        ti2Events.emit('request.end', {
+          ...body,
+          responseTimeInMs,
+          responseStatusCode: res.statusCode,
         });
-        if (!exists || !exists.body) {
-          console.log('=- creating index =-');
-          await elasticLogsClient.indices.create({
-            index: elasticLogIndex,
-          });
-          console.log('index created');
-        }
-      }).catch(console.log);
-      app.use((req, res, next) => {
-        const startHrTime = process.hrtime();
-        const body = {
-          date: Math.floor(Date.now() / 1e3),
-          url: req.url,
-          // body: req.body,
-          params: req.pathParams,
-          query: req.query,
-          appRecord: req.appRecord,
-          method: req.method,
-          operationId: R.path(['openapi', 'operation', 'operationId'], req),
-          client: req.headers['x-forwarded-for'] || req.connection.remoteAddress,
-        };
-        elasticLogsClient.index({
-          index: elasticLogIndex,
-          body,
-        }).then(({ body: { _id } }) => {
-          res.on('finish', () => {
-            const elapsedHrTime = process.hrtime(startHrTime);
-            const responseTimeInMs = parseInt(elapsedHrTime[0] * 1e3 + elapsedHrTime[1] / 1e6, 10);
-            elasticLogsClient.index({
-              index: elasticLogIndex,
-              id: _id,
-              body: {
-                ...body,
-                ...{
-                  responseTimeInMs,
-                  responseStatusCode: res.statusCode,
-                },
-              },
-            }).catch((err, response) => console.log(err, response));
-          });
-        }).catch((err, response) => console.log(err, response));
-        next();
       });
-    }
+      next();
+    });
+
     connect(app);
     app.use(middleware.mock());
     // global error Handling

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ti2",
-  "version": "1.0.47",
+  "version": "1.0.49",
   "description": "Tourist Industry Exchange (TI2)",
   "main": "index.js",
   "scripts": {
@@ -28,6 +28,7 @@
     "bluebird": "^3.7.2",
     "bull": "^4.8.2",
     "commander": "^9.2.0",
+    "eventemitter2": "^6.4.9",
     "express": "^4.17.2",
     "ioredis": "^5.0.4",
     "js-yaml": "^4.1.0",
@@ -44,7 +45,7 @@
     "swagger-ui-express": "4.3.0",
     "throng": "^5.0.0",
     "umzug": "^3.1.1",
-    "uninstall": "^0.0.0"
+    "uuid": "^9.0.0"
   },
   "devDependencies": {
     "@salvador/minami": "^1.2.3",