@pi-r/azure 0.7.3 → 0.8.1

package/client/index.js

@@ -1,12 +1,23 @@
 "use strict";
-exports.CLOUD_DOWNLOAD_CHUNK = exports.CLOUD_UPLOAD_CHUNK = exports.CLOUD_UPLOAD_STREAM = exports.executeBatchQuery = exports.executeQuery = exports.deleteObjectsV2 = exports.deleteObjects = exports.setBucketWebsite = exports.createBucketV2 = exports.createBucket = exports.createDatabaseClient = exports.createStorageClient = exports.validateDatabase = exports.validateStorage = void 0;
+exports.CLOUD_DOWNLOAD_CHUNK = exports.CLOUD_UPLOAD_CHUNK = exports.CLOUD_UPLOAD_STREAM = void 0;
+exports.validateStorage = validateStorage;
+exports.validateDatabase = validateDatabase;
+exports.createStorageClient = createStorageClient;
+exports.createDatabaseClient = createDatabaseClient;
+exports.createBucket = createBucket;
+exports.createBucketV2 = createBucketV2;
+exports.setBucketWebsite = setBucketWebsite;
+exports.deleteObjects = deleteObjects;
+exports.deleteObjectsV2 = deleteObjectsV2;
+exports.executeQuery = executeQuery;
+exports.executeBatchQuery = executeBatchQuery;
 const path = require("path");
 const storage = require("@azure/storage-blob");
 const cosmos = require("@azure/cosmos");
 const identity = require("@azure/identity");
-const types_1 = require("@e-mc/types");
-const util_1 = require("@e-mc/cloud/util");
 const Cloud = require("@e-mc/cloud");
