@pi-r/oracle 0.6.3 → 0.6.5

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 An Pham
+Copyright 2024 An Pham
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/README.md

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

package/client/index.d.ts

@@ -4,6 +4,7 @@ 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

@@ -30,17 +30,18 @@ class OraclePool extends DbPool {
         }
     }
     get closeable() {
-        return super.closeable || this.client.status === 6001 /* POOL_STATUS.DRAINING */;
+        return super.closeable || this.client.status === 6001;
     }
     get closed() {
-        return this.client.status === 6002 /* POOL_STATUS.CLOSED */;
+        return this.client.status === 6002;
     }
 }
 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_ACTIVE = new WeakSet();
 function removePoolProperties(credential) {
-    if (!credential.uuidKey) {
+    if (!credential.uuidKey && POOL_ACTIVE.has(credential)) {
         let result;
         for (let i = 0, length = POOL_UNUSED.length; i < length; ++i) {
             const attr = POOL_UNUSED[i];
@@ -72,7 +73,7 @@ if (DRIVER_MODE === 'thick' && oracledb.thin) {
             oracledb.initOracleClient({ libDir, configDir: process.env.NODE_ORACLEDB_CLIENT_CONFIG_DIR, driverName: process.env.NODE_ORACLEDB_CLIENT_DRIVER_NAME, errorUrl: process.env.NODE_ORACLEDB_CLIENT_ERROR_URL });
         }
         catch (err) {
-            Db.writeFail(["Unable to configure client" /* ERR_DB.CLIENT */, 'oracledb'], err);
+            Db.writeFail(["Unable to configure client", 'oracledb'], err);
         }
     }
 }
@@ -89,14 +90,14 @@ function initOracleClient(credential, type) {
                             this.addLog(this.statusType.WARN, err, 'oracledb', credential.libDir);
                             break;
                         default:
-                            this.writeFail(["Unable to configure client" /* ERR_DB.CLIENT */, 'oracledb'], err, { type: type ?? 65536 /* LOG_TYPE.DB */, fatal: false });
+                            this.writeFail(["Unable to configure client", 'oracledb'], err, { type: type ?? 65536, fatal: false });
                             break;
                     }
                 }
             }
         }
         else {
-            this.writeFail(["Unable to configure client" /* ERR_DB.CLIENT */, 'oracledb'], (0, types_1.errorMessage)('oracledb', 'Environment variable "NODE_ORACLEDB_DRIVER_MODE" was not set', 'thick'), { type: type ?? 65536 /* LOG_TYPE.DB */, 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;
     }
@@ -151,7 +152,7 @@ async function setCredential(item) {
             errors.push('connectString');
         }
         if (errors.length) {
-            throw (0, types_1.errorMessage)("oracle" /* STRINGS.MODULE_NAME */, 'Not defined - ' + errors.join(' | '));
+            throw (0, types_1.errorMessage)("oracle", 'Not defined - ' + errors.join(' | '));
         }
     }
     initOracleClient.call(this, credential);
@@ -187,7 +188,7 @@ async function setCredential(item) {
             }
         }
     }
