@pi-r/azure 0.3.4 → 0.3.6

package/LICENSE

@@ -1,7 +1,7 @@
-Copyright 2024 An Pham
-
-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:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
+Copyright 2023 An Pham
+
+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:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -1,7 +1,5 @@
-# @pi-r/azure
-
-PEP 402 - Forever
-
-## LICENSE
-
+# @pi-r/azure
+
+## LICENSE
+
 MIT

package/client/index.js

@@ -2,9 +2,6 @@
 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");
@@ -23,28 +20,43 @@ function validateDatabase(credential, data) {
 exports.validateDatabase = validateDatabase;
 function createStorageClient(credential) {
     var _a, _b;
-    const { BlobServiceClient, StorageSharedKeyCredential } = storage;
-    const { accountName, accountKey, connectionString, sharedAccessSignature } = credential;
-    if (connectionString) {
-        credential.accountName || (credential.accountName = (_a = /AccountName=([^;]+);/.exec(connectionString)) === null || _a === void 0 ? void 0 : _a[1]);
-        return BlobServiceClient.fromConnectionString(connectionString);
-    }
-    if (sharedAccessSignature) {
-        credential.accountName || (credential.accountName = (_b = /^https:\/\/([a-z\d]+)\./.exec(sharedAccessSignature)) === null || _b === void 0 ? void 0 : _b[1]);
-        return new BlobServiceClient(sharedAccessSignature);
-    }
-    let azureCredential;
-    if (accountName && accountKey) {
-        azureCredential = new StorageSharedKeyCredential(accountName, accountKey);
+    let packageName = '';
+    try {
+        const { BlobServiceClient, StorageSharedKeyCredential } = require(packageName = '@azure/storage-blob');
+        const { accountName, accountKey, connectionString, sharedAccessSignature } = credential;
+        if (connectionString) {
+            credential.accountName || (credential.accountName = (_a = /AccountName=([^;]+);/.exec(connectionString)) === null || _a === void 0 ? void 0 : _a[1]);
+            return BlobServiceClient.fromConnectionString(connectionString);
+        }
+        if (sharedAccessSignature) {
+            credential.accountName || (credential.accountName = (_b = /^https:\/\/([a-z\d]+)\./.exec(sharedAccessSignature)) === null || _b === void 0 ? void 0 : _b[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);
     }
-    else {
-        azureCredential = new identity.DefaultAzureCredential();
+    catch (err) {
+        this.checkPackage(err, packageName, { passThrough: true });
+        throw err;
     }
-    return new BlobServiceClient(`https://${accountName || process.env.AZURE_STORAGE_ACCOUNT}.blob.core.windows.net`, azureCredential);
 }
 exports.createStorageClient = createStorageClient;
 function createDatabaseClient(credential) {
-    return new cosmos.CosmosClient(credential);
+    try {
+        const { CosmosClient } = require('@azure/cosmos');
+        return new CosmosClient(credential);
+    }
+    catch (err) {
+        this.checkPackage(err, '@azure/cosmos', { passThrough: true });
+        throw err;
+    }
 }
 exports.createDatabaseClient = createDatabaseClient;
 async function createBucket(credential, bucket, publicRead, service = 'azure') {
@@ -75,12 +87,11 @@ async function createBucketV2(credential, bucket, access, options, service = 'az
     options.abortSignal = this.signal;
     return containerClient.create(options)
         .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.LOG_CLOUD_WARN });
+        if (response.errorCode) {
+            this.formatMessage(64, service, ['Container created with errors', bucket], (0, types_1.errorMessage)("Error code", response.errorCode), { ...Cloud.LOG_CLOUD_WARN });
         }
         else {
-            this.formatMessage(64, service, ['Container created', bucket], requestId, { ...Cloud.LOG_CLOUD_COMMAND });
+            this.formatMessage(64, service, ['Container created', bucket], response.requestId, { ...Cloud.LOG_CLOUD_COMMAND });
         }
         return true;
     })
@@ -98,15 +109,14 @@ async function createBucketV2(credential, bucket, access, options, service = 'az
 exports.createBucketV2 = createBucketV2;
 function setBucketWebsite(credential, bucket, options, service = 'azure') {
     const staticWebsite = { enabled: true };
-    const { indexPage, indexPath, errorPath } = options;
-    if ((0, types_1.isString)(indexPage)) {
-        staticWebsite.indexDocument = path.basename(indexPage);
+    if ((0, types_1.isString)(options.indexPage)) {
+        staticWebsite.indexDocument = path.basename(options.indexPage);
     }
-    if ((0, types_1.isString)(indexPath)) {
-        staticWebsite.defaultIndexDocumentPath = Module.joinPath(bucket, indexPath);
+    if ((0, types_1.isString)(options.indexPath)) {
+        staticWebsite.defaultIndexDocumentPath = Module.joinPath(bucket, options.indexPath);
     }
-    if ((0, types_1.isString)(errorPath)) {
-        staticWebsite.errorDocument404Path = Module.joinPath(bucket, errorPath);
+    if ((0, types_1.isString)(options.errorPath)) {
+        staticWebsite.errorDocument404Path = Module.joinPath(bucket, options.errorPath);
     }
     return createStorageClient.call(this, credential).setProperties({ staticWebsite })
         .then(() => {

package/download/index.js

@@ -1,8 +1,8 @@
 "use strict";
+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) => {
@@ -18,7 +18,7 @@ function download(credential, service = 'azure') {
             .then(value => {
             callback(null, value);
             const deleteObject = target.deleteObject;
-            if (deleteObject) {
+            if (target.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,30 +1,30 @@
-{
-  "name": "@pi-r/azure",
-  "version": "0.3.4",
-  "description": "Azure cloud functions for E-mc.",
-  "main": "client/index.js",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/anpham6/pi-r.git",
-    "directory": "src/cloud/azure"
-  },
-  "keywords": [
-    "squared",
-    "e-mc",
-    "squared-functions"
-  ],
-  "author": "An Pham <anpham6@gmail.com>",
-  "license": "MIT",
-  "homepage": "https://github.com/anpham6/pi-r#readme",
-  "dependencies": {
-    "@e-mc/cloud": "^0.6.3",
-    "@e-mc/module": "^0.6.3",
-    "@e-mc/types": "^0.6.3",
-    "@azure/cosmos": "^3.17.3",
-    "@azure/identity": "^3.4.2",
-    "@azure/storage-blob": "^12.17.0"
-  }
-}
+{
+  "name": "@pi-r/azure",
+  "version": "0.3.6",
+  "description": "Azure cloud functions for E-mc.",
+  "main": "client/index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
+    "directory": "src/cloud/azure"
+  },
+  "keywords": [
+    "squared",
+    "e-mc",
+    "squared-functions"
+  ],
+  "author": "An Pham <anpham6@gmail.com>",
+  "license": "MIT",
+  "homepage": "https://github.com/anpham6/pi-r#readme",
+  "dependencies": {
+    "@e-mc/cloud": "^0.6.16",
+    "@e-mc/module": "^0.6.16",
+    "@e-mc/types": "^0.6.16",
+    "@azure/cosmos": "^3.17.3",
+    "@azure/identity": "^3.4.2",
+    "@azure/storage-blob": "^12.23.0"
+  }
+}

package/types/index.d.ts

@@ -0,0 +1,30 @@
+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">;
+
+export interface AzureStorageCredential {
+    accountName?: string;
+    accountKey?: string;
+    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> {
+    source: "cloud";
+    service: "azure" | "az";
+    partitionKey?: PartitionKey;
+    storedProcedureId?: string;
+}
+
+export interface AzureDatabaseCredential extends AuthValue, CosmosClientOptions {
+    tenantId?: string;
+    clientId?: string;
+}

package/upload/index.js

@@ -1,11 +1,11 @@
 "use strict";
 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;