oracledb 6.0.3 → 6.2.0

package/lib/thin/sqlnet/constants.js

@@ -107,6 +107,8 @@ module.exports =  {
   NSGRAW                    : 0x1000, // I/O is direct to/from transport
   TNS_VERSION_DESIRED       : 319,
   TNS_VERSION_MINIMUM       : 300,
+  TNS_VERSION_MIN_UUID      : 319,
+  TNS_UUID_OFFSET           : 45,
 
   /* Accept Packet */
   NSPACVSN : 8,   // connection version

package/lib/thin/sqlnet/ezConnectResolver.js

@@ -26,7 +26,6 @@
 
 'use strict';
 
-const {lookup} = require('dns').promises;
 const errors = require("../../errors.js");
 
 // The host information pattern of the EZConnect URL format.
@@ -71,14 +70,7 @@ const DESCRIPTION_PARAMS = ["ENABLE", "FAILOVER", "LOAD_BALANCE",
 class EZConnectResolver {
   constructor(url) {
     this.URL_PROPS_ALIAS = this.initializeUrlAlias();
-    let jdbcUrlPrefix = url.indexOf('@');
-    if (jdbcUrlPrefix != -1) {
-      this.url = url.substring(jdbcUrlPrefix + 1);
-      this.urlPrefix = url.substring(0, jdbcUrlPrefix + 1);
-    } else {
-      this.url = url;
-      this.urlPrefix = "";
-    }
+    this.url = url;
     this.resolvedUrl = '';
     this.connectionProps = new Map();
     this.urlProps = new Map();
@@ -89,8 +81,8 @@ class EZConnectResolver {
  * Returns the resolved long TNS String.
  * @return Resolved TNS URL.
  */
-  async getResolvedUrl() {
-    await this.parse();
+  getResolvedUrl() {
+    this.parse();
     return this.resolvedUrl;
   }
 
@@ -99,33 +91,26 @@ class EZConnectResolver {
    * After parsing the extended settings if the remaining part of the URL is in
    * EZConnectURL format then resolve it to long TNS url format.
    */
-  async parse() {
+  parse() {
     // First try to parse the extended settings part of the URL.
     let parsedUrl = this.parseExtendedSettings(this.url);
     if (this.connectionProps.size === 0 && this.urlProps.size === 0) {
       // If we have not parsed anything then use the received url as is.
       parsedUrl = this.url;
     }
-
-    if (parsedUrl.startsWith("(")) {
-      // Skip resolve the URL if it is in TNS format,
-      // TNS format starts with '('
-      this.resolvedUrl = this.urlPrefix + parsedUrl;
-    } else {
-      // Try to resolve the EZConnectURL to Long TNS URL.
-      this.resolvedUrl = this.urlPrefix + await this.resolveToLongURLFormat(parsedUrl);
-    }
+    // Try to resolve the EZConnectURL to Long TNS URL.
+    this.resolvedUrl = this.resolveToLongURLFormat(parsedUrl);
   }
   /**
   * Translate the given ezconnect url format to Long TNS format.
   * @param url EZConnect URL
   * @return Returns resolved TNS url.
   */
-  async resolveToLongURLFormat(url) {
+  resolveToLongURLFormat(url) {
     // URL is in the following format
     // [protocol://]host1[,host13][:port1][,host2:port2][/service_name][:server][/instance_name]
 
-    let urlWithoutWhiteSpaces = url.replace(/\s/g, "");
+    const urlWithoutWhiteSpaces = url.replace(/\s/g, "");
     let bool = 0;
     let protocol = null, hostInfo = null, serviceName = null, serverMode = null, instanceName = null;
     for (const match of urlWithoutWhiteSpaces.matchAll(EZ_URL_PATTERN)) {
@@ -151,9 +136,9 @@ class EZConnectResolver {
     const proxyHost = this.urlProps.get("HTTPS_PROXY");
     const proxyPort = this.urlProps.get("HTTPS_PROXY_PORT");
     const addressInfo =
-      await this.buildAddressList(hostInfo, protocol, proxyHost, proxyPort);
+      this.buildAddressList(hostInfo, protocol, proxyHost, proxyPort);
 
-    let connectionIdPrefix =
+    const connectionIdPrefix =
       this.urlProps.get("CONNECTION_ID_PREFIX");
     // Build the available information in TNS format.
     const parts = [];
@@ -210,11 +195,9 @@ class EZConnectResolver {
 * @param proxyPort proxy server port [optional].
 * @return address information of the DESCRIPTION node.
 */
-  async buildAddressList(hostInfo, protocol,
+  buildAddressList(hostInfo, protocol,
     proxyHost, proxyPort) {
-    let shost = '';
-    let ipcnt = 0;
-    let builder = new Array();
+    const builder = new Array();
     let proxyInfo = '';
     if (proxyHost != null) {
       if (proxyPort != null) {
@@ -227,19 +210,18 @@ class EZConnectResolver {
     if (protocol == null) protocol = 'TCP';
     let naddr = 0;
     // ; groups the user into a ADDRESS_LIST
-    let addressLists = hostInfo.split(";");
-    for (let addressList in addressLists) {
+    const addressLists = hostInfo.split(";");
+    for (const addressList in addressLists) {
       let addressNodeCount = 0;
-      let addressListBuilder = new Array();
+      const addressListBuilder = new Array();
       for (const match of addressLists[addressList].matchAll(HOSTNAMES_PATTERN)) {
-        let hostnames = (match.groups.hostnames).split(',');
+        const hostnames = (match.groups.hostnames).split(',');
         let port = match.groups.port;
         if (port == null) {
-          port = '1521' + '';
+          port = '1521';    //default port
         }
-        for (let hname in hostnames) {
+        for (const hname in hostnames) {
           addressListBuilder.push(this.getAddrStr(hostnames[hname], port, protocol, proxyInfo));
-          shost = hostnames[hname];
           addressNodeCount++;
         }
       }
@@ -253,21 +235,6 @@ class EZConnectResolver {
       else
         builder.push(parts.join(''));
     }
-    if (naddr == 1) {
-      shost = shost.trim();
-      // If it is IPV6 format address then remove the enclosing '[' and ']'
-      if (shost.startsWith("[") && shost.endsWith("]"))
-        shost = shost.substring(1, shost.length - 1);
-      try {
-        await lookup(shost);
-        ipcnt++;
-      } catch {
-        // nothing
-      }
-      if (ipcnt == 0) {
-        errors.throwErr(errors.ERR_INVALID_EZCONNECT_SYNTAX, 'could not resolve hostname', shost);
-      }
-    }
 
     if (addressLists.length < 2 && naddr > 1) {
       this.lb = true;
@@ -300,7 +267,7 @@ class EZConnectResolver {
   buildDescriptionParams() {
     if (this.urlProps.size === 0)
       return '';
-    let builder = new Array();
+    const builder = new Array();
     this.urlProps.forEach(function(v, k) {
       if (DESCRIPTION_PARAMS.includes(k)) // Add only if it is a DESCRIPTION node parameter
         builder.push(`(${k}=${v})`);
@@ -318,10 +285,11 @@ class EZConnectResolver {
     if (protocol != null && protocol.toLowerCase() == "tcps") {
       // In EZConnect format if the DN match is not specified the enable it
       // by default for TCPS protocol.
-      const serverDNMatch = this.urlProps.get("SSL_SERVER_DN_MATCH") || 'TRUE';
+      const serverDNMatch = this.urlProps.get("SSL_SERVER_DN_MATCH");
       const serverCertDN = this.urlProps.get("SSL_SERVER_CERT_DN");
       const walletDir = this.urlProps.get("MY_WALLET_DIRECTORY");
-      securityInfo.push(`(SSL_SERVER_DN_MATCH=${serverDNMatch})`);
+      if (serverDNMatch != null)
+        securityInfo.push(`(SSL_SERVER_DN_MATCH=${serverDNMatch})`);
       if (serverCertDN != null)
         securityInfo.push(`(SSL_SERVER_CERT_DN=${serverCertDN}})`);
       if (walletDir != null)
@@ -342,8 +310,8 @@ class EZConnectResolver {
    * @return the parsed URL which does not contain the extended settings part.
    */
   parseExtendedSettings(urlStr) {
-    let urlBytes = Array.from(urlStr.trim());
-    let extendedSettingsIndex = this.findExtendedSettingPosition(urlBytes);
+    const urlBytes = Array.from(urlStr.trim());
+    const extendedSettingsIndex = this.findExtendedSettingPosition(urlBytes);
 
     if (extendedSettingsIndex == -1) {
       return urlStr; // No extended settings configuration found
@@ -360,7 +328,7 @@ class EZConnectResolver {
   parseExtendedProperties(urlChars, extIndex) {
     let key = null;
     let value = null;
-    let token = new Array(urlChars.length);
+    const token = new Array(urlChars.length);
     let tokenIndx = 0;
     let indices = '';
     for (let i = extIndex; i < urlChars.length; i++) {
@@ -421,7 +389,7 @@ class EZConnectResolver {
   parseQuotedString(startIndex, urlChars, tokenIndex, token) {
     let i = startIndex + 1; // look for closing '"' from the next index
     while (i < urlChars.length) {
-      let curChar = urlChars[i];
+      const curChar = urlChars[i];
       if (curChar == EXT_DOUBLE_QT) {
         // Got the " which ends the quoted block, so break the loop
         // Return the new indices, caller would resume from this new indices.
@@ -439,8 +407,8 @@ class EZConnectResolver {
    * @param value
    */
   addParam(key, value) {
-    let aliasKeyName = key.toLowerCase();
-    let propertyName = this.URL_PROPS_ALIAS.get(aliasKeyName);
+    const aliasKeyName = key.toLowerCase();
+    const propertyName = this.URL_PROPS_ALIAS.get(aliasKeyName);
     if (propertyName != null) {
       // if it is an URL alias then add to URL props
       this.urlProps.set(propertyName, value);
@@ -465,7 +433,7 @@ class EZConnectResolver {
    * @return url alias map
    */
   initializeUrlAlias() {
-    let aliasMap = new Map();
+    const aliasMap = new Map();
     aliasMap.set("enable", "ENABLE");
     aliasMap.set("failover", "FAILOVER");
     aliasMap.set("load_balance", "LOAD_BALANCE");

package/lib/thin/sqlnet/navNodes.js

@@ -58,7 +58,7 @@ class Address {
    *               (ie, "(ADDRESS=(DESCRIPTION=...)) and  ")
    */
   initFromString(s) {
-    let nvp = createNVPair(s);
+    const nvp = createNVPair(s);
     this.initFromNVPair(nvp);
   }
 
@@ -70,14 +70,14 @@ class Address {
   initFromNVPair(nvp) {
     if (nvp == null || !(nvp.name.toUpperCase() == "ADDRESS"))
       errors.throwErr(errors.ERR_INVALID_CONNECT_STRING_SYNTAX);
-    let protnvp = findNVPairRecurse(nvp, 'protocol');
-    let portnvp = findNVPairRecurse(nvp, 'port');
-    let hostnvp = findNVPairRecurse(nvp, 'host');
-    let httpsProxyNVP = findNVPairRecurse(nvp, 'https_proxy');
-    let httpsProxyPortNVP = findNVPairRecurse(nvp, 'https_proxy_port');
+    const protnvp = findNVPairRecurse(nvp, 'protocol');
+    const portnvp = findNVPairRecurse(nvp, 'port');
+    const hostnvp = findNVPairRecurse(nvp, 'host');
+    const httpsProxyNVP = findNVPairRecurse(nvp, 'https_proxy');
+    const httpsProxyPortNVP = findNVPairRecurse(nvp, 'https_proxy_port');
 
     if (portnvp)
-      this.port = portnvp.atom;
+      this.port = Number(portnvp.atom);
 
     if (hostnvp)
       this.host = hostnvp.atom;
@@ -88,7 +88,7 @@ class Address {
     if (httpsProxyNVP)
       this.httpsProxy = httpsProxyNVP.atom;
     if (httpsProxyPortNVP)
-      this.httpsProxyPort = httpsProxyPortNVP.atom;
+      this.httpsProxyPort = Number(httpsProxyPortNVP.atom);
 
     this.addr = nvp.toString();
   }
@@ -121,7 +121,7 @@ class AddressList {
    *               (ie, "(ADDRESS=(DESCRIPTION=...))")
    */
   initFromString(s) {
-    let nvp = createNVPair(s);
+    const nvp = createNVPair(s);
     this.initFromNVPair(nvp);
   }
 
@@ -134,7 +134,7 @@ class AddressList {
     /* for each child of "ADDRESS_LIST", create child or set SR/LB/FO */
     this.children = [];
     let childnv, child;
-    let listsize = nvp.getListSize();
+    const listsize = nvp.getListSize();
     if (listsize == 0) /* atom can not be valid */
       errors.throwErr(errors.ERR_INVALID_CONNECT_STRING_SYNTAX);
 
@@ -216,7 +216,7 @@ class Description {
     * Error thrown if invalid syntax (ie, "(ADDRESS=(DESCRIPTION=...))")
   */
   initFromString(s) {
-    let nvp = createNVPair(s);
+    const nvp = createNVPair(s);
     this.initFromNVPair(nvp);
   }
 
@@ -227,7 +227,7 @@ class Description {
    */
   //errors.throwErr(errors.ERR_INVALID_CONNECT_STRING_SYNTAX);
   initFromNVPair(nvp) {
-    let listsize = nvp.getListSize();
+    const listsize = nvp.getListSize();
     let childnv, child;
     if (listsize == 0) // atom can not be valid
       errors.throwErr(errors.ERR_INVALID_CONNECT_STRING_SYNTAX);
@@ -256,7 +256,7 @@ class Description {
         this.children.push(child);
       } else if (childnv.name.toUpperCase() == "CONNECT_DATA") {
         let tmpnv;
-        let listsize = childnv.getListSize();
+        const listsize = childnv.getListSize();
         for (let i = 0; i < listsize; i++) {
           tmpnv = childnv.getListElement(i);
           if (tmpnv.name.toUpperCase() == "CONNECTION_ID_PREFIX") {
@@ -294,7 +294,7 @@ class Description {
         if (childnv.atom > 0)
           this.params.expireTime = childnv.atom;
       } else if (childnv.name.toUpperCase() == "SECURITY") {
-        let listsize = childnv.getListSize();
+        const listsize = childnv.getListSize();
         let tmpnv;
         for (let i = 0; i < listsize; i++) {
           tmpnv = childnv.getListElement(i);
@@ -304,6 +304,10 @@ class Description {
             this.params.sslServerDNMatch = (tmpnv.atom.toLowerCase() == "yes"
             || tmpnv.atom.toLowerCase() == "on"
             || tmpnv.atom.toLowerCase() == "true");
+          } else if (tmpnv.name.toUpperCase() == "SSL_ALLOW_WEAK_DN_MATCH") {
+            this.params.sslAllowWeakDNMatch = (tmpnv.atom.toLowerCase() == "yes"
+            || tmpnv.atom.toLowerCase() == "on"
+            || tmpnv.atom.toLowerCase() == "true");
           } else if ((tmpnv.name.toUpperCase() == "WALLET_LOCATION") || (tmpnv.name.toUpperCase() == "MY_WALLET_DIRECTORY")) {
             this.params.walletLocation = tmpnv.atom;
           }
@@ -360,7 +364,7 @@ class DescriptionList {
    *               (ie, "(ADDRESS=(DESCRIPTION=...))")
    */
   initFromString(s) {
-    let nvp = createNVPair(s);
+    const nvp = createNVPair(s);
     this.initFromNVPair(nvp);
   }
 
@@ -370,7 +374,7 @@ class DescriptionList {
    *               (ie, "(ADDRESS=(DESCRIPTION=...))")
    */
   initFromNVPair(nvp) {
-    let listsize = nvp.getListSize();
+    const listsize = nvp.getListSize();
     let child, childnv;
     if (listsize == 0) /* atom can not be valid */
       errors.throwErr(errors.ERR_INVALID_CONNECT_STRING_SYNTAX);
@@ -482,8 +486,8 @@ class NavAddress extends Address {
     if (!net.isIP(this.host)) {
       try {
         addresses = await dnsPromises.lookup(this.host, options);
-        for (let addr in addresses) {
-          let co = new ConnOption();
+        for (const addr in addresses) {
+          const co = new ConnOption();
           co.hostname = this.host;
           co.port = this.port;
           co.protocol = this.prot;
@@ -503,7 +507,7 @@ class NavAddress extends Address {
         // do nothing
       }
     } else {
-      let co = new ConnOption();
+      const co = new ConnOption();
       co.hostname = this.host;
       co.port = this.port;
       co.protocol = this.prot;
@@ -530,7 +534,7 @@ class NavAddress extends Address {
    * Address. Constructing a string is mainly needed when source route is ON.
    */
   addToString(cs) {
-    let NVString = this.toString();
+    const NVString = this.toString();
     let cOpts = new Array();
     cOpts = cs.getcurrentDescription().getConnectOptions();
     for (let i = 0;i < cOpts.length; i++) {
@@ -589,7 +593,7 @@ class NavAddressList extends AddressList {
 
   }
   addToString(cs) {
-    let NVString = this.toString();
+    const NVString = this.toString();
     let cOpts = new Array();
     cOpts = cs.getcurrentDescription().getConnectOptions();
     for (let i = 0;i < cOpts.length; i++) {
@@ -631,7 +635,7 @@ class NavAddressList extends AddressList {
 
   closeNVPair(cs) {
     let cOpts = new Array();
-    let childS = this.getChildrenSize();
+    const childS = this.getChildrenSize();
     if (cs.getcurrentDescription() != null) {
       cOpts = cs.getcurrentDescription().getConnectOptions();
       let numChildren = 0;
@@ -682,7 +686,7 @@ class NavDescription extends Description {
   async navigate(cs) {
     cs.sBuf.length = 0; //reset
     cs.sBuf.push("(DESCRIPTION=");
-    let desc = cs.newConnectionDescription(); //connectiondescription
+    const desc = cs.newConnectionDescription(); //connectiondescription
     if (this.retryCount != null) {
       cs.retryCount = this.getIntValue(this.retryCount, cs.retryCount);
       desc.retryCount = cs.retryCount;
@@ -711,7 +715,7 @@ class NavDescription extends Description {
     if ('enable' in this.params) {
       cs.sBuf.push("(ENABLE=" + this.params.enable + ")");
     }
-    if (('sslServerCertDN' in this.params) || ('sslServerDNMatch' in this.params) || ('walletLocation' in this.params)) {
+    if (('sslServerCertDN' in this.params) || ('sslServerDNMatch' in this.params) || ('walletLocation' in this.params) || ('sslAllowWeakDNMatch' in this.params)) {
       cs.sBuf.push("(SECURITY=");
       if ('sslServerCertDN' in this.params) {
         cs.sBuf.push("(SSL_SERVER_CERT_DN=" + this.params.sslServerCertDN + ")");
@@ -719,6 +723,9 @@ class NavDescription extends Description {
       if ('sslServerDNMatch' in this.params) {
         cs.sBuf.push("(SSL_SERVER_DN_MATCH=" + this.params.sslServerDNMatch + ")");
       }
+      if ('sslAllowWeakDNMatch' in this.params) {
+        cs.sBuf.push("(SSL_ALLOW_WEAK_DN_MATCH=" + this.params.sslAllowWeakDNMatch + ")");
+      }
       if ('walletLocation' in this.params) {
         cs.sBuf.push("(WALLET_LOCATION=" + this.params.walletLocation + ")");
       }
@@ -834,10 +841,10 @@ class NavDescriptionList extends DescriptionList {
    */
   static setActiveChildren(children, failover, loadBalance) {
     let randNumber;
-    let listSize = children.length;
+    const listSize = children.length;
     let tmpChildren = new Array();
-    let rand = Math.floor(Math.random() * 10);
-    let arr = new Array(listSize).fill(false);
+    const rand = Math.floor(Math.random() * 10);
+    const arr = new Array(listSize).fill(false);
 
     if (failover) {
       if (loadBalance) {

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,38 +66,32 @@ 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);
-      resolvedVal = await ezcnObj.getResolvedUrl();
-    } catch (err) {
-      try {
-        /* try tns alias */
-        let namesFilePath = tnsnamesFilePath(configDir);
-        let 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');
-        resolvedVal = resolvedVal.getListElement(0);
-      } catch (err1) {
-        if ((connStr.indexOf(':') != -1) || (connStr.indexOf('/') != -1)) {
-          throw err;
-        } else {
-          throw err1;
-        }
-      }
+    if ((connStr.indexOf(':') != -1) || (connStr.indexOf('/') != -1)) {
+      const ezcnObj = new EzConnect(connStr);
+      resolvedVal = ezcnObj.getResolvedUrl();
+      return resolvedVal;
+    } else {
+      //try tns alias
+      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');
+      resolvedVal = resolvedVal.getListElement(0);
     }
+
   }
   return resolvedVal;
+
 }
 
 async function resolveAddress(connStr, configDir) {
-  let connstr = await resolveConnectStr(connStr, configDir);
+  const connstr = await resolveConnectStr(connStr, configDir);
   return createNode(connstr);
 }
 
@@ -140,23 +135,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 +206,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 +226,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 +245,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 +262,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 +272,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 +307,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 +353,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 +509,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);