@pi-r/azure 0.2.8 → 0.3.2

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 Mile Square Park
+Copyright 2023 Studio Trigger
 
 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:
 

package/README.md

@@ -1,6 +1,6 @@
 # @pi-r/azure
 
-PEP 402 - Forever
+PEP 402 - Forever Aina
 
 ## LICENSE
 

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, service, ['Container created with errors', bucket], (0, types_1.errorMessage)("Error code", response.errorCode), { ...Cloud.LOG_CLOUD_WARN });
+        const { requestId, errorCode } = response;
+        if (errorCode) {
+            this.formatMessage(64, service, ['Container created with errors', bucket], (0, types_1.errorMessage)("Error code", errorCode), { ...Cloud.LOG_CLOUD_WARN });
         }
         else {
-            this.formatMessage(64, service, ['Container created', bucket], response.requestId, { ...Cloud.LOG_CLOUD_COMMAND });
+            this.formatMessage(64, 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(() => {

package/download/index.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const client_1 = require("@pi-r/azure");
 const types_1 = require("@e-mc/types");
 const Module = require("@e-mc/module");
 const Cloud = require("@e-mc/cloud");
+const client_1 = require("@pi-r/azure");
 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, service, "Delete success", location, { ...Cloud.LOG_CLOUD_DELETE }))
                     .catch((err) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/azure",
-  "version": "0.2.8",
+  "version": "0.3.2",
   "description": "Azure cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -20,9 +20,9 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.5.4",
-    "@e-mc/module": "^0.5.4",
-    "@e-mc/types": "^0.5.4",
+    "@e-mc/cloud": "^0.6.1",
+    "@e-mc/module": "^0.6.1",
+    "@e-mc/types": "^0.6.1",
     "@azure/cosmos": "^3.17.3",
     "@azure/identity": "^3.4.2",
     "@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("@pi-r/azure");
 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("@pi-r/azure");
 const BUCKET_SESSION = new Set();
 const BUCKET_RESPONSE = {};
 const getBucketKey = (credential, bucket, acl = '') => Module.asString(credential, true) + bucket + '_' + acl;