3.19.6

https://github.com/DoctorMcKay/node-steam-tradeoffer-manager/issues/120#issuecomment-200179648

CONTRIBUTING.md

@@ -0,0 +1,35 @@
+# Contributing to SteamCommunity
+
+Thanks for your interest in making `SteamCommunity` better! I'd appreciate it if you read over this document quickly
+before you submit your issue or pull request. It'll make things go much smoother.
+
+# Issues
+
+Submitting an issue?
+
+- If you're **reporting a bug**, please include all relevant details.
+	- A descriptive title helps for one. Titles of just "Error" or "It doesn't work" really don't help.
+	- Please describe what you're trying to do, what actually happens, and what you can do to reproduce the problem.
+	- If you have an error message or a crash, please include the full text of the error message and the stack trace.
+	- Include the relevant snippet of your code. Wrap it in \`\`\`js /* code */ \`\`\` and GitHub [will format it nicely for you](https://help.github.com/articles/github-flavored-markdown/#syntax-highlighting).
+- If you're **requesting a feature**, please be descriptive and understanding.
+	- A good title makes a difference. Please briefly describe what you're requesting in the title.
+	- Be descriptive in the issue body, too. Say what you want to do, and ideally what the method should be named.
+	- Be understanding if I don't think that your feature request falls within the scope of this module.
+- If you're **asking a question** or **requesting support**, please don't submit a GitHub issue.
+	- Issues are only for problems directly relating to the module's code.
+	- Please [post a thread in the dedicated forum](https://dev.doctormckay.com/forum/8-node-steamcommunity/) instead.
+
+# Pull Requests
+
+Submitting a pull request? Great! Thanks for contributing your time and code! Please keep the following in mind.
+
+- Please follow the existing code style.
+	- Tabs for indentation
+	- camelCase for variables and functions
+	- Opening braces on the same line as the if/for/while statement
+	- etc.
+- Please avoid breaking changes. If you make a breaking change that can be done in a backwards-compatible manner, I won't accept it.
+- Please don't increment the version number in `package.json`. I'll do that myself when I publish it to npm.
+- Please include a brief description of your change in the pull request if it's not immediately apparent from the code.
+- Be understanding if I don't think that your change falls within the scope of this module.

README.md

@@ -9,12 +9,15 @@ This module provides an easy interface for the Steam Community website. This mod
 
 It supports Steam Guard and CAPTCHAs.
 
-# Installation
-
-Install it from npm:
-
-    $ npm install steamcommunity
+**Have a question about the module or coding in general? *Do not create a GitHub issue.* GitHub issues are for feature
+requests and bug reports. Instead, post in the [dedicated forum](https://dev.doctormckay.com/forum/8-node-steamcommunity/).
+Such issues may be ignored!**
 
 # Documentation
 
-As of version 1.0.0, documentation is on the [GitHub wiki](https://github.com/DoctorMcKay/node-steamcommunity/wiki).
+Documentation is available on the [GitHub wiki](https://github.com/DoctorMcKay/node-steamcommunity/wiki).
+
+# Support
+
+Report bugs on the [issue tracker](https://github.com/DoctorMcKay/node-steamcommunity/issues) or ask questions
+on the [dedicated forum](https://dev.doctormckay.com/forum/8-node-steamcommunity/).

classes/CMarketItem.js

@@ -8,7 +8,8 @@ SteamCommunity.prototype.getMarketItem = function(appid, hashName, currency, cal
 	}
 	var self = this;
 	this.httpRequest("https://steamcommunity.com/market/listings/" + appid + "/" + encodeURIComponent(hashName), function(err, response, body) {
-		if(self._checkHttpError(err, response, callback)) {
+		if (err) {
+			callback(err);
 			return;
 		}
 		
@@ -26,7 +27,7 @@ SteamCommunity.prototype.getMarketItem = function(appid, hashName, currency, cal
 				callback(null, item);
 			}
 		});
-	});
+	}, "steamcommunity");
 };
 
 function CMarketItem(appid, hashName, community, body, $) {
@@ -107,7 +108,8 @@ CMarketItem.prototype.updatePriceForCommodity = function(currency, callback) {
 		"uri": "https://steamcommunity.com/market/itemordershistogram?country=US&language=english&currency=" + currency + "&item_nameid=" + this.commodityID,
 		"json": true
 	}, function(err, response, body) {
-		if(self._community._checkHttpError(err, response, callback)) {
+		if (err) {
+			callback(err);
 			return;
 		}
 		
@@ -137,7 +139,7 @@ CMarketItem.prototype.updatePriceForCommodity = function(currency, callback) {
 		if(callback) {
 			callback(null);
 		}
-	});
+	}, "steamcommunity");
 };
 
 CMarketItem.prototype.updatePriceForNonCommodity = function (currency, callback) {
@@ -153,7 +155,8 @@ CMarketItem.prototype.updatePriceForNonCommodity = function (currency, callback)
 			"/render/?query=&start=0&count=10&country=US&language=english&currency=" + currency,
 		"json": true
 	}, function(err, response, body) {
-		if (self._community._checkHttpError(err, response, callback)) {
+		if (err) {
+			callback(err);
 			return;
 		}
 
@@ -181,5 +184,5 @@ CMarketItem.prototype.updatePriceForNonCommodity = function (currency, callback)
 		}
 
 		callback && callback(null);
-	});
+	}, "steamcommunity");
 };

classes/CMarketSearchResult.js

@@ -40,7 +40,8 @@ function performSearch(request, qs, results, callback) {
 		},
 		"json": true
 	}, function(err, response, body) {
-		if(self._checkHttpError(err, response, callback)) {
+		if (err) {
+			callback(err);
 			return;
 		}
 		
@@ -71,7 +72,7 @@ function performSearch(request, qs, results, callback) {
 			qs.start += body.pagesize;
 			performSearch.call(self, request, qs, results, callback);
 		}
-	});
+	}, "steamcommunity");
 }
 
 function CMarketSearchResult(row) {

classes/CSteamGroup.js

@@ -1,9 +1,10 @@
 var SteamCommunity = require('../index.js');
+var Helpers = require('../components/helpers.js');
 var SteamID = require('steamid');
 var xml2js = require('xml2js');
 
 SteamCommunity.prototype.getSteamGroup = function(id, callback) {
-	if(typeof id !== 'string' && !(typeof id === 'object' && id.__proto__ === SteamID.prototype)) {
+	if(typeof id !== 'string' && !Helpers.isSteamID(id)) {
 		throw new Error("id parameter should be a group URL string or a SteamID object");
 	}
 	
@@ -13,11 +14,8 @@ SteamCommunity.prototype.getSteamGroup = function(id, callback) {
 	
 	var self = this;
 	this.httpRequest("https://steamcommunity.com/" + (typeof id === 'string' ? "groups/" + id : "gid/" + id.toString()) + "/memberslistxml/?xml=1", function(err, response, body) {
-		if(self._checkHttpError(err, response, callback)) {
-			return;
-		}
-		
-		if(self._checkCommunityError(body, callback)) {
+		if (err) {
+			callback(err);
 			return;
 		}
 		
@@ -29,7 +27,7 @@ SteamCommunity.prototype.getSteamGroup = function(id, callback) {
 			
 			callback(null, new CSteamGroup(self, result.memberList));
 		});
-	});
+	}, "steamcommunity");
 };
 
 function CSteamGroup(community, groupData) {

classes/CSteamUser.js

@@ -1,9 +1,10 @@
 var SteamCommunity = require('../index.js');
+var Helpers = require('../components/helpers.js');
 var SteamID = require('steamid');
 var xml2js = require('xml2js');
 
 SteamCommunity.prototype.getSteamUser = function(id, callback) {
-	if(typeof id !== 'string' && !(typeof id === 'object' && id.__proto__ === SteamID.prototype)) {
+	if(typeof id !== 'string' && !Helpers.isSteamID(id)) {
 		throw new Error("id parameter should be a user URL string or a SteamID object");
 	}
 	
@@ -13,11 +14,8 @@ SteamCommunity.prototype.getSteamUser = function(id, callback) {
 	
 	var self = this;
 	this.httpRequest("http://steamcommunity.com/" + (typeof id === 'string' ? "id/" + id : "profiles/" + id.toString()) + "/?xml=1", function(err, response, body) {
-		if(self._checkHttpError(err, response, callback)) {
-			return;
-		}
-		
-		if(self._checkCommunityError(body, callback)) {
+		if (err) {
+			callback(err);
 			return;
 		}
 		
@@ -48,7 +46,7 @@ SteamCommunity.prototype.getSteamUser = function(id, callback) {
 			
 			callback(null, new CSteamUser(self, result.profile, customurl));
 		});
-	});
+	}, "steamcommunity");
 };
 
 function CSteamUser(community, userData, customurl) {

components/chat.js

@@ -82,7 +82,7 @@ SteamCommunity.prototype.chatLogon = function(interval, uiMode) {
 			self.chatState = SteamCommunity.ChatState.LoggedOn;
 			self.emit('chatLoggedOn');
 			self._chatPoll();
-		});
+		}, "steamcommunity");
 	});
 };
 
@@ -118,7 +118,8 @@ SteamCommunity.prototype.chatMessage = function(recipient, text, type, callback)
 			return;
 		}
 		
-		if(self._checkHttpError(err, response, callback)) {
+		if (err) {
+			callback(err);
 			return;
 		}
 		
@@ -127,7 +128,7 @@ SteamCommunity.prototype.chatMessage = function(recipient, text, type, callback)
 		} else {
 			callback(null);
 		}
-	});
+	}, "steamcommunity");
 };
 
 SteamCommunity.prototype.chatLogoff = function() {
@@ -149,7 +150,7 @@ SteamCommunity.prototype.chatLogoff = function() {
 			delete self.chatFriends;
 			self.chatState = SteamCommunity.ChatState.Offline;
 		}
-	});
+	}, "steamcommunity");
 };
 
 SteamCommunity.prototype._chatPoll = function() {
@@ -211,7 +212,7 @@ SteamCommunity.prototype._chatPoll = function() {
 					self.emit('debug', 'Unhandled chat message type: ' + message.type);
 			}
 		});
-	});
+	}, "steamcommunity");
 };
 
 SteamCommunity.prototype._chatUpdatePersona = function(steamID) {
@@ -242,5 +243,5 @@ SteamCommunity.prototype._chatUpdatePersona = function(steamID) {
 
 		self.emit('chatPersonaState', steamID, persona);
 		self.chatFriends[steamID.getSteamID64()] = persona;
-	});
+	}, "steamcommunity");
 };

components/confirmations.js

@@ -16,6 +16,11 @@ SteamCommunity.prototype.getConfirmations = function(time, key, callback) {
 
 	request(this, "conf", key, time, "conf", null, false, function(err, body) {
 		if(err) {
+			if (err.message == "Invalid protocol: steammobile:") {
+				err.message = "Not Logged In";
+				self._notifySessionExpired(err);
+			}
+
 			callback(err);
 			return;
 		}
@@ -153,12 +158,13 @@ function request(community, url, key, time, tag, params, json, callback) {
 		"qs": params,
 		"json": !!json
 	}, function(err, response, body) {
-		if(community._checkHttpError(err, response, callback)) {
+		if (err) {
+			callback(err);
 			return;
 		}
 
 		callback(null, body);
-	});
+	}, "steamcommunity");
 }
 
 // Confirmation checker

components/groups.js

@@ -39,7 +39,8 @@ SteamCommunity.prototype.getGroupMembers = function(gid, callback, members, link
 
 	var self = this;
 	this.httpRequest(options, function(err, response, body) {
-		if (self._checkHttpError(err, response, callback)) {
+		if (err) {
+			callback(err);
 			return;
 		}
 
@@ -60,7 +61,7 @@ SteamCommunity.prototype.getGroupMembers = function(gid, callback, members, link
 				callback(null, members);
 			}
 		});
-	});
+	}, "steamcommunity");
 };
 
 SteamCommunity.prototype.getGroupMembersEx = function(gid, addresses, callback) {
@@ -84,17 +85,8 @@ SteamCommunity.prototype.joinGroup = function(gid, callback) {
 			return;
 		}
 
-		if(err || response.statusCode >= 400) {
-			callback(err || new Error("HTTP error " + response.statusCode));
-			return;
-		}
-
-		if(self._checkCommunityError(body, callback)) {
-			return;
-		}
-
-		callback(null);
-	});
+		callback(err || null);
+	}, "steamcommunity");
 };
 
 SteamCommunity.prototype.leaveGroup = function(gid, callback) {
@@ -112,16 +104,7 @@ SteamCommunity.prototype.leaveGroup = function(gid, callback) {
 			return;
 		}
 
-		if(err || response.statusCode >= 400) {
-			callback(err || new Error("HTTP error " + response.statusCode));
-			return;
-		}
-
-		if(self._checkCommunityError(body, callback)) {
-			return;
-		}
-
-		callback(null);
+		callback(err || null);
 	});
 };
 
@@ -139,12 +122,8 @@ SteamCommunity.prototype.getAllGroupAnnouncements = function(gid, time, callback
 	this.httpRequest({
 		"uri": "https://steamcommunity.com/gid/" + gid.getSteamID64() + "/rss/" 
 	}, function(err, response, body) {
-
-		if(self._checkHttpError(err, response, callback)) {
-			return;
-		}
-
-		if(self._checkCommunityError(body, callback)) {
+		if (err) {
+			callback(err);
 			return;
 		}
 
@@ -172,7 +151,7 @@ SteamCommunity.prototype.getAllGroupAnnouncements = function(gid, time, callback
 
 			return callback(null, announcements);
 		});
-	});
+	}, "steamcommunity");
 }
 
 SteamCommunity.prototype.postGroupAnnouncement = function(gid, headline, content, callback) {
@@ -196,16 +175,8 @@ SteamCommunity.prototype.postGroupAnnouncement = function(gid, headline, content
 			return;
 		}
 
-		if(self._checkHttpError(err, response, callback)) {
-			return;
-		}
-
-		if(self._checkCommunityError(body, callback)) {
-			return;
-		}
-
-		callback(null);
-	})
+		callback(err || null);
+	}, "steamcommunity");
 };
 
 SteamCommunity.prototype.editGroupAnnouncement = function(gid, aid, headline, content, callback) {
@@ -227,23 +198,15 @@ SteamCommunity.prototype.editGroupAnnouncement = function(gid, aid, headline, co
 			"languages[0][body]": content,
 			"languages[0][updated]": 1
 		}
-	}
+	};
 
 	this.httpRequestPost(submitData, function(err, response, body) {
 		if(!callback) {
 			return;
 		}
 
-		if(self._checkHttpError(err, response, callback)) {
-			return;
-		}
-
-		if(self._checkCommunityError(body, callback)) {
-			return;
-		}
-
-		callback(null);
-	})
+		callback(err || null);
+	}, "steamcommunity");
 };
 
 SteamCommunity.prototype.deleteGroupAnnouncement = function(gid, aid, callback) {
@@ -254,24 +217,16 @@ SteamCommunity.prototype.deleteGroupAnnouncement = function(gid, aid, callback)
 	var self = this;
 
 	var submitData = {
-		"uri": "https://steamcommunity.com/gid/" + gid.getSteamID64() + "/announcements/delete/" + aid + "?sessionID=" + this.getSessionID(),
-	}
+		"uri": "https://steamcommunity.com/gid/" + gid.getSteamID64() + "/announcements/delete/" + aid + "?sessionID=" + this.getSessionID()
+	};
 
 	this.httpRequestGet(submitData, function(err, response, body) {
 		if(!callback) {
 			return;
 		}
 
-		if(self._checkHttpError(err, response, callback)) {
-			return;
-		}
-
-		if(self._checkCommunityError(body, callback)) {
-			return;
-		}
-
-		callback(null);
-	})
+		callback(err || null);
+	}, "steamcommunity");
 };
 
 SteamCommunity.prototype.scheduleGroupEvent = function(gid, name, type, description, time, server, callback) {
@@ -327,17 +282,8 @@ SteamCommunity.prototype.scheduleGroupEvent = function(gid, name, type, descript
 			return;
 		}
 
-		if(err || response.statusCode >= 400) {
-			callback(err || new Error("HTTP error " + response.statusCode));
-			return;
-		}
-
-		if(self._checkCommunityError(body, callback)) {
-			return;
-		}
-
-		callback(null);
-	});
+		callback(err || null);
+	}, "steamcommunity");
 };
 
 SteamCommunity.prototype.setGroupPlayerOfTheWeek = function(gid, steamID, callback) {
@@ -380,7 +326,7 @@ SteamCommunity.prototype.setGroupPlayerOfTheWeek = function(gid, steamID, callba
 				callback(new Error(results.response.results[0]));
 			}
 		});
-	});
+	}, "steamcommunity");
 };
 
 SteamCommunity.prototype.kickGroupMember = function(gid, steamID, callback) {
@@ -406,17 +352,8 @@ SteamCommunity.prototype.kickGroupMember = function(gid, steamID, callback) {
 			return;
 		}
 
-		if(err || response.statusCode >= 400) {
-			callback(err || new Error("HTTP error " + response.statusCode));
-			return;
-		}
-
-		if(self._checkCommunityError(body, callback)) {
-			return;
-		}
-
-		callback(null);
-	});
+		callback(err || null);
+	}, "steamcommunity");
 };
 
 SteamCommunity.prototype.getGroupHistory = function(gid, page, callback) {
@@ -431,11 +368,8 @@ SteamCommunity.prototype.getGroupHistory = function(gid, page, callback) {
 
 	var self = this;
 	this.httpRequest("https://steamcommunity.com/gid/" + gid.getSteamID64() + "/history?p=" + page, function(err, response, body) {
-		if(self._checkHttpError(err, response, callback)) {
-			return;
-		}
-
-		if(self._checkCommunityError(body, callback)) {
+		if (err) {
+			callback(err);
 			return;
 		}
 
@@ -499,5 +433,5 @@ SteamCommunity.prototype.getGroupHistory = function(gid, page, callback) {
 		});
 
 		callback(null, output);
-	});
+	}, "steamcommunity");
 };

components/helpers.js

@@ -0,0 +1,13 @@
+exports.isSteamID = function(input) {
+	var keys = Object.keys(input);
+	if (keys.length != 4) {
+		return false;
+	}
+
+	// Make sure it has the keys we expect
+	keys = keys.filter(function(item) {
+		return ['universe', 'type', 'instance', 'accountid'].indexOf(item) != -1;
+	});
+
+	return keys.length == 4;
+};

components/http.js

@@ -1,10 +1,15 @@
 var SteamCommunity = require('../index.js');
 
-SteamCommunity.prototype.httpRequest = function(uri, options, callback, method) {
+SteamCommunity.prototype.httpRequest = function(uri, options, callback, source) {
 	if (typeof uri === 'object') {
+		source = callback;
 		callback = options;
 		options = uri;
 		uri = options.url || options.uri;
+	} else if (typeof options === 'function') {
+		source = callback;
+		callback = options;
+		options = {};
 	}
 
 	options.url = options.uri = uri;
@@ -14,30 +19,50 @@ SteamCommunity.prototype.httpRequest = function(uri, options, callback, method)
 		delete this._httpRequestConvenienceMethod;
 	}
 
-	if (this.onPreHttpRequest && this.onPreHttpRequest(options, callback) === false) {
-		return false;
-	}
+	var requestID = ++this._httpRequestID;
+	source = source || "";
 
 	var self = this;
-	this.request(options, function(err, response, body) {
-		var hasCallback = !!callback;
-		var httpError = options.checkHttpError !== false && self._checkHttpError(err, response, callback);
-		var communityError = !options.json && options.checkCommunityError !== false && self._checkCommunityError(body, httpError ? function() {} : callback); // don't fire the callback if hasHttpError did it already
-		var tradeError = !options.json && options.checkTradeError !== false && self._checkTradeError(body, httpError || communityError ? function() {} : callback); // don't fire the callback if either of the previous already did
+	var continued = false;
 
-		self.emit('postHttpRequest', httpError || communityError || tradeError || null, response, body, {
-			"hasCallback": hasCallback,
-			"httpError": httpError,
-			"communityError": communityError,
-			"tradeError": tradeError
-		});
+	if (!this.onPreHttpRequest || !this.onPreHttpRequest(requestID, source, options, continueRequest)) {
+		// No pre-hook, or the pre-hook doesn't want to delay the request.
+		continueRequest(null);
+	}
 
-		if (hasCallback && !(httpError || communityError || tradeError)) {
-			callback.apply(self, arguments);
+	function continueRequest(err) {
+		if (continued) {
+			return;
 		}
-	});
 
-	return true;
+		continued = true;
+
+		if (err) {
+			if (callback) {
+				callback(err);
+			}
+
+			return;
+		}
+
+		self.request(options, function (err, response, body) {
+			var hasCallback = !!callback;
+			var httpError = options.checkHttpError !== false && self._checkHttpError(err, response, callback);
+			var communityError = !options.json && options.checkCommunityError !== false && self._checkCommunityError(body, httpError ? function () {} : callback); // don't fire the callback if hasHttpError did it already
+			var tradeError = !options.json && options.checkTradeError !== false && self._checkTradeError(body, httpError || communityError ? function () {} : callback); // don't fire the callback if either of the previous already did
+
+			self.emit('postHttpRequest', requestID, source, options, httpError || communityError || tradeError || null, response, body, {
+				"hasCallback": hasCallback,
+				"httpError": httpError,
+				"communityError": communityError,
+				"tradeError": tradeError
+			});
+
+			if(hasCallback && !(httpError || communityError || tradeError)) {
+				callback.apply(self, arguments);
+			}
+		});
+	}
 };
 
 SteamCommunity.prototype.httpRequestGet = function() {
@@ -50,6 +75,10 @@ SteamCommunity.prototype.httpRequestPost = function() {
 	return this.httpRequest.apply(this, arguments);
 };
 
+SteamCommunity.prototype._notifySessionExpired = function(err) {
+	this.emit('sessionExpired', err);
+};
+
 SteamCommunity.prototype._checkHttpError = function(err, response, callback) {
 	if(err) {
 		callback(err);
@@ -59,6 +88,7 @@ SteamCommunity.prototype._checkHttpError = function(err, response, callback) {
 	if(response.statusCode >= 300 && response.statusCode <= 399 && response.headers.location.indexOf('/login') != -1) {
 		err = new Error("Not Logged In");
 		callback(err);
+		this._notifySessionExpired(err);
 		return err;
 	}
 
@@ -73,17 +103,30 @@ SteamCommunity.prototype._checkHttpError = function(err, response, callback) {
 };
 
 SteamCommunity.prototype._checkCommunityError = function(html, callback) {
-	if(html.match(/<h1>Sorry!<\/h1>/)) {
+	var err;
+
+	if(typeof html === 'string' && html.match(/<h1>Sorry!<\/h1>/)) {
 		var match = html.match(/<h3>(.+)<\/h3>/);
-		var err = new Error(match ? match[1] : "Unknown error occurred");
+		err = new Error(match ? match[1] : "Unknown error occurred");
 		callback(err);
 		return err;
 	}
 
+	if (typeof html === 'string' && html.match(/g_steamID = false;/) && html.match(/<h1>Sign In<\/h1>/)) {
+		err = new Error("Not Logged In");
+		callback(err);
+		this._notifySessionExpired(err);
+		return err;
+	}
+
 	return false;
 };
 
 SteamCommunity.prototype._checkTradeError = function(html, callback) {
+	if (typeof html !== 'string') {
+		return false;
+	}
+
 	var match = html.match(/<div id="error_msg">\s*([^<]+)\s*<\/div>/);
 	if (match) {
 		var err = new Error(match[1].trim());

components/inventoryhistory.js

@@ -122,7 +122,7 @@ SteamCommunity.prototype.getInventoryHistory = function(options, callback) {
 		} else {
 			callback(null, output);
 		}
-	});
+	}, "steamcommunity");
 };
 
 function resolveVanityURL(vanityURL, callback) {

components/market.js

@@ -4,9 +4,11 @@ var Cheerio = require('cheerio');
 SteamCommunity.prototype.getMarketApps = function(callback) {
 	var self = this;
 	this.httpRequest('https://steamcommunity.com/market/', function (err, response, body) {
-		if(self._checkHttpError(err, response, callback)) {
+		if (err) {
+			callback(err);
 			return;
 		}
+
 		var $ = Cheerio.load(body);
 		if ($('.market_search_game_button_group')) {
 			apps = {};
@@ -21,5 +23,5 @@ SteamCommunity.prototype.getMarketApps = function(callback) {
 		} else {
 			callback(new Error("Malformed response"));
 		}
-	});
-}
+	}, "steamcommunity");
+};

components/profile.js

@@ -237,7 +237,7 @@ SteamCommunity.prototype.uploadAvatar = function(image, format, callback) {
 			}
 
 			doUpload(body);
-		})
+		}, "steamcommunity");
 	} else {
 		if(!format) {
 			format = image.match(/\.([^\.]+)$/);
@@ -354,6 +354,6 @@ SteamCommunity.prototype.uploadAvatar = function(image, format, callback) {
 			if(callback) {
 				callback(null, body.images.full);
 			}
-		});
+		}, "steamcommunity");
 	}
 };

components/twofactor.js

@@ -28,7 +28,8 @@ SteamCommunity.prototype.enableTwoFactor = function(callback) {
 			},
 			"json": true
 		}, function(err, response, body) {
-			if(self._checkHttpError(err, response, callback)) {
+			if (err) {
+				callback(err);
 				return;
 			}
 
@@ -45,7 +46,7 @@ SteamCommunity.prototype.enableTwoFactor = function(callback) {
 			}
 
 			callback(null, body.response);
-		});
+		}, "steamcommunity");
 	});
 };
 
@@ -60,7 +61,15 @@ SteamCommunity.prototype.finalizeTwoFactor = function(secret, activationCode, ca
 			return;
 		}
 
-		finalize(token);
+		SteamTotp.getTimeOffset(function(err, offset, latency) {
+			if (err) {
+				callback(err);
+				return;
+			}
+
+			diff = offset;
+			finalize(token);
+		});
 	});
 
 	function finalize(token) {
@@ -77,7 +86,8 @@ SteamCommunity.prototype.finalizeTwoFactor = function(secret, activationCode, ca
 			},
 			"json": true
 		}, function(err, response, body) {
-			if(self._checkHttpError(err, response, callback)) {
+			if (err) {
+				callback(err);
 				return;
 			}
 
@@ -104,7 +114,7 @@ SteamCommunity.prototype.finalizeTwoFactor = function(secret, activationCode, ca
 			} else {
 				callback(null);
 			}
-		});
+		}, "steamcommunity");
 	}
 };
 
@@ -127,7 +137,8 @@ SteamCommunity.prototype.disableTwoFactor = function(revocationCode, callback) {
 			},
 			"json": true
 		}, function(err, response, body) {
-			if(self._checkHttpError(err, response, callback)) {
+			if (err) {
+				callback(err);
 				return;
 			}
 
@@ -141,14 +152,8 @@ SteamCommunity.prototype.disableTwoFactor = function(revocationCode, callback) {
 				return;
 			}
 
-			if(body.response.status == 1) {
-				callback(null);
-				return;
-			}
-
-			var error = new Error("Cannot remove authenticator (" + body.response.status + ")");
-			error.eresult = body.response.status;
-			callback(error);
-		});
+			// success = true means it worked
+			callback(null);
+		}, "steamcommunity");
 	});
 };

components/users.js

@@ -21,7 +21,8 @@ SteamCommunity.prototype.addFriend = function(userID, callback) {
 			return;
 		}
 
-		if(self._checkHttpError(err, response, callback)) {
+		if (err) {
+			callback(err);
 			return;
 		}
 
@@ -30,7 +31,7 @@ SteamCommunity.prototype.addFriend = function(userID, callback) {
 		} else {
 			callback(new Error("Unknown error"));
 		}
-	});
+	}, "steamcommunity");
 };
 
 SteamCommunity.prototype.acceptFriendRequest = function(userID, callback) {
@@ -51,12 +52,8 @@ SteamCommunity.prototype.acceptFriendRequest = function(userID, callback) {
 			return;
 		}
 
-		if(self._checkHttpError(err, response, callback)) {
-			return;
-		}
-
-		callback(null);
-	});
+		callback(err || null);
+	}, "steamcommunity");
 };
 
 SteamCommunity.prototype.removeFriend = function(userID, callback) {
@@ -76,12 +73,8 @@ SteamCommunity.prototype.removeFriend = function(userID, callback) {
 			return;
 		}
 
-		if(self._checkHttpError(err, response, callback)) {
-			return;
-		}
-
-		callback(null);
-	});
+		callback(err || null);
+	}, "steamcommunity");
 };
 
 SteamCommunity.prototype.blockCommunication = function(userID, callback) {
@@ -101,12 +94,8 @@ SteamCommunity.prototype.blockCommunication = function(userID, callback) {
 			return;
 		}
 
-		if(self._checkHttpError(err, response, callback)) {
-			return;
-		}
-
-		callback(null);
-	});
+		callback(err || null);
+	}, "steamcommunity");
 };
 
 SteamCommunity.prototype.unblockCommunication = function(userID, callback) {
@@ -150,7 +139,8 @@ SteamCommunity.prototype.postUserComment = function(userID, message, callback) {
 			return;
 		}
 
-		if(self._checkHttpError(err, response, callback)) {
+		if (err) {
+			callback(err);
 			return;
 		}
 
@@ -161,7 +151,7 @@ SteamCommunity.prototype.postUserComment = function(userID, message, callback) {
 		} else {
 			callback(new Error("Unknown error"));
 		}
-	});
+	}, "steamcommunity");
 };
 
 SteamCommunity.prototype.inviteUserToGroup = function(userID, groupID, callback) {
@@ -185,7 +175,8 @@ SteamCommunity.prototype.inviteUserToGroup = function(userID, groupID, callback)
 			return;
 		}
 
-		if(self._checkHttpError(err, response, callback)) {
+		if (err) {
+			callback(err);
 			return;
 		}
 
@@ -196,7 +187,7 @@ SteamCommunity.prototype.inviteUserToGroup = function(userID, groupID, callback)
 		} else {
 			callback(new Error("Unknown error"));
 		}
-	});
+	}, "steamcommunity");
 };
 
 SteamCommunity.prototype.getUserInventoryContexts = function(userID, callback) {
@@ -216,7 +207,8 @@ SteamCommunity.prototype.getUserInventoryContexts = function(userID, callback) {
 
 	var self = this;
 	this.httpRequest("https://steamcommunity.com/profiles/" + userID.getSteamID64() + "/inventory/", function(err, response, body) {
-		if(self._checkHttpError(err, response, callback)) {
+		if (err) {
+			callback(err);
 			return;
 		}
 
@@ -235,7 +227,7 @@ SteamCommunity.prototype.getUserInventoryContexts = function(userID, callback) {
 		}
 
 		callback(null, data);
-	});
+	}, "steamcommunity");
 };
 
 SteamCommunity.prototype.getUserInventory = function(userID, appID, contextID, tradableOnly, callback) {
@@ -257,7 +249,8 @@ SteamCommunity.prototype.getUserInventory = function(userID, appID, contextID, t
 			},
 			"json": true
 		}, function(err, response, body) {
-			if(self._checkHttpError(err, response, callback)) {
+			if (err) {
+				callback(err);
 				return;
 			}
 
@@ -298,6 +291,6 @@ SteamCommunity.prototype.getUserInventory = function(userID, appID, contextID, t
 			} else {
 				callback(null, inventory, currency);
 			}
-		});
+		}, "steamcommunity");
 	}
 };

components/webapi.js

@@ -6,7 +6,8 @@ SteamCommunity.prototype.getWebApiKey = function(domain, callback) {
 		"uri": "https://steamcommunity.com/dev/apikey",
 		"followRedirect": false
 	}, function(err, response, body) {
-		if(self._checkHttpError(err, response, callback)) {
+		if (err) {
+			callback(err);
 			return;
 		}
 
@@ -28,14 +29,15 @@ SteamCommunity.prototype.getWebApiKey = function(domain, callback) {
 					"Submit": "Register"
 				}
 			}, function(err, response, body) {
-				if(self._checkHttpError(err, response, callback)) {
+				if (err) {
+					callback(err);
 					return;
 				}
 
 				self.getWebApiKey(domain, callback);
-			});
+			}, "steamcommunity");
 		}
-	});
+	}, "steamcommunity");
 };
 
 SteamCommunity.prototype.getWebApiOauthToken = function(callback) {
@@ -47,11 +49,8 @@ SteamCommunity.prototype.getWebApiOauthToken = function(callback) {
 
 	// Pull an oauth token from the webchat UI
 	this.httpRequest("https://steamcommunity.com/chat", function(err, response, body) {
-		if(self._checkHttpError(err, response, callback)) {
-			return;
-		}
-
-		if(self._checkCommunityError(body, callback)) {
+		if (err) {
+			callback(err);
 			return;
 		}
 
@@ -62,5 +61,5 @@ SteamCommunity.prototype.getWebApiOauthToken = function(callback) {
 		}
 
 		callback(null, match[1]);
-	});
+	}, "steamcommunity");
 };

examples/disable_twofactor.js

@@ -0,0 +1,61 @@
+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) {
+		rl.question("Two-Factor Auth Code: ", function(authCode) {
+			rl.question("Revocation Code: R", function(rCode) {
+				doLogin(accountName, password, authCode, "", rCode);
+			});
+		});
+	});
+});
+
+function doLogin(accountName, password, authCode, captcha, rCode) {
+	community.login({
+		"accountName": accountName,
+		"password": password,
+		"twoFactorCode": authCode,
+		"captcha": captcha
+	}, function(err, sessionID, cookies, steamguard) {
+		if(err) {
+			if(err.message == 'SteamGuard') {
+				console.log("This account does not have two-factor authentication enabled.");
+				process.exit();
+				return;
+			}
+
+			if(err.message == 'CAPTCHA') {
+				console.log(err.captchaurl);
+				rl.question("CAPTCHA: ", function(captchaInput) {
+					doLogin(accountName, password, authCode, captchaInput);
+				});
+
+				return;
+			}
+
+			console.log(err);
+			process.exit();
+			return;
+		}
+
+		console.log("Logged on!");
+		community.disableTwoFactor("R" + rCode, function(err) {
+			if(err) {
+				console.log(err);
+				process.exit();
+				return;
+			}
+
+			console.log("Two-factor authentication disabled!");
+			process.exit();
+		});
+	});
+}

examples/edit-group-announcement.js

@@ -14,12 +14,13 @@ rl.question("Username: ", function(accountName) {
 	});
 });
 
-function doLogin(accountName, password, authCode, twoFactorCode) {
+function doLogin(accountName, password, authCode, twoFactorCode, captcha) {
 	community.login({
 		"accountName": accountName,
 		"password": password,
 		"authCode": authCode,
-		"twoFactorCode": twoFactorCode
+		"twoFactorCode": twoFactorCode,
+		"captcha": captcha
 	}, function(err, sessionID, cookies, steamguard) {
 		if(err) {
 			if(err.message == 'SteamGuardMobile') {
@@ -39,6 +40,15 @@ function doLogin(accountName, password, authCode, twoFactorCode) {
 				return;
 			}
 
+			if(err.message == 'CAPTCHA') {
+				console.log(err.captchaurl);
+				rl.question("CAPTCHA: ", function(captchaInput) {
+					doLogin(accountName, password, authCode, twoFactorCode, captchaInput);
+				});
+
+				return;
+			}
+
 			console.log(err);
 			process.exit();
 			return;

examples/enable_twofactor.js

@@ -14,11 +14,12 @@ rl.question("Username: ", function(accountName) {
 	});
 });
 
-function doLogin(accountName, password, authCode) {
+function doLogin(accountName, password, authCode, captcha) {
 	community.login({
 		"accountName": accountName,
 		"password": password,
-		"authCode": authCode
+		"authCode": authCode,
+		"captcha": captcha
 	}, function(err, sessionID, cookies, steamguard) {
 		if(err) {
 			if(err.message == 'SteamGuardMobile') {
@@ -29,13 +30,22 @@ function doLogin(accountName, password, authCode) {
 
 			if(err.message == 'SteamGuard') {
 				console.log("An email has been sent to your address at " + err.emaildomain);
-				rl.question("Steam Guard Code: ", function(code) {
+				rl.question("Steam Guard Code: ", function (code) {
 					doLogin(accountName, password, code);
 				});
 
 				return;
 			}
 
+			if(err.message == 'CAPTCHA') {
+				console.log(err.captchaurl);
+				rl.question("CAPTCHA: ", function(captchaInput) {
+					doLogin(accountName, password, authCode, captchaInput);
+				});
+
+				return;
+			}
+
 			console.log(err);
 			process.exit();
 			return;

index.js

@@ -16,6 +16,7 @@ function SteamCommunity(options) {
 
 	this._jar = Request.jar();
 	this._captchaGid = -1;
+	this._httpRequestID = 0;
 	this.chatState = SteamCommunity.ChatState.Offline;
 
 	var defaults = {
@@ -73,8 +74,9 @@ SteamCommunity.prototype.login = function(details, callback) {
 		"json": true
 	}, function(err, response, body) {
 		// Remove the mobile cookies
-		if (self._checkHttpError(err, response, callback)) {
+		if (err) {
 			deleteMobileCookies();
+			callback(err);
 			return;
 		}
 
@@ -109,7 +111,8 @@ SteamCommunity.prototype.login = function(details, callback) {
 		}, function(err, response, body) {
 			deleteMobileCookies();
 
-			if(self._checkHttpError(err, response, callback)) {
+			if (err) {
+				callback(err);
 				return;
 			}
 
@@ -156,8 +159,8 @@ SteamCommunity.prototype.login = function(details, callback) {
 				
 				callback(null, sessionID, cookies, steamguard, oAuth.oauth_token);
 			}
-		});
-	});
+		}, "steamcommunity");
+	}, "steamcommunity");
 
 	function deleteMobileCookies() {
 		var cookie = Request.cookie('mobileClientVersion=');
@@ -182,7 +185,8 @@ SteamCommunity.prototype.oAuthLogin = function(steamguard, token, callback) {
 		},
 		"json": true
 	}, function(err, response, body) {
-		if(self._checkHttpError(err, response, callback)) {
+		if (err) {
+			callback(err);
 			return;
 		}
 
@@ -200,7 +204,7 @@ SteamCommunity.prototype.oAuthLogin = function(steamguard, token, callback) {
 
 		self.setCookies(cookies);
 		callback(null, self.getSessionID(), cookies);
-	});
+	}, "steamcommunity");
 };
 
 SteamCommunity.prototype.setCookies = function(cookies) {
@@ -246,26 +250,30 @@ SteamCommunity.prototype.parentalUnlock = function(pin, callback) {
 			return;
 		}
 		
-		if(self._checkHttpError(err, response, callback)) {
+		if (err) {
+			callback(err);
 			return;
 		}
 		
 		if(!body || typeof body.success !== 'boolean') {
-			return callback("Invalid response");
+			callback("Invalid response");
+			return;
 		}
 		
 		if(!body.success) {
-			return callback("Incorrect PIN");
+			callback("Incorrect PIN");
+			return;
 		}
 		
 		callback();
-	}.bind(this));
+	}.bind(this), "steamcommunity");
 };
 
 SteamCommunity.prototype.getNotifications = function(callback) {
 	var self = this;
 	this.httpRequestGet("https://steamcommunity.com/actions/RefreshNotificationArea", function(err, response, body) {
-		if(self._checkHttpError(err, response, callback)) {
+		if (err) {
+			callback(err);
 			return;
 		}
 		
@@ -295,7 +303,7 @@ SteamCommunity.prototype.getNotifications = function(callback) {
 		}
 		
 		callback(null, notifications);
-	});
+	}, "steamcommunity");
 };
 
 SteamCommunity.prototype.resetItemNotifications = function(callback) {
@@ -304,17 +312,17 @@ SteamCommunity.prototype.resetItemNotifications = function(callback) {
 		if(!callback) {
 			return;
 		}
-		
-		if(self._checkHttpError(err, response, callback)) {
-			return;
-		}
-		
-		callback(null);
-	});
+
+		callback(err || null);
+	}, "steamcommunity");
 };
 
 SteamCommunity.prototype.loggedIn = function(callback) {
-	this.httpRequest("https://steamcommunity.com/my", {"followRedirect": false}, function(err, response, body) {
+	this.httpRequestGet({
+		"uri": "https://steamcommunity.com/my",
+		"followRedirect": false,
+		"checkHttpError": false
+	}, function(err, response, body) {
 		if(err || (response.statusCode != 302 && response.statusCode != 403)) {
 			callback(err || new Error("HTTP error " + response.statusCode));
 			return;
@@ -326,7 +334,7 @@ SteamCommunity.prototype.loggedIn = function(callback) {
 		}
 		
 		callback(null, !!response.headers.location.match(/steamcommunity\.com(\/(id|profiles)\/[^\/]+)\/?/), false);
-	});
+	}, "steamcommunity");
 };
 
 SteamCommunity.prototype._myProfile = function(endpoint, form, callback) {
@@ -344,7 +352,7 @@ SteamCommunity.prototype._myProfile = function(endpoint, form, callback) {
 		}
 
 		var options = {
-			"uri": "https://steamcommunity.com" + mtch[1] + "/" + endpoint,
+			"uri": "https://steamcommunity.com" + match[1] + "/" + endpoint,
 			"method": "GET"
 		};
 
@@ -353,8 +361,8 @@ SteamCommunity.prototype._myProfile = function(endpoint, form, callback) {
 			options.form = form;
 		}
 
-		self.httpRequest(options, callback);
-	});
+		self.httpRequest(options, callback, "steamcommunity");
+	}, "steamcommunity");
 };
 
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "steamcommunity",
-	"version": "3.19.0-beta1",
+	"version": "3.19.6",
 	"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",
@@ -15,9 +15,9 @@
 	"dependencies": {
 		"request": "^2.61.0",
 		"node-bignumber": "^1.2.1",
-		"steamid": "^0.3.1",
+		"steamid": "^1.0.0",
 		"xml2js": "^0.4.11",
-		"cheerio": "^0.19.0",
+		"cheerio": "0.19.0",
 		"async": "^1.4.2",
 		"steam-totp": "^1.3.0"
 	},