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

package/client/index.js

@@ -1,8 +1,6 @@
 "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");
@@ -73,15 +71,22 @@ function createStorageClient(credential, service = 'aws-v3', sdk = '@aws-sdk/cli
 }
 exports.createStorageClient = createStorageClient;
 function createDatabaseClient(credential) {
-    return [Lib.DynamoDBDocumentClient.from(new Client.DynamoDBClient(credential), credential.translateConfig), Lib];
+    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;
+    }
 }
 exports.createDatabaseClient = createDatabaseClient;
 function validateStorage(credential) {
     const credentials = sanitizeCredentials(credential);
-    const profile = credential.profile;
-    if (profile || !credentials && process.env.AWS_SDK_LOAD_CONFIG === '1') {
+    if (credential.profile || !credentials && process.env.AWS_SDK_LOAD_CONFIG === '1') {
         const { fromIni } = require('@aws-sdk/credential-provider-ini');
-        credential.credentials = fromIni({ profile });
+        credential.credentials = fromIni({ profile: credential.profile });
         return true;
     }
     return !!credentials && (typeof credentials === 'function' || (0, aws_1.isAccessDefined)(credentials) || (0, aws_1.isEnvDefined)());
@@ -108,8 +113,8 @@ function createBucketV2(credential, Bucket, ACL, options, service = 'aws-v3', sd
         .catch(() => {
         const input = { ...options, Bucket };
         const region = credential.region;
-        if (typeof region === 'string' && region !== 'us-east-1') {
-            input.CreateBucketConfiguration || (input.CreateBucketConfiguration = { LocationConstraint: region });
+        if (!input.CreateBucketConfiguration && typeof region === 'string' && region !== 'us-east-1') {
+            input.CreateBucketConfiguration = { LocationConstraint: region };
         }
         return client.send(new AWS.CreateBucketCommand(input))
             .then(async () => {
@@ -156,12 +161,11 @@ 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 = {};
-    const { indexPage: Suffix, errorPage: Key } = options;
-    if ((0, types_1.isString)(Suffix)) {
-        WebsiteConfiguration.IndexDocument = { Suffix };
+    if ((0, types_1.isString)(options.indexPage)) {
+        WebsiteConfiguration.IndexDocument = { Suffix: options.indexPage };
     }
-    if ((0, types_1.isString)(Key)) {
-        WebsiteConfiguration.ErrorDocument = { Key };
+    if ((0, types_1.isString)(options.errorPage)) {
+        WebsiteConfiguration.ErrorDocument = { Key: options.errorPage };
     }
     return client.send(new AWS.PutBucketWebsiteCommand({ Bucket, WebsiteConfiguration }))
         .then(() => {
@@ -191,9 +195,8 @@ async function deleteObjectsV2(credential, Bucket, recursive = true, service = '
             }
             return client.send(new AWS.DeleteObjectsCommand({ Bucket, Delete: { Objects } }))
                 .then(data => {
-                const Deleted = data.Deleted;
-                if ((0, types_1.isArray)(Deleted)) {
-                    const files = Deleted.length + ' files';
+                if ((0, types_1.isArray)(data.Deleted)) {
+                    const files = data.Deleted.length + ' files';
                     this.formatMessage(64, service, ["Bucket emptied" + ` (${recursive ? 'recursive' : files})`, Bucket], recursive ? files : '', { ...Cloud.LOG_CLOUD_COMMAND });
                 }
             })
@@ -252,9 +255,9 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             if (update) {
                 await db.send(new AWS.UpdateCommand({ ...command, ...update }));
             }
-            const Item = (await db.send(new AWS.GetCommand(command))).Item;
-            if (Item) {
-                rows = [Item];
+            const output = await db.send(new AWS.GetCommand(command));
+            if (output.Item) {
+                rows = [output.Item];
             }
         }
         else if ((0, types_1.isPlainObject)(query)) {

package/download/index.js

@@ -1,9 +1,9 @@
 "use strict";
+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,31 +1,31 @@
-{
-  "name": "@pi-r/aws-v3",
-  "version": "0.3.4",
-  "description": "AWS V3 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/aws-v3"
-  },
-  "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",
-    "@pi-r/aws": "^0.3.4",
-    "@aws-sdk/client-dynamodb": "^3.540.0",
-    "@aws-sdk/client-s3": "^3.540.0",
-    "@aws-sdk/lib-dynamodb": "^3.540.0"
-  }
-}
+{
+  "name": "@pi-r/aws-v3",
+  "version": "0.3.6",
+  "description": "AWS V3 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/aws-v3"
+  },
+  "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",
+    "@pi-r/aws": "^0.3.6",
+    "@aws-sdk/client-dynamodb": "^3.614.0",
+    "@aws-sdk/client-s3": "^3.614.0",
+    "@aws-sdk/lib-dynamodb": "^3.614.0"
+  }
+}

package/types/index.d.ts

@@ -0,0 +1,42 @@
+import type { CloudDatabase, CloudStorage } from '@e-mc/types/lib/cloud';
+
+import type { AwsSdkSigV4AuthInputConfig } from '@aws-sdk/core';
+import type { DynamoDBClientConfig, QueryCommandInput, ScanCommandInput, TransactGetItemsCommandInput } from '@aws-sdk/client-dynamodb';
+import type { BatchGetCommandInput, NativeAttributeValue, TranslateConfig, UpdateCommandInput } from '@aws-sdk/lib-dynamodb';
+import type { S3ClientConfig } from '@aws-sdk/client-s3';
+import type { AwsCredentialIdentity, AwsCredentialIdentityProvider } from '@aws-sdk/types';
+
+export interface AWSBaseCredential extends Omit<AwsSdkSigV4AuthInputConfig, "credentials"> {
+    credentials?: AwsCredentialIdentity | AwsCredentialIdentityProvider;
+    provider?: {
+        http?: unknown;
+        ini?: unknown;
+        cognitoIdentity?: unknown;
+        cognitoIdentityPool?: unknown;
+        temporaryCredentials?: unknown;
+        webToken?: unknown;
+        containerMetadata?: unknown;
+        instanceMetadata?: unknown;
+        process?: unknown;
+        tokenFile?: unknown;
+        sso?: unknown;
+        env?: unknown;
+        nodeProviderChain?: unknown;
+    };
+}
+
+export type AWSStorage = CloudStorage<AWSStorageCredential, "aws-v3">;
+
+export interface AWSStorageCredential extends S3ClientConfig, AWSBaseCredential {}
+
+export interface AWSDatabaseQuery extends CloudDatabase<QueryCommandInput | ObjectMap<NativeAttributeValue>[] | string, PlainObject, UpdateCommandInput | string, BatchGetCommandInput | ScanCommandInput | TransactGetItemsCommandInput | NativeAttributeValue[]> {
+    source: "cloud";
+    service: "aws-v3";
+    key?: string | AttributeKey;
+}
+
+export interface AWSDatabaseCredential extends Omit<DynamoDBClientConfig, "credentials">, AWSBaseCredential {
+    translateConfig?: TranslateConfig;
+}
+
+export type AttributeKey = Record<string, NativeAttributeValue>;

package/upload/index.js

@@ -2,12 +2,12 @@
 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') {