3.35.0

Fix infinite loop in getWebApiKey

.editorconfig

@@ -0,0 +1,13 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = tab
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+insert_final_newline = false
+trim_trailing_whitespace = false

components/market.js

@@ -1,6 +1,10 @@
 var SteamCommunity = require('../index.js');
 var Cheerio = require('cheerio');
 
+/**
+ * Get a list of all apps on the market
+ * @param {function} callback - First argument is null|Error, second is an object of appid => name
+ */
 SteamCommunity.prototype.getMarketApps = function(callback) {
 	var self = this;
 	this.httpRequest('https://steamcommunity.com/market/', function (err, response, body) {
@@ -11,8 +15,8 @@ SteamCommunity.prototype.getMarketApps = function(callback) {
 
 		var $ = Cheerio.load(body);
 		if ($('.market_search_game_button_group')) {
-			apps = {};
-			$('.market_search_game_button_group > a').each(function (i, element) {
+			let apps = {};
+			$('.market_search_game_button_group a.game_button').each(function (i, element) {
 				var e = Cheerio.load(element);
 				var name = e('.game_button_game_name').text().trim();
 				var url = element.attribs.href;
@@ -25,3 +29,149 @@ SteamCommunity.prototype.getMarketApps = function(callback) {
 		}
 	}, "steamcommunity");
 };
+
+/**
+ * Check if an item is eligible to be turned into gems and if so, get its gem value
+ * @param {int} appid
+ * @param {int|string} assetid
+ * @param {function} callback
+ */
+SteamCommunity.prototype.getGemValue = function(appid, assetid, callback) {
+	this._myProfile({
+		"endpoint": "ajaxgetgoovalue/",
+		"qs": {
+			"sessionid": this.getSessionID(),
+			"appid": appid,
+			"contextid": 6,
+			"assetid": assetid
+		},
+		"checkHttpError": false,
+		"json": true
+	}, null, (err, res, body) => {
+		if (err) {
+			callback(err);
+			return;
+		}
+
+		if (body.success && body.success != SteamCommunity.EResult.OK) {
+			let err = new Error(body.message || SteamCommunity.EResult[body.success]);
+			err.eresult = err.code = body.success;
+			callback(err);
+			return;
+		}
+
+		if (!body.goo_value || !body.strTitle) {
+			callback(new Error("Malformed response"));
+			return;
+		}
+
+		callback(null, {"promptTitle": body.strTitle, "gemValue": parseInt(body.goo_value, 10)});
+	});
+};
+
+/**
+ * Turn an eligible item into gems.
+ * @param {int} appid
+ * @param {int|string} assetid
+ * @param {int} expectedGemsValue
+ * @param {function} callback
+ */
+SteamCommunity.prototype.turnItemIntoGems = function(appid, assetid, expectedGemsValue, callback) {
+	this._myProfile({
+		"endpoint": "ajaxgrindintogoo/",
+		"json": true,
+		"checkHttpError": false
+	}, {
+		"appid": appid,
+		"contextid": 6,
+		"assetid": assetid,
+		"goo_value_expected": expectedGemsValue,
+		"sessionid": this.getSessionID()
+	}, (err, res, body) => {
+		if (err) {
+			callback(err);
+			return;
+		}
+
+		if (body.success && body.success != SteamCommunity.EResult.OK) {
+			let err = new Error(body.message || SteamCommunity.EResult[body.success]);
+			err.eresult = err.code = body.success;
+			callback(err);
+			return;
+		}
+
+		if (!body['goo_value_received '] || !body.goo_value_total) { // lol valve
+			callback(new Error("Malformed response"));
+			return;
+		}
+
+		callback(null, {"gemsReceived": parseInt(body['goo_value_received '], 10), "totalGems": parseInt(body.goo_value_total, 10)});
+	})
+};
+
+/**
+ * Get details about a gift in your inventory.
+ * @param {string} giftID
+ * @param {function} callback
+ */
+SteamCommunity.prototype.getGiftDetails = function(giftID, callback) {
+	this.httpRequestPost({
+		"uri": "https://steamcommunity.com/gifts/" + giftID + "/validateunpack",
+		"form": {
+			"sessionid": this.getSessionID()
+		},
+		"json": true
+	}, (err, res, body) => {
+		if (err) {
+			callback(err);
+			return;
+		}
+
+		if (body.success && body.success != SteamCommunity.EResult.OK) {
+			let err = new Error(body.message || SteamCommunity.EResult[body.success]);
+			err.eresult = err.code = body.success;
+			callback(err);
+			return;
+		}
+
+		if (!body.packageid || !body.gift_name) {
+			callback(new Error("Malformed response"));
+			return;
+		}
+
+		callback(null, {
+			"giftName": body.gift_name,
+			"packageID": parseInt(body.packageid, 10),
+			"owned": body.owned
+		});
+	});
+};
+
+/**
+ * Unpack a gift in your inventory to your library.
+ * @param {string} giftID
+ * @param {function} callback
+ */
+SteamCommunity.prototype.redeemGift = function(giftID, callback) {
+	this.httpRequestPost({
+		"uri": "https://steamcommunity.com/gifts/" + giftID + "/unpack",
+		"form": {
+			"sessionid": this.getSessionID()
+		},
+		"json": true
+	}, (err, res, body) => {
+		if (err) {
+			callback(err);
+			return;
+		}
+
+		if (body.success && body.success != SteamCommunity.EResult.OK) {
+			let err = new Error(body.message || SteamCommunity.EResult[body.success]);
+			err.eresult = err.code = body.success;
+			callback(err);
+			return;
+		}
+
+		callback(null);
+	});
+};

components/profile.js

@@ -21,7 +21,7 @@ SteamCommunity.prototype.setupProfile = function(callback) {
 		if(!callback) {
 			return;
 		}
-		
+
 		if(err || response.statusCode != 200) {
 			callback(err || new Error("HTTP error " + response.statusCode));
 		} else {
@@ -37,82 +37,82 @@ SteamCommunity.prototype.editProfile = function(settings, callback) {
 			if(callback) {
 				callback(err || new Error("HTTP error " + response.statusCode));
 			}
-			
+
 			return;
 		}
-		
+
 		var $ = Cheerio.load(body);
 		var form = $('#editForm');
 		if(!form) {
 			if(callback) {
 				callback(new Error("Malformed response"));
 			}
-			
+
 			return;
 		}
-		
+
 		var values = {};
 		form.serializeArray().forEach(function(item) {
 			values[item.name] = item.value;
 		});
-		
+
 		for(var i in settings) {
 			if(!settings.hasOwnProperty(i)) {
 				continue;
 			}
-			
+
 			switch(i) {
 				case 'name':
 					values.personaName = settings[i];
 					break;
-				
+
 				case 'realName':
 					values.real_name = settings[i];
 					break;
-				
+
 				case 'summary':
 					values.summary = settings[i];
 					break;
-				
+
 				case 'country':
 					values.country = settings[i];
 					break;
-				
+
 				case 'state':
 					values.state = settings[i];
 					break;
-				
+
 				case 'city':
 					values.city = settings[i];
 					break;
-				
+
 				case 'customURL':
 					values.customURL = settings[i];
 					break;
-				
+
 				case 'background':
 					// The assetid of our desired profile background
 					values.profile_background = settings[i];
 					break;
-				
+
 				case 'featuredBadge':
 					// Currently, game badges aren't supported
 					values.favorite_badge_badgeid = settings[i];
 					break;
-				
+
 				case 'primaryGroup':
 					if(typeof settings[i] === 'object' && settings[i].getSteamID64) {
 						values.primary_group_steamid = settings[i].getSteamID64();
 					} else {
 						values.primary_group_steamid = new SteamID(settings[i]).getSteamID64();
 					}
-					
+
 					break;
-				
+
 				// TODO: profile showcases
 			}
 		}
-		
+
 		self._myProfile("edit", values, function(err, response, body) {
 			if (settings.customURL) {
 				delete self._profileURL;
@@ -122,10 +122,10 @@ SteamCommunity.prototype.editProfile = function(settings, callback) {
 				if(callback) {
 					callback(err || new Error("HTTP error " + response.statusCode));
 				}
-				
+
 				return;
 			}
-			
+
 			// Check for an error
 			var $ = Cheerio.load(body);
 			var error = $('#errorText .formRowFields');
@@ -135,11 +135,11 @@ SteamCommunity.prototype.editProfile = function(settings, callback) {
 					if(callback) {
 						callback(new Error(error));
 					}
-					
+
 					return;
 				}
 			}
-			
+
 			if(callback) {
 				callback(null);
 			}
@@ -154,58 +154,58 @@ SteamCommunity.prototype.profileSettings = function(settings, callback) {
 			if(callback) {
 				callback(err || new Error("HTTP error " + response.statusCode));
 			}
-			
+
 			return;
 		}
-		
+
 		var $ = Cheerio.load(body);
 		var form = $('#editForm');
 		if(!form) {
 			if(callback) {
 				callback(new Error("Malformed response"));
 			}
-			
+
 			return;
 		}
-		
+
 		var values = {};
 		form.serializeArray().forEach(function(item) {
 			values[item.name] = item.value;
 		});
-		
+
 		for(var i in settings) {
 			if(!settings.hasOwnProperty(i)) {
 				continue;
 			}
-			
+
 			switch(i) {
 				case 'profile':
 					values.privacySetting = settings[i];
 					break;
-				
+
 				case 'comments':
 					values.commentSetting = CommentPrivacyState[settings[i]];
 					break;
-				
+
 				case 'inventory':
 					values.inventoryPrivacySetting = settings[i];
 					break;
-				
+
 				case 'inventoryGifts':
 					values.inventoryGiftPrivacy = settings[i] ? 1 : 0;
 					break;
 			}
 		}
-		
+
 		self._myProfile("edit/settings", values, function(err, response, body) {
 			if(err || response.statusCode != 200) {
 				if(callback) {
 					callback(err || new Error("HTTP error " + response.statusCode));
 				}
-				
+
 				return;
 			}
-			
+
 			if(callback) {
 				callback(null);
 			}
@@ -219,6 +219,12 @@ SteamCommunity.prototype.uploadAvatar = function(image, format, callback) {
 		format = null;
 	}
 
+	// are we logged in?
+	if (!this.steamID) {
+		callback(new Error("Not Logged In"));
+		return;
+	}
+
 	var self = this;
 
 	if(image instanceof Buffer) {

components/webapi.js

@@ -14,6 +14,10 @@ SteamCommunity.prototype.getWebApiKey = function(domain, callback) {
 		if(body.match(/<h2>Access Denied<\/h2>/)) {
 			return callback(new Error("Access Denied"));
 		}
+		
+		if(body.match(/You must have a validated email address to create a Steam Web API key./)) {
+			return callback(new Error("You must have a validated email address to create a Steam Web API key."));
+		}
 
 		var match = body.match(/<p>Key: ([0-9A-F]+)<\/p>/);
 		if(match) {

examples/enable_twofactor.js

@@ -79,7 +79,7 @@ function doLogin(accountName, password, authCode, captcha) {
 
 			console.log("Writing secrets to twofactor_" + community.steamID.getSteamID64() + ".json");
 			console.log("Revocation code: " + response.revocation_code);
-			fs.writeFile("twofactor_" + community.steamID.getSteamID64() + ".json", JSON.stringify(response, null, "\t"));
+			fs.writeFileSync("twofactor_" + community.steamID.getSteamID64() + ".json", JSON.stringify(response, null, "\t"));
 
 			promptActivationCode(response);
 		});

index.js

@@ -86,7 +86,7 @@ SteamCommunity.prototype.login = function(details, callback) {
 	} else {
 		mobileHeaders = {"Referer": "https://steamcommunity.com/login"};
 	}
-	
+
 	this.httpRequestPost("https://steamcommunity.com/login/getrsakey/", {
 		"form": {"username": details.accountName},
 		"headers": mobileHeaders,
@@ -104,7 +104,7 @@ SteamCommunity.prototype.login = function(details, callback) {
 			callback(new Error("Invalid RSA key received"));
 			return;
 		}
-		
+
 		var key = new RSA();
 		key.setPublic(body.publickey_mod, body.publickey_exp);
 
@@ -146,7 +146,7 @@ SteamCommunity.prototype.login = function(details, callback) {
 				// Steam Guard (email)
 				error = new Error("SteamGuard");
 				error.emaildomain = body.emaildomain;
-				
+
 				callback(error);
 			} else if (!body.success && body.requires_twofactor) {
 				// Steam Guard (app)
@@ -154,9 +154,9 @@ SteamCommunity.prototype.login = function(details, callback) {
 			} else if (!body.success && body.captcha_needed && body.message.match(/Please verify your humanity/)) {
 				error = new Error("CAPTCHA");
 				error.captchaurl = "https://steamcommunity.com/login/rendercaptcha/?gid=" + body.captcha_gid;
-				
+
 				self._captchaGid = body.captcha_gid;
-				
+
 				callback(error);
 			} else if (!body.success) {
 				callback(new Error(body.message || "Unknown error"));
@@ -170,7 +170,7 @@ SteamCommunity.prototype.login = function(details, callback) {
 				var cookies = self._jar.getCookieString("https://steamcommunity.com").split(';').map(function(cookie) {
 					return cookie.trim();
 				});
-				
+
 				if (!disableMobile){
 					oAuth = JSON.parse(body.oauth);
 					self.steamID = new SteamID(oAuth.steamid);
@@ -198,7 +198,7 @@ SteamCommunity.prototype.login = function(details, callback) {
 				}
 
 				self.setCookies(cookies);
-				
+
 				callback(null, sessionID, cookies, steamguard, disableMobile ? null : oAuth.oauth_token);
 			}
 		}, "steamcommunity");
@@ -278,7 +278,7 @@ SteamCommunity.prototype.getSessionID = function() {
 			return decodeURIComponent(match[2]);
 		}
 	}
-	
+
 	var sessionID = generateSessionID();
 	this._setCookie(Request.cookie('sessionid=' + sessionID));
 	return sessionID;
@@ -300,17 +300,17 @@ SteamCommunity.prototype.parentalUnlock = function(pin, callback) {
 		if(!callback) {
 			return;
 		}
-		
+
 		if (err) {
 			callback(err);
 			return;
 		}
-		
+
 		if (!body || typeof body.success !== 'boolean') {
 			callback("Invalid response");
 			return;
 		}
-		
+
 		if (!body.success) {
 			switch (body.eresult) {
 				case 15:
@@ -327,7 +327,7 @@ SteamCommunity.prototype.parentalUnlock = function(pin, callback) {
 
 			return;
 		}
-		
+
 		callback();
 	}.bind(this), "steamcommunity");
 };
@@ -347,7 +347,7 @@ SteamCommunity.prototype.getNotifications = function(callback) {
 			callback(new Error("Malformed response"));
 			return;
 		}
-		
+
 		var notifications = {
 			"trades": body.notifications[1] || 0,
 			"gameTurns": body.notifications[2] || 0,
@@ -387,12 +387,12 @@ SteamCommunity.prototype.loggedIn = function(callback) {
 			callback(err || new Error("HTTP error " + response.statusCode));
 			return;
 		}
-		
+
 		if(response.statusCode == 403) {
 			callback(null, true, true);
 			return;
 		}
-		
+
 		callback(null, !!response.headers.location.match(/steamcommunity\.com(\/(id|profiles)\/[^\/]+)\/?/), false);
 	}, "steamcommunity");
 };
@@ -451,17 +451,19 @@ SteamCommunity.prototype._myProfile = function(endpoint, form, callback) {
 			self._profileURL = match[1];
 			setTimeout(function () {
 				delete self._profileURL; // delete the cache
-			}, 60000);
+			}, 60000).unref();
 
 			completeRequest(match[1]);
 		}, "steamcommunity");
 	}
 
 	function completeRequest(url) {
-		var options = {
-			"uri": "https://steamcommunity.com" + url + "/" + endpoint,
-			"method": "GET"
-		};
+		var options = {};
+		if (endpoint.endpoint) {
+			options = endpoint;
+			options.uri = "https://steamcommunity.com" + url + "/" + endpoint.endpoint;
+			options.method = "GET";
+		}
 
 		if (form) {
 			options.method = "POST";

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "steamcommunity",
-	"version": "3.34.0",
+	"version": "3.35.0",
 	"description": "Provides an interface for logging into and interacting with the Steam Community website",
 	"keywords": [
 		"steam",