@pi-r/oracle 0.7.2 → 0.7.4

package/README.md

@@ -1,7 +1,7 @@
-### @pi-r/oracle
-
-https://e-mc.readthedocs.io/en/latest/db/oracle.html
-
-### LICENSE
-
+### @pi-r/oracle
+
+https://e-mc.readthedocs.io/en/latest/db/oracle.html
+
+### LICENSE
+
 MIT

package/client/index.d.ts

@@ -1,13 +1,13 @@
-import type { IModule } from '@e-mc/types/lib';
-import type { LogType } from '@e-mc/types/lib/logger';
-import type { IDbSourceClient } from '@e-mc/db/types';
-
-import type { OracleDataSource } from '../types';
-
-import type { InitialiseOptions } from 'oracledb';
-
-declare const Oracle: IDbSourceClient<OracleDataSource> & {
-    initOracleClient(this: IModule, credential: InitialiseOptions, type?: LogType): void;
-};
-
+import type { IModule } from '@e-mc/types/lib';
+import type { LogType } from '@e-mc/types/lib/logger';
+import type { IDbSourceClient } from '@e-mc/db/types';
+
+import type { OracleDataSource } from '../types';
+
+import type { InitialiseOptions } from 'oracledb';
+
+declare const Oracle: IDbSourceClient<OracleDataSource> & {
+    initOracleClient(this: IModule, credential: InitialiseOptions, type?: LogType): void;
+};
+
 export = Oracle;

package/client/pool.js

@@ -0,0 +1,50 @@
+"use strict";
+const DbPool = require('@e-mc/db/pool');
+const POOL_ACTIVE = new WeakSet();
+class OraclePool extends DbPool {
+    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 (!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;
+    }
+}
+OraclePool.CACHE_UNUSED = ['connectTimeout', 'transportConnectTimeout', 'expireTime', 'poolMax', 'poolMin', 'poolIncrement', 'poolTimeout', 'poolPingInterval', 'poolMaxPerShard', 'queueMax', 'queueRequests', 'queueTimeout', 'enableStatistics', 'sodaMetaDataCache', 'stmtCacheSize'];
+module.exports = OraclePool;

package/package.json

@@ -1,28 +1,28 @@
-{
-  "name": "@pi-r/oracle",
-  "version": "0.7.2",
-  "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.9.4",
-    "@e-mc/types": "^0.9.4",
-    "oracledb": "^6.5.1"
-  }
-}
+{
+  "name": "@pi-r/oracle",
+  "version": "0.7.4",
+  "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.9.12",
+    "@e-mc/types": "^0.9.12",
+    "oracledb": "^6.6.0"
+  }
+}

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