oracledb 6.7.0 → 6.7.2

package/README.md

@@ -1,10 +1,10 @@
-# node-oracledb version 6.7.0
+# node-oracledb version 6.7.2
 
 The node-oracledb add-on for Node.js powers high performance Oracle Database
 applications.  Applications can be written in TypeScript, or directly in
 JavaScript.
 
-Use node-oracledb 6.7.0 to connect Node.js 14.6, or later, to Oracle
+Use node-oracledb 6.7.2 to connect Node.js 14.6, or later, to Oracle
 Database.  Older versions of node-oracledb may work with older versions of
 Node.js.
 
@@ -48,7 +48,7 @@ vulnerability disclosure process.
 
 ## License
 
-Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+Copyright (c) 2015, 2025, Oracle and/or its affiliates.
 
 This software is dual-licensed to you under the Universal Permissive License
 (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License

package/build/Release/oracledb-6.7.2-darwin-arm64.node-buildinfo.txt

@@ -0,0 +1 @@
+oracledb-6.7.2-darwin-arm64.node v22.2.0 d813e9fe939a65599afab84c08ad9fcea51718d5 ca4b004c471033328549f8b4d461cb5985fe2230 Fri, 07 Feb 2025 13:55:05 GMT

package/build/Release/oracledb-6.7.2-darwin-x64.node-buildinfo.txt

@@ -0,0 +1 @@
+oracledb-6.7.2-darwin-x64.node v20.11.1 d813e9fe939a65599afab84c08ad9fcea51718d5 ca4b004c471033328549f8b4d461cb5985fe2230 Fri, 07 Feb 2025 14:37:36 GMT

package/build/Release/oracledb-6.7.2-js-buildinfo.txt

@@ -0,0 +1 @@
+d813e9fe939a65599afab84c08ad9fcea51718d5

package/build/Release/oracledb-6.7.2-linux-arm64.node-buildinfo.txt

@@ -0,0 +1 @@
+oracledb-6.7.2-linux-arm64.node v20.16.0 d813e9fe939a65599afab84c08ad9fcea51718d5 ca4b004c471033328549f8b4d461cb5985fe2230 Fri, 07 Feb 2025 13:48:03 GMT

package/build/Release/oracledb-6.7.2-linux-x64.node-buildinfo.txt

@@ -0,0 +1 @@
+oracledb-6.7.2-linux-x64.node v20.16.0 d813e9fe939a65599afab84c08ad9fcea51718d5 ca4b004c471033328549f8b4d461cb5985fe2230 Fri, 07 Feb 2025 13:47:00 GMT

package/build/Release/oracledb-6.7.2-win32-x64.node-buildinfo.txt

@@ -0,0 +1 @@
+oracledb-6.7.2-win32-x64.node v20.0.0 d813e9fe939a65599afab84c08ad9fcea51718d5 ca4b004c471033328549f8b4d461cb5985fe2230 Fri, 07 Feb 2025 13:46:32 GMT

package/examples/example.js

@@ -1,4 +1,4 @@
-/* Copyright (c) 2018, 2023, Oracle and/or its affiliates. */
+/* Copyright (c) 2018, 2024, Oracle and/or its affiliates. */
 
 /******************************************************************************
  *
@@ -47,16 +47,16 @@ const dbConfig = require('./dbconfig.js');
 if (process.env.NODE_ORACLEDB_DRIVER_MODE === 'thick') {
 
   // Thick mode requires Oracle Client or Oracle Instant Client libraries.
-  // On Windows and macOS Intel you can specify the directory containing the
+  // On Windows and macOS you can specify the directory containing the
   // libraries at runtime or before Node.js starts.  On other platforms (where
   // Oracle libraries are available) the system library search path must always
   // include the Oracle library path before Node.js starts.  If the search path
   // is not correct, you will get a DPI-1047 error.  See the node-oracledb
   // installation documentation.
   let clientOpts = {};
-  // On Windows and macOS Intel platforms, set the environment
-  // variable NODE_ORACLEDB_CLIENT_LIB_DIR to the Oracle Client library path
-  if (process.platform === 'win32' || (process.platform === 'darwin' && process.arch === 'x64')) {
+  // On Windows and macOS platforms, set the environment variable
+  // NODE_ORACLEDB_CLIENT_LIB_DIR to the Oracle Client library path
+  if (process.platform === 'win32' || process.platform === 'darwin') {
     clientOpts = { libDir: process.env.NODE_ORACLEDB_CLIENT_LIB_DIR };
   }
   oracledb.initOracleClient(clientOpts);  // enable node-oracledb Thick mode

package/lib/connection.js

@@ -748,6 +748,11 @@ class Connection extends EventEmitter {
     }
 
     delete this._impl;
+    if (!this.thin) {
+      for (const cls of this._dbObjectClasses.values()) {
+        cls._objType.refCleanup();
+      }
+    }
     this._dbObjectClasses.clear();
     this.emit('_afterConnClose');
   }

package/lib/errors.js

@@ -195,6 +195,7 @@ const ERR_OCIOBJECT_CONFIG_PROVIDER_AUTH_FAILED = 526;
 const ERR_AZURE_VAULT_AUTH_FAILED = 527;
 const ERR_AZURE_SERVICE_PRINCIPAL_AUTH_FAILED = 528;
 const ERR_WALLET_TYPE_NOT_SUPPORTED = 529;
+const ERR_HOST_NOT_FOUND = 530;
 
 // Oracle SUCCESS_WITH_INFO warning start from 700
 const WRN_COMPILATION_CREATE = 700;
@@ -511,24 +512,27 @@ messages.set(ERR_TNS_NAMES_FILE_MISSING,                // NJS-520
   'cannot connect to Oracle Database. File tnsnames.ora not found in %s');
 messages.set(ERR_CONNECTION_EOF,                        // NJS-521
   'connection to host %s port %d received end-of-file on communication channel. (CONNECTION_ID=%s)');
-messages.set(ERR_AZURE_CONFIG_PROVIDER_AUTH_FAILED,                        // NJS-522
+messages.set(ERR_AZURE_CONFIG_PROVIDER_AUTH_FAILED,     // NJS-522
   'Azure Authentication Failed: The authentication parameter value %s may be incorrect');
-messages.set(ERR_CONFIG_PROVIDER_FAILED_TO_RETRIEVE_CONFIG,                        // NJS-523
+messages.set(ERR_CONFIG_PROVIDER_FAILED_TO_RETRIEVE_CONFIG,   // NJS-523
   'Failed to retrieve configuration from Centralized Configuration Provider:\n %s');
 messages.set(ERR_CONFIG_PROVIDER_NOT_SUPPORTED,               // NJS-524
   'Configuration Provider not supported: %s');
 messages.set(ERR_CONFIG_PROVIDER_LOAD_FAILED,                 // NJS-525
   'Centralized Config Provider failed to load required libraries. Please install the required libraries.\n %s');
-messages.set(ERR_OCIOBJECT_CONFIG_PROVIDER_AUTH_FAILED,                        // NJS-526
+messages.set(ERR_OCIOBJECT_CONFIG_PROVIDER_AUTH_FAILED,       // NJS-526
   'OCI authentication failed: The authentication parameter value %s may be incorrect');
-messages.set(ERR_AZURE_VAULT_AUTH_FAILED,                        // NJS-527
-  'Azure Vault: Provide correct azure vault authentication details');
-messages.set(ERR_AZURE_SERVICE_PRINCIPAL_AUTH_FAILED,                        // NJS-528
+messages.set(ERR_AZURE_VAULT_AUTH_FAILED,                     // NJS-527
+  'Azure Vault: Provide correct Azure Vault authentication details');
+messages.set(ERR_AZURE_SERVICE_PRINCIPAL_AUTH_FAILED,         // NJS-528
   'Azure service principal authentication requires either a client certificate path or a client secret string');
-messages.set(ERR_WALLET_TYPE_NOT_SUPPORTED, 'Invalid wallet content format. Supported format is PEM');// NJS-529
-// Oracle SUCCESS_WITH_INFO warning
+messages.set(ERR_WALLET_TYPE_NOT_SUPPORTED,                   // NJS-529
+  'Invalid wallet content format. Supported format is PEM');
+messages.set(ERR_HOST_NOT_FOUND,                          // NJS-530
+  'The host addresses or URLs provided by the connect string are incorrect or unresolvable in your network.');
 
-messages.set(WRN_COMPILATION_CREATE,                           // NJS-700
+// Oracle SUCCESS_WITH_INFO warning
+messages.set(WRN_COMPILATION_CREATE,                          // NJS-700
   'creation succeeded with compilation errors');
 
 //-----------------------------------------------------------------------------
@@ -843,6 +847,7 @@ module.exports = {
   ERR_CONFIG_PROVIDER_NOT_SUPPORTED,
   ERR_CONFIG_PROVIDER_LOAD_FAILED,
   ERR_WALLET_TYPE_NOT_SUPPORTED,
+  ERR_HOST_NOT_FOUND,
   ERR_INVALID_BIND_NAME,
   ERR_WRONG_NUMBER_OF_BINDS,
   ERR_BUFFER_LENGTH_INSUFFICIENT,

package/lib/oracledb.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2015, 2024, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -665,7 +665,7 @@ async function createPool(options) {
 // If a tnsnames.ora file does not exist, then an exception is raised
 //-----------------------------------------------------------------------------
 async function getNetworkServiceNames(configDir) {
-  const { NLParamParser, tnsnamesFilePath } = require('thin/sqlnet/paramParser.js');
+  const { NLParamParser, tnsnamesFilePath } = require('./thin/sqlnet/paramParser.js');
   const nlParamParser =  new NLParamParser;
   const filePath = tnsnamesFilePath(configDir);
   const aliasht = await nlParamParser.initializeNlpa(filePath);

package/lib/thin/dbObject.js

@@ -179,7 +179,8 @@ class ThinDbObjectImpl extends DbObjectImpl {
   //---------------------------------------------------------------------------
   _ensureAssocKeys() {
     if (!this.unpackedAssocKeys) {
-      this.unpackedAssocKeys = [...this.unpackedAssocArray.keys()].sort();
+      // Associative arrays indexed by integer are only supported now
+      this.unpackedAssocKeys = [...this.unpackedAssocArray.keys()].sort((x, y) => x - y);
     }
   }
 
@@ -546,6 +547,9 @@ class ThinDbObjectImpl extends DbObjectImpl {
   // getNextIndex()
   //
   // Returns the next index in a collection.
+  // For associative arrays indexed by integers, if the passed-in index
+  // parameter is not present, it will return the next higher index found
+  // in the associative array.
   //---------------------------------------------------------------------------
   getNextIndex(index) {
     this._ensureUnpacked();
@@ -566,6 +570,9 @@ class ThinDbObjectImpl extends DbObjectImpl {
   // getPrevIndex()
   //
   // Returns the previous index in a collection.
+  // For associative arrays indexed by integers, if the passed-in index
+  // parameter is not present, it will return the next lower index found
+  // in the associative array.
   //---------------------------------------------------------------------------
   getPrevIndex(index) {
     this._ensureUnpacked();
@@ -575,9 +582,11 @@ class ThinDbObjectImpl extends DbObjectImpl {
       }
     } else if (this.unpackedAssocArray) {
       this._ensureAssocKeys();
-      for (const key of this.unpackedAssocKeys.reverse()) {
-        if (key < index)
-          return key;
+      let prev;
+      for (const key of this.unpackedAssocKeys) {
+        if (key >= index)
+          return prev;
+        prev = key;
       }
     }
   }

package/lib/thin/protocol/constants.js

@@ -48,7 +48,7 @@ module.exports = {
   PURITY_NEW: constants.PURITY_NEW,
   PURITY_SELF: constants.PURITY_SELF,
   SYSASM: constants.SYSASM,
-  SYSBKP: constants.SYSBKP,
+  SYSBKP: constants.SYSBACKUP,
   SYSDBA: constants.SYSDBA,
   SYSDG: constants.SYSDG,
   SYSKM: constants.SYSKM,

package/lib/thin/protocol/messages/withData.js

@@ -698,7 +698,7 @@ class MessageWithData extends Message {
       // conversion requested if maxSize is not multiplied by the
       // bufferSizeFactor
       if (variable.type._csfrm === constants.CSFRM_NCHAR) {
-        maxSize *= variable.type._bufferSizeFactor;
+        maxSize = Math.min(maxSize * variable.type._bufferSizeFactor, constants.TNS_MAX_LONG_LENGTH);
       }
       if ([constants.TNS_DATA_TYPE_ROWID, constants.TNS_DATA_TYPE_UROWID].includes(oraTypeNum)) {
         oraTypeNum = constants.TNS_DATA_TYPE_VARCHAR;
@@ -726,11 +726,9 @@ class MessageWithData extends Message {
       // expects that and complains if any other value is sent!
       buf.writeUInt8(0);
       buf.writeUInt8(0);
-      if (maxSize > buf.caps.maxStringSize) {
-        buf.writeUB4(constants.TNS_MAX_LONG_LENGTH);
-      } else {
-        buf.writeUB4(maxSize);
-      }
+
+      // Write the max buffer size
+      buf.writeUB4(maxSize);
 
       if (variable.isArray) {
         buf.writeUB4(variable.maxArraySize);

package/lib/thin/sqlnet/connStrategy.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -90,6 +90,7 @@ class ConnStrategy {
     this.descriptionList.push(this.currentDescription);
     this.currentDescription = null;
   }
+
   /**
   * Execute the Connection Options from the array.  When a refuse packet is received from
   * server this method is called again and the next connect option is tried.
@@ -148,8 +149,8 @@ class ConnStrategy {
   }
   // sleep time expects milliseconds
 
-
 }
+
 function sleep(time) {
   return new Promise((resolve) => setTimeout(resolve, time));
 }

package/lib/thin/sqlnet/navNodes.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -315,6 +315,7 @@ class Description {
       }
     }
   }
+
   toString() {
     let s = new String(""), child ;
 
@@ -428,9 +429,6 @@ class DescriptionList {
 }
 
 
-
-
-
 /**
  * Class that contains information about a possible connection.
  */
@@ -453,6 +451,7 @@ const NavSchemaObject = {
 const options = {
   all: true,
 };
+
 /**
  * Class that navigates the address node in the tree.
  */
@@ -460,16 +459,17 @@ class NavAddress extends Address {
   constructor() {
     super();
   }
+
   /**
    * Set the connection option to this address.
    * @param {object} cs
    */
   async navigate(cs) {
     let addresses;
-    let nullHost = 0;
+    let nullHost = false;
     let needToCloseDescription = false;
     if (!this.host) {
-      nullHost = 1;
+      nullHost = true;
       this.host = os.hostname();
       try {
         await dnsPromises.lookup(this.host, options);
@@ -495,7 +495,7 @@ class NavAddress extends Address {
           co.httpsProxyPort = this.httpsProxyPort;
           co.desc = cs.getcurrentDescription();
           co.CNdata.push(cs.sBuf.join(""));
-          if (nullHost == 1)
+          if (nullHost)
             co.CNdata.push('(address=(protocol=' + this.prot + ')(host=' + this.host + ')(port=' + this.port + '))');
           else
             co.CNdata.push(this.toString());
@@ -505,6 +505,8 @@ class NavAddress extends Address {
         }
       } catch {
         // do nothing
+        // Any error in the try block is ignored, because we want to try
+        // the next address
       }
     } else {
       const co = new ConnOption();
@@ -527,8 +529,6 @@ class NavAddress extends Address {
 
   }
 
-
-
   /**
    * AddToString is used to construct a string representation of the TNS
    * Address. Constructing a string is mainly needed when source route is ON.
@@ -557,10 +557,10 @@ class NavAddressList extends AddressList {
   }
 
   /**
- * Method decides how to traverse and sets the active children based on
- * the loadbalancing, failover values.
- * @param {object} cs
- */
+   * Method decides how to traverse and sets the active children based on
+   * the loadbalancing, failover values.
+   * @param {object} cs
+   */
   async navigate(cs) {
     await this.navigate2(cs, 0);
   }
@@ -592,6 +592,7 @@ class NavAddressList extends AddressList {
     cs.sBuf.length = this.sBuflength;
 
   }
+
   addToString(cs) {
     const NVString = this.toString();
     let cOpts = new Array();
@@ -604,7 +605,6 @@ class NavAddressList extends AddressList {
     }
   }
 
-
   getChildrenSize() {
     let size = 0;
     for (let i = 0; i < this.activeChildren.length; i++) {
@@ -762,7 +762,6 @@ class NavDescription extends Description {
   }
 
   closeNVPair(cs) {
-
     if (cs.getcurrentDescription() == null)
       return;
     let cOpts = new Array();
@@ -812,11 +811,9 @@ class NavDescription extends Description {
   }
 
   getIntValue(stringInt, defaultValue) {
-    try {
+    if (/^\d+$/.test(stringInt))
       return parseInt(stringInt);
-    } catch (exception) {
-      return defaultValue;
-    }
+    return defaultValue;
   }
 
 }
@@ -884,7 +881,5 @@ class NavDescriptionList extends DescriptionList {
 
   }
 
-
-
 }
 module.exports = {NavAddress, NavAddressList, NavDescription, NavDescriptionList};

package/lib/thin/sqlnet/networkSession.js

@@ -143,6 +143,7 @@ class NetworkSession {
   async getAddress(addressNode, userConfig) {
     /* Get the next address */
     const address = await addressNode.execute(userConfig);
+
     /* Prepare connection attributes */
     const uuid = this.sAtts ? this.sAtts.uuid : null;
     this.sAtts = new SessionAtts(uuid);
@@ -196,8 +197,10 @@ class NetworkSession {
   }
 
   /**
-   * Establish network session .Make transport level connection, send NSPTCN(connect packet) and read the response.
-   * @returns NetError.(connection successfully established(NetError.CONNECTED) or reason for failure)
+   * Establish network session. Make transport level connection, send
+   * NSPTCN(connect packet) and read the response. @returns NetError.
+   * (connection successfully established(NetError.CONNECTED)
+   * or reason for failure)
    */
   async connect2(address, userConfig) {
     /* Sanitise SDU */
@@ -534,8 +537,8 @@ class NetworkSession {
     try {
       address = await this.getAddress(addressNode, userConfig);
     } catch (err) {
-      if (err.message == "All options tried") /* Not even one valid Address */
-        errors.throwErr(errors.ERR_INVALID_CONNECT_STRING_PARAMETERS, "Ensure the ADDRESS parameters have been entered correctly, the most likely incorrect parameter is the host name");
+      if (err.message == "All options tried") /* Not even one valid address */
+        errors.throwErr(errors.ERR_HOST_NOT_FOUND);
       else
         errors.throwErr(errors.ERR_INVALID_CONNECT_STRING_PARAMETERS, err.message);
     }
@@ -617,7 +620,8 @@ class NetworkSession {
   /**
    * receive inband notification
    * @param {Object} obj Return the notification into user provided object
-   * @returns Error number sent from server, or error on the connection. returns 0 if healthy connection
+   * @returns Error number sent from server, or error on the connection.
+   * returns 0 if healthy connection
    */
   recvInbandNotif() {
     let error = 0;

package/lib/thin/sqlnet/ntTcp.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -72,7 +72,7 @@ class NTTCP {
   }
 
   /**
-   * DN matching funciton(used with TLS)
+   * DN matching function(used with TLS)
    */
   dnMatch(serverName, cert) {
     if (this.atts.sslServerDNMatch && this.doDNMatch) {
@@ -211,7 +211,7 @@ class NTTCP {
 
     try {
       await this.ntConnect(address);
-      if (this.atts.expireTime || this.atts.enableDCD) {  /* Set Keep alives */
+      if (this.atts.expireTime || this.atts.enableDCD) {  /* Set KeepAlives */
         if (this.atts.expireTime) {
           this.stream.setKeepAlive(true, this.atts.expireTime);
         } else {
@@ -248,7 +248,7 @@ class NTTCP {
   /**
    * Disconnect Network Transoprt
    * @param {int} type
-   * @returns Proimise
+   * @returns Promise
    */
   disconnect(type) {   /* Disconnect function for TCP sockets */
     if (this.connected && !this.err) {
@@ -470,8 +470,9 @@ class NTTCP {
    * @returns Promise
    */
   async renegTLS() {
+    let initTLSDone = false;
+    this.checkErr();
     try {
-      this.checkErr();
       this.doDNMatch = true;
       const secureContext = tls.createSecureContext({
         cert: this.atts.wallet,
@@ -479,7 +480,12 @@ class NTTCP {
         passphrase: this.atts.walletPassword,
         ca: this.atts.wallet,
       });
+      initTLSDone = true;
       await this.tlsConnect(secureContext, this.connStream);
+    } catch (err) {
+      if (!initTLSDone)
+        errors.throwErr(errors.ERR_TLS_INIT_FAILURE, err.message);
+      else throw err;
     } finally {
       this.setupEventHandlers();
     }

package/lib/thin/sqlnet/nvStrToNvPair.js

@@ -68,6 +68,9 @@ class NVPair {
     this.listType = LIST_REGULAR;
     this.rhsType = RHS_NONE;
   }
+  /**
+   * @param {string} atom - input atom string literal
+   */
   set setAtom(atom) {
     if (this._containsComment(atom)) {
       errors.throwErr(errors.ERR_INVALID_CONNECT_STRING_SYNTAX);
@@ -122,7 +125,7 @@ class NVPair {
   }
   /**
      * adds a nvpair to the existing one.
-     * @param {nvpair} pair
+     * @param {NVPair} pair
      */
   addListElement(pair) {
     if (this.list == null) {
@@ -147,11 +150,11 @@ class NVPair {
     }
   }
   /**
-    * Returns an empty string with the number specified in the argument. Used for
-     * indentation of multi-level NVPairs as they are stored
-     *
-     * @param count
-     *          Number of spaces required in the blank string.
+    * Returns an empty string with the number specified in the argument. Used
+    * for indentation of multi-level NVPairs as they are stored
+    *
+    * @param count
+    *          Number of spaces required in the blank string.
     */
   _space(count) {
     var blank_str = "";
@@ -274,9 +277,9 @@ const TKN_LF_VALUE = '\n';
 const TKN_CR_VALUE = '\r';
 
 /**
- * The NVTokens class is used to help break NVStrings apart into tokens, such as
- * TKN_LPAREN or TKN_LITERAL - this helps simplify the task of building NVPairs
- * from an NVString.
+ * The NVTokens class is used to help break NVStrings apart into tokens, such
+ * as TKN_LPAREN or TKN_LITERAL - this helps simplify the task of building
+ * NVPairs from an NVString.
 */
 class NVTokens {
 
@@ -435,9 +438,8 @@ class NVTokens {
     return true;
   }
   /**
-   * Returns current token. Throws Error if no string has
-   * been parsed, or if there are no tokens left. Does NOT advance
-   * the token position.
+   * Returns current token. Throws Error if no string has been parsed,
+   * or if there are no tokens left. Does NOT advance the token position.
    */
   getToken() {
     if (this.tkType == null) { // nothing parsed
@@ -451,9 +453,8 @@ class NVTokens {
   }
 
   /**
-   * Returns current token. Throws Error if no string has
-   * been parsed, or if there are no tokens left. DOES advance the
-   * token position.
+   * Returns current token. Throws Error if no string has been parsed,
+   * or if there are no tokens left. DOES advance the token position.
    */
   popToken() {
     let token = TKN_NONE;
@@ -470,9 +471,8 @@ class NVTokens {
   }
   /**
    * Returns literal for current token. If current token is NOT a TKN_LITERAL,
-   * it returns a string representation of the current token. Throws
-   * Error if no string has been parsed, or
-   * if there are no tokens left.
+   * it returns a string representation of the current token. Throws Error
+   * if no string has been parsed, or if there are no tokens left.
    *
    * DOES NOT advance the token position.
    */
@@ -492,9 +492,8 @@ class NVTokens {
 
   /**
    * Returns literal for current token. If current token is NOT a TKN_LITERAL,
-   * it returns a string representation of the current token. Throws
-   * Error if no string has been parsed, or
-   * if there are no tokens left.
+   * it returns a string representation of the current token. Throws Error
+   * if no string has been parsed, or if there are no tokens left.
    *
    * DOES advance the token position.
    */
@@ -547,8 +546,6 @@ class NVTokens {
 }
 
 
-
-
 /**
  * The NVFactory class is used to help interpret the tokens generated by
  * NVTokens from an NVString.
@@ -696,7 +693,7 @@ function readNVList(nvt, parent) {
 
 /**
   * Returns a NVPair whose name matches (ignoring case) the specified
-  * name.  This function does search recursively through all descendents
+  * name.  This function does search recursively through all descendants
   * of the specified NVPair.
   * @param  nvp  NVPair to search through
   * @param  name  name to match (ignoring case)
@@ -726,8 +723,8 @@ function findNVPairRecurse(nvp, name) {
 }
 
 /**
-  * Returns a NVPair whose name matches (ignoring case) the specified
-  * name. This functions only searches the direct descendants of specified NVPair
+  * Returns a NVPair whose name matches (ignoring case) the specified name.
+  * This functions only searches the direct descendants of specified NVPair
   * @param  nvp  NVPair to search through
   * @param  name  name to match (ignoring case)
   */

package/lib/thin/sqlnet/paramParser.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -26,7 +26,7 @@
 
 'use strict';
 
-const {createNVPair, findValue} = require("./nvStrToNvPair.js");
+const {createNVPair} = require("./nvStrToNvPair.js");
 const fs = require('fs');
 const process = require('process');
 const readline = require('readline');
@@ -59,12 +59,21 @@ function tnsnamesFilePath(configDir) {
     return filePathVal;
   }
 }
+//Structure for each tnsnames.ora file
+class tnsnamesElement {
 
+  constructor() {
+    this.readInProgress = false;
+    this.waiters = [];
+    this.aliasht = new Map(); // It will have key as alias and value as its aliases value
+    this.modTime = new Map(); // It will have tnsnames filename and also all its ifile and its modified time
+  }
+}
 class NLParamParser {
 
   constructor() {
-    this.waiters = [];
-    this.readInProgress = false;
+  // key as tnsnames.ora(file_name) and value will be tnsnamesStruct<ht(alias key and value), modTime>
+    this.tnsnamesHT = new Map();
   }
   /**
  * Reads the given file line by line and stores the
@@ -73,29 +82,35 @@ class NLParamParser {
  * @returns {Promise}
  */
   async initializeNlpa(file_path) {
-    if (this.readInProgress) {
+    let tnsFileStruct;
+    if (this.tnsnamesHT.has(file_path))
+      tnsFileStruct = this.tnsnamesHT.get(file_path);
+    else
+      tnsFileStruct = new tnsnamesElement();
+    if (tnsFileStruct.readInProgress) {
       await new Promise((resolve) => {
-        this.waiters.push(resolve);
+        tnsFileStruct.waiters.push(resolve);
       });
     }
-    if (!this.checkModfTime()) {
+    /* check modification time of all files in the cache
+       including the file_path */
+    if (!this.checkModfTime(tnsFileStruct)) {
       /* No File has been modified */
-      return this.ht;
+      return tnsFileStruct.aliasht;
     }
-    this.ht = new Map();
-    this.modTime = new Map(); //stores modified time of each IFile
-    this.readInProgress = true;
-    await this.start(file_path, 0); //start with 0 depth (tnsnames.ora)
-    return this.ht;
+    tnsFileStruct.readInProgress = true;
+    await this.start(file_path, 0, tnsFileStruct); //start with 0 depth (tnsnames.ora)
+    this.tnsnamesHT.set(file_path, tnsFileStruct);
+    return tnsFileStruct.aliasht;
   }
 
-  async start(file_path, depth) {
+  async start(file_path, depth, tnsFileStruct) {
 
     if (depth > MAX_IFILE_DEPTH)
       return; //ignore after max depth
     const stat = fs.statSync(file_path);
     // store file path and its modified time.
-    this.modTime.set(file_path, stat.mtime);
+    tnsFileStruct.modTime.set(file_path, stat.mtime);
     // Creating a readable stream from file
     // readline module reads line by line
     // but from a readable stream only.
@@ -129,7 +144,7 @@ class NLParamParser {
           nvElem = nvElem + line;
 
         } else if (nvElem.length != 0) {
-          await this.addNLPListElement(nvElem, depth); // Add Parameter to Hashtable
+          await this.addNLPListElement(nvElem, depth, tnsFileStruct); // Add Parameter to Hashtable
           nvElem = ""; // Clear first, before storing current line
 
           line = this.checkNLPforComments(line);
@@ -138,12 +153,12 @@ class NLParamParser {
       }
     }
     if (nvElem.length != 0) { // at eof, still one more parameter to read
-      await this.addNLPListElement(nvElem, depth);
+      await this.addNLPListElement(nvElem, depth, tnsFileStruct);
       nvElem = "";      // clear nvElem buffer after added
     }
-    this.readInProgress = false;
+    tnsFileStruct.readInProgress = false;
     let waiter;
-    while ((waiter = this.waiters.pop())) {
+    while ((waiter = tnsFileStruct.waiters.pop())) {
       waiter();
     }
   }
@@ -173,9 +188,11 @@ class NLParamParser {
     return str1.join('');
   }
   // check if any of the IFiles has been changed
-  checkModfTime() {
-    if (this.modTime) {
-      for (const [key, value] of this.modTime) {
+  checkModfTime(tnsFileStruct) {
+    // There may be multiple tnsnames.ora files. So check if the tnsnames.ora
+    // in question is already cached
+    if (tnsFileStruct.modTime.size != 0) {
+      for (const [key, value] of tnsFileStruct.modTime) {
         if (fs.existsSync(key)) {
           const stat = fs.statSync(key);
           if ((stat.mtime - value > 0)) {
@@ -193,7 +210,7 @@ class NLParamParser {
     * adds name value pairs from the input buffer into the hash table.
     * @param {string} ibuf
     */
-  async addNLPListElement(ibuf, depth) {
+  async addNLPListElement(ibuf, depth, tnsFileStruct) {
     const res = ibuf.split(/\r?\n/).filter(element => element);
     for (let i = 0; i < res.length; i++) {
       if (res[i].charAt(0) != '(') {
@@ -205,33 +222,15 @@ class NLParamParser {
       nvp.name = uname;
       // support for ifile
       if (uname == 'IFILE') {
-        await this.start(nvp.atom, depth + 1);
+        await this.start(nvp.atom, depth + 1, tnsFileStruct);
       } else {
         const unames = uname.split(","); //multiple aliases (alias1, alias2, alias3)
         for (let i = 0; i < unames.length; i++) {
-          this.ht.set(unames[i], nvp);
+          tnsFileStruct.aliasht.set(unames[i], nvp);
         }
       }
     }
   }
-  toString() {
-    let out = "";
-    this.ht.forEach((value) => {
-      out = out + value.toString() + "\n";
-    });
-    return out;
-  }
-  /**
-    * if key is address/port then it returns the port value from the
-    * address NVPAIR.
-    * @param {string} key
-    * @returns {string}
-   */
-  findValueOf(key) {
-    const myarr = key.split('/');
-    return (findValue(this.ht.get(myarr[0].toUpperCase()), myarr));
-  }
-
 }
 
 module.exports = {

package/lib/util.js

@@ -171,9 +171,7 @@ function traceExitFn(traceContext, result, err) {
   }
 
   // Fill the traceContext.
-  if (err) {
-    traceContext.error = Object.assign(({}, err));
-  }
+  traceContext.error = err;
   traceContext.additionalConfig.result = result;
   if (this._impl) {
     // fill function call state.

package/lib/version.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2023, 2024, Oracle and/or its affiliates.
+// Copyright (c) 2023, 2025, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -31,6 +31,6 @@
 module.exports = {
   VERSION_MAJOR: 6,
   VERSION_MINOR: 7,
-  VERSION_PATCH: 0,
+  VERSION_PATCH: 2,
   VERSION_SUFFIX: ''
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oracledb",
-  "version": "6.7.0",
+  "version": "6.7.2",
   "description": "A Node.js module for Oracle Database access from JavaScript and TypeScript",
   "license": "(Apache-2.0 OR UPL-1.0)",
   "homepage": "http://oracle.github.io/node-oracledb/",

package/build/Release/oracledb-6.7.0-darwin-arm64.node-buildinfo.txt

@@ -1 +0,0 @@
-oracledb-6.7.0-darwin-arm64.node v22.2.0 29e0b9cfc2f22f3df1e6b746323fb5f1f95ba492 3f4e00888d20e313374cfe0fb148de2180eaf93f Thu, 07 Nov 2024 06:28:34 GMT

package/build/Release/oracledb-6.7.0-darwin-x64.node-buildinfo.txt

@@ -1 +0,0 @@
-oracledb-6.7.0-darwin-x64.node v20.11.1 29e0b9cfc2f22f3df1e6b746323fb5f1f95ba492 3f4e00888d20e313374cfe0fb148de2180eaf93f Thu, 07 Nov 2024 06:21:29 GMT

package/build/Release/oracledb-6.7.0-js-buildinfo.txt

@@ -1 +0,0 @@
-29e0b9cfc2f22f3df1e6b746323fb5f1f95ba492

package/build/Release/oracledb-6.7.0-linux-arm64.node-buildinfo.txt

@@ -1 +0,0 @@
-oracledb-6.7.0-linux-arm64.node v18.20.4 29e0b9cfc2f22f3df1e6b746323fb5f1f95ba492 3f4e00888d20e313374cfe0fb148de2180eaf93f Thu, 07 Nov 2024 16:48:12 GMT

package/build/Release/oracledb-6.7.0-linux-x64.node-buildinfo.txt

@@ -1 +0,0 @@
-oracledb-6.7.0-linux-x64.node v16.20.2 29e0b9cfc2f22f3df1e6b746323fb5f1f95ba492 3f4e00888d20e313374cfe0fb148de2180eaf93f Thu, 07 Nov 2024 16:47:47 GMT

package/build/Release/oracledb-6.7.0-win32-x64.node-buildinfo.txt

@@ -1 +0,0 @@
-oracledb-6.7.0-win32-x64.node v18.16.0 29e0b9cfc2f22f3df1e6b746323fb5f1f95ba492 3f4e00888d20e313374cfe0fb148de2180eaf93f Thu, 07 Nov 2024 16:23:47 GMT

package/examples/README.md

@@ -1,140 +0,0 @@
-# Node-oracledb Examples
-
-The directory in node-oracledb's [Github repository](https://github.com/oracle/node-oracledb/tree/main/examples) contains a lot of [node-oracledb](https://www.npmjs.com/package/oracledb) examples.
-Documentation is [here](https://node-oracledb.readthedocs.io/en/latest/).
-
-To run the examples:
-
-- [Install node-oracledb](https://node-oracledb.readthedocs.io/en/latest/user_guide/installation.html#quickstart).
-
-- Ensure that you navigate to the `examples` directory in your terminal window
-  or IDE, where you are running the samples.
-
-- Review `dbconfig.js`.
-
-In your terminal window or IDE, set the following environment variables to
-provide credentials for the `dbconfig.js` file.
-
-- `NODE_ORACLEDB_USER` must be set to the database user.
-
-- `NODE_ORACLEDB_PASSWORD` must be set to the database password.
-
-- `NODE_ORACLEDB_CONNECTIONSTRING` must be set to the connection string that points to your database's location.
-
-- `NODE_ORACLEDB_EXTERNALAUTH` provides the options for enabling external authentication. Setting this environment variable to "true" will enable external authentication. To ensure external authentication works, firstly make sure the Oracle external authentication service is correctly configured. See [Documentation for External Authentication](https://node-oracledb.readthedocs.io/en/latest/user_guide/connection_handling.html#extauth) for details.
-
-- `NODE_ORACLEDB_DRIVER_MODE` provides an option to set the 'Thin' or 'Thick' modes of node-oracledb. Setting this environment variable to "thick" will enable Thick mode.
-Setting it to "thin" will retain the Thin mode. The default mode is Thin.
-
-- `NODE_ORACLEDB_WALLET_LOCATION` must be set to the local directory name for the wallets that may be required for mutual TLS (mTLS) connections, especially to Oracle Cloud
-Autonomous Databases optionally. The wallet location can also be provided as a part of the database connect string.
-
-- `NODE_ORACLEDB_WALLET_PASSWORD` must set to the password for the wallets that may be required for mutual TLS (mTLS) connections, especially to Oracle Cloud Autonomous Databases.
-
-- `NODE_ORACLEDB_CLIENT_LIB_DIR` provides an optional path for the Oracle Client libraries to be used on Windows and macOS platforms, when using Thick mode in node-oracledb.
-
-Review the examples and then run them individually.  For example, to see what
-  the file `example.js` does, use:
-
-  ```
-  node example.js
-  ```
-
-After running the examples, the demonstration objects can be dropped with
-  `demodrop.js`:
-
-  ```
-  node demodrop.js
-  ```
-
-Many examples can be run in either node-oracledb Thin (the default) or Thick
-modes.  Thin mode is a pure JavaScript implementation of node-oracledb.
-Setting the environment variable `NODE_ORACLEDB_DRIVER_MODE` to `'thick'` will
-make examples use Thick mode.
-
-## Example Overview
-
-If this is your first time with node-oracledb, start with
-[`example.js`](example.js).
-
-File Name                                                 | Description
-----------------------------------------------------------|----------------------------------------------------------------------------------
-[`aqmulti.js`](aqmulti.js)                                | Oracle Advanced Queuing (AQ) example passing multiple messages
-[`aqobject.js`](aqobject.js)                              | Oracle Advanced Queuing (AQ) example passing an Oracle Database object
-[`aqoptions.js`](aqoptions.js)                            | Oracle Advanced Queuing (AQ) example setting options and message attributes
-[`aqraw.js`](aqraw.js)                                    | Basic Oracle Advanced Queuing (AQ) example passing text messages
-[`aqutil.js`](aqutil.js)                                  | Common file to setup the user credentials for all the Advanced Queuing (AQ) examples.
-[`blobhttp.js`](blobhttp.js)                              | Simple web app that streams an image
-[`azureConfigProvider.js`](azureConfigProvider.js)        | Show how to connect to an Oracle Database using Azure Configuration Providers
-[`calltimeout.js`](calltimeout.js)                        | Shows how to cancel a SQL statement if it doesn't complete in a specified time
-[`connect.js`](connect.js)                                | Basic example for creating a standalone (non-pooled) connection
-[`connectionpool.js`](connectionpool.js)                  | Basic example creating a pool of connections
-[`cqn1.js`](cqn1.js)                                      | Basic Continuous Query Notification (CQN) example
-[`cqn2.js`](cqn2.js)                                      | Continuous Query Notification with notification grouping
-[`date_timestamp1.js`](date_timestamp1.js)                | Show some basic DATE and TIMESTAMP behaviors
-[`date_timestamp2.js`](date_timestamp2.js)                | Show some DATE and TIMESTAMP behaviors with timezones
-[`dbconfig.js`](dbconfig.js)                              | Common file used by examples for setting connection credentials
-[`dbmsoutputgetline.js`](dbmsoutputgetline.js)            | Show fetching DBMS_OUTPUT by binding buffers
-[`dbmsoutputpipe.js`](dbmsoutputpipe.js)                  | Show fetching DBMS_OUTPUT by using a pipelined table
-[`demodrop.js`](demodrop.js)                              | Drops the schema objects created by the examples
-[`demosetup.js`](demosetup.js)                            | Used to create common schema objects for the examples
-[`dmlrupd.js`](dmlrupd.js)                                | Example of DML RETURNING where multiple rows are matched
-[`em_batcherrors.js`](em_batcherrors.js)                  | `executeMany()` example showing handling data errors
-[`em_dmlreturn1.js`](em_dmlreturn1.js)                    | `executeMany()` example of DML RETURNING that returns single values
-[`em_dmlreturn2.js`](em_dmlreturn2.js)                    | `executeMany()` example of DML RETURNING that returns multiple values
-[`em_insert1.js`](em_insert1.js)                          | Array DML example using `executeMany()` with bind-by-name syntax
-[`em_insert2.js`](em_insert2.js)                          | Array DML example using `executeMany()` with bind by position
-[`em_plsql.js`](em_plsql.js)                              | `executeMany()` example calling PL/SQL multiple times with one call
-[`em_rowcounts.js`](em_rowcounts.js)                      | `executeMany()` example showing how to find the number of rows affected by each input row
-[`endtoend.js`](endtoend.js)                              | Example showing setting tracing attributes
-[`example.js`](example.js)                                | Basic example showing creating a table, inserting multiple rows, and querying rows
-[`impres.js`](impres.js)                                  | Shows PL/SQL 'Implict Results' returning multiple query results from PL/SQL code.
-[`insert1.js`](insert1.js)                                | Basic example creating a table and inserting data.  Shows DDL and DML
-[`insert2.js`](insert2.js)                                | Basic example showing auto commit behavior
-[`lastinsertid.js`](lastinsertid.js)                      | Shows inserting a row and getting its ROWID.
-[`lobbinds.js`](lobbinds.js)                              | Demonstrates how to bind and query LOBs
-[`lobinsert1.js`](lobinsert1.js)                          | Shows inserting a file into a CLOB column
-[`lobinsert2.js`](lobinsert2.js)                          | Inserts text into a CLOB column using the RETURNING INTO method.
-[`lobinserttemp.js`](lobinserttemp.js)                    | Writes data to a Temporary CLOB and then inserts it into the database
-[`lobplsqltemp.js`](lobplsqltemp.js)                      | Streams data into a Temporary CLOB and then passes it to PL/SQL
-[`lobselect.js`](lobselect.js)                            | Shows basic, non-streaming CLOB and BLOB queries
-[`lobstream1.js`](lobstream1.js)                          | Shows how to stream LOBs to files
-[`lobstream2.js`](lobstream2.js)                          | Shows using Stream data events to fetch a CLOB
-[`lowercasecolumns.js`](lowercasecolumns.js)              | Shows how a type handler can convert column names to lower case
-[`metadata.js`](metadata.js)                              | Shows the metadata available after executing SELECT statements
-[`ociConfigProvider.js`](ociConfigProvider.js)            | Show how to connect to an Oracle Database using OCI Configuration Providers
-[`plsqlarray.js`](plsqlarray.js)                          | Examples of binding PL/SQL "INDEX BY" tables
-[`plsqlfunc.js`](plsqlfunc.js)                            | How to call a PL/SQL function
-[`plsqlproc.js`](plsqlproc.js)                            | How to call a PL/SQL procedure
-[`plsqlrecord.js`](plsqlrecord.js)                        | Shows binding of PL/SQL RECORDS
-[`plsqlvarrayrecord.js`](plsqlvarrayrecord.js)            | Shows binding a VARRAY of RECORD in PL/SQL
-[`plsqlrowtype.js`](plsqlrowtype.js)                      | Shows binding of PL/SQL %ROWTYPE object
-[`raw.js`](raw.js)                                        | Shows using a Buffer to insert and select a RAW
-[`refcursor.js`](refcursor.js)                            | Shows using a ResultSet to fetch rows from a REF CURSOR
-[`refcursortoquerystream.js`](refcursortoquerystream.js)  | Converts a REF CURSOR returned from `execute()` to a query stream.
-[`resultset1.js`](resultset1.js)                          | Executes a query and uses a ResultSet to fetch rows with `getRow()`
-[`resultset2.js`](resultset2.js)                          | Executes a query and uses a ResultSet to fetch batches of rows with `getRows()`
-[`resultsettoquerystream.js`](resultsettoquerystream.js)  | Converts a ResultSet returned from `execute()` into a Readable Stream.
-[`rowlimit.js`](rowlimit.js)                              | Shows ways to limit the number of records fetched by queries
-[`sampleazuretokenauth.js`](sampleazuretokenauth.js)      | Shows connection pooling with Azure token based authentication.
-[`sampleocitokenauth.js`](sampleocitokenauth.js)          | Shows connection pooling with OCI OAuth 2.0 token based authentication.
-[`select1.js`](select1.js)                                | Executes a basic query without using a connection pool or ResultSet
-[`select2.js`](select2.js)                                | Executes queries to show array and object output formats
-[`selectgeometry.js`](selectgeometry.js)                  | Insert and query Oracle Spatial geometries
-[`selectjson.js`](selectjson.js)                          | Shows some JSON features of Oracle Database 21c
-[`selectjsonblob.js`](selectjsonblob.js)                  | Shows how to use a BLOB as a JSON column store
-[`selectobject.js`](selectobject.js)                      | Insert and query a named Oracle database object
-[`selectnestedcursor.js`](selectnestedcursor.js)          | Shows selecting from a nested cursor
-[`selectstream.js`](selectstream.js)                      | Executes a basic query using a Readable Stream
-[`selectvarray.js`](selectvarray.js)                      | Shows inserting and selecting from a VARRAY column
-[`sessionfixup.js`](sessionfixup.js)                      | Shows a pooled connection callback to efficiently set session state
-[`sessiontagging1.js`](sessiontagging1.js)                | Simple pooled connection tagging for setting session state
-[`sessiontagging2.js`](sessiontagging2.js)                | More complex example of pooled connection tagging for setting session state
-[`soda1.js`](soda1.js)                                    | Basic Simple Oracle Document Access (SODA) example
-[`typehandlerdate.js`](typehandlerdate.js)                | Show how a type handler can format a queried date in a locale-specific way
-[`typehandlernum.js`](typehandlernum.js)                  | Show how a type handler can alter queried numbers
-[`vectortype1.js`](vectortype1.js)                        | Insert and query VECTOR columns.
-[`vectortype2.js`](vectortype2.js)                        | Insert data into VECTOR columns and verify vector operations.
-[`version.js`](version.js)                                | Shows the node-oracledb version attributes
-[`webapp.js`](webapp.js)                                  | A simple web application using a connection pool
-[`xmltypeInDbObject.js`](xmltypeInDbObject.js)            | Work with XMLType data in DbObject (Thin mode only)