github-repos/node-steamcommunity
1
0
Fork 0
mirror of https://github.com/DoctorMcKay/node-steamcommunity.git synced 2026-08-19 13:13:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update inventory loading endpoint (#148)

Browse Source 
* Update inventory loading endpoint

Should fix 429s :)

* Fix missing contextID parameter at CEconItem class

* Revert "Fix missing contextID parameter at CEconItem class"

This reverts commit 416321105b.

* Revert "Revert "Fix missing contextID parameter at CEconItem class""

This reverts commit 49ecd46954.

* Update #1
This commit is contained in:
João Silva
2016-12-13 05:23:02 +00:00
committed by Alexander Corn
parent 95a36b00c1
commit b789e13a70
2 changed files with 31 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
classes/CEconItem.js
View File

@@ -15,12 +15,9 @@ function CEconItem(item, descriptions, contextID) {
// Merge the description
if(descriptions) {
var description = descriptions[this.classid + '_' + this.instanceid];
if(description) {
for(thing in description) {
if(description.hasOwnProperty(thing)) {
this[thing] = description[thing];
}
for(thing in descriptions) {
if(descriptions.hasOwnProperty(thing)) {
this[thing] = descriptions[thing];
}
}
}

58
components/users.js
View File

@@ -263,16 +263,16 @@ SteamCommunity.prototype.getUserInventory = function(userID, appID, contextID, t
if(typeof userID === 'string') {
userID = new SteamID(userID);
}
get([], [], 1);
var endpoint = "/profiles/" + userID.getSteamID64();
get([], []);
function get(inventory, currency, start) {
function get(inventory, currency, step, start) {
self.httpRequest({
"uri": "https://steamcommunity.com" + endpoint + "/inventory/json/" + appID + "/" + contextID,
"uri": "https://steamcommunity.com/inventory/" + userID.getSteamID64() + "/" + appID + "/" + contextID,
"qs": {
"start": start,
"trading": tradableOnly ? 1 : undefined
"l": "english", // Default language
"count": 5000, // Max items per 'page'
"start_assetid": start,
},
"json": true
}, function(err, response, body) {
@@ -281,9 +281,9 @@ SteamCommunity.prototype.getUserInventory = function(userID, appID, contextID, t
return;
}
if(!body || !body.success || !body.rgInventory || !body.rgDescriptions || !body.rgCurrency) {
if(!body || !body.success || !body.assets || !body.descriptions) {
if(body) {
callback(new Error(body.Error || "Malformed response"));
callback(new Error(body.error || "Malformed response"));
} else {
callback(new Error("Malformed response"));
}
@@ -291,33 +291,31 @@ SteamCommunity.prototype.getUserInventory = function(userID, appID, contextID, t
return;
}
var i;
for(i in body.rgInventory) {
if(!body.rgInventory.hasOwnProperty(i)) {
continue;
for(var i = 0; i < body.assets.length; i++) {
var description = getDescription(body.descriptions, body.assets[i].classid, body.assets[i].instanceid)
if(!tradableOnly || description && description.tradable) {
inventory.push(new CEconItem(body.assets[i], description, contextID));
}
inventory.push(new CEconItem(body.rgInventory[i], body.rgDescriptions, contextID));
}
// Dunno how to handle currencies now
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);
if(body.total_inventory_count > 5000 * step) {
get(inventory, currency, step + 1, body.assets[body.assets.length - 1].assetid);
} else {
callback(null, inventory, currency);
}
}, "steamcommunity");
}
};
function getDescription(descriptions, classID, instanceID) {
for(var i = 0; i < descriptions.length; i++) {
if(descriptions[i].classid == classID && descriptions[i].instanceid == instanceID) {
return descriptions[i];
}
}
return;
}