3.41.0

(Fixes #229)

classes/CEconItem.js

@@ -66,6 +66,22 @@ function CEconItem(item, description, contextID) {
 		this.market_fee_app = parseInt(match[1], 10);
 	}
 
+	// 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 After ') == 0);
+		if (description) {
+			let date = new Date(description.value.substring(15).replace(/[,()]/g, ''));
+			if (date) {
+				this.cache_expiration = date.toISOString();
+			}
+		}
+	}
+
+	// If we have item_expiration, also set cache_expiration to the same value
+	if (this.item_expiration) {
+		this.cache_expiration = this.item_expiration;
+	}
+
 	if (this.actions === "") {
 		this.actions = [];
 	}

classes/CSteamUser.js

@@ -190,3 +190,13 @@ CSteamUser.prototype.getInventoryContents = function(appID, contextID, tradableO
 CSteamUser.prototype.getProfileBackground = function(callback) {
 	this._community.getUserProfileBackground(this.steamID, callback);
 };
+
+/**
+ * Upload an image to Steam and send it to the target user over chat.
+ * @param {Buffer} imageContentsBuffer - The image contents, as a Buffer
+ * @param {{spoiler?: boolean}} [options]
+ * @param {function} callback
+ */
+CSteamUser.prototype.sendImage = function(imageContentsBuffer, options, callback) {
+	this._community.sendImageToUser(this.steamID, imageContentsBuffer, options, callback);
+};

components/users.js

@@ -1,4 +1,6 @@
 const Cheerio = require('cheerio');
+const Crypto = require('crypto');
+const imageSize = require('image-size');
 const SteamID = require('steamid');
 
 const SteamCommunity = require('../index.js');
@@ -397,6 +399,11 @@ SteamCommunity.prototype.getUserInventory = function(userID, appID, contextID, t
  * @param {function} callback
  */
 SteamCommunity.prototype.getUserInventoryContents = function(userID, appID, contextID, tradableOnly, language, callback) {
+	if (typeof language === 'function') {
+		callback = language;
+		language = "english";
+	}
+
 	if (!userID) {
 		callback(new Error("The user's SteamID is invalid or missing."));
 		return;
@@ -408,11 +415,6 @@ SteamCommunity.prototype.getUserInventoryContents = function(userID, appID, cont
 		userID = new SteamID(userID);
 	}
 
-	if (typeof language === 'function') {
-		callback = language;
-		language = "english";
-	}
-
 	var pos = 1;
 	get([], []);
 
@@ -508,3 +510,156 @@ SteamCommunity.prototype.getUserInventoryContents = function(userID, appID, cont
 		return quickDescriptionLookup[key];
 	}
 };
+
+/**
+ * Upload an image to Steam and send it to another user over Steam chat.
+ * @param {SteamID|string} userID - Either a SteamID object or a string that can parse into one
+ * @param {Buffer} imageContentsBuffer - The image contents, as a Buffer
+ * @param {{spoiler?: boolean}} [options]
+ * @param {function} callback
+ */
+SteamCommunity.prototype.sendImageToUser = function(userID, imageContentsBuffer, options, callback) {
+	if (typeof options == 'function') {
+		callback = options;
+		options = {};
+	}
+
+	options = options || {};
+
+	if (!userID) {
+		callback(new Error('The user\'s SteamID is invalid or missing'));
+		return;
+	}
+
+	if (typeof userID == 'string') {
+		userID = new SteamID(userID);
+	}
+
+	if (!Buffer.isBuffer(imageContentsBuffer)) {
+		callback(new Error('The image contents must be a Buffer containing an image'));
+		return;
+	}
+
+	var imageDetails = null;
+	try {
+		imageDetails = imageSize(imageContentsBuffer);
+	} catch (ex) {
+		callback(ex);
+		return;
+	}
+
+	var imageHash = Crypto.createHash('sha1');
+	imageHash.update(imageContentsBuffer);
+	imageHash = imageHash.digest('hex');
+
+	this.httpRequestPost({
+		uri: 'https://steamcommunity.com/chat/beginfileupload/?l=english',
+		headers: {
+			referer: 'https://steamcommunity.com/chat/'
+		},
+		formData: { // it's multipart
+			sessionid: this.getSessionID(),
+			l: 'english',
+			file_size: imageContentsBuffer.length,
+			file_name: 'image.' + imageDetails.type,
+			file_sha: imageHash,
+			file_image_width: imageDetails.width,
+			file_image_height: imageDetails.height,
+			file_type: 'image/' + (imageDetails.type == 'jpg' ? 'jpeg' : imageDetails.type)
+		},
+		json: true
+	}, (err, res, body) => {
+		if (err) {
+			if (body && body.success) {
+				var err2 = Helpers.eresultError(body.success);
+				if (body.message) {
+					err2.message = body.message;
+				}
+				callback(err2);
+			} else {
+				callback(err);
+			}
+			return;
+		}
+
+		if (body.success != 1) {
+			callback(Helpers.eresultError(body.success));
+			return;
+		}
+
+		var hmac = body.hmac;
+		var timestamp = body.timestamp;
+		var startResult = body.result;
+
+		if (!startResult || !startResult.ugcid || !startResult.url_host || !startResult.request_headers) {
+			callback(new Error('Malformed response'));
+			return;
+		}
+
+		// Okay, now we need to PUT the file to the provided URL
+		var uploadUrl = (startResult.use_https ? 'https' : 'http') + '://' + startResult.url_host + startResult.url_path;
+		var headers = {};
+		startResult.request_headers.forEach((header) => {
+			headers[header.name.toLowerCase()] = header.value;
+		});
+
+		this.httpRequest({
+			uri: uploadUrl,
+			method: 'PUT',
+			headers,
+			body: imageContentsBuffer
+		}, (err, res, body) => {
+			if (err) {
+				callback(err);
+				return;
+			}
+
+			// Now we need to commit the upload
+			this.httpRequestPost({
+				uri: 'https://steamcommunity.com/chat/commitfileupload/',
+				headers: {
+					referer: 'https://steamcommunity.com/chat/'
+				},
+				formData: { // it's multipart again
+					sessionid: this.getSessionID(),
+					l: 'english',
+					file_name: 'image.' + imageDetails.type,
+					file_sha: imageHash,
+					success: '1',
+					ugcid: startResult.ugcid,
+					file_type: 'image/' + (imageDetails.type == 'jpg' ? 'jpeg' : imageDetails.type),
+					file_image_width: imageDetails.width,
+					file_image_height: imageDetails.height,
+					timestamp,
+					hmac,
+					friend_steamid: userID.getSteamID64(),
+					spoiler: options.spoiler ? '1' : '0'
+				},
+				json: true
+			}, (err, res, body) => {
+				if (err) {
+					callback(err);
+					return;
+				}
+
+				if (body.success != 1) {
+					callback(Helpers.eresultError(body.success));
+					return;
+				}
+
+				if (body.result.success != 1) {
+					// lol valve
+					callback(Helpers.eresultError(body.result.success));
+					return;
+				}
+
+				if (!body.result.details || !body.result.details.url) {
+					callback(new Error('Malformed response'));
+					return;
+				}
+
+				callback(null, body.result.details.url);
+			}, 'steamcommunity');
+		}, 'steamcommunity');
+	}, 'steamcommunity');
+};

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "steamcommunity",
-	"version": "3.40.1",
+	"version": "3.41.0",
 	"description": "Provides an interface for logging into and interacting with the Steam Community website",
 	"keywords": [
 		"steam",
@@ -21,13 +21,14 @@
 		"url": "https://github.com/DoctorMcKay/node-steamcommunity.git"
 	},
 	"dependencies": {
-		"request": "^2.86.0",
-		"node-bignumber": "^1.2.1",
-		"steamid": "^1.0.0",
-		"xml2js": "^0.4.11",
+		"async": "^2.6.3",
 		"cheerio": "0.22.0",
-		"async": "^2.1.4",
-		"steam-totp": "^1.3.0"
+		"image-size": "^0.8.2",
+		"node-bignumber": "^1.2.1",
+		"request": "^2.88.0",
+		"steam-totp": "^1.5.0",
+		"steamid": "^1.1.3",
+		"xml2js": "^0.4.22"
 	},
 	"engines": {
 		"node": ">=4.0.0"