@pi-r/aws 0.3.6 → 0.3.7

package/client/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isNoSuchBucket = exports.getBucketKey = exports.checkBucketCannedACL = exports.setDatabaseEndpoint = exports.executeBatchQuery = exports.executeQuery = exports.deleteObjectsV2 = exports.deleteObjects = exports.setBucketWebsite = exports.setBucketPolicy = exports.createBucketV2 = exports.createBucket = exports.createDatabaseClient = exports.createStorageClient = exports.validateDatabase = exports.validateStorage = exports.getPrivatePolicy = exports.getBucketPublicReadPolicy = exports.getPublicReadPolicy = exports.isDatabaseDefined = exports.isEnvDefined = exports.isAccessDefined = void 0;
+const aws = require("aws-sdk");
 const types_1 = require("@e-mc/types");
 const util_1 = require("@e-mc/cloud/util");
 const Module = require("@e-mc/module");
@@ -123,20 +124,18 @@ exports.validateDatabase = validateDatabase;
 function createStorageClient(credential, service = 'aws', sdk = 'aws-sdk/clients/s3') {
     try {
         if (service === 'aws') {
-            const S3 = require('aws-sdk/clients/s3');
-            if (credential.fromPath) {
-                const client = new S3();
-                client.config.loadFromPath(credential.fromPath);
+            const { profile, fromPath } = credential;
+            if (fromPath) {
+                const client = new aws.S3();
+                client.config.loadFromPath(fromPath);
                 return client;
             }
-            if (credential.profile || process.env.AWS_SDK_LOAD_CONFIG === '1' && !isAccessDefined(credential) && !isEnvDefined()) {
-                const { SharedIniFileCredentials } = require('aws-sdk');
-                credential = new SharedIniFileCredentials({ profile: credential.profile });
+            if (profile || process.env.AWS_SDK_LOAD_CONFIG === '1' && !isAccessDefined(credential) && !isEnvDefined()) {
+                credential = new aws.SharedIniFileCredentials({ profile });
             }
-            return new S3(credential);
+            return new aws.S3(credential);
         }
-        const S3 = require(sdk);
-        return new S3(credential);
+        return new (require(sdk))(credential);
     }
     catch (err) {
         this.checkPackage(err, sdk.split('/')[0], { passThrough: true });
@@ -145,26 +144,18 @@ function createStorageClient(credential, service = 'aws', sdk = 'aws-sdk/clients
 }
 exports.createStorageClient = createStorageClient;
 function createDatabaseClient(credential) {
-    try {
-        let options;
-        if (credential.fromPath) {
-            const AWS = require('aws-sdk');
-            AWS.config.loadFromPath(credential.fromPath);
-        }
-        else if (credential.profile || process.env.AWS_SDK_LOAD_CONFIG === '1' && !isAccessDefined(credential) && !isEnvDefined()) {
-            const { SharedIniFileCredentials } = require('aws-sdk');
-            options = new SharedIniFileCredentials({ profile: credential.profile });
-        }
-        else {
-            options = credential;
-        }
-        const DynamoDB = require('aws-sdk/clients/dynamodb');
-        return new DynamoDB.DocumentClient(options);
+    const { profile, fromPath } = credential;
+    let options;
+    if (fromPath) {
+        aws.config.loadFromPath(fromPath);
     }
-    catch (err) {
-        this.checkPackage(err, 'aws-sdk', { passThrough: true });
-        throw err;
+    else if (profile || process.env.AWS_SDK_LOAD_CONFIG === '1' && !isAccessDefined(credential) && !isEnvDefined()) {
+        options = new aws.SharedIniFileCredentials({ profile });
+    }
+    else {
+        options = credential;
     }
+    return new aws.DynamoDB.DocumentClient(options);
 }
 exports.createDatabaseClient = createDatabaseClient;
 function createBucket(credential, Bucket, publicRead, service = 'aws', sdk = 'aws-sdk/clients/s3') {
@@ -184,8 +175,8 @@ function createBucketV2(credential, Bucket, ACL, options, service = 'aws', sdk =
         .catch(() => {
         const input = { ...options, Bucket };
         const region = credential.region;
-        if (!input.CreateBucketConfiguration && typeof region === 'string' && (region !== 'us-east-1' || service !== 'aws')) {
-            input.CreateBucketConfiguration = { LocationConstraint: region };
+        if (region && (region !== 'us-east-1' || service !== 'aws')) {
+            input.CreateBucketConfiguration || (input.CreateBucketConfiguration = { LocationConstraint: region });
         }
         return S3.createBucket(input).promise()
             .then(async () => {
@@ -235,11 +226,12 @@ exports.setBucketPolicy = setBucketPolicy;
 function setBucketWebsite(credential, Bucket, options, service = 'aws', sdk = 'aws-sdk/clients/s3') {
     const S3 = createStorageClient.call(this, credential, service, sdk);
     const WebsiteConfiguration = {};
-    if ((0, types_1.isString)(options.indexPage)) {
-        WebsiteConfiguration.IndexDocument = { Suffix: options.indexPage };
+    const { indexPage: Suffix, errorPage: Key } = options;
+    if ((0, types_1.isString)(Suffix)) {
+        WebsiteConfiguration.IndexDocument = { Suffix };
     }
-    if ((0, types_1.isString)(options.errorPage)) {
-        WebsiteConfiguration.ErrorDocument = { Key: options.errorPage };
+    if ((0, types_1.isString)(Key)) {
+        WebsiteConfiguration.ErrorDocument = { Key };
     }
     return S3.putBucketWebsite({ Bucket, WebsiteConfiguration }).promise()
         .then(() => {
@@ -269,8 +261,9 @@ async function deleteObjectsV2(credential, Bucket, recursive = true, service = '
             }
             return S3.deleteObjects({ Bucket, Delete: { Objects } }).promise()
                 .then(data => {
-                if ((0, types_1.isArray)(data.Deleted)) {
-                    const files = data.Deleted.length + ' files';
+                const Deleted = data.Deleted;
+                if ((0, types_1.isArray)(Deleted)) {
+                    const files = Deleted.length + ' files';
                     this.formatMessage(64, service, ["Bucket emptied" + ` (${recursive ? 'recursive' : files})`, Bucket], recursive ? files : '', { ...Cloud.LOG_CLOUD_COMMAND });
                 }
             })
@@ -329,9 +322,9 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             if (update) {
                 await client.update({ ...command, ...update }).promise();
             }
-            const output = await client.get(command).promise();
-            if (output.Item) {
-                rows = [output.Item];
+            const Item = (await client.get(command).promise()).Item;
+            if (Item) {
+                rows = [Item];
             }
         }
         else if ((0, types_1.isPlainObject)(query)) {
@@ -343,9 +336,9 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             if (limit > 0) {
                 query.Limit = limit;
             }
-            const output = await createClient().query(query).promise();
-            if (output.Count && output.Items) {
-                rows = output.Items;
+            const { Count, Items } = await createClient().query(query).promise();
+            if (Count && Items) {
+                rows = Items;
             }
         }
         else {
@@ -358,9 +351,10 @@ async function executeBatchQuery(credential, batch, sessionKey) {
 exports.executeBatchQuery = executeBatchQuery;
 function setDatabaseEndpoint(config) {
     var _a, _b;
-    config.endpoint || (config.endpoint = `https://dynamodb.${(0, types_1.isString)(config.region) ? config.region : process.env.AWS_DEFAULT_REGION || 'us-east-1'}.amazonaws.com`);
-    if (!config.region && (0, types_1.isString)(config.endpoint)) {
-        const region = (_b = (((_a = /dynamodb\.([^.]+)\./i.exec(config.endpoint)) === null || _a === void 0 ? void 0 : _a[1]) || process.env.AWS_DEFAULT_REGION)) === null || _b === void 0 ? void 0 : _b.toLowerCase();
+    let region = config.region;
+    config.endpoint || (config.endpoint = `https://dynamodb.${(0, types_1.isString)(region) ? region : process.env.AWS_DEFAULT_REGION || 'us-east-1'}.amazonaws.com`);
+    if (!region && (0, types_1.isString)(config.endpoint)) {
+        region = (_b = (((_a = /dynamodb\.([^.]+)\./i.exec(config.endpoint)) === null || _a === void 0 ? void 0 : _a[1]) || process.env.AWS_DEFAULT_REGION)) === null || _b === void 0 ? void 0 : _b.toLowerCase();
         if (region && region !== 'us-east-1') {
             config.region = region;
         }

package/download/index.js

@@ -1,8 +1,8 @@
 "use strict";
-const client_1 = require("@pi-r/aws");
 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/aws");
 function download(credential, service = 'aws', sdk = 'aws-sdk/clients/s3') {
     const s3 = client_1.createStorageClient.call(this, credential, service, sdk);
     return (data, callback) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/aws",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "AWS V2 cloud functions for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",

package/upload/index.js

@@ -1,11 +1,11 @@
 "use strict";
 const path = require("path");
 const fs = require("fs");
-const client_1 = require("@pi-r/aws");
 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/aws");
 const BUCKET_SESSION = new Set();
 const BUCKET_RESPONSE = {};
 function upload(credential, service = 'aws', sdk = 'aws-sdk/clients/s3') {