@pi-r/azure 0.11.3 → 0.12.0

package/client/index.js

@@ -1,25 +1,12 @@
 "use strict";
-exports.CLOUD_DOWNLOAD_CHUNK = exports.CLOUD_UPLOAD_CHUNK = exports.CLOUD_UPLOAD_STREAM = void 0;
-exports.validateStorage = validateStorage;
-exports.validateDatabase = validateDatabase;
-exports.createStorageClient = createStorageClient;
-exports.createDatabaseClient = createDatabaseClient;
-exports.createBucket = createBucket;
-exports.createBucketV2 = createBucketV2;
-exports.setBucketWebsite = setBucketWebsite;
-exports.deleteObjects = deleteObjects;
-exports.deleteObjectsV2 = deleteObjectsV2;
-exports.deleteObjectsV3 = deleteObjectsV3;
-exports.copyObject = copyObject;
-exports.executeQuery = executeQuery;
-exports.executeBatchQuery = executeBatchQuery;
-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 types_1 = require("@e-mc/types");
-const util_1 = require("@e-mc/cloud/util");
+
+const path = require('node:path');
+const { AnonymousCredential, BlobServiceClient, StorageSharedKeyCredential } = require('@azure/storage-blob');
+const { CosmosClient } = require('@azure/cosmos');
+const { DefaultAzureCredential, EnvironmentCredential, UsernamePasswordCredential } = require('@azure/identity');
+const Cloud = require('@e-mc/cloud');
+const { errorMessage, isErrorCode, isString } = require('@e-mc/types');
+const { formatError } = require('@e-mc/cloud/util');
 function isEnvironmentCredential() {
     const env = process.env;
     return !!(env.AZURE_TENANT_ID && env.AZURE_CLIENT_ID && (env.AZURE_CLIENT_SECRET || env.AZURE_CLIENT_CERTIFICATE_PATH));
@@ -40,7 +27,7 @@ function createStorageClient(credential) {
         if (!accountName) {
             credential.accountName = /AccountName=([^;]+);/.exec(connectionString)?.[1];
         }
-        return storage.BlobServiceClient.fromConnectionString(connectionString, credential.clientOptions);
+        return BlobServiceClient.fromConnectionString(connectionString, credential.clientOptions);
     }
     if (accountSas && !accountSas.startsWith('?')) {
         accountSas = '?' + accountSas;
@@ -55,26 +42,26 @@ function createStorageClient(credential) {
         else {
             credential.accountName ||= /^https:\/\/([a-z\d]+)\./.exec(sharedAccessSignature)?.[1];
         }
-        return new storage.BlobServiceClient(sharedAccessSignature);
+        return new BlobServiceClient(sharedAccessSignature);
     }
     let serviceCredential;
     if (accountName && accountSas) {
-        serviceCredential = new storage.AnonymousCredential();
+        serviceCredential = new AnonymousCredential();
     }
     else if (accountName && accountKey) {
-        serviceCredential = new storage.StorageSharedKeyCredential(accountName, accountKey);
+        serviceCredential = new StorageSharedKeyCredential(accountName, accountKey);
     }
     else if (isEnvironmentCredential()) {
-        serviceCredential = new identity.EnvironmentCredential();
+        serviceCredential = new EnvironmentCredential();
     }
     else {
-        serviceCredential = new identity.DefaultAzureCredential(credential.defaultAzureOptions);
+        serviceCredential = new DefaultAzureCredential(credential.defaultAzureOptions);
     }
-    return new storage.BlobServiceClient(url, serviceCredential, credential.clientOptions);
+    return new BlobServiceClient(url, serviceCredential, credential.clientOptions);
 }
 function createDatabaseClient(credential) {
     if (credential.username && credential.password && credential.tenantId && credential.clientId) {
-        credential.aadCredentials = new identity.UsernamePasswordCredential(credential.username, credential.password, credential.tenantId, credential.clientId);
+        credential.aadCredentials = new UsernamePasswordCredential(credential.username, credential.password, credential.tenantId, credential.clientId);
         credential = { ...credential };
         delete credential.username;
         delete credential.password;
@@ -82,9 +69,9 @@ function createDatabaseClient(credential) {
         delete credential.clientId;
     }
     else if (isEnvironmentCredential()) {
-        credential.aadCredentials = new identity.EnvironmentCredential();
+        credential.aadCredentials = new EnvironmentCredential();
     }
-    return new cosmos.CosmosClient(credential);
+    return new CosmosClient(credential);
 }
 async function createBucket(credential, bucket, publicRead, service = "azure") {
     return createBucketV2.call(this, credential, bucket, publicRead ? 'blob' : 'container', undefined, service);
@@ -119,7 +106,7 @@ async function createBucketV2(credential, bucket, access, options, service = "az
         .then(response => {
         const { requestId, errorCode } = response;
         if (errorCode) {
-            this.formatMessage(64, service, ['Container created with errors', bucket], (0, types_1.errorMessage)("Error code", errorCode), Cloud.optionsLogMessage('WARN'));
+            this.formatMessage(64, service, ['Container created with errors', bucket], errorMessage("Error code", errorCode), Cloud.optionsLogMessage('WARN'));
         }
         else {
             this.formatMessage(64, service, ['Container created', bucket], requestId, Cloud.optionsLogMessage('COMMAND'));
@@ -127,7 +114,7 @@ async function createBucketV2(credential, bucket, access, options, service = "az
         return true;
     })
         .catch(async (err) => {
-        if ((0, types_1.isErrorCode)(err, 'ContainerAlreadyExists')) {
+        if (isErrorCode(err, 'ContainerAlreadyExists')) {
             if (access) {
                 await setAccessPolicy();
             }
@@ -140,20 +127,20 @@ async function createBucketV2(credential, bucket, access, options, service = "az
 async function setBucketWebsite(credential, bucket, options, service = "azure") {
     const staticWebsite = { enabled: true };
     const { indexPage, indexPath, errorPath } = options;
-    if ((0, types_1.isString)(indexPage)) {
+    if (isString(indexPage)) {
         staticWebsite.indexDocument = path.basename(indexPage);
     }
-    if ((0, types_1.isString)(indexPath)) {
+    if (isString(indexPath)) {
         staticWebsite.defaultIndexDocumentPath = Cloud.joinPath(bucket, indexPath);
     }
-    if ((0, types_1.isString)(errorPath)) {
+    if (isString(errorPath)) {
         staticWebsite.errorDocument404Path = Cloud.joinPath(bucket, errorPath);
     }
     return createStorageClient(credential).setProperties({ staticWebsite })
         .then(response => {
         const { requestId, errorCode } = response;
         if (errorCode) {
-            this.formatMessage(64, service, ["Bucket website configured" + ' with errors', bucket], (0, types_1.errorMessage)("Error code", errorCode), Cloud.optionsLogMessage('WARN'));
+            this.formatMessage(64, service, ["Bucket website configured" + ' with errors', bucket], errorMessage("Error code", errorCode), Cloud.optionsLogMessage('WARN'));
         }
         else {
             this.formatMessage(64, service, ["Bucket website configured", bucket], requestId, Cloud.optionsLogMessage('COMMAND'));
@@ -165,8 +152,8 @@ async function setBucketWebsite(credential, bucket, options, service = "azure")
         return false;
     });
 }
-async function deleteObjects(credential, bucket, service, sdk, recursive = true) {
-    return deleteObjectsV2.call(this, credential, bucket, recursive, service);
+async function deleteObjects(credential, bucket, options, service) {
+    return deleteObjectsV3.call(this, credential, bucket, options, service);
 }
 async function deleteObjectsV2(credential, bucket, recursive = true, service) {
     return deleteObjectsV3.call(this, credential, bucket, { recursive }, service);
@@ -210,7 +197,7 @@ async function copyObject(credential, bucketSource, keySource, bucket, key, opti
     return poller.pollUntilDone()
         .then(response => {
         if (response.errorCode) {
-            this.formatMessage(64, service, ["Copy success" + ' with errors', bucket], (0, types_1.errorMessage)("Error code", response.errorCode, bucketSource), Cloud.optionsLogMessage('WARN'));
+            this.formatMessage(64, service, ["Copy success" + ' with errors', bucket], errorMessage("Error code", response.errorCode, bucketSource), Cloud.optionsLogMessage('WARN'));
         }
         else {
             this.formatMessage(64, service, ["Copy success", bucket], bucketSource + '/' + keySource, Cloud.optionsLogMessage('COMMAND'));
@@ -243,7 +230,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         const { service, name, table, id, query, storedProcedureId, partitionKey = null, params, limit = 0, ignoreCache } = item;
         if (!name || !table) {
             closeClient();
-            throw (0, util_1.formatError)(item, name ? "Missing database table" : "Missing database name");
+            throw formatError(item, name ? "Missing database table" : "Missing database name");
         }
         cacheValue.exclusiveOf = Array.isArray(ignoreCache) ? ignoreCache : undefined;
         let rows, queryString = caching && ignoreCache !== true ? name + '_' + table + '_' : '';
@@ -306,7 +293,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             }
             else {
                 closeClient();
-                throw (0, util_1.formatError)(item, "Missing database query");
+                throw formatError(item, "Missing database query");
             }
         }
         result[i] = this.setQueryResult(service, credential, queryString, rows, cacheValue);
@@ -314,6 +301,23 @@ async function executeBatchQuery(credential, batch, sessionKey) {
     closeClient();
     return result;
 }
-exports.CLOUD_UPLOAD_STREAM = true;
-exports.CLOUD_UPLOAD_CHUNK = true;
-exports.CLOUD_DOWNLOAD_CHUNK = true;
+const CLOUD_UPLOAD_STREAM = true;
+const CLOUD_UPLOAD_CHUNK = true;
+const CLOUD_DOWNLOAD_CHUNK = true;
+
+exports.CLOUD_DOWNLOAD_CHUNK = CLOUD_DOWNLOAD_CHUNK;
+exports.CLOUD_UPLOAD_CHUNK = CLOUD_UPLOAD_CHUNK;
+exports.CLOUD_UPLOAD_STREAM = CLOUD_UPLOAD_STREAM;
+exports.copyObject = copyObject;
+exports.createBucket = createBucket;
+exports.createBucketV2 = createBucketV2;
+exports.createDatabaseClient = createDatabaseClient;
+exports.createStorageClient = createStorageClient;
+exports.deleteObjects = deleteObjects;
+exports.deleteObjectsV2 = deleteObjectsV2;
+exports.deleteObjectsV3 = deleteObjectsV3;
+exports.executeBatchQuery = executeBatchQuery;
+exports.executeQuery = executeQuery;
+exports.setBucketWebsite = setBucketWebsite;
+exports.validateDatabase = validateDatabase;
+exports.validateStorage = validateStorage;

package/download/index.js

@@ -1,23 +1,24 @@
 "use strict";
-const path = require("node:path");
-const Cloud = require("@e-mc/cloud");
-const types_1 = require("@e-mc/types");
-const util_1 = require("@e-mc/cloud/util");
-const client_1 = require("@pi-r/azure");
+
+const path = require('node:path');
+const Cloud = require('@e-mc/cloud');
+const { alignSize, errorValue, getTempDir, isErrorCode, isPlainObject } = require('@e-mc/types');
+const { createErrorHandler, intoArray } = require('@e-mc/cloud/util');
+const { copyObject, createStorageClient } = require('@pi-r/azure');
 function download(credential, service = "azure") {
-    const blobServiceClient = (0, client_1.createStorageClient)(credential);
+    const blobServiceClient = createStorageClient(credential);
     return (data, callback) => {
         const { bucket, download: target } = data;
         const key = target.keyname || target.filename;
         if (!bucket || !key) {
-            callback((0, types_1.errorValue)('Missing property', !bucket ? 'Container' : 'Name'));
+            callback(errorValue('Missing property', !bucket ? 'Container' : 'Name'));
             return;
         }
         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;
+        const blockSize = (flags & 4) && alignSize(target.chunkSize, 1024) || 0;
+        const tempDir = blockSize >= 2097152000 ? getTempDir(true, service) : null;
         let diskClient, destination;
         if (tempDir) {
             destination = path.join(tempDir, path.basename(target.filename || key));
@@ -29,26 +30,26 @@ function download(credential, service = "azure") {
         diskClient
             .then(async (value) => {
             callback(null, destination || value);
-            const copyTo = (0, util_1.intoArray)(target.copyObject);
+            const copyTo = intoArray(target.copyObject);
             if (copyTo) {
                 const tasks = [];
                 for (const { bucket: bucketName, pathname, filename, options } of copyTo) {
                     const keyObject = filename ? Cloud.joinPath(pathname, filename, true) : key;
-                    tasks.push(client_1.copyObject
+                    tasks.push(copyObject
                         .call(this, credential, bucket, key, bucketName, keyObject, options)
-                        .catch((0, util_1.createErrorHandler)(this, service, bucket)));
+                        .catch(createErrorHandler(this, service, bucket)));
                 }
                 await Promise.all(tasks);
             }
             const deleteObject = target.deleteObject;
             if (deleteObject) {
                 const location = Cloud.joinPath(bucket, key);
-                containerClient.delete((0, types_1.isPlainObject)(deleteObject) ? { ...deleteObject, abortSignal: this.signal } : { abortSignal: this.signal })
+                containerClient.delete(isPlainObject(deleteObject) ? { ...deleteObject, abortSignal: this.signal } : { abortSignal: this.signal })
                     .then(() => {
                     this.formatMessage(64, service, "Delete success", location, Cloud.optionsLogMessage('DELETE'));
                 })
                     .catch((err) => {
-                    if (!(0, types_1.isErrorCode)(err, 'BlobNotFound')) {
+                    if (!isErrorCode(err, 'BlobNotFound')) {
                         this.formatFail(64, service, ["Delete failed", location], err, Cloud.optionsLogMessage('FAIL', { fatal: !!target.active }));
                     }
                 });
@@ -57,4 +58,5 @@ function download(credential, service = "azure") {
             .catch(callback);
     };
 }
+
 module.exports = download;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/azure",
-  "version": "0.11.3",
+  "version": "0.12.0",
   "description": "Azure cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -19,9 +19,9 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.13.10",
-    "@e-mc/module": "^0.13.10",
-    "@e-mc/types": "^0.13.10",
+    "@e-mc/cloud": "^0.14.0",
+    "@e-mc/module": "^0.14.0",
+    "@e-mc/types": "^0.14.0",
     "@azure/cosmos": "^4.9.3",
     "@azure/identity": "*",
     "@azure/storage-blob": "^12.31.0"

package/upload/index.js

@@ -1,19 +1,20 @@
 "use strict";
-const path = require("node:path");
-const fs = require("node:fs");
-const stream = require("node:stream");
-const Cloud = require("@e-mc/cloud");
-const types_1 = require("@e-mc/types");
-const util_1 = require("@e-mc/cloud/util");
-const client_1 = require("@pi-r/azure");
+
+const path = require('node:path');
+const fs = require('node:fs');
+const stream = require('node:stream');
+const Cloud = require('@e-mc/cloud');
+const { alignSize, coerceObject, createAbortError, isObject } = require('@e-mc/types');
+const { createErrorHandler, createKeyAndBody, generateFilename, intoArray } = require('@e-mc/cloud/util');
+const { copyObject, createBucketV2, createStorageClient } = require('@pi-r/azure');
 const BUCKET_SESSION = new Set();
 const BUCKET_RESPONSE = {};
 const getBucketKey = (credential, bucket, acl = '') => Cloud.asString(credential, true) + bucket + '_' + acl;
 function upload(credential, service = "azure") {
-    const blobServiceClient = (0, client_1.createStorageClient)(credential);
+    const blobServiceClient = createStorageClient(credential);
     return async (data, callback) => {
         const { bucket, localUri } = data;
-        const { pathname, flags = 0, fileGroup, contentType, metadata, tags, endpoint, admin = {}, overwrite, options } = data.upload;
+        const { pathname, flags = 0, fileGroup, descendantsGroup, contentType, metadata, tags, endpoint, admin = {}, overwrite, options } = data.upload;
         const containerClient = blobServiceClient.getContainerClient(bucket);
         let filename = data.upload.filename || path.basename(localUri), bucketKey;
         const complete = (err, url) => {
@@ -23,23 +24,23 @@ function upload(credential, service = "azure") {
             }
             callback(err, url);
         };
-        const addLog = (0, util_1.createErrorHandler)(this, bucket, service);
+        const addLog = createErrorHandler(this, bucket, service);
         const configBucket = admin.configBucket;
         if (!BUCKET_SESSION.has(bucket)) {
             const bucketAcl = admin.publicRead ? 'blob' : admin.acl;
-            const response = BUCKET_RESPONSE[bucketKey = getBucketKey(credential, bucket, bucketAcl)] ||= client_1.createBucketV2.call(this, credential, bucket, bucketAcl, configBucket?.create);
+            const response = BUCKET_RESPONSE[bucketKey = getBucketKey(credential, bucket, bucketAcl)] ||= createBucketV2.call(this, credential, bucket, bucketAcl, configBucket?.create);
             if (!await response) {
                 complete(null);
                 return;
             }
             BUCKET_SESSION.add(bucket);
         }
-        const retentionPolicy = (0, util_1.intoArray)(configBucket?.retentionPolicy);
+        const retentionPolicy = intoArray(configBucket?.retentionPolicy);
         if (retentionPolicy) {
             try {
                 if (this.hasCoerce(service, 'options')) {
                     for (const policy of retentionPolicy) {
-                        (0, types_1.coerceObject)(policy);
+                        coerceObject(policy);
                     }
                 }
             }
@@ -55,7 +56,7 @@ function upload(credential, service = "azure") {
         if (!overwrite) {
             try {
                 const current = filename;
-                const next = (0, util_1.generateFilename)(filename);
+                const next = generateFilename(filename);
                 let i = 0, exists = false;
                 do {
                     if (i > 0) {
@@ -81,7 +82,7 @@ function upload(credential, service = "azure") {
                 return;
             }
         }
-        const chunkSize = flags & 4 ? (0, types_1.alignSize)(data.upload.chunkSize, 1024) : 0;
+        const chunkSize = flags & 4 ? alignSize(data.upload.chunkSize, 1024) : 0;
         const maxSingleShotSize = Math.max(chunkSize, 8388608);
         const Key = [filename];
         const Body = [data.buffer];
@@ -110,7 +111,7 @@ function upload(credential, service = "azure") {
             Stream[0] = stream.Readable.from(Body[0], { highWaterMark: getChunkSize() });
         }
         if (fileGroup) {
-            const [key, body, type] = (0, util_1.createKeyAndBody)(filename, fileGroup, chunkSize > 0 ? maxSingleShotSize : 0, addLog, flags);
+            const [key, body, type] = createKeyAndBody(filename, fileGroup, { errorCallback: addLog, descendantsGroup, flags, chunkSize: chunkSize > 0 ? maxSingleShotSize : 0 });
             Key.push(...key);
             ContentType.push(...type);
             for (let i = 0; i < body.length; ++i) {
@@ -130,7 +131,7 @@ function upload(credential, service = "azure") {
             const first = i === 0;
             if (this.aborted) {
                 if (first) {
-                    complete((0, types_1.createAbortError)());
+                    complete(createAbortError());
                 }
                 return;
             }
@@ -138,10 +139,10 @@ function upload(credential, service = "azure") {
             const params = { ...options, abortSignal: this.signal };
             const headers = params.blobHTTPHeaders ||= {};
             if (first) {
-                if ((0, types_1.isObject)(metadata)) {
+                if (isObject(metadata)) {
                     params.metadata = metadata;
                 }
-                if ((0, types_1.isObject)(tags)) {
+                if (isObject(tags)) {
                     params.tags = tags;
                 }
                 headers.blobContentType ||= ContentType[i];
@@ -173,12 +174,12 @@ function upload(credential, service = "azure") {
                 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);
                 this.formatMessage(64, service, "Upload success", url, Cloud.optionsLogMessage('UPLOAD'));
                 if (first) {
-                    const copyTo = (0, util_1.intoArray)(data.upload.copyObject);
+                    const copyTo = intoArray(data.upload.copyObject);
                     if (copyTo) {
                         const tasks = [];
                         for (const { bucket: bucketName, pathname: pathObject = pathname, filename: fileObject, options: copyOptions } of copyTo) {
                             const keyObject = fileObject ? Cloud.joinPath(pathObject, fileObject, true) : blobName;
-                            tasks.push(client_1.copyObject
+                            tasks.push(copyObject
                                 .call(this, credential, bucket, blobName, bucketName, keyObject, copyOptions)
                                 .catch(addLog));
                         }
@@ -198,4 +199,5 @@ function upload(credential, service = "azure") {
         }
     };
 }
+
 module.exports = upload;