sending requests via proxy + request lib added

Author: alexk-blackops

.gitignore

@@ -1,2 +1,4 @@
 node_modules
-npm-debug.log
+npm-debug.log
+proxy.js
+proxy2.js

config/config.js

@@ -1,4 +1,5 @@
 module.exports = {
+    'PROTOCOL' : 'https',
     'HOST': 'dev.stackify.com',
     'PORT': 443,
     'IDENTIFY_PATH': '/API/Metrics/IdentifyApp',

index.js

@@ -10,8 +10,8 @@ module.exports = {
 
     start: function(options) {
         api.methods.identifyApp(options);
-        exc.exc();
-    },
+/*        exc.exc();
+*/    },
 
     log: logger.methods.log,
     trace: logger.methods.trace,

lib/api.js

@@ -1,4 +1,5 @@
 var os      = require('os'),
+    url     = require('url'),
     util    = require('util'),
     send    = require('./sender'),
     logger  = require('./logger'),
@@ -7,33 +8,36 @@ var os      = require('os'),
 
     appname = module.exports.name,
 
-    options = {
-        hostname: CONFIG.HOST,
-        port: CONFIG.PORT,
-        method: 'POST',
-        secureProtocol: 'SSLv3_method',
-        headers: {
-            'Content-Type': 'application/json',
-            'X-Stackify-Key': CONFIG.APIKEY,
-            'X-Stackify-PV': 'V1'
+    options = function options(path, body) {
+        return {
+            url: CONFIG.PROTOCOL + '://' + CONFIG.HOST + path,
+            method: 'POST',
+            json: true,
+            headers: {
+                'Content-Type': 'application/json',
+                'X-Stackify-Key': CONFIG.APIKEY,
+                'X-Stackify-PV': 'V1'
+            },
+            body: body
         }
     };
 
 module.exports.methods = {
 
     identifyApp: function identifyApp(settings) {
-        var opt = options,
-            fail_counter = 0,
-            data = {
+        var body = {
                 DeviceName: os.hostname(),
                 AppName: appname,
                 ConfiguredAppName: appname,
                 AppLocaton: process.env.PWD
             },
+            opt = options(CONFIG.IDENTIFY_PATH, body),
+            fail_counter = 0,
             callback = function (data) {
                 console.log('successfully identified');
 
-                CONFIG.APP_DETAILS = JSON.parse(data);
+                CONFIG.APP_DETAILS = data;
+                console.log(util.inspect(data));
                 CONFIG.APP_DETAILS.ENV = settings.env;
                 CONFIG.APIKEY = settings.apiKey;
 
@@ -44,28 +48,29 @@ module.exports.methods = {
                 fail_counter += 1;
                 if (fail_counter <= CONFIG.REQUEST_ATTEMPTS) {
                     setTimeout(function () {
-                        send(opt, data, callback, fail);
+                        send(opt, callback, fail);
                     }, CONFIG.REQUEST_TIMER);
                 }
             };
 
-        opt.path = CONFIG.IDENTIFY_PATH;
-
         console.log('Identifying...');
 
+        if (settings.proxy) {
+            CONFIG.PROXY = opt.proxy = settings.proxy
+        };
+
         if (typeof (settings.apiKey) === 'string' && typeof (settings.env) === 'string') {
             opt.headers['X-Stackify-Key'] = settings.apiKey;
             CONFIG.APPNAME = appname;
-            send(opt, data, callback, fail);
+            send(opt, callback, fail);
         } else {
             throw new TypeError('You have to pass apiKey and env parameters');
         }
 
     },
 
     postLogs: function postLogs(messages, cb, fail) {
-        var opt = options,
-            data = {
+        var body = {
                 CDID: CONFIG.APP_DETAILS.DeviceID,
                 CDAppID: CONFIG.APP_DETAILS.DeviceAppID,
                 AppNameID: CONFIG.APP_DETAILS.AppNameID,
@@ -78,9 +83,14 @@ module.exports.methods = {
                 Logger: 'Node.js Stackify Logger ver. 1.0',
                 Platform: 'Node.js',
                 Msgs : messages
+            },
+            opt = options(CONFIG.LOG_SAVE_PATH, body);
+
+            if (CONFIG.PROXY) {
+                opt.proxy = CONFIG.PROXY;
             };
 
-        opt.path = CONFIG.LOG_SAVE_PATH;
-        send(options, data, cb, fail);
+
+        send(opt, cb, fail);
     }
 };

lib/sender.js

@@ -5,38 +5,32 @@
 ###### @fail {Function} **Optional** function to be executed if request wasn't succesful
 Low level function for sending http/https requests
 */
-var https = require('https'),
-    util  = require('util');
+var http    = require('http'),
+    util    = require('util'),
+    request = require('request');
 
-module.exports = function sender(options, data, cb, fail) {
-    var callback = function (response) {
-        var str = '';
-
-        //another chunk of data has been recieved, so append it to `str`
-        response.on('data', function (chunk) {
-            str += chunk;
-        });
-
-        //the whole response has been recieved
-        response.on('end', function () {
+module.exports = function sender(options, cb, fail) {
+    console.log('here');
+    console.log(util.inspect(options));
+    var callback = function (error, response, body) {
+        if (!error) {
             if (response.statusCode === 200) {
                 if (cb) {
-                    cb(str);
+                    cb(body);
+                    console.log('success');
                 }
             } else {
                 if (fail) {
                     fail();
-                    console.log('fail');
+                    console.log('fail:', body);
                 }
             }
-        });
-    },
-        req = https.request(options, callback);
+        } else {
+            console.log(error);
+        }
+    };
+    
+    request(options, callback);
 
-    req.on('error', function (e) {
-        console.log('err: ' + e);
-    });
 
-    req.write(JSON.stringify(data));
-    req.end();
 };

package.json

@@ -13,8 +13,10 @@
   "author": "Stackify",
   "license": "ISC",
   "dependencies": {
+    "https-proxy-agent": "^0.3.5",
     "on-finished": "^2.1.1",
     "pkginfo": "^0.3.0",
+    "request": "^2.48.0",
     "stack-trace": "0.0.9"
   }
 }

test.js

@@ -1,6 +1,7 @@
 var http = require('http');
 var util = require('util');
-var stackify = require('./index')({apiKey: '0Zw8Fj4Hr3Aa1Sf2Gw4Cb3Gk7Fp6Zn6Sc0Gw2Cr', env: 'dev'});
+var stackify = require('./index');
+stackify.start({apiKey: '0Zw8Fj4Hr3Aa1Sf2Gw4Cb3Gk7Fp6Zn6Sc0Gw2Cr', env: 'dev'/*, proxy: 'http://74.50.126.249:8089'*/});
 var stack = require('stack-trace');
 var pkginfo = require('pkginfo')(module, 'name');
 var express = require("express");
@@ -14,7 +15,6 @@ var foo = function foo() {
     stackify.error('dfg');
 };
 foo();
-fg;
 
 setInterval(function () {
     stackify.info('test');