@pi-r/azure 0.5.0 → 0.6.1

package/client/index.js

@@ -60,7 +60,7 @@ async function createBucketV2(credential, bucket, access, options, service = 'az
             break;
     }
     const containerClient = createStorageClient.call(this, credential).getContainerClient(bucket);
-    const setAccessPolicy = () => containerClient.setAccessPolicy(access).catch(err => this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Unable to configure container" /* ERR_AZURE.CONFIGURE_CONTAINER */, bucket], err, { ...Cloud.LOG_CLOUD_WARN }));
+    const setAccessPolicy = async () => containerClient.setAccessPolicy(access).catch(err => this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Unable to configure container" /* ERR_AZURE.CONFIGURE_CONTAINER */, bucket], err, { ...Cloud.LOG_CLOUD_WARN }));
     if (await containerClient.exists().catch(() => false)) {
         if (access) {
             await setAccessPolicy();
@@ -95,7 +95,7 @@ async function createBucketV2(credential, bucket, access, options, service = 'az
     });
 }
 exports.createBucketV2 = createBucketV2;
-function setBucketWebsite(credential, bucket, options, service = 'azure') {
+async function setBucketWebsite(credential, bucket, options, service = 'azure') {
     const staticWebsite = { enabled: true };
     const { indexPage, indexPath, errorPath } = options;
     if ((0, types_1.isString)(indexPage)) {
@@ -118,7 +118,7 @@ function setBucketWebsite(credential, bucket, options, service = 'azure') {
     });
 }
 exports.setBucketWebsite = setBucketWebsite;
-function deleteObjects(credential, Bucket, service) {
+async function deleteObjects(credential, Bucket, service) {
     return deleteObjectsV2.call(this, credential, Bucket, true, service);
 }
 exports.deleteObjects = deleteObjects;
@@ -129,7 +129,7 @@ async function deleteObjectsV2(credential, bucket, recursive = true, service = '
             const tasks = [];
             let fileCount = 0;
             for await (const blob of containerClient.listBlobsFlat({ includeUncommitedBlobs: true })) {
-                if (!recursive && blob.name.indexOf('/') !== -1) {
+                if (!recursive && blob.name.includes('/')) {
                     continue;
                 }
                 tasks.push(containerClient.deleteBlob(blob.name, { versionId: blob.versionId }).catch(() => { --fileCount; }));
@@ -157,7 +157,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
     const cacheValue = { value: this.valueOfKey(credential, 'cache'), sessionKey };
     let client;
     const createClient = (name, table) => {
-        client || (client = createDatabaseClient.call(this, length === 1 ? credential : { ...credential }));
+        client || (client = createDatabaseClient.call(this, credential));
         return client.database(name).container(table);
     };
     const closeClient = () => client?.dispose();
@@ -168,18 +168,17 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             closeClient();
             throw (0, util_1.formatError)(item, name ? "Missing database table" /* ERR_DB.TABLE */ : "Missing database name" /* ERR_DB.NAME */);
         }
-        const renewCache = ignoreCache === 0;
         const getCache = (value) => {
-            if (ignoreCache === 1) {
-                return;
+            if (ignoreCache !== 1) {
+                cacheValue.renewCache = ignoreCache === 0;
+                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 ? name + '_' + table + '_' : '';
+        cacheValue.exclusiveOf = Array.isArray(ignoreCache) ? ignoreCache : undefined;
+        let rows, queryString = caching && ignoreCache !== true ? name + '_' + table + '_' : '';
         if (storedProcedureId && params) {
             const { options } = item;
-            if (queryString && (rows = getCache(queryString += Module.asString(partitionKey) + '_' + storedProcedureId + Module.asString(params, true) + Module.asString(options, true)))) {
+            if (queryString && (rows = getCache(queryString += Module.asString(partitionKey, true) + '_' + storedProcedureId + Module.asString(params, true) + Module.asString(options, true)))) {
                 result[i] = rows;
                 continue;
             }
@@ -191,7 +190,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         else if (id) {
             const { options } = item;
             if (queryString) {
-                queryString += Module.asString(partitionKey) + '_' + id + Module.asString(options, true);
+                queryString += Module.asString(partitionKey, true) + '_' + id + Module.asString(options, true);
                 if (!update && (rows = getCache(queryString))) {
                     result[i] = rows;
                     continue;
@@ -203,20 +202,26 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 rows = [resource];
             }
         }
-        else if (query) {
+        else {
             let { options } = item;
+            if (partitionKey) {
+                (options || (options = {})).partitionKey = partitionKey;
+            }
             if (limit > 0) {
                 (options || (options = {})).maxItemCount = limit;
             }
-            if (queryString && (rows = getCache(queryString += Module.asString(query) + Module.asString(options, true)))) {
-                result[i] = rows;
-                continue;
+            if (query || (0, types_1.isPlainObject)(options)) {
+                if (queryString && (rows = getCache(queryString += (query ? Module.asString(query, true) : '') + Module.asString(options, true)))) {
+                    result[i] = rows;
+                    continue;
+                }
+                const items = createClient(name, table).items;
+                ({ resources: rows } = await (query ? items.query(query, options).fetchAll() : items.readAll(options).fetchAll()));
+            }
+            else {
+                closeClient();
+                throw (0, util_1.formatError)(item, "Missing database query" /* ERR_DB.QUERY */);
             }
-            rows = (await createClient(name, table).items.query(query, options).fetchAll()).resources;
-        }
-        else {
-            closeClient();
-            throw (0, util_1.formatError)(item, "Missing database query" /* ERR_DB.QUERY */);
         }
         result[i] = this.setQueryResult(service, credential, queryString, rows, cacheValue);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/azure",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "description": "Azure cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -20,9 +20,9 @@
   "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",
+    "@e-mc/cloud": "^0.8.1",
+    "@e-mc/module": "^0.8.1",
+    "@e-mc/types": "^0.8.1",
     "@azure/cosmos": "^4.0.0",
     "@azure/identity": "^4.0.0",
     "@azure/storage-blob": "^12.17.0"

package/upload/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
-const fs = require("fs");
 const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
 const Module = require("@e-mc/module");
@@ -28,7 +27,7 @@ function upload(credential, service = 'azure') {
             cleanup();
             callback(err);
         };
-        const addLog = (err) => err instanceof Error && this.addLog(this.statusType.WARN, err.message, service + ': ' + bucket);
+        const addLog = (err) => err instanceof Error && this.addLog(this.statusType.WARN, err, service, bucket);
         const configBucket = admin.configBucket;
         if (!BUCKET_SESSION.has(bucket)) {
             const bucketAcl = admin.publicRead ? 'blob' : admin.acl;
@@ -84,15 +83,10 @@ function upload(credential, service = 'azure') {
         const Body = [data.buffer];
         const ContentType = [contentType];
         if (fileGroup) {
-            for (const [content, ext, localFile] of fileGroup) {
-                try {
-                    Body.push(typeof content === 'string' ? fs.readFileSync(content) : content);
-                    Key.push(ext === '.map' && localFile ? path.basename(localFile) : filename + ext);
-                }
-                catch (err) {
-                    addLog(err);
-                }
-            }
+            const [key, body, type] = (0, util_1.createKeyAndBody)(filename, fileGroup, addLog);
+            Key.push(...key);
+            Body.push(...body);
+            ContentType.push(...type);
         }
         for (let i = 0; i < Key.length; ++i) {
             const first = i === 0;