oracledb 6.5.1 → 6.7.0

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

@@ -0,0 +1,139 @@
+// Copyright (c) 2024, 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.
+//
+//-----------------------------------------------------------------------------
+
+'use strict';
+
+const Message = require("./base.js");
+const constants = require("../constants.js");
+
+/**
+ * Used for two-phase commit (TPC) transaction start, attach and detach.
+ *
+ * @class TransactionSwitchMessage
+ * @extends {Message}
+ */
+class TransactionSwitchMessage extends Message {
+
+  constructor(connImpl) {
+    super(connImpl);
+    this.functionCode = constants.TNS_FUNC_TPC_TXN_SWITCH;
+    this.applicationValue = 0;
+    this.internalName = connImpl.internalName;
+    if (this.internalName) {
+      this.internalName = Buffer.from(this.internalName);
+    }
+    this.externalName = connImpl.externalName;
+    if (this.externalName) {
+      this.externalName = Buffer.from(this.externalName);
+    }
+  }
+
+  processReturnParameter(buf) {
+    // process the parameters returned by the datatabase
+    this.applicationValue = buf.readUB4();
+    this.contextLen = buf.readUB2();
+    if (this.contextLen > 0) {
+      this.context = Buffer.from(buf.readBytes(this.contextLen));
+    }
+  }
+
+  encode(buf) {
+    // 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);
+    }
+
+    // write message
+    this.writeFunctionHeader(buf);
+    buf.writeUB4(this.operation);
+    if (this.context) {
+      buf.writeUInt8(1);  // pointer (transaction context)
+      buf.writeUB4(this.context.length);
+    } else {
+      buf.writeUInt8(0);  // pointer (transaction context)
+      buf.writeUB4(0);    // transaction context length
+    }
+
+    if (this.xid) {
+      buf.writeUB4(this.xid.formatId);
+      buf.writeUB4(this.xid.globalTransactionId.length);
+      buf.writeUB4(this.xid.branchQualifier.length);
+      buf.writeUInt8(1);  // pointer (XID)
+      buf.writeUB4(xidBytes.length);
+    } else {
+      buf.writeUB4(0);    // format id
+      buf.writeUB4(0);    // global transaction id length
+      buf.writeUB4(0);    // branch qualifier length
+      buf.writeUInt8(0);  // pointer (XID)
+      buf.writeUB4(0);    // XID length
+    }
+
+    buf.writeUB4(this.flags);
+    buf.writeUB4(this.timeout);
+    buf.writeUInt8(1);   // pointer (application value)
+    buf.writeUInt8(1);   // pointer (return context)
+    buf.writeUInt8(1);   // pointer (return context length)
+
+    if (this.internalName) {
+      buf.writeUInt8(1);   // pointer (internal name)
+      buf.writeUB4(this.internalName.length);
+    } else {
+      buf.writeUInt8(0);   // pointer (internal name)
+      buf.writeUB4(0);     // length of internal name
+    }
+
+    if (this.externalName) {
+      buf.writeUInt8(1);   // pointer (external name)
+      buf.writeUB4(this.externalName.length);
+    } else {
+      buf.writeUInt8(0);   // pointer (external name)
+      buf.writeUB4(0);     // length of external name
+    }
+
+    if (this.context) {
+      buf.writeBytes(this.context);
+    }
+    if (this.xid) {
+      buf.writeBytes(xidBytes);
+    }
+    buf.writeUB4(this.applicationValue);
+
+    if (this.internalName) {
+      buf.writeBytes(this.internalName);
+    }
+
+    if (this.externalName) {
+      buf.writeBytes(this.externalName);
+    }
+  }
+}
+
+module.exports = TransactionSwitchMessage;

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

