@pi-r/oracle 0.11.2 → 0.12.0

package/client/index.js

@@ -1,22 +1,16 @@
 "use strict";
-exports.DB_SOURCE_TYPE = exports.DB_SOURCE_CLIENT = void 0;
-exports.getConfigObject = getConfigObject;
-exports.initOracleClient = initOracleClient;
-exports.setCredential = setCredential;
-exports.executeQuery = executeQuery;
-exports.executeBatchQuery = executeBatchQuery;
-exports.checkTimeout = checkTimeout;
-const oracledb = require("oracledb");
-const Db = require("@e-mc/db");
-const types_1 = require("@e-mc/types");
-const util_1 = require("@e-mc/db/util");
-const DbPool = require("@pi-r/oracle/client/pool");
+
+const oracledb = require('oracledb');
+const Db = require('@e-mc/db');
+const { DB_TYPE, asFunction, errorMessage, isError, isErrorCode, isPlainObject, isString } = require('@e-mc/types');
+const { parseConnectionString, parseServerAuth } = require('@e-mc/db/util');
+const DbPool = require('@pi-r/oracle/client/pool');
 const POOL_STATE = {};
 const DRIVER_MODE = process.env.NODE_ORACLEDB_DRIVER_MODE;
 const useLibDir = () => Db.PLATFORM_WIN32 || process.platform === 'darwin' && process.arch === 'x64';
 if (DRIVER_MODE === 'thick' && oracledb.thin) {
     let libDir;
-    if (!useLibDir() || (0, types_1.isString)(libDir = process.env.NODE_ORACLEDB_CLIENT_LIB_DIR || process.env.ORACLE_HOME)) {
+    if (!useLibDir() || isString(libDir = process.env.NODE_ORACLEDB_CLIENT_LIB_DIR || process.env.ORACLE_HOME)) {
         try {
             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 });
         }
@@ -26,7 +20,7 @@ if (DRIVER_MODE === 'thick' && oracledb.thin) {
     }
 }
 function getConfigObject(value) {
-    return (0, types_1.isString)(value) && /^config-(?:ociobject|azure):\/\//i.test(value) ? value : '';
+    return isString(value) && /^config-(?:ociobject|azure):\/\//i.test(value) ? value : '';
 }
 function initOracleClient(credential, type) {
     if (credential.libDir && oracledb.thin) {
@@ -35,20 +29,16 @@ function initOracleClient(credential, type) {
                 oracledb.initOracleClient({ libDir: useLibDir() ? credential.libDir : undefined, driverName: credential.driverName, errorUrl: credential.errorUrl });
             }
             catch (err) {
-                if (err instanceof Error) {
-                    switch (err.code) {
-                        case 'NJS-090':
-                            this.addLog(3, err, "oracle", credential.libDir);
-                            break;
-                        default:
-                            this.writeFail(["Unable to configure client", 'oracledb'], err, { type: type ?? 65536, fatal: false });
-                            break;
-                    }
+                if (isErrorCode(err, 'NJS-090')) {
+                    this.addLog(3, err, "oracle", credential.libDir);
+                }
+                else {
+                    this.writeFail(["Unable to configure client", 'oracledb'], err, { type: type ?? 65536, fatal: false });
                 }
             }
         }
         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 ?? 65536, fatal: false });
+            this.writeFail(["Unable to configure client", 'oracledb'], errorMessage('oracledb', 'Environment variable "NODE_ORACLEDB_DRIVER_MODE" was not set', 'thick'), { type: type ?? 65536, fatal: false });
         }
         delete credential.libDir;
     }
