@pi-r/azure 0.10.1 → 0.10.3

package/client/index.js

@@ -170,6 +170,7 @@ async function deleteObjectsV3(credential, bucket, options = {}, service = 'azur
                 recursive = options.recursive;
                 delete options.recursive;
             }
+            options.abortSignal = this.signal;
             options.includeUncommitedBlobs ??= true;
             const tasks = [];
             let fileCount = 0;
@@ -245,13 +246,20 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         }
         else {
             const { update, options = {} } = item;
-            if (partitionKey) {
-                options.partitionKey = partitionKey;
+            const items = createClient(name, table).items;
+            if (Array.isArray(params)) {
+                await items.executeBulkOperations(params, options);
             }
-            if (limit > 0) {
-                options.maxItemCount = limit;
+            if (update) {
+                await items.upsert(update, { accessCondition: options.accessCondition, sessionToken: options.sessionToken, initialHeaders: options.initialHeaders, priorityLevel: options.priorityLevel, abortSignal: this.signal });
             }
             if (query || Object.keys(options).length > 0) {
+                if (partitionKey) {
+                    options.partitionKey = partitionKey;
+                }
+                if (limit > 0) {
+                    options.maxItemCount = limit;
+                }
                 if (queryString) {
                     queryString += (query ? Cloud.asString(query, true) : '') + Cloud.asString(options, true);
                     if (!update && (rows = this.getCacheResult(service, credential, queryString, cacheValue, ignoreCache))) {
@@ -259,11 +267,13 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                         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, abortSignal: this.signal });
+                if (query) {
+                    const iter = items.query(query, attachSignal(options));
+                    ({ resources: rows } = await (options.maxItemCount ? iter.fetchNext() : iter.fetchAll()));
+                }
+                else {
+                    ({ resources: rows } = await items.readAll(attachSignal(options)).fetchAll());
                 }
-                ({ resources: rows } = await (query ? items.query(query, attachSignal(options)).fetchAll() : items.readAll(attachSignal(options)).fetchAll()));
             }
             else {
                 closeClient();

package/download/index.js

@@ -12,21 +12,13 @@ function download(credential, service = 'azure') {
             callback((0, types_1.errorValue)('Missing property', !Bucket ? 'Container' : 'Name'));
             return;
         }
-        let tempDir;
-        const downloadResponse = (err, url) => {
-            callback(err, url);
-            if (tempDir) {
-                setImmediate(() => {
-                    Cloud.removeDir(tempDir);
-                });
-            }
-        };
         const { flags = 0 } = target;
         const containerClient = blobServiceClient.getContainerClient(Bucket);
         const blobClient = containerClient.getBlockBlobClient(Key);
         const blockSize = (flags & 4) && (0, types_1.alignSize)(target.chunkSize, 1024) || 0;
+        const tempDir = blockSize >= 2097152000 ? (0, types_1.getTempDir)(true, service) : null;
         let diskClient, destination;
-        if (blockSize >= 2097152000 && (tempDir = this.getTempDir({ uuidDir: true }))) {
+        if (tempDir) {
             destination = path.join(tempDir, path.basename(target.filename || Key));
             diskClient = blobClient.downloadToFile(destination, 0, undefined, { snapshot: target.versionId, abortSignal: this.signal });
         }
@@ -35,11 +27,11 @@ function download(credential, service = 'azure') {
         }
         diskClient
             .then((value) => {
-            downloadResponse(null, destination || value);
+            callback(null, destination || value);
             const deleteObject = target.deleteObject;
             if (deleteObject) {
                 const location = Cloud.joinPath(Bucket, Key);
-                containerClient.delete((0, types_1.isPlainObject)(deleteObject) ? (deleteObject.abortSignal = this.signal, deleteObject) : { abortSignal: this.signal })
+                containerClient.delete((0, types_1.isPlainObject)(deleteObject) ? { ...deleteObject, abortSignal: this.signal } : { abortSignal: this.signal })
                     .then(() => {
                     this.formatMessage(64, service, "Delete success", location, { ...Cloud.LOG_CLOUD_DELETE });
                 })
@@ -51,7 +43,7 @@ function download(credential, service = 'azure') {
                 });
             }
         })
-            .catch(downloadResponse);
+            .catch(callback);
     };
 }
 module.exports = download;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/azure",
-  "version": "0.10.1",
+  "version": "0.10.3",
   "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.12.3",
-    "@e-mc/module": "^0.12.3",
-    "@e-mc/types": "^0.12.3",
-    "@azure/cosmos": "^4.3.0",
+    "@e-mc/cloud": "^0.12.7",
+    "@e-mc/module": "^0.12.7",
+    "@e-mc/types": "^0.12.7",
+    "@azure/cosmos": "^4.5.1",
     "@azure/identity": "*",
-    "@azure/storage-blob": "^12.27.0"
+    "@azure/storage-blob": "^12.28.0"
   }
 }