Merge pull request #216 from BobdenOs/master

Fix discarded enqueued queries
SAP · Aug 29, 2023 · cccd888 · cccd888
2 parents 3f5b524 + 2662a29
commit cccd888
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/protocol/Connection.js b/lib/protocol/Connection.js
@@ -268,6 +268,7 @@ Connection.prototype._addListeners = function _addListeners(socket) {
   function onend() {
     var err = new Error('Connection closed by server');
     err.code = 'EHDBCLOSE';
+    self._clearQueue(err);
     onerror(err);
   }
   socket.on('end', onend);
@@ -276,8 +277,12 @@ Connection.prototype._addListeners = function _addListeners(socket) {
 Connection.prototype._cleanup = function _cleanup() {
   this._socket = undefined;
   this._state = undefined;
+  this._clearQueue()
+};
+
+Connection.prototype._clearQueue = function _clearQueue(err) {
   if (this._queue) {
-    this._queue.abort();
+    this._queue.abort(err);
     this._queue = undefined;
   }
 };

diff --git a/lib/util/Queue.js b/lib/util/Queue.js
@@ -63,7 +63,8 @@ Queue.prototype.pause = function pause() {
   return this;
 };
 
-Queue.prototype.abort = function abort() {
+Queue.prototype.abort = function abort(err) {
+  this.queue.forEach(t => t.receive(err))
   this.queue = [];
   this.busy = false;
   this.running = false;