@pi-r/azure 0.3.2 → 0.5.2

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 Studio Trigger
+Copyright 2023 Wit Studio
 
 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,6 +1,6 @@
 # @pi-r/azure
 
-PEP 402 - Forever Aina
+PEP 402 - Forever Vivy
 
 ## LICENSE
 

package/client/index.js

@@ -163,7 +163,7 @@ 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" : "Missing database name");
@@ -179,7 +179,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         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 +191,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.2",
+  "version": "0.5.2",
   "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.1",
-    "@e-mc/module": "^0.6.1",
-    "@e-mc/types": "^0.6.1",
-    "@azure/cosmos": "^3.17.3",
-    "@azure/identity": "^3.4.2",
+    "@e-mc/cloud": "^0.7.2",
+    "@e-mc/module": "^0.7.2",
+    "@e-mc/types": "^0.7.2",
+    "@azure/cosmos": "^4.0.0",
+    "@azure/identity": "^4.0.1",
     "@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.message, 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, service, ["Bucket configured" + ' (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)