Bump labels, update to axios

Author: cloudcms

index.js

@@ -35,7 +35,8 @@ if (isNode())
 {
     var fs = _safeRequire("fs");
     var path = _safeRequire("path");
-    var request = _safeRequire("request");
+    //var request = _safeRequire("request");
+    var request = require("./request");
 
     var HttpsProxyAgent = _safeRequire("https-proxy-agent");
 
@@ -65,9 +66,10 @@ if (isNode())
         headers["Content-Type"] = contentType;
         headers["Authorization"] = driver.getHttpHeaders()["Authorization"];
 
-        readStream.pipe(request({
+        request({
             "method": "POST", 
-            "url": uploadUri, 
+            "url": uploadUri,
+            "data": readStream,
             "headers": headers, 
             "timeout": 120 * 1000 // 2 minutes
         }, function (err, httpResponse, body) {
@@ -77,15 +79,15 @@ if (isNode())
                 return callback(err);
             }
 
-            if (httpResponse.statusCode >= 200 && httpResponse.statusCode <= 204)
+            if (httpResponse.status >= 200 && httpResponse.status <= 204)
             {
                 return callback();
             }
 
             callback({
                 "message": "Status: " + httpResponse.statusCode + ", Message: " + body
             });
-        }));    
+        });
     };
 
     Gitana.streamDownload = function(attachment, callback)
@@ -96,16 +98,21 @@ if (isNode())
         headers["Authorization"] = driver.getHttpHeaders()["Authorization"];
 
         // download and pipe to stream
-        var stream = request({
+        request({
             "method": "GET", 
             "url": attachment.getDownloadUri(), 
             "headers": {
                 "Authorization": attachment.getDriver().getHttpHeaders()["Authorization"]
             },
             "timeout": 120 * 1000 // 2 minutes        
+        }, function (err, response) {
+    
+            if (err) {
+                return callback(err);
+            }
+            
+            callback(null, response.data);
         });
-        
-        callback(null, stream);
     };
 
     Gitana.HTTP_XHR_FACTORY = function()

package.json

@@ -1,7 +1,7 @@
 {
-    "author": "Gitana Software, Inc. <info@cloudcms.com> (http://www.cloudcms.com)",
+    "author": "Gitana Software, Inc. <info@gitana.io> (https://gitana.io)",
     "name": "gitana",
-    "description": "Cloud CMS Gitana Driver for Node JS",
+    "description": "Gitana Cloud CMS Driver for Node JS",
     "version": "1.0.323",
     "repository": {
         "type": "git",
@@ -15,10 +15,10 @@
         "grunt": "*"
     },
     "optionalDependencies": {
-        "https-proxy-agent": "^2.2.1",
+        "https-proxy-agent": "^7.0.1",
         "node-http-xhr": "^1.3.4",
-        "request": "*",
-        "xmlhttprequest": "*"
+        "axios": "^1.5.0",
+        "xmlhttprequest": "1.8.0"
     },
     "contributors": [
         {

request.js

@@ -0,0 +1,123 @@
+var axios = require("axios");
+
+// var http = require("http");
+// var https = require("https");
+//
+// var FormData = require("form-data");
+
+/**
+ * Incoming config:
+ *
+ * {
+ *     "url": "",
+ *     "method": "",
+ *     "headers": {},
+ *     "qs": {},
+ *     "data": "" | {},
+ *     "json": {}
+ * }
+ *
+ * Callback is (err, response).
+ *
+ * Where response is the Axios response object.
+ *
+ * @param config
+ * @param callback
+ */
+module.exports = function(config, callback)
+{
+    // request config - https://github.com/request/request#requestoptions-callback
+    // axios config - https://www.npmjs.com/package/axios
+    
+    if (!callback) {
+        callback = function(err, response, data) {
+            // nothing
+        };
+    }
+    
+    var requestConfig = {};
+    requestConfig.url = config.uri || config.url;
+    requestConfig.method = config.method || "get";
+    requestConfig.headers = {};
+
+    if (!config) {
+        config = {};
+    }
+    if (!config.headers) {
+        config.headers = {};
+    }
+    for (var k in config.headers)
+    {
+        var v = config.headers[k];
+        if (v)
+        {
+            requestConfig.headers[k.trim().toLowerCase()] = v;
+        }
+    }
+    // support for FormData headers
+    // copy form data headers
+    if (config.data && config.data.getHeaders)
+    {
+        var formDataHeaders = config.data.getHeaders();
+        for (var k in formDataHeaders)
+        {
+            var v = formDataHeaders[k];
+            requestConfig.headers[k] = v;
+        }
+    }
+    
+    if (config.qs) {
+        requestConfig.params = config.qs;
+    }
+
+    if (config.json) {
+        requestConfig.data = config.json;
+        
+        if (!requestConfig.headers["content-type"]) {
+            requestConfig.headers["content-type"] = "application/json";
+        }
+    }
+
+    if (config.data)
+    {
+        requestConfig.data = config.data;
+    
+        if (!requestConfig.headers["content-type"])
+        {
+            if (!requestConfig.data)
+            {
+                if (requestConfig.data.getHeaders)
+                {
+                    // assume this is a FormData and skip
+                }
+                else if (typeof(requestConfig.data) === "object")
+                {
+                    // send as json
+                    requestConfig.headers["content-type"] = "application/json";
+                }
+            }
+        }
+    }
+
+    if (config.responseType) {
+        requestConfig.responseType = config.responseType;
+    }
+
+
+    /*
+    if (requestConfig.url.toLowerCase().indexOf("https:") > -1)
+    {
+        requestConfig.httpsAgent = https.globalAgent;
+    }
+    else
+    {
+        requestConfig.httpAgent = http.globalAgent;
+    }
+    */
+    
+    return axios.request(requestConfig).then(function(response) {
+        callback(null, response, response.data);
+    }, function(error) {
+        callback(error);
+    });
+};