3.16.0

Resolves #24

classes/CEconItem.js

@@ -25,11 +25,18 @@ function CEconItem(item, descriptions, contextID) {
 		}
 	}
 
+	this.is_currency = !!this.is_currency;
 	this.tradable = !!this.tradable;
 	this.marketable = !!this.marketable;
 	this.commodity = !!this.commodity;
 	this.market_tradable_restriction = (this.market_tradable_restriction ? parseInt(this.market_tradable_restriction, 10) : 0);
 	this.market_marketable_restriction = (this.market_marketable_restriction ? parseInt(this.market_marketable_restriction, 10) : 0);
+	this.fraudwarnings = this.fraudwarnings || [];
+	this.descriptions = this.descriptions || [];
+
+	if(this.owner && JSON.stringify(this.owner) == '{}') {
+		this.owner = null;
+	}
 }
 
 CEconItem.prototype.getImageURL = function() {

components/confirmations.js

@@ -1,5 +1,7 @@
 var SteamCommunity = require('../index.js');
 var Cheerio = require('cheerio');
+var SteamTotp = require('steam-totp');
+var Async = require('async');
 
 var CConfirmation = require('../classes/CConfirmation.js');
 
@@ -15,6 +17,7 @@ SteamCommunity.prototype.getConfirmations = function(time, key, callback) {
 	request(this, "conf", key, time, "conf", null, false, function(err, body) {
 		if(err) {
 			callback(err);
+			return;
 		}
 
 		var $ = Cheerio.load(body);
@@ -73,6 +76,7 @@ SteamCommunity.prototype.getConfirmationOfferID = function(confID, time, key, ca
 	request(this, "details/" + confID, key, time, "details", null, true, function(err, body) {
 		if(err) {
 			callback(err);
+			return;
 		}
 
 		if(!body.success) {
@@ -137,7 +141,7 @@ SteamCommunity.prototype.respondToConfirmation = function(confID, confKey, time,
 
 function request(community, url, key, time, tag, params, json, callback) {
 	params = params || {};
-	params.p = "android:" + Date.now();
+	params.p = "android:" + require('crypto').randomBytes(16).toString('hex');
 	params.a = community.steamID.getSteamID64();
 	params.k = key;
 	params.t = time;
@@ -162,11 +166,13 @@ function request(community, url, key, time, tag, params, json, callback) {
 /**
  * Start automatically polling our confirmations for new ones. The `confKeyNeeded` event will be emitted when we need a confirmation key, or `newConfirmation` when we get a new confirmation
  * @param {int} pollInterval - The interval, in milliseconds, at which we will poll for confirmations. This shouldn't be any less than 10,000 probably.
+ * @param {Buffer|string|null} [identitySecret=null] - Your identity_secret. If passed, all confirmations will be automatically accepted and nothing will be emitted.
  */
-SteamCommunity.prototype.startConfirmationChecker = function(pollInterval) {
+SteamCommunity.prototype.startConfirmationChecker = function(pollInterval, identitySecret) {
 	this._confirmationPollInterval = pollInterval;
 	this._knownConfirmations = this._knownConfirmations || {};
 	this._confirmationKeys = this._confirmationKeys || {};
+	this._identitySecret = identitySecret;
 
 	if(this._confirmationTimer) {
 		clearTimeout(this._confirmationTimer);
@@ -183,6 +189,10 @@ SteamCommunity.prototype.stopConfirmationChecker = function() {
 		delete this._confirmationPollInterval;
 	}
 
+	if(this._identitySecret) {
+		delete this._identitySecret;
+	}
+
 	if(this._confirmationTimer) {
 		clearTimeout(this._confirmationTimer);
 		delete this._confirmationTimer;
@@ -200,6 +210,27 @@ SteamCommunity.prototype.checkConfirmations = function() {
 	}
 
 	var self = this;
+	if(!this._confirmationQueue) {
+		this._confirmationQueue = Async.queue(function(conf, callback) {
+			// Worker to process new confirmations
+			if(self._identitySecret) {
+				// We should accept this
+				self.emit('debug', "Accepting confirmation #" + conf.id);
+				var time = Math.floor(Date.now() / 1000);
+				conf.respond(time, SteamTotp.getConfirmationKey(self._identitySecret, time, "allow"), true, function() {
+					// If there was an error and it wasn't actually accepted, we'll pick it up again
+					delete self._knownConfirmations[conf.id];
+					setTimeout(callback, 1000); // Call the callback in 1 second, to make sure the time changes
+				});
+			} else {
+				self.emit('newConfirmation', conf);
+				setTimeout(callback, 1000); // Call the callback in 1 second, to make sure the time changes
+			}
+		}, 1);
+	}
+
+	this.emit('debug', 'Checking confirmations');
+
 	this._confirmationCheckerGetKey('conf', function(err, key) {
 		if(err) {
 			resetTimer();
@@ -225,16 +256,16 @@ SteamCommunity.prototype.checkConfirmations = function() {
 
 			// We have new confirmations! Grab a key to get details.
 			self._confirmationCheckerGetKey('details', function(err, key) {
-				var handled = 0;
-
 				newOnes.forEach(function(conf) {
+					self._knownConfirmations[conf.id] = conf; // Add it to our list of known confirmations
+
 					if(err) {
-						handleNewConfirmation(conf, handled++);
+						self._confirmationQueue.push(conf);
 					} else {
 						// Get its offer ID, if we can
 						conf.getOfferID(key.time, key.key, function(err, offerID) {
 							conf.offerID = offerID ? offerID : null;
-							handleNewConfirmation(conf, handled++);
+							self._confirmationQueue.push(conf);
 						});
 					}
 				});
@@ -255,12 +286,32 @@ SteamCommunity.prototype.checkConfirmations = function() {
 
 		// Delay them by 1 second per new confirmation that we see, so that keys won't be the same.
 		setTimeout(function() {
-			self.emit('newConfirmation', conf);
+			if(self._identitySecret) {
+				self.emit('debug', 'Accepting confirmation ' + conf.id);
+				var time = Math.floor(Date.now() / 1000);
+				conf.respond(time, SteamTotp.getConfirmationKey(self._identitySecret, time, "allow"), true, function() {
+					delete self._knownConfirmations[conf.id];
+				});
+			} else {
+				self.emit('newConfirmation', conf);
+			}
 		}, handleNumber * 1000);
 	}
 };
 
 SteamCommunity.prototype._confirmationCheckerGetKey = function(tag, callback) {
+	if(this._identitySecret) {
+		if(tag == 'details') {
+			// We don't care about details
+			callback(new Error("Disabled"));
+			return;
+		}
+
+		var time = Math.floor(Date.now() / 1000);
+		callback(null, {"time": time, "key": SteamTotp.getConfirmationKey(this._identitySecret, time, tag)});
+		return;
+	}
+
 	var existing = this._confirmationKeys[tag];
 	var reusable = ['conf', 'details'];
 

components/inventoryhistory.js

@@ -50,6 +50,8 @@ SteamCommunity.prototype.getInventoryHistory = function(options, callback) {
 		for(var i = 0; i < trades.length; i++) {
 			item = $(trades[i]);
 			trade = {};
+
+			trade.onHold = !!item.find('span:nth-of-type(2)').text().match(/Trade on Hold/i);
 			
 			timeMatch = item.find('.tradehistory_timestamp').html().match(/(\d+):(\d+)(am|pm)/);
 			if(timeMatch[1] == 12 && timeMatch[3] == 'am') {
@@ -81,7 +83,7 @@ SteamCommunity.prototype.getInventoryHistory = function(options, callback) {
 			
 			items = item.find('.history_item');
 			for(j = 0; j < items.length; j++) {
-				match = body.match(new RegExp("HistoryPageCreateItemHover\\( '" + $(items[j]).attr('id') + "', (\\d+), '(\\d+)', '(\\d+)', '(\\d+)' \\);"));
+				match = body.match(new RegExp("HistoryPageCreateItemHover\\( '" + $(items[j]).attr('id') + "', (\\d+), '(\\d+)', '(\\d+|class_\\d+_instance_\\d+|class_\\d+)', '(\\d+)' \\);"));
 				econItem = historyInventory[match[1]][match[2]][match[3]];
 				
 				if($(items[j]).attr('id').indexOf('received') != -1) {

components/profile.js

@@ -191,9 +191,14 @@ SteamCommunity.prototype.profileSettings = function(settings, callback) {
 					values.inventoryGiftPrivacy = settings[i] ? 1 : 0;
 					break;
 				
-				case 'emailConfirmation':
+				case 'emailConfirmation': // deprecated
+				case 'tradeConfirmation':
 					values.tradeConfirmationSetting = settings[i] ? 1 : 0;
 					break;
+
+				case 'marketConfirmation':
+					values.marketConfirmationSetting = settings[i] ? 1 : 0;
+					break;
 			}
 		}
 		

components/twofactor.js

@@ -18,7 +18,7 @@ SteamCommunity.prototype.enableTwoFactor = function(callback) {
 
 		// Create a random device ID hash
 		var hash = require('crypto').createHash('sha1');
-		hash.update(Math.random().toString());
+		hash.update(self.steamID.getSteamID64());
 		hash = hash.digest('hex');
 
 		self.request.post({

examples/enable_twofactor.js

@@ -0,0 +1,97 @@
+var SteamCommunity = require('../index.js');
+var ReadLine = require('readline');
+var fs = require('fs');
+
+var community = new SteamCommunity();
+var rl = ReadLine.createInterface({
+	"input": process.stdin,
+	"output": process.stdout
+});
+
+rl.question("Username: ", function(accountName) {
+	rl.question("Password: ", function(password) {
+		doLogin(accountName, password);
+	});
+});
+
+function doLogin(accountName, password, authCode) {
+	community.login({
+		"accountName": accountName,
+		"password": password,
+		"authCode": authCode
+	}, function(err, sessionID, cookies, steamguard) {
+		if(err) {
+			if(err.message == 'SteamGuardMobile') {
+				console.log("This account already has two-factor authentication enabled.");
+				process.exit();
+				return;
+			}
+
+			if(err.message == 'SteamGuard') {
+				console.log("An email has been sent to your address at " + err.emaildomain);
+				rl.question("Steam Guard Code: ", function(code) {
+					doLogin(accountName, password, code);
+				});
+
+				return;
+			}
+
+			console.log(err);
+			process.exit();
+			return;
+		}
+
+		console.log("Logged on!");
+		community.enableTwoFactor(function(err, response) {
+			if(err) {
+				if(err.eresult == 2) {
+					console.log("Error: Failed to enable two-factor authentication. Do you have a phone number attached to your account?");
+					process.exit();
+					return;
+				}
+
+				if(err.eresult == 84) {
+					console.log("Error: RateLimitExceeded. Try again later.");
+					process.exit();
+					return;
+				}
+
+				console.log(err);
+				process.exit();
+				return;
+			}
+
+			if(response.status != 1) {
+				console.log("Error: Status " + response.status);
+				process.exit();
+				return;
+			}
+
+			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"));
+
+			promptActivationCode(response);
+		});
+	});
+}
+
+function promptActivationCode(response) {
+	rl.question("SMS Code: ", function(smsCode) {
+		community.finalizeTwoFactor(response.shared_secret, smsCode, function(err) {
+			if(err) {
+				if(err.message == "Invalid activation code") {
+					console.log(err);
+					promptActivationCode(response);
+					return;
+				}
+
+				console.log(err);
+			} else {
+				console.log("Two-factor authentication enabled!");
+			}
+
+			process.exit();
+		});
+	});
+}

index.js

@@ -3,6 +3,8 @@ var RSA = require('node-bignumber').Key;
 var hex2b64 = require('node-bignumber').hex2b64;
 var SteamID = require('steamid');
 
+const USER_AGENT = "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36";
+
 require('util').inherits(SteamCommunity, require('events').EventEmitter);
 
 module.exports = SteamCommunity;
@@ -16,7 +18,10 @@ function SteamCommunity(localAddress) {
 
 	var defaults = {
 		"jar": this._jar,
-		"timeout": 50000
+		"timeout": 50000,
+		"headers": {
+			"User-Agent": USER_AGENT
+		}
 	};
 
 	if(localAddress) {
@@ -30,9 +35,6 @@ function SteamCommunity(localAddress) {
 
 	// UTC
 	this._jar.setCookie(Request.cookie('timezoneOffset=0,0'), 'https://steamcommunity.com');
-
-	this._jar.setCookie(Request.cookie("mobileClientVersion=0 (2.1.3)"), "https://steamcommunity.com");
-	this._jar.setCookie(Request.cookie("mobileClient=android"), "https://steamcommunity.com");
 }
 
 SteamCommunity.prototype.login = function(details, callback) {
@@ -46,10 +48,13 @@ SteamCommunity.prototype.login = function(details, callback) {
 	// headers required to convince steam that we're logging in from a mobile device so that we can get the oAuth data
 	var mobileHeaders = {
 		"X-Requested-With": "com.valvesoftware.android.steam.community",
-		"referer": "https://steamcommunity.com/mobilelogin?oauth_client_id=DE45CD61&oauth_scope=read_profile%20write_profile%20read_client%20write_client",
-		"user-agent": "Mozilla/5.0 (Linux; U; Android 4.1.1; en-us; Google Nexus 4 - 4.1.1 - API 16 - 768x1280 Build/JRO03S) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
-		"accept": "text/javascript, text/html, application/xml, text/xml, */*"
+		"Referer": "https://steamcommunity.com/mobilelogin?oauth_client_id=DE45CD61&oauth_scope=read_profile%20write_profile%20read_client%20write_client",
+		"User-Agent": "Mozilla/5.0 (Linux; U; Android 4.1.1; en-us; Google Nexus 4 - 4.1.1 - API 16 - 768x1280 Build/JRO03S) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
+		"Accept": "text/javascript, text/html, application/xml, text/xml, */*"
 	};
+
+	this._jar.setCookie(Request.cookie("mobileClientVersion=0 (2.1.3)"), "https://steamcommunity.com");
+	this._jar.setCookie(Request.cookie("mobileClient=android"), "https://steamcommunity.com");
 	
 	this.request.post("https://steamcommunity.com/login/getrsakey/", {
 		"form": {
@@ -57,7 +62,9 @@ SteamCommunity.prototype.login = function(details, callback) {
 		},
 		"headers": mobileHeaders
 	}, function(err, response, body) {
+		// Remove the mobile cookies
 		if(err) {
+			deleteMobileCookies();
 			callback(err);
 			return;
 		}
@@ -66,9 +73,16 @@ SteamCommunity.prototype.login = function(details, callback) {
 		try {
 			json = JSON.parse(body);
 		} catch(e) {
+			deleteMobileCookies();
 			callback(e);
 			return;
 		}
+
+		if(!json.publickey_mod || !json.publickey_exp) {
+			deleteMobileCookies();
+			callback(new Error("Invalid RSA key received"));
+			return;
+		}
 		
 		var key = new RSA();
 		key.setPublic(json.publickey_mod, json.publickey_exp);
@@ -94,6 +108,8 @@ SteamCommunity.prototype.login = function(details, callback) {
 			"form": form,
 			"headers": mobileHeaders
 		}, function(err, response, body) {
+			deleteMobileCookies();
+
 			if(self._checkHttpError(err, response, callback)) {
 				return;
 			}
@@ -138,10 +154,53 @@ SteamCommunity.prototype.login = function(details, callback) {
 					}
 				}
 				
-				callback(null, sessionID, cookies, steamguard);
+				callback(null, sessionID, cookies, steamguard, oAuth.oauth_token);
 			}
 		});
 	});
+
+	function deleteMobileCookies() {
+		var cookie = Request.cookie('mobileClientVersion=');
+		cookie.expires = new Date(0);
+		self._jar.setCookie(cookie, "https://steamcommunity.com");
+
+		cookie = Request.cookie('mobileClient=');
+		cookie.expires = new Date(0);
+		self._jar.setCookie(cookie, "https://steamcommunity.com");
+	}
+};
+
+SteamCommunity.prototype.oAuthLogin = function(steamguard, token, callback) {
+	steamguard = steamguard.split('||');
+	var steamID = new SteamID(steamguard[0]);
+
+	var self = this;
+	this.request.post({
+		"uri": "https://api.steampowered.com/IMobileAuthService/GetWGToken/v1/",
+		"form": {
+			"access_token": token
+		},
+		"json": true
+	}, function(err, response, body) {
+		if(self._checkHttpError(err, response, callback)) {
+			return;
+		}
+
+		if(!body.response || !body.response.token || !body.response.token_secure) {
+			callback(new Error("Malformed response"));
+			return;
+		}
+
+		var cookies = [
+			'steamLogin=' + encodeURIComponent(steamID.getSteamID64() + '||' + body.response.token),
+			'steamLoginSecure=' + encodeURIComponent(steamID.getSteamID64() + '||' + body.response.token_secure),
+			'steamMachineAuth' + steamID.getSteamID64() + '=' + steamguard[1],
+			'sessionid=' + self.getSessionID()
+		];
+
+		self.setCookies(cookies);
+		callback(null, self.getSessionID(), cookies);
+	});
 };
 
 SteamCommunity.prototype.setCookies = function(cookies) {
@@ -171,7 +230,7 @@ SteamCommunity.prototype.getSessionID = function() {
 };
 
 function generateSessionID() {
-	return Math.floor(Math.random() * 1000000000);
+	return require('crypto').randomBytes(12).toString('hex');
 }
 
 SteamCommunity.prototype.parentalUnlock = function(pin, callback) {
@@ -288,7 +347,7 @@ SteamCommunity.prototype._myProfile = function(endpoint, form, callback) {
 		
 		var match = response.headers.location.match(/steamcommunity\.com(\/(id|profiles)\/[^\/]+)\/?/);
 		if(!match) {
-			callback("Can't get profile URL");
+			callback(new Error("Can't get profile URL"));
 			return;
 		}
 		

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "steamcommunity",
-	"version": "3.12.2",
+	"version": "3.16.0",
 	"description": "Provides an interface for logging into and interacting with the Steam Community website",
 	"keywords": ["steam", "steam community"],
 	"homepage": "https://github.com/DoctorMcKay/node-steamcommunity",