Merge pull request #12 from romanbalayan/release-6.0.3

Release-6.0.3

Author: romanbalayan

README.md

@@ -1,26 +1,27 @@
 # node-oracledb-prebuilt-for-lambda
 
  - This module is forked from the currently un-maintained [node-oracledb-for-lambda](https://github.com/nalbion/node-oracledb-for-lambda).
- - Core oracledb libraries are derived from [node-oracledb](https://github.com/oracle/node-oracledb) v6.0.1
- - 6.0.1: Prebuilt for use with AWS Lambda nodejs16.x Runtime
- - Also tested to work with AWS Lambda nodejs14.x and nodejs18.x Runtime
+ - Core oracledb libraries are derived from [node-oracledb](https://github.com/oracle/node-oracledb) v6.0.3
+ - 6.0.3: Prebuilt for use with AWS Lambda nodejs18.x Runtime
+ - Also tested to work with AWS Lambda nodejs14.x, nodejs16.x, and nodejs18.x Runtime
 
 The scripts to reproduce the build process can be found at [node-oracledb-lambda-test](https://github.com/romanbalayan/node-oracledb-lambda-test). 
 
 # Usage
 
 ```bash
-npm install --save oracledb-prebuilt-for-lambda@6.0.1
+npm install --save oracledb-prebuilt-for-lambda@6.0.3
 ```
 
 # Versioning
  - Changed release version to match that of underlying node-oracledb version. 
- - i.e. for release based on oracledb 6.0.1, release will be oracledb-prebuilt-for-lambda@6.0.1
+ - i.e. for release based on oracledb 6.0.3, release will be oracledb-prebuilt-for-lambda@6.0.3
 
 
  # Releases
  | node-oracledb       | oracledb-prebuilt-for-lambda    |
  | ------------------- | ---------- |
+ | 6.0.3               | 6.0.3      |
  | 6.0.1               | 6.0.1      |
  | 5.5.0               | 5.5.0      |
  | 5.4.0               | 5.4.0      |
@@ -34,6 +35,7 @@ npm install --save oracledb-prebuilt-for-lambda@6.0.1
 
 
  # Changelog
+ - v6.0.3: [node-oracledb v6.0.3 changelog](https://node-oracledb.readthedocs.io/en/latest/release_notes.html#node-oracledb-v6-0-3-12-jul-2023)
  - v6.0.1: [node-oracledb v6.0.1 changelog](https://node-oracledb.readthedocs.io/en/latest/release_notes.html#node-oracledb-v6-0-1-07-jun-2023)
  - v5.5.0: [node-oracledb v5.5.0 changelog](https://github.com/oracle/node-oracledb/blob/main/CHANGELOG.md#node-oracledb-v550-7-sep-2022)
  - v5.4.0: [node-oracledb v5.4.0 changelog](https://github.com/oracle/node-oracledb/blob/main/CHANGELOG.md#node-oracledb-v540-9-jun-2022)

index.js

@@ -1 +1,27 @@
+// Copyright (c) 2015, 2023, 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
+// 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
+// either license.
+//
+// If you elect to accept the software under the Apache License, Version 2.0,
+// the following applies:
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//-----------------------------------------------------------------------------
+
 module.exports = require('./lib/oracledb.js');

lib/connection.js

@@ -146,6 +146,7 @@ class Connection extends EventEmitter {
       cls = this._buildDbObjectClass(objType);
       cls._connection = this;
       cls._objType = objType;
+      objType._connection = this._impl;
       this._dbObjectClasses.set(objType, cls);
     }
     return (cls);

lib/errors.js

@@ -161,7 +161,8 @@ const ERR_INVALID_SID = 519;
 const ERR_TNS_NAMES_FILE_MISSING = 520;
 const ERR_CONNECTION_EOF = 521;
 
-// define mapping for ODPI-C errors that need to be wrapped with NJS errors
+// define mapping for ODPI-C, OCI & ORA errors that need to be wrapped
+// with NJS errors
 const adjustErrorXref = new Map();
 adjustErrorXref.set("DPI-1010", ERR_CONNECTION_CLOSED);
 adjustErrorXref.set("DPI-1024", [ERR_INVALID_COLL_INDEX_GET, 'at index ([0-9]+) does']);
@@ -327,7 +328,7 @@ messages.set(ERR_MISSING_CREDENTIALS,                   // NJS-101
 messages.set(ERR_UNEXPECTED_END_OF_DATA,                // NJS-102
   'unexpected end of data: want %d bytes but only %d bytes are available');
 messages.set(ERR_UNEXPECTED_MESSAGE_TYPE,               // NJS-103
-  'unexpected message type %d received');
+  'unexpected message type %d received at position %d of packet %d');
 messages.set(ERR_POOL_HAS_BUSY_CONNECTIONS,             // NJS-104
   'connection pool cannot be closed because connections are busy');
 messages.set(ERR_NAN_VALUE,                             // NJS-105
@@ -343,9 +344,9 @@ messages.set(ERR_INVALID_TYPE_NUM,                      // NJS-109
 messages.set(ERR_INVALID_ORACLE_TYPE_NUM,               // NJS-110
   'invalid Oracle type number %d [csfrm: %d]');
 messages.set(ERR_UNEXPECTED_NEGATIVE_INTEGER,           // NJS-111
-  'internal error: read a negative integer when expecting a positive integer');
+  'internal error: read a negative integer when expecting a positive integer at position %d of packet %d');
 messages.set(ERR_INTEGER_TOO_LARGE,                     // NJS-112
-  'internal error: read integer of length %d when expecting integer of no more than length %d');
+  'internal error: read integer of length %d when expecting integer of no more than length %d at position %d of packet %d');
 messages.set(ERR_UNEXPECTED_DATA,                       // NJS-113
   'unexpected data received: %s');
 messages.set(ERR_OSON_FIELD_NAME_LIMITATION,            // NJS-114

lib/pool.js

@@ -47,6 +47,7 @@ class Pool extends EventEmitter {
     this._timeOfReset = this._createdDate = Date.now();
     this._sessionCallback = undefined;
     this._connRequestQueue = [];
+    this._connectionClass = settings.connectionClass;
   }
 
   //---------------------------------------------------------------------------
@@ -376,7 +377,9 @@ class Pool extends EventEmitter {
       errors.assertParamValue(nodbUtil.isObject(a1), 1);
       options = this._verifyGetConnectionOptions(a1);
     }
-    settings.addToOptions(options, "connectionClass");
+
+    // get connection class value from pool
+    options.connectionClass = this._connectionClass;
 
     // if pool is draining/closed, throw an appropriate error
     this._checkPoolOpen(true);

lib/settings.js

@@ -69,7 +69,7 @@ class Settings {
   // database are returned as though they used the JavaScript time zone
   // setting. TIMESTAMP WITH TIME ZONE and TIMESTAMP WITH LOCAL TIME ZONE data
   // are returned in native JavaScript format (since they contain time zone
-  // information).
+  // information). This is used only in Thick mode (from node-oracledb 6.0.0).
   //---------------------------------------------------------------------------
   _getDateComponents(useLocal, date) {
     if (useLocal) {

lib/thin/dbObject.js

@@ -35,6 +35,19 @@ const { GrowableBuffer } = require('./protocol/buffer.js');
 
 class DbObjectPickleBuffer extends GrowableBuffer {
 
+  //---------------------------------------------------------------------------
+  // _readBytesWithLength()
+  //
+  // Helper function that processes the number of bytes (if needed) and then
+  // acquires the specified number of bytes from the buffer.
+  //---------------------------------------------------------------------------
+  _readBytesWithLength(numBytes) {
+    if (numBytes === constants.TNS_LONG_LENGTH_INDICATOR) {
+      numBytes = this.readUInt32BE();
+    }
+    return this.readBytes(numBytes);
+  }
+
   //---------------------------------------------------------------------------
   // getIsAtomicNull()
   //
@@ -349,12 +362,12 @@ class ThinDbObjectImpl extends DbObjectImpl {
         return buf.readBinaryInteger();
       case types.DB_TYPE_VARCHAR:
       case types.DB_TYPE_CHAR:
-        return buf.readStr(constants.TNS_CS_IMPLICIT);
+        return buf.readStr(constants.CSFRM_IMPLICIT);
       case types.DB_TYPE_NVARCHAR:
       case types.DB_TYPE_NCHAR:
-        return buf.readStr(constants.TNS_CS_NCHAR);
+        return buf.readStr(constants.CSFRM_NCHAR);
       case types.DB_TYPE_RAW:
-        return buf.readBytesWithLength();
+        return Buffer.from(buf.readBytesWithLength());
       case types.DB_TYPE_BINARY_DOUBLE:
         return buf.readBinaryDouble();
       case types.DB_TYPE_BINARY_FLOAT:
@@ -365,7 +378,6 @@ class ThinDbObjectImpl extends DbObjectImpl {
       case types.DB_TYPE_TIMESTAMP_LTZ:
       case types.DB_TYPE_TIMESTAMP_TZ:
         return buf.readOracleDate(false);
-      case types.DB_TYPE_BLOB:
       case types.DB_TYPE_BOOLEAN:
         return buf.readBool();
       case types.DB_TYPE_OBJECT:
@@ -374,7 +386,7 @@ class ThinDbObjectImpl extends DbObjectImpl {
           return null;
         obj = new ThinDbObjectImpl(typeClass);
         if (obj._objType.isCollection || this._objType.isCollection) {
-          obj.packedData = buf.readBytesWithLength();
+          obj.packedData = Buffer.from(buf.readBytesWithLength());
         } else {
           obj._unpackDataFromBuf(buf);
         }

lib/thin/lob.js

@@ -121,10 +121,10 @@ class ThinLobImpl extends LobImpl {
   }
 
   getCsfrm() {
-    if (this.dbType._csfrm !== constants.TNS_CS_NCHAR) {
+    if (this.dbType._csfrm !== constants.CSFRM_NCHAR) {
       if (this._locator[constants.TNS_LOB_LOC_OFFSET_FLAG_3] &
           constants.TNS_LOB_LOC_FLAGS_VAR_LENGTH_CHARSET) {
-        return constants.TNS_CS_NCHAR;
+        return constants.CSFRM_NCHAR;
       }
     }
     return this.dbType._csfrm;

lib/thin/pool.js

@@ -144,13 +144,13 @@ class ThinPoolImpl extends PoolImpl {
   }
 
   //---------------------------------------------------------------------------
-  // get connection from pool
+  // credentials are obfuscated and stored in an object(userConfig) during
+  // pool creation. _getConnAttrs() method is used to deobfuscate encrypted
+  // credentials for creating new connections
   //---------------------------------------------------------------------------
-  async _connect(connAttrs) {
+  async _getConnAttrs() {
     let accessToken;
-    const conn = new ThinConnectionImpl();
-    conn._pool = this;
-    let clonedAttrs = Object.assign({}, connAttrs);
+    const clonedAttrs = Object.assign({}, this._userConfig);
     if (clonedAttrs.password === null) {
       clonedAttrs.password = protocolUtil.getDeobfuscatedValue(this._password,
         this._obfuscatedPassword);
@@ -204,19 +204,14 @@ class ThinPoolImpl extends PoolImpl {
         protocolUtil.getDeobfuscatedValue(this._privateKey,
           this._obfuscatedPrivateKey);
     }
-    await conn.connect(clonedAttrs);
-    clonedAttrs = null;
-    return conn;
+    return clonedAttrs;
   }
 
   //---------------------------------------------------------------------------
   // return available connection if present in pool else
   // create new connection and return it
   //---------------------------------------------------------------------------
   async getConnection() {
-    if (settings.connectionClass !== '') {
-      this._userConfig.connectionClass = settings.connectionClass;
-    }
     return await this.acquire();
   }
 
@@ -318,8 +313,11 @@ class ThinPoolImpl extends PoolImpl {
   // Grows the pool to include the specified number of connections.
   //---------------------------------------------------------------------------
   async _growPool(numConns) {
+    const clonedAttrs = await this._getConnAttrs();
     while (numConns > 0) {
-      let conn = await this._connect(this._userConfig);
+      const conn = new ThinConnectionImpl();
+      conn._pool = this;
+      await conn.connect(clonedAttrs);
       conn._newSession = true;
       conn._dropSess = false;
       conn._lastTimeUsed = Date.now();

lib/thin/protocol/buffer.js

@@ -92,13 +92,13 @@ class BaseBuffer {
       return 0;
     } else if (size & 0x80) {
       if (!signed) {
-        errors.throwErr(errors.ERR_UNEXPECTED_NEGATIVE_INTEGER);
+        errors.throwErr(errors.ERR_UNEXPECTED_NEGATIVE_INTEGER, this.pos, this.packetNum);
       }
       isNegative = true;
       size = size & 0x7f;
     }
     if (size > maxSize) {
-      errors.throwErr(errors.ERR_INTEGER_TOO_LARGE, size, maxSize);
+      errors.throwErr(errors.ERR_INTEGER_TOO_LARGE, size, maxSize, this.pos, this.packetNum);
     }
     if (skip) {
       this.skipBytes(size);
@@ -375,18 +375,18 @@ class BaseBuffer {
     const obj = {};
     let numBytes = this.readUB4();
     if (numBytes > 0)
-      obj.toid = this.readBytesWithLength();
+      obj.toid = Buffer.from(this.readBytesWithLength());
     numBytes = this.readUB4();
     if (numBytes > 0)
-      obj.oid = this.readBytesWithLength();
+      obj.oid = Buffer.from(this.readBytesWithLength());
     numBytes = this.readUB4();
     if (numBytes > 0)
-      obj.snapshot = this.readBytesWithLength();
+      obj.snapshot = Buffer.from(this.readBytesWithLength());
     this.skipUB2();                     // version
     numBytes = this.readUB4();
     this.skipUB2();                     // flags
     if (numBytes > 0)
-      obj.packedData = this.readBytesWithLength();
+      obj.packedData = Buffer.from(this.readBytesWithLength());
     return obj;
   }
 
@@ -465,7 +465,7 @@ class BaseBuffer {
     if (!buf) {
       return null;
     }
-    if (csfrm === constants.TNS_CS_IMPLICIT)
+    if (csfrm === constants.CSFRM_IMPLICIT)
       return buf.toString();
 
     // need a copy of the buffer since swap16() changes the buffer in place and
@@ -748,7 +748,7 @@ class BaseBuffer {
     const ptr = this.reserveBytes(length);
     if (type === types.DB_TYPE_DATE || type == types.DB_TYPE_TIMESTAMP) {
       const year = date.getFullYear();
-      ptr[0] = Math.floor(year / 100) + 100;
+      ptr[0] = Math.trunc(year / 100) + 100;
       ptr[1] = year % 100 + 100;
       ptr[2] = date.getMonth() + 1;
       ptr[3] = date.getDate();
@@ -757,7 +757,7 @@ class BaseBuffer {
       ptr[6] = date.getSeconds() + 1;
     } else {
       const year = date.getUTCFullYear();
-      ptr[0] = Math.floor(year / 100) + 100;
+      ptr[0] = Math.trunc(year / 100) + 100;
       ptr[1] = year % 100 + 100;
       ptr[2] = date.getUTCMonth() + 1;
       ptr[3] = date.getUTCDate();