@pi-r/oracle 0.9.4 → 0.10.1

package/client/index.js

@@ -38,7 +38,7 @@ function initOracleClient(credential, type) {
                 if (err instanceof Error) {
                     switch (err.code) {
                         case 'NJS-090':
-                            this.addLog(this.statusType.WARN, err, 'oracledb', credential.libDir);
+                            this.addLog(this.statusType.WARN, err, "oracle", credential.libDir);
                             break;
                         default:
                             this.writeFail(["Unable to configure client", 'oracledb'], err, { type: type ?? 65536, fatal: false });
@@ -104,7 +104,7 @@ async function setCredential(item) {
             errors.push('connectString');
         }
         if (errors.length > 0) {
-            throw (0, types_1.errorMessage)("oracle", 'Not defined - ' + errors.join(' | '));
+            throw (0, types_1.errorMessage)("oracle", "Invalid credentials", errors.join(', '));
         }
     }
     initOracleClient.call(this, credential);
@@ -112,10 +112,15 @@ async function setCredential(item) {
     if (!usePool) {
         return;
     }
+    else if (credential.sessionCallback) {
+        item.usePool = undefined;
+        return;
+    }
     const poolAlias = credential.poolAlias;
     let password, pool;
     if ((0, types_1.isString)(usePool)) {
-        if (username = credential.user || poolAlias || configObject) {
+        username = credential.user || poolAlias || configObject;
+        if (username) {
             [password, pool] = DbPool.validateKey(POOL_STATE, username, usePool);
             if (pool) {
                 pool.add(item, password);
@@ -142,7 +147,7 @@ async function setCredential(item) {
     }
     const config = this.getPoolConfig("oracle", password);
     if (config) {
-        const { min, max, idle, queue_max, queue_idle, timeout } = config;
+        const { min, max, idle, queue_max, queue_idle, timeout, server_timeout } = config;
         if (min >= 0) {
             credential.poolMin ??= min;
         }
@@ -161,6 +166,9 @@ async function setCredential(item) {
         if (timeout >= 0) {
             credential.connectTimeout ??= idle / 1000;
         }
+        if (server_timeout > 0) {
+            credential.transportConnectTimeout ??= server_timeout / 1000;
+        }
     }
     const poolKey = DbPool.asString(credential);
     if ((pool = POOL_STATE[poolKey]) && !pool.closed) {
@@ -370,7 +378,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
         }
     }
-    return this.processRows(batch, tasks, {
+    return this.processRows(batch, tasks, clients.length === 0 ? parallel : {
         parallel,
         disconnect: () => {
             for (const item of clients) {

package/client/pool.js

@@ -2,6 +2,8 @@
 const DbPool = require('@e-mc/db/pool');
 const POOL_ACTIVE = new WeakSet();
 class OraclePool extends DbPool {
+    static CACHE_UNUSED = ['connectTimeout', 'transportConnectTimeout', 'expireTime', 'poolMax', 'poolMin', 'poolIncrement', 'poolTimeout', 'poolPingInterval', 'poolMaxPerShard', 'queueMax', 'queueRequests', 'queueTimeout', 'enableStatistics', 'sodaMetaDataCache', 'stmtCacheSize', 'httpsProxy', 'httpsProxyPort'];
+    static CACHE_IGNORE = ['sessionCallback'];
     static asString(credential) {
         if (credential.connectString && (credential.user && credential.password || credential.externalAuth) || credential.poolAlias) {
             return JSON.stringify(this.removeUUIDKey(credential));
@@ -9,6 +11,9 @@ class OraclePool extends DbPool {
         return super.asString(credential);
     }
     static sanitize(credential) {
+        if (!this.canCache(credential)) {
+            return;
+        }
         if (!POOL_ACTIVE.has(credential) || credential.uuidKey) {
             return credential;
         }
@@ -46,5 +51,4 @@ class OraclePool extends DbPool {
         return this.client.status === 6002;
     }
 }
-OraclePool.CACHE_UNUSED = ['connectTimeout', 'transportConnectTimeout', 'expireTime', 'poolMax', 'poolMin', 'poolIncrement', 'poolTimeout', 'poolPingInterval', 'poolMaxPerShard', 'queueMax', 'queueRequests', 'queueTimeout', 'enableStatistics', 'sodaMetaDataCache', 'stmtCacheSize'];
 module.exports = OraclePool;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/oracle",
-  "version": "0.9.4",
+  "version": "0.10.1",
   "description": "Oracle client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -20,8 +20,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.11.5",
-    "@e-mc/types": "^0.11.5",
+    "@e-mc/db": "^0.12.3",
+    "@e-mc/types": "^0.12.3",
     "oracledb": "^6.8.0"
   }
 }