ti2-ventrata 1.0.20 → 1.0.22

package/index.js

@@ -15,13 +15,6 @@ if (process.env.debug) {
   curlirize(axiosRaw);
 }
 
-const axios = async (...args) => axiosRaw(...args)
-  .catch(err => {
-    const errMsg = R.path(['response', 'data', 'errorMessage'], err);
-    console.log('error in ti2-ventrata', args[0], errMsg);
-    if (errMsg) throw new Error(errMsg);
-    throw err;
-  });
 const isNilOrEmpty = R.either(R.isNil, R.isEmpty);
 
 const getHeaders = ({
@@ -29,6 +22,7 @@ const getHeaders = ({
   acceptLanguage,
   octoEnv,
   resellerId,
+  requestId,
 }) => ({
   Authorization: `Bearer ${apiKey}`,
   ...octoEnv ? { 'Octo-Env': octoEnv } : {},
@@ -36,6 +30,7 @@ const getHeaders = ({
   'Content-Type': 'application/json',
   ...resellerId ? { Referer: resellerId } : {},
   'Octo-Capabilities': 'octo/pricing,octo/pickups',
+  ...requestId ? { requestId } : {},
   // 'Octo-Capabilities': 'octo/pricing',
 });
 
@@ -44,6 +39,31 @@ class Plugin {
     Object.entries(params).forEach(([attr, value]) => {
       this[attr] = value;
     });
+    if (this.events) {
+      axiosRaw.interceptors.request.use(request => {
+        this.events.emit(`${this.name}.axios.request`, JSON.parse(JSON.stringify(request)));
+        return request;
+      });
+      axiosRaw.interceptors.response.use(response => {
+        this.events.emit(`${this.name}.axios.response`, JSON.parse(JSON.stringify(response)));
+        return response;
+      });
+    }
+    const pluginObj = this;
+    this.axios = async (...args) => axiosRaw(...args).catch(err => {
+      const errMsg = R.path(['response', 'data', 'errorMessage'], err);
+      console.log(`error in ${this.name}`, args[0], errMsg || err);
+      if (pluginObj.events) {
+        pluginObj.events.emit(`${this.name}.axios.error`, {
+          request: args[0],
+          err: JSON.parse(JSON.stringify(err)),
+          errMsg,
+        });
+      }
+      if (errMsg) throw new Error(errMsg);
+      throw err;
+    });
+
     this.tokenTemplate = () => ({
       apiKey: {
         type: 'text',
@@ -85,6 +105,7 @@ class Plugin {
       acceptLanguage,
       resellerId,
     },
+    requestId,
   }) {
     const url = `${endpoint || this.endpoint}/whoami?token=${apiKey}`;
     const headers = getHeaders({
@@ -93,9 +114,10 @@ class Plugin {
       octoEnv,
       acceptLanguage,
       resellerId,
+      requestId,
     });
     try {
-      const connectionId = R.path(['data', 'connection', 'id'], await axios({
+      const connectionId = R.path(['data', 'connection', 'id'], await this.axios({
         method: 'get',
         url,
         headers,
@@ -119,6 +141,7 @@ class Plugin {
       productTypeDefs,
       productQuery,
     },
+    requestId,
   }) {
     let url = `${endpoint || this.endpoint}/products`;
     if (!isNilOrEmpty(payload)) {
@@ -132,8 +155,9 @@ class Plugin {
       octoEnv,
       acceptLanguage,
       resellerId,
+      requestId,
     });
-    let results = R.pathOr([], ['data'], await axios({
+    let results = R.pathOr([], ['data'], await this.axios({
       method: 'get',
       url,
       headers,
@@ -202,6 +226,7 @@ class Plugin {
       availTypeDefs,
       availQuery,
     },
+    requestId,
   }) {
     assert(this.jwtKey, 'JWT secret should be set');
     assert(
@@ -222,6 +247,7 @@ class Plugin {
       octoEnv,
       acceptLanguage,
       resellerId,
+      requestId,
     });
     const url = `${endpoint || this.endpoint}/availability`;
     const availability = (
@@ -234,7 +260,7 @@ class Plugin {
           units: units[ix].map(u => ({ id: u.unitId, quantity: u.quantity })),
         };
         if (currency) data.currency = currency;
-        const result = R.path(['data'], await axios({
+        const result = R.path(['data'], await this.axios({
           method: 'post',
           url,
           data,
@@ -278,6 +304,7 @@ class Plugin {
       availTypeDefs,
       availQuery,
     },
+    requestId,
   }) {
     assert(this.jwtKey, 'JWT secret should be set');
     assert(
@@ -298,6 +325,7 @@ class Plugin {
       octoEnv,
       acceptLanguage,
       resellerId,
+      requestId,
     });
     const url = `${endpoint || this.endpoint}/availability/calendar`;
     const availability = (
@@ -311,7 +339,7 @@ class Plugin {
           units: units[ix].map(u => ({ id: u.unitId, quantity: u.quantity })),
         };
         if (currency) data.currency = currency;
-        const result = await axios({
+        const result = await this.axios({
           method: 'post',
           url,
           data,
@@ -348,6 +376,7 @@ class Plugin {
       bookingTypeDefs,
       bookingQuery,
     },
+    requestId,
   }) {
     assert(availabilityKey, 'an availability code is required !');
     assert(R.path(['name'], holder), 'first name is required');
@@ -358,9 +387,10 @@ class Plugin {
       octoEnv,
       acceptLanguage,
       resellerId,
+      requestId,
     });
     const dataForCreateBooking = await jwt.verify(availabilityKey, this.jwtKey);
-    let booking = R.path(['data'], await axios({
+    let booking = R.path(['data'], await this.axios({
       method: rebookingId ? 'patch' : 'post',
       url: `${endpoint || this.endpoint}/bookings${rebookingId ? `/${rebookingId}` : ''}`,
       data: {
@@ -385,7 +415,7 @@ class Plugin {
         resellerReference: reference,
         settlementMethod,
       };
-      booking = R.path(['data'], await axios({
+      booking = R.path(['data'], await this.axios({
         method: 'post',
         url: `${endpoint || this.endpoint}/bookings/${booking.uuid}/confirm`,
         data: dataForConfirmBooking,
@@ -418,6 +448,7 @@ class Plugin {
       bookingTypeDefs,
       bookingQuery,
     },
+    requestId,
   }) {
     assert(!isNilOrEmpty(bookingId) || !isNilOrEmpty(id), 'Invalid booking id');
     const headers = getHeaders({
@@ -426,9 +457,10 @@ class Plugin {
       octoEnv,
       acceptLanguage,
       resellerId,
+      requestId,
     });
     const url = `${endpoint || this.endpoint}/bookings/${bookingId || id}`;
-    const booking = R.path(['data'], await axios({
+    const booking = R.path(['data'], await this.axios({
       method: 'delete',
       url,
       data: { reason },
@@ -463,6 +495,7 @@ class Plugin {
       bookingTypeDefs,
       bookingQuery,
     },
+    requestId,
   }) {
     assert(
       !isNilOrEmpty(bookingId)
@@ -479,10 +512,11 @@ class Plugin {
       octoEnv,
       acceptLanguage,
       resellerId,
+      requestId,
     });
     const searchByUrl = async url => {
       try {
-        return R.path(['data'], await axios({
+        return R.path(['data'], await this.axios({
           method: 'get',
           url,
           headers,
@@ -502,7 +536,7 @@ class Plugin {
       }
       if (!isNilOrEmpty(resellerReference)) {
         url = `${endpoint || this.endpoint}/bookings?resellerReference=${resellerReference}`;
-        return R.path(['data'], await axios({
+        return R.path(['data'], await this.axios({
           method: 'get',
           url,
           headers,
@@ -510,7 +544,7 @@ class Plugin {
       }
       if (!isNilOrEmpty(supplierBookingId)) {
         url = `${endpoint || this.endpoint}/bookings?supplierReference=${supplierBookingId}`;
-        return R.path(['data'], await axios({
+        return R.path(['data'], await this.axios({
           method: 'get',
           url,
           headers,
@@ -520,7 +554,7 @@ class Plugin {
         const localDateStart = moment(travelDateStart, dateFormat).format();
         const localDateEnd = moment(travelDateEnd, dateFormat).format();
         url = `${endpoint || this.endpoint}/bookings?localDateStart=${encodeURIComponent(localDateStart)}&localDateEnd=${encodeURIComponent(localDateEnd)}`;
-        return R.path(['data'], await axios({
+        return R.path(['data'], await this.axios({
           method: 'get',
           url,
           headers,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ti2-ventrata",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "description": "Ventrata's TI2 Plugin",
   "main": "index.js",
   "scripts": {