+const util_1 = require("@e-mc/cloud/util");
+const types_1 = require("@e-mc/types");
 function validateStorage(credential) {
     const env = process.env;
     if (credential.accountName && credential.accountKey || credential.connectionString || credential.sharedAccessSignature || env.AZURE_TENANT_ID && env.AZURE_CLIENT_ID && env.AZURE_CLIENT_SECRET) {
@@ -14,11 +25,9 @@ function validateStorage(credential) {
     }
     return Cloud.enabled("process.env.apply") && !!((credential.connectionString = env.AZURE_STORAGE_CONNECTION_STRING) || (credential.sharedAccessSignature = env.AZURE_STORAGE_SAS_TOKEN) || (credential.accountName = env.AZURE_STORAGE_ACCOUNT) && (credential.accountKey = env.AZURE_STORAGE_KEY));
 }
-exports.validateStorage = validateStorage;
 function validateDatabase(credential, data) {
     return !!(data.name && data.table && (credential.endpoint && credential.key || credential.username && credential.password && (credential.tenantId && credential.clientId || (credential.tenantId = process.env.AZURE_TENANT_ID) && (credential.clientId = process.env.AZURE_CLIENT_ID)) || Cloud.enabled("process.env.apply") && (credential.endpoint = process.env.AZURE_COSMOS_ENDPOINT) && (credential.key = process.env.AZURE_COSMOS_KEY)));
 }
-exports.validateDatabase = validateDatabase;
 function createStorageClient(credential) {
     let { accountName, accountKey, connectionString, sharedAccessSignature } = credential;
     if (connectionString) {
@@ -41,7 +50,6 @@ function createStorageClient(credential) {
     }
     return new storage.BlobServiceClient(url, accountName && accountKey ? new storage.StorageSharedKeyCredential(accountName, accountKey) : new identity.DefaultAzureCredential());
 }
-exports.createStorageClient = createStorageClient;
 function createDatabaseClient(credential) {
     if (credential.username && credential.password && credential.tenantId && credential.clientId) {
         credential.aadCredentials = new identity.UsernamePasswordCredential(credential.username, credential.password, credential.tenantId, credential.clientId);
@@ -53,11 +61,9 @@ function createDatabaseClient(credential) {
     }
     return new cosmos.CosmosClient(credential);
 }
-exports.createDatabaseClient = createDatabaseClient;
 async function createBucket(credential, bucket, publicRead, service = 'azure') {
     return createBucketV2.call(this, credential, bucket, publicRead ? 'blob' : 'container', undefined, service);
 }
-exports.createBucket = createBucket;
 async function createBucketV2(credential, bucket, access, options, service = 'azure') {
     switch (access) {
         case 'blob':
@@ -68,7 +74,11 @@ async function createBucketV2(credential, bucket, access, options, service = 'az
             break;
     }
     const containerClient = createStorageClient.call(this, credential).getContainerClient(bucket);
-    const setAccessPolicy = async () => containerClient.setAccessPolicy(access).catch((err) => this.formatMessage(64, service, ["Unable to configure container", bucket], err, { ...Cloud.LOG_CLOUD_WARN }));
+    const setAccessPolicy = async () => {
+        return containerClient.setAccessPolicy(access).catch((err) => {
+            this.formatMessage(64, service, ["Unable to configure container", bucket], err, { ...Cloud.LOG_CLOUD_WARN });
+        });
+    };
     if (await containerClient.exists().catch(() => false)) {
         if (access) {
             await setAccessPolicy();
@@ -102,7 +112,6 @@ async function createBucketV2(credential, bucket, access, options, service = 'az
         return false;
     });
 }
-exports.createBucketV2 = createBucketV2;
 async function setBucketWebsite(credential, bucket, options, service = 'azure') {
     const staticWebsite = { enabled: true };
     const { indexPage, indexPath, errorPath } = options;
@@ -131,11 +140,9 @@ async function setBucketWebsite(credential, bucket, options, service = 'azure')
         return false;
     });
 }
-exports.setBucketWebsite = setBucketWebsite;
 async function deleteObjects(credential, Bucket, service) {
     return deleteObjectsV2.call(this, credential, Bucket, true, service);
 }
-exports.deleteObjects = deleteObjects;
 async function deleteObjectsV2(credential, bucket, recursive = true, service = 'azure') {
     const containerClient = createStorageClient.call(this, credential).getContainerClient(bucket);
     if (await containerClient.exists().catch(() => false)) {
@@ -160,11 +167,9 @@ async function deleteObjectsV2(credential, bucket, recursive = true, service = '
         }
     }
 }
-exports.deleteObjectsV2 = deleteObjectsV2;
 async function executeQuery(credential, data, sessionKey) {
     return (await executeBatchQuery.call(this, credential, [data], sessionKey))[0] || [];
 }
-exports.executeQuery = executeQuery;
 async function executeBatchQuery(credential, batch, sessionKey) {
     const length = batch.length;
     const result = new Array(length);
@@ -178,22 +183,16 @@ async function executeBatchQuery(credential, batch, sessionKey) {
     const closeClient = () => client?.dispose();
     for (let i = 0; i < length; ++i) {
         const item = batch[i];
-        const { service, name, table, id, query, storedProcedureId, partitionKey = null, params, limit = 0, update, ignoreCache } = item;
+        const { service, name, table, id, query, storedProcedureId, partitionKey = null, params, limit = 0, ignoreCache } = item;
         if (!name || !table) {
             closeClient();
             throw (0, util_1.formatError)(item, name ? "Missing database table" : "Missing database name");
         }
-        const getCache = (value) => {
-            if (ignoreCache !== 1) {
-                cacheValue.renewCache = ignoreCache === 0;
-                return this.getQueryResult(service, credential, value, cacheValue);
-            }
-        };
         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 += (partitionKey ? Cloud.asString(partitionKey, true) : '') + '_' + storedProcedureId + '_' + Cloud.asString(params, true) + Cloud.asString(options, true)))) {
+            if (queryString && (rows = this.getCacheResult(service, credential, queryString += (partitionKey ? Cloud.asString(partitionKey, true) : '') + '_' + storedProcedureId + '_' + Cloud.asString(params, true) + Cloud.asString(options, true), cacheValue, ignoreCache))) {
                 result[i] = rows;
                 continue;
             }
@@ -203,10 +202,10 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             }
         }
         else if (id) {
-            const { options } = item;
+            const { update, options } = item;
             if (queryString) {
                 queryString += (partitionKey ? Cloud.asString(partitionKey, true) : '') + '_' + id + '_' + Cloud.asString(options, true);
-                if (!update && (rows = getCache(queryString))) {
+                if (!update && (rows = this.getCacheResult(service, credential, queryString, cacheValue, ignoreCache))) {
                     result[i] = rows;
                     continue;
                 }
@@ -218,19 +217,25 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             }
         }
         else {
-            let { options } = item;
+            const { update, options = {} } = item;
             if (partitionKey) {
-                (options ||= {}).partitionKey = partitionKey;
+                options.partitionKey = partitionKey;
             }
             if (limit > 0) {
-                (options ||= {}).maxItemCount = limit;
+                options.maxItemCount = limit;
             }
-            if (query || (0, types_1.isPlainObject)(options)) {
-                if (queryString && (rows = getCache(queryString += (query ? Cloud.asString(query, true) : '') + Cloud.asString(options, true)))) {
-                    result[i] = rows;
-                    continue;
+            if (query || Object.keys(options).length > 0) {
+                if (queryString) {
+                    queryString += (query ? Cloud.asString(query, true) : '') + Cloud.asString(options, true);
+                    if (!update && (rows = this.getCacheResult(service, credential, queryString, cacheValue, ignoreCache))) {
+                        result[i] = rows;
+                        continue;
+                    }
                 }
                 const items = createClient(name, table).items;
+                if (update) {
+                    await items.upsert(update, { accessCondition: options.accessCondition, sessionToken: options.sessionToken, initialHeaders: options.initialHeaders, priorityLevel: options.priorityLevel });
+                }
                 ({ resources: rows } = await (query ? items.query(query, options).fetchAll() : items.readAll(options).fetchAll()));
             }
             else {
@@ -243,7 +248,6 @@ async function executeBatchQuery(credential, batch, sessionKey) {
     closeClient();
     return result;
 }
-exports.executeBatchQuery = executeBatchQuery;
 exports.CLOUD_UPLOAD_STREAM = true;
 exports.CLOUD_UPLOAD_CHUNK = true;
 exports.CLOUD_DOWNLOAD_CHUNK = true;

package/download/index.js

@@ -3,7 +3,7 @@ const types_1 = require("@e-mc/types");
 const path = require("path");
 const Cloud = require("@e-mc/cloud");
 const client_1 = require("@pi-r/azure");
-module.exports = function download(credential, service = 'azure') {
+function download(credential, service = 'azure') {
     const blobServiceClient = client_1.createStorageClient.call(this, credential);
     return (data, callback) => {
         const { bucket: Bucket, download: target } = data;
@@ -16,7 +16,9 @@ module.exports = function download(credential, service = 'azure') {
         const downloadResponse = (err, url) => {
             callback(err, url);
             if (tempDir) {
-                queueMicrotask(() => Cloud.removeDir(tempDir));
+                queueMicrotask(() => {
+                    Cloud.removeDir(tempDir);
+                });
             }
         };
         const { flags = 0 } = target;
@@ -44,6 +46,9 @@ module.exports = function download(credential, service = 'azure') {
                 });
             }
         })
-            .catch((err) => downloadResponse(err));
+            .catch((err) => {
+            downloadResponse(err);
+        });
     };
-};
+}
+module.exports = download;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/azure",
-  "version": "0.7.3",
+  "version": "0.8.1",
   "description": "Azure cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -20,11 +20,11 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.9.6",
-    "@e-mc/module": "^0.9.6",
-    "@e-mc/types": "^0.9.6",
+    "@e-mc/cloud": "^0.10.0",
+    "@e-mc/module": "^0.10.0",
+    "@e-mc/types": "^0.10.0",
     "@azure/cosmos": "^4.0.0",
-    "@azure/identity": "^4.4.0",
+    "@azure/identity": "^4.4.1",
     "@azure/storage-blob": "^12.24.0"
   }
 }

package/types/index.d.ts

@@ -11,7 +11,7 @@ export interface AzureStorageCredential {
     sharedAccessSignature?: string;
 }
 
-export interface AzureDatabaseQuery<T = FeedOptions | RequestOptions> extends CloudDatabase<string | SqlQuerySpec, T, PatchRequestBody, unknown[], AzureDatabaseCredential> {
+export interface AzureDatabaseQuery<T = FeedOptions | RequestOptions, U = PatchRequestBody | PlainObject> extends CloudDatabase<string | SqlQuerySpec, T, U, unknown[], AzureDatabaseCredential> {
     source: "cloud";
     service: "azure" | "az";
     partitionKey?: PartitionKey;

package/upload/index.js

@@ -2,14 +2,14 @@
 const path = require("path");
 const fs = require("fs");
 const stream = require("stream");
+const Cloud = require("@e-mc/cloud");
 const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
-const Cloud = require("@e-mc/cloud");
 const client_1 = require("@pi-r/azure");
 const BUCKET_SESSION = new Set();
 const BUCKET_RESPONSE = {};
 const getBucketKey = (credential, bucket, acl = '') => Cloud.asString(credential, true) + bucket + '_' + acl;
-module.exports = function upload(credential, service = 'azure') {
+function upload(credential, service = 'azure') {
     const blobServiceClient = client_1.createStorageClient.call(this, credential);
     return async (data, callback) => {
         const { bucket, localUri } = data;
@@ -26,7 +26,11 @@ module.exports = function upload(credential, service = 'azure') {
             cleanup();
             callback(err);
         };
-        const addLog = (err) => err instanceof Error && this.addLog(this.statusType.WARN, err, service, bucket);
+        const addLog = (err) => {
+            if (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;
@@ -44,7 +48,9 @@ module.exports = function upload(credential, service = 'azure') {
             }
             try {
                 if (this.hasCoerce(service, 'options')) {
-                    retentionPolicy.forEach(policy => (0, types_1.coerceObject)(policy));
+                    for (const policy of retentionPolicy) {
+                        (0, types_1.coerceObject)(policy);
+                    }
                 }
             }
             catch {
@@ -54,7 +60,9 @@ module.exports = function upload(credential, service = 'azure') {
                 const { expiresOn, startsOn, permissions } = retentionPolicy[0].accessPolicy;
                 this.formatMessage(64, service, ["Bucket configured" + ' (retention policy)', bucket], expiresOn ? expiresOn.toLocaleString() + ' (expires)' : startsOn ? startsOn.toLocaleString() + ' (starts)' : permissions, { ...Cloud.LOG_CLOUD_COMMAND });
             })
-                .catch((err) => addLog(err));
+                .catch((err) => {
+                addLog(err);
+            });
         }
         if (!overwrite) {
             try {
@@ -188,4 +196,5 @@ module.exports = function upload(credential, service = 'azure') {
             });
         }
     };
-};
+}
+module.exports = upload;