@pi-r/oci 0.5.2 → 0.6.0

package/client/index.js

@@ -4,6 +4,7 @@ exports.executeBatchQuery = exports.executeQuery = exports.deleteObjectsV2 = exp
 const oracledb = require("oracledb");
 const types_1 = require("@e-mc/types");
 const aws_1 = require("@pi-r/aws");
+const oracle_1 = require("@pi-r/oracle");
 const util_1 = require("@e-mc/cloud/util");
 const Module = require("@e-mc/module");
 function validateStorage(credential) {
@@ -26,52 +27,36 @@ function setStorageCredential(credential) {
     credential.signatureVersion = 'v4';
 }
 exports.setStorageCredential = setStorageCredential;
-function createDatabaseClient(credential) {
+async function createDatabaseClient(credential) {
     if (credential.username) {
         credential.user || (credential.user = credential.username);
         delete credential.username;
     }
-    if (oracledb.thin && credential.libDir) {
-        try {
-            oracledb.initOracleClient({ libDir: credential.libDir, driverName: credential.driverName, errorUrl: credential.errorUrl });
-        }
-        catch (err) {
-            if (err instanceof Error) {
-                switch (err.code) {
-                    case 'NJS-090':
-                        this.addLog(this.statusType.WARN, err, 'oracledb', credential.libDir);
-                        break;
-                    default:
-                        this.writeFail(["Unable to configure client" /* ERR_DB.CLIENT */, 'oracledb'], err, { type: this.logType.CLOUD, fatal: false });
-                        break;
-                }
-            }
-        }
-    }
+    oracle_1.initOracleClient.call(this, credential, this.logType.CLOUD);
     return oracledb.getConnection(credential);
 }
 exports.createDatabaseClient = createDatabaseClient;
-function createBucket(credential, bucket, publicRead) {
+async function createBucket(credential, bucket, publicRead) {
     return aws_1.createBucketV2.call(this, credential, bucket, publicRead ? 'public-read' : undefined, undefined, 'oci');
 }
 exports.createBucket = createBucket;
-function createBucketV2(credential, bucket, ACL, options) {
+async function createBucketV2(credential, bucket, ACL, options) {
     return aws_1.createBucketV2.call(this, credential, bucket, ACL, options, 'oci');
 }
 exports.createBucketV2 = createBucketV2;
-function setBucketPolicy(credential, bucket, options) {
+async function setBucketPolicy(credential, bucket, options) {
     return aws_1.setBucketPolicy.call(this, credential, bucket, options, 'oci');
 }
 exports.setBucketPolicy = setBucketPolicy;
-function setBucketWebsite(credential, bucket, options) {
+async function setBucketWebsite(credential, bucket, options) {
     return aws_1.setBucketWebsite.call(this, credential, bucket, options, 'oci');
 }
 exports.setBucketWebsite = setBucketWebsite;
-function deleteObjects(credential, bucket) {
+async function deleteObjects(credential, bucket) {
     return deleteObjectsV2.call(this, credential, bucket, true);
 }
 exports.deleteObjects = deleteObjects;
-function deleteObjectsV2(credential, bucket, recursive = true) {
+async function deleteObjectsV2(credential, bucket, recursive = true) {
     setStorageCredential(credential);
     return aws_1.deleteObjectsV2.call(this, credential, bucket, recursive, 'oci');
 }
@@ -86,8 +71,8 @@ async function executeBatchQuery(credential, batch, sessionKey) {
     const caching = length > 0 && this.hasCache(batch[0].service, sessionKey);
     const cacheValue = { value: this.valueOfKey(credential, 'cache'), sessionKey };
     let client;
-    const createClient = () => createDatabaseClient.call(this, length === 1 ? credential : { ...credential });
-    const closeClient = () => client?.close();
+    const createClient = async () => createDatabaseClient.call(this, length === 1 ? credential : { ...credential });
+    const closeClient = async () => client?.close();
     for (let i = 0; i < length; ++i) {
         const item = batch[i];
         const { service, table, id, query, ignoreCache } = item;
@@ -97,11 +82,10 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         }
         const renewCache = ignoreCache === 0;
         const getCache = (value) => {
-            if (ignoreCache === 1) {
-                return;
+            if (ignoreCache !== 1) {
+                cacheValue.renewCache = renewCache;
+                return this.getQueryResult(service, credential, value, cacheValue);
             }
-            cacheValue.renewCache = renewCache;
-            return this.getQueryResult(service, credential, value, cacheValue);
         };
         let rows, queryString = caching && ignoreCache !== true || ignoreCache === false || ignoreCache === 1 || renewCache ? table + '_' : '';
         invalid: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/oci",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "description": "Oracle (OCI) cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -20,11 +20,12 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.7.0",
-    "@e-mc/module": "^0.7.0",
-    "@e-mc/types": "^0.7.0",
-    "@pi-r/aws": "^0.5.0",
-    "aws-sdk": "^2.1514.0",
-    "oracledb": "^6.2.0"
+    "@e-mc/cloud": "^0.8.0",
+    "@e-mc/module": "^0.8.0",
+    "@e-mc/types": "^0.8.0",
+    "@pi-r/aws": "^0.6.0",
+    "@pi-r/oracle": "^0.6.0",
+    "aws-sdk": "^2.1524.0",
+    "oracledb": "^6.3.0"
   }
 }