v3.34.1

Fix infinite loop in getWebApiKey

.editorconfig

@@ -0,0 +1,13 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = tab
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+insert_final_newline = false
+trim_trailing_whitespace = false

CONTRIBUTING.md

@@ -28,6 +28,7 @@ Submitting a pull request? Great! Thanks for contributing your time and code! Pl
 	- Tabs for indentation
 	- camelCase for variables and functions
 	- Opening braces on the same line as the if/for/while statement
+	- No omitting unnecessary braces
 	- etc.
 - Please avoid breaking changes. If you make a breaking change that can be done in a backwards-compatible manner, I won't accept it.
 - Please don't increment the version number in `package.json`. I'll do that myself when I publish it to npm.

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Alexander Corn
+Copyright (c) 2015 Alex Corn
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

classes/CSteamGroup.js

@@ -114,6 +114,15 @@ CSteamGroup.prototype.getHistory = function(page, callback) {
 	this._community.getGroupHistory(this.steamID, page, callback);
 };
 
+
+CSteamGroup.prototype.getAllComments = function(from, count, callback) {
+	this._community.getAllGroupComments(this.steamID, from, count, callback);
+};
+
+CSteamGroup.prototype.deleteComment = function(cid, callback) {
+	this._community.deleteGroupComment(this.steamID, cid, callback);
+};
+
 /**
  * Get requests to join this restricted group.
  * @param {function} callback - First argument is null/Error, second is array of SteamID objects

components/groups.js

@@ -2,6 +2,7 @@ var SteamCommunity = require('../index.js');
 var SteamID = require('steamid');
 var xml2js = require('xml2js');
 var Cheerio = require('cheerio');
+var Helpers = require('./helpers.js');
 var EResult = SteamCommunity.EResult;
 
 SteamCommunity.prototype.getGroupMembers = function(gid, callback, members, link, addresses, addressIdx) {
@@ -143,7 +144,7 @@ SteamCommunity.prototype.getAllGroupAnnouncements = function(gid, time, callback
 					headline: announcement.title[0],
 					content:  announcement.description[0],
 					date:     new Date(announcement.pubDate[0]),
-					author:   announcement.author[0],
+					author:   (typeof announcement.author === 'undefined') ? null : announcement.author[0],
 					aid:      splitLink[splitLink.length - 1]
 				}
 			}).filter(function(announcement) {
@@ -494,7 +495,7 @@ SteamCommunity.prototype.getGroupHistory = function(gid, page, callback) {
 				sid.universe = SteamID.Universe.PUBLIC;
 				sid.type = SteamID.Type.INDIVIDUAL;
 				sid.instance = SteamID.Instance.DESKTOP;
-				sid.accountid = $(users[0]).data('miniprofile');
+				sid.accountid = $(users[1]).data('miniprofile');
 				data.actor = sid;
 			}
 
@@ -519,6 +520,77 @@ SteamCommunity.prototype.getGroupHistory = function(gid, page, callback) {
 	}, "steamcommunity");
 };
 
+SteamCommunity.prototype.getAllGroupComments = function(gid, from, count, callback) {
+	if (typeof gid === 'string') {
+		gid = new SteamID(gid);
+	}
+
+	var options = {
+		"uri": "https://steamcommunity.com/comment/Clan/render/" + gid.getSteamID64() + "/-1/",
+		"form": {
+			"start": from,
+			"count": count
+		}
+	};
+
+	var self = this;
+	this.httpRequestPost(options, function(err, response, body) {
+		if (err) {
+			callback(err);
+			return;
+		}
+
+		var comments = [];
+
+		var $ = Cheerio.load(JSON.parse(body).comments_html);
+
+		$(".commentthread_comment_content").each(function () {
+			var comment = {};
+			var cachedSelector;
+
+			var $selector = $(this).find(".commentthread_author_link");
+			comment.authorName = $($selector).find("bdi").text();
+			comment.authorId = $($selector).attr("href").replace(/https?:\/\/steamcommunity.com\/(id|profiles)\//, "");
+			comment.date = Helpers.decodeSteamTime($(this).find(".commentthread_comment_timestamp").text().trim());
+
+			$selector = $(this).find(".commentthread_comment_text");
+			comment.commentId = $($selector).attr("id").replace("comment_content_", "");
+			comment.text = $($selector).html().trim();
+
+			comments.push(comment);
+		});
+
+		callback(null, comments);
+	}, "steamcommunity");
+};
+
+SteamCommunity.prototype.deleteGroupComment = function(gid, cid, callback) {
+	if (typeof gid === 'string') {
+		gid = new SteamID(gid);
+	}
+
+	if (typeof cid !== 'string') {
+		cid = cid.toString();
+	}
+
+	var options = {
+		"uri": "https://steamcommunity.com/comment/Clan/delete/" + gid.getSteamID64() + "/-1/",
+		"form": {
+			"sessionid": this.getSessionID(),
+			"gidcomment": cid
+		}
+	};
+
+	var self = this;
+	this.httpRequestPost(options, function(err, response, body) {
+		if(!callback) {
+			return;
+		}
+
+		callback(err || null);
+	}, "steamcommunity");
+};
+
 /**
  * Get requests to join a restricted group.
  * @param {SteamID|string} gid - The SteamID of the group you want to manage

components/helpers.js

@@ -13,11 +13,26 @@ exports.isSteamID = function(input) {
 };
 
 exports.decodeSteamTime = function(time) {
-	var parts = time.split('@');
-	if (!parts[0].match(/,/)) {
-		// no year, assume current year
-		parts[0] += ", " + (new Date()).getFullYear();
+	var date = new Date();
+
+	if (time.includes("@")) {
+		var parts = time.split('@');
+		if (!parts[0].includes(",")) {
+			// no year, assume current year
+			parts[0] += ", " + date.getFullYear();
+		}
+
+		date = new Date(parts.join('@').replace(/(am|pm)/, ' $1') + " UTC");  // add a space so JS can decode it
+	} else {
+		// Relative date
+		var amount = time.replace(/(\d) (minutes|hour|hours) ago/, "$1");
+
+		if(time.includes("minutes")) {
+			date.setMinutes(date.getMinutes() - amount);
+		} else if(time.match(/hour|hours/)) {
+			date.setHours(date.getHours() - amount);
+		}
 	}
 
-	return new Date(parts.join('@').replace(/(am|pm)/, ' $1') + " UTC"); // add a space so JS can decode it
+	return date;
 };

components/inventoryhistory.js

@@ -13,6 +13,11 @@ var Async = require('async');
  * With "prev" set, you will request 30 trades that were completed MORE RECENTLY than after_time (and optionally after_trade)
  */
 
