cloudcms-server 3.2.296 → 3.2.298

package/util/proxy-factory.js

@@ -9,8 +9,6 @@ var oauth2 = require("./oauth2")();
 
 var LRU = require("lru-cache");
 
-const { lookup } = require('dns-lookup-cache');
-
 var exports = module.exports;
 
 var _LOCK = function(lockIdentifiers, workFunction)
@@ -245,8 +243,7 @@ var createProxyHandler = function(proxyTarget, pathPrefix)
         return headers;
     };
     // request invoke settings
-    proxyOptions.request = {};
-    proxyOptions.request.lookup = lookup;
+    //proxyOptions.request = {};
     
     //////////////////////////////////////////////////////////////////////////
     

package/util/renditions.js

@@ -1,13 +1,14 @@
-var path = require('path');
-var fs = require('fs');
+// var path = require('path');
+// var fs = require('fs');
 var util = require("../util/util");
-var async = require("async");
-var request = require("request");
+//var async = require("async");
 
-var http = require("http");
-var https = require("https");
+// var http = require("http");
+// var https = require("https");
 
-var logFactory = require("../util/logger");
+var logFactory = require("./logger");
+
+var request = require("./request");
 
 /**
  * WCM Resource Dependency Manager
@@ -82,9 +83,8 @@ exports = module.exports = function()
                     "rows": rows
                 },
                 "headers": headers,
-                "timeout": process.defaultHttpTimeoutMs,
-                "agent": agent
-            }, function (err, response, body) {
+                "timeout": process.defaultHttpTimeoutMs
+            }, function (err, response, json) {
                 callback();
             });
         };

package/util/request.js

@@ -0,0 +1,135 @@
+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
+        };
+    }
+    
+    if (typeof(config) === "string") {
+        config = {
+            "method": "get",
+            "json": true,
+            "url": config
+        };
+    }
+    
+    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) {
+        
+        if (typeof(config.json) !== "boolean")
+        {
+            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);
+    });
+};

package/util/util.js

@@ -1,7 +1,6 @@
 var fs = require("fs");
 var path = require("path");
 var mkdirp = require('mkdirp');
-var request = require("request");
 var mime = require("mime");
 var uuidv4 = require("uuid/v4");
 var os = require("os");
@@ -13,6 +12,8 @@ var klaw = require("klaw");
 var targz = require('targz');
 var archiver = require("archiver");
 
+var request = require("./request");
+
 var http = require("http");
 var https = require("https");
 
@@ -681,17 +682,7 @@ var retryGitanaRequest = exports.retryGitanaRequest = function(logMethod, gitana
                 "err": previousError
             });
         }
-
-        // 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)
         {
@@ -709,16 +700,19 @@ var retryGitanaRequest = exports.retryGitanaRequest = function(logMethod, gitana
         config.headers["Authorization"] = headers2["Authorization"];
 
         // make the request
+        console.log("C: " + JSON.stringify(config, null, 2));
         request(config, function(err, response, body) {
-
+            console.log("E: " + err);
+            console.log("B: " + body);
+            
             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?
@@ -726,7 +720,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);
@@ -762,7 +756,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);
@@ -772,7 +766,7 @@ var retryGitanaRequest = exports.retryGitanaRequest = function(logMethod, gitana
             cb(err, response, body);
         });
     };
-
+    
     _handler(gitana, config, 0, maxAttempts, null, callback);
 };