3.19.2

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/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");
 	}
 	

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");
 	}
 	

components/confirmations.js

@@ -16,7 +16,12 @@ 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";
+			}
+
 			callback(err);
+			self._notifySessionExpired(err);
 			return;
 		}
 

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

@@ -22,30 +22,47 @@ SteamCommunity.prototype.httpRequest = function(uri, options, callback, source)
 	var requestID = ++this._httpRequestID;
 	source = source || "";
 
-	if (this.onPreHttpRequest && this.onPreHttpRequest(requestID, source, options, callback) === false) {
-		return false;
+	var self = this;
+	var continued = false;
+
+	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);
 	}
 
-	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
-
-		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);
+	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() {
@@ -58,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);
@@ -67,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;
 	}
 
@@ -81,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());

index.js

@@ -318,7 +318,11 @@ SteamCommunity.prototype.resetItemNotifications = function(callback) {
 };
 
 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;
@@ -348,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"
 		};
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "steamcommunity",
-	"version": "3.19.0-beta3",
+	"version": "3.19.2",
 	"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",
@@ -17,7 +17,7 @@
 		"node-bignumber": "^1.2.1",
 		"steamid": "^0.3.1",
 		"xml2js": "^0.4.11",
-		"cheerio": "^0.19.0",
+		"cheerio": "^0.20.0",
 		"async": "^1.4.2",
 		"steam-totp": "^1.3.0"
 	},