@@ -56,7 +46,7 @@ function initOracleClient(credential, type) {
 async function setCredential(item) {
     let credential = this.getCredential(item), hostname, port, username, database;
     if (credential) {
-        ({ hostname, port, database, username } = (0, util_1.parseServerAuth)(credential));
+        ({ hostname, port, database, username } = parseServerAuth(credential));
         credential.user ||= username;
         if ('connectionString' in credential) {
             credential.connectString ||= credential.connectionString;
@@ -67,7 +57,7 @@ async function setCredential(item) {
         const uri = item.uri;
         credential = {};
         if (uri) {
-            const connection = (0, util_1.parseConnectionString)(uri);
+            const connection = parseConnectionString(uri);
             if (connection) {
                 ({ hostname, port, username: credential.user, password: credential.password, database } = connection);
             }
@@ -104,7 +94,7 @@ async function setCredential(item) {
             errors.push('connectString');
         }
         if (errors.length > 0) {
-            throw (0, types_1.errorMessage)("oracle", "Invalid credentials", errors.join(', '));
+            throw errorMessage("oracle", "Invalid credentials", errors.join(', '));
         }
     }
     initOracleClient.call(this, credential);
@@ -118,7 +108,7 @@ async function setCredential(item) {
     }
     const poolAlias = credential.poolAlias;
     let password, pool;
-    if ((0, types_1.isString)(usePool)) {
+    if (isString(usePool)) {
         username = credential.user || poolAlias || configObject;
         if (username) {
             [password, pool] = DbPool.validateKey(POOL_STATE, username, usePool);
@@ -189,8 +179,8 @@ async function executeBatchQuery(batch, options = '', outResult) {
         return [];
     }
     let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
-    if ((0, types_1.isPlainObject)(options)) {
-        ({ parallel, connectOnce, errorQuery, sessionKey } = options);
+    if (isPlainObject(options)) {
+        ({ parallel, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
     }
     else {
         if (typeof options === 'string') {
@@ -231,17 +221,12 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
             catch (err) {
                 let close;
-                switch (err instanceof Error && err.code) {
-                    case 'ORA-01017':
-                        close = 1;
-                        break;
-                    default:
-                        close = pool.closeable;
-                        break;
+                if (!isErrorCode(err, 'ORA-01017')) {
+                    close = pool.closeable;
                 }
-                if (close) {
+                if (close !== false) {
                     await pool.detach(true);
-                    if (close === 1) {
+                    if (!close) {
                         throw err;
                     }
                 }
@@ -265,7 +250,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")) || !query && (error = (0, types_1.errorMessage)(source, "Missing database query"))) {
+        if (!credential && !isPlainObject(credential = item.credential) && (error = errorMessage(source, "Invalid credentials")) || !query && (error = errorMessage(source, "Missing database query"))) {
             if (this.handleFail(error, item, { errorQuery })) {
                 if (!parallel) {
                     tasks.length = 0;
@@ -282,7 +267,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             continue;
         }
         item.transactionState = 1;
-        const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("oracle", 'options', credential) && (0, types_1.asFunction)(item.streamRow) : item.streamRow;
+        const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("oracle", 'options', credential) && 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 +319,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                             if (err === false) {
                                 return;
                             }
-                            if (err instanceof Error) {
+                            if (isError(err)) {
                                 error = err;
                                 return;
                             }
@@ -394,5 +379,14 @@ async function executeBatchQuery(batch, options = '', outResult) {
 async function checkTimeout(value, limit = 0) {
     return DbPool.checkTimeout(POOL_STATE, value, limit);
 }
-exports.DB_SOURCE_CLIENT = true;
-exports.DB_SOURCE_TYPE = types_1.DB_TYPE.SQL;
+const DB_SOURCE_CLIENT = true;
+const DB_SOURCE_TYPE = DB_TYPE.SQL;
+
+exports.DB_SOURCE_CLIENT = DB_SOURCE_CLIENT;
+exports.DB_SOURCE_TYPE = DB_SOURCE_TYPE;
+exports.checkTimeout = checkTimeout;
+exports.executeBatchQuery = executeBatchQuery;
+exports.executeQuery = executeQuery;
+exports.getConfigObject = getConfigObject;
+exports.initOracleClient = initOracleClient;
+exports.setCredential = setCredential;

package/client/pool.js

@@ -1,4 +1,5 @@
 "use strict";
+
 const DbPool = require('@e-mc/db/pool');
 const POOL_ACTIVE = new WeakSet();
 class OraclePool extends DbPool {
@@ -51,4 +52,5 @@ class OraclePool extends DbPool {
         return this.client.status === 6002;
     }
 }
+
 module.exports = OraclePool;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/oracle",
-  "version": "0.11.2",
+  "version": "0.12.0",
   "description": "Oracle client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -20,8 +20,11 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.13.9",
-    "@e-mc/types": "^0.13.9",
+    "@e-mc/db": "^0.14.0",
+    "@e-mc/types": "^0.14.0",
     "oracledb": "^6.10.0"
+  },
+  "peerDependencies": {
+    "@types/oracledb": "^6"
   }
 }