@pi-r/oci 0.8.3 → 0.9.1

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.
-
-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.
+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.
+
+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

@@ -4,4 +4,4 @@ https://e-mc.readthedocs.io/en/latest/cloud/oci.html
 
 ### LICENSE
 
-MIT
+MIT

package/client/index.js

@@ -9,19 +9,20 @@ exports.setBucketPolicy = setBucketPolicy;
 exports.setBucketWebsite = setBucketWebsite;
 exports.deleteObjects = deleteObjects;
 exports.deleteObjectsV2 = deleteObjectsV2;
+exports.deleteObjectsV3 = deleteObjectsV3;
 exports.executeQuery = executeQuery;
 exports.executeBatchQuery = executeBatchQuery;
 const oracledb = require("oracledb");
 const Cloud = require("@e-mc/cloud");
-const util_1 = require("@e-mc/cloud/util");
 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 oracle = require("@pi-r/oracle");
+const aws = require("@pi-r/aws");
 function validateStorage(credential) {
     return !!(credential.accessKeyId && credential.secretAccessKey && (credential.region && credential.namespace || credential.endpoint));
 }
 function validateDatabase(credential, data) {
-    return !!(data.table && (credential.user && credential.password && (credential.connectString || credential.connectionString) || credential.poolAlias || (0, oracle_1.getConfigObject)(credential.connectionString || credential.connectionString)));
+    return !!(data.table && (credential.user && credential.password && (credential.connectString || credential.connectionString) || credential.poolAlias || oracle.getConfigObject(credential.connectionString || credential.connectionString)));
 }
 function setStorageCredential(credential) {
     const { endpoint, namespace, region } = credential;
@@ -38,27 +39,30 @@ function setStorageCredential(credential) {
     credential.signatureVersion = 'v4';
 }
 async function createDatabaseClient(credential) {
-    oracle_1.initOracleClient.call(this, credential, this.logType.CLOUD);
+    oracle.initOracleClient.call(this, credential, this.logType.CLOUD);
     return oracledb.getConnection(credential);
 }
 async function createBucket(credential, bucket, publicRead) {
-    return aws_1.createBucketV2.call(this, credential, bucket, publicRead ? 'public-read' : undefined, undefined, 'oci');
+    return createBucketV2.call(this, credential, bucket, publicRead ? 'public-read' : undefined);
 }
 async function createBucketV2(credential, bucket, ACL, options) {
-    return aws_1.createBucketV2.call(this, credential, bucket, ACL, options, 'oci');
+    return aws.createBucketV2.call(this, credential, bucket, ACL, options, 'oci');
 }
 async function setBucketPolicy(credential, bucket, options) {
-    return aws_1.setBucketPolicy.call(this, credential, bucket, options, 'oci');
+    return aws.setBucketPolicy.call(this, credential, bucket, options, 'oci');
 }
 async function setBucketWebsite(credential, bucket, options) {
-    return aws_1.setBucketWebsite.call(this, credential, bucket, options, 'oci');
+    return aws.setBucketWebsite.call(this, credential, bucket, options, 'oci');
+}
+async function deleteObjects(credential, Bucket, service, sdk, recursive = true) {
+    return deleteObjectsV2.call(this, credential, Bucket, recursive);
 }
-async function deleteObjects(credential, bucket) {
-    return deleteObjectsV2.call(this, credential, bucket, true);
+async function deleteObjectsV2(credential, Bucket, recursive = true) {
+    return deleteObjectsV3.call(this, credential, Bucket, { recursive, Bucket });
 }
-async function deleteObjectsV2(credential, bucket, recursive = true) {
+async function deleteObjectsV3(credential, bucket, options = {}) {
     setStorageCredential(credential);
-    return aws_1.deleteObjectsV2.call(this, credential, bucket, recursive, 'oci');
+    return aws.deleteObjectsV3.call(this, credential, bucket, options, 'oci');
 }
 async function executeQuery(credential, data, sessionKey) {
     return (await executeBatchQuery.call(this, credential, [data], sessionKey))[0] || [];
@@ -208,7 +212,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                     if (item.streamRow) {
                         rows = [];
                         await new Promise((resolve, reject) => {
-                            let error;
+                            let error = false;
                             const stream = client.queryStream(query, params || [], executeOptions);
                             stream
                                 .on('data', row => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/oci",
-  "version": "0.8.3",
+  "version": "0.9.1",
   "description": "Oracle (OCI) cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -13,19 +13,18 @@
   },
   "keywords": [
     "squared",
-    "e-mc",
-    "squared-functions"
+    "e-mc"
   ],
   "author": "An Pham <anpham6@gmail.com>",
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.10.3",
-    "@e-mc/module": "^0.10.3",
-    "@e-mc/types": "^0.10.3",
-    "@pi-r/aws": "^0.8.3",
-    "@pi-r/oracle": "^0.8.3",
-    "aws-sdk": "^2.1691.0",
-    "oracledb": "^6.6.0"
+    "@e-mc/cloud": "^0.11.2",
+    "@e-mc/module": "^0.11.2",
+    "@e-mc/types": "^0.11.2",
+    "@pi-r/aws": "^0.9.1",
+    "@pi-r/oracle": "^0.9.1",
+    "aws-sdk": "^2.1692.0",
+    "oracledb": "^6.7.1"
   }
 }

package/types/index.d.ts

@@ -13,7 +13,7 @@ export interface OCIStorageCredential extends ConfigurationOptions {
 export interface OCIDatabaseQuery extends Omit<CloudDatabase<PlainObject | string, ExecuteOptions, StandardMap, BindParameters, OCIDatabaseCredential>, "id"> {
     source: "cloud";
     service: "oci";
-    id?: ArrayOf<string>;
+    id?: string | string[];
     updateType?: 0 | 1 | 2;
     streamRow?: boolean;
 }