Native promises

.travis.yml

@@ -1,6 +1,8 @@
 language: node_js
 node_js:
-  - "6"
+  - "8"
+  - "9"
+  - "10"
 
 script:
   - npm test

lib/request.js

@@ -1,8 +1,6 @@
 "use strict";
 
 const doRequest = require("request");
-const nodefn = require("when/node");
-const _ = require("lodash");
 const version = require("../package.json").version;
 
 /**
@@ -14,37 +12,48 @@ const version = require("../package.json").version;
  * @returns {Promise}
  */
 function request(baseConfig, method, depth, xml) {
-    const config = _.assign({}, baseConfig);
-
-    config.headers = _.assign({}, baseConfig.headers);
+    const config = {
+        headers: baseConfig.headers || {},
+        body: xml,
+        method,
+        'headers["Content-length"]': xml.length,
+        'headers["Depth"]': depth,
+        ...baseConfig
+    };
 
     if (!baseConfig.headers || "User-Agent" in baseConfig.headers === false) {
         config.headers["User-Agent"] = "scrapegoat/" + version;
     }
 
     if (baseConfig.auth) {
-        config.auth = _.assign({}, baseConfig.auth);
-        config.auth.sendImmediately = "sendImmediately" in baseConfig.auth ? baseConfig.auth.sendImmediately : false;
+        config.auth = {
+            sendImmediately: false,
+            ...baseConfig.auth
+        };
     }
 
-    config.body = xml;
-    config.method = method;
-    config.headers["Content-length"] = xml.length;
-    config.headers.Depth = depth;
     config.timeout = baseConfig.timeout ? baseConfig.timeout : 10000;
 
-    return nodefn.call(doRequest, config)
-        .spread((res, body) => {
-            let err;
+    return new Promise((resolve, reject) => {
+        doRequest(config, (error, res, body) => {
+            if (error) {
+                reject(error);
+                return;
+            }
 
             if (res.statusCode >= 300) {
-                err = new Error("Response with status code: " + res.statusCode);
+                const err = new Error(
+                    "Response with status code: " + res.statusCode
+                );
+
                 err.statusCode = res.statusCode;
-                throw err;
+                reject(err);
+                return;
             }
 
-            return body;
+            resolve(body);
         });
+    });
 }
 
 module.exports = request;

lib/xml/parser.js

@@ -1,13 +1,14 @@
 "use strict";
 
-const parseXMLString = require("xml2js").parseString;
-const nodefn = require("when/node");
+const { promisify } = require("util");
+const { parseString } = require("xml2js");
+const parseXMLString = promisify(parseString);
 const ICAL = require("ical.js");
 const moment = require("moment");
 
 // parse calendar object
 function parseCalendarMultistatus(xml) {
-    return nodefn.call(parseXMLString, xml).then((result) => {
+    return parseXMLString(xml).then((result) => {
         const parsed = {};
 
         if (!result["d:multistatus"] || !result["d:multistatus"]["d:response"]) {
@@ -27,7 +28,7 @@ function parseEventsMultistatus(xml) {
     let parsed;
     const formatted = [];
 
-    return nodefn.call(parseXMLString, xml).then((result) => {
+    return parseXMLString(xml).then((result) => {
         if (!result["d:multistatus"] || !result["d:multistatus"]["d:response"]) {
             return formatted;
         }
@@ -134,7 +135,7 @@ function parseEvents(xml) {
     let parsed;
     const formatted = [];
 
-    return nodefn.call(parseXMLString, xml).then((result) => {
+    return parseXMLString(xml).then((result) => {
         if (!result["d:multistatus"] || !result["d:multistatus"]["d:response"]) {
             return formatted;
         }