oracledb 6.0.3 → 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);
   }
@@ -210,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);
@@ -230,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") {
@@ -249,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) {
@@ -266,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 */
@@ -276,7 +278,7 @@ 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);
@@ -311,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) {
@@ -356,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);
@@ -510,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);

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;
@@ -67,28 +68,40 @@ class NTTCP {
     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));
+          }
         }
       }
     }
@@ -136,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) => {
@@ -211,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,
@@ -259,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));
@@ -301,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);
@@ -309,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);
     }
@@ -457,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,
@@ -513,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:

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]);

package/lib/thin/sqlnet/packet.js

@@ -42,7 +42,7 @@ function ConnectPacket(connectData, sAtts, flags = 0) {
   this.connectDataLen = connectData.length;
   this.overflow = false;
 
-  let size, options;
+  let size;
 
   if (this.connectDataLen <= MAX_CDATA_LEN) {
     size = NSPCNL + this.connectDataLen;
@@ -69,7 +69,7 @@ function ConnectPacket(connectData, sAtts, flags = 0) {
   /* Options:
         Note : Node JS does not support TCP Out-of-band so not setting NSGSENDATTN or NSGRECVATTN
   */
-  options = constants.NSGDONTCARE;
+  const options = constants.NSGDONTCARE;
   //options = options | constants.NSGUSEVIO  /* Vectored I/O support.Uncomment when support is added */
   this.buf.writeUInt16BE(options, constants.NSPCNOPT);
 
@@ -245,6 +245,13 @@ function AcceptPacket(packet, sAtts) {
   /* Accept flags */
   this.flag0 = packet.buf.readUInt8(constants.NSPACFL0);
   this.flag1 = packet.buf.readUInt8(constants.NSPACFL1);
+
+  /* UUID - CDB Instance ID */
+  if (sAtts.version >= constants.TNS_VERSION_MIN_UUID) {
+    packet.dbUUID = packet.buf.subarray(constants.TNS_UUID_OFFSET,
+      constants.TNS_UUID_OFFSET + 16);
+    packet.dbUUID = packet.dbUUID.toString('base64');
+  }
 }
 
 /**

package/lib/thin/sqlnet/paramParser.js

@@ -37,7 +37,7 @@ const errors = require("../../errors.js");
  */
 function tnsnamesFilePath(configDir) {
   let filePathVal = null;
-  let tnsAdminVal = process.env.TNS_ADMIN;
+  const tnsAdminVal = process.env.TNS_ADMIN;
   if (configDir) {
     filePathVal = configDir + '/tnsnames.ora';
     if (fs.existsSync(filePathVal)) {
@@ -69,7 +69,7 @@ class NLParamParser {
  * @returns {Promise}
  */
   async initializeNlpa(file_path) {
-    let stat = fs.statSync(file_path);
+    const stat = fs.statSync(file_path);
 
     if (!(stat.mtime - prevmtime)) {
       /* File has been read */
@@ -139,10 +139,10 @@ class NLParamParser {
    * @return String  The modified String returned
    */
   checkNLPforComments(str) {
-    let str1 = new Array(str.length);
+    const str1 = new Array(str.length);
 
     for (let i = 0; i < str.length; i++) {
-      let current_char = str[i];
+      const current_char = str[i];
       if (current_char == '#') {
         if (i != 0) {
           break; // No need to continue. Return the line
@@ -160,14 +160,14 @@ class NLParamParser {
     * @param {string} ibuf
     */
   addNLPListElement(ibuf) {
-    let res = ibuf.split(/\r?\n/).filter(element => element);
+    const res = ibuf.split(/\r?\n/).filter(element => element);
     for (let i = 0; i < res.length; i++) {
       if (res[i].charAt(0) != '(') {
         res[i] = '(' + res[i] + ')';
       }
-      let nvp = createNVPair(res[i]);
-      let name = nvp.name;
-      let uname = name.toUpperCase();
+      const nvp = createNVPair(res[i]);
+      const name = nvp.name;
+      const uname = name.toUpperCase();
       nvp.name = uname;
       const unames = uname.split(","); //multiple aliases (alias1, alias2, alias3)
       for (let i = 0; i < unames.length; i++) {
@@ -191,7 +191,7 @@ class NLParamParser {
     * @returns {string}
    */
   findValueOf(key) {
-    let myarr = key.split('/');
+    const myarr = key.split('/');
     return (findValue(this.ht.get(myarr[0].toUpperCase()), myarr));
   }
 

package/lib/thin/sqlnet/sessionAtts.js

@@ -59,6 +59,7 @@ class SessionAtts {
     this.nt.tcpNoDelay = true;
     this.uuid = uuid;
     this.nt.sslServerDNMatch = true;
+    this.nt.sslAllowWeakDNMatch = false;
   }
 
   /**
@@ -100,6 +101,9 @@ class SessionAtts {
       if (typeof params.sslServerDNMatch === 'boolean') {
         this.nt.sslServerDNMatch = params.sslServerDNMatch;
       }
+      if (typeof params.sslAllowWeakDNMatch === 'boolean') {
+        this.nt.sslAllowWeakDNMatch = params.sslAllowWeakDNMatch;
+      }
       if (typeof params.sslServerCertDN === 'string') {
         this.nt.sslServerCertDN = params.sslServerCertDN;
       }

package/lib/thin/statement.js

@@ -145,7 +145,7 @@ class Statement {
   //---------------------------------------------------------------------------
   _determineStatementType(sql) {
     sql = thinUtil.cleanSql(sql);
-    let tokens = sql.trim().trimStart('(').substring(0, 10).split(" ");
+    const tokens = sql.trim().trimStart('(').substring(0, 10).split(" ");
     if (tokens.length > 0) {
       const sqlKeyword = tokens[0].toUpperCase();
       if (["DECLARE", "BEGIN", "CALL"].includes(sqlKeyword)) {
@@ -221,7 +221,7 @@ class Statement {
         let result;
         let intoKey = -1;
         const retKey = sql.search(DML_RETURNING_KEY);
-        let intoRegex = DML_RETURNING_INTO_KEY;
+        const intoRegex = DML_RETURNING_INTO_KEY;
         // simulate lastInfdexOf with intoRegex input
         while ((result = intoRegex.exec(sql.slice(retKey))) != null) {
           intoKey = result.index;
@@ -259,7 +259,7 @@ class Statement {
       if (this.isPlSql && this.bindInfoDict.has(name)) {
         return;
       }
-      let info = new BindInfo(name, isReturnBind);
+      const info = new BindInfo(name, isReturnBind);
       this.bindInfoList.push(info);
 
       if (this.bindInfoDict.has(info.bindName)) {

package/lib/thin/util.js

@@ -68,7 +68,7 @@ function getMetadataMany(vars) {
 // Get the outBinds for the sql
 //---------------------------------------------------------------------------
 function getOutBinds(bindVars, pos) {
-  let bindByPos = (bindVars[0].name === undefined);
+  const bindByPos = (bindVars[0].name === undefined);
   let outBinds;
   if (bindByPos) {
     outBinds = [];
@@ -93,11 +93,11 @@ function getOutBinds(bindVars, pos) {
 // Get the outBinds for the sql when doing an executeMany call
 //---------------------------------------------------------------------------
 function getExecuteManyOutBinds(bindVars, numIters) {
-  let numOutBinds = getNumOutBinds(bindVars);
+  const numOutBinds = getNumOutBinds(bindVars);
   if (numOutBinds === 0) {
     return;
   }
-  let outBinds = new Array(numIters).fill(null);
+  const outBinds = new Array(numIters).fill(null);
   for (let i = 0; i < numIters; i++) {
     outBinds[i] = getOutBinds(bindVars, i);
   }
@@ -125,7 +125,7 @@ function getNumOutBinds(bindVars) {
 // Get the outBinds for the sql when doing an execute call
 //---------------------------------------------------------------------------
 function getExecuteOutBinds(bindVars) {
-  let numOutBinds = getNumOutBinds(bindVars);
+  const numOutBinds = getNumOutBinds(bindVars);
   if (numOutBinds === 0) {
     return;
   }
@@ -151,7 +151,7 @@ function cleanSql(sql) {
 // Get the bind variables from the bindInfoList of the statement object
 //---------------------------------------------------------------------------
 function getBindVars(statement) {
-  let bindVars = [];
+  const bindVars = [];
   for (const bindInfo of statement.bindInfoList) {
     bindVars.push(bindInfo.bindVar);
   }
@@ -167,8 +167,7 @@ function checkProxyUserValidity(userName) {
   let schemaUser = '', proxyUser = '';
   let quoteFound = false, openSquareBracketFound = false;
   let lastQuoteFoundIndex = 0;
-  let schemaUserStartIndex;
-  let result = {
+  const result = {
     status       : -1,
     proxyUser    : '',
     schemaUser   : ''
@@ -219,7 +218,7 @@ function checkProxyUserValidity(userName) {
   // extract schema user
   index = index + 1;
   quoteFound = false;
-  schemaUserStartIndex = index;
+  const schemaUserStartIndex = index;
   lastQuoteFoundIndex = 0;
   while (index < userNameLength) {
     // check for double quotes

package/lib/transformer.js

@@ -248,5 +248,7 @@ function transformValueIn(info, value, options) {
 
 // define exports
 module.exports = {
-  transformValueIn,
+  transformJsonValue,
+  transformValueIn
+
 };

package/lib/util.js

@@ -294,18 +294,6 @@ function isTokenValid(accessToken) {
   }
 }
 
-function isPrivateKeyValid(accessToken) {
-  errors.assert(typeof accessToken.privateKey === 'string',
-    errors.ERR_TOKEN_BASED_AUTH);
-
-  if (accessToken.privateKey.startsWith("-----BEGIN PRIVATE KEY-----") ||
-    accessToken.privateKey.endsWith("-----END PRIVATE KEY-----")) {
-    return false;
-  }
-
-  return true;
-}
-
 //-----------------------------------------------------------------------------
 // addTypeProperties()
 //
@@ -342,7 +330,6 @@ module.exports = {
   isArrayOfStrings,
   isObject,
   isObjectOrArray,
-  isPrivateKeyValid,
   isShardingKey,
   isSodaDocument,
   isTokenExpired,

package/lib/version.js

@@ -30,7 +30,7 @@
 
 module.exports = {
   VERSION_MAJOR: 6,
-  VERSION_MINOR: 0,
-  VERSION_PATCH: 3,
+  VERSION_MINOR: 1,
+  VERSION_PATCH: 0,
   VERSION_SUFFIX: ''
 };