@pi-r/oracle 0.3.0 → 0.5.0

package/client/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DB_SOURCE_TYPE = exports.DB_SOURCE_CLIENT = exports.checkTimeout = exports.executeBatchQuery = exports.executeQuery = exports.setCredential = void 0;
+const oracledb = require("oracledb");
 const util_1 = require("@e-mc/db/util");
 const types_1 = require("@e-mc/types");
 const Db = require("@e-mc/db");
@@ -24,11 +25,22 @@ class OraclePool extends DbPool {
     }
 }
 const POOL_STATE = {};
-function removePoolProperties(options) {
-    if (!options.uuidKey && ('poolMax' in options || 'poolMin' in options || 'poolIncrement' in options || 'poolTimeout' in options || 'poolPingInterval' in options || 'poolMaxPerShard' in options || 'queueMax' in options || 'queueRequests' in options || 'queueTimeout' in options)) {
-        return { ...options, poolMax: undefined, poolMin: undefined, poolIncrement: undefined, poolTimeout: undefined, poolPingInterval: undefined, poolMaxPerShard: undefined, queueMax: undefined, queueRequests: undefined, queueTimeout: undefined };
+const POOL_UNUSED = ['poolMax', 'poolMin', 'poolIncrement', 'poolTimeout', 'poolPingInterval', 'poolMaxPerShard', 'connectTimeout', 'queueMax', 'queueRequests', 'queueTimeout'];
+function removePoolProperties(credential) {
+    if (!credential.uuidKey) {
+        let result;
+        for (let i = 0, length = POOL_UNUSED.length; i < length; ++i) {
+            const attr = POOL_UNUSED[i];
+            if (attr in credential) {
+                result || (result = { ...credential });
+                delete result[attr];
+            }
+        }
+        if (result) {
+            return result;
+        }
     }
-    return options;
+    return credential;
 }
 function getPoolKey(credential) {
     if (credential.connectString && (credential.user && credential.password || credential.externalAuth)) {
@@ -114,10 +126,9 @@ async function setCredential(item) {
         const poolKey = getPoolKey(credential);
         if (poolKey) {
             if (!(pool = POOL_STATE[poolKey]) || pool.closed) {
-                const { createPool } = require("oracledb" /* STRINGS.PACKAGE_NAME */);
                 const config = this.getPoolConfig("oracle" /* STRINGS.MODULE_NAME */, password);
                 if (config) {
-                    const { min, max, idle, queue_max, queue_idle } = config;
+                    const { min, max, idle, queue_max, queue_idle, timeout } = config;
                     if (min >= 0) {
                         credential.poolMin ?? (credential.poolMin = min);
                     }
@@ -133,8 +144,11 @@ async function setCredential(item) {
                     if (queue_idle >= 0) {
                         credential.queueTimeout ?? (credential.queueTimeout = queue_idle);
                     }
+                    if (timeout >= 0) {
+                        credential.connectTimeout ?? (credential.connectTimeout = idle / 1000);
+                    }
                 }
-                new OraclePool(await createPool(credential), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
+                new OraclePool(await oracledb.createPool(credential), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
             }
             else {
                 pool.add(item);
@@ -155,7 +169,6 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (length === 0) {
         return [];
     }
-    const db = require("oracledb" /* STRINGS.PACKAGE_NAME */);
     let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
     if ((0, types_1.isPlainObject)(options)) {
         ({ parallel, connectOnce, errorQuery, sessionKey } = options);
@@ -216,7 +229,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 pool.connected = false;
             }
         }
-        clients.push(client || (client = await db.getConnection((oracleCredential || credential))));
+        clients.push(client || (client = await oracledb.getConnection((oracleCredential || credential))));
         if (connectOnce) {
             if (!parallel) {
                 oracleClient = client;
@@ -287,7 +300,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 if (oracleClient && parallel) {
                     oracleClient = undefined;
                 }
-                const executeOptions = { outFormat: db.OUT_FORMAT_OBJECT, ...clientOptions, resultSet: false, autoCommit: true };
+                const executeOptions = { outFormat: oracledb.OUT_FORMAT_OBJECT, ...clientOptions, resultSet: false, autoCommit: true };
                 commandType = this.commandType.SELECT;
                 if (streamRow) {
                     const rows = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/oracle",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "description": "Oracle client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -21,8 +21,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.5.3",
-    "@e-mc/types": "^0.5.3",
-    "oracledb": "^6.0.0"
+    "@e-mc/db": "^0.7.0",
+    "@e-mc/types": "^0.7.0",
+    "oracledb": "^6.2.0"
   }
 }