3.14.159

Resolves #24

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);
 						});
 					}
 				});
@@ -245,7 +276,9 @@ SteamCommunity.prototype.checkConfirmations = function() {
 	});
 
 	function resetTimer() {
-		self._confirmationTimer = setTimeout(self.checkConfirmations.bind(self), self._confirmationPollInterval);
+		if(self._confirmationPollInterval) {
+			self._confirmationTimer = setTimeout(self.checkConfirmations.bind(self), self._confirmationPollInterval);
+		}
 	}
 
 	function handleNewConfirmation(conf, handleNumber) {
@@ -253,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/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({

index.js

@@ -30,9 +30,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 +43,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 +57,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 +68,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 +103,8 @@ SteamCommunity.prototype.login = function(details, callback) {
 			"form": form,
 			"headers": mobileHeaders
 		}, function(err, response, body) {
+			deleteMobileCookies();
+
 			if(self._checkHttpError(err, response, callback)) {
 				return;
 			}
@@ -142,6 +153,16 @@ SteamCommunity.prototype.login = function(details, callback) {
 			}
 		});
 	});
+
+	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.setCookies = function(cookies) {

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "steamcommunity",
-	"version": "3.12.1",
+	"version": "3.14.159",
 	"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",