oracledb 5.1.0 → 5.4.0

package/lib/lob.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved
+// Copyright (c) 2016, 2022, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -60,6 +60,7 @@ class Lob extends Duplex {
   constructor() {
     super({ decodeStrings: false });
     this.offset = 1;
+    this._isActive = false;
     this.once('finish', function() {
       if (this._autoCloseLob) {
         this.destroy();
@@ -69,8 +70,10 @@ class Lob extends Duplex {
 
   _extend(oracledb) {
     this._oracledb = oracledb;
-    this.close = nodbUtil.callbackify(close);
-    this.getData = nodbUtil.callbackify(getData);
+    this.close = nodbUtil.callbackify(nodbUtil.preventConcurrent(nodbUtil.serialize(close), 'NJS-023'));
+    this.getData = nodbUtil.callbackify(nodbUtil.preventConcurrent(nodbUtil.serialize(getData), 'NJS-023'));
+    this._serializedRead = nodbUtil.serialize(this.__read);
+    this._serializedWrite = nodbUtil.serialize(this.__write);
   }
 
   // called by stream.destroy() and ensures that the LOB is closed if it has
@@ -87,13 +90,22 @@ class Lob extends Duplex {
     cb(err);
   }
 
+  // return the connection associated with the LOB (used for serializing
+  // accesses to the connection)
+  _getConnection() {
+    let connection = this._parentObj;
+    while (!(connection instanceof this._oracledb.Connection))
+      connection = connection._parentObj;
+    return connection;
+  }
+
   // implementation of streaming read; if lob is set to auto-close, the lob is
   // automatically closed within the C code when an error occurs or when there
   // are no more bytes to transfer; all that needs to be done in the JS layer
   // is to destroy the streaming LOB
   async _read() {
     try {
-      const data = await this.__read(this.offset);
+      const data = await this._serializedRead(this.offset);
       if (data) {
         this.offset += data.length;
         this.push(data);
@@ -122,7 +134,7 @@ class Lob extends Duplex {
     }
 
     try {
-      await this.__write(this.offset, data);
+      await this._serializedWrite(this.offset, data);
     } catch (err) {
       cb(err);
       this.destroy(err);

package/lib/oracledb.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved
+// Copyright (c) 2015, 2022, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -25,7 +25,7 @@ const util = require('util');
 // This version of node-oracledb works with Node.js 8.16, 10.16 or
 // later.  The test stops hard-to-interpret runtime errors and crashes
 // with older Node.js versions.  Also Node.js 8.16 and 10.16 (and
-// 12.0) contain an important N-API performance regression fix.  If
+// 12.0) contain an important Node-API performance regression fix.  If
 // you're using the obsolete Node.js 9 or 11 versions, you're on your
 // own regarding performance and functionality
 let vs = process.version.substring(1).split(".").map(Number);
@@ -43,6 +43,7 @@ const BaseDbObject = require('./dbObject.js');
 const Connection = require('./connection.js');
 const Lob = require('./lob.js');
 const Pool = require('./pool.js');
+const PoolStatistics = require('./poolStatistics.js');
 const ResultSet = require('./resultset.js');
 const SodaDatabase = require('./sodaDatabase.js');
 const SodaCollection = require('./sodaCollection.js');
@@ -74,7 +75,7 @@ for (let i = 0; i < binaryLocations.length; i++) {
   try {
     oracledbCLib = requireBinary(binaryLocations[i]);
     break;
-  } catch(err) {
+  } catch (err) {
     if (err.code !== 'MODULE_NOT_FOUND' || i == binaryLocations.length - 1) {
       let nodeInfo;
       if (err.code === 'MODULE_NOT_FOUND') {
@@ -95,18 +96,20 @@ class OracleDb {
   constructor() {
     this.queueTimeout = 60000;
     this.queueMax     = 500;
+    this.errorOnConcurrentExecute = false;
   }
 
   // extend class with promisified functions
-  _extend() {
-    this.getConnection = nodbUtil.callbackify(getConnection);
-    this.createPool = nodbUtil.callbackify(createPool);
-    this.shutdown = nodbUtil.callbackify(shutdown);
-    this.startup = nodbUtil.callbackify(startup);
+  _extend(_oracledb) {
+    this.getConnection = nodbUtil.callbackify(getConnection).bind(_oracledb);
+    this.createPool = nodbUtil.callbackify(createPool).bind(_oracledb);
+    this.shutdown = nodbUtil.callbackify(shutdown).bind(_oracledb);
+    this.startup = nodbUtil.callbackify(startup).bind(_oracledb);
+    this.initOracleClient = this.initOracleClient.bind(_oracledb);
   }
 
   // temporary method for determining if an object is a date until
-  // napi_is_date() can be used (when N-API v5 can be used)
+  // napi_is_date() can be used (when Node-API v5 can be used)
   _isDate(val) {
     return util.isDate(val);
   }
@@ -196,6 +199,39 @@ async function createPool(poolAttrs) {
     tempUsedPoolAliases[poolAlias] = true;
   }
 
+  if (adjustedPoolAttrs.accessToken !== undefined) {
+    // token and privateKey must be set for token based
+    // authentication
+    if (adjustedPoolAttrs.accessToken.token === undefined ||
+        adjustedPoolAttrs.accessToken.token === '' ||
+        adjustedPoolAttrs.accessToken.privateKey === undefined ||
+        adjustedPoolAttrs.accessToken.privateKey === '') {
+      throw new Error(nodbUtil.getErrorMessage('NJS-084'));
+    }
+
+    // cannot set username or password for token based authentication
+    if (adjustedPoolAttrs.user !== undefined ||
+        adjustedPoolAttrs.password !== undefined) {
+      throw new Error(nodbUtil.getErrorMessage('NJS-084'));
+    }
+
+    // homogeneous and externalAuth must be set to true for token based
+    // authentication
+    if (adjustedPoolAttrs.homogeneous === false ||
+        adjustedPoolAttrs.externalAuth === false) {
+      throw new Error(nodbUtil.getErrorMessage('NJS-085'));
+    }
+
+    adjustedPoolAttrs.token = adjustedPoolAttrs.accessToken.token;
+    adjustedPoolAttrs.privateKey =
+        adjustedPoolAttrs.accessToken.privateKey;
+  }
+
+  if (adjustedPoolAttrs.accessToken === undefined &&
+      adjustedPoolAttrs.accessTokenCallback !== undefined) {
+    throw new Error(nodbUtil.getErrorMessage('NJS-084'));
+  }
+
   try {
     const pool = await this._createPool(adjustedPoolAttrs);
 
@@ -207,7 +243,7 @@ async function createPool(poolAttrs) {
     }
 
     pool._setup(poolAttrs, poolAlias, this);
-    pool.on('_after_close', () => {
+    pool.on('_afterPoolClose', () => {
       if (pool.poolAlias) {
         delete poolCache[pool.poolAlias];
       }
@@ -268,9 +304,35 @@ async function getConnection(a1) {
 
   // otherwise, create a new standalone connection
   } else {
+    if (connAttrs.accessToken !== undefined) {
+      // token and privateKey must be set for token based
+      // authentication
+      if (connAttrs.accessToken.token === undefined ||
+          connAttrs.accessToken.token === '' ||
+          connAttrs.accessToken.privateKey === undefined ||
+          connAttrs.accessToken.privateKey === '') {
+        throw new Error(nodbUtil.getErrorMessage('NJS-084'));
+      }
+
+      // cannot set username or password for token based authentication
+      if (connAttrs.user !== undefined ||
+          connAttrs.password !== undefined) {
+        throw new Error(nodbUtil.getErrorMessage('NJS-084'));
+      }
+
+      // externalAuth must be set to true for token based authentication
+      if (connAttrs.externalAuth === false) {
+        throw new Error(nodbUtil.getErrorMessage('NJS-086'));
+      }
+
+      connAttrs.token = connAttrs.accessToken.token;
+      connAttrs.privateKey =
+        connAttrs.accessToken.privateKey;
+    }
+
     try {
       return await this._getConnection(connAttrs);
-    } catch(err) {
+    } catch (err) {
       if (err.message.match(/DPI-1047/)) {
         err.message += "\n" + nodbUtil.getInstallHelp();
       }
@@ -379,6 +441,7 @@ proto.BaseDbObject = BaseDbObject;
 proto.Connection = Connection;
 proto.Lob = Lob;
 proto.Pool = Pool;
+proto.PoolStatistics = PoolStatistics;
 proto.ResultSet = ResultSet;
 proto.SodaDatabase = SodaDatabase;
 proto.SodaCollection = SodaCollection;