@pi-r/oci 0.6.2 → 0.6.5

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 An Pham
+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:
 

package/README.md

@@ -1,7 +1,10 @@
-### @pi-r/oci
+# @pi-r/oci
 
-https://e-mc.readthedocs.io/en/latest/cloud/oci.html
+## Documentation
 
-### LICENSE
+- [E-mc](https://e-mc.readthedocs.io/en/latest/cloud/oci.html)
+- [squared](https://squared.readthedocs.io)
+
+## LICENSE
 
 MIT

package/client/index.js

@@ -88,7 +88,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             if (id) {
                 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 update = item.update;
                 if (queryString) {
@@ -101,7 +101,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();
@@ -140,36 +140,60 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 }
             }
             else if (query) {
-                let maxRows = typeof item.limit === 'number' ? Math.max(item.limit, 0) : undefined;
+                let maxRows = typeof item.limit === 'number' ? item.limit : NaN;
                 if ((0, types_1.isPlainObject)(query)) {
                     if (!table) {
                         closeClient();
-                        throw (0, util_1.formatError)(item, "Missing database table" /* ERR_DB.TABLE */);
+                        throw (0, util_1.formatError)(item, "Missing database table");
                     }
-                    if (queryString && (rows = getCache(queryString += Module.asString(query, true) + (maxRows ? maxRows : '')))) {
+                    if (queryString && (rows = getCache(queryString += Module.asString(query, true) + (maxRows > 0 ? maxRows : '')))) {
                         result[i] = rows;
                         continue;
                     }
                     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) {
-                        operation = operation.limit(maxRows);
+                    const tryQuery = async () => {
+                        let operation = db.find().filter(query);
+                        if (maxRows > 0) {
+                            operation = operation.limit(maxRows);
+                        }
+                        return (await operation.getDocuments()).map(doc => doc.getContent());
+                    };
+                    try {
+                        rows = await tryQuery();
+                    }
+                    catch (err) {
+                        switch (err instanceof Error && err.code) {
+                            case 'ORA-40820':
+                                if (maxRows > 0) {
+                                    const limit = maxRows;
+                                    maxRows = 0;
+                                    rows = await tryQuery();
+                                    if (limit > rows.length) {
+                                        rows = rows.slice(0, limit);
+                                    }
+                                    this.addLog(types_1.STATUS_TYPE.WARN, err, service, Module.asString(query, true));
+                                    break;
+                                }
+                            default:
+                                throw err;
+                        }
                     }
-                    rows = (await operation.getDocuments()).map(doc => doc.getContent());
                 }
                 else {
                     const { params, options } = item;
-                    maxRows || (maxRows = options?.maxRows);
-                    if (queryString && (rows = getCache(queryString += query + Module.asString(params, true) + Module.asString(options, true) + (maxRows ? maxRows : '')))) {
+                    if (options?.maxRows && isNaN(maxRows)) {
+                        maxRows = options.maxRows;
+                    }
+                    if (queryString && (rows = getCache(queryString += query + Module.asString(params, true) + Module.asString(options, true) + (maxRows > 0 ? maxRows : '')))) {
                         result[i] = rows;
                         continue;
                     }
                     client || (client = await createClient());
-                    const executeOptions = { ...options, outFormat: 4002 /* OUT_FORMAT.OBJECT */, maxRows, resultSet: false, autoCommit: true };
+                    const executeOptions = { ...options, outFormat: 4002, maxRows, resultSet: false, autoCommit: true };
                     if (item.streamRow) {
                         rows = [];
                         await new Promise((resolve, reject) => {
@@ -194,7 +218,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                         })
                             .catch(err => {
                             closeClient();
-                            throw (0, util_1.formatError)(item, err instanceof Error ? err.message : "Missing database query" /* ERR_DB.QUERY */);
+                            throw (0, util_1.formatError)(item, err instanceof Error ? err.message : "Missing database query");
                         });
                     }
                     else {
@@ -204,7 +228,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             }
             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.6.2",
+  "version": "0.6.5",
   "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,12 +20,12 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.8.2",
-    "@e-mc/module": "^0.8.2",
-    "@e-mc/types": "^0.8.2",
-    "@pi-r/aws": "^0.6.2",
-    "@pi-r/oracle": "^0.6.2",
-    "aws-sdk": "^2.1545.0",
+    "@e-mc/cloud": "^0.8.6",
+    "@e-mc/module": "^0.8.6",
+    "@e-mc/types": "^0.8.6",
+    "@pi-r/aws": "^0.6.5",
+    "@pi-r/oracle": "^0.6.5",
+    "aws-sdk": "^2.1570.0",
     "oracledb": "^6.3.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;