bancho.js 0.11.5 → 0.12.0

package/CHANGELOG.md

@@ -1,7 +1,26 @@
 # Pre-release
 
+## Version 0.12
+
+### Version 0.12.0
+
+- **Support creating lobbies with filtered names by queuing lobby creation**  
+  Created lobbies are no longer checked against their names for the `createLobby` call to succeed. This helps in cases where the requested lobby name has filtered words.  
+  As a consequence, lobby creation can no longer be done in parallel. They are now transparently queued. The promise returned by `createLobby` still resolves when the lobby is created, so this should be fully transparent to the user.
+- **Fix infinite loop when message fails to send**
+- BanchoChannel: Fix join and leave methods hanging forever if channel is already joined/left
+- BanchoChannel: Fix JOIN and PART events being emitted before they're fully processed
+- Fix slots types not being nullable
+
 ## Version 0.11
 
+### Version 0.11.6
+
+- **BanchoLobby: Add timer events**  
+  Added the following events for `!mp timer`: `timerTick`, `timerAborted`, `timerEnded`  
+  Added the following events for `!mp start`: `startTimerStarted`, `startTimerTick`, `startTimerAborted`  
+  They are emitted with a `seconds` parameter where applicable.
+
 ### Version 0.11.5
 
 - Apply new personal account rate limits
@@ -369,4 +388,4 @@
 
 ## Version 0.1 
 
-- Initial single-file library with very basic IRC support
+- Initial single-file library with very basic IRC support

package/README.md