+/**
+ * @deprecated Use GetTradeHistory instead: https://lab.xpaw.me/steam_api_documentation.html#IEconService_GetTradeHistory_v1
+ * @param {object} options
+ * @param {function} callback
+ */
 SteamCommunity.prototype.getInventoryHistory = function(options, callback) {
 	if (typeof options === 'function') {
 		callback = options;

components/webapi.js

@@ -14,6 +14,10 @@ SteamCommunity.prototype.getWebApiKey = function(domain, callback) {
 		if(body.match(/<h2>Access Denied<\/h2>/)) {
 			return callback(new Error("Access Denied"));
 		}
+		
+		if(body.match(/You must have a validated email address to create a Steam Web API key./)) {
+			return callback(new Error("You must have a validated email address to create a Steam Web API key."));
+		}
 
 		var match = body.match(/<p>Key: ([0-9A-F]+)<\/p>/);
 		if(match) {

examples/enable_twofactor.js

@@ -79,7 +79,7 @@ function doLogin(accountName, password, authCode, captcha) {
 
 			console.log("Writing secrets to twofactor_" + community.steamID.getSteamID64() + ".json");
 			console.log("Revocation code: " + response.revocation_code);
-			fs.writeFile("twofactor_" + community.steamID.getSteamID64() + ".json", JSON.stringify(response, null, "\t"));
+			fs.writeFileSync("twofactor_" + community.steamID.getSteamID64() + ".json", JSON.stringify(response, null, "\t"));
 
 			promptActivationCode(response);
 		});

index.js

@@ -13,7 +13,8 @@ module.exports = SteamCommunity;
 
 SteamCommunity.SteamID = SteamID;
 SteamCommunity.ConfirmationType = require('./resources/EConfirmationType.js');
-SteamCommunity.EResult = require('./resources/EResult.js');
+SteamCommunity.EResult = require('./resources/EResult.js')
+
 
 function SteamCommunity(options) {
 	options = options || {};
@@ -62,22 +63,29 @@ SteamCommunity.prototype.login = function(details, callback) {
 		var parts = details.steamguard.split('||');
 		this._setCookie(Request.cookie('steamMachineAuth' + parts[0] + '=' + encodeURIComponent(parts[1])), true);
 	}
-	
+
+	var disableMobile = details.disableMobile;
+
 	var self = this;
 
 	// Delete the cache
 	delete self._profileURL;
 
 	// headers required to convince steam that we're logging in from a mobile device so that we can get the oAuth data
-	var mobileHeaders = {
-		"X-Requested-With": "com.valvesoftware.android.steam.community",
-		"Referer": "https://steamcommunity.com/mobilelogin?oauth_client_id=DE45CD61&oauth_scope=read_profile%20write_profile%20read_client%20write_client",
-		"User-Agent": "Mozilla/5.0 (Linux; U; Android 4.1.1; en-us; Google Nexus 4 - 4.1.1 - API 16 - 768x1280 Build/JRO03S) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
-		"Accept": "text/javascript, text/html, application/xml, text/xml, */*"
-	};
+	var mobileHeaders = {};
+	if (!disableMobile) {
+		mobileHeaders = {
+			"X-Requested-With": "com.valvesoftware.android.steam.community",
+			"Referer": "https://steamcommunity.com/mobilelogin?oauth_client_id=DE45CD61&oauth_scope=read_profile%20write_profile%20read_client%20write_client",
+			"User-Agent": "Mozilla/5.0 (Linux; U; Android 4.1.1; en-us; Google Nexus 4 - 4.1.1 - API 16 - 768x1280 Build/JRO03S) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
+			"Accept": "text/javascript, text/html, application/xml, text/xml, */*"
+		};
 
-	this._setCookie(Request.cookie("mobileClientVersion=0 (2.1.3)"));
-	this._setCookie(Request.cookie("mobileClient=android"));
+		this._setCookie(Request.cookie("mobileClientVersion=0 (2.1.3)"));
+		this._setCookie(Request.cookie("mobileClient=android"));
+	} else {
+		mobileHeaders = {"Referer": "https://steamcommunity.com/login"};
+	}
 	
 	this.httpRequestPost("https://steamcommunity.com/login/getrsakey/", {
 		"form": {"username": details.accountName},
@@ -91,7 +99,7 @@ SteamCommunity.prototype.login = function(details, callback) {
 			return;
 		}
 
-		if(!body.publickey_mod || !body.publickey_exp) {
+		if (!body.publickey_mod || !body.publickey_exp) {
 			deleteMobileCookies();
 			callback(new Error("Invalid RSA key received"));
 			return;
@@ -99,25 +107,31 @@ SteamCommunity.prototype.login = function(details, callback) {
 		
 		var key = new RSA();
 		key.setPublic(body.publickey_mod, body.publickey_exp);
-		
+
+		var formObj = {
+			"captcha_text": details.captcha || "",
+			"captchagid": self._captchaGid,
+			"emailauth": details.authCode || "",
+			"emailsteamid": "",
+			"password": hex2b64(key.encrypt(details.password)),
+			"remember_login": "true",
+			"rsatimestamp": body.timestamp,
+			"twofactorcode": details.twoFactorCode || "",
+			"username": details.accountName,
+			"loginfriendlyname": "",
+			"donotcache": Date.now()
+		};
+
+		if(!disableMobile){
+			formObj.oauth_client_id = "DE45CD61";
+			formObj.oauth_scope = "read_profile write_profile read_client write_client";
+			formObj.loginfriendlyname = "#login_emailauth_friendlyname_mobile";
+		}
+
 		self.httpRequestPost({
 			"uri": "https://steamcommunity.com/login/dologin/",
 			"json": true,
-			"form": {
-				"captcha_text": details.captcha || "",
-				"captchagid": self._captchaGid,
-				"emailauth": details.authCode || "",
-				"emailsteamid": "",
-				"password": hex2b64(key.encrypt(details.password)),
-				"remember_login": "true",
-				"rsatimestamp": body.timestamp,
-				"twofactorcode": details.twoFactorCode || "",
-				"username": details.accountName,
-				"oauth_client_id": "DE45CD61",
-				"oauth_scope": "read_profile write_profile read_client write_client",
-				"loginfriendlyname": "#login_emailauth_friendlyname_mobile",
-				"donotcache": Date.now()
-			},
+			"form": formObj,
 			"headers": mobileHeaders
 		}, function(err, response, body) {
 			deleteMobileCookies();
@@ -128,38 +142,51 @@ SteamCommunity.prototype.login = function(details, callback) {
 			}
 
 			var error;
-			if(!body.success && body.emailauth_needed) {
+			if (!body.success && body.emailauth_needed) {
 				// Steam Guard (email)
 				error = new Error("SteamGuard");
 				error.emaildomain = body.emaildomain;
 				
 				callback(error);
-			} else if(!body.success && body.requires_twofactor) {
+			} else if (!body.success && body.requires_twofactor) {
 				// Steam Guard (app)
 				callback(new Error("SteamGuardMobile"));
-			} else if(!body.success && body.captcha_needed && body.message.match(/Please verify your humanity/)) {
+			} else if (!body.success && body.captcha_needed && body.message.match(/Please verify your humanity/)) {
 				error = new Error("CAPTCHA");
 				error.captchaurl = "https://steamcommunity.com/login/rendercaptcha/?gid=" + body.captcha_gid;
 				
 				self._captchaGid = body.captcha_gid;
 				
 				callback(error);
-			} else if(!body.success) {
+			} else if (!body.success) {
 				callback(new Error(body.message || "Unknown error"));
-			} else if(!body.oauth) {
+			} else if (!disableMobile && !body.oauth) {
 				callback(new Error("Malformed response"));
 			} else {
 				var sessionID = generateSessionID();
-				var oAuth = JSON.parse( body.oauth );
+				var oAuth;
 				self._setCookie(Request.cookie('sessionid=' + sessionID));
-				
-				self.steamID = new SteamID(oAuth.steamid);
-				self.oAuthToken = oAuth.oauth_token;
 
 				var cookies = self._jar.getCookieString("https://steamcommunity.com").split(';').map(function(cookie) {
 					return cookie.trim();
 				});
 				
+				if (!disableMobile){
+					oAuth = JSON.parse(body.oauth);
+					self.steamID = new SteamID(oAuth.steamid);
+					self.oAuthToken = oAuth.oauth_token;
+				}else{
+					for(var i = 0; i < cookies.length; i++) {
+						var parts = cookies[i].split('=');
+						if(parts[0] == 'steamLogin') {
+							self.steamID = new SteamID(decodeURIComponent(parts[1]).split('||')[0])
+							break;
+						}
+					}
+
+					self.oAuthToken = null;
+				}
+
 				// Find the Steam Guard cookie
 				var steamguard = null;
 				for(var i = 0; i < cookies.length; i++) {
@@ -172,7 +199,7 @@ SteamCommunity.prototype.login = function(details, callback) {
 
 				self.setCookies(cookies);
 				
-				callback(null, sessionID, cookies, steamguard, oAuth.oauth_token);
+				callback(null, sessionID, cookies, steamguard, disableMobile ? null : oAuth.oauth_token);
 			}
 		}, "steamcommunity");
 	}, "steamcommunity");
@@ -370,6 +397,39 @@ SteamCommunity.prototype.loggedIn = function(callback) {
 	}, "steamcommunity");
 };
 
+SteamCommunity.prototype.getTradeURL = function(callback) {
+	this._myProfile("/tradeoffers/privacy", null, (err, response, body) => {
+		if (err) {
+			callback(err);
+			return;
+		}
+
+		var match = body.match(/https?:\/\/(www.)?steamcommunity.com\/tradeoffer\/new\/?\?partner=\d+(&|&amp;)token=([a-zA-Z0-9-_]+)/);
+		if (match) {
+			var token = match[3];
+			callback(null, match[0], token);
+		} else {
+			callback(new Error("Malformed response"));
+		}
+	}, "steamcommunity");
+};
+
+SteamCommunity.prototype.changeTradeURL = function(callback) {
+	this._myProfile("/tradeoffers/newtradeurl", {"sessionid": this.getSessionID()}, (err, response, body) => {
+		if (!callback) {
+			return;
+		}
+
+		if (!body || typeof body !== "string" || body.length < 3 || body.indexOf('"') !== 0) {
+			callback(new Error("Malformed response"));
+			return;
+		}
+
+		var newToken = body.replace(/"/g, ''); //"t1o2k3e4n" => t1o2k3e4n
+		callback(null, "https://steamcommunity.com/tradeoffer/new/?partner=" + this.steamID.accountid + "&token=" + newToken, newToken);
+	}, "steamcommunity");
+};
+
 SteamCommunity.prototype._myProfile = function(endpoint, form, callback) {
 	var self = this;
 
@@ -430,4 +490,4 @@ require('./classes/CSteamUser.js');
 /**
  @callback SteamCommunity~genericErrorCallback
  @param {Error|null} err - An Error object on failure, or null on success
- */
+ */

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "steamcommunity",
-	"version": "3.32.2",
+	"version": "3.34.1",
 	"description": "Provides an interface for logging into and interacting with the Steam Community website",
 	"keywords": [
 		"steam",
@@ -11,6 +11,11 @@
 		"url": "https://github.com/DoctorMcKay/node-steamcommunity/issues"
 	},
 	"license": "MIT",
+	"author": {
+		"name": "Alex Corn",
+		"email": "mckay@doctormckay.com",
+		"url": "https://www.doctormckay.com"
+	},
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/DoctorMcKay/node-steamcommunity.git"