3.26.0

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(),
@@ -294,24 +296,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();
 		});
 	});
 

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;
@@ -167,11 +173,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 +215,14 @@ SteamCommunity.prototype.oAuthLogin = function(steamguard, token, callback) {
 	}, "steamcommunity");
 };
 
+SteamCommunity.prototype._setCookie = function(cookie, secure) {
+	var protocol = secure ? "https" : "http";
+
+	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 +230,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 +245,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 +287,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
+			// dunno about 11
+		};
+
 		callback(null, notifications);
 	}, "steamcommunity");
 };

package.json

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