@autofleet/node-common 1.0.2 → 1.0.4

package/index.js

@@ -1,3 +1,3 @@
 module.exports = {
-  Network: require('./Network'),
-}
+  Network: require('./network'),
+}

package/network/index.js

@@ -1,7 +1,14 @@
 const axios = require('axios');
 require('dotenv').config();
+/**
+ * Add support for nock testing 
+ * see s://github.com/axios/axios/issues/305
+ */
+if (process.env.NODE_ENV === 'test') {
+  axios.defaults.adapter = require('axios/lib/adapters/http')
+}
 
-const HTTPMethods = [
+const Methods = [
   'get',
   'post',
   'delete',
@@ -10,6 +17,7 @@ const HTTPMethods = [
   'patch',
   'options'
 ]
+
 const defaultSettings = {
   timeout: 2500,
   headers: { 'X-AF-AUTH': 'ANYONE' }
@@ -17,28 +25,36 @@ const defaultSettings = {
 
 module.exports = class Network {
   constructor(settings = {}) {
-    this.settings = Object.assign(defaultSettings, settings);
+    this.settings = Object.assign(defaultSettings, settings)
+    this.validate()
+    this.createBaseUrl()
+    this.buildClassHttpMethods()
+  }
+
+  validate() {
+    if (!this.settings.serviceUrl && ! this.settings.serviceName) {
+      throw new Error('At least one of the settings Missing serviceUrl or serviceName')
+    }
+  }
 
+  createBaseUrl() {
+    let settings = this.settings
     if (settings.serviceUrl) {
       settings.baseURL = settings.serviceUrl;
     } else if (settings.serviceName) {
-      settings.baseURL = process.env[`${settings.serviceName}_SERVICE_HOST`];
-
-      if (!settings.baseURL) {
-        throw new Error(`Missing enviermint varible: ${settings.serviceName}_SERVICE_HOST`);
+      const envServiceHostName = `${settings.serviceName}_SERVICE_HOST`
+      settings.baseURL = 'http://' + process.env[envServiceHostName]
+      if(!settings.baseURL) {
+        throw new Error(`Missing environment variable: ${envServiceHostName}`)
       }
     }
-
-    if (!settings.baseURL) {
-      throw new Error('Missing serviceUrl or serviceName')
-    }
-
-    this.axios = axios.create(settings);
-
-    HTTPMethods.map((method) => this[method] = (...args) => this.axios[method](...args)
-      .then((response) => {
-        console.log('Request:', response.config.method.toUpperCase(), response.config.url)
-        console.log('Response:', response.data)
-      }));
+  }
+  
+  /**
+   * Build class methods that wrap axios methods
+   */
+  buildClassHttpMethods() {
+    this.axios = axios.create(this.settings);
+    Methods.map((method) => this[method] = (...args) => this.axios[method](...args))
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/node-common",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "",
   "main": "index.js",
   "scripts": {