@@ -3,7 +3,7 @@
 [![NPM](https://nodei.co/npm/bancho.js.png?compact=true)](https://nodei.co/npm/bancho.js/)  
 [![pipeline status](https://git.cartooncraft.fr/ThePooN/bancho.js/badges/master/pipeline.svg)](https://git.cartooncraft.fr/ThePooN/bancho.js/commits/master)
 
-## Current release: 0.11.5
+## Current release: 0.12.0
 
 # Introduction
 

package/index.d.ts

@@ -5,17 +5,17 @@ declare module "bancho.js" {
 
 	export class BanchoClient extends EventEmitter {
 		constructor(options: BanchoClientOptions)
-	
+
 		/**
 		 * Populated with a Nodesu client, if api key is passed to the constructor
 		 */
 		osuApi: nodesu.Client
-	
+
 		/**
 		 * Get a BanchoUser instance for the specified user
 		 */
 		getUser(username: string): BanchoUser
-	
+
 		/**
 		 * Get a BanchoUser representing ourself
 		 */
@@ -25,7 +25,7 @@ declare module "bancho.js" {
 		 * Get a BanchoUser instance for the specified user id
 		 */
 		getUserById(userid: number): Promise<BanchoUser>
-	
+
 		/**
 		 * Get a BanchoChannel instance for the specified name
 		 */
@@ -37,99 +37,99 @@ declare module "bancho.js" {
 		 * @param privateLobby Mark as private
 		 */
 		createLobby(name: string, private?: boolean): Promise<BanchoMultiplayerChannel>
-	
+
 		/**
 		 * Connects to Bancho, rejects an Error if connection fails
 		 */
 		connect(): Promise<null>
-		
+
 		/**
 		 * Disconnects from Bancho
 		 */
 		disconnect(): void
-		
+
 		/**
 		 * Returns the current connection state.
 		 */
 		getConnectState(): Symbol
-		
+
 		/**
 		 * Returns true if the connectState is Connected, false otherwise.
 		 */
 		isConnected(): boolean
-		
+
 		/**
 		 * Returns true if the connectState is Disconnected, otherwise false.
 		 */
 		isDisconnected(): boolean
-		
+
 		/**
 		 * Registers a listener for channel messages.
 		 * @param listener the callback
 		 */
 		on(event: "CM", listener: (message: ChannelMessage) => void): this
-		
+
 		/**
 		 * Registers a listener for the successful connection events.
 		 * @param listener the callback
 		 */
 		on(event: "connected", listener: () => void): this
-		
+
 		/**
 		 * Registers a listener for the disconnection events.
 		 * @param listener the callback
 		 */
 		on(event: "disconnected", listener: (error: Error) => void): this
-		
+
 		/**
 		 * Registers a listener for errors.
 		 * @param listener the callback
 		 */
 		on(event: "error", listener: (error: Error) => void): this
-		
+
 		/**
 		 * Registers a listener for when a user joins a channel.
 		 * @param listener the callback
 		 */
 		on(event: "JOIN", listener: (member: BanchoChannelMember) => void): this
-		
+
 		/**
 		 * Registers a listener for when a user leaves a channel.
 		 * @param listener the callback
 		 */
 		on(event: "PART", listener: (member: BanchoChannelMember) => void): this
-		
+
 		/**
 		 * Registers a listener for when the client fails to enter a non-existant channel.
 		 * @param listener the callback with the concerned BanchoChannel
 		 */
 		on(event: "nochannel", listener: (channel: BanchoChannel) => void): this
-		
+
 		/**
 		 * Registers a listener for when the client tries to execute something for an offline user.
 		 * @param listener the callback with the concerned BanchoUser
 		 */
 		on(event: "nouser", listener: (user: BanchoUser) => void): this
-		
+
 		/**
 		 * Registers a listener for private messages.
 		 * @param listener the callback
 		 */
 		on(event: "PM", listener: (message: PrivateMessage) => void): this
-		
+
 		/**
 		 * Registers a listener for when Bancho sends us back a PM that couldn't be sent.
 		 * As far as we know, only happens when a PM is rejected because the recipient blocks messages from non-friends.
 		 * @param listener the callback with the concerned PrivateMessage
 		 */
 		on(event: "rejectedMessage", listener: (message: PrivateMessage) => void): this
-		
+
 		/**
 		 * Registers a listener for client state changes.
 		 * @param listener the callback with a Symbol from ConnectStates and a possible error.
 		 */
 		on(event: "state", listener: (state: Symbol, error?: Error) => void): this
-		
+
 	}
 
 	export class BanchoUser extends EventEmitter {
@@ -138,10 +138,10 @@ declare module "bancho.js" {
 		 * @param banchojs Bancho.js client this user was instancied by
 		 */
 		constructor(banchojs: BanchoClient, ircUsername: string)
-	
+
 		banchojs: BanchoClient
 		ircUsername: string
-	
+
 		id: number
 		username: string
 		joinDate: Date
@@ -162,19 +162,19 @@ declare module "bancho.js" {
 		totalSecondsPlayed: number
 		ppCountryRank: number
 		events: Array<nodesu.UserEvent>
-	
+
 		/**
 		 * Fetch the user from the osu! API if possible. Populates all the "optional" properties of BanchoUser.
-		 * 
+		 *
 		 * @throws {Error} osu! API/no API key error
 		 */
 		fetchFromAPI(): Promise<nodesu.User>
-		
+
 		/**
 		 * Returns true if the user is the client
 		 */
 		isClient(): boolean
-	
+
 		/**
 		 * Sends a PM to this user.
 		 */
@@ -261,7 +261,7 @@ declare module "bancho.js" {
 		constructor(banchojs: BanchoClient, recipient: BanchoUser|BanchoChannel, message: string)
 		/**
 		 * Sends the prepared message to the recipient
-		 * 
+		 *
 		 * @throws {Error} If recipient isn't a valid type
 		 */
 		send(): Promise<null>
@@ -288,7 +288,7 @@ declare module "bancho.js" {
 		channelMembers: Map<string, BanchoChannelMember>
 		/**
 		 * Sends a message to this channel
-		 * 
+		 *
 		 * Elevated Bancho users are advised to heavily sanitize their inputs.
 		 */
 		sendMessage(message: string): Promise<null>
@@ -304,13 +304,13 @@ declare module "bancho.js" {
 		 * @param listener the callback with the message
 		 */
 		on(event: "message", listener: (message: BanchoMessage) => void): this
-		
+
 		/**
 		 * Registers a listener for when a user joins this channel.
 		 * @param listener the callback
 		 */
 		on(event: "JOIN", listener: (member: BanchoChannelMember) => void): this
-		
+
 		/**
 		 * Registers a listener for when a user leaves this channel.
 		 * @param listener the callback
@@ -328,7 +328,7 @@ declare module "bancho.js" {
 
 	/**
 	 * Represents a Bancho multiplayer lobby.
-	 * 
+	 *
  	 * Highly recommended to await updateSettings before manipulating (else some properties will be null).
 	 */
 	export class BanchoLobby extends EventEmitter {
@@ -348,7 +348,7 @@ declare module "bancho.js" {
 		/**
 		 * Array of BanchoLobbyPlayer determining each users' slot, from 0 to 15
 		 */
-		slots: Array<BanchoLobbyPlayer>
+		slots: Array<BanchoLobbyPlayer | null>
 		/**
 		 * Current size of the lobby
 		 */
@@ -356,7 +356,7 @@ declare module "bancho.js" {
 		gamemode: nodesu.ModeType
 		/**
 		 * Beatmap fetched from the API (late/not as reliable, use beatmapId when possible)
-		 * 
+		 *
 		 */
 		beatmap: nodesu.Beatmap
 		beatmapId: number
@@ -436,7 +436,7 @@ declare module "bancho.js" {
 		 * @param winCondition See BanchoLobbyWinConditions
 		 */
 		setSettings(teamMode?: number, winCondition?: number, size?: number): Promise<null>
-		
+
 		/**
 		 * Moves a player from one slot to another
 		 * @param slot starting from 0
@@ -599,6 +599,12 @@ declare module "bancho.js" {
 		on(event: "winCondition", listener: (winCondition: number) => void): this
 		on(event: "userNotFound", listener: () => void): this
 		on(event: "userNotFoundUsername", listener: (username: string) => void): this
+		on(event: "timerEnded", listener: () => void): this
+		on(event: "timerAborted", listener: () => void): this
+		on(event: "timerTick", listener: (seconds: number) => void): this
+		on(event: "startTimerStarted", listener: (seconds: number) => void): this
+		on(event: "startTimerAborted", listener: () => void): this
+		on(event: "startTimerTick", listener: (seconds: number) => void): this
 	}
 
 	export class BanchoLobbyPlayer {
@@ -644,8 +650,8 @@ declare module "bancho.js" {
 	/** A Bancho channel member */
 	export class BanchoChannelMember {
 		/**
-		 * @param client 
-		 * @param channel 
+		 * @param client
+		 * @param channel
 		 * @param userString Username with optional @ or + prefix (that will automatically determine the role)
 		 */
 		constructor(client: BanchoClient, channel: BanchoChannel, userString: string)
@@ -747,7 +753,7 @@ declare module "bancho.js" {
 		/**
 		 * Parse mods in their bit flags form and returns them in an array of BanchoMods.
 		 * @param bits Mods combination in bit flags form
-		 * @param returnNone Returns [BanchoMods.None] if bits is equal to 0 
+		 * @param returnNone Returns [BanchoMods.None] if bits is equal to 0
 		 */
 		parseBitFlags(bits: number, returnNone?: boolean): BanchoMod[]
 		/**
@@ -882,23 +888,23 @@ declare module "bancho.js" {
 	 * Contains the different connect states: Disconnected, Connecting, Reconnecting, Connected.
 	 */
 	type ConnectStateTypes = {
-		/** 
-		 * When we're purposely disconnected from Bancho or after an auth fail 
+		/**
+		 * When we're purposely disconnected from Bancho or after an auth fail
 		 */
 		Disconnected: Symbol,
-	
-		/** 
-		 * When we've opened the socket before any reconnection attempts and waiting for the Welcome packet 
+
+		/**
+		 * When we've opened the socket before any reconnection attempts and waiting for the Welcome packet
 		 */
 		Connecting: Symbol,
-	
-		/** 
-		 * When we've gotten disconnected, and are currently waiting before trying to reconnect 
+
+		/**
+		 * When we've gotten disconnected, and are currently waiting before trying to reconnect
 		 */
 		Reconnecting: Symbol,
-	
-		/** 
-		 * When we're online! \o/ 
+
+		/**
+		 * When we're online! \o/
 		 */
 		Connected: Symbol
 	}

package/lib/BanchoChannel.js

@@ -97,6 +97,8 @@ class BanchoChannel extends EventEmitter {
 	 * @returns {Promise<null>}
 	 */
 	join() {
+		if (this.joined)
+			return Promise.resolve();
 		return this._joinOrPart("JOIN", "joinCallback", "joinPromise");
 	}
 
@@ -107,6 +109,8 @@ class BanchoChannel extends EventEmitter {
 	 * @returns {Promise<null>}
 	 */
 	leave() {
+		if (!this.joined)
+			return Promise.resolve();
 		return this._joinOrPart("PART", "partCallback", "partPromise");
 	}
 
@@ -137,4 +141,4 @@ class BanchoChannel extends EventEmitter {
 	}
 }
 
-module.exports = BanchoChannel;
+module.exports = BanchoChannel;

package/lib/BanchoClient.js

@@ -103,7 +103,7 @@ class BanchoClient extends EventEmitter {
 		this.setMaxListeners(50);
 		if(!this.username || !this.password)
 			throw new Error("You gotta gimme an username and a password to connect to Bancho dumbass");
-		
+
 		this.client = null;
 		this.connectState = ConnectStates.Disconnected;
 		this.reconnect = true;
@@ -115,6 +115,7 @@ class BanchoClient extends EventEmitter {
 		this.usersById = new CacheMap();
 		this.channels = {};
 		this.messagesQueue = [];
+		this.lobbyCreationQueue = [];
 
 		// Register our own error listener so there are no uncaught exceptions
 		// for exceptions WE throw for the end-user that don't need to be caught (such as timeouts)
@@ -151,10 +152,11 @@ class BanchoClient extends EventEmitter {
 				else if(message.recipient instanceof BanchoChannel)
 					this.emit("CM", new ChannelMessage(this.getSelf(), content, true, message.recipient));
 
-				this.messagesQueue.shift();
 				resolve();
 			} catch(e) {
 				reject(e);
+			} finally {
+				this.messagesQueue.shift();
 			}
 		}
 	}
@@ -176,7 +178,7 @@ class BanchoClient extends EventEmitter {
 			this.emit("error", err);
 			this.onClose(err);
 		});
-	
+
 		this.client.on("close", () => {
 			if(!this.ignoreClose)
 				this.onClose(new Error("Connection closed"));
@@ -205,7 +207,7 @@ class BanchoClient extends EventEmitter {
 
 	/**
 	 * Send raw data over IRC.
-	 * @param {string} data 
+	 * @param {string} data
 	 * @param {boolean} throwIfDisconnected Throws an Error if we're disconnected
 	 * @private
 	 */
@@ -218,7 +220,7 @@ class BanchoClient extends EventEmitter {
 
 	/**
 	 * Update connection state
-	 * @param {ConnectState} newConnectState 
+	 * @param {ConnectState} newConnectState
 	 * @param {Error} err Error to emit with the new state
 	 * @fires BanchoClient#connected
 	 * @fires BanchoClient#disconnected
@@ -257,7 +259,7 @@ class BanchoClient extends EventEmitter {
 
 	/**
 	 * Executed when connection is expectedly or not closed
-	 * @param {Error} err 
+	 * @param {Error} err
 	 * @private
 	 */
 	onClose(err) {
@@ -268,14 +270,14 @@ class BanchoClient extends EventEmitter {
 
 		if(this.connectState == ConnectStates.Disconnected)
 			return;
-		
+
 		if(!this.reconnect)
 			return this.updateState(ConnectStates.Disconnected, err);
-		
+
 		this.updateState(ConnectStates.Reconnecting, err);
 		if(this.reconnectTimeout)
 			clearTimeout(this.reconnectTimeout);
-		
+
 		this.reconnectTimeout = setTimeout(() => {
 			if(this.reconnect) {
 				const oldCallback = this.connectCallback;
@@ -288,7 +290,7 @@ class BanchoClient extends EventEmitter {
 
 	/**
 	 * Handle incoming IRC commands from Bancho
-	 * @param {string} command 
+	 * @param {string} command
 	 * @private
 	 */
 	handleIrcCommand(command) {
@@ -309,8 +311,8 @@ class BanchoClient extends EventEmitter {
 
 	/**
 	 * Get a BanchoUser instance for the specified username
-	 * 
-	 * @param {string} username 
+	 *
+	 * @param {string} username
 	 * @returns {BanchoUser}
 	 */
 	getUser(username) {
@@ -332,7 +334,7 @@ class BanchoClient extends EventEmitter {
 
 	/**
 	 * Get a BanchoUser instance for the specified user id
-	 * 
+	 *
 	 * @async
 	 * @param {number} userid
 	 * @returns {Promise<BanchoUser>}
@@ -355,8 +357,8 @@ class BanchoClient extends EventEmitter {
 
 	/**
 	 * Get a BanchoChannel instance for the specified name
-	 * 
-	 * @param {string} channelName 
+	 *
+	 * @param {string} channelName
 	 * @returns {BanchoChannel|BanchoMultiplayerChannel}
 	 */
 	getChannel(channelName) {
@@ -372,7 +374,7 @@ class BanchoClient extends EventEmitter {
 
 	/**
 	 * Creates a multiplayer lobby and return its channel.
-	 * 
+	 *
 	 * @async
 	 * @param {string} name Lobby name
 	 * @param {boolean} [privateLobby] Mark as private
@@ -385,33 +387,58 @@ class BanchoClient extends EventEmitter {
 			if(!name || !name.trim())
 				throw new Error("Empty name!");
 			name = name.trim();
-
-			const BanchoBot = this.getUser("BanchoBot");
-			const command = !privateLobby ? "make" : "makeprivate";
-			BanchoBot.sendMessage("!mp "+command+" "+name).then(() => {
-				setTimeout(() => {
-					reject(new Error("Multiplayer lobby creation timeout has been reached!"));
-				}, 10000);
-				const matchCreatedRegex = /Created the tournament match https:\/\/osu\.ppy\.sh\/mp\/(\d+) (.+)/;
-				const listener = (msg) => {
-					const m = matchCreatedRegex.exec(msg.message);
-					if(!m || m[2] != name)
-						return;
-	
-					BanchoBot.removeListener("message", listener);
-					const channel = this.getChannel("#mp_"+Number(m[1]));
-					if(!channel.lobby)
-						return reject(new Error("Not a multiplayer channel?! This shouldn't happen..."));
-					resolve(channel);
-				};
-				BanchoBot.on("message", listener);
+			this.lobbyCreationQueue.push({
+				name,
+				privateLobby,
+				resolve,
+				reject,
 			});
+			if(this.lobbyCreationQueue.length === 1)
+				this.processLobbyCreationQueue();
 		});
 	}
 
+	async processLobbyCreationQueue() {
+		while(this.lobbyCreationQueue[0]) {
+			const { name, privateLobby, resolve, reject } = this.lobbyCreationQueue[0];
+
+			try {
+				if(!this.isConnected())
+					throw new Error("Currently disconnected!");
+
+				// eslint-disable-next-line no-async-promise-executor
+				resolve(await new Promise(async (resolve, reject) => {
+					const BanchoBot = this.getUser("BanchoBot");
+					const command = !privateLobby ? "make" : "makeprivate";
+					await BanchoBot.sendMessage("!mp "+command+" "+name);
+					setTimeout(() => {
+						reject(new Error("Multiplayer lobby creation timeout has been reached!"));
+					}, 10000);
+					const matchCreatedRegex = /Created the tournament match https:\/\/osu\.ppy\.sh\/mp\/(\d+) (.+)/;
+					const listener = (msg) => {
+						const m = matchCreatedRegex.exec(msg.message);
+						if(!m)
+							return;
+
+						BanchoBot.removeListener("message", listener);
+						const channel = this.getChannel("#mp_"+Number(m[1]));
+						if(!channel.lobby)
+							return reject(new Error("Not a multiplayer channel?! This shouldn't happen..."));
+						resolve(channel);
+					};
+					BanchoBot.on("message", listener);
+				}));
+			} catch(e) {
+				reject(e);
+			} finally {
+				this.lobbyCreationQueue.shift();
+			}
+		}
+	}
+
 	/**
 	 * Connects to Bancho, rejects an Error if connection fails
-	 * 
+	 *
 	 * @method
 	 * @async
 	 * @return {Promise<null, Error>}
@@ -421,7 +448,7 @@ class BanchoClient extends EventEmitter {
 			if(this.connectState == ConnectStates.Connected ||
 				this.connectState == ConnectStates.Connecting)
 				return reject(new Error("Already connected/connecting"));
-			
+
 			this.connectCallback = (err) => {
 				if(err)
 					return reject(err);
@@ -441,18 +468,18 @@ class BanchoClient extends EventEmitter {
 
 	/**
 	 * Disconnects from Bancho
-	 * 
+	 *
 	 * @method
 	 */
 	disconnect() {
 		if(this.connectState == ConnectStates.Disconnected)
 			return;
-		
+
 		if(this.isConnected())
 			this.send("QUIT");
 		else if(this.connectState == ConnectStates.Connecting)
 			this.client.destroy();
-		
+
 		if(this.reconnectTimeout) {
 			clearTimeout(this.reconnectTimeout);
 			this.reconnectTimeout = null;
@@ -463,7 +490,7 @@ class BanchoClient extends EventEmitter {
 
 	/**
 	 * When we've just connected, execute the connect callback
-	 * 
+	 *
 	 * @param {any} arg Arg to pass to the callback
 	 * @param {boolean} [erase=true] Erase the existing callback
 	 * @param {boolean} [throwIfNonexistant=false] Throw an error if the callback doesn't exist
@@ -481,16 +508,16 @@ class BanchoClient extends EventEmitter {
 
 	/**
 	 * Returns the current connection state.
-	 * 
+	 *
 	 * @returns {Symbol} Current connection state. See ConnectStates
 	 */
 	getConnectState() {
 		return this.connectState;
 	}
-	
+
 	/**
 	 * Returns true if the connectState is Connected, otherwise false.
-	 * 
+	 *
 	 * @returns {boolean}
 	 */
 	isConnected() {
@@ -499,7 +526,7 @@ class BanchoClient extends EventEmitter {
 
 	/**
 	 * Returns true if the connectState is Disconnected, otherwise false.
-	 * 
+	 *
 	 * @returns {boolean}
 	 */
 	isDisconnected() {
@@ -507,4 +534,4 @@ class BanchoClient extends EventEmitter {
 	}
 }
 
-module.exports = BanchoClient;
+module.exports = BanchoClient;

package/lib/IrcCommands/JoinCommand.js

@@ -14,26 +14,27 @@ class JoinCommand extends IrcCommand {
 
 	/**
 	 * Emits the JOIN event
-	 * 
+	 *
 	 * @fires BanchoClient#JOIN
-	 * @param {BanchoClient} client 
+	 * @param {BanchoClient} client
 	 * @param {BanchoUser} user
-	 * @param {BanchoChannel} channel 
+	 * @param {BanchoChannel} channel
 	 */
 	emit(client, user, channel) {
-		/**
-		 * Fired when a user has joined a channel
-		 * @event BanchoClient#JOIN
-		 * @type {BanchoChannelMember}
-		 */
 		const member = new BanchoChannelMember(client, channel, user.ircUsername);
 		channel.channelMembers.set(user.ircUsername, member);
-		client.emit("JOIN", member);
 		if(user.isClient()) {
 			channel.joined = true;
 			if(channel.joinCallback != null)
 				channel.joinCallback();
 		}
+
+		/**
+		 * Fired when a user has joined a channel
+		 * @event BanchoClient#JOIN
+		 * @type {BanchoChannelMember}
+		 */
+		client.emit("JOIN", member);
 	}
 
 	handleCommand(client, command, splits) {
@@ -43,4 +44,4 @@ class JoinCommand extends IrcCommand {
 	}
 }
 
-module.exports = JoinCommand;
+module.exports = JoinCommand;

package/lib/IrcCommands/PartCommand.js

@@ -13,27 +13,31 @@ class PartCommand extends JoinCommand {
 
 	/**
 	 * Emits the PART event
-	 * 
+	 *
 	 * @fires BanchoClient#PART
-	 * @param {BanchoClient} client 
-	 * @param {BanchoUser} user 
-	 * @param {BanchoChannel} channel 
+	 * @param {BanchoClient} client
+	 * @param {BanchoUser} user
+	 * @param {BanchoChannel} channel
 	 */
 	emit(client, user, channel) {
-		/**
-		 * Fired when a user has left a channel
-		 * @event BanchoClient#PART
-		 * @type {BanchoChannelMember}
-		 */
-		if(channel.channelMembers.has(user.ircUsername))
-			client.emit("PART", channel.channelMembers.get(user.ircUsername));
+		const member = channel.channelMembers.get(user.ircUsername);
+
 		if(user.isClient()) {
 			channel.joined = false;
 			channel.channelMembers.clear();
 			if(channel.partCallback != null)
 				channel.partCallback();
+		} else {
+			channel.channelMembers.delete(user.ircUsername);
 		}
-		channel.channelMembers.delete(user.ircUsername);
+
+		/**
+		 * Fired when a user has left a channel
+		 * @event BanchoClient#PART
+		 * @type {BanchoChannelMember}
+		 */
+		if(member)
+			client.emit("PART", member);
 	}
 }
 

package/lib/Multiplayer/BanchoLobby.js

@@ -413,6 +413,50 @@ class BanchoLobby extends EventEmitter {
 
 					this.emit("matchSettings", ret);
 					break;
+				case "timerEnded":
+				case "timerAborted":
+					/**
+					 * Emitted when a timer ends
+					 * @event BanchoLobby#timerEnded
+					 */
+					/**
+					 * Emitted when a timer is aborted
+					 * @event BanchoLobby#timerAborted
+					 */
+					this.emit(regex.name);
+					break;
+				case "timerTick":
+					/**
+					 * Emitted when a timer ticks
+					 * @event BanchoLobby#timerTick
+					 * @type {object}
+					 * @prop {number} seconds
+					 */
+					this.emit(regex.name, ret.seconds);
+					break;
+				case "startTimerStarted":
+					/**
+					 * Emitted when a start timer is started
+					 * @event BanchoLobby#startTimerStarted
+					 */
+					this.emit(regex.name, ret.seconds);
+					break;
+				case "startTimerAborted":
+					/**
+					 * Emitted when a start timer is aborted
+					 * @event BanchoLobby#startTimerAborted
+					 */
+					this.emit(regex.name);
+					break;
+				case "startTimerTick":
+					/**
+					 * Emitted when a start timer ticks
+					 * @event BanchoLobby#startTimerTick
+					 * @type {object}
+					 * @prop {number} seconds
+					 */
+					this.emit(regex.name, ret.seconds);
+					break;
 			}
 		}
 	}

package/lib/Multiplayer/BanchoLobbyRegexes.js

@@ -291,6 +291,45 @@ module.exports = {
 		},
 		hostCleared: function(str) {
 			return str == "Cleared match host";
+		},
+		timerEnded: function(str) {
+			return str == "Countdown finished";
+		},
+		timerAborted: function(str) {
+			return str == "Countdown aborted";
+		},
+		timerTick: function(str) {
+			const r = /^Countdown ends in (\d+) (minute|second)s?(?: and (\d+) seconds?)?$/;
+			if(r.test(str)) {
+				const m = r.exec(str);
+
+				return {
+					seconds: Number(m[1]) * (m[2] === "minute" ? 60 : 1) + (m[3] ? Number(m[3]) : 0)
+				};
+			}
+		},
+		startTimerStarted: function(str) {
+			const r = /^Queued the match to start in (\d+) (minute|second)s?(?: and (\d+) seconds?)?$/;
+			if(r.test(str)) {
+				const m = r.exec(str);
+
+				return {
+					seconds: Number(m[1]) * (m[2] === "minute" ? 60 : 1) + (m[3] ? Number(m[3]) : 0)
+				};
+			}
+		},
+		startTimerAborted: function(str) {
+			return str == "Aborted the match start timer";
+		},
+		startTimerTick: function(str) {
+			const r = /^Match starts in (\d+) (minute|second)s?(?: and (\d+) seconds?)?$/;
+			if(r.test(str)) {
+				const m = r.exec(str);
+
+				return {
+					seconds: Number(m[1]) * (m[2] === "minute" ? 60 : 1) + (m[3] ? Number(m[3]) : 0)
+				};
+			}
 		}
 	}
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bancho.js",
-  "version": "0.11.5",
+  "version": "0.12.0",
   "description": "Interface with Bancho over IRC, made easy and reliable",
   "main": "index.js",
   "types": "index.d.ts",

package/tests/TestGoals.js

@@ -19,6 +19,8 @@ const TestGoals = {
 	MultiplayerScoresSorting: Symbol("MultiplayerScoresSorting"),
 
 	MultiplayerLobbyExists: Symbol("MultiplayerLobbyExists"),
+	MultiplayerLobbyUpdateSettings: Symbol("MultiplayerLobbyUpdateSettings"),
+	MultiplayerLobbyNamed: Symbol("MultiplayerLobbyNamed"),
 	MultiplayerLobbySetMap: Symbol("MultiplayerLobbySetMap"),
 	MultiplayerLobbySetModsDTFree: Symbol("MultiplayerLobbySetModsDTFree"),
 	MultiplayerLobbySetModsHDHR: Symbol("MultiplayerLobbySetModsHDHR"),
@@ -35,4 +37,4 @@ const TestGoals = {
 	MultiplayerLobbyCloseLobby: Symbol("MultiplayerLobbyCloseLobby")
 };
 
-module.exports = Object.freeze(TestGoals);
+module.exports = Object.freeze(TestGoals);

package/tests/units/JoinEventChannelUnit.js

@@ -10,38 +10,34 @@ class JoinEventChannelUnit extends TestUnit {
 	run() {
 		return new Promise((resolve, reject) => {
 			const channel = this.client.getChannel("#french");
-			let returned = false;
 			this.client.on("JOIN", (obj) => {
 				if(obj.user.isClient() && obj.channel == channel) {
 					this.fulFillGoal(TestGoals.JoinEvent);
-					channel.leave(channel);
 
 					this.client.on("PART", (obj) => {
 						if(obj.user.isClient() && obj.channel == channel) {
 							this.client.removeAllListeners("JOIN");
 							this.client.removeAllListeners("nochannel");
+							this.client.removeAllListeners("PART");
 							this.fulFillGoal(TestGoals.PartEvent);
-							returned = true;
 							resolve();
 						}
 					});
+					channel.leave(channel);
 				}
 			});
 			this.client.on("nochannel", (errorChannel) => {
 				if(errorChannel == channel) {
 					this.client.removeAllListeners("JOIN");
 					this.client.removeAllListeners("nochannel");
-					returned = true;
+					this.client.removeAllListeners("PART");
 					reject(new Error("No such channel: "+errorChannel.name));
 				}
 			});
 			channel.join();
-			setTimeout(() => {
-				if(!returned)
-					reject(new Error("Didn't join after timeout!"));
-			}, 10000);
+			setTimeout(() => reject(new Error("Didn't join and leave after timeout!")), 10000);
 		});
 	}
 }
 
-module.exports = new JoinEventChannelUnit();
+module.exports = new JoinEventChannelUnit();

package/tests/units/MultiplayerLobbiesUnit.js

@@ -20,6 +20,11 @@ class MultiplayerLobbiesUnit extends TestUnit {
 		if(!channel.lobby)
 			throw new Error("lobby doesn't exist! this is a regular channel, not a multiplayer one!");
 		this.fulFillGoal(TestGoals.MultiplayerLobbyExists);
+		await channel.lobby.updateSettings();
+		this.fulFillGoal(TestGoals.MultiplayerLobbyUpdateSettings);
+		if(channel.lobby.name !== roomName)
+			throw new Error("lobby name doesn't match!");
+		this.fulFillGoal(TestGoals.MultiplayerLobbyNamed);
 		await channel.lobby.setMap(75);
 		this.fulFillGoal(TestGoals.MultiplayerLobbySetMap);
 		await channel.lobby.setMods([BanchoMods.enum.DoubleTime], true);
@@ -54,4 +59,4 @@ class MultiplayerLobbiesUnit extends TestUnit {
 	}
 }
 
-module.exports = new MultiplayerLobbiesUnit();
+module.exports = new MultiplayerLobbiesUnit();