client: make connection.reconnect true by default

AlcaDesign · AlcaDesign · commit f9a5b3a41d6f · 2021-04-13T08:17:44.000-05:00
diff --git a/lib/client.js b/lib/client.js
@@ -30,7 +30,7 @@ class Client extends EventEmitter {
 
 		this.maxReconnectAttempts = _.get(this.opts.connection.maxReconnectAttempts, Infinity);
 		this.maxReconnectInterval = _.get(this.opts.connection.maxReconnectInterval, 30000);
-		this.reconnect = _.get(this.opts.connection.reconnect, false);
+		this.reconnect = _.get(this.opts.connection.reconnect, true);
 		this.reconnectDecay = _.get(this.opts.connection.reconnectDecay, 1.5);
 		this.reconnectInterval = _.get(this.opts.connection.reconnectInterval, 1000);
 
diff --git a/test/commands.js b/test/commands.js
@@ -412,7 +412,8 @@ describe('commands (justinfan)', function() {
 			connection: {
 				server: 'localhost',
 				port: 7000,
-				timeout: 1
+				timeout: 1,
+				reconnect: false
 			}
 		});
 	});
diff --git a/test/websockets.js b/test/websockets.js
@@ -54,7 +54,7 @@ describe('websockets', function() {
 	});
 });
 
-describe('server crashed, with reconnect: false (default)', function() {
+describe('server crashed, with reconnect: true (default)', function() {
 	before(function() {
 		// Initialize websocket server
 		this.server = new WebSocketServer({ port: 7000 });
@@ -66,7 +66,7 @@ describe('server crashed, with reconnect: false (default)', function() {
 		});
 	});
 
-	it('gracefully handle the error', function(cb) {
+	it('attempt to reconnect', function(cb) {
 		this.timeout(15000);
 		const client = this.client;
 		const server = this.server;
@@ -77,28 +77,30 @@ describe('server crashed, with reconnect: false (default)', function() {
 		});
 
 		client.on('disconnected', function() {
-			'Test that we reached this point'.should.be.ok();
-			cb();
+			setTimeout(function() {
+				'Test that we reached this point'.should.be.ok();
+				cb();
+			}, client.reconnectTimer);
 		});
 
 		client.connect().catch(catchConnectError);
 	});
 });
 
-describe('server crashed, with reconnect: true', function() {
+describe('server crashed, with reconnect: false', function() {
 	before(function() {
 		// Initialize websocket server
 		this.server = new WebSocketServer({ port: 7000 });
 		this.client = new tmi.client({
 			connection: {
 				server: 'localhost',
 				port: 7000,
-				reconnect: true
+				reconnect: false
 			}
 		});
 	});
 
-	it('attempt to reconnect', function(cb) {
+	it('gracefully handle the error', function(cb) {
 		this.timeout(15000);
 		const client = this.client;
 		const server = this.server;
@@ -109,10 +111,8 @@ describe('server crashed, with reconnect: true', function() {
 		});
 
 		client.on('disconnected', function() {
-			setTimeout(function() {
-				'Test that we reached this point'.should.be.ok();
-				cb();
-			}, client.reconnectTimer);
+			'Test that we reached this point'.should.be.ok();
+			cb();
 		});
 
 		client.connect().catch(catchConnectError);
