@pi-r/oracle 0.6.7 → 0.7.1

package/README.md

@@ -1,10 +1,7 @@
-# @pi-r/oracle
+### @pi-r/oracle
 
-## Documentation
+https://e-mc.readthedocs.io/en/latest/db/oracle.html
 
-- [E-mc](https://e-mc.readthedocs.io/en/latest/db/oracle.html)
-- [squared](https://squared.readthedocs.io)
-
-## LICENSE
+### LICENSE
 
 MIT

package/client/index.d.ts

@@ -4,7 +4,6 @@ import type { IDbSourceClient } from '@e-mc/db/types';
 
 import type { OracleDataSource } from '../types';
 
-// @ts-ignore
 import type { InitialiseOptions } from 'oracledb';
 
 declare const Oracle: IDbSourceClient<OracleDataSource> & {

package/client/index.js

@@ -37,7 +37,7 @@ class OraclePool extends DbPool {
 }
 const DRIVER_MODE = process.env.NODE_ORACLEDB_DRIVER_MODE;
 const POOL_STATE = {};
-const POOL_UNUSED = ['poolMax', 'poolMin', 'poolIncrement', 'poolTimeout', 'poolPingInterval', 'poolMaxPerShard', 'connectTimeout', 'queueMax', 'queueRequests', 'queueTimeout'];
+const POOL_UNUSED = ['connectTimeout', 'transportConnectTimeout', 'expireTime', 'poolMax', 'poolMin', 'poolIncrement', 'poolTimeout', 'poolPingInterval', 'poolMaxPerShard', 'queueMax', 'queueRequests', 'queueTimeout', 'enableStatistics', 'sodaMetaDataCache', 'stmtCacheSize'];
 const POOL_ACTIVE = new WeakSet();
 function removePoolProperties(credential) {
     if (!credential.uuidKey && POOL_ACTIVE.has(credential)) {
@@ -45,7 +45,7 @@ function removePoolProperties(credential) {
         for (let i = 0, length = POOL_UNUSED.length; i < length; ++i) {
             const attr = POOL_UNUSED[i];
             if (attr in credential) {
-                result || (result = { ...credential });
+                result ||= { ...credential };
                 delete result[attr];
             }
         }
@@ -89,31 +89,26 @@ function initOracleClient(credential, type) {
                             this.addLog(this.statusType.WARN, err, 'oracledb', credential.libDir);
                             break;
                         default:
-                            this.writeFail(["Unable to configure client", 'oracledb'], err, { type: type !== null && type !== void 0 ? type : 65536, fatal: false });
+                            this.writeFail(["Unable to configure client", 'oracledb'], err, { type: type ?? 65536, fatal: false });
                             break;
                     }
                 }
             }
         }
         else {
-            this.writeFail(["Unable to configure client", 'oracledb'], (0, types_1.errorMessage)('oracledb', 'Environment variable "NODE_ORACLEDB_DRIVER_MODE" was not set', 'thick'), { type: type !== null && type !== void 0 ? type : 65536, fatal: false });
+            this.writeFail(["Unable to configure client", 'oracledb'], (0, types_1.errorMessage)('oracledb', 'Environment variable "NODE_ORACLEDB_DRIVER_MODE" was not set', 'thick'), { type: type ?? 65536, fatal: false });
         }
         delete credential.libDir;
     }
 }
 exports.initOracleClient = initOracleClient;
 async function setCredential(item) {
-    var _a, _b, _c, _d, _e, _f;
     let credential = this.getCredential(item), hostname, port, username, database;
     if (credential) {
-        ({ hostname, port, username } = (0, util_1.parseServerAuth)(credential));
-        credential.user || (credential.user = username);
-        if ('database' in credential) {
-            database = credential.database;
-            delete credential.database;
-        }
+        ({ hostname, port, database, username } = (0, util_1.parseServerAuth)(credential));
+        credential.user ||= username;
         if ('connectionString' in credential) {
-            credential.connectString || (credential.connectString = credential.connectionString);
+            credential.connectString ||= credential.connectionString;
             delete credential.connectionString;
         }
     }
@@ -132,7 +127,7 @@ async function setCredential(item) {
         item.credential = credential;
     }
     if (hostname) {
-        credential.connectString || (credential.connectString = hostname + (port ? ':' + port : '') + (database ? '/' + database : ''));
+        credential.connectString ||= hostname + (port ? ':' + port : '') + (database ? '/' + database : '');
     }
     if (credential.externalAuth) {
         delete credential.user;
@@ -192,22 +187,22 @@ async function setCredential(item) {
     if (config) {
         const { min, max, idle, queue_max, queue_idle, timeout } = config;
         if (min >= 0) {
-            (_a = credential.poolMin) !== null && _a !== void 0 ? _a : (credential.poolMin = min);
+            credential.poolMin ??= min;
         }
         if (max > 0) {
-            (_b = credential.poolMax) !== null && _b !== void 0 ? _b : (credential.poolMax = max);
+            credential.poolMax ??= max;
         }
         if (idle >= 0) {
-            (_c = credential.poolTimeout) !== null && _c !== void 0 ? _c : (credential.poolTimeout = idle / 1000);
+            credential.poolTimeout ??= idle / 1000;
         }
         if (queue_max >= 0) {
-            (_d = credential.queueMax) !== null && _d !== void 0 ? _d : (credential.queueMax = queue_max);
+            credential.queueMax ??= queue_max;
         }
         if (queue_idle >= 0) {
-            (_e = credential.queueTimeout) !== null && _e !== void 0 ? _e : (credential.queueTimeout = queue_idle);
+            credential.queueTimeout ??= queue_idle;
         }
         if (timeout >= 0) {
-            (_f = credential.connectTimeout) !== null && _f !== void 0 ? _f : (credential.connectTimeout = idle / 1000);
+            credential.connectTimeout ??= idle / 1000;
         }
     }
     const poolKey = getPoolKey(credential);
@@ -223,7 +218,6 @@ async function executeQuery(item, options) {
 }
 exports.executeQuery = executeQuery;
 async function executeBatchQuery(batch, options = '', outResult) {
-    var _a;
     const length = batch.length;
     if (length === 0) {
         return [];
@@ -246,7 +240,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         parallel = !batch.some(item => item.parallel === false);
     }
     if (!parallel) {
-        outResult || (outResult = new Array(length));
+        outResult ||= new Array(length);
     }
     const caching = this.hasCache("oracle", sessionKey);
     const tasks = new Array(length);
@@ -290,7 +284,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 pool.connected = false;
             }
         }
-        clients.push(client || (client = await oracledb.getConnection((oracleCredential || credential))));
+        clients.push(client ||= await oracledb.getConnection((oracleCredential || credential)));
         if (connectOnce) {
             if (!parallel) {
                 oracleClient = client;
@@ -300,7 +294,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         item.transactionState &= ~64;
         return client;
     };
-    if ((_a = this.host) === null || _a === void 0 ? void 0 : _a.username) {
+    if (this.host?.username) {
         this.applyCommand(...batch);
     }
     for (let i = 0; i < length; ++i) {
@@ -324,7 +318,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             continue;
         }
         item.transactionState = 1;
-        const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("oracle", 'options', null, credential) && (0, types_1.asFunction)(item.streamRow) : item.streamRow;
+        const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("oracle", 'options', credential) && (0, types_1.asFunction)(item.streamRow) : item.streamRow;
         const cacheValue = ignoreCache === undefined ? sessionKey : Array.isArray(ignoreCache) ? { sessionKey, exclusiveOf: ignoreCache } : { sessionKey, renewCache: ignoreCache === 0 };
         let queryString = '';
         if (caching && ignoreCache !== true && !streamRow) {
@@ -383,7 +377,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                         }
                         rows.push(row);
                     })
-                        .on('error', err => error || (error = err))
+                        .on('error', err => error ||= err)
                         .on('close', () => {
                         if (error && this.handleFail(error, item, { errorQuery, commandType })) {
                             reject(error);
@@ -421,7 +415,13 @@ async function executeBatchQuery(batch, options = '', outResult) {
         }
     }
     return this.processRows(batch, tasks, {
-        disconnect: () => clients.forEach(item => item.close(err => err && this.writeFail(["Unable to close connnection", "oracle"], err, { type: 65536, fatal: false }))),
+        disconnect: () => clients.forEach(item => {
+            item.close(err => {
+                if (err) {
+                    this.writeFail(["Unable to close connnection", "oracle"], err, { type: 65536, fatal: false });
+                }
+            });
+        }),
         parallel
     }, outResult);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/oracle",
-  "version": "0.6.7",
+  "version": "0.7.1",
   "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.8.8",
-    "@e-mc/types": "^0.8.8",
-    "oracledb": "^6.4.0"
+    "@e-mc/db": "^0.9.2",
+    "@e-mc/types": "^0.9.2",
+    "oracledb": "^6.5.1"
   }
 }

package/types/index.d.ts

@@ -5,7 +5,7 @@ import type { ExecuteAction, ServerAuth } from '@e-mc/types/lib/db';
 // @ts-ignore
 import type { BindParameters, ConnectionAttributes, ExecuteOptions, InitialiseOptions, PoolAttributes } from 'oracledb';
 
-export interface OracleDataSource extends DbDataSource<string, ExecuteOptions, unknown, string | OracleCredential, string>, ExecuteAction<BindParameters> {
+export interface OracleDataSource extends DbDataSource<string, ExecuteOptions, unknown, OracleCredential, string>, ExecuteAction<BindParameters> {
     source: "oracle";
 }