3.7.2

LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Alexander 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
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

README.md

@@ -1,8 +1,13 @@
 # Steam Community for Node.js
+[![npm version](https://img.shields.io/npm/v/steamcommunity.svg)](https://npmjs.com/package/steamcommunity)
+[![npm downloads](https://img.shields.io/npm/dm/steamcommunity.svg)](https://npmjs.com/package/steamcommunity)
+[![dependencies](https://img.shields.io/david/DoctorMcKay/node-steamcommunity.svg)](https://david-dm.org/DoctorMcKay/node-steamcommunity)
+[![license](https://img.shields.io/npm/l/steamcommunity.svg)](https://github.com/DoctorMcKay/node-steamcommunity/blob/master/LICENSE)
+[![paypal](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=N36YVAT42CZ4G&item_name=node%2dsteamcommunity&currency_code=USD)
 
-This lightweight module provides an easy interface for the Steam Community website. This module can be used to simply login to steamcommunity.com for use with other libraries, or to interact with steamcommunity.com.
+This module provides an easy interface for the Steam Community website. This module can be used to simply login to steamcommunity.com for use with other libraries, or to interact with steamcommunity.com.
 
-It supports Steam Guard but doesn't support CAPTCHAs, so make sure you don't provide Steam with an incorrect password.
+It supports Steam Guard and CAPTCHAs.
 
 # Installation
 

classes/CSteamUser.js

@@ -107,124 +107,30 @@ CSteamUser.prototype.getAvatarURL = function(size, protocol) {
 };
 
 CSteamUser.prototype.addFriend = function(callback) {
-	var self = this;
-	this._community.request.post('https://steamcommunity.com/actions/AddFriendAjax', {"form": {"accept_invite": 0, "sessionID": this._community.getSessionID(), "steamid": this.steamID.toString()}}, function(err, response, body) {
-		if(!callback) {
-			return;
-		}
-		
-		if(self._community._checkHttpError(err, response, callback)) {
-			return;
-		}
-		
-		var json;
-		try {
-			json = JSON.parse(body);
-		} catch(e) {
-			callback(e);
-			return;
-		}
-		
-		if(json.success) {
-			callback(null);
-		} else {
-			callback(new Error("Unknown error"));
-		}
-	});
+	this._community.addFriend(this.steamID, callback);
 };
 
 CSteamUser.prototype.acceptFriendRequest = function(callback) {
-	var self = this;
-	this._community.request.post('https://steamcommunity.com/actions/AddFriendAjax', {"form": {"accept_invite": 1, "sessionID": this._community.getSessionID(), "steamid": this.steamID.toString()}}, function(err, response, body) {
-		if(!callback) {
-			return;
-		}
-		
-		if(self._community._checkHttpError(err, response, callback)) {
-			return;
-		}
-		
-		callback(null);
-	});
+	this._community.acceptFriendRequest(this.steamID, callback);
 };
 
 CSteamUser.prototype.removeFriend = function(callback) {
-	var self = this;
-	this._community.request.post('https://steamcommunity.com/actions/RemoveFriendAjax', {"form": {"sessionID": this._community.getSessionID(), "steamid": this.steamID.toString()}}, function(err, response, body) {
-		if(!callback) {
-			return;
-		}
-		
-		if(self._community._checkHttpError(err, response, callback)) {
-			return;
-		}
-		
-		callback(null);
-	});
+	this._community.removeFriend(this.steamID, callback);
+
 };
 
 CSteamUser.prototype.blockCommunication = function(callback) {
-	var self = this;
-	this._community.request.post('https://steamcommunity.com/actions/BlockUserAjax', {"form": {"sessionID": this._community.getSessionID(), "steamid": this.steamID.toString()}}, function(err, response, body) {
-		if(!callback) {
-			return;
-		}
-		
-		if(self._community._checkHttpError(err, response, callback)) {
-			return;
-		}
-		
-		callback(null);
-	});
+	this._community.blockCommunication(this.steamID, callback);
 };
 
 CSteamUser.prototype.unblockCommunication = function(callback) {
-	var form = {"action": "unignore"};
-	form['friends[' + this.steamID.toString() + ']'] = 1;
-	
-	this._community._myProfile('friends/blocked/', form, function(err, response, body) {
-		if(!callback) {
-			return;
-		}
-		
-		if(err || response.statusCode >= 400) {
-			callback(err || new Error("HTTP error " + response.statusCode));
-			return;
-		}
-		
-		callback(null);
-	});
+	this._community.unblockCommunication(this.steamID, callback);
 };
 
 CSteamUser.prototype.comment = function(message, callback) {
-	this._community.request.post('https://steamcommunity.com/comment/Profile/post/' + this.steamID.toString() + '/-1/', {"form": {
-		"comment": message,
-		"count": 6,
-		"sessionid": this._community.getSessionID()
-	}}, function(err, response, body) {
-		if(!callback) {
-			return;
-		}
-		
-		if(err || response.statusCode != 200) {
-			callback(err || new Error("HTTP error " + response.statusCode));
-			return;
-		}
-		
-		var json;
-		try {
-			json = JSON.parse(body);
-		} catch(e) {
-			callback(e);
-			return;
-		}
-		
-		if(json.success) {
-			callback(null);
-		} else if(json.error) {
-			callback(new Error(json.error));
-		} else {
-			callback(new Error("Unknown error"));
-		}
-	});
+	this._community.postUserComment(this.steamID, message, callback);
+};
+
+CSteamUser.prototype.inviteToGroup = function(groupID, callback) {
+	this._community.inviteUserToGroup(this.steamID, groupID, callback);
 };

components/profile.js

@@ -1,6 +1,7 @@
 var SteamCommunity = require('../index.js');
 var SteamID = require('steamid');
 var Cheerio = require('cheerio');
+var fs = require('fs');
 
 SteamCommunity.PrivacyState = {
 	"Private": 1,
@@ -211,3 +212,152 @@ SteamCommunity.prototype.profileSettings = function(settings, callback) {
 		});
 	});
 };
+
+SteamCommunity.prototype.uploadAvatar = function(image, format, callback) {
+	if(typeof format === 'function') {
+		callback = format;
+		format = null;
+	}
+
+	var self = this;
+
+	if(image instanceof Buffer) {
+		doUpload(image);
+	} else if(image.match(/^https?:\/\//)) {
+		this.request.get({
+			"uri": image,
+			"encoding": null
+		}, function(err, response, body) {
+			if(err || response.statusCode != 200) {
+				if(callback) {
+					callback(err ? new Error(err.message + " downloading image") : new Error("HTTP error " + response.statusCode + " downloading image"));
+				}
+
+				return;
+			}
+
+			if(!format) {
+				format = response.headers['content-type'];
+			}
+
+			doUpload(body);
+		})
+	} else {
+		if(!format) {
+			format = image.match(/\.([^\.]+)$/);
+			if(format) {
+				format = format[1];
+			}
+		}
+
+		fs.readFile(image, function(err, file) {
+			if(err) {
+				if(callback) {
+					callback(err);
+				}
+
+				return;
+			}
+
+			doUpload(file);
+		})
+	}
+
+	function doUpload(buffer) {
+		if(!format) {
+			if(callback) {
+				callback(new Error("Unknown image format"));
+			}
+
+			return;
+		}
+
+		if(format.match(/^image\//)) {
+			format = format.substring(6);
+		}
+
+		var filename = '';
+		var contentType = '';
+
+		switch(format.toLowerCase()) {
+			case 'jpg':
+			case 'jpeg':
+				filename = 'avatar.jpg';
+				contentType = 'image/jpeg';
+				break;
+
+			case 'png':
+				filename = 'avatar.png';
+				contentType = 'image/png';
+				break;
+
+			case 'gif':
+				filename = 'avatar.gif';
+				contentType = 'image/gif';
+				break;
+
+			default:
+				if(callback) {
+					callback(new Error("Unknown or invalid image format"));
+				}
+
+				return;
+		}
+
+		self.request.post({
+			"uri": "https://steamcommunity.com/actions/FileUploader",
+			"formData": {
+				"MAX_FILE_SIZE": buffer.length,
+				"type": "player_avatar_image",
+				"sId": self.steamID.getSteamID64(),
+				"sessionid": self.getSessionID(),
+				"doSub": 1,
+				"json": 1,
+				"avatar": {
+					"value": buffer,
+					"options": {
+						"filename": filename,
+						"contentType": contentType
+					}
+				}
+			},
+			"json": true
+		}, function(err, response, body) {
+			if(err) {
+				if(callback) {
+					callback(err);
+				}
+
+				return;
+			}
+
+			if(body && !body.success && body.message) {
+				if(callback) {
+					callback(new Error(body.message));
+				}
+
+				return;
+			}
+
+			if(response.statusCode != 200) {
+				if(callback) {
+					callback(new Error("HTTP error " + response.statusCode));
+				}
+
+				return;
+			}
+
+			if(!body || !body.success) {
+				if(callback) {
+					callback(new Error("Malformed response"));
+				}
+
+				return;
+			}
+
+			if(callback) {
+				callback(null, body.images.full);
+			}
+		});
+	}
+};

components/users.js

@@ -0,0 +1,199 @@
+var SteamCommunity = require('../index.js');
+var SteamID = require('steamid');
+
+SteamCommunity.prototype.addFriend = function(userID, callback) {
+	if(typeof userID === 'string') {
+		userID = new SteamID(userID);
+	}
+
+	var self = this;
+	this.request.post({
+		"uri": "https://steamcommunity.com/actions/AddFriendAjax",
+		"form": {
+			"accept_invite": 0,
+			"sessionID": this.getSessionID(),
+			"steamid": userID.toString()
+		},
+		"json": true
+	}, function(err, response, body) {
+		if(!callback) {
+			return;
+		}
+
+		if(self._checkHttpError(err, response, callback)) {
+			return;
+		}
+
+		if(body.success) {
+			callback(null);
+		} else {
+			callback(new Error("Unknown error"));
+		}
+	});
+};
+
+SteamCommunity.prototype.acceptFriendRequest = function(userID, callback) {
+	if(typeof userID === 'string') {
+		userID = new SteamID(userID);
+	}
+
+	var self = this;
+	this.request.post({
+		"uri": "https://steamcommunity.com/actions/AddFriendAjax",
+		"form": {
+			"accept_invite": 1,
+			"sessionID": this.getSessionID(),
+			"steamid": userID.toString()
+		}
+	}, function(err, response, body) {
+		if(!callback) {
+			return;
+		}
+
+		if(self._checkHttpError(err, response, callback)) {
+			return;
+		}
+
+		callback(null);
+	});
+};
+
+SteamCommunity.prototype.removeFriend = function(userID, callback) {
+	if(typeof userID === 'string') {
+		userID = new SteamID(userID);
+	}
+
+	var self = this;
+	this.request.post({
+		"uri": "https://steamcommunity.com/actions/RemoveFriendAjax",
+		"form": {
+			"sessionID": this.getSessionID(),
+			"steamid": userID.toString()
+		}
+	}, function(err, response, body) {
+		if(!callback) {
+			return;
+		}
+
+		if(self._checkHttpError(err, response, callback)) {
+			return;
+		}
+
+		callback(null);
+	});
+};
+
+SteamCommunity.prototype.blockCommunication = function(userID, callback) {
+	if(typeof userID === 'string') {
+		userID = new SteamID(userID);
+	}
+
+	var self = this;
+	this.request.post({
+		"uri": "https://steamcommunity.com/actions/BlockUserAjax",
+		"form": {
+			"sessionID": this.getSessionID(),
+			"steamid": userID.toString()
+		}
+	}, function(err, response, body) {
+		if(!callback) {
+			return;
+		}
+
+		if(self._checkHttpError(err, response, callback)) {
+			return;
+		}
+
+		callback(null);
+	});
+};
+
+SteamCommunity.prototype.unblockCommunication = function(userID, callback) {
+	if(typeof userID === 'string') {
+		userID = new SteamID(userID);
+	}
+
+	var form = {"action": "unignore"};
+	form['friends[' + userID.toString() + ']'] = 1;
+
+	this._myProfile('friends/blocked/', form, function(err, response, body) {
+		if(!callback) {
+			return;
+		}
+
+		if(err || response.statusCode >= 400) {
+			callback(err || new Error("HTTP error " + response.statusCode));
+			return;
+		}
+
+		callback(null);
+	});
+};
+
+SteamCommunity.prototype.postUserComment = function(userID, message, callback) {
+	if(typeof userID === 'string') {
+		userID = new SteamID(userID);
+	}
+
+	var self = this;
+	this.request.post({
+		"uri": "https://steamcommunity.com/comment/Profile/post/" + userID.toString() + "/-1",
+		"form": {
+			"comment": message,
+			"count": 6,
+			"sessionid": this.getSessionID()
+		},
+		"json": true
+	}, function(err, response, body) {
+		if(!callback) {
+			return;
+		}
+
+		if(self._checkHttpError(err, response, callback)) {
+			return;
+		}
+
+		if(body.success) {
+			callback(null);
+		} else if(bpdy.error) {
+			callback(new Error(body.error));
+		} else {
+			callback(new Error("Unknown error"));
+		}
+	});
+};
+
+SteamCommunity.prototype.inviteUserToGroup = function(userID, groupID, callback) {
+	if(typeof userID === 'string') {
+		userID = new SteamID(userID);
+	}
+
+	var self = this;
+	this.request.post({
+		"uri": "https://steamcommunity.com/actions/GroupInvite",
+		"form": {
+			"group": groupID.toString(),
+			"invitee": userID.toString(),
+			"json": 1,
+			"sessionID": this.getSessionID(),
+			"type": "groupInvite"
+		},
+		"json": true
+	}, function(err, response, body) {
+		if(!callback) {
+			return;
+		}
+
+		if(self._checkHttpError(err, response, callback)) {
+			return;
+		}
+
+		if(body.results == 'OK') {
+			callback(null);
+		} else if(body.results) {
+			callback(new Error(body.results));
+		} else {
+			callback(new Error("Unknown error"));
+		}
+	});
+};

index.js

@@ -149,7 +149,10 @@ function generateSessionID() {
 
 SteamCommunity.prototype.getWebApiKey = function(domain, callback) {
 	var self = this;
-	this.request("https://steamcommunity.com/dev/apikey", function(err, response, body) {
+	this.request({
+		"uri": "https://steamcommunity.com/dev/apikey",
+		"followRedirect": false
+	}, function(err, response, body) {
 		if(self._checkHttpError(err, response, callback)) {
 			return;
 		}
@@ -172,8 +175,8 @@ SteamCommunity.prototype.getWebApiKey = function(domain, callback) {
 					"Submit": "Register"
 				}
 			}, function(err, response, body) {
-				if(err || response.statusCode >= 400) {
-					return callback(err.message || "HTTP error " + response.statusCode);
+				if(self._checkHttpError(err, response, callback)) {
+					return;
 				}
 				
 				self.getWebApiKey(domain, callback);
@@ -308,7 +311,12 @@ SteamCommunity.prototype._checkHttpError = function(err, response, callback) {
 		return true;
 	}
 	
-	if(response.statusCode != 200) {
+	if(response.statusCode >= 300 && response.statusCode <= 399 && response.headers.location.indexOf('/login') != -1) {
+		callback(new Error("Not Logged In"));
+		return true;
+	}
+	
+	if(response.statusCode >= 400) {
 		var error = new Error("HTTP error " + response.statusCode);
 		error.code = response.statusCode;
 		callback(error);
@@ -322,6 +330,7 @@ require('./components/chat.js');
 require('./components/profile.js');
 require('./components/market.js');
 require('./components/groups.js');
+require('./components/users.js');
 require('./classes/CMarketItem.js');
 require('./classes/CMarketSearchResult.js');
 require('./classes/CSteamGroup.js');

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "steamcommunity",
-	"version": "3.5.2",
+	"version": "3.7.2",
 	"description": "Provides an interface for logging into and interacting with the Steam Community website",
 	"keywords": ["steam", "steam community"],
 	"homepage": "https://github.com/DoctorMcKay/node-steamcommunity",
@@ -13,10 +13,10 @@
 		"url": "https://github.com/DoctorMcKay/node-steamcommunity.git"
 	},
 	"dependencies": {
-		"request":			"^2.58.0",
+		"request":			"^2.61.0",
 		"node-bignumber":	"^1.2.1",
-		"steamid":			"^0.3.0",
-		"xml2js":			"^0.4.9",
+		"steamid":			"^0.3.1",
+		"xml2js":			"^0.4.11",
 		"cheerio":			"^0.19.0"
 	}
 }