oracledb 6.1.0 → 6.3.0

package/lib/thin/sqlnet/constants.js

@@ -27,175 +27,175 @@
 
 module.exports =  {
   // TNS packet types
-  NSPTCN : 1,          // Connect
-  NSPTAC : 2,          // Accept
-  NSPTAK : 3,          // Acknowledge
-  NSPTRF : 4,          // Refuse
-  NSPTRD : 5,          // Redirect
-  NSPTDA : 6,          // Data
-  NSPTNL : 7,          // Null
-  NSPTAB : 9,          // Abort
-  NSPTRS : 11,         // Re-send
-  NSPTMK : 12,         // Marker
-  NSPTAT : 13,         // Attention
-  NSPTCNL : 14,        // Control information
-  NSPTDD  : 15,        // data descriptor
-  NSPTHI  : 19,        // Highest legal packet type
+  NSPTCN: 1,          // Connect
+  NSPTAC: 2,          // Accept
+  NSPTAK: 3,          // Acknowledge
+  NSPTRF: 4,          // Refuse
+  NSPTRD: 5,          // Redirect
+  NSPTDA: 6,          // Data
+  NSPTNL: 7,          // Null
+  NSPTAB: 9,          // Abort
+  NSPTRS: 11,         // Re-send
+  NSPTMK: 12,         // Marker
+  NSPTAT: 13,         // Attention
+  NSPTCNL: 14,        // Control information
+  NSPTDD: 15,         // data descriptor
+  NSPTHI: 19,         // Highest legal packet type
 
   // Packet Header
-  NSPHDLEN  : 0,       // Packet length
-  NSPHDPSM  : 2,       // Packet checksum(deprecated in version 3.15 with large sdu support)
-  NSPHDTYP  : 4,       // Packet type
-  NSPHDFLGS : 5,       // Packet flags
-  NSPHDHSM  : 6,       // Header checksum
-  NSPSIZHD  : 8,       // Packet header size
+  NSPHDLEN: 0,       // Packet length
+  NSPHDPSM: 2,       // Packet checksum(deprecated in version 3.15 with large sdu support)
+  NSPHDTYP: 4,       // Packet type
+  NSPHDFLGS: 5,      // Packet flags
+  NSPHDHSM: 6,       // Header checksum
+  NSPSIZHD: 8,       // Packet header size
 
   /* Packet flags for NSPHDFLGS */
-  NSPFSID  : 0x01,     // SID is given
-  NSPFRDS  : 0x02,     // ReDirect Separation of cnda vs cndo
-  NSPFRDR  : 0x04,     // ReDiRected client Connect (NSPTCN)
-  NSPFLSD  : 0x20,     // packet with large sdu field
-  NO_HEADER_FLAGS : 0,
-  NSPFSRN  : 0x08,
+  NSPFSID: 0x01,     // SID is given
+  NSPFRDS: 0x02,     // ReDirect Separation of cnda vs cndo
+  NSPFRDR: 0x04,     // ReDiRected client Connect (NSPTCN)
+  NSPFLSD: 0x20,     // packet with large sdu field
+  NO_HEADER_FLAGS: 0,
+  NSPFSRN: 0x08,
 
   // Connect Packet
-  NSPCNVSN   : 8,    // My version number
-  NSPCNLOV   : 10,   // Lowest version number I can be compatible with
-  NSPCNOPT   : 12,   // Global service options
-  NSPCNSDU   : 14,   // My SDU size
-  NSPCNTDU   : 16,   // Maximum TDU size
-  NSPCNNTC   : 18,   // NT characterstics
-  NSPCNTNA   : 20,   // Line turnaround value
-  NSPCNONE   : 22,   // The value '1' in my hardware byte order
-  NSPCNLEN   : 24,   // Length of connect data
-  NSPCNOFF   : 26,   // Offset to connect data
-  NSPCNMXC   : 28,   // Maximum connect data you can send me
-  NSPCNFL0   : 32,   // Connect flags
-  NSPCNFL1   : 33,
-  NSPCNTMO   : 50,   // local connection timeout val
-  NSPCNTCK   : 52,   // local tick size
-  NSPCNADL   : 54,
-  NSPCNAOF   : 56,   // offset to reconnect tns addr
-  NSPCNLSD   : 58,   // large sdu
-  NSPCNLTD   : 62,   // large tdu
-  NSPCNCFL   : 66,   // compression data
-  NSPCNCFL2  : 70,   // connect flag2
+  NSPCNVSN: 8,    // My version number
+  NSPCNLOV: 10,   // Lowest version number I can be compatible with
+  NSPCNOPT: 12,   // Global service options
+  NSPCNSDU: 14,   // My SDU size
+  NSPCNTDU: 16,   // Maximum TDU size
+  NSPCNNTC: 18,   // NT characterstics
+  NSPCNTNA: 20,   // Line turnaround value
+  NSPCNONE: 22,   // The value '1' in my hardware byte order
+  NSPCNLEN: 24,   // Length of connect data
+  NSPCNOFF: 26,   // Offset to connect data
+  NSPCNMXC: 28,   // Maximum connect data you can send me
+  NSPCNFL0: 32,   // Connect flags
+  NSPCNFL1: 33,
+  NSPCNTMO: 50,   // local connection timeout val
+  NSPCNTCK: 52,   // local tick size
+  NSPCNADL: 54,
+  NSPCNAOF: 56,   // offset to reconnect tns addr
+  NSPCNLSD: 58,   // large sdu
+  NSPCNLTD: 62,   // large tdu
+  NSPCNCFL: 66,   // compression data
+  NSPCNCFL2: 70,  // connect flag2
   //  NSPCNV310DAT : (NSPCNTMO + 8), start of connect data, V3.10   packet
   //  NSPCNV315DAT : (NSPCNCFL + 4),
-  NSPCNDAT : 74,      // Start connect data
-  NSPMXCDATA : 230,   // Maximum length of connect data
+  NSPCNDAT: 74,      // Start connect data
+  NSPMXCDATA: 230,   // Maximum length of connect data
   // Connect flags (Used mostly by NA)
-  NSINAWANTED               : 0x01, // Want to use NA
-  NSINAINTCHG               : 0x02, // Interchange involved
+  NSINAWANTED: 0x01, // Want to use NA
+  NSINAINTCHG: 0x02, // Interchange involved
   NSINADISABLEDFORCONNECTION: 0x04, // Disable NA
-  NSINANOSERVICES           : 0x08, // No NA services linked
-  NSINAREQUIRED             : 0x10, // NA is required
-  NSINAAUTHWANTED           : 0x20, // Authentication linked
-  NSISUPSECRENEG            : 0x80, // bkwrd comp: SUPport SECurity RE-NEG
+  NSINANOSERVICES: 0x08, // No NA services linked
+  NSINAREQUIRED: 0x10,   // NA is required
+  NSINAAUTHWANTED: 0x20, // Authentication linked
+  NSISUPSECRENEG: 0x80,  // bkwrd comp: SUPport SECurity RE-NEG
   // Connect options
-  NSGDONTCARE               : 0x0001, // "don't care"
-  NSGHDX                    : 0x0002, // half-duplex (w/ token management)
-  NSGFDX                    : 0x0004, // full-duplex
-  NSGHDRCHKSUM              : 0x0008, // checksum on packet header
-  NSGPAKCHKSUM              : 0x0010, // checksum on entire packet
-  NSGBROKEN                 : 0x0020, // provide broken connection notification
-  NSGUSEVIO                 : 0x0040, // can use Vectored I/O
-  NSGOSAUTHOK               : 0x0080, // use OS authentication
-  NSGSENDATTN               : 0x0200, // can send attention
-  NSGRECVATTN               : 0x0400, // can recv attention
-  NSGNOATTNPR               : 0x0800, // no attention processing
-  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,
+  NSGDONTCARE: 0x0001, // "don't care"
+  NSGHDX: 0x0002, // half-duplex (w/ token management)
+  NSGFDX: 0x0004, // full-duplex
+  NSGHDRCHKSUM: 0x0008, // checksum on packet header
+  NSGPAKCHKSUM: 0x0010, // checksum on entire packet
+  NSGBROKEN: 0x0020, // provide broken connection notification
+  NSGUSEVIO: 0x0040, // can use Vectored I/O
+  NSGOSAUTHOK: 0x0080, // use OS authentication
+  NSGSENDATTN: 0x0200, // can send attention
+  NSGRECVATTN: 0x0400, // can recv attention
+  NSGNOATTNPR: 0x0800, // no attention processing
+  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
-  NSPACOPT : 10,  // global service options
-  NSPACSDU : 12,  // SDU size
-  NSPACTDU : 14,  // Maximum TDU
-  NSPACONE : 16,  // The value '1' in my hardware byte order
-  NSPACLEN : 18,  // connect data length
-  NSPACOFF : 20,  // offset to connect data
-  NSPACFL0 : 22,  // connect flags
-  NSPACFL1 : 23,
-  NSPACTMO : 24,  // connection pool timeout value
-  NSPACTCK : 26,  // local tick size
-  NSPACADL : 28,  // reconnect tns address length
-  NSPACAOF : 30,  // offset to reconnect tns addr
-  NSPACLSD : 32,  // Large sdu
-  NSPACLTD : 36,  // Large tdu
-  NSPACCFL : 40,  // compression flag
-  NSPACFL2 : 41,  // accept flag2 (4 bytes)
-  NSPACV310DAT : 32, /* start of accept data, V3.10     packet */
-  NSPACV315DAT : 41, // start of accept data, V3.15     packet
+  NSPACVSN: 8,   // connection version
+  NSPACOPT: 10,  // global service options
+  NSPACSDU: 12,  // SDU size
+  NSPACTDU: 14,  // Maximum TDU
+  NSPACONE: 16,  // The value '1' in my hardware byte order
+  NSPACLEN: 18,  // connect data length
+  NSPACOFF: 20,  // offset to connect data
+  NSPACFL0: 22,  // connect flags
+  NSPACFL1: 23,
+  NSPACTMO: 24,  // connection pool timeout value
+  NSPACTCK: 26,  // local tick size
+  NSPACADL: 28,  // reconnect tns address length
+  NSPACAOF: 30,  // offset to reconnect tns addr
+  NSPACLSD: 32,  // Large sdu
+  NSPACLTD: 36,  // Large tdu
+  NSPACCFL: 40,  // compression flag
+  NSPACFL2: 41,  // accept flag2 (4 bytes)
+  NSPACV310DAT: 32, /* start of accept data, V3.10     packet */
+  NSPACV315DAT: 41, // start of accept data, V3.15     packet
 
   /* Refuse Packet */
-  NSPRFURS : 8,  // User (appliction) reason for refusal
-  NSPRFSRS : 9,  // System (NS) reason for
-  NSPRFLEN : 10, // Length of refuse data
-  NSPRFDAT : 12, // Start of connect data
+  NSPRFURS: 8,  // User (appliction) reason for refusal
+  NSPRFSRS: 9,  // System (NS) reason for
+  NSPRFLEN: 10, // Length of refuse data
+  NSPRFDAT: 12, // Start of connect data
   // Compression flags
-  NSPACCFON : 0x80, // 1st MSB:  compression on/off
-  NSPACCFAT : 0x40, // 2nd MSB :   compression auto
-  NSPACCFNT : 0x02, // Second last LSB : compression for non-tcp protocol
+  NSPACCFON: 0x80, // 1st MSB:  compression on/off
+  NSPACCFAT: 0x40, // 2nd MSB :   compression auto
+  NSPACCFNT: 0x02, // Second last LSB : compression for non-tcp protocol
   // Accept flag2
-  NSPACOOB     : 0x00000001, // OOB support check at connection time
-  NSGPCHKSCMD  : 0x01000000, // Support for Poll and Check logic
+  NSPACOOB: 0x00000001, // OOB support check at connection time
+  NSGPCHKSCMD: 0x01000000, // Support for Poll and Check logic
 
   /* Redirect packet */
-  NSPRDLEN : 8,   // Length of redirect data
-  NSPRDDAT : 10,  // Start of connect data
+  NSPRDLEN: 8,   // Length of redirect data
+  NSPRDDAT: 10,  // Start of connect data
 
   /* Data Packet */
-  NSPDAFLG  : 8,    // Data flags
-  NSPDADAT  : 10,   // Start of Data
-  NSPDAFEOF : 0x40, // "end of file"
+  NSPDAFLG: 8,    // Data flags
+  NSPDADAT: 10,   // Start of Data
+  NSPDAFEOF: 0x40, // "end of file"
 
   /* Marker Packet */
-  NSPMKTYP : 8,     // marker type (see below)
-  NSPMKODT : 9,     // old (pre-V3.05) data byte
-  NSPMKDAT : 10,    // data byte
-  NSPMKTD0 : 0,     // data marker - 0 data bytes
-  NSPMKTD1 : 1,     // data marker - 1 data byte
-  NSPMKTAT : 2,     // Attention Marker
-  NIQBMARK : 1,     // Break marker
-  NIQRMARK : 2,     // Reset marker
-  NIQIMARK : 3,     // Interrupt marker
+  NSPMKTYP: 8,     // marker type (see below)
+  NSPMKODT: 9,     // old (pre-V3.05) data byte
+  NSPMKDAT: 10,    // data byte
+  NSPMKTD0: 0,     // data marker - 0 data bytes
+  NSPMKTD1: 1,     // data marker - 1 data byte
+  NSPMKTAT: 2,     // Attention Marker
+  NIQBMARK: 1,     // Break marker
+  NIQRMARK: 2,     // Reset marker
+  NIQIMARK: 3,     // Interrupt marker
 
   /* Control Packet */
-  NSPCTLCMD      : 8,  // Control Command length is 2 bytes
-  NSPCTLDAT      : 10, // Control Data length is specific to the Command type.
-  NSPCTL_SERR    : 8,  // Error Control Command Type
-  NSPCTL_CLRATTN : 9,  // Clear OOB option
+  NSPCTLCMD: 8,  // Control Command length is 2 bytes
+  NSPCTLDAT: 10, // Control Data length is specific to the Command type.
+  NSPCTL_SERR: 8,  // Error Control Command Type
+  NSPCTL_CLRATTN: 9,  // Clear OOB option
 
   /* OPTIONS */
-  NSPDFSDULN  : 8192,    // default SDU size
-  NSPABSSDULN : 2097152, // maximim SDU size
-  NSPMXSDULN  : 65535,   // maximim SDU size
-  NSPMNSDULN  : 512,     // minimum SDU size
-  NSPDFTDULN  : 2097152, // default TDU size
-  NSPMXTDULN  : 2097152, // maximum TDU size
-  NSPMNTDULN  : 255,     // minimum TDU size
-  NSFIMM      : 0x0040,  // immediate close
+  NSPDFSDULN: 8192,    // default SDU size
+  NSPABSSDULN: 2097152, // maximim SDU size
+  NSPMXSDULN: 65535,   // maximim SDU size
+  NSPMNSDULN: 512,     // minimum SDU size
+  NSPDFTDULN: 2097152, // default TDU size
+  NSPMXTDULN: 2097152, // maximum TDU size
+  NSPMNTDULN: 255,     // minimum TDU size
+  NSFIMM: 0x0040,  // immediate close
 
   /* PARAMETERS */
-  DISABLE_OOB_STR      : 'DISABLE_OOB', // disable OOB parameter
-  EXPIRE_TIME          : 'EXPIRE_TIME', // expire Time
-  PEM_WALLET_FILE_NAME : 'ewallet.pem',
+  DISABLE_OOB_STR: 'DISABLE_OOB', // disable OOB parameter
+  EXPIRE_TIME: 'EXPIRE_TIME', // expire Time
+  PEM_WALLET_FILE_NAME: 'ewallet.pem',
 
   /* Get/Set options */
-  NT_MOREDATA : 1, // More Data in Transport available
-  NS_MOREDATA : 2, // More Data available to be read
-  SVCNAME     : 3, // Service name
-  SERVERTYPE  : 4, // Server type
-  REMOTEADDR  : 5, // Remote Address
-  HEALTHCHECK : 6, // Health check of connection
-  CONNCLASS   : 7, // Connection Class
-  PURITY      : 8, // Purity
-  SID         : 9, // SID
+  NT_MOREDATA: 1, // More Data in Transport available
+  NS_MOREDATA: 2, // More Data available to be read
+  SVCNAME: 3, // Service name
+  SERVERTYPE: 4, // Server type
+  REMOTEADDR: 5, // Remote Address
+  HEALTHCHECK: 6, // Health check of connection
+  CONNCLASS: 7, // Connection Class
+  PURITY: 8, // Purity
+  SID: 9, // SID
 
   /* FLAGS */
-  NSNOBLOCK : 0x0001, // Do not block
+  NSNOBLOCK: 0x0001, // Do not block
 };

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();
-    const 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,29 +91,22 @@ 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]
 