-    const config = this.getPoolConfig("oracle" /* STRINGS.MODULE_NAME */, password);
+    const config = this.getPoolConfig("oracle", password);
     if (config) {
         const { min, max, idle, queue_max, queue_idle, timeout } = config;
         if (min >= 0) {
@@ -246,16 +247,17 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (!parallel) {
         outResult || (outResult = new Array(length));
     }
-    const caching = this.hasCache("oracle" /* STRINGS.MODULE_NAME */, sessionKey);
+    const caching = this.hasCache("oracle", sessionKey);
     const tasks = new Array(length);
     const clients = [];
     let oraclePool, oracleClient, oracleCredential, onceCredential = connectOnce ? batch[0].credential : undefined;
     const getConnection = async (item, credential) => {
-        item.transactionState = 64 /* DB_TRANSACTION.AUTH */;
+        item.transactionState = 64;
         let client;
         if (oraclePool) {
             clients.push(client = await oraclePool.getConnection());
-            item.transactionState &= ~64 /* DB_TRANSACTION.AUTH */;
+            item.transactionState &= ~64;
+            POOL_ACTIVE.add(credential);
             return client;
         }
         const pool = item.usePool && DbPool.findKey(POOL_STATE, item.usePool, getPoolKey(credential), ...connectOnce ? [item, batch[0]] : [item]);
@@ -266,6 +268,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     oraclePool = pool;
                 }
                 pool.connected = true;
+                POOL_ACTIVE.add(credential);
             }
             catch (err) {
                 let close;
@@ -293,7 +296,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
             oracleCredential = credential;
         }
-        item.transactionState &= ~64 /* DB_TRANSACTION.AUTH */;
+        item.transactionState &= ~64;
         return client;
     };
     if (this.host?.username) {
@@ -303,7 +306,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         const item = batch[i];
         const { source, query, params, ignoreCache, options: clientOptions } = item;
         let credential = oracleCredential || onceCredential, error;
-        if (!credential && !(0, types_1.isPlainObject)(credential = item.credential) && (error = (0, types_1.errorMessage)(source, "Invalid credentials" /* ERR_DB.CREDENTIALS */)) || !query && (error = (0, types_1.errorMessage)(source, "Missing database query" /* ERR_DB.QUERY */))) {
+        if (!credential && !(0, types_1.isPlainObject)(credential = item.credential) && (error = (0, types_1.errorMessage)(source, "Invalid credentials")) || !query && (error = (0, types_1.errorMessage)(source, "Missing database query"))) {
             if (this.handleFail(error, item, { errorQuery })) {
                 if (!parallel) {
                     tasks.length = 0;
@@ -319,8 +322,8 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
             continue;
         }
-        item.transactionState = 1 /* DB_TRANSACTION.ACTIVE */;
-        const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("oracle" /* STRINGS.MODULE_NAME */, 'options', null, credential) && (0, types_1.asFunction)(item.streamRow) : item.streamRow;
+        item.transactionState = 1;
+        const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("oracle", 'options', null, 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) {
@@ -334,7 +337,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     else {
                         outResult[i] = result;
                     }
-                    this.add(item, 4 /* DB_TRANSACTION.COMMIT */ | 128 /* DB_TRANSACTION.CACHE */);
+                    this.add(item, 4 | 128);
                     continue;
                 }
                 if (!ignoreCache && outCacheMiss) {
@@ -385,7 +388,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                             reject(error);
                         }
                         else {
-                            this.add(item, 4 /* DB_TRANSACTION.COMMIT */);
+                            this.add(item, 4);
                             resolve(!error ? this.setQueryResult(source, removePoolProperties(credential), queryString, rows, cacheValue) : rows);
                         }
                     })
@@ -393,7 +396,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 }
                 else {
                     const { rows } = await client.execute(query, params || [], executeOptions);
-                    this.add(item, 4 /* DB_TRANSACTION.COMMIT */);
+                    this.add(item, 4);
                     resolve(rows ? this.setQueryResult(source, removePoolProperties(credential), queryString, rows, cacheValue) : null);
                 }
             }
@@ -417,7 +420,7 @@ 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" /* ERR_DB.CONNECTION_CLOSE */, "oracle" /* STRINGS.MODULE_NAME */], err, { type: 65536 /* LOG_TYPE.DB */, fatal: false }))),
+        disconnect: () => clients.forEach(item => item.close(err => 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.3",
+  "version": "0.6.5",
   "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.3",
-    "@e-mc/types": "^0.8.3",
+    "@e-mc/db": "^0.8.6",
+    "@e-mc/types": "^0.8.6",
     "oracledb": "^6.3.0"
   }
 }

package/types/index.d.ts

@@ -2,6 +2,7 @@ import type { DbDataSource } from '@e-mc/types/lib/squared';
 
 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> {