3.27.0

Problem when search "Key:" in polish language.

classes/CConfirmation.js

@@ -1,17 +1,32 @@
+var SteamCommunity = require('../index.js');
+
 module.exports = CConfirmation;
 
 function CConfirmation(community, data) {
 	Object.defineProperty(this, "_community", {"value": community});
 
 	this.id = data.id;
+	this.type = data.type;
+	this.creator = data.creator;
 	this.key = data.key;
 	this.title = data.title;
 	this.receiving = data.receiving;
 	this.time = data.time;
 	this.icon = data.icon;
+	this.offerID = this.type == SteamCommunity.ConfirmationType.Trade ? this.creator : null;
 }
 
 CConfirmation.prototype.getOfferID = function(time, key, callback) {
+	if (this.type && this.creator) {
+		if (this.type != SteamCommunity.ConfirmationType.Trade) {
+			callback(new Error("Not a trade confirmation"));
+			return;
+		}
+
+		callback(null, this.creator);
+		return;
+	}
+
 	this._community.getConfirmationOfferID(this.id, time, key, callback);
 };
 

components/confirmations.js

@@ -52,6 +52,8 @@ SteamCommunity.prototype.getConfirmations = function(time, key, callback) {
 			var img = conf.find('.mobileconf_list_entry_icon img');
 			confs.push(new CConfirmation(self, {
 				"id": conf.data('confid'),
+				"type": conf.data('type'),
+				"creator": conf.data('creator'),
 				"key": conf.data('key'),
 				"title": conf.find('.mobileconf_list_entry_description>div:nth-of-type(1)').text().trim(),
 				"receiving": conf.find('.mobileconf_list_entry_description>div:nth-of-type(2)').text().trim(),
@@ -111,7 +113,7 @@ SteamCommunity.prototype.getConfirmationOfferID = function(confID, time, key, ca
  * @param {int|int[]} confID - The ID of the confirmation in question, or an array of confirmation IDs
  * @param {string|string[]} confKey - The confirmation key associated with the confirmation in question (or an array of them) (not a TOTP key, the `key` property of CConfirmation)
  * @param {int} time - The unix timestamp with which the following key was generated
- * @param {string} key - The confirmation key that was generated using the preceeding time and the tag "allow" (if accepting) or "cancel" (if not accepting)
+ * @param {string} key - The confirmation key that was generated using the preceding time and the tag "allow" (if accepting) or "cancel" (if not accepting)
  * @param {boolean} accept - true if you want to accept the confirmation, false if you want to cancel it
  * @param {SteamCommunity~genericErrorCallback} callback - Called when the request is complete
  */
@@ -144,6 +146,61 @@ SteamCommunity.prototype.respondToConfirmation = function(confID, confKey, time,
 	});
 };
 
+/**
+ * Accept a confirmation for a given object (trade offer or market listing) automatically.
+ * @param {string} identitySecret
+ * @param {number|string} objectID
+ * @param {SteamCommunity~genericErrorCallback} callback
+ */
+SteamCommunity.prototype.acceptConfirmationForObject = function(identitySecret, objectID, callback) {
+	var self = this;
+	this._usedConfTimes = this._usedConfTimes || [];
+
+	SteamTotp.getTimeOffset(function(err, offset) {
+		if (err) {
+			callback(err);
+			return;
+		}
+
+		var time = SteamTotp.time(offset);
+		self.getConfirmations(time, SteamTotp.getConfirmationKey(identitySecret, time, "conf"), function(err, confs) {
+			if (err) {
+				callback(err);
+				return;
+			}
+
+			var conf = confs.filter(function(conf) { return conf.creator == objectID; });
+			if (conf.length == 0) {
+				callback(new Error("Could not find confirmation for object " + objectID));
+				return;
+			}
+
+			conf = conf[0];
+
+			// make sure we don't reuse the same time
+			var localOffset = 0;
+			do {
+				time = SteamTotp.time(offset) + localOffset++;
+			} while (self._usedConfTimes.indexOf(time) != -1);
+
+			self._usedConfTimes.push(time);
+			if (self._usedConfTimes.length > 60) {
+				self._usedConfTimes.splice(0, self._usedConfTimes.length - 60); // we don't need to save more than 60 entries
+			}
+
+			conf.respond(time, SteamTotp.getConfirmationKey(identitySecret, time, "allow"), true, callback);
+		});
+	});
+};
+
+/**
+ * Send a single request to Steam to accept all outstanding confirmations (after loading the list). If one fails, the
+ * entire request will fail and there will be no way to know which failed without loading the list again.
+ * @param {number} time
+ * @param {string} confKey
+ * @param {string} allowKey
+ * @param {function} callback
+ */
 SteamCommunity.prototype.acceptAllConfirmations = function(time, confKey, allowKey, callback) {
 	var self = this;
 
@@ -294,24 +351,13 @@ SteamCommunity.prototype.checkConfirmations = function() {
 				return; // No new ones
 			}
 
-			// We have new confirmations! Grab a key to get details.
-			self._confirmationCheckerGetKey('details', function(err, key) {
-				newOnes.forEach(function(conf) {
-					self._knownConfirmations[conf.id] = conf; // Add it to our list of known confirmations
-
-					if(err) {
-						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;
-							self._confirmationQueue.push(conf);
-						});
-					}
-				});
-
-				resetTimer();
+			// We have new confirmations!
+			newOnes.forEach(function(conf) {
+				self._knownConfirmations[conf.id] = conf; // Add it to our list of known confirmations
+				self._confirmationQueue.push(conf);
 			});
+
+			resetTimer();
 		});
 	});
 

