Compare commits

...

18 Commits

Author SHA1 Message Date
Alex Corn
08d14f19e6 3.50.2 2026-07-12 17:18:42 -04:00
DoctorMcKay
cfed757eab Merge pull request #369 from lrftw/fix/login-timeout
Fix login hanging indefinitely on steam-session timeout
2026-07-12 17:09:58 -04:00
DoctorMcKay
63defbb643 Merge pull request #370 from GVRLNKMK/fix-ceconitem-tradable-after-crash
Fix CEconItem crash when "Tradable/Marketable After" date isn't day-first
2026-07-12 17:09:19 -04:00
GVRLNKMK
6e20fbe299 Fix CEconItem crash when Tradable/Marketable After date isn't day-first
CEconItem destructured the day-first date regex match without a null
check, throwing 'match is not iterable' for CS2 items whose
owner_descriptions use the legacy month-first format (e.g. 'Tradable/
Marketable After Jul 11, 2025 (2:00:00)'). Running in the constructor,
this made getInventoryContents()/getUserInventoryContents() reject the
whole inventory.

Guard the null match, fall back to parsing the legacy month-first
format, and only set cache_expiration for a valid date. Day-first
strings are unchanged; backwards-compatible.
2026-07-10 17:25:18 +03:00
Lucas
59090242f9 Fix login hanging indefinitely on steam-session timeout
Modern login in components/login.js listens for 'authenticated' and
'error' events from steam-session's LoginSession, but not the 'timeout'
event. When loginTimeout (default 30s) elapses, steam-session emits
'timeout' and calls cancelLoginAttempt() without emitting an 'error'
event, causing the Promise to never settle and the login callback to
never be called.

Add a 'timeout' event listener that rejects the Promise with a
descriptive error.
2026-07-03 10:02:04 +02:00
Alex Corn
00e82f7e79 3.50.1 2026-06-28 17:48:51 -04:00
DoctorMcKay
7b901b147b Merge pull request #367 from ricardocefet2018/master
fix: Invalid time value
2026-06-28 17:44:21 -04:00
Ricardo Rocha
0f7fc98ab5 fix: Invalid time value 2026-06-26 19:14:28 -03:00
Alex Corn
2a12174a7c 3.50.0 2026-03-27 04:32:44 -04:00
DoctorMcKay
caa76ee84b Merge pull request #365 from DarkGL/feat/asset-properties
feat: Add asset_properties support to getInventoryContents
2026-03-27 04:29:47 -04:00
Rafal Wiecek
bc8893fedd feat: add asset properties to inventory items 2026-03-16 15:52:32 +01:00
Alex Corn
d3e90f6fd3 3.49.0 2025-07-19 05:00:47 -04:00
Alex Corn
a61b50b7a2 Added acknowledgeTradeProtection method 2025-07-19 04:59:15 -04:00
Alex Corn
39fe4a4106 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	package.json
2025-07-19 04:49:23 -04:00
Alex Corn
4b8799ddd4 3.48.5 2024-11-02 02:54:44 -04:00
Alex Corn
f02f85a2aa Don't error out if a CS inventory has no visible items 2024-11-02 02:54:16 -04:00
Alex Corn
4948cbeac0 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	package.json
2024-11-02 02:49:14 -04:00
Alex Corn
0fb2798424 3.48.3 2024-04-18 06:04:25 -04:00
5 changed files with 56 additions and 6 deletions

View File

@@ -1,6 +1,6 @@
module.exports = CEconItem;
function CEconItem(item, description, contextID) {
function CEconItem(item, description, contextID, assetProperties) {
var thing;
for (thing in item) {
if (item.hasOwnProperty(thing)) {
@@ -68,10 +68,26 @@ function CEconItem(item, description, contextID) {
// Restore cache_expiration, if we can (for CS:GO items)
if (this.appid == 730 && this.contextid == 2 && this.owner_descriptions) {
let description = this.owner_descriptions.find(d => d.value && d.value.indexOf('Tradable/Marketable After ') == 0);
let description = this.owner_descriptions.find((d) => d.value && d.value.indexOf("Tradable/Marketable After ") == 0);
if (description) {
let date = new Date(description.value.substring(26).replace(/[,()]/g, ''));
if (date) {
let date;
const match = description.value.match(/(\d{1,2}) (\w+) @ (\d{1,2}:\d{2})(am|pm)/i);
if (match) {
// New day-first format, e.g. "Tradable/Marketable After 17 Jul @ 3:00am"
const [, day, month, time, meridian] = match;
const now = new Date();
let year = now.getFullYear();
date = new Date(`${day} ${month} ${year} ${time} ${meridian}`);
if (date.getTime() < now.getTime()) {
date = new Date(`${day} ${month} ${year + 1} ${time} ${meridian}`);
}
} else {
// Legacy month-first format, e.g. "Tradable/Marketable After Jul 11, 2025 (2:00:00)"
date = new Date(description.value.substring("Tradable/Marketable After ".length).replace(/[,()]/g, ""));
}
if (date && !isNaN(date.getTime())) {
this.cache_expiration = date.toISOString();
}
}
@@ -86,6 +102,11 @@ function CEconItem(item, description, contextID) {
this.actions = [];
}
// Assign asset_properties if provided
if (assetProperties) {
this.asset_properties = assetProperties;
}
// One wouldn't think that we need this if statement, but apparently v8 has a weird bug/quirk where deleting a
// property results in greatly increased memory usage. Because that makes sense.
if (this.currency) {

View File

@@ -392,6 +392,22 @@ SteamCommunity.prototype.checkConfirmations = function() {
}
};
SteamCommunity.prototype.acknowledgeTradeProtection = function(callback) {
this.httpRequestPost({
uri: 'https://steamcommunity.com//trade/new/acknowledge',
form: {
sessionid: this.getSessionID(),
message: 1
}
}, (err, res, body) => {
if (err) {
return callback && callback(err);
}
callback && callback(null);
}, 'steamcommunity');
}
SteamCommunity.prototype._confirmationCheckerGetKey = function(tag, callback) {
if(this._identitySecret) {
if(tag == 'details') {

View File

@@ -68,6 +68,10 @@ SteamCommunity.prototype._modernLogin = function(logOnDetails) {
reject(err);
});
session.on('timeout', () => {
reject(new Error('Login timed out'));
});
try {
let startResult = await session.startWithCredentials({
accountName: logOnDetails.accountName,

View File

@@ -647,12 +647,21 @@ SteamCommunity.prototype.getUserInventoryContents = function(userID, appID, cont
return;
}
// Build asset_properties lookup by assetid
var assetPropertiesLookup = {};
if (body.asset_properties) {
for (var j = 0; j < body.asset_properties.length; j++) {
assetPropertiesLookup[body.asset_properties[j].assetid] = body.asset_properties[j].asset_properties;
}
}
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)) {
body.assets[i].pos = pos++;
(body.assets[i].currencyid ? currency : inventory).push(new CEconItem(body.assets[i], description, contextID));
var assetProperties = assetPropertiesLookup[body.assets[i].assetid] || null;
(body.assets[i].currencyid ? currency : inventory).push(new CEconItem(body.assets[i], description, contextID, assetProperties));
}
}

View File

@@ -1,6 +1,6 @@
{
"name": "steamcommunity",
"version": "3.48.8",
"version": "3.50.2",
"description": "Provides an interface for logging into and interacting with the Steam Community website",
"files": [
"/classes",