@pi-r/azure 0.5.0 → 0.5.3

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 An Pham
+Copyright 2023 Haruhi Suzumiya
 
 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,5 +1,7 @@
-### @pi-r/azure
+# @pi-r/azure
 
-### LICENSE
+PEP 402 - Forever
+
+## LICENSE
 
 MIT

package/client/index.js

@@ -14,11 +14,11 @@ function validateStorage(credential) {
     if (credential.accountName && credential.accountKey || credential.connectionString || credential.sharedAccessSignature || env.AZURE_TENANT_ID && env.AZURE_CLIENT_ID && env.AZURE_CLIENT_SECRET && (credential.accountName || env.AZURE_STORAGE_ACCOUNT)) {
         return true;
     }
-    return Module.enabled("process.env.apply" /* KEY_NAME.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));
+    return Module.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));
 }
 exports.validateStorage = validateStorage;
 function validateDatabase(credential, data) {
-    return !!(data.name && data.table && (credential.endpoint && credential.key || Module.enabled("process.env.apply" /* KEY_NAME.PROCESS_ENV_APPLY */) && (credential.endpoint = process.env.AZURE_COSMOS_ENDPOINT) && (credential.key = process.env.AZURE_COSMOS_KEY)));
+    return !!(data.name && data.table && (credential.endpoint && credential.key || Module.enabled("process.env.apply") && (credential.endpoint = process.env.AZURE_COSMOS_ENDPOINT) && (credential.key = process.env.AZURE_COSMOS_KEY)));
 }
 exports.validateDatabase = validateDatabase;
 function createStorageClient(credential) {
@@ -60,7 +60,7 @@ async function createBucketV2(credential, bucket, access, options, service = 'az
             break;
     }
     const containerClient = createStorageClient.call(this, credential).getContainerClient(bucket);
-    const setAccessPolicy = () => containerClient.setAccessPolicy(access).catch(err => this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Unable to configure container" /* ERR_AZURE.CONFIGURE_CONTAINER */, bucket], err, { ...Cloud.LOG_CLOUD_WARN }));
+    const setAccessPolicy = () => containerClient.setAccessPolicy(access).catch(err => this.formatMessage(64, service, ["Unable to configure container", bucket], err, { ...Cloud.LOG_CLOUD_WARN }));
     if (await containerClient.exists().catch(() => false)) {
         if (access) {
             await setAccessPolicy();
@@ -76,10 +76,10 @@ async function createBucketV2(credential, bucket, access, options, service = 'az
         .then(response => {
         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 });
+            this.formatMessage(64, service, ['Container created with errors', bucket], (0, types_1.errorMessage)("Error code", errorCode), { ...Cloud.LOG_CLOUD_WARN });
         }
         else {
-            this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ['Container created', bucket], requestId, { ...Cloud.LOG_CLOUD_COMMAND });
+            this.formatMessage(64, service, ['Container created', bucket], requestId, { ...Cloud.LOG_CLOUD_COMMAND });
         }
         return true;
     })
@@ -90,7 +90,7 @@ async function createBucketV2(credential, bucket, access, options, service = 'az
             }
             return true;
         }
-        this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Unable to create container" /* ERR_AZURE.CREATE_CONTAINER */, bucket], err, { ...Cloud.LOG_CLOUD_FAIL });
+        this.formatFail(64, service, ["Unable to create container", bucket], err, { ...Cloud.LOG_CLOUD_FAIL });
         return false;
     });
 }
