3.31.0

(make david-dm happy)

.npmrc

@@ -0,0 +1 @@
+package-lock=false

README.md

@@ -9,6 +9,8 @@ This module provides an easy interface for the Steam Community website. This mod
 
 It supports Steam Guard and CAPTCHAs.
 
+This reports anonymous usage statistics to the author. [See here](https://github.com/DoctorMcKay/node-stats-reporter) for more information.
+
 **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!**

components/confirmations.js

@@ -243,6 +243,10 @@ SteamCommunity.prototype.acceptAllConfirmations = function(time, confKey, allowK
 };
 
 function request(community, url, key, time, tag, params, json, callback) {
+	if (!community.steamID) {
+		throw new Error("Must be logged in before trying to do anything with confirmations");
+	}
+
 	params = params || {};
 	params.p = SteamTotp.getDeviceID(community.steamID);
 	params.a = community.steamID.getSteamID64();

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;
 		}
 
@@ -340,15 +340,21 @@ SteamCommunity.prototype.getUserInventory = function(userID, appID, contextID, t
  * @param {int} appID - The Steam application ID of the game for which you want an inventory
  * @param {int} contextID - The ID of the "context" within the game you want to retrieve
  * @param {boolean} tradableOnly - true to get only tradable items and currencies
+ * @param {string} [language] - The language of item descriptions to return. Omit for default (which may either be English or your account's chosen language)
  * @param {function} callback
  */
-SteamCommunity.prototype.getUserInventoryContents = function(userID, appID, contextID, tradableOnly, callback) {
+SteamCommunity.prototype.getUserInventoryContents = function(userID, appID, contextID, tradableOnly, language, callback) {
 	var self = this;
 
-	if(typeof userID === 'string') {
+	if (typeof userID === 'string') {
 		userID = new SteamID(userID);
 	}
 
+	if (typeof language === 'function') {
+		callback = language;
+		language = "english";
+	}
+
 	var pos = 1;
 	get([], []);
 
@@ -359,7 +365,7 @@ SteamCommunity.prototype.getUserInventoryContents = function(userID, appID, cont
 				"Referer": "https://steamcommunity.com/profiles/" + userID.getSteamID64() + "/inventory"
 			},
 			"qs": {
-				"l": "english", // Default language
+				"l": language, // Default language
 				"count": 5000, // Max items per 'page'
 				"start_assetid": start
 			},
@@ -368,7 +374,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 +383,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
@@ -413,20 +437,16 @@ SteamCommunity.prototype.getUserInventoryContents = function(userID, appID, cont
 	var quickDescriptionLookup = {};
 
 	function getDescription(descriptions, classID, instanceID) {
-		instanceID = instanceID || '0'; // instanceID can be undefined, in which case it's 0.
-
-		var key = classID + '_' + instanceID;
+		var key = classID + '_' + (instanceID || '0'); // instanceID can be undefined, in which case it's 0.
 
 		if (quickDescriptionLookup[key]) {
 			return quickDescriptionLookup[key];
 		}
 
 		for (var i = 0; i < descriptions.length; i++) {
-			quickDescriptionLookup[key] = descriptions[i];
-
-			if (descriptions[i].classid == classID && descriptions[i].instanceid == instanceID) {
-				return descriptions[i];
-			}
+			quickDescriptionLookup[descriptions[i].classid + '_' + (descriptions[i].instanceid || '0')] = descriptions[i];
 		}
+		
+		return quickDescriptionLookup[key];
 	}
 };

index.js

@@ -1,9 +1,11 @@
+require('@doctormckay/stats-reporter').setup(require('./package.json'));
+
 var Request = require('request');
 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 +47,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
@@ -281,13 +283,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,8 +1,11 @@
 {
 	"name": "steamcommunity",
-	"version": "3.30.3",
+	"version": "3.31.0",
 	"description": "Provides an interface for logging into and interacting with the Steam Community website",
-	"keywords": ["steam", "steam community"],
+	"keywords": [
+		"steam",
+		"steam community"
+	],
 	"homepage": "https://github.com/DoctorMcKay/node-steamcommunity",
 	"bugs": {
 		"url": "https://github.com/DoctorMcKay/node-steamcommunity/issues"
@@ -13,7 +16,8 @@
 		"url": "https://github.com/DoctorMcKay/node-steamcommunity.git"
 	},
 	"dependencies": {
-		"request": "^2.61.0",
+		"@doctormckay/stats-reporter": "^1.0.2",
+		"request": "^2.81.0",
 		"node-bignumber": "^1.2.1",
 		"steamid": "^1.0.0",
 		"xml2js": "^0.4.11",