ti2-tourplan 1.0.9 → 1.0.11

package/index.js

@@ -1,10 +1,9 @@
-// const axios = require('axios');
 const R = require('ramda');
 const assert = require('assert');
 const moment = require('moment');
 const js2xmlparser = require('js2xmlparser');
 const xml2js = require('xml2js');
-const axios = require('axios');
+const axiosRaw = require('axios');
 
 const Normalizer = require('./normalizer');
 
@@ -20,17 +19,47 @@ const xmlOptions = {
   },
 };
 
-const getHeaders = ({ length }) => ({
+const getHeaders = ({ length, requestId }) => ({
   Accept: 'application/xml',
   'Content-Type': 'application/xml; charset=utf-8',
   'Content-Length': length,
+  ...requestId ? { requestId } : {},
 });
 
+const axiosSafeRequest = R.pick(['headers', 'method', 'url', 'data']);
+const axiosSafeResponse = response => {
+  const retVal = R.pick(['data', 'status', 'statusText', 'headers', 'request'], response);
+  retVal.request = axiosSafeRequest(retVal.request);
+  return retVal;
+};
+
 class Plugin {
   constructor(params = {}) { // we get the env variables from here
     Object.entries(params).forEach(([attr, value]) => {
       this[attr] = value;
     });
+    if (this.events) {
+      axiosRaw.interceptors.request.use(request => {
+        this.events.emit(`${this.name}.axios.request`, axiosSafeRequest(request));
+        return request;
+      });
+      axiosRaw.interceptors.response.use(response => {
+        this.events.emit(`${this.name}.axios.response`, axiosSafeResponse(response));
+        return response;
+      });
+    }
+    const pluginObj = this;
+    this.axios = async (...args) => axiosRaw(...args).catch(err => {
+      const errMsg = R.omit(['config'], err.toJSON());
+      console.log(`error in ${this.name}`, args[0], errMsg);
+      if (pluginObj.events) {
+        pluginObj.events.emit(`${this.name}.axios.error`, {
+          request: args[0],
+          err: errMsg,
+        });
+      }
+      throw err;
+    });
     this.tokenTemplate = () => ({
       endpoint: {
         type: 'text',
@@ -58,6 +87,7 @@ class Plugin {
       username,
       password,
     },
+    requestId,
   }) {
     try {
       const model = {
@@ -70,11 +100,12 @@ class Plugin {
         js2xmlparser.parse('Request', model, xmlOptions),
       );
       data = data.replace(xmlOptions.dtd.name, `Request SYSTEM "${xmlOptions.dtd.name}"`);
-      const reply = R.path(['data'], await axios({
+      const reply = R.path(['data'], await this.axios({
         metod: 'post',
         url: endpoint,
         data,
         headers: getHeaders({ length: data.length }),
+        requestId,
       }));
       const replyObj = await xmlParser.parseStringPromise(reply);
       assert(R.path(['Reply', 'AuthenticationReply', 0], replyObj) === '');
@@ -97,6 +128,7 @@ class Plugin {
       keyPath,
       appliesTo: appliesToFilter,
     },
+    requestId,
   }) {
     const verbose = R.path(['verbose'], this);
     const cleanLog = inputString =>
@@ -129,11 +161,11 @@ class Plugin {
     );
     data = data.replace(xmlOptions.dtd.name, `Request SYSTEM "${xmlOptions.dtd.name}"`);
     if (verbose) console.log('request', cleanLog(data));
-    const reply = R.path(['data'], await axios({
+    const reply = R.path(['data'], await this.axios({
       metod: 'post',
       url: endpoint,
       data,
-      headers: getHeaders({ length: data.length }),
+      headers: getHeaders({ length: data.length, requestId }),
     }));
     if (verbose) console.log('reply', cleanLog(reply));
     const returnObj = await xmlParser.parseStringPromise(reply);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ti2-tourplan",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Tourplan's TI2 Plugin",
   "main": "index.js",
   "scripts": {