@@ -67,7 +67,6 @@ class MessageWithData extends Message {
     if (messageType === constants.TNS_MSG_TYPE_DESCRIBE_INFO) {
       buf.skipBytesChunked();
       const prevQueryVars = this.statement.queryVars;
-      this.statement.queryVars = [];
       this.statement.numQueryVars = 0;
       this.statement.bufferRowCount = 0;
       this.statement.bufferRowIndex = 0;
@@ -140,7 +139,11 @@ class MessageWithData extends Message {
     if ((cVar.fetchInfo.dbType._oraTypeNum === constants.TNS_DATA_TYPE_CLOB
        && pVar.fetchInfo.fetchType._oraTypeNum === constants.TNS_DATA_TYPE_LONG)
         || (cVar.fetchInfo.dbType._oraTypeNum === constants.TNS_DATA_TYPE_BLOB
-          && pVar.fetchInfo.fetchType._oraTypeNum === constants.TNS_DATA_TYPE_LONG_RAW)) {
+          && pVar.fetchInfo.fetchType._oraTypeNum === constants.TNS_DATA_TYPE_LONG_RAW)
+        || (cVar.fetchInfo.dbType._oraTypeNum === constants.TNS_DATA_TYPE_JSON
+          && pVar.fetchInfo.fetchType._oraTypeNum === constants.TNS_DATA_TYPE_VARCHAR)
+        || (cVar.fetchInfo.dbType._oraTypeNum === constants.TNS_DATA_TYPE_VECTOR
+          && pVar.fetchInfo.fetchType._oraTypeNum === constants.TNS_DATA_TYPE_LONG)) {
       cVar.type = pVar.fetchInfo.fetchType;
       cVar.maxSize = pVar.maxSize;
     }
@@ -498,12 +501,20 @@ class MessageWithData extends Message {
       }
     } else if (oraTypeNum === constants.TNS_DATA_TYPE_BOOLEAN) {
       colValue = buf.readBool();
-    } else if (oraTypeNum === constants.TNS_DATA_TYPE_CLOB || oraTypeNum === constants.TNS_DATA_TYPE_BLOB) {
+    } else if (
+      oraTypeNum === constants.TNS_DATA_TYPE_CLOB ||
+      oraTypeNum === constants.TNS_DATA_TYPE_BLOB ||
+      oraTypeNum === constants.TNS_DATA_TYPE_BFILE
+    ) {
+      let length = 0;
+      let chunkSize = 0;
       const bvalue = buf.readUB4();
       if (bvalue > 0) { // Non Null data in column
         colValue = new ThinLobImpl();
-        const length = buf.readUB8();
-        const chunkSize = buf.readUB4();
+        if (oraTypeNum !== constants.TNS_DATA_TYPE_BFILE) {
+          length = buf.readUB8();
+          chunkSize = buf.readUB4();
+        }
         const locator = Buffer.from(buf.readBytesWithLength());
         colValue.init(this.connection, locator, dbType, length, chunkSize);
       }
@@ -852,7 +863,11 @@ class MessageWithData extends Message {
       } else {
         buf.writeUInt16BE(0x0100);
       }
-    } else if (oraTypeNum === constants.TNS_DATA_TYPE_CLOB || oraTypeNum === constants.TNS_DATA_TYPE_BLOB) {
+    } else if (
+      oraTypeNum === constants.TNS_DATA_TYPE_CLOB ||
+      oraTypeNum === constants.TNS_DATA_TYPE_BLOB ||
+      oraTypeNum === constants.TNS_DATA_TYPE_BFILE
+    ) {
       buf.writeUB4(value._locator.length);
       buf.writeBytesWithLength(value._locator);
     } else if ([constants.TNS_DATA_TYPE_ROWID, constants.TNS_DATA_TYPE_UROWID].includes(oraTypeNum)) {

package/lib/thin/protocol/protocol.js

@@ -31,6 +31,7 @@ const Capabilities = require("./capabilities.js");
 const {WritePacket, ReadPacket} = require("./packet.js");
 const errors = require("../../errors");
 const utils = require("./utils.js");
+const traceHandler = require('../../traceHandler.js');
 
 /**
  * Handles protocol details.
@@ -141,6 +142,13 @@ class Protocol {
   async _processMessage(message) {
     let callTimer;
     let callTimeoutExpired = false;
+    let traceInstance, traceContext;
+    const traceEnabled = traceHandler.isEnabled();
+
+    if (traceEnabled) {
+      traceContext = { additionalConfig: {} };
+      traceInstance = traceHandler.getTraceInstance();
+    }
     try {
       if (this.callTimeout > 0) {
         callTimer = setTimeout(() => {
@@ -148,6 +156,10 @@ class Protocol {
           this.breakMessage();
         }, this.callTimeout);
       }
+      if (traceEnabled) {
+        traceContext.operation = `oracledb.${message.constructor.name}`;
+        traceInstance.onBeginRoundTrip(traceContext);
+      }
       await this._encodeMessage(message);
       if (message.messageType !== constants.TNS_MSG_TYPE_ONEWAY_FN) {
         await this._decodeMessage(message);
@@ -157,9 +169,20 @@ class Protocol {
           err.code !== errors.ERR_CONNECTION_CLOSED_CODE) {
         await this._recoverFromError(err, message);
       }
+      if (traceEnabled) {
+        traceContext.error = err;
+      }
       throw err;
     } finally {
       clearTimeout(callTimer);
+      if (traceEnabled) {
+        traceContext.callLevelConfig = message.connection._callLevelTraceData;
+        traceContext.connectLevelConfig = message.connection._getConnectTraceConfig();
+        if (message.callStatus & constants.TNS_EOCS_FLAGS_SESS_RELEASE) {
+          traceContext.additionalConfig.implicitRelease = true;
+        }
+        traceInstance.onEndRoundTrip(traceContext);
+      }
     }
     if (message.flushOutBinds) {
       await this.flushOutBindMessage(message);

package/lib/thin/sqlnet/connStrategy.js

@@ -29,6 +29,7 @@
 const { NavAddress, NavAddressList, NavDescription, NavDescriptionList } = require("./navNodes.js");
 const { createNVPair } = require("./nvStrToNvPair.js");
 const errors = require("../../errors.js");
+const constants = require("./constants.js");
 
 /**
  * Class that holds all possible attributes under Description
@@ -114,6 +115,8 @@ class ConnStrategy {
       if (config != null) {
         if ((delay == 0 || delay == undefined) && config.retryDelay > 0) {
           delay = config.retryDelay * 1000;
+        } else if (!delay) {
+          delay = constants.DEFAULT_RETRY_DELAY; // 1 sec default
         }
       }
       for (let i = this.lastRetryCounter; i <= this.retryCount; ++i) {
@@ -157,7 +160,7 @@ function sleep(time) {
  * @param {string} str - input description string
  * @returns {object} - returns a connection strategy object.
  */
-async function createNode(str) {
+async function createNode(str, userConfig) {
   let nvpair;
   if (typeof str === 'string')
     nvpair = createNVPair(str);
@@ -185,6 +188,11 @@ async function createNode(str) {
   }
   navobj.initFromNVPair(nvpair);
   const cs = new ConnStrategy();
+  cs.driverName = userConfig.driverName;
+  cs.machine = userConfig.machine;
+  cs.terminal = userConfig.terminal;
+  cs.osUser = userConfig.osUser;
+  cs.program = userConfig.program;
   await navobj.navigate(cs);
   return cs;
 }

package/lib/thin/sqlnet/constants.js

@@ -187,6 +187,8 @@ module.exports =  {
   DISABLE_OOB_STR: 'DISABLE_OOB', // disable OOB parameter
   EXPIRE_TIME: 'EXPIRE_TIME', // expire Time
   PEM_WALLET_FILE_NAME: 'ewallet.pem',
+  DEFAULT_TRANSPORT_CONNECT_TIMEOUT: 20000, //default transport connect timeout
+  DEFAULT_RETRY_DELAY: 1000, //default retry delay
 
   /* Get/Set options */
   NT_MOREDATA: 1, // More Data in Transport available

package/lib/thin/sqlnet/navNodes.js

@@ -777,8 +777,20 @@ class NavDescription extends Description {
       if (this.connectData == null) {
         this.connectData = "(SERVICE_NAME=)";
       }
-      const pgmName = "\"'" + cInfo.program + "'\"";
-      const cid = `(CID=(PROGRAM=${pgmName})(HOST=${cInfo.hostName})(USER=${cInfo.userName}))`;
+
+      let pgmName = cInfo.program;
+      if (cs.program) {
+        pgmName = cs.program;
+      }
+      let hostName = cInfo.hostName;
+      if (cs.machine) {
+        hostName = cs.machine;
+      }
+      let userName = cInfo.userName;
+      if (cs.osUser) {
+        userName = cs.osUser;
+      }
+      const cid = `(CID=(PROGRAM=${pgmName})(HOST=${hostName})(USER=${userName}))`;
       cOpts[i].CNdata.push(NavSchemaObject.CD);
       cOpts[i].CNdata.push(this.connectData);
       cOpts[i].CNdata.push(cid);

package/lib/thin/sqlnet/networkSession.js

@@ -46,7 +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);
+  const addressNode = await createNode(connStr, userConfig);
   let nvpair;
   if (typeof connStr === 'string')
     nvpair = createNVPair(connStr);
@@ -97,9 +97,9 @@ async function resolveConnectStr(connectString, configDir) {
 
 }
 
-async function resolveAddress(connStr, configDir) {
-  const connstr = await resolveConnectStr(connStr, configDir);
-  return createNode(connstr);
+async function resolveAddress(connStr, userConfig) {
+  const connstr = await resolveConnectStr(connStr, userConfig.configDir);
+  return createNode(connstr, userConfig);
 }
 
 /**
@@ -199,7 +199,7 @@ 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)
    */
-  async connect2(address) {
+  async connect2(address, userConfig) {
     /* Sanitise SDU */
     if (this.sAtts.sdu) {
       if (this.sAtts.sdu > constants.NSPABSSDULN) {
@@ -269,7 +269,7 @@ class NetworkSession {
           redirConnData = this.cData;
         }
 
-        const redirAddressNode = await resolveAddress(adrStr);
+        const redirAddressNode = await resolveAddress(adrStr, userConfig);
         const host = address.hostname;
         address = await redirAddressNode.execute();
         if (address.desc)
@@ -301,7 +301,7 @@ class NetworkSession {
     this.markerPkt = new Packet.MarkerPacket(this.sAtts.largeSDU);
     this.controlPkt = new Packet.ControlPacket();
     this.ntAdapter.largeSDU = this.sAtts.largeSDU;
-    this.sAtts.nt.wallet = null;
+    this.sAtts.clearWallet();
     this.sAtts.nt.walletPassword = null;
     return (true);
   }
@@ -314,10 +314,10 @@ class NetworkSession {
     do {
       try {
         if (this.sAtts.connectTimeout) {
-          const asyncPromise = this.connect2(address);
+          const asyncPromise = this.connect2(address, userConfig);
           connected = await timeout(asyncPromise, this.sAtts.connectTimeout, "connectTimeout", address, this.sAtts.connectionId);
         } else {
-          connected = await this.connect2(address);
+          connected = await this.connect2(address, userConfig);
         }
       } catch (err) {
         if (err.message.startsWith('NJS-510') && !this.ntAdapter.connected) {
@@ -328,6 +328,7 @@ class NetworkSession {
           this.ntAdapter.disconnect(constants.NSFIMM);
           this.ntAdapter = null;
         }
+        this.sAtts.clearWallet();
         connected = false;
         savedErr = err;
         try {
@@ -527,7 +528,7 @@ class NetworkSession {
       addressNode = userConfig._connInfo[5];
       addressNode.reset();
     } else {
-      addressNode = await resolveAddress(connStr, userConfig.configDir);
+      addressNode = await resolveAddress(connStr, userConfig);
     }
     let address;
     try {

package/lib/thin/sqlnet/ntTcp.js

@@ -234,7 +234,7 @@ class NTTCP {
             ca: this.atts.wallet,
           });
         } catch (err) {
-          errors.throwErr(errors.ERR_TLS_INIT_FAILURE);
+          errors.throwErr(errors.ERR_TLS_INIT_FAILURE, err.message);
         }
         await this.tlsConnect(secureContext, this.stream);
       }

package/lib/thin/sqlnet/paramParser.js

@@ -32,6 +32,7 @@ const process = require('process');
 const readline = require('readline');
 const errors = require("../../errors.js");
 
+const MAX_IFILE_DEPTH = 4;
 /**
  * Returns File path of the tnsnames.ora if it exists.
  */
@@ -59,9 +60,12 @@ function tnsnamesFilePath(configDir) {
   }
 }
 
-let prevmtime = 0;
-
 class NLParamParser {
+
+  constructor() {
+    this.waiters = [];
+    this.readInProgress = false;
+  }
   /**
  * Reads the given file line by line and stores the
  * network service names mapped to connect descriptors in the hashtable.
@@ -69,13 +73,29 @@ class NLParamParser {
  * @returns {Promise}
  */
   async initializeNlpa(file_path) {
-    const stat = fs.statSync(file_path);
-
-    if (!(stat.mtime - prevmtime)) {
-      /* File has been read */
+    if (this.readInProgress) {
+      await new Promise((resolve) => {
+        this.waiters.push(resolve);
+      });
+    }
+    if (!this.checkModfTime()) {
+      /* No File has been modified */
       return this.ht;
     }
+    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;
+  }
+
+  async start(file_path, depth) {
 
+    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);
     // Creating a readable stream from file
     // readline module reads line by line
     // but from a readable stream only.
@@ -84,52 +104,49 @@ class NLParamParser {
       output: process.stdout,
       terminal: false
     });
-    this.ht = new Map();
-
-    const start = async () =>{
-      let nvElem = "";
-      for await (let line of file) {
-        if (line.length == 0) {   // ignore empty lines
-          continue;
-        } else if (line[0] == '#') {  // comment line
+    let nvElem = "";
+    for await (let line of file) {
+      if (line.length == 0) {   // ignore empty lines
+        continue;
+      } else if (line[0] == '#') {  // comment line
+        continue;
+      } else if ((line[0] == ' ') ||    // continued input on new line
+                  (line[0] == '\t') ||
+                  (line[0] == ')') ||
+                  (line[0] == '(')) {
+        line = line.replace(/\s+/g, '');
+        line = this.checkNLPforComments(line);
+        if (line.length == 0)
           continue;
-        } else if ((line[0] == ' ') ||    // continued input on new line
-                    (line[0] == '\t') ||
-                    (line[0] == ')') ||
-                    (line[0] == '(')) {
-          line = line.replace(/\s+/g, '');
-          line = this.checkNLPforComments(line);
-          if (line.length == 0)
-            continue;
-          else {
-            nvElem = nvElem + line;
-          }
+        else {
+          nvElem = nvElem + line;
+        }
 
-        } else {  // new NV Element starting here
-          if (nvElem.length == 0) {
+      } else {  // new NV Element starting here
+        if (nvElem.length == 0) {
 
-            line = this.checkNLPforComments(line);
-            nvElem = nvElem + line;
+          line = this.checkNLPforComments(line);
+          nvElem = nvElem + line;
 
-          } else if (nvElem.length != 0) {
-            this.addNLPListElement(nvElem); // Add Parameter to Hashtable
-            nvElem = ""; // Clear first, before storing current line
+        } else if (nvElem.length != 0) {
+          await this.addNLPListElement(nvElem, depth); // Add Parameter to Hashtable
+          nvElem = ""; // Clear first, before storing current line
 
-            line = this.checkNLPforComments(line);
-            nvElem = nvElem + line;
-          }
+          line = this.checkNLPforComments(line);
+          nvElem = nvElem + line;
         }
       }
-      if (nvElem.length != 0) { // at eof, still one more parameter to read
-        this.addNLPListElement(nvElem);
-        nvElem = "";      // clear nvElem buffer after added
-      }
-      prevmtime = stat.mtime;
-      return this.ht;
-    };
-    return await start();
+    }
+    if (nvElem.length != 0) { // at eof, still one more parameter to read
+      await this.addNLPListElement(nvElem, depth);
+      nvElem = "";      // clear nvElem buffer after added
+    }
+    this.readInProgress = false;
+    let waiter;
+    while ((waiter = this.waiters.pop())) {
+      waiter();
+    }
   }
-
   /**
    * Given a string, this method looks if the '#' character is present.
    * If true, the line is truncated from that point onwards until the end
@@ -155,11 +172,28 @@ 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) {
+        if (fs.existsSync(key)) {
+          const stat = fs.statSync(key);
+          if ((stat.mtime - value > 0)) {
+            return true;
+          }
+        } else
+          return true;
+      }
+    } else {
+      return true;
+    }
+    return false;
+  }
   /**
     * adds name value pairs from the input buffer into the hash table.
     * @param {string} ibuf
     */
-  addNLPListElement(ibuf) {
+  async addNLPListElement(ibuf, depth) {
     const res = ibuf.split(/\r?\n/).filter(element => element);
     for (let i = 0; i < res.length; i++) {
       if (res[i].charAt(0) != '(') {
@@ -169,14 +203,17 @@ class NLParamParser {
       const name = nvp.name;
       const uname = name.toUpperCase();
       nvp.name = uname;
-      const unames = uname.split(","); //multiple aliases (alias1, alias2, alias3)
-      for (let i = 0; i < unames.length; i++) {
-        this.ht.set(unames[i], nvp);
+      // support for ifile
+      if (uname == 'IFILE') {
+        await this.start(nvp.atom, depth + 1);
+      } else {
+        const unames = uname.split(","); //multiple aliases (alias1, alias2, alias3)
+        for (let i = 0; i < unames.length; i++) {
+          this.ht.set(unames[i], nvp);
+        }
       }
     }
   }
-
-
   toString() {
     let out = "";
     this.ht.forEach((value) => {

package/lib/thin/sqlnet/sessionAtts.js

@@ -77,6 +77,9 @@ class SessionAtts {
       if (typeof params.walletPassword === 'string') {
         this.nt.walletPassword = params.walletPassword;
       }
+      if (typeof params.walletContent === 'string') {
+        this.nt.wallet = params.walletContent;
+      }
       if (params.expireTime > 0) {
         this.nt.expireTime = params.expireTime * 1000 * 60;
       }
@@ -135,6 +138,15 @@ class SessionAtts {
     });
   }
 
+  /**
+   * Clear wallet
+   */
+  clearWallet() {
+    if (this.nt.wallet && Buffer.isBuffer(this.nt.wallet))
+      this.nt.wallet.fill(0);
+    this.nt.wallet = null;
+  }
+
   /**
    * Prepare attributes for connection, Generate Connection ID and read Wallet file
    *
@@ -151,12 +163,12 @@ class SessionAtts {
     }
     this.nt.connectionId = this.connectionId;
 
-    if (protocol && (protocol.toUpperCase() == "TCPS" && this.nt.walletFile)) {
+    if (protocol && (protocol.toUpperCase() == "TCPS" && !this.nt.wallet && this.nt.walletFile)) {
       this.nt.wallet = await this.readWalletFile();
     }
 
     if (!this.connectTimeout && !this.transportConnectTimeout)
-      this.transportConnectTimeout = 60 * 1000; /* Default to 60 secs */
+      this.transportConnectTimeout = constants.DEFAULT_TRANSPORT_CONNECT_TIMEOUT; /* Default to 20 secs */
   }
 
 }

package/lib/thin/util.js

@@ -29,6 +29,7 @@
 const constants = require('../constants');
 const errors = require('../errors.js');
 const os = require('os');
+const nodbUtil = require('../util.js');
 
 //---------------------------------------------------------------------------
 // populateClientInfo()
@@ -36,15 +37,15 @@ const os = require('os');
 // Populates client process information
 //---------------------------------------------------------------------------
 function populateClientInfo() {
-  this.program = process.argv0;
+  this.program = nodbUtil.sanitize(process.argv0);
   this.terminal = "unknown";
   this.pid = process.pid.toString();
   try {
-    this.userName = os.userInfo().username;
+    this.userName = nodbUtil.sanitize(os.userInfo().username);
   } catch {
     this.userName = "unknown";
   }
-  this.hostName = os.hostname();
+  this.hostName = nodbUtil.sanitize(os.hostname());
 }
 // Initialize client data on startup.
 const CLIENT_INFO = new populateClientInfo();