cloudcms-server 3.3.1-beta.1 → 3.3.1-beta.10

package/util/request.js

@@ -0,0 +1,117 @@
+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
+
+    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;
+    }
+    */
+    
+    axios.request(requestConfig).then(function(response) {
+        callback(null, response, response.data);
+    }, function(error) {
+        callback(error);
+    });
+};

package/util/util.js

@@ -1,6 +1,5 @@
 var fs = require("fs");
 var path = require("path");
-var request = require("request");
 var mime = require("mime");
 var os = require("os");
 var async = require("async");
@@ -22,6 +21,8 @@ var JSON5 = require("json5");
 
 var uuidv4 = require("uuid").v4;
 
+var request = require("./request");
+
 var VALID_IP_ADDRESS_REGEX_STRING = "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$";
 
 exports = module.exports;
@@ -684,16 +685,6 @@ var retryGitanaRequest = exports.retryGitanaRequest = function(logMethod, gitana
             });
         }
 
-        // make sure agent is applied
-        if (!config.agent && config.url)
-        {
-            var agent = getAgent(config.url);
-            if (agent)
-            {
-                config.agent = agent;
-            }
-        }
-
         // make sure we have a headers object
         if (!config.headers)
         {
@@ -716,11 +707,11 @@ var retryGitanaRequest = exports.retryGitanaRequest = function(logMethod, gitana
             if (response)
             {
                 // ok case (just callback)
-                if (response.statusCode === 200)
+                if (response.status === 200)
                 {
                     return cb(err, response, body);
                 }
-                else if (response.statusCode === 429)
+                else if (response.status === 429)
                 {
                     // we heard "too many requests", so we wait a bit and then retry
                     // TODO: look at HTTP headers to determine how long to wait?
@@ -728,7 +719,7 @@ var retryGitanaRequest = exports.retryGitanaRequest = function(logMethod, gitana
                         logMethod("Too Many Requests heard, attempting retry (" + (currentAttempts + 1) + " / " + maxAttempts + ")");
                         _retryHandler(gitana, config, currentAttempts, maxAttempts, {
                             "message": "Heard 429 Too Many Requests",
-                            "code": response.statusCode,
+                            "code": response.status,
                             "body": body,
                             "err": err
                         }, cb);
@@ -764,7 +755,7 @@ var retryGitanaRequest = exports.retryGitanaRequest = function(logMethod, gitana
                 // refresh the access token and then retry
                 return _invalidTokenRetryHandler(gitana, config, currentAttempts, maxAttempts, {
                     "message": "Unable to refresh access token and retry",
-                    "code": response.statusCode,
+                    "code": response.status,
                     "body": body,
                     "err": err
                 }, cb);
@@ -1083,7 +1074,6 @@ var applyResponseContentType = exports.applyResponseContentType = function(respo
     {
         var ext = path.extname(filename);
         if (ext) {
-            //contentType = mime.lookup(ext);
             contentType = lookupMimeType(ext);
         }
     }
@@ -1094,7 +1084,6 @@ var applyResponseContentType = exports.applyResponseContentType = function(respo
         var ext = path.extname(filename);
         if (ext)
         {
-            //contentType = mime.lookup(ext);
             contentType = lookupMimeType(ext);
         }
     }
@@ -1383,7 +1372,7 @@ var isUndefined = exports.isUndefined = function(obj) {
 var lookupMimeType = exports.lookupMimeType = function(ext) {
 
     // rely on the mimetype library for base handling
-    var mimetype = mime.lookup(ext);
+    var mimetype = mime.getType(ext);
 
     var extension = ext;
     if (extension && extension.indexOf(".") === 0)
@@ -1788,10 +1777,11 @@ var zip = exports.zip = function(directoryPath, writableStream)
  * @param {string} protocol
  * @param {string} host
  * @param [number|string] port
+ * @param {string} path
  *
  * @type {Function}
  */
-var asURL = exports.asURL = function(protocol, host, port)
+var asURL = exports.asURL = function(protocol, host, port, path)
 {
     // protocol lower case
     protocol = protocol.toLowerCase();
@@ -1816,7 +1806,20 @@ var asURL = exports.asURL = function(protocol, host, port)
             url += ":" + port;
         }
     }
-
+    
+    // include url "path" if defined
+    if (path) {
+        path = '/' + path;
+        path = path.replace(/\/+/g, '/'); // ensure no extra '/' characters
+        if (path.endsWith('/')) {
+            // remove trailing '/' character
+            path = path.substring(0, path.length - 1);
+        }
+        if (path) {
+            url += path;
+        }
+    }
+    
     return url;
 };
 
@@ -1867,22 +1870,6 @@ var isHttp = exports.isHttp = function(url)
     return url.toLowerCase().startsWith("http://");
 };
 
-var getAgent = exports.getAgent = function(url)
-{
-    var agent = http.globalAgent;
-
-    if (url.indexOf("https://") === 0)
-    {
-        agent = https.globalAgent;
-    }
-    else if (url.indexOf("http://") === 0)
-    {
-        agent = http.globalAgent;
-    }
-
-    return agent;
-};
-
 /*
 var selectLeastPrivilegedGitana = exports.selectLeastPrivilegedGitana = function(req)
 {