Typescript: remove @class/@extends/@Property declarations

smogon · Jul 13, 2017 · 6e3e4dd · 6e3e4dd
1 parent ba03b66
commit 6e3e4dd
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 24 deletions.
diff --git a/sockets-workers.js b/sockets-workers.js
@@ -39,18 +39,16 @@ const SUBCHANNEL_MESSAGE_REGEX = /\|split\n([^\n]*)\n([^\n]*)\n([^\n]*)\n[^\n]*/
  * Manages the worker's state for sockets, channels, and
  * subchannels. This is responsible for parsing all outgoing and incoming
  * messages.
- *
- * @class Multiplexer
- * @property {number} socketCounter
- * @property {Map<string, any>} sockets
- * @property {Map<string, Map<string, string>>} channels
- * @property {?NodeJS.Timer} cleanupInterval
  */
 class Multiplexer {
 	constructor() {
+		/** @type {number} */
 		this.socketCounter = 0;
+		/** @type {Map<string, any>} */
 		this.sockets = new Map();
+		/** @type {Map<string, Map<string, string>>} */
 		this.channels = new Map();
+		/** @type {?NodeJS.Timer} */
 		this.cleanupInterval = setInterval(() => this.sweepClosedSockets(), 10 * 60 * 1000);
 	}
 
@@ -85,6 +83,7 @@ class Multiplexer {
 
 	/**
 	 * Sends an IPC message to the parent process.
+	 *
 	 * @param {string} token
 	 * @param {string[]} params
 	 */
@@ -96,6 +95,7 @@ class Multiplexer {
 	/**
 	 * Parses the params in a downstream message sent as a
 	 * command.
+	 *
 	 * @param {string} params
 	 * @param {number} count
 	 * @return {string[]}
@@ -130,6 +130,7 @@ class Multiplexer {
 
 	/**
 	 * Parses downstream messages.
+	 *
 	 * @param {string} data
 	 * @return {boolean}
 	 */
@@ -168,6 +169,7 @@ class Multiplexer {
 
 	/**
 	 * Safely tries to destroy a socket's connection.
+	 *
 	 * @param {any} socket
 	 */
 	tryDestroySocket(socket) {
@@ -179,6 +181,7 @@ class Multiplexer {
 
 	/**
 	 * Eval handler for downstream messages.
+	 *
 	 * @param {string} expr
 	 * @return {boolean}
 	 */
@@ -192,6 +195,7 @@ class Multiplexer {
 
 	/**
 	 * Sockets.socketConnect message handler.
+	 *
 	 * @param {any} socket
 	 * @return {boolean}
 	 */
@@ -240,6 +244,7 @@ class Multiplexer {
 
 	/**
 	 * Sockets.socketSend message handler.
+	 *
 	 * @param {string} socketid
 	 * @param {string} message
 	 * @return {boolean}
@@ -255,6 +260,7 @@ class Multiplexer {
 	/**
 	 * onmessage event handler for sockets. Passes the message
 	 * upstream.
+	 *
 	 * @param {string} socketid
 	 * @param {string} message
 	 * @return {boolean}
@@ -282,6 +288,7 @@ class Multiplexer {
 
 	/**
 	 * Sockets.channelAdd message handler.
+	 *
 	 * @param {string} channelid
 	 * @param {string} socketid
 	 * @return {boolean}
@@ -303,6 +310,7 @@ class Multiplexer {
 
 	/**
 	 * Sockets.channelRemove message handler.
+	 *
 	 * @param {string} channelid
 	 * @param {string} socketid
 	 * @return {boolean}
@@ -319,6 +327,7 @@ class Multiplexer {
 	/**
 	 * Sockets.channelSend and Sockets.channelBroadcast message
 	 * handler.
+	 *
 	 * @param {string} channelid
 	 * @param {string} message
 	 * @return {boolean}
@@ -343,6 +352,7 @@ class Multiplexer {
 
 	/**
 	 * Sockets.subchannelMove message handler.
+	 *
 	 * @param {string} channelid
 	 * @param {string} subchannelid
 	 * @param {string} socketid
@@ -364,6 +374,7 @@ class Multiplexer {
 
 	/**
 	 * Sockets.subchannelBroadcast message handler.
+	 *
 	 * @param {string} channelid
 	 * @param {string} message
 	 * @return {boolean}
@@ -410,7 +421,9 @@ class Multiplexer {
 	 * is already disconnected.
 	 */
 	destroy() {
+		// @ts-ignore
 		clearInterval(this.cleanupInterval);
+		this.cleanupInterval = null;
 		this.sockets.forEach(socket => this.tryDestroySocket(socket));
 		this.sockets.clear();
 		this.channels.clear();