@pi-r/azure 0.8.1 → 0.8.3

package/README.md

@@ -1,7 +1,7 @@
-### @pi-r/azure
-
-https://e-mc.readthedocs.io/en/latest/cloud/azure.html
-
-### LICENSE
-
+### @pi-r/azure
+
+https://e-mc.readthedocs.io/en/latest/cloud/azure.html
+
+### LICENSE
+
 MIT

package/client/index.js

@@ -20,7 +20,7 @@ const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
 function validateStorage(credential) {
     const env = process.env;
-    if (credential.accountName && credential.accountKey || credential.connectionString || credential.sharedAccessSignature || env.AZURE_TENANT_ID && env.AZURE_CLIENT_ID && env.AZURE_CLIENT_SECRET) {
+    if (credential.accountName && (credential.accountKey || credential.accountSas) || credential.connectionString || credential.sharedAccessSignature || env.AZURE_TENANT_ID && env.AZURE_CLIENT_ID && env.AZURE_CLIENT_SECRET) {
         return true;
     }
     return Cloud.enabled("process.env.apply") && !!((credential.connectionString = env.AZURE_STORAGE_CONNECTION_STRING) || (credential.sharedAccessSignature = env.AZURE_STORAGE_SAS_TOKEN) || (credential.accountName = env.AZURE_STORAGE_ACCOUNT) && (credential.accountKey = env.AZURE_STORAGE_KEY));
@@ -29,14 +29,17 @@ function validateDatabase(credential, data) {
     return !!(data.name && data.table && (credential.endpoint && credential.key || credential.username && credential.password && (credential.tenantId && credential.clientId || (credential.tenantId = process.env.AZURE_TENANT_ID) && (credential.clientId = process.env.AZURE_CLIENT_ID)) || Cloud.enabled("process.env.apply") && (credential.endpoint = process.env.AZURE_COSMOS_ENDPOINT) && (credential.key = process.env.AZURE_COSMOS_KEY)));
 }
 function createStorageClient(credential) {
-    let { accountName, accountKey, connectionString, sharedAccessSignature } = credential;
+    let { accountName, accountKey, accountSas = '', connectionString, sharedAccessSignature } = credential;
     if (connectionString) {
         if (!accountName) {
             credential.accountName = /AccountName=([^;]+);/.exec(connectionString)?.[1];
         }
         return storage.BlobServiceClient.fromConnectionString(connectionString);
     }
-    const url = `https://${accountName || process.env.AZURE_STORAGE_ACCOUNT}.blob.core.windows.net`;
+    if (accountSas && !accountSas.startsWith('?')) {
+        accountSas = '?' + accountSas;
+    }
+    const url = `https://${accountName || process.env.AZURE_STORAGE_ACCOUNT}.blob.core.windows.net${accountSas}`;
     if (sharedAccessSignature) {
         if (accountName) {
             if (!Cloud.isURL(sharedAccessSignature)) {
@@ -48,7 +51,7 @@ function createStorageClient(credential) {
         }
         return new storage.BlobServiceClient(sharedAccessSignature);
     }
-    return new storage.BlobServiceClient(url, accountName && accountKey ? new storage.StorageSharedKeyCredential(accountName, accountKey) : new identity.DefaultAzureCredential());
+    return new storage.BlobServiceClient(url, accountName && accountSas ? new storage.AnonymousCredential() : accountName && accountKey ? new storage.StorageSharedKeyCredential(accountName, accountKey) : new identity.DefaultAzureCredential());
 }
 function createDatabaseClient(credential) {
     if (credential.username && credential.password && credential.tenantId && credential.clientId) {

package/download/index.js

@@ -16,7 +16,7 @@ function download(credential, service = 'azure') {
         const downloadResponse = (err, url) => {
             callback(err, url);
             if (tempDir) {
-                queueMicrotask(() => {
+                setImmediate(() => {
                     Cloud.removeDir(tempDir);
                 });
             }

package/package.json

@@ -1,30 +1,30 @@
-{
-  "name": "@pi-r/azure",
-  "version": "0.8.1",
-  "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.10.0",
-    "@e-mc/module": "^0.10.0",
-    "@e-mc/types": "^0.10.0",
-    "@azure/cosmos": "^4.0.0",
-    "@azure/identity": "^4.4.1",
-    "@azure/storage-blob": "^12.24.0"
-  }
-}
+{
+  "name": "@pi-r/azure",
+  "version": "0.8.3",
+  "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.10.3",
+    "@e-mc/module": "^0.10.3",
+    "@e-mc/types": "^0.10.3",
+    "@azure/cosmos": "^4.1.1",
+    "@azure/identity": "^4.4.1",
+    "@azure/storage-blob": "^12.25.0"
+  }
+}

package/types/index.d.ts

@@ -1,24 +1,25 @@
-import type { CloudDatabase, CloudStorage } from '@e-mc/types/lib/cloud';
-
-import type { CosmosClientOptions, FeedOptions, PartitionKey, PatchRequestBody, RequestOptions, SqlQuerySpec } from '@azure/cosmos';
-
-export type AzureStorage = CloudStorage<AzureStorageCredential, "azure" | "az">;
-
-export interface AzureStorageCredential {
-    accountName?: string;
-    accountKey?: string;
-    connectionString?: string;
-    sharedAccessSignature?: string;
-}
-
-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;
+import type { CloudDatabase, CloudStorage } from '@e-mc/types/lib/cloud';
+
+import type { CosmosClientOptions, FeedOptions, PartitionKey, PatchRequestBody, RequestOptions, SqlQuerySpec } from '@azure/cosmos';
+
+export type AzureStorage = CloudStorage<AzureStorageCredential, "azure" | "az">;
+
+export interface AzureStorageCredential {
+    accountName?: string;
+    accountKey?: string;
+    accountSas?: string;
+    connectionString?: string;
+    sharedAccessSignature?: string;
+}
+
+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;
 }