@pi-r/azure 0.3.0 → 0.6.0

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; }));
@@ -163,23 +163,22 @@ 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, params, limit = 0, update, ignoreCache } = item;
+        const { service, name, table, id, query, storedProcedureId, partitionKey = null, params, limit = 0, update, ignoreCache } = item;
         if (!name || !table) {
             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 = renewCache;
+                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 + '_' : '';
         if (storedProcedureId && params) {
             const { options } = item;
-            if (queryString && (rows = getCache(queryString += (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 += (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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/azure",
-  "version": "0.3.0",
+  "version": "0.6.0",
   "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.6.0",
-    "@e-mc/module": "^0.6.0",
-    "@e-mc/types": "^0.6.0",
-    "@azure/cosmos": "^3.17.3",
-    "@azure/identity": "^3.2.4",
-    "@azure/storage-blob": "^12.15.0"
+    "@e-mc/cloud": "^0.8.0",
+    "@e-mc/module": "^0.8.0",
+    "@e-mc/types": "^0.8.0",
+    "@azure/cosmos": "^4.0.0",
+    "@azure/identity": "^4.0.0",
+    "@azure/storage-blob": "^12.17.0"
   }
 }

package/upload/index.js

@@ -15,7 +15,7 @@ function upload(credential, service = 'azure') {
     return async (data, callback) => {
         var _a, _b;
         const { bucket, localUri } = data;
-        const { pathname = '', fileGroup, contentType, metadata, endpoint, admin = {}, overwrite, options } = data.upload;
+        const { pathname = '', fileGroup, contentType, metadata, tags, endpoint, admin = {}, overwrite, options } = data.upload;
         const containerClient = blobServiceClient.getContainerClient(bucket);
         let filename = data.upload.filename || path.basename(localUri), bucketKey;
         const cleanup = () => {
@@ -28,15 +28,29 @@ function upload(credential, service = 'azure') {
             cleanup();
             callback(err);
         };
+        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;
-            const response = BUCKET_RESPONSE[_a = bucketKey = getBucketKey(credential, bucket, bucketAcl)] || (BUCKET_RESPONSE[_a] = client_1.createBucketV2.call(this, credential, bucket, bucketAcl, admin.configBucket?.create));
+            const response = BUCKET_RESPONSE[_a = bucketKey = getBucketKey(credential, bucket, bucketAcl)] || (BUCKET_RESPONSE[_a] = client_1.createBucketV2.call(this, credential, bucket, bucketAcl, configBucket?.create));
             if (!await response) {
                 errorResponse(null);
                 return;
             }
             BUCKET_SESSION.add(bucket);
         }
+        let retentionPolicy = configBucket?.retentionPolicy;
+        if (retentionPolicy) {
+            if (!Array.isArray(retentionPolicy)) {
+                retentionPolicy = [retentionPolicy];
+            }
+            containerClient.setAccessPolicy('container', retentionPolicy)
+                .then(() => {
+                const { expiresOn, startsOn, permissions } = retentionPolicy[0].accessPolicy;
+                this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket configured" /* VAL_CLOUD.CONFIGURE_BUCKET */ + ' (retention policy)', bucket], expiresOn ? expiresOn.toLocaleString() + ' (expires)' : startsOn ? startsOn.toLocaleString() + ' (starts)' : permissions, { ...Cloud.LOG_CLOUD_COMMAND });
+            })
+                .catch(err => addLog(err));
+        }
         if (!overwrite) {
             try {
                 const current = filename;
@@ -69,7 +83,6 @@ function upload(credential, service = 'azure') {
         const Key = [filename];
         const Body = [data.buffer];
         const ContentType = [contentType];
-        const addLog = (err) => err instanceof Error && this.addLog(this.statusType.WARN, err.message, service + ': ' + bucket);
         if (fileGroup) {
             for (const [content, ext, localFile] of fileGroup) {
                 try {
@@ -91,8 +104,13 @@ function upload(credential, service = 'azure') {
             }
             const blobName = Module.joinPath(pathname, Key[i]);
             const params = { ...options, abortSignal: this.signal };
-            if (first && metadata) {
-                params.metadata = metadata;
+            if (first) {
+                if ((0, types_1.isPlainObject)(metadata)) {
+                    params.metadata = metadata;
+                }
+                if ((0, types_1.isPlainObject)(tags)) {
+                    params.tags = tags;
+                }
             }
             (_b = (params.blobHTTPHeaders || (params.blobHTTPHeaders = {}))).blobContentType || (_b.blobContentType = ContentType[i]);
             containerClient.getBlockBlobClient(blobName).upload(Body[i], Body[i].byteLength, params)