@pi-r/oracle 0.3.5 → 0.3.6

package/LICENSE

@@ -1,7 +1,7 @@
-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:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
+Copyright 2023 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:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -1,7 +1,5 @@
-# @pi-r/oracle
-
-PEP 402 - Forever
-
-## LICENSE
-
+# @pi-r/oracle
+
+## LICENSE
+
 MIT

package/client/index.d.ts

@@ -1,7 +1,7 @@
-import type { IDbSourceClient } from '@e-mc/db/types';
-
-import type { OracleDataSource } from '../types';
-
-declare const Oracle: IDbSourceClient<OracleDataSource>;
-
+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,7 +1,6 @@
 "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");
@@ -128,6 +127,7 @@ async function setCredential(item) {
         const poolKey = getPoolKey(credential);
         if (poolKey) {
             if (!(pool = POOL_STATE[poolKey]) || pool.closed) {
+                const { createPool } = require("oracledb");
                 const config = this.getPoolConfig("oracle", password);
                 if (config) {
                     const { min, max, idle, queue_max, queue_idle } = config;
@@ -147,7 +147,7 @@ async function setCredential(item) {
                         (_e = credential.queueTimeout) !== null && _e !== void 0 ? _e : (credential.queueTimeout = queue_idle);
                     }
                 }
-                new OraclePool(await oracledb.createPool(credential), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
+                new OraclePool(await createPool(credential), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
             }
             else {
                 pool.add(item);
@@ -168,6 +168,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (length === 0) {
         return [];
     }
+    const db = require("oracledb");
     let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
     if ((0, types_1.isPlainObject)(options)) {
         ({ parallel, connectOnce, errorQuery, sessionKey } = options);
@@ -228,7 +229,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 pool.connected = false;
             }
         }
-        clients.push(client || (client = await oracledb.getConnection((oracleCredential || credential))));
+        clients.push(client || (client = await db.getConnection((oracleCredential || credential))));
         if (connectOnce) {
             if (!parallel) {
                 oracleClient = client;
@@ -299,7 +300,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 if (oracleClient && parallel) {
                     oracleClient = undefined;
                 }
-                const executeOptions = { outFormat: oracledb.OUT_FORMAT_OBJECT, ...clientOptions, resultSet: false, autoCommit: true };
+                const executeOptions = { outFormat: db.OUT_FORMAT_OBJECT, ...clientOptions, resultSet: false, autoCommit: true };
                 commandType = this.commandType.SELECT;
                 if (streamRow) {
                     const rows = [];

package/client/pool.js

@@ -0,0 +1,54 @@
+"use strict";
+const DbPool = require('@e-mc/db/pool');
+const POOL_ACTIVE = new WeakSet();
+class OraclePool extends DbPool {
+    static CACHE_UNUSED = ['connectTimeout', 'transportConnectTimeout', 'expireTime', 'poolMax', 'poolMin', 'poolIncrement', 'poolTimeout', 'poolPingInterval', 'poolMaxPerShard', 'queueMax', 'queueRequests', 'queueTimeout', 'enableStatistics', 'sodaMetaDataCache', 'stmtCacheSize', 'httpsProxy', 'httpsProxyPort'];
+    static CACHE_IGNORE = ['sessionCallback'];
+    static asString(credential) {
+        if (credential.connectString && (credential.user && credential.password || credential.externalAuth) || credential.poolAlias) {
+            return JSON.stringify(this.removeUUIDKey(credential));
+        }
+        return super.asString(credential);
+    }
+    static sanitize(credential) {
+        if (!this.canCache(credential)) {
+            return;
+        }
+        if (!POOL_ACTIVE.has(credential) || credential.uuidKey) {
+            return credential;
+        }
+        return super.sanitize(credential);
+    }
+    get closeable() {
+        return super.closeable || this.client.status === 6001;
+    }
+    async getConnection(credential) {
+        if (credential) {
+            POOL_ACTIVE.add(credential);
+        }
+        return this.client.getConnection();
+    }
+    async close() {
+        return this.client.close();
+    }
+    isEmpty() {
+        if (this.closed) {
+            return true;
+        }
+        try {
+            const data = this.client.getStatistics();
+            if (data) {
+                const { connectionsInUse, currentQueueLength } = data;
+                return connectionsInUse === 0 && currentQueueLength === 0;
+            }
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    get closed() {
+        return this.client.status === 6002;
+    }
+}
+module.exports = OraclePool;

package/package.json

@@ -1,28 +1,28 @@
-{
-  "name": "@pi-r/oracle",
-  "version": "0.3.5",
-  "description": "Oracle client driver for E-mc.",
-  "main": "client/index.js",
-  "types": "client/index.d.ts",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/anpham6/pi-r.git",
-    "directory": "src/db/oracle"
-  },
-  "keywords": [
-    "squared",
-    "e-mc",
-    "squared-functions"
-  ],
-  "author": "An Pham <anpham6@gmail.com>",
-  "license": "MIT",
-  "homepage": "https://github.com/anpham6/pi-r#readme",
-  "dependencies": {
-    "@e-mc/db": "^0.6.7",
-    "@e-mc/types": "^0.6.7",
-    "oracledb": "^6.5.1"
-  }
-}
+{
+  "name": "@pi-r/oracle",
+  "version": "0.3.6",
+  "description": "Oracle client driver for E-mc.",
+  "main": "client/index.js",
+  "types": "client/index.d.ts",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
+    "directory": "src/db/oracle"
+  },
+  "keywords": [
+    "squared",
+    "e-mc",
+    "squared-functions"
+  ],
+  "author": "An Pham <anpham6@gmail.com>",
+  "license": "MIT",
+  "homepage": "https://github.com/anpham6/pi-r#readme",
+  "dependencies": {
+    "@e-mc/db": "^0.6.16",
+    "@e-mc/types": "^0.6.16",
+    "oracledb": "^6.5.1"
+  }
+}

package/types/index.d.ts

@@ -1,12 +1,12 @@
-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, PoolAttributes } from 'oracledb';
-
-export interface OracleDataSource extends DbDataSource<string, ExecuteOptions, unknown, string | OracleCredential, string>, ExecuteAction<BindParameters> {
-    source: "oracle";
-}
-
+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, PoolAttributes } from 'oracledb';
+
+export interface OracleDataSource extends DbDataSource<string, ExecuteOptions, unknown, string | OracleCredential, string>, ExecuteAction<BindParameters> {
+    source: "oracle";
+}
+
 export interface OracleCredential extends ServerAuth, ConnectionAttributes, PoolAttributes {}