forwarding all requests

Author: ezraroi

lib/index.js

@@ -1,6 +1,5 @@
 'use strict';
 
-var http = require('http');
 var Request = require('request');
 var Q = require('q');
 var zlib = require('zlib');
@@ -15,7 +14,7 @@ function Codeine(server,port,api_key) {
   this.server = server;
   this.api_key = api_key;
   this.port = port;
-  this.request = Request.defaults({'headers': { 'api_token' : this.api_key} });
+  this.request = Request.defaults({'headers': { 'api_token' : this.api_key}, 'followAllRedirects': true });
 }
 
 function getCodeinePath(self) {
@@ -53,7 +52,7 @@ Codeine.prototype.createNewProject = function(projectName, selectedProject) {
   var deferred = Q.defer();
   var uri = getCodeinePath(this) + 'projects';
   log('createNewProject() - uri is ' + uri);
-  this.request(createNewProjectCommand(uri,this.api_key,projectName,selectedProject), function (error, response, body) {
+  this.request(createNewProjectCommand(uri,projectName,selectedProject), function (error, response, body) {
     if (!error && response && response.statusCode === 200) {
       deferred.resolve(body);
     }
@@ -73,31 +72,27 @@ Codeine.prototype.createNewProject = function(projectName, selectedProject) {
 
 Codeine.prototype.runCommand = function(projectName, commandObject){
   var deferred = Q.defer();
-  var runCommandOptions = createCodeineRunCommand(this.server,projectName,this.api_key, this.port);
-  log('runCommand() - command object ', runCommandOptions);
   var post_data = JSON.stringify(commandObject);
   log('runCommand() - post data is ' + post_data);
-  var commandReq = http.request(runCommandOptions, function(res) {
-    res.setEncoding('utf8');
+  var uri = getCodeinePath(this) + 'command-nodes?project='+ projectName;
+  var runCommandOptions = createCodeineRunCommand(uri, post_data);
+  log('runCommand() - command object ', runCommandOptions);
 
-    if (res.statusCode === 200) {
-      log('runCommand() - Command ran successfully');
+  this.request(runCommandOptions, function(error, response, body) {
+    if (!error && response && response.statusCode === 200) {
+      deferred.resolve(body);
     }
     else {
-      console.error('codeine:: runCommand() - Status Code =  ' + res.statusCode);
-      deferred.reject();
+      log('runCommand() - Error is', error);
+      if (response && response.statusCode) {
+        console.error('codeine:: runCommand() - Status Code =  ' + response.statusCode);
+        deferred.reject(response.statusCode);
+      }
+      else {
+        deferred.reject(error);
+      }
     }
-    res.on('data', function (chunk) {
-      log('Response: ', chunk);
-      deferred.resolve(chunk);
-    });
   });
-  commandReq.write(post_data);
-  commandReq.on('error', function(e) {
-    console.error('codeine:: runCommand() - Error from server', e);
-    deferred.reject(e);
-  });
-  commandReq.end();
   return deferred.promise;
 };
 
@@ -106,6 +101,7 @@ Codeine.prototype.runCommandSync = function (projectName, commandObject, sleep,
   log('runCommandSync() - Running command', commandObject.command_info.name);
   return this.runCommand(projectName, commandObject)
       .then(function (commandId) {
+        commandId = commandId.toString();
         log('runCommandSync() - Waiting for command', commandId, 'to finish');
         function check(iteration) {
           log('runCommandSync() - waiting for command', commandId, 'to finish.' +
@@ -245,29 +241,28 @@ Codeine.prototype.getProjectStatus = function(projectName) {
 
 Codeine.prototype.saveProjectConfiguration = function(projectName, conf) {
   var deferred = Q.defer();
-  var saveConfCommandOptions = createSaveConfCommand(this.server, projectName, this.api_key, this.port);
+  var uri = getCodeinePath(this) + 'project-configuration?project='+ projectName;
   var post_data = JSON.stringify(conf);
+  var saveConfCommandOptions = createSaveConfCommand(uri, post_data);
   log('saveProjectConfiguration() - post data is ', post_data);
-  var commandReq = http.request(saveConfCommandOptions, function(res) {
-    res.setEncoding('utf8');
-    if (res.statusCode === 200) {
+
+  this.request(saveConfCommandOptions, function (error, response, body) {
+    if (!error && response && response.statusCode === 200) {
       log('saveProjectConfiguration() - Configuration was saved successfully');
+      var config = JSON.parse(body);
+      deferred.resolve(config);
     }
     else {
-      console.error('coeine:: saveProjectConfiguration() - Status Code =  ' + res.statusCode);
-      deferred.reject();
+      log('saveProjectConfiguration() - Error is', error);
+      if (response && response.statusCode) {
+        console.error('codeine:: saveProjectConfiguration() - Status Code =  ' + response.statusCode);
+        deferred.reject(response.statusCode);
+      }
+      else {
+        deferred.reject(error);
+      }
     }
-    res.on('data', function (chunk) {
-      log('Response: ', chunk);
-      deferred.resolve(chunk);
-    });
-  });
-  commandReq.write(post_data);
-  commandReq.on('error', function(e) {
-    console.error('codeine:: saveProjectConfiguration() - Error from server', e);
-    deferred.reject(e);
   });
-  commandReq.end();
   return deferred.promise;
 };
 
@@ -302,7 +297,7 @@ Codeine.prototype.getCommandOutput = function(projectName, commandId) {
   return this.request({ url : uri, encoding : null });
 };
 
-function createNewProjectCommand(url,api_token,projectName,selectedProject) {
+function createNewProjectCommand(url,projectName,selectedProject) {
   var requestData = {
     'project_name': projectName,
     'type': 'New'
@@ -314,31 +309,26 @@ function createNewProjectCommand(url,api_token,projectName,selectedProject) {
   return {
     url: url,
     encoding: null,
-    headers  : {
-      'api_token' : api_token
-    },
     method: 'POST',
     body: JSON.stringify(requestData)
   };
 }
 
-function createSaveConfCommand(server,project,api_token,port) {
+function createSaveConfCommand(uri, requestData) {
   return {
-    hostname: server,
-    headers  : {'api_token' : api_token} ,
-    port: port,
-    path: '/api-with-token/project-configuration?project=' + project,
-    method: 'PUT'
+    url: uri,
+    encoding: null,
+    method: 'PUT',
+    body: requestData
   };
 }
 
-function createCodeineRunCommand(server,project,api_token,port) {
+function createCodeineRunCommand(uri, requestData) {
   return {
-    hostname: server,
-    headers  : {'api_token' : api_token} ,
-    port: port,
-    path: '/api-with-token/command-nodes?project=' + project,
-    method: 'POST'
+    url: uri,
+    encoding: null,
+    method: 'POST',
+    body: requestData
   };
 }