@@ -151,7 +136,7 @@ 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);
 
     const connectionIdPrefix =
       this.urlProps.get("CONNECTION_ID_PREFIX");
@@ -210,10 +195,8 @@ 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;
     const builder = new Array();
     let proxyInfo = '';
     if (proxyHost != null) {
@@ -235,11 +218,10 @@ class EZConnectResolver {
         const hostnames = (match.groups.hostnames).split(',');
         let port = match.groups.port;
         if (port == null) {
-          port = '1521' + '';
+          port = '1521';    //default port
         }
         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;

package/lib/thin/sqlnet/navNodes.js

@@ -35,10 +35,10 @@ const dnsPromises = dns.promises;
 const cInfo = require("../util.js").CLIENT_INFO;
 
 const SchemaObjectFactoryInterface = {
-  ADDR:0,
-  ADDR_LIST:1,
-  DESC:2,
-  DESC_LIST:3,
+  ADDR: 0,
+  ADDR_LIST: 1,
+  DESC: 2,
+  DESC_LIST: 3,
 };
 
 /**
@@ -77,7 +77,7 @@ class Address {
     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();
   }
@@ -451,7 +451,7 @@ const NavSchemaObject = {
   CONID: "(CONNECTION_ID="
 };
 const options = {
-  all:true,
+  all: true,
 };
 /**
  * Class that navigates the address node in the tree.

package/lib/thin/sqlnet/networkSession.js

@@ -46,6 +46,7 @@ const downHostInstance = require("./connStrategy.js").SOLE_INST_DHCACHE;
 
 async function getConnectionInfo(userConfig) {
   const connStr = await resolveConnectStr(userConfig.connectString, userConfig.configDir);
+  const addressNode = await createNode(connStr);
   let nvpair;
   if (typeof connStr === 'string')
     nvpair = createNVPair(connStr);
@@ -58,7 +59,7 @@ async function getConnectionInfo(userConfig) {
   const sid =   findValue(nvpair, ["DESCRIPTION", "CONNECT_DATA", "SID"]);
   const poolPurity = findValue(nvpair, ["DESCRIPTION", "CONNECT_DATA", "POOL_PURITY"]);
 
-  return [serverVal, connClass, svcname, poolPurity, sid ];
+  return [serverVal, connClass, svcname, poolPurity, sid, addressNode ];
 }
 
 /**
@@ -71,29 +72,23 @@ async function resolveConnectStr(connectString, configDir) {
   const connStr = connectString.trim();
   let resolvedVal = connStr;
   if ((connStr.indexOf(')') == -1) || (connStr.indexOf('(') != 0)) {
-    try {
-      /* Try through ezconnect */
+    if ((connStr.indexOf(':') != -1) || (connStr.indexOf('/') != -1)) {
       const ezcnObj = new EzConnect(connStr);
-      resolvedVal = await ezcnObj.getResolvedUrl();
-    } catch (err) {
-      try {
-        /* 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);
-      } catch (err1) {
-        if ((connStr.indexOf(':') != -1) || (connStr.indexOf('/') != -1)) {
-          throw err;
-        } else {
-          throw err1;
-        }
-      }
+      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) {
@@ -516,7 +511,13 @@ class NetworkSession {
   */
   async connect(userConfig) {
     const connStr = userConfig.connectString ? userConfig.connectString : userConfig.connectionString;
-    const addressNode = await resolveAddress(connStr, userConfig.configDir);
+    let addressNode;
+    if (userConfig._connInfo) {
+      addressNode = userConfig._connInfo[5];
+      addressNode.reset();
+    } else {
+      addressNode = await resolveAddress(connStr, userConfig.configDir);
+    }
     let address;
     try {
       address = await this.getAddress(addressNode, userConfig);

package/lib/thin/sqlnet/ntTcp.js

@@ -228,10 +228,10 @@ class NTTCP {
           this.doDNMatch = false; //Don't match initial connect
         try {
           secureContext = tls.createSecureContext({
-            cert : this.atts.wallet,
-            key : this.atts.wallet,
+            cert: this.atts.wallet,
+            key: this.atts.wallet,
             passphrase: this.atts.walletPassword,
-            ca : this.atts.wallet,
+            ca: this.atts.wallet,
           });
         } catch (err) {
           errors.throwErr(errors.ERR_TLS_INIT_FAILURE);
@@ -415,7 +415,7 @@ class NTTCP {
           buf: tempBuf.subarray(0, len),
           type: tempBuf[4],
           flags: tempBuf[5],
-          num : this.packetNum++
+          num: this.packetNum++
         };
         this.packets.push(packet);
         if (this.readWaiter) {
@@ -474,10 +474,10 @@ class NTTCP {
       this.checkErr();
       this.doDNMatch = true;
       const secureContext = tls.createSecureContext({
-        cert : this.atts.wallet,
-        key : this.atts.wallet,
+        cert: this.atts.wallet,
+        key: this.atts.wallet,
         passphrase: this.atts.walletPassword,
-        ca : this.atts.wallet,
+        ca: this.atts.wallet,
       });
       await this.tlsConnect(secureContext, this.connStream);
     } finally {

package/lib/thin/sqlnet/packet.js

@@ -299,7 +299,7 @@ function RedirectPacket(packet) {
  */
 function MarkerPacket(isLargeSDU) {
   this.len = constants.NSPMKDAT + 1; /* Packet length */
-  this.buf = Buffer.alloc(constants.NSPMKDAT + 1); /* Packet Buffer */
+  this.buf = Buffer.allocUnsafe(constants.NSPMKDAT + 1); /* Packet Buffer */
 
   if (isLargeSDU) {
     this.buf.writeUInt32BE(this.len, constants.NSPHDLEN);