oracledb 6.0.2 → 6.1.0

package/lib/thin/sqlnet/networkSession.js

@@ -37,7 +37,7 @@ const { Buffer } = require('buffer');
 const EzConnect = require("./ezConnectResolver.js");
 const { NLParamParser, tnsnamesFilePath } = require("./paramParser.js");
 const process = require('process');
-
+const downHostInstance = require("./connStrategy.js").SOLE_INST_DHCACHE;
 /**
  *
  * @param {string} userConfig
@@ -45,19 +45,20 @@ const process = require('process');
  */
 
 async function getConnectionInfo(userConfig) {
-  let connStr = await resolveConnectStr(userConfig.connectString, userConfig.configDir);
+  const connStr = await resolveConnectStr(userConfig.connectString, userConfig.configDir);
   let nvpair;
   if (typeof connStr === 'string')
     nvpair = createNVPair(connStr);
   else
     nvpair = connStr;//Already a NVPair
 
-  let serverVal = findValue(nvpair, ["DESCRIPTION", "CONNECT_DATA", "SERVER"]);
-  let connClass = findValue(nvpair, ["DESCRIPTION", "CONNECT_DATA", "POOL_CONNECTION_CLASS"]);
-  let svcname =   findValue(nvpair, ["DESCRIPTION", "CONNECT_DATA", "SERVICE_NAME"]);
-  let poolPurity = findValue(nvpair, ["DESCRIPTION", "CONNECT_DATA", "POOL_PURITY"]);
+  const serverVal = findValue(nvpair, ["DESCRIPTION", "CONNECT_DATA", "SERVER"]);
+  const connClass = findValue(nvpair, ["DESCRIPTION", "CONNECT_DATA", "POOL_CONNECTION_CLASS"]);
+  const svcname =   findValue(nvpair, ["DESCRIPTION", "CONNECT_DATA", "SERVICE_NAME"]);
+  const sid =   findValue(nvpair, ["DESCRIPTION", "CONNECT_DATA", "SID"]);
+  const poolPurity = findValue(nvpair, ["DESCRIPTION", "CONNECT_DATA", "POOL_PURITY"]);
 
-  return [serverVal, connClass, svcname, poolPurity ];
+  return [serverVal, connClass, svcname, poolPurity, sid ];
 }
 
 /**
@@ -65,20 +66,20 @@ async function getConnectionInfo(userConfig) {
  * @param {String} connStr Connect string
  * @returns AddressNode
  */
