oracledb 6.8.0 → 6.9.0

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2025, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -45,10 +45,6 @@ class LobOpMessage extends Message {
      */
     this.sourceLobImpl = options.sourceLobImpl || null;
     this.operation = options.operation;
-    /*
-     * Destination LOB locator. For copy, append operations,...
-     */
-    this.destLobImpl = options.destLobImpl || null;
     /*
      * Offset from where sourceLob operation to start
      */
@@ -64,6 +60,7 @@ class LobOpMessage extends Message {
     this.functionCode = constants.TNS_FUNC_LOB_OP;
     this.sendAmount = options.sendAmount;
     this.amount = options.amount || 0; // LOB length
+    this.destLength = options.destLength || 0;
   }
 
   encode(buf) {
@@ -75,13 +72,8 @@ class LobOpMessage extends Message {
       buf.writeUInt8(1);
       buf.writeUB4(this.sourceLobImpl._locator.length);
     }
-    if (this.destLobImpl === null) {
-      buf.writeUInt8(0);
-      buf.writeUB4(0);
-    } else {
-      buf.writeUInt8(1);
-      buf.writeUB4(this.destLobImpl._locator.length);
-    }
+    buf.writeUInt8(0);
+    buf.writeUB4(this.destLength);
     buf.writeUB4(0);
     buf.writeUB4(0);
     if (this.operation === constants.TNS_LOB_OP_CREATE_TEMP) {
@@ -117,9 +109,6 @@ class LobOpMessage extends Message {
     if (this.sourceLobImpl) {
       buf.writeBytes(this.sourceLobImpl._locator);
     }
-    if (this.destLobImpl) {
-      buf.writeBytes(this.destLobImpl._locator);
-    }
     if (this.operation === constants.TNS_LOB_OP_CREATE_TEMP) {
       if (this.sourceLobImpl.dbType._csfrm === constants.CSFRM_NCHAR) {
         buf.caps.checkNCharsetId();
@@ -185,15 +174,9 @@ class LobOpMessage extends Message {
       locator = lobArray.slice(0, numBytes);
       locator.copy(this.sourceLobImpl._locator);
     }
-    if (this.destLobImpl !== null) {
-      numBytes = this.destLobImpl._locator.length;
-      lobArray = buf.readBytes(numBytes);
-      locator = lobArray.slice(0, numBytes);
-      locator.copy(this.destLobImpl._locator);
-    }
     if (this.operation === constants.TNS_LOB_OP_CREATE_TEMP) {
       buf.skipUB2();        // skip character set
-      buf.skipBytes(3);     // skip trailing flags, amount
+      buf.skipUB1();        // skip trailing flags
     } else if (this.sendAmount) {
       this.amount = buf.readSB8();
     }

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

@@ -44,7 +44,6 @@ class LogOffMessage extends Message {
   }
 
   encode(buf) {
-    this.writePiggybacks(buf);
     this.writeFunctionHeader(buf);
   }
 

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

@@ -45,7 +45,6 @@ class SessionReleaseMessage extends Message {
   }
 
   encode(buf) {
-    this.writePiggybacks(buf);
     this.writeFunctionHeader(buf);
     buf.writeUInt8(0); // pointer (tag name)
     buf.writeUInt8(0); // tag name length

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

@@ -28,6 +28,7 @@
 
 const Message = require("./base.js");
 const constants = require("../constants.js");
+const errors = require("../../../errors.js");
 
 /**
  * Used for two-phase commit (TPC) transaction start, attach and detach.
@@ -61,18 +62,25 @@ class TransactionSwitchMessage extends Message {
   }
 
   encode(buf) {
+    // We unset the pending flag in writePiggybacks just before encode is
+    // called to ensure message is written
+    if (this.connection._sessionlessData?.pending)
+      errors.throwErr(errors.ERR_SESSIONLESS_ALREADY_ACTIVE);
+
     // writes the message to the database
     // acquire data to send to the server
     let xidBytes;
     if (this.xid) {
       xidBytes = Buffer.alloc(128);
       this.xid.globalTransactionId.copy(xidBytes);
-      this.xid.branchQualifier.copy(xidBytes,
-        this.xid.globalTransactionId.length);
+      if (this.xid.branchQualifier)
+        this.xid.branchQualifier.copy(xidBytes,
+          this.xid.globalTransactionId.length);
     }
 
-    // write message
     this.writeFunctionHeader(buf);
+
+
     buf.writeUB4(this.operation);
     if (this.context) {
       buf.writeUInt8(1);  // pointer (transaction context)
@@ -97,7 +105,7 @@ class TransactionSwitchMessage extends Message {
     }
 
     buf.writeUB4(this.flags);
-    buf.writeUB4(this.timeout);
+    buf.writeUB4(this.timeout ? this.timeout : 0);
     buf.writeUInt8(1);   // pointer (application value)
     buf.writeUInt8(1);   // pointer (return context)
     buf.writeUInt8(1);   // pointer (return context length)

package/lib/thin/protocol/protocol.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2025, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -204,6 +204,7 @@ class Protocol {
       let err = new Error(message.errorInfo.message);
       err.offset = message.errorInfo.pos;
       err.errorNum = message.errorInfo.num;
+      err.isRecoverable = message.errorInfo.isRecoverable;
       err = errors.transformErr(err);
       if (err.code === errors.ERR_CONNECTION_CLOSED_CODE) {
         this.nsi.disconnect();

package/lib/thin/sqlnet/connStrategy.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2025, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -194,6 +194,7 @@ async function createNode(str, userConfig) {
   cs.terminal = userConfig.terminal;
   cs.osUser = userConfig.osUser;
   cs.program = userConfig.program;
+  cs.httpsProxy = userConfig.httpsProxy;
   await navobj.navigate(cs);
   return cs;
 }

package/lib/thin/sqlnet/navNodes.js

@@ -500,7 +500,7 @@ class NavAddress extends Address {
       cs.newConnectionDescription();
       needToCloseDescription = true;
     }
-    if (!net.isIP(this.host)) {
+    if (!net.isIP(this.host) && !(cs.httpsProxy || this.httpsProxy)) {
       try {
         addresses = await dnsPromises.lookup(this.host, options);
         for (const addr of addresses) {

package/lib/thin/sqlnet/networkSession.js

@@ -374,9 +374,9 @@ class NetworkSession {
           const buffertoDeCompress = packet.buf.subarray(constants.NSPDADAT, size);
           let deCompressedDataBuffer;
           try {
-            if (this.sAtts.firstCompressedPacket) {
+            if (this.sAtts.firstRecvCompressedPacket) {
               deCompressedDataBuffer = zlib.inflateSync(buffertoDeCompress, {finishFlush: zlib.constants.Z_SYNC_FLUSH});
-              this.sAtts.firstCompressedPacket = 0;
+              this.sAtts.firstRecvCompressedPacket = 0;
             } else {
               deCompressedDataBuffer = zlib.inflateRawSync(buffertoDeCompress, {finishFlush: zlib.constants.Z_SYNC_FLUSH});
             }
@@ -457,7 +457,13 @@ class NetworkSession {
         const bufferHeader = buf.subarray(0, constants.NSPDADAT);
         let compressedDataBuffer;
         try {
-          compressedDataBuffer = zlib.deflateSync(buffertoCompress, {finishFlush: zlib.constants.Z_SYNC_FLUSH});
+          if (this.sAtts.firstSendCompressedPacket) {
+            compressedDataBuffer = zlib.deflateSync(buffertoCompress, {finishFlush: zlib.
+              constants.Z_SYNC_FLUSH});
+            this.sAtts.firstSendCompressedPacket = 0;
+          } else {
+            compressedDataBuffer = zlib.deflateRawSync(buffertoCompress, {finishFlush: zlib.constants.Z_SYNC_FLUSH});
+          }
         } catch (err) {
           errors.throwErr(errors.ERR_DATA_COMPRESSION, err.message);
         }

package/lib/thin/sqlnet/packet.js

@@ -258,7 +258,8 @@ function AcceptPacket(packet, sAtts) {
     if ((this.cflag & constants.NSPACCFON) != 0) { // compression ON
       sAtts.negotiatedNetworkCompressionScheme = (this.cflag & 0x3c) >> 2; // 0x3c
       sAtts.networkCompressionEnabled = true;
-      sAtts.firstCompressedPacket = true;
+      sAtts.firstRecvCompressedPacket = true;
+      sAtts.firstSendCompressedPacket = true;
     } else {
       sAtts.networkCompressionEnabled = false;
     }

package/lib/thin/sqlnet/sessionAtts.js

@@ -62,6 +62,7 @@ class SessionAtts {
     this.nt.sslServerDNMatch = true;
     this.nt.sslAllowWeakDNMatch = false;
     this.nt.useSNI = false;
+    this.networkCompressionThreshold = 1024;
   }
 
   /**
@@ -85,9 +86,7 @@ class SessionAtts {
       }
       if (params.networkCompressionThreshold >= 200) {
         this.networkCompressionThreshold = parseInt(params.networkCompressionThreshold);
-      } else
-        this.networkCompressionThreshold = 1024;
-
+      }
 
       if (typeof params.walletLocation === 'string') {
         this.nt.walletFile = path.join(params.walletLocation, constants.PEM_WALLET_FILE_NAME);

package/lib/types.js

@@ -322,14 +322,9 @@ const DB_TYPE_FETCH_TYPE_MAP = new Map([
 ]);
 
 // additional aliases for types by column type name
-dbTypeByColumnTypeName.set("DOUBLE PRECISION", DB_TYPE_NUMBER);
-dbTypeByColumnTypeName.set("FLOAT", DB_TYPE_NUMBER);
-dbTypeByColumnTypeName.set("INTEGER", DB_TYPE_NUMBER);
 dbTypeByColumnTypeName.set("PL/SQL BOOLEAN", DB_TYPE_BOOLEAN);
 dbTypeByColumnTypeName.set("PL/SQL BINARY INTEGER", DB_TYPE_BINARY_INTEGER);
 dbTypeByColumnTypeName.set("PL/SQL PLS INTEGER", DB_TYPE_BINARY_INTEGER);
-dbTypeByColumnTypeName.set("REAL", DB_TYPE_NUMBER);
-dbTypeByColumnTypeName.set("SMALLINT", DB_TYPE_NUMBER);
 dbTypeByColumnTypeName.set("TIMESTAMP WITH LOCAL TZ", DB_TYPE_TIMESTAMP_LTZ);
 dbTypeByColumnTypeName.set("TIMESTAMP WITH TZ", DB_TYPE_TIMESTAMP_TZ);
 

package/lib/util.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2016, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2016, 2025, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -33,6 +33,26 @@ const util = require('util');
 const types = require('./types.js');
 const constants = require('./constants.js');
 const traceHandler = require('./traceHandler.js');
+const crypto = require("crypto");
+
+const pemHeaders = [
+  '-----BEGIN CERTIFICATE-----',
+  '-----BEGIN PUBLIC KEY-----',
+  '-----BEGIN PRIVATE KEY-----',
+  '-----BEGIN RSA PRIVATE KEY-----',
+  '-----BEGIN DSA PRIVATE KEY-----',
+  '-----BEGIN EC PRIVATE KEY-----',
+  '-----BEGIN ENCRYPTED PRIVATE KEY-----'
+];
+const pemFooters = [
+  '-----END CERTIFICATE-----',
+  '-----END PUBLIC KEY-----',
+  '-----END PRIVATE KEY-----',
+  '-----END RSA PRIVATE KEY-----',
+  '-----END DSA PRIVATE KEY-----',
+  '-----END EC PRIVATE KEY-----',
+  '-----END ENCRYPTED PRIVATE KEY-----'
+];
 
 // set of valid network characters
 const validNetworkCharacterSet = new Set(['A', 'B', 'C', 'D', 'E', 'F', 'G',
@@ -80,6 +100,13 @@ function getInstallURL() {
   return ('Node-oracledb installation instructions: https://node-oracledb.readthedocs.io/en/latest/user_guide/installation.html');
 }
 
+// check if a file has contents of a .pem file
+function isPemFile(content) {
+  //remove any line breaks at the end of the content
+  content = content.trim();
+  return pemHeaders.some(header => content.includes(header)) &&
+       pemFooters.some(footer => content.endsWith(footer));
+}
 
 // getInstallHelp returns a string with installation usage tips that may be helpful
 function getInstallHelp() {
@@ -372,6 +399,21 @@ function isShardingKey(value) {
   return true;
 }
 
+function isAppContext(value) {
+  if (!Array.isArray(value))
+    return false;
+  for (let i = 0; i < value.length; i++) {
+    const element = value[i];
+    if (!Array.isArray(element) || element.length !== 3)
+      return false;
+    for (let j = 0; j < 3; j++) {
+      if (typeof element[j] !== 'string')
+        return false;
+    }
+  }
+  return true;
+}
+
 function isSodaDocument(value) {
   return (value != null && value._sodaDocumentMarker);
 }
@@ -414,6 +456,34 @@ function normalizeXid(value) {
   return normalizedXid;
 }
 
+//---------------------------------------------------------------------------
+// isTransactionId()
+//
+// Validates if the given value is a sessionless transactionId
+//---------------------------------------------------------------------------
+function isTransactionId(value) {
+  return Buffer.isBuffer(value) || (typeof value === 'string');
+}
+
+//---------------------------------------------------------------------------
+// normalizeTransactionId()
+//
+// Returns the normalized value of a sessionless transactionId as a buffer
+// In case the value is null a random 36-byte UUID buffer is returned
+//---------------------------------------------------------------------------
+function normalizeTransactionId(value) {
+  let normalizedTransactionId = value;
+  if (normalizedTransactionId === undefined)
+    normalizedTransactionId = crypto.randomUUID();
+  if (typeof normalizedTransactionId === 'string') {
+    normalizedTransactionId = Buffer.from(normalizedTransactionId);
+    const len = normalizedTransactionId.length;
+    if ((len === 0) || (len > 64))
+      errors.throwErr(errors.ERR_INVALID_TRANSACTION_SIZE, len);
+  }
+  return normalizedTransactionId;
+}
+
 function verifySodaDoc(content) {
   if (isSodaDocument(content))
     return content._impl;
@@ -573,15 +643,19 @@ module.exports = {
   isObjectOrArray,
   isPrivilege,
   isShardingKey,
+  isAppContext,
   isSodaDocument,
   isTokenExpired,
   isTokenValid,
+  isTransactionId,
   isVectorValue,
   isXid,
+  normalizeTransactionId,
   normalizeXid,
   makeDate,
   sanitize,
   verifySodaDoc,
   wrapFn,
-  wrapFns
+  wrapFns,
+  isPemFile
 };

package/lib/version.js

@@ -30,7 +30,7 @@
 
 module.exports = {
   VERSION_MAJOR: 6,
-  VERSION_MINOR: 8,
+  VERSION_MINOR: 9,
   VERSION_PATCH: 0,
   VERSION_SUFFIX: ''
 };

package/package/install.js

@@ -68,7 +68,7 @@ function warn(message) { // eslint-disable-line
   console.error.apply(console, args);
 }
 
-// This version of node-oracledb works with Node.js 14.6 or later.
+// This version of node-oracledb works with Node.js 14.17 or later.
 // Note: the checked version is the minimum required for Node-API
 // compatibility.  When new Node.js versions are released, older Node.js
 // versions are dropped from the node-oracledb test plan.
@@ -76,8 +76,8 @@ function warn(message) { // eslint-disable-line
 // Keep this code in sync with lib/oracledb.js
 function checkVersion() {
   const vs = process.version.substring(1).split(".").map(Number);
-  errors.assert(vs[0] > 14 || (vs[0] === 14 && vs[1] >= 6),
-    errors.ERR_NODE_TOO_OLD, nodbUtil.PACKAGE_JSON_VERSION, "14.6");
+  errors.assert(vs[0] > 14 || (vs[0] === 14 && vs[1] >= 17),
+    errors.ERR_NODE_TOO_OLD, nodbUtil.PACKAGE_JSON_VERSION, "14.17");
 }
 
 // Check for the binary node-oracledb module needed for "Thick mode".

package/package/prunebinaries.js

@@ -1,4 +1,4 @@
-/* Copyright (c) 2019, 2023, Oracle and/or its affiliates. */
+/* Copyright (c) 2019, 2025, Oracle and/or its affiliates. */
 
 /******************************************************************************
  *
@@ -47,11 +47,11 @@ const nodbUtil = require('../lib/util.js');
 
 const dir = nodbUtil.RELEASE_DIR; // contains the binaries
 
-let re = new RegExp(nodbUtil.BINARY_FILE);
+const re = new RegExp(nodbUtil.BINARY_FILE);
 
 try {
-  let f = fs.readdirSync(dir);
-  let opt = process.argv[2];
+  const f = fs.readdirSync(dir);
+  const opt = process.argv[2];
 
   if (opt) {
     // 'npm run prune <option>' is called
@@ -76,18 +76,12 @@ try {
   console.error(err.message);
 }
 
-async function removeFileorDir(fileOrDirPath) {
+function removeFileorDir(fileOrDirPath) {
   try {
     const isDir = fs.statSync(fileOrDirPath).isDirectory();
     if (isDir) {
       // Remove the directory and its files recursively
-      // Use fs.promises for Node.js versions 14.6-14.13,
-      // which do not support fs.rmSync()
-      const vs = process.version.substring(1).split(".").map(Number);
-      if (vs[0] > 14 || (vs[0] === 14 && vs[1] >= 14))
-        fs.rmSync(fileOrDirPath, { recursive: true, force: true });
-      else
-        await fs.promises.rmdir(fileOrDirPath, { recursive: true, force: true });
+      fs.rmSync(fileOrDirPath, { recursive: true, force: true });
     } else {
       // Remove the file or the symlink synchronously
       fs.unlinkSync(fileOrDirPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oracledb",
-  "version": "6.8.0",
+  "version": "6.9.0",
   "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/",
@@ -34,7 +34,7 @@
     "prune": "node package/prunebinaries.js"
   },
   "engines": {
-    "node": ">=14.6"
+    "node": ">=14.17"
   },
   "maintainers": [
     {