@@ -109,11 +109,11 @@ function setBucketWebsite(credential, bucket, options, service = 'azure') {
     }
     return createStorageClient.call(this, credential).setProperties({ staticWebsite })
         .then(() => {
-        this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket configured" /* VAL_CLOUD.CONFIGURE_BUCKET */, bucket], options, { ...Cloud.LOG_CLOUD_COMMAND });
+        this.formatMessage(64, service, ["Bucket configured", bucket], options, { ...Cloud.LOG_CLOUD_COMMAND });
         return true;
     })
         .catch(err => {
-        this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Unable to configure bucket" /* ERR_CLOUD.CONFIGURE_BUCKET */, bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
+        this.formatFail(64, service, ["Unable to configure bucket", bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
         return false;
     });
 }
@@ -135,13 +135,13 @@ async function deleteObjectsV2(credential, bucket, recursive = true, service = '
                 tasks.push(containerClient.deleteBlob(blob.name, { versionId: blob.versionId }).catch(() => { --fileCount; }));
             }
             fileCount = tasks.length;
-            return this.allSettled(tasks, ["Unable to delete blob" /* ERR_AZURE.DELETE_BLOB */, bucket], 64 /* LOG_TYPE.CLOUD */).then(() => {
+            return this.allSettled(tasks, ["Unable to delete blob", bucket], 64).then(() => {
                 const files = fileCount + ' files';
-                this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, [`Container emptied (${recursive ? 'recursive' : files})`, bucket], recursive ? files : '', { ...Cloud.LOG_CLOUD_COMMAND });
+                this.formatMessage(64, service, [`Container emptied (${recursive ? 'recursive' : files})`, bucket], recursive ? files : '', { ...Cloud.LOG_CLOUD_COMMAND });
             });
         }
         catch (err) {
-            this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Unable to list bucket" /* ERR_CLOUD.LIST_BUCKET */, bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
+            this.formatFail(64, service, ["Unable to list bucket", bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
         }
     }
 }
@@ -166,7 +166,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         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 */);
+            throw (0, util_1.formatError)(item, name ? "Missing database table" : "Missing database name");
         }
         const renewCache = ignoreCache === 0;
         const getCache = (value) => {
@@ -179,19 +179,19 @@ 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 += Module.asString(partitionKey) + '_' + storedProcedureId + Module.asString(params, true) + Module.asString(options, true)))) {
+            if (queryString && (rows = getCache(queryString += Module.asString(partitionKey, true) + '_' + storedProcedureId + Module.asString(params, true) + Module.asString(options, true)))) {
                 result[i] = rows;
                 continue;
             }
             const { statusCode, resource } = await createClient(name, table).scripts.storedProcedure(storedProcedureId).execute(partitionKey, params, options);
-            if (statusCode === 200 /* HTTP_STATUS.OK */) {
+            if (statusCode === 200) {
                 rows = Array.isArray(resource) ? resource : [resource];
             }
         }
         else if (id) {
             const { options } = item;
             if (queryString) {
-                queryString += Module.asString(partitionKey) + '_' + id + Module.asString(options, true);
+                queryString += Module.asString(partitionKey, true) + '_' + id + Module.asString(options, true);
                 if (!update && (rows = getCache(queryString))) {
                     result[i] = rows;
                     continue;
@@ -199,7 +199,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             }
             const db = createClient(name, table).item(id, partitionKey);
             const { statusCode, resource } = update ? await db.patch(update, options) : await db.read(options);
-            if (statusCode === 200 /* HTTP_STATUS.OK */) {
+            if (statusCode === 200) {
                 rows = [resource];
             }
         }
@@ -208,7 +208,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             if (limit > 0) {
                 (options || (options = {})).maxItemCount = limit;
             }
-            if (queryString && (rows = getCache(queryString += Module.asString(query) + Module.asString(options, true)))) {
+            if (queryString && (rows = getCache(queryString += Module.asString(query, true) + Module.asString(options, true)))) {
                 result[i] = rows;
                 continue;
             }
@@ -216,7 +216,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         }
         else {
             closeClient();
-            throw (0, util_1.formatError)(item, "Missing database query" /* ERR_DB.QUERY */);
+            throw (0, util_1.formatError)(item, "Missing database query");
         }
         result[i] = this.setQueryResult(service, credential, queryString, rows, cacheValue);
     }

package/download/index.js

@@ -1,9 +1,8 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 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 client_1 = require("@pi-r/azure");
 function download(credential, service = 'azure') {
     const blobServiceClient = client_1.createStorageClient.call(this, credential);
     return (data, callback) => {
@@ -21,10 +20,10 @@ function download(credential, service = 'azure') {
             const deleteObject = 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 }))
+                    .then(() => this.formatMessage(64, service, "Delete success", location, { ...Cloud.LOG_CLOUD_DELETE }))
                     .catch((err) => {
                     if (!(err instanceof Error && err.code === 'BlobNotFound')) {
-                        this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Delete failed" /* ERR_CLOUD.DELETE_FAIL */, location], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: !!target.active });
+                        this.formatFail(64, service, ["Delete failed", location], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: !!target.active });
                     }
                 });
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/azure",
-  "version": "0.5.0",
+  "version": "0.5.3",
   "description": "Azure cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -8,7 +8,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/anpham6/pi-r.git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
     "directory": "src/cloud/azure"
   },
   "keywords": [
@@ -20,11 +20,11 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.7.0",
-    "@e-mc/module": "^0.7.0",
-    "@e-mc/types": "^0.7.0",
+    "@e-mc/cloud": "^0.7.3",
+    "@e-mc/module": "^0.7.3",
+    "@e-mc/types": "^0.7.3",
     "@azure/cosmos": "^4.0.0",
-    "@azure/identity": "^4.0.0",
+    "@azure/identity": "^4.0.1",
     "@azure/storage-blob": "^12.17.0"
   }
 }

package/types/index.d.ts

@@ -0,0 +1,24 @@
+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> extends CloudDatabase<string | SqlQuerySpec, T, PatchRequestBody, 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,12 +1,11 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const fs = require("fs");
 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 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;
@@ -47,7 +46,7 @@ function upload(credential, service = 'azure') {
             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 });
+                this.formatMessage(64, service, ["Bucket configured" + ' (retention policy)', bucket], expiresOn ? expiresOn.toLocaleString() + ' (expires)' : startsOn ? startsOn.toLocaleString() + ' (starts)' : permissions, { ...Cloud.LOG_CLOUD_COMMAND });
             })
                 .catch(err => addLog(err));
         }
@@ -72,7 +71,7 @@ function upload(credential, service = 'azure') {
                     }
                 } while (exists && ++i);
                 if (i > 0) {
-                    this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["File renamed" /* VAL_CLOUD.RENAME_FILE */, current], filename, { ...Cloud.LOG_CLOUD_WARN });
+                    this.formatMessage(64, service, ["File renamed", current], filename, { ...Cloud.LOG_CLOUD_WARN });
                 }
             }
             catch (err) {
@@ -117,7 +116,7 @@ function upload(credential, service = 'azure') {
                 .then(result => {
                 let requestUrl = result._response.request.url;
                 const url = endpoint ? Module.joinPath(endpoint, blobName) : Module.isFile(requestUrl = decodeURIComponent(requestUrl), 'http/s') ? requestUrl : Module.joinPath(`https://${credential.accountName}.blob.core.windows.net`, bucket, blobName);
-                this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Upload success" /* VAL_CLOUD.UPLOAD_FILE */, url, { ...Cloud.LOG_CLOUD_UPLOAD });
+                this.formatMessage(64, service, "Upload success", url, { ...Cloud.LOG_CLOUD_UPLOAD });
                 if (first) {
                     cleanup();
                     callback(null, url);