components/http.js

@@ -60,10 +60,10 @@ SteamCommunity.prototype.httpRequest = function(uri, options, callback, source)
 				"jsonError": jsonError
 			});
 
-			if (hasCallback) {
+			if (hasCallback && !(httpError || communityError || tradeError)) {
 				if (jsonError) {
 					callback.call(self, jsonError, response);
-				} else if (!(httpError || communityError || tradeError)) {
+				} else {
 					callback.apply(self, arguments);
 				}
 			}

components/inventoryhistory.js

@@ -5,118 +5,158 @@ var request = require('request');
 var Cheerio = require('cheerio');
 var Async = require('async');
 
+/*
+ * Inventory history in a nutshell.
+ *
+ * There are no more page numbers. Now you have to request after_time and optionally after_trade.
+ * Without "prev" set, you will request 30 trades that were completed FURTHER IN THE PAST than after_time (and optionally after_trade)
+ * With "prev" set, you will request 30 trades that were completed MORE RECENTLY than after_time (and optionally after_trade)
+ */
+
 SteamCommunity.prototype.getInventoryHistory = function(options, callback) {
-	if(typeof options === 'function') {
+	if (typeof options === 'function') {
 		callback = options;
 		options = {};
 	}
 	
-	options.page = options.page || 1;
-	
-	this.httpRequest("https://steamcommunity.com/my/inventoryhistory?l=english&p=" + options.page, function(err, response, body) {
-		if(err) {
+	options.direction = options.direction || "past";
+
+	var qs = "?l=english";
+	if (options.startTime) {
+		if (options.startTime instanceof Date) {
+			options.startTime = Math.floor(options.startTime.getTime() / 1000);
+		}
+
+		qs += "&after_time=" + options.startTime;
+
+		if (options.startTrade) {
+			qs += "&after_trade=" + options.startTrade;
+		}
+	}
+
+	if (options.direction == "future") {
+		qs += "&prev=1";
+	}
+
+	this._myProfile("inventoryhistory" + qs, null, function(err, response, body) {
+		if (err) {
 			callback(err);
 			return;
 		}
-		
+
 		var output = {};
 		var vanityURLs = [];
-		
+
 		var $ = Cheerio.load(body);
-		var html = $('.inventory_history_pagingrow').html();
-		if(!html) {
+		if (!$('.inventory_history_pagingrow').html()) {
 			callback("Malformed page: no paging row found");
 			return;
 		}
-		
-		var match = html.match(/(\d+) - (\d+) of (\d+) History Items/);
-		
-		output.first = parseInt(match[1], 10);
-		output.last = parseInt(match[2], 10);
-		output.totalTrades = parseInt(match[3], 10);
-		
+
 		// Load the inventory item data
 		var match2 = body.match(/var g_rgHistoryInventory = (.*);/);
-		if(!match2) {
+		if (!match2) {
 			callback(new Error("Malformed page: no trade found"));
 			return;
 		}
-		var historyInventory = JSON.parse(match2[1]);
-		
+
+		try {
+			var historyInventory = JSON.parse(match2[1]);
+		} catch (ex) {
+			callback(new Error("Malformed page: no well-formed trade data found"));
+			return;
+		}
+
+		var i;
+
+		// See if we've got paging buttons
+		var $paging = $('.inventory_history_nextbtn .pagebtn:not(.disabled)');
+		var href;
+		for (i = 0; i < $paging.length; i++) {
+			href = $paging[i].attribs.href;
+			if (href.match(/prev=1/)) {
+				output.firstTradeTime = new Date(href.match(/after_time=(\d+)/)[1] * 1000);
+				output.firstTradeID = href.match(/after_trade=(\d+)/)[1];
+			} else {
+				output.lastTradeTime = new Date(href.match(/after_time=(\d+)/)[1] * 1000);
+				output.lastTradeID = href.match(/after_trade=(\d+)/)[1];
+			}
+		}
+
 		output.trades = [];
 		var trades = $('.tradehistoryrow');
-		
+
 		var item, trade, profileLink, items, j, econItem, timeMatch, time;
-		for(var i = 0; i < trades.length; i++) {
+		for (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') {
+			if (timeMatch[1] == 12 && timeMatch[3] == 'am') {
 				timeMatch[1] = 0;
 			}
-			
-			if(timeMatch[1] < 12 && timeMatch[3] == 'pm') {
+
+			if (timeMatch[1] < 12 && timeMatch[3] == 'pm') {
 				timeMatch[1] = parseInt(timeMatch[1], 10) + 12;
 			}
-			
+
 			time = (timeMatch[1] < 10 ? '0' : '') + timeMatch[1] + ':' + timeMatch[2] + ':00';
-			
-			trade.date = new Date(item.find('.tradehistory_date').html() + ' ' + time);
+
+			trade.date = new Date(item.find('.tradehistory_date').html() + ' ' + time + ' UTC');
 			trade.partnerName = item.find('.tradehistory_event_description a').html();
 			trade.partnerSteamID = null;
 			trade.partnerVanityURL = null;
 			trade.itemsReceived = [];
 			trade.itemsGiven = [];
-			
+
 			profileLink = item.find('.tradehistory_event_description a').attr('href');
-			if(profileLink.indexOf('/profiles/') != -1) {
+			if (profileLink.indexOf('/profiles/') != -1) {
 				trade.partnerSteamID = new SteamID(profileLink.match(/(\d+)$/)[1]);
 			} else {
 				trade.partnerVanityURL = profileLink.match(/\/([^\/]+)$/)[1];
-				if(options.resolveVanityURLs && vanityURLs.indexOf(trade.partnerVanityURL) == -1) {
+				if (options.resolveVanityURLs && vanityURLs.indexOf(trade.partnerVanityURL) == -1) {
 					vanityURLs.push(trade.partnerVanityURL);
 				}
 			}
-			
+
 			items = item.find('.history_item');
-			for(j = 0; j < items.length; j++) {
+			for (j = 0; j < items.length; j++) {
 				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) {
+
+				if ($(items[j]).attr('id').indexOf('received') != -1) {
 					trade.itemsReceived.push(new CEconItem(econItem));
 				} else {
 					trade.itemsGiven.push(new CEconItem(econItem));
 				}
 			}
-			
+
 			output.trades.push(trade);
 		}
-		
-		if(options.resolveVanityURLs) {
+
+		if (options.resolveVanityURLs) {
 			Async.map(vanityURLs, resolveVanityURL, function(err, results) {
-				if(err) {
+				if (err) {
 					callback(err);
 					return;
 				}
-				
-				for(i = 0; i < output.trades.length; i++) {
-					if(output.trades[i].partnerSteamID || !output.trades[i].partnerVanityURL) {
+
+				for (i = 0; i < output.trades.length; i++) {
+					if (output.trades[i].partnerSteamID || !output.trades[i].partnerVanityURL) {
 						continue;
 					}
-					
+
 					// Find the vanity URL
-					for(j = 0; j < results.length; j++) {
-						if(results[j].vanityURL == output.trades[i].partnerVanityURL) {
+					for (j = 0; j < results.length; j++) {
+						if (results[j].vanityURL == output.trades[i].partnerVanityURL) {
 							output.trades[i].partnerSteamID = new SteamID(results[j].steamID);
 							break;
 						}
 					}
 				}
-				
+
 				callback(null, output);
 			});
 		} else {
@@ -127,17 +167,17 @@ SteamCommunity.prototype.getInventoryHistory = function(options, callback) {
 
 function resolveVanityURL(vanityURL, callback) {
 	request("https://steamcommunity.com/id/" + vanityURL + "/?xml=1", function(err, response, body) {
-		if(err) {
+		if (err) {
 			callback(err);
 			return;
 		}
-		
+
 		var match = body.match(/<steamID64>(\d+)<\/steamID64>/);
-		if(!match || !match[1]) {
+		if (!match || !match[1]) {
 			callback(new Error("Couldn't find Steam ID"));
 			return;
 		}
-		
+
 		callback(null, {"vanityURL": vanityURL, "steamID": match[1]});
 	});
 }

components/webapi.js

@@ -3,7 +3,7 @@ var SteamCommunity = require('../index.js');
 SteamCommunity.prototype.getWebApiKey = function(domain, callback) {
 	var self = this;
 	this.httpRequest({
-		"uri": "https://steamcommunity.com/dev/apikey",
+		"uri": "https://steamcommunity.com/dev/apikey?l=english",
 		"followRedirect": false
 	}, function(err, response, body) {
 		if (err) {
@@ -21,7 +21,7 @@ SteamCommunity.prototype.getWebApiKey = function(domain, callback) {
 			callback(null, match[1]);
 		} else {
 			// We need to register a new API key
-			self.httpRequestPost('https://steamcommunity.com/dev/registerkey', {
+			self.httpRequestPost('https://steamcommunity.com/dev/registerkey?l=english', {
 				"form": {
 					"domain": domain,
 					"agreeToTerms": "agreed",

index.js

@@ -10,6 +10,12 @@ require('util').inherits(SteamCommunity, require('events').EventEmitter);
 module.exports = SteamCommunity;
 
 SteamCommunity.SteamID = SteamID;
+SteamCommunity.ConfirmationType = {
+	// 1 is unknown, possibly "Invalid"
+	"Trade": 2,
+	"MarketListing": 3
+	// 4 is opt-out or other like account confirmation?
+};
 
 function SteamCommunity(options) {
 	options = options || {};
@@ -43,16 +49,16 @@ function SteamCommunity(options) {
 	this.request = this.request.defaults(defaults);
 
 	// English
-	this._jar.setCookie(Request.cookie('Steam_Language=english'), 'https://steamcommunity.com');
+	this._setCookie(Request.cookie('Steam_Language=english'));
 
 	// UTC
-	this._jar.setCookie(Request.cookie('timezoneOffset=0,0'), 'https://steamcommunity.com');
+	this._setCookie(Request.cookie('timezoneOffset=0,0'));
 }
 
 SteamCommunity.prototype.login = function(details, callback) {
 	if(details.steamguard) {
 		var parts = details.steamguard.split('||');
-		this._jar.setCookie(Request.cookie('steamMachineAuth' + parts[0] + '=' + encodeURIComponent(parts[1])), 'https://steamcommunity.com');
+		this._setCookie(Request.cookie('steamMachineAuth' + parts[0] + '=' + encodeURIComponent(parts[1])), true);
 	}
 	
 	var self = this;
@@ -65,8 +71,8 @@ SteamCommunity.prototype.login = function(details, callback) {
 		"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._setCookie(Request.cookie("mobileClientVersion=0 (2.1.3)"));
+	this._setCookie(Request.cookie("mobileClient=android"));
 	
 	this.httpRequestPost("https://steamcommunity.com/login/getrsakey/", {
 		"form": {"username": details.accountName},
@@ -140,7 +146,7 @@ SteamCommunity.prototype.login = function(details, callback) {
 			} else {
 				var sessionID = generateSessionID();
 				var oAuth = JSON.parse( body.oauth );
-				self._jar.setCookie(Request.cookie('sessionid=' + sessionID), 'http://steamcommunity.com');
+				self._setCookie(Request.cookie('sessionid=' + sessionID));
 				
 				self.steamID = new SteamID(oAuth.steamid);
 				self.oAuthToken = oAuth.oauth_token;
@@ -158,6 +164,8 @@ SteamCommunity.prototype.login = function(details, callback) {
 						break;
 					}
 				}
+
+				self.setCookies(cookies);
 				
 				callback(null, sessionID, cookies, steamguard, oAuth.oauth_token);
 			}
@@ -167,11 +175,11 @@ 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");
+		self._setCookie(cookie);
 
 		cookie = Request.cookie('mobileClient=');
 		cookie.expires = new Date(0);
-		self._jar.setCookie(cookie, "https://steamcommunity.com");
+		self._setCookie(cookie);
 	}
 };
 
@@ -209,6 +217,15 @@ SteamCommunity.prototype.oAuthLogin = function(steamguard, token, callback) {
 	}, "steamcommunity");
 };
 
+SteamCommunity.prototype._setCookie = function(cookie, secure) {
+	var protocol = secure ? "https" : "http";
+	cookie.secure = !!secure;
+
+	this._jar.setCookie(cookie.clone(), protocol + "://steamcommunity.com");
+	this._jar.setCookie(cookie.clone(), protocol + "://store.steampowered.com");
+	this._jar.setCookie(cookie.clone(), protocol + "://help.steampowered.com");
+};
+
 SteamCommunity.prototype.setCookies = function(cookies) {
 	var self = this;
 	cookies.forEach(function(cookie) {
@@ -216,8 +233,8 @@ SteamCommunity.prototype.setCookies = function(cookies) {
 		if(cookieName == 'steamLogin') {
 			self.steamID = new SteamID(cookie.match(/=(\d+)/)[1]);
 		}
-		
-		self._jar.setCookie(Request.cookie(cookie), (cookieName.match(/^steamMachineAuth/) || cookieName.match(/Secure$/) ? "https://" : "http://") + "steamcommunity.com");
+
+		self._setCookie(Request.cookie(cookie), !!(cookieName.match(/^steamMachineAuth/) || cookieName.match(/Secure$/)));
 	});
 };
 
@@ -231,7 +248,7 @@ SteamCommunity.prototype.getSessionID = function() {
 	}
 	
 	var sessionID = generateSessionID();
-	this._jar.setCookie(Request.cookie('sessionid=' + sessionID), "http://steamcommunity.com");
+	this._setCookie(Request.cookie('sessionid=' + sessionID));
 	return sessionID;
 };
 
@@ -273,37 +290,34 @@ SteamCommunity.prototype.parentalUnlock = function(pin, callback) {
 
 SteamCommunity.prototype.getNotifications = function(callback) {
 	var self = this;
-	this.httpRequestGet("https://steamcommunity.com/actions/RefreshNotificationArea", function(err, response, body) {
+	this.httpRequestGet({
+		"uri": "https://steamcommunity.com/actions/GetNotificationCounts",
+		"json": true
+	}, function(err, response, body) {
 		if (err) {
 			callback(err);
 			return;
 		}
-		
-		var notifications = {
-			"comments": 0,
-			"items": 0,
-			"invites": 0,
-			"gifts": 0,
-			"chat": 0,
-			"trades": 0
-		};
-		
-		var items = {
-			"comments": /(\d+) new comments?/,
-			"items": /(\d+) new items? in your inventory/,
-			"invites": /(\d+) new invites?/,
-			"gifts": /(\d+) new gifts?/,
-			"chat": /(\d+) unread chat messages?/,
-			"trades": /(\d+) new trade notifications?/
-		};
-		
-		var match;
-		for(var i in items) {
-			if(match = body.match(items[i])) {
-				notifications[i] = parseInt(match[1], 10);
-			}
+
+		if (!body || !body.notifications) {
+			callback(new Error("Malformed response"));
+			return;
 		}
 		
+		var notifications = {
+			"trades": body.notifications[1] || 0,
+			"gameTurns": body.notifications[2] || 0,
+			"moderatorMessages": body.notifications[3] || 0,
+			"comments": body.notifications[4] || 0,
+			"items": body.notifications[5] || 0,
+			"invites": body.notifications[6] || 0,
+			// dunno about 7
+			"gifts": body.notifications[8] || 0,
+			"chat": body.notifications[9] || 0,
+			"helpRequestReplies": body.notifications[10] || 0,
+			"accountAlerts": body.notifications[11] || 0
+		};
+
 		callback(null, notifications);
 	}, "steamcommunity");
 };

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "steamcommunity",
-	"version": "3.23.2",
+	"version": "3.27.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",