Merge changes from internal node-hdb repo for v2.26.2 patch release

Merge changes from internal node-hdb repo for v2.26.2 patch release

Author: linjun-he-sap

lib/protocol/ResultSet.js

@@ -150,11 +150,15 @@ ResultSet.prototype.resume = function resume() {
 };
 
 ResultSet.prototype.close = function close(cb) {
-  this.finished = true;
-  this._running = false;
+  if (this.closed) {
+    if (typeof cb === 'function') {
+      return cb();
+    }
+    return;
+  }
   var self = this;
-  process.nextTick(function callEmitEndAndClose() {
-    emitEnd.call(self);
+  emitEnd.call(self);
+  process.nextTick(function callSendClose() {
     sendClose.call(self, cb);
   });
 };
@@ -297,16 +301,19 @@ function sendClose(cb) {
     if (err) {
       debug('close failed: %s', err);
     } else {
-      self.closed = true;
       emitClose.call(self);
     }
     if (util.isFunction(cb)) {
       cb(err);
     }
   }
-  this._connection.closeResultSet({
-    resultSetId: this.id
-  }, done);
+  if (this._connection) {
+    this._connection.closeResultSet({
+      resultSetId: this.id
+    }, done);
+  } else if (util.isFunction(cb)) {
+    cb();
+  }
 }
 
 function sendFetch() {
@@ -348,17 +355,9 @@ function handleData(data) {
     this.emit('data', data.buffer);
   }
 
-  if (isLast(data)) {
-    this.finished = true;
-    this._running = false;
-    this.closed = isClosed(data);
-  }
-
   var self = this;
-  if (self.finished) {
-    process.nextTick(function callEmitEnd() {
-      emitEnd.call(self);
-    });
+  if (isLast(data)) {
+    emitEnd.call(self, isClosed(data));
     return;
   }
 
@@ -369,22 +368,35 @@ function handleData(data) {
   }
 }
 
-function emitEnd() {
+function emitEnd(isClosed = false) {
   /* jshint validthis:true */
   debug('emit "end"');
-  this.emit('end');
-  var self = this;
-  if (this.closed) {
-    process.nextTick(function callEmitClose() {
-      emitClose.call(self);
-    });
+  var shouldEmit = !this.finished;
+  if (!this.finished) {
+    this.finished = true;
+    this._running = false;
   }
+  let self = this;
+  process.nextTick(function callEmitEnd() {
+    if (shouldEmit) {
+      self.emit('end');
+    }
+    if (isClosed) {
+      emitClose.call(self);
+    }
+  });
 }
 
 function emitClose() {
   /* jshint validthis:true */
   debug('emit "close"');
-  this.emit('close');
+  if (!this.closed) {
+    this.closed = true;
+    let self = this;
+    process.nextTick(function callEmitClose() {
+      self.emit('close');
+    });
+  }
 }
 
 function isLast(data) {

package.json

@@ -1,12 +1,19 @@
 {
-  "author": "Koser, Holger <holger.koser@sap.com>",
+  "author": {
+    "name": "SAP SE",
+    "url": "https://www.sap.com/"
+  },
   "contributors": [
+    "Albion, Jeff <jeff.albion@sap.com>",
+    "Ian, McCurdy <ian.mccurdy@sap.com>",
+    "He, Linjun <linjun.he@sap.com>",
+    "Koser, Holger <holger.koser@sap.com>",
     "Vachkov, Georgi <georgi.vachkov@sap.com>",
     "Penev, Alexander <alexander.penev@sap.com>"
   ],
   "name": "hdb",
   "description": "SAP HANA Database Client for Node",
-  "version": "2.26.1",
+  "version": "2.26.2",
   "repository": {
     "type": "git",
     "url": "git://github.com/SAP/node-hdb.git"
@@ -29,20 +36,23 @@
     "node": ">= 18"
   },
   "dependencies": {
-    "iconv-lite": "^0.4.18"
+    "iconv-lite": "0.7.0"
   },
   "devDependencies": {
-    "async": "^2.4.1",
-    "chrome-net": "^3.3.0",
-    "concat-stream": "^1.5.1",
-    "coveralls": "^2.13.1",
-    "fstream": "^1.0.11",
-    "generic-pool": "^2.4.2",
-    "istanbul": "^0.4.4",
-    "mocha": "^3.4.2",
-    "should": "^10.0.0"
+    "async": "2.6.4",
+    "chrome-net": "3.3.4",
+    "concat-stream": "1.6.2",
+    "coveralls": "2.13.3",
+    "fstream": "1.0.12",
+    "generic-pool": "2.5.4",
+    "istanbul": "0.4.5",
+    "mocha": "3.5.3",
+    "should": "10.0.0"
   },
   "optionalDependencies": {
-    "lz4-wasm-nodejs": "^0.9.2"
+    "lz4-wasm-nodejs": "0.9.2"
+  },
+  "overrides": {
+    "safer-buffer": "2.1.2"
   }
 }

test/lib.ResultSet.js

@@ -549,5 +549,30 @@ describe('Lib', function () {
       });
     });
 
+    it('should not fail when closed multiple times', function (done) {
+      let rs = createSimpleResultSet();
+      rs.closed.should.be.false;
+      let closeCount = 0;
+      rs.close(function (err) {
+        closeCount += 1;
+        rs.closed.should.be.true;
+        (err === undefined).should.be.true;
+        rs.close(function (err) {
+          closeCount += 1;
+          (err === undefined).should.be.true;
+          if (closeCount === 3) {
+            done();
+          }
+        });
+      });
+      rs.close(function (err) {
+        closeCount += 1;
+        (err === undefined).should.be.true;
+        if (closeCount === 3) {
+          done();
+        }
+      });
+    });
+
   });
 });