-let nlParamParser =  new NLParamParser;
+const nlParamParser =  new NLParamParser;
 async function resolveConnectStr(connectString, configDir) {
-  let connStr = connectString.trim();
+  const connStr = connectString.trim();
   let resolvedVal = connStr;
   if ((connStr.indexOf(')') == -1) || (connStr.indexOf('(') != 0)) {
     try {
       /* Try through ezconnect */
-      let ezcnObj = new EzConnect(connStr);
+      const ezcnObj = new EzConnect(connStr);
       resolvedVal = await ezcnObj.getResolvedUrl();
     } catch (err) {
       try {
         /* try tns alias */
-        let namesFilePath = tnsnamesFilePath(configDir);
-        let p = await nlParamParser.initializeNlpa(namesFilePath);
+        const namesFilePath = tnsnamesFilePath(configDir);
+        const p = await nlParamParser.initializeNlpa(namesFilePath);
         resolvedVal = p.get(connStr.toUpperCase());
         if (!resolvedVal)
           errors.throwErr(errors.ERR_TNS_ENTRY_NOT_FOUND, connStr, configDir ? configDir + '/tnsnames.ora' : process.env.TNS_ADMIN + '/tnsnames.ora');
@@ -96,7 +97,7 @@ async function resolveConnectStr(connectString, configDir) {
 }
 
 async function resolveAddress(connStr, configDir) {
-  let connstr = await resolveConnectStr(connStr, configDir);
+  const connstr = await resolveConnectStr(connStr, configDir);
   return createNode(connstr);
 }
 
@@ -140,23 +141,24 @@ class NetworkSession {
 
   async getAddress(addressNode, userConfig) {
     /* Get the next address */
-    let address = await addressNode.execute(userConfig);
+    const address = await addressNode.execute(userConfig);
     /* Prepare connection attributes */
-    let uuid = this.sAtts ? this.sAtts.uuid : null;
+    const uuid = this.sAtts ? this.sAtts.uuid : null;
     this.sAtts = new SessionAtts(uuid);
     this.sAtts.setFrom(userConfig);
     this.sAtts.setFrom(address.desc.params);  /* Resolve attributes from Connect String */
     await this.sAtts.prepare(address.protocol);
 
     /* Insert Connection ID */
-    let rootNVPair = createNVPair(address.CNdata.join(""));
-    let cdataNVPair = findNVPairRecurse(rootNVPair, "CONNECT_DATA");
-    let connidStr = `(CONNECTION_ID=${this.sAtts.connectionId})`;
-    let childNVPair = createNVPair(connidStr);
+    const rootNVPair = createNVPair(address.CNdata.join(""));
+    const cdataNVPair = findNVPairRecurse(rootNVPair, "CONNECT_DATA");
+    const connidStr = `(CONNECTION_ID=${this.sAtts.connectionId})`;
+    const childNVPair = createNVPair(connidStr);
     cdataNVPair.addListElement(childNVPair);
 
     this.cData = Buffer.from(rootNVPair.toString(), 'ascii');
     this.cDataNVPair = rootNVPair;
+    this.sAtts.nt.cDataNVPair = rootNVPair;
 
     return (address);
   }
@@ -165,6 +167,9 @@ class NetworkSession {
    * Make the transport level connection
    */
   async transportConnect(address) {
+    if (address.protocol.toUpperCase() == 'TCP' && address.httpsProxy) {
+      errors.throwErr(errors.ERR_INVALID_CONNECT_STRING_PARAMETERS, 'https proxy requires protocol as', 'tcps ');
+    }
     if (address.protocol && (address.protocol.toUpperCase() == 'TCP' || address.protocol.toUpperCase() == 'TCPS')) {
       this.ntAdapter = new NTTCP(this.sAtts.nt);
     } else {
@@ -173,8 +178,8 @@ class NetworkSession {
     await this.ntAdapter.connect(address);
     this.ntAdapter.startRead();
     this.sAtts.ntCha = this.ntAdapter.cha;
-    this.sndDatapkt = new Packet.DataPacket(this.sAtts.sdu, this.sAtts.largeSDU);
-    this.rcvDatapkt = new Packet.DataPacket(this.sAtts.sdu, this.sAtts.largeSDU);
+    this.sndDatapkt = new Packet.DataPacket(this.sAtts.largeSDU);
+    this.rcvDatapkt = new Packet.DataPacket(this.sAtts.largeSDU);
   }
 
   /**
@@ -207,7 +212,7 @@ class NetworkSession {
 
     /* Transport connect */
     if (this.sAtts.transportConnectTimeout) {
-      let asyncPromise = this.transportConnect(address);
+      const asyncPromise = this.transportConnect(address);
       await timeout(asyncPromise, this.sAtts.transportConnectTimeout, "transportConnectTimeout", address, this.sAtts.connectionId);
     } else {
       await this.transportConnect(address);
@@ -227,9 +232,9 @@ class NetworkSession {
           await this._recvPacket();
           this.refusePkt.dataBuf = this.rcvDatapkt.buf.subarray(this.rcvDatapkt.offset, this.rcvDatapkt.len).toString();
         }
-        let nvpair = createNVPair(this.refusePkt.dataBuf);
+        const nvpair = createNVPair(this.refusePkt.dataBuf);
         this.refusePkt = null;
-        let err = findValue(nvpair, ["DESCRIPTION", "ERR"]);
+        const err = findValue(nvpair, ["DESCRIPTION", "ERR"]);
         if (err == "12514") {
           errors.throwErr(errors.ERR_INVALID_SERVICE_NAME, this.getOption(constants.SVCNAME), address.host, address.port, this.sAtts.connectionId);
         } else if (err == "12505") {
@@ -246,7 +251,7 @@ class NetworkSession {
         }
         this._sendConnect(connectPkt);
       } else if (packet.type === constants.NSPTRD) { /* REDIRECT */
-        let adrLen, adrStr, redirAddressNode, redirConnData;
+        let adrLen, adrStr, redirConnData;
 
         /* Read and connect to Redirect address */
         if (this.redirectPkt.overflow) {
@@ -263,8 +268,8 @@ class NetworkSession {
           redirConnData = this.cData;
         }
 
-        redirAddressNode = await resolveAddress(adrStr);
-        let host = address.host;
+        const redirAddressNode = await resolveAddress(adrStr);
+        const host = address.hostname;
         address = await redirAddressNode.execute();
         if (address.desc)
           this.sAtts.setFrom(address.desc.params);  /* Add on attributes from redirect connect String */
@@ -273,24 +278,23 @@ class NetworkSession {
         this.ntAdapter.disconnect(constants.NSFIMM);
 
         if (this.sAtts.transportConnectTimeout) {
-          let asyncPromise = this.transportConnect(address);
+          const asyncPromise = this.transportConnect(address);
           await timeout(asyncPromise, this.sAtts.transportConnectTimeout, "transportConnectTimeout", address, this.sAtts.connectionId);
         } else {
           await this.transportConnect(address);
         }
 
         connectPkt = new Packet.ConnectPacket(redirConnData, this.sAtts, constants.NSPFRDR);
+        this.sndDatapkt = new Packet.DataPacket(this.sAtts.largeSDU);
         this._sendConnect(connectPkt);
       }
     }
 
     /* Accepted  */
     this.connected = true;
-    this.rcvDatapkt = new Packet.DataPacket(this.sAtts.sdu, this.sAtts.largeSDU);
-    this.rcvDatapkt.offset = this.rcvDatapkt.dataPtr;
-    this.rcvDatapkt.len = this.rcvDatapkt.dataPtr;
-    this.sndDatapkt = new Packet.DataPacket(this.sAtts.sdu, this.sAtts.largeSDU);
-    this.sndDatapkt.createPacket();
+    this.cData = null;
+    this.sndDatapkt = new Packet.DataPacket(this.sAtts.largeSDU);
+    this.sndDatapkt.createPacket(constants.NSPDADAT); //Currently only used for disconnect
     this.sndDatapkt.offset = this.sndDatapkt.dataPtr;
     this.sndDatapkt.len = this.sndDatapkt.bufLen;
     this.markerPkt = new Packet.MarkerPacket(this.sAtts.largeSDU);
@@ -309,13 +313,14 @@ class NetworkSession {
     do {
       try {
         if (this.sAtts.connectTimeout) {
-          let asyncPromise = this.connect2(address);
+          const asyncPromise = this.connect2(address);
           connected = await timeout(asyncPromise, this.sAtts.connectTimeout, "connectTimeout", address, this.sAtts.connectionId);
         } else {
           connected = await this.connect2(address);
         }
       } catch (err) {
-        if (err.message.startsWith('NJS-510')) {
+        if (err.message.startsWith('NJS-510') && !this.ntAdapter.connected) {
+          downHostInstance.markDownHost(address.host, Date.now()); // mark the host as down
           this.ntAdapter.connected = true; // Pretend as connected
         }
         if (this.ntAdapter) {
@@ -354,6 +359,8 @@ class NetworkSession {
         break;
       case constants.NSPTAC: /* ACCEPT */
         Packet.AcceptPacket(packet, this.sAtts);
+        this.dbUUID = packet.dbUUID;
+        packet.dbUUID = null;
         break;
       case constants.NSPTRF: /* REFUSE */
         this.refusePkt = new Packet.RefusePacket(packet);
@@ -466,7 +473,7 @@ class NetworkSession {
     let bytesCopied = 0;
 
     this.sndDatapkt.dataLen = this.sndDatapkt.offset;
-    if (this.sndDatapkt.dataLen < this.sndDatapkt.bufLen) {
+    if (this.sndDatapkt.dataLen < this.sndDatapkt.bufLen || !this.sndDatapkt.bufLen) {
       bytesCopied = this.sndDatapkt.fillBuf(userBuf, offset, len);
       len -= bytesCopied;
       offset += bytesCopied;
@@ -508,8 +515,8 @@ class NetworkSession {
    * Establish network connection
   */
   async connect(userConfig) {
-    let connStr = userConfig.connectString ? userConfig.connectString : userConfig.connectionString;
-    let addressNode = await resolveAddress(connStr, userConfig.configDir);
+    const connStr = userConfig.connectString ? userConfig.connectString : userConfig.connectionString;
+    const addressNode = await resolveAddress(connStr, userConfig.configDir);
     let address;
     try {
       address = await this.getAddress(addressNode, userConfig);
@@ -591,7 +598,6 @@ class NetworkSession {
     let error = 0;
     if (this.controlPkt.errno) {     /* Control pkt already read */
       error = this.controlPkt.errno;
-      this.controlPkt.clear(); /* Clear error */
       return (error);
     } else if (!this.getOption(constants.HEALTHCHECK)) {
       return errors.ERR_CONNECTION_CLOSED;
@@ -602,7 +608,6 @@ class NetworkSession {
         if (packet.type == constants.NSPTCNL) {
           this.controlPkt.fromPacket(packet);
           error = this.controlPkt.errno;
-          this.controlPkt.clear(); /* Clear error */
           return (error);
         } else {
           this.ntAdapter.packets.unshift(packet); /* Push packet back */

package/lib/thin/sqlnet/ntTcp.js

@@ -34,6 +34,7 @@ const http = require("http");
 const Timers = require('timers');
 const constants = require("./constants.js");
 const errors = require("../../errors.js");
+const { findValue } = require("./nvStrToNvPair.js");
 
 const PACKET_HEADER_SIZE = 8;
 const DEFAULT_PORT = 1521;
@@ -47,6 +48,8 @@ const TCPCHA = 1 << 1 |    /* ASYNC support */
   1 << 9 |    /* Full Duplex support */
   1 << 12;    /* SIGPIPE Support */
 
+let streamNum = 1;
+
 /**
  * Network Transport TCP/TCPS adapter
  * @param {Address} address Destination Address
@@ -63,28 +66,42 @@ class NTTCP {
     this.numPacketsSinceLastWait = 0;
     this.secure = false;
     this.largeSDU = false;
+    this.streamNum = streamNum++;
+    this.packetNum = 1;
+    this.doDNMatch = true;
   }
 
   /**
    * DN matching funciton(used with TLS)
    */
   dnMatch(serverName, cert) {
-    if (this.atts.sslServerDNMatch) {
-      let toObject = str =>str .split(',').map(x => x.split('=').map(y => y.trim())).reduce((a, x) => {
+    if (this.atts.sslServerDNMatch && this.doDNMatch) {
+      const toObject = str =>str .split(',').map(x => x.split('=').map(y => y.trim())).reduce((a, x) => {
         a[x[0]] = x[1];
         return a;
       }, {});
       if (this.atts.sslServerCertDN) { /* Full DN Match */
-        let obj = toObject(this.atts.sslServerCertDN);
-        for (let key in obj) {
-          if (obj[key] != cert.subject[key]) {
-            return (errors.getErr(errors.ERR_TLS_DNMATCH_FAILURE));
+        const obj = toObject(this.atts.sslServerCertDN);
+        if (Object.keys(obj).length == Object.keys(cert.subject).length) {
+          for (const key in obj) {
+            if (obj[key] != cert.subject[key]) {
+              return (errors.getErr(errors.ERR_TLS_DNMATCH_FAILURE));
+            }
           }
+        } else {
+          return (errors.getErr(errors.ERR_TLS_DNMATCH_FAILURE));
         }
       } else {
         if (tls.checkServerIdentity(this.hostName, cert) && (!this.originHost || tls.checkServerIdentity(this.originHost, cert))) { /* Hostname match */
-          const hostName = this.hostName + " "  + (this.originHost ? "or " + this.originHost : "");
-          return (errors.getErr(errors.ERR_TLS_HOSTMATCH_FAILURE, hostName));
+          if (this.atts.sslAllowWeakDNMatch) {
+            const serviceName = findValue(this.atts.cDataNVPair, ["DESCRIPTION", "CONNECT_DATA", "SERVICE_NAME"]); /* Service Name match */
+            if (serviceName != cert.subject.CN) {
+              return (errors.getErr(errors.ERR_TLS_DNMATCH_FAILURE));
+            }
+          } else {
+            const hostName = this.hostName + " "  + (this.originHost ? "or " + this.originHost : "");
+            return (errors.getErr(errors.ERR_TLS_HOSTMATCH_FAILURE, hostName));
+          }
         }
       }
     }
@@ -132,7 +149,7 @@ class NTTCP {
     }
 
     let connectErrCause, proxyConnectErrCause, req;
-    let httpsProxy = address.httpsProxy || this.atts.httpsProxy;
+    const httpsProxy = address.httpsProxy || this.atts.httpsProxy;
     let httpsProxyPort = address.httpsProxyPort || this.atts.httpsProxyPort;
 
     await new Promise((resolve) => {
@@ -207,6 +224,8 @@ class NTTCP {
       if (address.protocol.toUpperCase() == "TCPS") {
         let secureContext;
         this.secure = true;
+        if (this.atts.sslAllowWeakDNMatch)
+          this.doDNMatch = false; //Don't match initial connect
         try {
           secureContext = tls.createSecureContext({
             cert : this.atts.wallet,
@@ -240,7 +259,8 @@ class NTTCP {
     }
     this.stream = null;
     this.connected = false;
-    this.waiter = null;
+    this.drainWaiter = null;
+    this.readWaiter = null;
   }
 
   /**
@@ -254,7 +274,7 @@ class NTTCP {
       const block = buffer.slice(i, i + 8);
       const hexDumpValues = [];
       const printableValues = [];
-      for (let hexByte of block) {
+      for (const hexByte of block) {
         hexDumpValues.push(hexByte.toString(16).toUpperCase().padStart(2, '0'));
         if (hexByte > 0x20 && hexByte < 0x7f) {
           printableValues.push(String.fromCharCode(hexByte));
@@ -296,7 +316,7 @@ class NTTCP {
    */
   checkErr() {
     if (!this.connected || this.err) {
-      let err, newErr;
+      let err;
       if (this.savedErr) {
         err = errors.getErr(errors.ERR_CONNECTION_LOSTCONTACT,
           this.host, this.port,  this.atts.connectionId, this.savedErr.message);
@@ -304,7 +324,7 @@ class NTTCP {
         err = errors.getErr(errors.ERR_CONNECTION_EOF, this.host, this.port, this.atts.connectionId,);
       }
       /* Wrap around NJS-500 */
-      newErr = errors.getErr(errors.ERR_CONNECTION_CLOSED);
+      const newErr = errors.getErr(errors.ERR_CONNECTION_CLOSED);
       newErr.message = newErr.message + "\n" + err.message;
       throw (newErr);
     }
@@ -318,21 +338,19 @@ class NTTCP {
   send(buf) {
     this.checkErr();
     if (process.env.NODE_ORACLEDB_DEBUG_PACKETS)
-      this.printPacket("Sending packet", buf);
+      this.printPacket(`Sending packet ${this.packetNum} on stream ${this.streamNum}`, buf);
     const result = this.stream.write(buf, (err) => {
       if (err) {
         this.savedErr = err;
         this.err = true;
-        if (this.waiter) {
-          this.waiter();
-          this.waiter = null;
-        }
+        this._notifyWaiters();
       }
     });
     if (!result) {
       this.needsDrain = true;
     }
     this.numPacketsSinceLastWait++;
+    this.packetNum++;
   }
 
   /**
@@ -352,7 +370,9 @@ class NTTCP {
   async pauseWrite() {
     this.checkErr();
     if (this.needsDrain) {
-      await new Promise((resolve) => this.stream.once('drain', resolve));
+      await new Promise((resolve) => {
+        this.drainWaiter = resolve;
+      });
       this.checkErr();
     } else {
       await new Promise((resolve) => Timers.setImmediate(resolve));
@@ -394,15 +414,16 @@ class NTTCP {
         const packet = {
           buf: tempBuf.subarray(0, len),
           type: tempBuf[4],
-          flags: tempBuf[5]
+          flags: tempBuf[5],
+          num : this.packetNum++
         };
         this.packets.push(packet);
-        if (this.waiter) {
-          this.waiter();
-          this.waiter = null;
+        if (this.readWaiter) {
+          this.readWaiter();
+          this.readWaiter = null;
         }
         if (process.env.NODE_ORACLEDB_DEBUG_PACKETS)
-          this.printPacket("Receiving packet", packet.buf);
+          this.printPacket(`Receiving packet ${packet.num} on stream ${this.streamNum}`, packet.buf);
 
         // if the packet consumed all of the bytes (most common scenario), then
         // simply clear the temporary buffer; otherwise, retain whatever bytes
@@ -436,7 +457,7 @@ class NTTCP {
     if (this.packets.length === 0) {
       this.checkErr();
       await new Promise((resolve) => {
-        this.waiter = resolve;
+        this.readWaiter = resolve;
         this.numPacketsSinceLastWait = 0;
       });
       this.checkErr();
@@ -451,7 +472,8 @@ class NTTCP {
   async renegTLS() {
     try {
       this.checkErr();
-      let secureContext = tls.createSecureContext({
+      this.doDNMatch = true;
+      const secureContext = tls.createSecureContext({
         cert : this.atts.wallet,
         key : this.atts.wallet,
         passphrase: this.atts.walletPassword,
@@ -472,26 +494,25 @@ class NTTCP {
     this.stream.on('error', (err) => {
       this.savedErr = err;
       this.err = true;
-      if (this.waiter) {
-        this.waiter();
-        this.waiter = null;
-      }
+      this._notifyWaiters();
     });
 
     this.stream.on('end', () => {
       this.err = true;
-      if (this.waiter) {
-        this.waiter();
-        this.waiter = null;
-      }
+      this._notifyWaiters();
     });
 
     this.stream.on('close', () => {
       this.connected = false;
+      this._notifyWaiters();
     });
 
     this.stream.on('drain', () => {
       this.needsDrain = false;
+      if (this.drainWaiter) {
+        this.drainWaiter();
+        this.drainWaiter = null;
+      }
     });
 
   }
@@ -508,7 +529,7 @@ class NTTCP {
         return (this.packets.length > 0);
       case constants.REMOTEADDR: /* Remote Address */
       {
-        let socket = this.secure ? this.connStream : this.stream;
+        const socket = this.secure ? this.connStream : this.stream;
         return (socket.remoteAddress + ":" + socket.remotePort);
       }
       default:
@@ -516,6 +537,20 @@ class NTTCP {
     }
   }
 
+  /**
+   * Notify the waiters (drain and read) and reset them, if applicable.
+   */
+  _notifyWaiters() {
+    if (this.drainWaiter) {
+      this.drainWaiter();
+      this.drainWaiter = null;
+    }
+    if (this.readWaiter) {
+      this.readWaiter();
+      this.readWaiter = null;
+    }
+  }
+
 }
 
 module.exports = NTTCP;

package/lib/thin/sqlnet/nvStrToNvPair.js

@@ -176,7 +176,7 @@ class NVPair {
         }
       } else if (this.listType == LIST_COMMASEP) {
         for (let i = 0; i < this.getListSize(); i++) {
-          let listElem = this.getListElement(i);
+          const listElem = this.getListElement(i);
           out = out + listElem.name;
           if (i != this.getListSize() - 1)
             out = out + ", ";
@@ -202,7 +202,7 @@ class NVPair {
       } else if (this.listType == LIST_COMMASEP) {
         out = out + " (";
         for (let i = 0; i < this.getListSize(); i++) {
-          let listElem = this.getListElement(i);
+          const listElem = this.getListElement(i);
           out = out + listElem.name;
 
           if (i != this.getListSize() - 1)
@@ -308,7 +308,7 @@ class NVTokens {
    * function to trim leading and trailing spaces from a literal.
    */
   _trimWhiteSpace(it) {
-    let length = it.length;
+    const length = it.length;
     let start = 0;
     let end = length;
 
@@ -337,7 +337,7 @@ class NVTokens {
     this.tkType = new Array();
     this.tkValue = new Array();
 
-    let len = nvString.length;
+    const len = nvString.length;
     let eql_seen = false;
     // convert NVString to character array for easier access
     let input = new Array();
@@ -560,7 +560,7 @@ class NVTokens {
   * @param  nvString  the nvString to parse
   */
 function createNVPair(nvString) {
-  let nvt = new NVTokens();
+  const nvt = new NVTokens();
   nvt.parseTokens(nvString);
   return readTopLevelNVPair(nvt);
 }
@@ -579,7 +579,7 @@ function readTopLevelNVPair(nvt) {
   }
 
   let name = readNVLiteral(nvt);
-  let nvp = new NVPair(name);
+  const nvp = new NVPair(name);
 
   if ((tk = nvt.getToken()) == TKN_COMMA) {
     // read comma'ed names as one name
@@ -601,14 +601,14 @@ function readTopLevelNVPair(nvt) {
  */
 function readNVPair(nvt) {
   // Opening ( or , for NVPair
-  let tk = nvt.getToken();
+  const tk = nvt.getToken();
   nvt.eatToken();
   if (!((tk == TKN_LPAREN) || (tk == TKN_COMMA))) {
     errors.throwErr(errors.ERR_INVALID_CONNECT_STRING_SYNTAX);
   }
 
-  let name = readNVLiteral(nvt);
-  let nvp = new NVPair(name);
+  const name = readNVLiteral(nvt);
+  const nvp = new NVPair(name);
 
   return readRightHandSide(nvp, nvt);
 }
@@ -628,7 +628,7 @@ function readRightHandSide(nvp, nvt) {
       // otherwise read an NVList.
       tk = nvt.getToken();
       if (tk == TKN_LITERAL) {
-        let value = readNVLiteral(nvt);
+        const value = readNVLiteral(nvt);
         nvp.setAtom = value;
       } else {
         // NVList is responsible for adding child NVPairs to this parent
@@ -663,7 +663,7 @@ function readRightHandSide(nvp, nvt) {
  * function which returns the next literal from NVTokens.
  */
 function readNVLiteral(nvt) {
-  let tk = nvt.getToken();
+  const tk = nvt.getToken();
   if (tk != TKN_LITERAL) {
     errors.throwErr(errors.ERR_INVALID_CONNECT_STRING_SYNTAX);
   }
@@ -677,12 +677,12 @@ function readNVLiteral(nvt) {
 function readNVList(nvt, parent) {
   // if next token is "(" or ",", then read an NVPair
   // otherwise, assume epsilon
-  let tk = nvt.getToken();
+  const tk = nvt.getToken();
   if (!(tk == TKN_LPAREN || tk == TKN_COMMA)) {
     return; // didn't read an nvpair
   }
 
-  let child = readNVPair(nvt);
+  const child = readNVPair(nvt);
 
   // read a good NVPair
   parent.addListElement(child);
@@ -715,7 +715,7 @@ function findNVPairRecurse(nvp, name) {
 
   /* Loop thru the list of children and searching each child for name.     */
   for (let i = 0; i < nvp.getListSize(); i++) {
-    let child = findNVPairRecurse(nvp.getListElement(i), name);
+    const child = findNVPairRecurse(nvp.getListElement(i), name);
 
     /* Did we find "name"?                                                 */
     if (child !== null)
@@ -742,7 +742,7 @@ function findNVPair(nvp, name) {
 
   /* Loop thru the list of children and searching each child for name.     */
   for (let i = 0; i < nvp.getListSize(); i++) {
-    let child = nvp.getListElement(i);
+    const child = nvp.getListElement(i);
     if (name.toUpperCase() == (child.name).toUpperCase())
       return child;
   }
@@ -764,7 +764,7 @@ function findValue(nvp, names) {
     return null;
 
   let output = nvp;
-  let sze = names.length;
+  const sze = names.length;
 
   for (let i = 1; i < sze; i++) {
     output = findNVPair(output, names[i]);