moved to base minimalistic implementation to provide support for all …

…api endpoints

.travis.yml

@@ -2,7 +2,7 @@ language: node_js
 node_js:
   - 0.4
   - 0.6
-  - 0.7 # development version of 0.8, may be unstable
+  - 0.8
 
 notifications:
   email:

README.md

@@ -1,6 +1,6 @@
-# node-cloudstack
+# cloudstack
 
-`node-cloudstack` is a CloudStack client implementation for Node.js.
+`cloudstack` is a minimalistic wrapper for the CloudStack API in Node.js.
 
 ## Build Status
 
@@ -9,21 +9,14 @@
 ## Usage
 
 ```javascript
-var cloudstack = require('cloudstack')
-  , templateId = 1
-  , serviceOfferingId = 1
-  , zoneId = 1;
-
-client.deployVirtualMachine(templateId, serviceOfferingId, zoneId, function(result) {
-	var virtualMachineId = result.vmid;
-
-	result.emitter.on('success', function() {
-		console.log('Machine deployed successfully and it is ready to use!');
-	});
+var cloudstack = new (require('./cloudstack'))({
+	apiUri: config.api_uri, // overrides process.env.CLOUDSTACK_API_URI
+	apiKey: config.api_key, // overrides process.env.CLOUDSTACK_API_KEY
+	apiSecret: config.api_secret // overrides process.env.CLOUDSTACK_API_SECRET
+});
 
-	result.emitter.on('fail', function() {
-		console.log('Machine failed to deploy.');
-	});
+cloudstack.exec('listVirtualMachines', {}, function(error, result) {
+	console.log(result);
 });
 ```
 

lib/cloudstack.js

@@ -1,7 +1,66 @@
-exports.createClient = function(options) {
+var request = require('request')
+  , crypto = require('crypto');
+
+module.exports = function cloudstack(options) {
 	if (!options) {
-		throw Error('Missing parameter "options".')
+		options = {};
 	}
 
-	return new (require('./cloudstackClient'))(options);
+	var apiUri = options.apiUri || process.env.CLOUDSTACK_API_URI
+	  , apiKey = options.apiKey || process.env.CLOUDSTACK_API_KEY
+	  , apiSecret = options.apiSecret || process.env.CLOUDSTACK_API_SECRET;
+
+	this.exec = function(cmd, params, callback) {
+		var paramString = genSignedParamString(
+			apiKey, 
+			apiSecret, 
+			cmd,
+			params
+		);
+
+		var uri = apiUri + '?' + paramString;
+		request(uri, function(err, res, body) {
+			if (err) {
+				return callback(err);
+			}
+
+			var parsedBody = JSON.parse(body);
+
+			if (res.statusCode == 200) {
+				var result = parsedBody[cmd.toLowerCase() + 'response'];
+
+				return callback(null, result);
+			} 
+
+			// TODO: need all the error condition here
+			callback(parsedBody);
+		});
+	};
+
+	var genSignedParamString = function(apiKey, apiSecret, cmd, params) {
+		params.apiKey = apiKey;
+		params.command = cmd;		
+		params.response = 'json';
+
+		var paramKeys = [];
+		for(var key in params) {
+			if(params.hasOwnProperty(key)){
+				paramKeys.push(key);
+			};
+		};
+
+		paramKeys.sort();
+
+		var qsParameters = [];
+		for(var i = 0; i < paramKeys.length; i++) {
+			key = paramKeys[i];
+			qsParameters.push(key + '=' + encodeURIComponent(params[key]));
+		}
+
+		var queryString = qsParameters.join('&')
+		  , cryptoAlg = crypto.createHmac('sha1', apiSecret)
+		  , signature = cryptoAlg.update(queryString.toLowerCase()).digest('base64');
+
+		return queryString + '&signature=' + encodeURIComponent(signature);
+	};
 };