3.30.2

Check if requested inventory is ours.

classes/CEconItem.js

@@ -1,6 +1,6 @@
 module.exports = CEconItem;
 
-function CEconItem(item, descriptions, contextID) {
+function CEconItem(item, description, contextID) {
 	var thing;
 	for (thing in item) {
 		if (item.hasOwnProperty(thing)) {
@@ -8,7 +8,7 @@ function CEconItem(item, descriptions, contextID) {
 		}
 	}
 
-	var isCurrency = (typeof this.is_currency !== 'undefined') ? (!!this.is_currency) : (typeof this.currencyid !== 'undefined'); // I don't want to put this on the object yet; it's nice to have the ids at the top of printed output
+	var isCurrency = !!(this.is_currency || this.currency) || typeof this.currencyid !== 'undefined'; // I don't want to put this on the object yet; it's nice to have the ids at the top of printed output
 
 	if (isCurrency) {
 		this.currencyid = this.id = (this.id || this.currencyid);
@@ -21,10 +21,15 @@ function CEconItem(item, descriptions, contextID) {
 	this.contextid = this.contextid || contextID.toString();
 
 	// Merge the description
-	if (descriptions) {
-		for (thing in descriptions) {
-			if (descriptions.hasOwnProperty(thing)) {
-				this[thing] = descriptions[thing];
+	if (description) {
+		// Is this a listing of descriptions?
+		if (description[this.classid + '_' + this.instanceid]) {
+			description = description[this.classid + '_' + this.instanceid];
+		}
+
+		for (thing in description) {
+			if (description.hasOwnProperty(thing)) {
+				this[thing] = description[thing];
 			}
 		}
 	}
@@ -41,6 +46,31 @@ function CEconItem(item, descriptions, contextID) {
 	if (this.owner && JSON.stringify(this.owner) == '{}') {
 		this.owner = null;
 	}
+
+	// Restore old property names of tags
+	if (this.tags) {
+		this.tags = this.tags.map(function(tag) {
+			return {
+				"internal_name": tag.internal_name,
+				"name": tag.localized_tag_name || tag.name,
+				"category": tag.category,
+				"color": tag.color || "",
+				"category_name": tag.localized_category_name || tag.category_name
+			};
+		});
+	}
+
+	// Restore market_fee_app, if applicable
+	var match;
+	if (this.appid == 753 && this.contextid == 6 && this.market_hash_name && (match = this.market_hash_name.match(/^(\d+)\-/))) {
+		this.market_fee_app = parseInt(match[1], 10);
+	}
+
+	if (this.actions === "") {
+		this.actions = [];
+	}
+
+	 delete this.currency;
 }
 
 CEconItem.prototype.getImageURL = function() {
@@ -56,12 +86,12 @@ CEconItem.prototype.getLargeImageURL = function() {
 };
 
 CEconItem.prototype.getTag = function(category) {
-	if(!this.tags) {
+	if (!this.tags) {
 		return null;
 	}
 
-	for(var i = 0; i < this.tags.length; i++) {
-		if(this.tags[i].category == category) {
+	for (var i = 0; i < this.tags.length; i++) {
+		if (this.tags[i].category == category) {
 			return this.tags[i];
 		}
 	}

classes/CSteamUser.js

@@ -158,6 +158,25 @@ CSteamUser.prototype.getInventoryContexts = function(callback) {
 	this._community.getUserInventoryContexts(this.steamID, callback);
 };
 
+/**
+ * Get the contents of a user's inventory context.
+ * @deprecated Use CSteamUser#getInventoryContents instead
+ * @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 callback
+ */
 CSteamUser.prototype.getInventory = function(appID, contextID, tradableOnly, callback) {
 	this._community.getUserInventory(this.steamID, appID, contextID, tradableOnly, callback);
 };
+
+/**
+ * Get the contents of a user's inventory context.
+ * @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 callback
+ */
+CSteamUser.prototype.getInventoryContents = function(appID, contextID, tradableOnly, callback) {
+	this._community.getUserInventoryContents(this.steamID, appID, contextID, tradableOnly, callback);
+};

components/users.js

@@ -257,18 +257,107 @@ SteamCommunity.prototype.getUserInventoryContexts = function(userID, callback) {
 	}, "steamcommunity");
 };
 
+/**
+ * Get the contents of a user's inventory context.
+ * @deprecated Use getUserInventoryContents instead
+ * @param {SteamID|string} userID - The user's SteamID as a SteamID object or a string which can parse into one
+ * @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 {function} callback
+ */
 SteamCommunity.prototype.getUserInventory = function(userID, appID, contextID, tradableOnly, callback) {
 	var self = this;
 
+	if (typeof userID === 'string') {
+		userID = new SteamID(userID);
+	}
+
+	var endpoint = "/profiles/" + userID.getSteamID64();
+	get([], []);
+
+	function get(inventory, currency, start) {
+		self.httpRequest({
+			"uri": "https://steamcommunity.com" + endpoint + "/inventory/json/" + appID + "/" + contextID,
+			"headers": {
+				"Referer": "https://steamcommunity.com" + endpoint + "/inventory"
+			},
+			"qs": {
+				"start": start,
+				"trading": tradableOnly ? 1 : undefined
+			},
+			"json": true
+		}, function(err, response, body) {
+			if (err) {
+				callback(err);
+				return;
+			}
+
+			if (!body || !body.success || !body.rgInventory || !body.rgDescriptions || !body.rgCurrency) {
+				if (body) {
+					callback(new Error(body.Error || "Malformed response"));
+				} else {
+					callback(new Error("Malformed response"));
+				}
+
+				return;
+			}
+
+			var i;
+			for (i in body.rgInventory) {
+				if (!body.rgInventory.hasOwnProperty(i)) {
+					continue;
+				}
+
+				inventory.push(new CEconItem(body.rgInventory[i], body.rgDescriptions, contextID));
+			}
+
+			for (i in body.rgCurrency) {
+				if (!body.rgCurrency.hasOwnProperty(i)) {
+					continue;
+				}
+
+				currency.push(new CEconItem(body.rgInventory[i], body.rgDescriptions, contextID));
+			}
+
+			if (body.more) {
+				var match = response.request.uri.href.match(/\/(profiles|id)\/([^\/]+)\//);
+				if(match) {
+					endpoint = "/" + match[1] + "/" + match[2];
+				}
+
+				get(inventory, currency, body.more_start);
+			} else {
+				callback(null, inventory, currency);
+			}
+		}, "steamcommunity");
+	}
+};
+
+/**
+ * Get the contents of a user's inventory context.
+ * @param {SteamID|string} userID - The user's SteamID as a SteamID object or a string which can parse into one
+ * @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 {function} callback
+ */
+SteamCommunity.prototype.getUserInventoryContents = function(userID, appID, contextID, tradableOnly, callback) {
+	var self = this;
+
 	if(typeof userID === 'string') {
 		userID = new SteamID(userID);
 	}
-	
-	get([], [], 1);
 
-	function get(inventory, currency, step, start) {
+	var pos = 1;
+	get([], []);
+
+	function get(inventory, currency, start) {
 		self.httpRequest({
 			"uri": "https://steamcommunity.com/inventory/" + userID.getSteamID64() + "/" + appID + "/" + contextID,
+			"headers": {
+				"Referer": "https://steamcommunity.com/profiles/" + userID.getSteamID64() + "/inventory"
+			},
 			"qs": {
 				"l": "english", // Default language
 				"count": 5000, // Max items per 'page'
@@ -279,6 +368,11 @@ SteamCommunity.prototype.getUserInventory = function(userID, appID, contextID, t
 			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()) {
+						// We can never get private profile error for our own inventory!
+						self._notifySessionExpired(err);
+					}
+					
 					callback(new Error("This profile is private."));
 					return;
 				}
@@ -302,12 +396,13 @@ SteamCommunity.prototype.getUserInventory = function(userID, appID, contextID, t
 				var description = getDescription(body.descriptions, body.assets[i].classid, body.assets[i].instanceid);
 				
 				if (!tradableOnly || (description && description.tradable)) {
+					body.assets[i].pos = pos++;
 					(body.assets[i].currencyid ? currency : inventory).push(new CEconItem(body.assets[i], description, contextID));
 				}
 			}
 
-			if(body.total_inventory_count > 5000 * step) {
-				get(inventory, currency, step + 1, body.assets[body.assets.length - 1].assetid);
+			if (body.more_items) {
+				get(inventory, currency, body.last_assetid);
 			} else {
 				callback(null, inventory, currency, body.total_inventory_count);
 			}

package.json

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