3.30.7

Check if instance is logged in before comparing steamids (fixes #164)

classes/CSteamUser.js

@@ -108,6 +108,8 @@ function CSteamUser(community, userData, customurl) {
 CSteamUser.getAvatarURL = function(hash, size, protocol) {
 	size = size || '';
 	protocol = protocol || 'http://';
+
+	hash = hash || "72f78b4c8cc1f62323f8a33f6d53e27db57c2252"; // The default "?" avatar
 	
 	var url = protocol + "steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/" + hash.substring(0, 2) + "/" + hash;
 	if(size == 'full' || size == 'medium') {

components/http.js

@@ -98,7 +98,7 @@ SteamCommunity.prototype._checkHttpError = function(err, response, callback, bod
 		return err;
 	}
 
-	if (response.statusCode == 403 && response.body && response.body.match(/<div id="parental_notice_instructions">Enter your PIN below to exit Family View.<\/div>/)) {
+	if (response.statusCode == 403 && typeof response.body === 'string' && response.body.match(/<div id="parental_notice_instructions">Enter your PIN below to exit Family View.<\/div>/)) {
 		err = new Error("Family View Restricted");
 		callback(err, response, body);
 		return err;

components/inventoryhistory.js

@@ -49,7 +49,7 @@ SteamCommunity.prototype.getInventoryHistory = function(options, callback) {
 
 		var $ = Cheerio.load(body);
 		if (!$('.inventory_history_pagingrow').html()) {
-			callback("Malformed page: no paging row found");
+			callback(new Error("Malformed page: no paging row found"));
 			return;
 		}
 

components/users.js

@@ -218,16 +218,16 @@ SteamCommunity.prototype.getUserAliases = function(userID, callback) {
 };
 
 SteamCommunity.prototype.getUserInventoryContexts = function(userID, callback) {
-	if(typeof userID === 'string') {
+	if (typeof userID === 'string') {
 		userID = new SteamID(userID);
 	}
 
-	if(typeof userID === 'function') {
+	if (typeof userID === 'function') {
 		callback = userID;
 		userID = this.steamID;
 	}
 
-	if(!userID) {
+	if (!userID) {
 		callback(new Error("No SteamID specified and not logged in"));
 		return;
 	}
@@ -240,8 +240,8 @@ SteamCommunity.prototype.getUserInventoryContexts = function(userID, callback) {
 		}
 
 		var match = body.match(/var g_rgAppContextData = ([^\n]+);\r?\n/);
-		if(!match) {
-			callback(new Error("Malformed response"));
+		if (!match) {
+			callback(new Error(body.match(/inventory is currently private\./) ? "Private inventory" : "Malformed response"));
 			return;
 		}
 
@@ -368,7 +368,7 @@ SteamCommunity.prototype.getUserInventoryContents = function(userID, appID, cont
 			if (err) {
 				if (err.message == "HTTP error 403" && body === null) {
 					// 403 with a body of "null" means the inventory/profile is private.
-					if(userID.getSteamID64() == self.steamID.getSteamID64()) {
+					if (self.steamID && userID.getSteamID64() == self.steamID.getSteamID64()) {
 						// We can never get private profile error for our own inventory!
 						self._notifySessionExpired(err);
 					}
@@ -377,10 +377,28 @@ SteamCommunity.prototype.getUserInventoryContents = function(userID, appID, cont
 					return;
 				}
 
+				if (err.message == "HTTP error 500" && body && body.error) {
+					err = new Error(body.error);
+
+					var match = body.error.match(/^(.+) \((\d+)\)$/);
+					if (match) {
+						err.message = match[1];
+						err.eresult = match[2];
+						callback(err);
+						return;
+					}
+				}
+
 				callback(err);
 				return;
 			}
 
+			if (body && body.success && body.total_inventory_count === 0) {
+				// Empty inventory
+				callback(null, [], [], 0);
+				return;
+			}
+
 			if (!body || !body.success || !body.assets || !body.descriptions) {
 				if (body) {
 					// Dunno if the error/Error property even exists on this new endpoint

index.js

@@ -3,7 +3,7 @@ var RSA = require('node-bignumber').Key;
 var hex2b64 = require('node-bignumber').hex2b64;
 var SteamID = require('steamid');
 
-const USER_AGENT = "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36";
+const USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36";
 
 require('util').inherits(SteamCommunity, require('events').EventEmitter);
 
@@ -45,7 +45,7 @@ function SteamCommunity(options) {
 		defaults.localAddress = options.localAddress;
 	}
 
-	this.request = options.request || Request.defaults();
+	this.request = options.request || Request.defaults({"forever": true}); // "forever" indicates that we want a keep-alive agent
 	this.request = this.request.defaults(defaults);
 
 	// English
@@ -56,7 +56,11 @@ function SteamCommunity(options) {
 }
 
 SteamCommunity.prototype.login = function(details, callback) {
-	if(details.steamguard) {
+	if (!details.accountName || !details.password) {
+		throw new Error("Missing either accountName or password to login; both are needed");
+	}
+
+	if (details.steamguard) {
 		var parts = details.steamguard.split('||');
 		this._setCookie(Request.cookie('steamMachineAuth' + parts[0] + '=' + encodeURIComponent(parts[1])), true);
 	}
@@ -277,13 +281,25 @@ SteamCommunity.prototype.parentalUnlock = function(pin, callback) {
 			return;
 		}
 		
-		if(!body || typeof body.success !== 'boolean') {
+		if (!body || typeof body.success !== 'boolean') {
 			callback("Invalid response");
 			return;
 		}
 		
-		if(!body.success) {
-			callback("Incorrect PIN");
+		if (!body.success) {
+			switch (body.eresult) {
+				case 15:
+					callback("Incorrect PIN");
+					break;
+
+				case 25:
+					callback("Too many invalid PIN attempts");
+					break;
+
+				default:
+					callback("Error " + body.eresult);
+			}
+
 			return;
 		}
 		

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "steamcommunity",
-	"version": "3.30.2",
+	"version": "3.30.7",
 	"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,8 +17,8 @@
 		"node-bignumber": "^1.2.1",
 		"steamid": "^1.0.0",
 		"xml2js": "^0.4.11",
-		"cheerio": "0.19.0",
-		"async": "^1.4.2",
+		"cheerio": "0.22.0",
+		"async": "^2.1.4",
 		"steam-totp": "^1.3.0"
 	},
 	"engines": {