Note down the cause of inactive connections

More info for #99
animetosho · Jan 21, 2023 · b5b90b2 · b5b90b2
1 parent af78ba5
commit b5b90b2
Showing 1 changed file with 20 additions and 9 deletions.
diff --git a/lib/nntp.js b/lib/nntp.js
@@ -134,6 +134,7 @@ function NNTP(opts, rawSpeedTracker) {
 
 NNTP.prototype = {
 	state: 'inactive',
+	stateCause: 'unused',
 	socket: null,
 	postMethod: 'POST',
 	_timer: null,
@@ -318,7 +319,7 @@ NNTP.prototype = {
 				this._close(next);
 		}.bind(this))((this._finished ?
 			function() {
-				this._setState('inactive');
+				this._setState('inactive', 'connect fail');
 				var e = new NNTPError('connect_fail', 'NNTP connection failed: ' + errMsg);
 				cb(e);
 				this._runCloseCbs();
@@ -332,7 +333,7 @@ NNTP.prototype = {
 			}
 		:
 			function() {
-				this._setState('waiting');
+				this._setState('waiting', 'connect fail');
 				this.warn('NNTP connection failed: ' + errMsg + ', reconnecting after ' +(this.opts.reconnectDelay/1000)+ ' second(s)... (attempt ' + (this.opts.connectRetries - this._connectRetries) + '/' + this.opts.connectRetries + ')');
 
 				this._connectCb = cb; // set this back for .destroy() calls to work properly (.connect() will reset this anyway)
@@ -343,7 +344,7 @@ NNTP.prototype = {
 	},
 	_onClose: function(had_error) {
 		if(!this.socket) return; // node 10.x issue
-		this._setState('disconnected');
+		this._setState('disconnected', 'closed');
 		this.dataQueue = [];
 		this.dataLength = 0;
 		this.debug('NNTP connection closed');
@@ -424,7 +425,7 @@ NNTP.prototype = {
 						self.connect();
 				});
 			} else {
-				self._setState('inactive');
+				self._setState('inactive', 'no requests');
 			}
 		});
 	},
@@ -593,7 +594,7 @@ NNTP.prototype = {
 			} else
 				self._end(cb, CMD_QUIT);
 		})(function() {
-			self._setState('inactive');
+			self._setState('inactive', 'end');
 			self._callMulti(self._getNotifyCbs(), new NNTPError('cancelled', 'Request cancelled (via \'end\')'));
 			self._runCloseCbs();
 			self._resetState();
@@ -617,7 +618,7 @@ NNTP.prototype = {
 			} else
 				cb();
 		})(function() {
-			self._setState('inactive');
+			self._setState('inactive', 'close');
 			self._callMulti(cbs, new NNTPError('cancelled', 'Request cancelled (via \'close\')'));
 			self._runCloseCbs();
 			self._resetState();
@@ -633,7 +634,7 @@ NNTP.prototype = {
 		if(this._throttleHandle)
 			this._throttleHandle.cancel();
 		this._destroy();
-		this._setState('inactive');
+		this._setState('inactive', 'destroy');
 		this._resetState();
 		this._callMulti(cbs, new NNTPError('cancelled', 'Request cancelled (via \'destroy\')'));
 	},
@@ -1023,16 +1024,20 @@ NNTP.prototype = {
 	},
 
 	getCurrentActivity: function() {
-		if(this.state != 'connected')
+		if(this.state != 'connected') {
+			if(this.stateCause)
+				return this.state + ' [' + this.stateCause + ']';
 			return this.state;
+		}
 		if(!this._requests.length)
 			return 'idle';
 		if(this._requests[0].type == 'post-upload')
 			return 'posting';
 		return 'requesting (' + this._requests[0].type + ')';
 	},
-	_setState: function(state) {
+	_setState: function(state, cause) {
 		this.state = state;
+		this.stateCause = cause;
 		this.lastActivity = Date.now();
 	},
 	_startRequest: function(req) {
@@ -1070,6 +1075,12 @@ NNTP.prototype = {
 			active[type] = 1 + (active[type] || 0);
 		});
 
+		// check for mis-labelled stuff?
+		for(var k in active) {
+			if(!(k in this.numRequests))
+				this.numRequests[k] = 0;
+		}
+
 		var ret = [];
 		for(var k in this.numRequests) {
 			var count = '' + this.numRequests[k];