Internal optimisations..

lib/get-file.js

@@ -29,11 +29,13 @@ self.getFile = function(url, file) {
 		];
 
 		//temp fix for request.js buffer overflow bug
+		/*
 		var rq = require('request');
 		var FileCookieStore = require('tough-cookie-filestore');
 		self.request = rq.defaults({
-			'jar': rq.jar(new FileCookieStore(process.env.VMWSTATEDIR + '/cookies.json'))
+			'jar': rq.jar(new FileCookieStore('./cookies.json'))
 		});
+		*/
 		// temp fix for request.js buffer overflow bug
 
 		self.request.get({

lib/get-index.js

@@ -3,7 +3,6 @@ var fs = require('fs');
 var FileCookieStore = require('tough-cookie-filestore');
 var Session = require('./utils.js').session;
 var rq = require('request');
-var rp = require('request-promise');
 var self = myVmw.prototype;
 
 // myvmw constructor
@@ -15,33 +14,35 @@ function myVmw(opt) {
 	if(!fs.existsSync(self.cookie)) {
 		fs.writeFileSync(self.cookie, '');
 	}
-	self.request = rp.defaults({
+	self.request = rq.defaults({
 		'jar': rq.jar(new FileCookieStore(self.cookie))
 	});
 }
 module.exports = myVmw;
 
 // login to my.vmware.com and generate cookies.txt
-self.login = async function() {
-	let url = 'https://my.vmware.com';
-	console.log('Synching delicious cookies from [' + url + ']');
-	return self.request.get({url}).then(function(data) { // add error handling?
-		let url = 'https://my.vmware.com/oam/server/auth_cred_submit';
-		console.log('Offering up afforementioned snacks as a sacrifice to [' + url + ']');
-		let options = {
-			url,
-			followAllRedirects: true,
-			headers: {
-				'content-type': 'application/x-www-form-urlencoded'
-			},
-			form: {
-				username: self.username,
-				password: self.password,
-				vmware: 'login'
-			}
-		};
-		return self.request.post(options, function (data) {
-			//console.log(JSON.stringify(this, null, "\t"));
+self.login = function() {
+	return new Promise(function(resolve, reject) {
+		let url = 'https://my.vmware.com';
+		console.log('Synching delicious cookies from [' + url + ']');
+		self.request.get({url}, (err, resp, data) => {
+			let url = 'https://my.vmware.com/oam/server/auth_cred_submit';
+			console.log('Offering up afforementioned snacks as a sacrifice to [' + url + ']');
+			let options = {
+				url,
+				followAllRedirects: true,
+				headers: {
+					'content-type': 'application/x-www-form-urlencoded'
+				},
+				form: {
+					username: self.username,
+					password: self.password,
+					vmware: 'login'
+				}
+			};
+			self.request.post(options, (err, resp, data) => {
+				resolve();
+			});
 		});
 	});
 };
@@ -57,7 +58,7 @@ self.index = function() { // compare promise vs async
 				'p_p_resource_id': 'productsAtoZ'
 			});
 			console.log('Pulling landing index.json [' + base + ']');
-			self.request.get({url}).then(function(data) {
+			self.request.get({url}, (err, resp, data) => {
 				resolve(JSON.parse(data))
 			});
 		});

lib/get-product.js

@@ -94,7 +94,12 @@ function indexProduct(p, fileData = {}, name = p.name) {
 		let url = 'https://my.vmware.com/group/vmware/details?downloadGroup=' + p.name + '&productId=' + p.id;
 		queue.add(() => {
 			console.log('[FETCH]: ' + url);
-			return self.request.get({url});
+			return new Promise(function(resolve, reject) {
+				self.request.get({url}, (err, resp, data) => {
+					resolve(data)
+				});
+			});
+
 		}).then((data) => {
 			fileData[p.name] = ef.getFiles(data);
 			if(queue.size === 0 && queue.pending === 0) {

lib/vmw-api.js

@@ -1,6 +1,5 @@
 #!/usr/bin/env node
 const args = process.argv;
-const request = require('request'); // see if this can be removed
 const getFile = require('./get-file.js');
 const getProduct = require('./get-product.js');
 const getIndex = require('./get-index.js');
@@ -45,7 +44,9 @@ self.loadMain = function() { // merge with session?
 		if(fs.existsSync(mainIndex)) {
 			resolve(require(mainIndex));
 		} else {
+			const request = require('request'); // see if this can be moved to get-file
 			let client = new getFile({request});
+			//let client = new getFile();
 			let url = 'https://raw.githubusercontent.com/apnex/vmw-cli/master/mainIndex.json';
 			client.getFile(url, mainIndex).then((md5) => {
 				resolve(require(mainIndex));
@@ -144,6 +145,7 @@ self.login = async function(opts) {
 		await indexSession.data();
 		self.request = myvmw.request;
 		return myvmw.request;
+		//return;
 	} else {
 		console.log('[ERROR]: environment variables $VMWUSER and $VMWPASS not set! Please configure');
 		return;
@@ -153,7 +155,7 @@ self.login = async function(opts) {
 // verify login credentials, session, and download fileName
 self.get = function(productGroup, fileName) {
 	if(username && password) {
-		self.login({username, password}).then(function(request) {
+		self.login({username, password}).then(() => {
 			let index = require(fileIndex);
 			let fileNode = index[productGroup]['files'][fileName];
 			if(fileNode.download) {
@@ -172,7 +174,6 @@ self.get = function(productGroup, fileName) {
 self.getDownload = function(url, md5remote) {
 	self.request.get({url}, function (error, response, body) {
 		let file = JSON.parse(body);
-		//console.log(decodeURIComponent(file.downloadUrl));
 		let client = new getFile({
 			request: self.request
 		});
@@ -208,8 +209,6 @@ self.getUrl = function(fileNode) {
 
 	// testing
 	params['hashKey'] = 1;
-	//params['uuId'] = '2549fd40-53b9-4c8a-8733-89e7cfdfc417'; //esx65
-	//params['uuId'] = '2243e90b-fb44-4ca9-ac85-9805afe1235d'; //esx67
 
 	let base = 'https://my.vmware.com/group/vmware/details';
 	let dlgUrl = this.buildUrl(base, Object.assign({

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vmw-cli",
-	"version": "1.1.9",
+	"version": "1.1.10",
 	"description": "CLI interface for my.vmware.com",
 	"license": "MIT",
 	"repository": "apnex/vmw-cli",