@pi-r/azure 0.9.3 → 0.10.0

package/client/index.js

@@ -35,7 +35,7 @@ function createStorageClient(credential) {
         if (!accountName) {
             credential.accountName = /AccountName=([^;]+);/.exec(connectionString)?.[1];
         }
-        return storage.BlobServiceClient.fromConnectionString(connectionString);
+        return storage.BlobServiceClient.fromConnectionString(connectionString, credential.clientOptions);
     }
     if (accountSas && !accountSas.startsWith('?')) {
         accountSas = '?' + accountSas;
@@ -52,7 +52,17 @@ function createStorageClient(credential) {
         }
         return new storage.BlobServiceClient(sharedAccessSignature);
     }
-    return new storage.BlobServiceClient(url, accountName && accountSas ? new storage.AnonymousCredential() : accountName && accountKey ? new storage.StorageSharedKeyCredential(accountName, accountKey) : new identity.DefaultAzureCredential());
+    let serviceCredential;
+    if (accountName && accountSas) {
+        serviceCredential = new storage.AnonymousCredential();
+    }
+    else if (accountName && accountKey) {
+        serviceCredential = new storage.StorageSharedKeyCredential(accountName, accountKey);
+    }
+    else {
+        serviceCredential = new identity.DefaultAzureCredential(credential.defaultAzureOptions);
+    }
+    return new storage.BlobServiceClient(url, serviceCredential, credential.clientOptions);
 }
 function createDatabaseClient(credential) {
     if (credential.username && credential.password && credential.tenantId && credential.clientId) {

package/download/index.js

@@ -27,11 +27,15 @@ function download(credential, service = 'azure') {
         const blockSize = (flags & 4) && (0, types_1.alignSize)(target.chunkSize, 1024) || 0;
         let diskClient, destination;
         if (blockSize >= 2097152000 && (tempDir = this.getTempDir({ uuidDir: true }))) {
-            diskClient = blobClient.downloadToFile(destination = path.join(tempDir, path.basename(target.filename || Key)), 0, undefined, { snapshot: target.versionId, abortSignal: this.signal });
+            destination = path.join(tempDir, path.basename(target.filename || Key));
+            diskClient = blobClient.downloadToFile(destination, 0, undefined, { snapshot: target.versionId, abortSignal: this.signal });
         }
-        (diskClient || blobClient.downloadToBuffer(0, 0, { ...target.options, blockSize, concurrency: blockSize > 0 ? target.chunkLimit : undefined, abortSignal: this.signal }))
+        else {
+            diskClient = blobClient.downloadToBuffer(0, 0, { ...target.options, blockSize, concurrency: blockSize > 0 ? target.chunkLimit : undefined, abortSignal: this.signal });
+        }
+        diskClient
             .then((value) => {
-            downloadResponse(null, diskClient && destination || value);
+            downloadResponse(null, destination || value);
             const deleteObject = target.deleteObject;
             if (deleteObject) {
                 const location = Cloud.joinPath(Bucket, Key);
@@ -40,9 +44,10 @@ function download(credential, service = 'azure') {
                     this.formatMessage(64, service, "Delete success", location, { ...Cloud.LOG_CLOUD_DELETE });
                 })
                     .catch((err) => {
-                    if (!(err instanceof Error && err.code === 'BlobNotFound')) {
-                        this.formatFail(64, service, ["Delete failed", location], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: !!target.active });
+                    if (err instanceof Error && err.code === 'BlobNotFound') {
+                        return;
                     }
+                    this.formatFail(64, service, ["Delete failed", location], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: !!target.active });
                 });
             }
         })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/azure",
-  "version": "0.9.3",
+  "version": "0.10.0",
   "description": "Azure cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -19,11 +19,11 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.11.4",
-    "@e-mc/module": "^0.11.4",
-    "@e-mc/types": "^0.11.4",
+    "@e-mc/cloud": "^0.12.0",
+    "@e-mc/module": "^0.12.0",
+    "@e-mc/types": "^0.12.0",
     "@azure/cosmos": "^4.3.0",
-    "@azure/identity": "4.6.0",
+    "@azure/identity": "*",
     "@azure/storage-blob": "^12.27.0"
   }
 }

package/types/index.d.ts

@@ -2,6 +2,8 @@ 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';
+import type { StoragePipelineOptions } from '@azure/storage-blob';
+import type { DefaultAzureCredentialOptions } from '@azure/identity';
 
 export type AzureStorage = CloudStorage<AzureStorageCredential, "azure" | "az">;
 
@@ -11,6 +13,8 @@ export interface AzureStorageCredential {
     accountSas?: string;
     connectionString?: string;
     sharedAccessSignature?: string;
+    defaultAzureOptions?: DefaultAzureCredentialOptions;
+    clientOptions?: StoragePipelineOptions;
 }
 
 export interface AzureDatabaseQuery<T = FeedOptions | RequestOptions, U = PatchRequestBody | PlainObject> extends CloudDatabase<string | SqlQuerySpec, T, U, unknown[], AzureDatabaseCredential> {

package/upload/index.js

@@ -174,7 +174,10 @@ function upload(credential, service = 'azure') {
                 params.concurrency = data.upload.chunkLimit;
                 uploadClient = blobClient.uploadData(Body[i], params);
             }
-            (uploadClient || blobClient.upload(Body[i], Body[i].byteLength, params))
+            else {
+                uploadClient = blobClient.upload(Body[i], Body[i].byteLength, params);
+            }
+            uploadClient
                 .then(result => {
                 let requestUrl = result._response.request.url;
                 const url = endpoint ? Cloud.joinPath(endpoint, blobName) : Cloud.isFile(requestUrl = decodeURIComponent(requestUrl), 'http/s') ? requestUrl : Cloud.joinPath(`https://${credential.accountName}.blob.core.windows.net`, bucket, blobName);