@vouchfor/sdk 1.1.9 → 1.1.12

package/lib/services/baseService.js

@@ -1,13 +1,14 @@
 const utils = require('../shared/utils');
 
 class BaseService {
-  constructor(client, config = {}) {
+  constructor(client, config = {}, logger) {
     const basePath = config.basePath ? `/${config.basePath}` : '';
 
     this._client = client;
     this._apiKey = config.apiKey || '';
     this._integrationKey = config.integrationKey || '';
     this._baseUrl = `${config.baseUrl}${basePath}`;
+    this._logger = logger;
   }
 
   async _callApi({
@@ -34,6 +35,7 @@ class BaseService {
       headers: apiHeaders,
       method,
       url,
+      logger: this._logger
     });
   }
 }

package/lib/services/integration/base.js

@@ -2,13 +2,13 @@ const BaseService = require('../baseService');
 const utils = require('../../shared/utils');
 
 class BaseIntegrationService extends BaseService {
-  constructor(client, config = {}, basePath = '') {
+  constructor(client, config = {}, basePath = '', logger) {
     super(client, {
       apiKey: config.integrationKey,
       baseUrl: `https://apps${utils.getApiSuffix(config.env)}.vouchfor.com/v1`,
       basePath,
       env: config.env,
-    });
+    }, logger);
   }
 
   _request({ body, method, path }) {
@@ -21,4 +21,4 @@ class BaseIntegrationService extends BaseService {
   }
 }
 
-module.exports = BaseIntegrationService;
+module.exports = BaseIntegrationService;

package/lib/services/integration/integrationService.js

@@ -1,8 +1,8 @@
 const BaseIntegrationService = require('./base');
 
 class IntegrationService extends BaseIntegrationService {
-  constructor(client, config) {
-    super(client, config, '');
+  constructor(client, config, logger) {
+    super(client, config, '', logger);
   }
 
   get applications() {

package/lib/services/rest/applicationService.js

@@ -2,9 +2,9 @@ const BaseRestService = require('./base');
 const ApplicationStorageService = require('./applicationStorageService');
 
 class ApplicationService extends BaseRestService {
-  constructor(client, config) {
-    super(client, config, 'applications');
-    this.storage = new ApplicationStorageService(client, config);
+  constructor(client, config, logger) {
+    super(client, config, 'applications', logger);
+    this.storage = new ApplicationStorageService(client, config, logger);
   }
 
   create(application, apiKey) {
@@ -36,4 +36,4 @@ class ApplicationService extends BaseRestService {
   }
 }
 
-module.exports = ApplicationService;
+module.exports = ApplicationService;

package/lib/services/rest/applicationStorageService.js

@@ -5,8 +5,8 @@ function storagePath(id, key) {
 }
 
 class ApplicationStorageService extends BaseRestService {
-  constructor(client, config) {
-    super(client, config, 'applications');
+  constructor(client, config, logger) {
+    super(client, config, 'applications', logger);
   }
 
   set(id, key, data, apiKey) {
@@ -33,4 +33,4 @@ class ApplicationStorageService extends BaseRestService {
   }
 }
 
-module.exports = ApplicationStorageService;
+module.exports = ApplicationStorageService;

package/lib/services/rest/base.js

@@ -2,14 +2,14 @@ const BaseService = require('../baseService');
 const utils = require('../../shared/utils');
 
 class BaseRestService extends BaseService {
-  constructor(client, config = {}, basePath = '') {
+  constructor(client, config = {}, basePath = '', logger) {
     super(client, {
       apiKey: config.apiKey,
       integrationKey: config.integrationKey,
       baseUrl: `https://api${utils.getApiSuffix(config.env)}.vouchfor.com/v1`,
       basePath,
       env: config.env,
-    });
+    }, logger);
   }
 
   _request({ apiKey, body, method, path, headers }) {

package/lib/services/rest/campaignService.js

@@ -1,8 +1,8 @@
 const BaseRestService = require('./base');
 
 class CampaignService extends BaseRestService {
-  constructor(client, config) {
-    super(client, config, 'campaigns');
+  constructor(client, config, logger) {
+    super(client, config, 'campaigns', logger);
   }
 
   create(campaign, apiKey) {
@@ -34,4 +34,4 @@ class CampaignService extends BaseRestService {
   }
 }
 
-module.exports = CampaignService;
+module.exports = CampaignService;

package/lib/services/rest/entityService.js

@@ -1,8 +1,8 @@
 const BaseRestService = require('./base');
 
 class EntityService extends BaseRestService {
-  constructor(client, config) {
-    super(client, config, 'entities');
+  constructor(client, config, logger) {
+    super(client, config, 'entities', logger);
   }
 
   create(entity, apiKey) {
@@ -30,4 +30,4 @@ class EntityService extends BaseRestService {
   }
 }
 
-module.exports = EntityService;
+module.exports = EntityService;

package/lib/services/rest/fileService.js

@@ -5,8 +5,8 @@ const axios = require('axios');
 const BaseRestService = require('./base');
 
 class FileService extends BaseRestService {
-  constructor(client, config) {
-    super(client, config, 'files');
+  constructor(client, config, logger) {
+    super(client, config, 'files', logger);
   }
 
   upload(file, key, apiKey, { extract } = {}) {

package/lib/services/rest/vouchService.js

@@ -1,8 +1,8 @@
 const BaseRestService = require('./base');
 
 class VouchService extends BaseRestService {
-  constructor(client, config) {
-    super(client, config, 'vouches');
+  constructor(client, config, logger) {
+    super(client, config, 'vouches', logger);
   }
 
   create(vouch, apiKey) {

package/lib/shared/utils.js

@@ -1,22 +1,65 @@
 const followRedirects = require('follow-redirects');
-const { https } = followRedirects;
+const { http, https } = followRedirects;
 
 followRedirects.maxRedirects = 10;
 followRedirects.maxBodyLength = Infinity;
 
+function logHttpResponse({ req, res, body, result, logger }) {
+  const { protocol, method, host, _header: header } = req._currentRequest;
+  const get = req.type === 'GET';
+  const type = res.headers['content-type'] ?? 'application/json';
+  const json = type.indexOf('application/json') !== -1;
+  const data = (json && body ? JSON.stringify(body) : body || '') + '\n';
+  const request = header + (get ? '' : data);
+  const { httpVersion, statusCode, statusMessage } = res;
+  const headers = [];
+  const n = res.rawHeaders.length / 2;
+  for (let i = 0; i < n; i += 2) {
+    headers.push(`${res.rawHeaders[i]}: ${res.rawHeaders[i+1]}`);
+  }
+  const content = res.headers['content-type'].split('/')[0];
+  const binary =  [ 'image', 'audio', 'video' ].includes(content);
+  const payload = binary ? `<<< ${content} content} >>>` : result;
+  const response = `HTTP/${httpVersion} ${statusCode} ${statusMessage}\r\n`
+                 + headers.join(`\r\n`) + `\r\n\r\n` + payload + `\r\n`;
+  logger.info(`${(protocol + ' ' + method).toUpperCase()} request to host: ${host}\n`
+            + `>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n`
+            + request
+            + `<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n`
+            + response
+            + `>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>`);
+}
+
+function logHttpError({ req, err, body, logger }) {
+  const { protocol, method, host, _header: header } = req._currentRequest;
+  const get = req.type === 'GET';
+  const type = res.headers['content-type'] ?? 'application/json';
+  const json = type.indexOf('application/json') !== -1;
+  const data = (json && body ? JSON.stringify(body) : body || '') + '\n';
+  const request = header + (get ? '' : data);
+  const error = err + `\r\n`;
+  logger.info(`${(protocol + ' ' + method).toUpperCase()} request to host: ${host}\n`
+            + `>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n`
+            + request
+            + `<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n`
+            + error
+            + `>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>`);
+}
+
 module.exports = {
   getApiSuffix(env = 'prod') {
     const isProd = env === 'prod';
     return isProd ? '' : `-${env}`;
   },
-  request({ body, headers, method, url }) {
-    const { host, pathname, search = '' } = new URL(url);
+  request({ body, headers, method, url, logger }) {
+    const { protocol, hostname, port, pathname, search = '' } = new URL(url);
 
     return new Promise((resolve, reject) => {
       let result = '';
-      const req = https
+      const req = (protocol === 'https:' ? https : http)
         .request({
-            host,
+            hostname,
+            port,
             path: `${pathname}${search}`,
             headers,
             method: method ? method : body ? 'POST' : 'GET',
@@ -27,6 +70,10 @@ module.exports = {
             });
             res.on('end', () => {
               try {
+                if (logger) {
+                  logHttpResponse({ req, res, body, result, logger });
+                }
+
                 if (res.statusCode >= 400) {
                   const error = res.statusMessage || 'error';
                   try {
@@ -47,6 +94,9 @@ module.exports = {
           },
         )
         .on('error', (err) => {
+          if (logger) {
+            logHttpError({ req, err, body, logger });
+          }
           reject(err);
         });
       if (typeof body?.pipe === 'function') {

package/lib/vouch.js

@@ -1,5 +1,5 @@
 class Vouch {
-  constructor(config = {}) {
+  constructor(config = {}, logger) {
     this.config = Object.freeze({
       apiKey: config.apiKey,
       integrationKey: config.integrationKey,
@@ -9,10 +9,10 @@ class Vouch {
     const services = require('./services');
     Object.keys(services).forEach(
       (key) => {
-        this[key] = new services[key](this, this.config);
+        this[key] = new services[key](this, this.config, logger);
       }
     );
   }
 }
 
-module.exports = Vouch;
+module.exports = Vouch;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vouchfor/sdk",
-  "version": "1.1.9",
+  "version": "1.1.12",
   "description": "Vouch API SDK",
   "main": "lib/index.js",
   "repository": {