@pi-r/oci 0.3.0 → 0.3.3

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 An Pham
+Copyright 2023 Lisa Mishima
 
 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/oci
+# @pi-r/oci
 
-### LICENSE
+PEP 402 - Forever
+
+## LICENSE
 
 MIT

package/client/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeBatchQuery = exports.executeQuery = exports.deleteObjectsV2 = exports.deleteObjects = exports.setBucketWebsite = exports.setBucketPolicy = exports.createBucketV2 = exports.createBucket = exports.createDatabaseClient = exports.setStorageCredential = exports.validateDatabase = exports.validateStorage = void 0;
+const oracledb = require("oracledb");
 const types_1 = require("@e-mc/types");
 const aws_1 = require("@pi-r/aws");
 const util_1 = require("@e-mc/cloud/util");
@@ -14,29 +15,23 @@ function validateDatabase(credential, data) {
 }
 exports.validateDatabase = validateDatabase;
 function setStorageCredential(credential) {
-    if (credential.endpoint) {
-        credential.region || (credential.region = /([^.]+)\.oraclecloud\.com$/.exec(credential.endpoint)?.[1]);
+    const { endpoint, namespace, region } = credential;
+    if (endpoint) {
+        credential.region || (credential.region = /([^.]+)\.oraclecloud\.com$/.exec(endpoint)?.[1]);
     }
-    else {
-        credential.endpoint || (credential.endpoint = `https://${credential.namespace}.compat.objectstorage.${credential.region}.oraclecloud.com`);
+    else if (namespace && region) {
+        credential.endpoint || (credential.endpoint = `https://${namespace}.compat.objectstorage.${region}.oraclecloud.com`);
     }
     credential.s3ForcePathStyle = true;
     credential.signatureVersion = 'v4';
 }
 exports.setStorageCredential = setStorageCredential;
 function createDatabaseClient(credential) {
-    try {
-        if (credential.username) {
-            credential.user || (credential.user = credential.username);
-            delete credential.username;
-        }
-        const { getConnection } = require('oracledb');
-        return getConnection(credential);
-    }
-    catch (err) {
-        this.checkPackage(err, 'oracledb', { passThrough: true });
-        throw err;
+    if (credential.username) {
+        credential.user || (credential.user = credential.username);
+        delete credential.username;
     }
+    return oracledb.getConnection(credential);
 }
 exports.createDatabaseClient = createDatabaseClient;
 function createBucket(credential, bucket, publicRead) {
@@ -81,7 +76,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         const { service, table, id, query, ignoreCache } = item;
         if (!table) {
             closeClient();
-            throw (0, util_1.formatError)(item, "Missing database table" /* ERR_DB.TABLE */);
+            throw (0, util_1.formatError)(item, "Missing database table");
         }
         const renewCache = ignoreCache === 0;
         const getCache = (value) => {
@@ -105,7 +100,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 const db = await (client || (client = await createClient())).getSodaDatabase().openCollection(table);
                 if (!db) {
                     closeClient();
-                    throw (0, util_1.formatError)(item, "Missing database table" /* ERR_DB.TABLE */);
+                    throw (0, util_1.formatError)(item, "Missing database table");
                 }
                 const row = db.find().key(id);
                 let document = await row.getOne();
@@ -153,7 +148,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                     const db = await (client || (client = await createClient())).getSodaDatabase().openCollection(table);
                     if (!db) {
                         closeClient();
-                        throw (0, util_1.formatError)(item, "Missing database table" /* ERR_DB.TABLE */);
+                        throw (0, util_1.formatError)(item, "Missing database table");
                     }
                     let operation = db.find().filter(query);
                     if (maxRows) {
@@ -167,12 +162,12 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                         result[i] = rows;
                         continue;
                     }
-                    ({ rows } = await (client || (client = await createClient())).execute(query, params || [], { ...options, outFormat: 4002 /* OUT_FORMAT.OBJECT */, maxRows, resultSet: false, autoCommit: true }));
+                    ({ rows } = await (client || (client = await createClient())).execute(query, params || [], { ...options, outFormat: 4002, maxRows, resultSet: false, autoCommit: true }));
                 }
             }
             else {
                 closeClient();
-                throw (0, util_1.formatError)(item, "Missing database query" /* ERR_DB.QUERY */);
+                throw (0, util_1.formatError)(item, "Missing database query");
             }
         }
         result[i] = this.setQueryResult(service, credential, queryString, rows, cacheValue);

package/download/index.js

@@ -1,9 +1,8 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const client_1 = require("../client");
+const client_1 = require("@pi-r/oci");
 function download(credential, service = 'oci') {
     (0, client_1.setStorageCredential)(credential);
-    return require('../../aws/download').call(this, credential, service);
+    return require("@pi-r/aws/download").call(this, credential, service);
 }
 
 module.exports = download;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/oci",
-  "version": "0.3.0",
+  "version": "0.3.3",
   "description": "Oracle (OCI) cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -8,7 +8,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/anpham6/pi-r.git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
     "directory": "src/cloud/oci"
   },
   "keywords": [
@@ -20,11 +20,11 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.5.3",
-    "@e-mc/module": "^0.5.3",
-    "@e-mc/types": "^0.5.3",
-    "@pi-r/aws": "^0.2.2",
-    "aws-sdk": "^2.1385.0",
-    "oracledb": "^6.0.0"
+    "@e-mc/cloud": "^0.6.2",
+    "@e-mc/module": "^0.6.2",
+    "@e-mc/types": "^0.6.2",
+    "@pi-r/aws": "^0.3.3",
+    "aws-sdk": "^2.1591.0",
+    "oracledb": "^6.4.0"
   }
 }

package/upload/index.js

@@ -1,9 +1,8 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const client_1 = require("../client");
+const client_1 = require("@pi-r/oci");
 function upload(credential, service = 'oci') {
     (0, client_1.setStorageCredential)(credential);
-    return require('../../aws/upload').call(this, credential, service);
+    return require("@pi-r/aws/upload").call(this, credential, service);
 }
 
 module.exports = upload;