@pi-r/oracle 0.3.0 → 0.3.2

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 An Pham
+Copyright 2023 Studio Trigger
 
 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,5 +1,7 @@
-### @pi-r/oracle
+# @pi-r/oracle
 
-### LICENSE
+PEP 402 - Forever Aina
+
+## LICENSE
 
 MIT

package/client/index.d.ts

@@ -1,7 +1,7 @@
-import type { OracleDataSource } from '@e-mc/types/lib/db';
-
 import type { IDbSourceClient } from '@e-mc/db/types';
 
+import type { OracleDataSource } from '../types';
+
 declare const Oracle: IDbSourceClient<OracleDataSource>;
 
 export = Oracle;

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");
@@ -17,18 +18,29 @@ class OraclePool extends DbPool {
         return this.closed || connectionsInUse === 0 && currentQueueLength === 0;
     }
     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 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', '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)) {
@@ -84,7 +96,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(' | '));
         }
     }
     const usePool = item.usePool;
@@ -114,8 +126,7 @@ 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);
+                const config = this.getPoolConfig("oracle", password);
                 if (config) {
                     const { min, max, idle, queue_max, queue_idle } = config;
                     if (min >= 0) {
@@ -134,7 +145,7 @@ async function setCredential(item) {
                         credential.queueTimeout ?? (credential.queueTimeout = queue_idle);
                     }
                 }
-                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 +166,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);
@@ -176,16 +186,16 @@ 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;
             return client;
         }
         const pool = item.usePool && DbPool.findKey(POOL_STATE, item.usePool, getPoolKey(credential), ...connectOnce ? [item, batch[0]] : [item]);
@@ -216,21 +226,21 @@ 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;
             }
             oracleCredential = credential;
         }
-        item.transactionState &= ~64 /* DB_TRANSACTION.AUTH */;
+        item.transactionState &= ~64;
         return client;
     };
     for (let i = 0; i < length; ++i) {
         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;
@@ -246,8 +256,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 renewCache = ignoreCache === 0;
         const cacheValue = renewCache ? { sessionKey, renewCache } : sessionKey;
         let queryString = '';
@@ -262,7 +272,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) {
@@ -287,7 +297,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 = [];
@@ -313,7 +323,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);
                         }
                     })
@@ -321,7 +331,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);
                 }
             }
@@ -345,7 +355,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.3.0",
+  "version": "0.3.2",
   "description": "Oracle client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/anpham6/pi-r.git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
     "directory": "src/db/oracle"
   },
   "keywords": [
@@ -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.6.1",
+    "@e-mc/types": "^0.6.1",
+    "oracledb": "^6.3.0"
   }
 }