@pi-r/azure 0.2.3 → 0.5.0

package/client/index.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeBatchQuery = exports.executeQuery = exports.deleteObjectsV2 = exports.deleteObjects = exports.setBucketWebsite = exports.createBucketV2 = exports.createBucket = exports.createDatabaseClient = exports.createStorageClient = exports.validateDatabase = exports.validateStorage = void 0;
 const path = require("path");
+const storage = require("@azure/storage-blob");
+const cosmos = require("@azure/cosmos");
+const identity = require("@azure/identity");
 const types_1 = require("@e-mc/types");
 const util_1 = require("@e-mc/cloud/util");
 const Module = require("@e-mc/module");
@@ -19,43 +22,28 @@ function validateDatabase(credential, data) {
 }
 exports.validateDatabase = validateDatabase;
 function createStorageClient(credential) {
-    let packageName = '';
-    try {
-        const { BlobServiceClient, StorageSharedKeyCredential } = require(packageName = '@azure/storage-blob');
-        const { accountName, accountKey, connectionString, sharedAccessSignature } = credential;
-        if (connectionString) {
-            credential.accountName || (credential.accountName = /AccountName=([^;]+);/.exec(connectionString)?.[1]);
-            return BlobServiceClient.fromConnectionString(connectionString);
-        }
-        if (sharedAccessSignature) {
-            credential.accountName || (credential.accountName = /^https:\/\/([a-z\d]+)\./.exec(sharedAccessSignature)?.[1]);
-            return new BlobServiceClient(sharedAccessSignature);
-        }
-        let azureCredential;
-        if (accountName && accountKey) {
-            azureCredential = new StorageSharedKeyCredential(accountName, accountKey);
-        }
-        else {
-            const { DefaultAzureCredential } = require(packageName = '@azure/identity');
-            azureCredential = new DefaultAzureCredential();
-        }
-        return new BlobServiceClient(`https://${accountName || process.env.AZURE_STORAGE_ACCOUNT}.blob.core.windows.net`, azureCredential);
+    const { BlobServiceClient, StorageSharedKeyCredential } = storage;
+    const { accountName, accountKey, connectionString, sharedAccessSignature } = credential;
+    if (connectionString) {
+        credential.accountName || (credential.accountName = /AccountName=([^;]+);/.exec(connectionString)?.[1]);
+        return BlobServiceClient.fromConnectionString(connectionString);
     }
-    catch (err) {
-        this.checkPackage(err, packageName, { passThrough: true });
-        throw err;
+    if (sharedAccessSignature) {
+        credential.accountName || (credential.accountName = /^https:\/\/([a-z\d]+)\./.exec(sharedAccessSignature)?.[1]);
+        return new BlobServiceClient(sharedAccessSignature);
     }
+    let azureCredential;
+    if (accountName && accountKey) {
+        azureCredential = new StorageSharedKeyCredential(accountName, accountKey);
+    }
+    else {
+        azureCredential = new identity.DefaultAzureCredential();
+    }
+    return new BlobServiceClient(`https://${accountName || process.env.AZURE_STORAGE_ACCOUNT}.blob.core.windows.net`, azureCredential);
 }
 exports.createStorageClient = createStorageClient;
 function createDatabaseClient(credential) {
-    try {
-        const { CosmosClient } = require('@azure/cosmos');
-        return new CosmosClient(credential);
-    }
-    catch (err) {
-        this.checkPackage(err, '@azure/cosmos', { passThrough: true });
-        throw err;
-    }
+    return new cosmos.CosmosClient(credential);
 }
 exports.createDatabaseClient = createDatabaseClient;
 async function createBucket(credential, bucket, publicRead, service = 'azure') {
@@ -86,11 +74,12 @@ async function createBucketV2(credential, bucket, access, options, service = 'az
     options.abortSignal = this.signal;
     return containerClient.create(options)
         .then(response => {
-        if (response.errorCode) {
-            this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ['Container created with errors', bucket], (0, types_1.errorMessage)("Error code" /* ERR_MESSAGE.ERROR_CODE */, response.errorCode), { ...Cloud.LOG_CLOUD_WARN });
+        const { requestId, errorCode } = response;
+        if (errorCode) {
+            this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ['Container created with errors', bucket], (0, types_1.errorMessage)("Error code" /* ERR_MESSAGE.ERROR_CODE */, errorCode), { ...Cloud.LOG_CLOUD_WARN });
         }
         else {
-            this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ['Container created', bucket], response.requestId, { ...Cloud.LOG_CLOUD_COMMAND });
+            this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ['Container created', bucket], requestId, { ...Cloud.LOG_CLOUD_COMMAND });
         }
         return true;
     })
@@ -108,14 +97,15 @@ async function createBucketV2(credential, bucket, access, options, service = 'az
 exports.createBucketV2 = createBucketV2;
 function setBucketWebsite(credential, bucket, options, service = 'azure') {
     const staticWebsite = { enabled: true };
-    if ((0, types_1.isString)(options.indexPage)) {
-        staticWebsite.indexDocument = path.basename(options.indexPage);
+    const { indexPage, indexPath, errorPath } = options;
+    if ((0, types_1.isString)(indexPage)) {
+        staticWebsite.indexDocument = path.basename(indexPage);
     }
-    if ((0, types_1.isString)(options.indexPath)) {
-        staticWebsite.defaultIndexDocumentPath = Module.joinPath(bucket, options.indexPath);
+    if ((0, types_1.isString)(indexPath)) {
+        staticWebsite.defaultIndexDocumentPath = Module.joinPath(bucket, indexPath);
     }
-    if ((0, types_1.isString)(options.errorPath)) {
-        staticWebsite.errorDocument404Path = Module.joinPath(bucket, options.errorPath);
+    if ((0, types_1.isString)(errorPath)) {
+        staticWebsite.errorDocument404Path = Module.joinPath(bucket, errorPath);
     }
     return createStorageClient.call(this, credential).setProperties({ staticWebsite })
         .then(() => {
@@ -173,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" /* ERR_DB.TABLE */ : "Missing database name" /* ERR_DB.NAME */);
@@ -189,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) + '_' + storedProcedureId + Module.asString(params, true) + Module.asString(options, true)))) {
                 result[i] = rows;
                 continue;
             }
@@ -201,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) + '_' + id + Module.asString(options, true);
                 if (!update && (rows = getCache(queryString))) {
                     result[i] = rows;
                     continue;
@@ -218,7 +208,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             if (limit > 0) {
                 (options || (options = {})).maxItemCount = limit;
             }
-            if (queryString && (rows = getCache(queryString += Module.asString(query, true) + Module.asString(options, true)))) {
+            if (queryString && (rows = getCache(queryString += Module.asString(query) + Module.asString(options, true)))) {
                 result[i] = rows;
                 continue;
             }

package/download/index.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const client_1 = require("../client");
 const types_1 = require("@e-mc/types");
 const Module = require("@e-mc/module");
 const Cloud = require("@e-mc/cloud");
+const client_1 = require("../client");
 function download(credential, service = 'azure') {
     const blobServiceClient = client_1.createStorageClient.call(this, credential);
     return (data, callback) => {
@@ -19,7 +19,7 @@ function download(credential, service = 'azure') {
             .then(value => {
             callback(null, value);
             const deleteObject = target.deleteObject;
-            if (target.deleteObject) {
+            if (deleteObject) {
                 blobClient.delete((0, types_1.isPlainObject)(deleteObject) && (deleteObject.abortSignal = this.signal) ? deleteObject : undefined)
                     .then(() => this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Delete success" /* VAL_CLOUD.DELETE_FILE */, location, { ...Cloud.LOG_CLOUD_DELETE }))
                     .catch((err) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/azure",
-  "version": "0.2.3",
+  "version": "0.5.0",
   "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.5.3",
-    "@e-mc/module": "^0.5.3",
-    "@e-mc/types": "^0.5.3",
-    "@azure/cosmos": "^3.17.3",
-    "@azure/identity": "^3.2.4",
-    "@azure/storage-blob": "^12.15.0"
+    "@e-mc/cloud": "^0.7.0",
+    "@e-mc/module": "^0.7.0",
+    "@e-mc/types": "^0.7.0",
+    "@azure/cosmos": "^4.0.0",
+    "@azure/identity": "^4.0.0",
+    "@azure/storage-blob": "^12.17.0"
   }
 }

package/upload/index.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const fs = require("fs");
-const client_1 = require("../client");
 const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
 const Module = require("@e-mc/module");
 const Cloud = require("@e-mc/cloud");
+const client_1 = require("../client");
 const BUCKET_SESSION = new Set();
 const BUCKET_RESPONSE = {};
 const getBucketKey = (credential, bucket, acl = '') => Module.asString(credential, true) + bucket + '_' + acl;
@@ -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 /* LOG_TYPE.CLOUD */, service, ["Bucket configured" /* VAL_CLOUD.CONFIGURE_BUCKET */ + ' (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)