the client autodisconnects if streams become done during resend

Author: hpihkala

streamr-client.js

@@ -339,10 +339,11 @@ StreamrClient.prototype.unsubscribe = function(sub) {
 	if (this.subsByStream[sub.streamId].length === 1 && this.connected && !this.disconnecting && sub.isSubscribed()) {
 		this._requestUnsubscribe(sub.streamId)
 	}
-	// Else the sub can be cleaned off immediately
+	// Else the sub can be cleaned off' immediately
 	else {
 		this._removeSubscription(sub)
 		sub.trigger('unsubscribed')
+		this._checkAutoDisconnect()
 	}
 }
 
@@ -454,11 +455,7 @@ StreamrClient.prototype.connect = function(reconnect) {
 			sub.trigger('unsubscribed')
 		})
 
-		// Disconnect if no longer subscribed to any channels
-		if (Object.keys(_this.subsByStream).length===0 && _this.options.autoDisconnect) {
-			console.log("Disconnecting due to no longer being subscribed to any channels")
-			_this.disconnect()
-		}
+		_this._checkAutoDisconnect()
 	})
 
 	// Route resending state messages to corresponding Subscriptions
@@ -529,6 +526,14 @@ StreamrClient.prototype.disconnect = function() {
 	this.socket.disconnect()
 }
 
+StreamrClient.prototype._checkAutoDisconnect = function() {
+	// Disconnect if no longer subscribed to any channels
+	if (Object.keys(this.subsByStream).length===0 && this.options.autoDisconnect) {
+		console.log("Disconnecting due to no longer being subscribed to any channels")
+		this.disconnect()
+	}
+}
+
 StreamrClient.prototype._resendAndSubscribe = function(sub) {
 	var _this = this
 

test/test.streamr-client.js

@@ -791,32 +791,6 @@ describe('StreamrClient', function() {
 				})
 			})
 		})
-	})
-	
-	describe("disconnect", function() {
-
-		it('should disconnect the socket', function(done) {
-			client.connect()
-			client.socket.disconnect = done
-
-			client.socket.once('connect', function() {
-				client.disconnect()
-			})
-		})
-
-		it('should report that it is not connected and not connecting after disconnecting', function(done) {
-			client.connect()
-
-			client.socket.once('connect', function() {
-				client.disconnect()
-			})
-
-			client.socket.once('disconnect', function() {
-				assert(!client.isConnected())
-				assert(!client.connecting)
-				done()
-			})
-		})
 
 		it('should disconnect when no longer subscribed to any streams', function(done) {
 			client.options.autoDisconnect = true
@@ -839,6 +813,30 @@ describe('StreamrClient', function() {
 			})
 		})
 
+		it('should disconnect if all subscriptions are done during resend', function(done) {
+			client.options.autoDisconnect = true
+
+			var sub1 = client.subscribe("stream1", function(message) {}, {resend_all: true})
+			client.connect()
+
+			client.socket.on('resend', function(request) {
+				async(function() {
+					client.socket.emit('resending', {
+						channel: request.channel, 
+						sub: request.sub,
+						from: 0, 
+						to: 0
+					})
+					client.socket.emit('ui', byeMsg(request.channel,0))
+					client.socket.emit('resent', {channel: request.channel, sub: request.sub, from:0, to:0})
+				})
+			})
+
+			client.socket.on('disconnect', function() {
+				done()
+			})
+		})
+
 		it('should not disconnect if autoDisconnect is set to false', function(done) {
 			client.options.autoDisconnect = false
 
@@ -858,6 +856,32 @@ describe('StreamrClient', function() {
 				throw "Should not have disconnected!"
 			})
 		})
+	})
+	
+	describe("disconnect", function() {
+
+		it('should disconnect the socket', function(done) {
+			client.connect()
+			client.socket.disconnect = done
+
+			client.socket.once('connect', function() {
+				client.disconnect()
+			})
+		})
+
+		it('should report that it is not connected and not connecting after disconnecting', function(done) {
+			client.connect()
+
+			client.socket.once('connect', function() {
+				client.disconnect()
+			})
+
+			client.socket.once('disconnect', function() {
+				assert(!client.isConnected())
+				assert(!client.connecting)
+				done()
+			})
+		})
 
 		it('should reset subscriptions when calling disconnect()', function(done) {
 			client.subscribe("stream1", function(message) {})