@pi-r/aws-v3 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/aws-v3
 
-PEP 402 - Forever
+PEP 402 - Forever Aina
 
 ## LICENSE
 

package/client/index.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeBatchQuery = exports.executeQuery = exports.deleteObjectsV2 = exports.deleteObjects = exports.setBucketWebsite = exports.setBucketPolicy = exports.createBucketV2 = exports.createBucket = exports.validateDatabase = exports.validateStorage = exports.createDatabaseClient = exports.createStorageClient = void 0;
+const Lib = require("@aws-sdk/lib-dynamodb");
+const Client = require("@aws-sdk/client-dynamodb");
 const aws_1 = require("@pi-r/aws");
 const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
@@ -70,22 +72,15 @@ function createStorageClient(credential, service = 'aws-v3', sdk = '@aws-sdk/cli
 }
 exports.createStorageClient = createStorageClient;
 function createDatabaseClient(credential) {
-    try {
-        const AWS = require('@aws-sdk/lib-dynamodb');
-        const { DynamoDBClient } = require('@aws-sdk/client-dynamodb');
-        return [AWS.DynamoDBDocumentClient.from(new DynamoDBClient(credential), credential.translateConfig), AWS];
-    }
-    catch (err) {
-        this.checkPackage(err, '@aws-sdk', { passThrough: true });
-        throw err;
-    }
+    return [Lib.DynamoDBDocumentClient.from(new Client.DynamoDBClient(credential), credential.translateConfig), Lib];
 }
 exports.createDatabaseClient = createDatabaseClient;
 function validateStorage(credential) {
     const credentials = sanitizeCredentials(credential);
-    if (credential.profile || !credentials && process.env.AWS_SDK_LOAD_CONFIG === '1') {
+    const profile = credential.profile;
+    if (profile || !credentials && process.env.AWS_SDK_LOAD_CONFIG === '1') {
         const { fromIni } = require('@aws-sdk/credential-provider-ini');
-        credential.credentials = fromIni({ profile: credential.profile });
+        credential.credentials = fromIni({ profile });
         return true;
     }
     return !!credentials && (typeof credentials === 'function' || (0, aws_1.isAccessDefined)(credentials) || (0, aws_1.isEnvDefined)());
@@ -112,8 +107,8 @@ function createBucketV2(credential, Bucket, ACL, options, service = 'aws-v3', sd
         .catch(() => {
         const input = { ...options, Bucket };
         const region = credential.region;
-        if (!input.CreateBucketConfiguration && typeof region === 'string' && region !== 'us-east-1') {
-            input.CreateBucketConfiguration = { LocationConstraint: region };
+        if (typeof region === 'string' && region !== 'us-east-1') {
+            input.CreateBucketConfiguration || (input.CreateBucketConfiguration = { LocationConstraint: region });
         }
         return client.send(new AWS.CreateBucketCommand(input))
             .then(async () => {
@@ -160,11 +155,12 @@ exports.setBucketPolicy = setBucketPolicy;
 function setBucketWebsite(credential, Bucket, options, service = 'aws', sdk = 'aws-sdk/clients/s3') {
     const [client, AWS] = 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 client.send(new AWS.PutBucketWebsiteCommand({ Bucket, WebsiteConfiguration }))
         .then(() => {
@@ -194,8 +190,9 @@ async function deleteObjectsV2(credential, Bucket, recursive = true, service = '
             }
             return client.send(new AWS.DeleteObjectsCommand({ Bucket, Delete: { Objects } }))
                 .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 });
                 }
             })
@@ -254,9 +251,9 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             if (update) {
                 await db.send(new AWS.UpdateCommand({ ...command, ...update }));
             }
-            const output = await db.send(new AWS.GetCommand(command));
-            if (output.Item) {
-                rows = [output.Item];
+            const Item = (await db.send(new AWS.GetCommand(command))).Item;
+            if (Item) {
+                rows = [Item];
             }
         }
         else if ((0, types_1.isPlainObject)(query)) {

package/download/index.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const client_1 = require("@pi-r/aws-v3");
 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-v3");
 function download(config, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
     const [client, AWS] = client_1.createStorageClient.call(this, config, service, sdk);
     return (data, callback) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/aws-v3",
-  "version": "0.2.8",
+  "version": "0.3.2",
   "description": "AWS V3 cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -20,10 +20,10 @@
   "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",
-    "@pi-r/aws": "^0.2.8",
+    "@e-mc/cloud": "^0.6.1",
+    "@e-mc/module": "^0.6.1",
+    "@e-mc/types": "^0.6.1",
+    "@pi-r/aws": "^0.3.2",
     "@aws-sdk/client-dynamodb": "^3.525.0",
     "@aws-sdk/client-s3": "^3.525.0",
     "@aws-sdk/lib-dynamodb": "^3.525.0"

package/upload/index.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const fs = require("fs");
 const stream = require("stream");
-const client_1 = require("@pi-r/aws-v3");
 const util_1 = require("@e-mc/cloud/util");
 const aws_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-v3");
 const BUCKET_SESSION = new Set();
 const BUCKET_RESPONSE = {};
 function upload(credential, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {