3.49.0

# Conflicts:
#	package.json

classes/CEconItem.js

@@ -28,7 +28,7 @@ function CEconItem(item, description, contextID) {
 		}
 
 		for (thing in description) {
-			if (description.hasOwnProperty(thing)) {
+			if (description.hasOwnProperty(thing) && !this.hasOwnProperty(thing)) {
 				this[thing] = description[thing];
 			}
 		}

components/confirmations.js

@@ -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') {

components/http.js

@@ -1,3 +1,5 @@
+var URL = require('url');
+
 var SteamCommunity = require('../index.js');
 
 SteamCommunity.prototype.httpRequest = function(uri, options, callback, source) {
@@ -19,6 +21,16 @@ SteamCommunity.prototype.httpRequest = function(uri, options, callback, source)
 		delete this._httpRequestConvenienceMethod;
 	}
 
+	// Add origin header if necessary
+	// https://github.com/DoctorMcKay/node-steamcommunity/issues/351
+	if ((options.method || 'GET').toUpperCase() != 'GET') {
+		options.headers = options.headers || {};
+		if (!options.headers.origin) {
+			var parsedUrl = URL.parse(options.url);
+			options.headers.origin = parsedUrl.protocol + '//' + parsedUrl.host;
+		}
+	}
+
 	var requestID = ++this._httpRequestID;
 	source = source || "";
 

components/login.js

@@ -54,7 +54,7 @@ SteamCommunity.prototype._modernLogin = function(logOnDetails) {
 				let webCookies = await session.getWebCookies();
 				let sessionIdCookie = webCookies.find(c => c.startsWith('sessionid='));
 				resolve({
-					sessionID: sessionIdCookie.split('=')[1],
+					sessionID: sessionIdCookie.split('=')[1].split(';')[0].trim(),
 					cookies: webCookies,
 					steamguard: session.steamGuardMachineToken,
 					mobileAccessToken: logOnDetails.disableMobile ? null : session.accessToken

components/users.js

@@ -590,7 +590,7 @@ SteamCommunity.prototype.getUserInventoryContents = function(userID, appID, cont
 			},
 			"qs": {
 				"l": language, // Default language
-				"count": 5000, // Max items per 'page'
+				"count": 1000, // Max items per 'page'
 				"start_assetid": start
 			},
 			"json": true
@@ -629,6 +629,13 @@ SteamCommunity.prototype.getUserInventoryContents = function(userID, appID, cont
 				return;
 			}
 
+			if (appID == 730 && body && body.success && !body.assets) {
+				// CS inventory has no visible items. We need a special case for this because Valve is incapable of
+				// doing anything not dumb.
+				callback(null, [], [], body.total_inventory_count);
+				return;
+			}
+
 			if (!body || !body.success || !body.assets || !body.descriptions) {
 				if (body) {
 					// Dunno if the error/Error property even exists on this new endpoint

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "steamcommunity",
-	"version": "3.48.4",
+	"version": "3.49.0",
 	"description": "Provides an interface for logging into and interacting with the Steam Community website",
 	"files": [
 		"/classes",
@@ -33,7 +33,7 @@
 		"cheerio": "0.22.0",
 		"image-size": "^0.8.2",
 		"request": "^2.88.0",
-		"steam-session": "^1.7.2",
+		"steam-session": "^1.9.1",
 		"steam-totp": "^1.5.0",
 		"steamid": "^1.1.3",
 		"xml2js": "^0.6.2"