@pi-r/azure 0.8.3 → 0.9.0

package/LICENSE

@@ -1,7 +1,7 @@
-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:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+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:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -4,4 +4,4 @@ https://e-mc.readthedocs.io/en/latest/cloud/azure.html
 
 ### LICENSE
 
-MIT
+MIT

package/client/index.js

@@ -9,15 +9,16 @@ exports.createBucketV2 = createBucketV2;
 exports.setBucketWebsite = setBucketWebsite;
 exports.deleteObjects = deleteObjects;
 exports.deleteObjectsV2 = deleteObjectsV2;
+exports.deleteObjectsV3 = deleteObjectsV3;
 exports.executeQuery = executeQuery;
 exports.executeBatchQuery = executeBatchQuery;
-const path = require("path");
+const path = require("node:path");
 const storage = require("@azure/storage-blob");
 const cosmos = require("@azure/cosmos");
 const identity = require("@azure/identity");
 const Cloud = require("@e-mc/cloud");
-const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
+const util_1 = require("@e-mc/cloud/util");
 function validateStorage(credential) {
     const env = process.env;
     if (credential.accountName && (credential.accountKey || credential.accountSas) || credential.connectionString || credential.sharedAccessSignature || env.AZURE_TENANT_ID && env.AZURE_CLIENT_ID && env.AZURE_CLIENT_SECRET) {
@@ -143,25 +144,34 @@ async function setBucketWebsite(credential, bucket, options, service = 'azure')
         return false;
     });
 }
-async function deleteObjects(credential, Bucket, service) {
-    return deleteObjectsV2.call(this, credential, Bucket, true, service);
+async function deleteObjects(credential, bucket, service, sdk, recursive = true) {
+    return deleteObjectsV2.call(this, credential, bucket, recursive, service);
+}
+async function deleteObjectsV2(credential, bucket, recursive = true, service) {
+    return deleteObjectsV3.call(this, credential, bucket, { recursive }, service);
 }
-async function deleteObjectsV2(credential, bucket, recursive = true, service = 'azure') {
+async function deleteObjectsV3(credential, bucket, options = {}, service = 'azure') {
     const containerClient = createStorageClient.call(this, credential).getContainerClient(bucket);
     if (await containerClient.exists().catch(() => false)) {
         try {
+            options = { ...options };
+            let recursive = true;
+            if ('recursive' in options) {
+                recursive = options.recursive;
+                delete options.recursive;
+            }
+            options.includeUncommitedBlobs ??= true;
             const tasks = [];
             let fileCount = 0;
-            for await (const blob of containerClient.listBlobsFlat({ includeUncommitedBlobs: true })) {
-                if (!recursive && blob.name.includes('/')) {
-                    continue;
+            for await (const blob of containerClient.listBlobsFlat(options)) {
+                if (recursive || !blob.name.includes('/')) {
+                    tasks.push(containerClient.deleteBlob(blob.name, { versionId: blob.versionId }).catch(() => {
+                        --fileCount;
+                    }));
                 }
-                tasks.push(containerClient.deleteBlob(blob.name, { versionId: blob.versionId }).catch(() => {
-                    --fileCount;
-                }));
             }
             fileCount = tasks.length;
-            return this.allSettled(tasks, ["Unable to delete blob", bucket], 64).then(() => {
+            await this.allSettled(tasks, ["Unable to delete blob", bucket], 64).then(() => {
                 this.formatMessage(64, service, ['Container emptied' + (recursive ? ' (recursive)' : ''), bucket], fileCount + ' files', { ...Cloud.LOG_CLOUD_COMMAND });
             });
         }

package/download/index.js

@@ -1,7 +1,7 @@
 "use strict";
-const types_1 = require("@e-mc/types");
-const path = require("path");
+const path = require("node:path");
 const Cloud = require("@e-mc/cloud");
+const types_1 = require("@e-mc/types");
 const client_1 = require("@pi-r/azure");
 function download(credential, service = 'azure') {
     const blobServiceClient = client_1.createStorageClient.call(this, credential);
@@ -46,9 +46,7 @@ function download(credential, service = 'azure') {
                 });
             }
         })
-            .catch((err) => {
-            downloadResponse(err);
-        });
+            .catch(downloadResponse);
     };
 }
 module.exports = download;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/azure",
-  "version": "0.8.3",
+  "version": "0.9.0",
   "description": "Azure cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -13,18 +13,17 @@
   },
   "keywords": [
     "squared",
-    "e-mc",
-    "squared-functions"
+    "e-mc"
   ],
   "author": "An Pham <anpham6@gmail.com>",
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.10.3",
-    "@e-mc/module": "^0.10.3",
-    "@e-mc/types": "^0.10.3",
-    "@azure/cosmos": "^4.1.1",
-    "@azure/identity": "^4.4.1",
-    "@azure/storage-blob": "^12.25.0"
+    "@e-mc/cloud": "^0.11.0",
+    "@e-mc/module": "^0.11.0",
+    "@e-mc/types": "^0.11.0",
+    "@azure/cosmos": "^4.2.0",
+    "@azure/identity": "*",
+    "@azure/storage-blob": "^12.26.0"
   }
 }

package/types/index.d.ts

@@ -1,4 +1,5 @@
 import type { CloudDatabase, CloudStorage } from '@e-mc/types/lib/cloud';
+import type { AuthValue } from '@e-mc/types/lib/http';
 
 import type { CosmosClientOptions, FeedOptions, PartitionKey, PatchRequestBody, RequestOptions, SqlQuerySpec } from '@azure/cosmos';
 

package/upload/index.js

@@ -1,10 +1,10 @@
 "use strict";
-const path = require("path");
-const fs = require("fs");
-const stream = require("stream");
+const path = require("node:path");
+const fs = require("node:fs");
+const stream = require("node:stream");
 const Cloud = require("@e-mc/cloud");
-const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
+const util_1 = require("@e-mc/cloud/util");
 const client_1 = require("@pi-r/azure");
 const BUCKET_SESSION = new Set();
 const BUCKET_RESPONSE = {};
@@ -60,15 +60,13 @@ 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(addLog);
         }
         if (!overwrite) {
             try {
                 const current = filename;
                 const next = (0, util_1.generateFilename)(filename);
-                let i = 0, exists;
+                let i = 0, exists = false;
                 do {
                     if (i > 0) {
                         [filename, exists] = next(i);