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

package/client/index.js

@@ -23,16 +23,16 @@ function setCannedAcl(S3, client, Bucket, ACL, service = 'aws-v3', recursive) {
     }
     return client.send(new S3.PutBucketPolicyCommand({ Bucket, Policy }))
         .then(() => {
-        this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ['Grant ' + ACL, Bucket], '', { ...recursive ? Cloud.LOG_CLOUD_DELAYED : Cloud.LOG_CLOUD_COMMAND });
+        this.formatMessage(64, service, ['Grant ' + ACL, Bucket], '', { ...recursive ? Cloud.LOG_CLOUD_DELAYED : Cloud.LOG_CLOUD_COMMAND });
     })
         .catch((err) => {
         if (!recursive && err instanceof Error) {
             if (err.name === 'OperationAborted') {
-                setTimeout(() => setCannedAcl.call(this, S3, client, Bucket, ACL, service, true), 60000 /* TIME.m */);
-                this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, [`Grant ${ACL} (delayed)`, err.Endpoint || Bucket], err, { ...Cloud.LOG_CLOUD_DELAYED });
+                setTimeout(() => setCannedAcl.call(this, S3, client, Bucket, ACL, service, true), 60000);
+                this.formatMessage(64, service, [`Grant ${ACL} (delayed)`, err.Endpoint || Bucket], err, { ...Cloud.LOG_CLOUD_DELAYED });
             }
             else {
-                this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ['Unable to grant ' + ACL, err.Endpoint || Bucket], err, { ...Cloud.LOG_CLOUD_WARN });
+                this.formatMessage(64, service, ['Unable to grant ' + ACL, err.Endpoint || Bucket], err, { ...Cloud.LOG_CLOUD_WARN });
             }
         }
     });
@@ -112,7 +112,7 @@ function createBucketV2(credential, Bucket, ACL, options, service = 'aws-v3', sd
         }
         return client.send(new AWS.CreateBucketCommand(input))
             .then(async () => {
-            this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket created" /* VAL_CLOUD.CREATE_BUCKET */, Bucket], '', { ...Cloud.LOG_CLOUD_COMMAND });
+            this.formatMessage(64, service, ["Bucket created", Bucket], '', { ...Cloud.LOG_CLOUD_COMMAND });
             if (ACL) {
                 await setCannedAcl.call(this, AWS, client, Bucket, ACL, service);
             }
@@ -127,7 +127,7 @@ function createBucketV2(credential, Bucket, ACL, options, service = 'aws-v3', sd
                     }
                     return true;
                 default:
-                    this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Unable to create bucket" /* ERR_CLOUD.CREATE_BUCKET */, Bucket], err, { ...Cloud.LOG_CLOUD_FAIL });
+                    this.formatFail(64, service, ["Unable to create bucket", Bucket], err, { ...Cloud.LOG_CLOUD_FAIL });
                     return false;
             }
         });
@@ -141,12 +141,12 @@ function setBucketPolicy(credential, Bucket, options, service = 'aws', sdk = 'aw
     options.Bucket = Bucket;
     return (block ? client.send(new AWS.PutPublicAccessBlockCommand(options)) : policy ? client.send(new AWS.PutBucketPolicyCommand(options)) : client.send(new AWS.PutBucketAclCommand(options)))
         .then(() => {
-        this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, [block ? "Bucket configured" /* VAL_CLOUD.CONFIGURE_BUCKET */ : policy ? "Bucket policy configured" /* VAL_CLOUD.POLICY_BUCKET */ : "Bucket ACL configured" /* VAL_CLOUD.ACL_BUCKET */, Bucket], '', { ...Cloud.LOG_CLOUD_COMMAND });
+        this.formatMessage(64, service, [block ? "Bucket configured" : policy ? "Bucket policy configured" : "Bucket ACL configured", Bucket], '', { ...Cloud.LOG_CLOUD_COMMAND });
         return true;
     })
         .catch(err => {
         if (!isNoSuchBucket(err)) {
-            this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Unable to update bucket policy" /* ERR_CLOUD.POLICY_BUCKET */, Bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
+            this.formatFail(64, service, ["Unable to update bucket policy", Bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
         }
         return false;
     });
@@ -164,12 +164,12 @@ function setBucketWebsite(credential, Bucket, options, service = 'aws', sdk = 'a
     }
     return client.send(new AWS.PutBucketWebsiteCommand({ Bucket, WebsiteConfiguration }))
         .then(() => {
-        this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket configured" /* VAL_CLOUD.CONFIGURE_BUCKET */, Bucket], WebsiteConfiguration, { ...Cloud.LOG_CLOUD_COMMAND });
+        this.formatMessage(64, service, ["Bucket configured", Bucket], WebsiteConfiguration, { ...Cloud.LOG_CLOUD_COMMAND });
         return true;
     })
         .catch(err => {
         if (!isNoSuchBucket(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;
     });
@@ -193,17 +193,17 @@ async function deleteObjectsV2(credential, Bucket, recursive = true, service = '
                 const Deleted = data.Deleted;
                 if ((0, types_1.isArray)(Deleted)) {
                     const files = Deleted.length + ' files';
-                    this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket emptied" /* VAL_CLOUD.EMPTY_BUCKET */ + ` (${recursive ? 'recursive' : files})`, Bucket], recursive ? files : '', { ...Cloud.LOG_CLOUD_COMMAND });
+                    this.formatMessage(64, service, ["Bucket emptied" + ` (${recursive ? 'recursive' : files})`, Bucket], recursive ? files : '', { ...Cloud.LOG_CLOUD_COMMAND });
                 }
             })
                 .catch(err => {
-                this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Unable to empty bucket" /* ERR_CLOUD.DELETE_BUCKET */, Bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
+                this.formatFail(64, service, ["Unable to empty bucket", Bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
             });
         }
     })
         .catch(err => {
         if (!isNoSuchBucket(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 });
         }
     });
 }
@@ -225,7 +225,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         const { service, table, id = '', query, partitionKey, key = partitionKey, limit = 0, update, ignoreCache } = item;
         if (!table) {
             closeClient();
-            throw (0, util_1.formatError)(item, "Missing database table" /* ERR_DB.TABLE */);
+            throw (0, util_1.formatError)(item, "Missing database table");
         }
         (0, aws_1.setDatabaseEndpoint)(credential);
         const renewCache = ignoreCache === 0;
@@ -273,7 +273,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,10 +1,9 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 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/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) => {
@@ -25,8 +24,8 @@ function download(config, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
                     input = Object.assign(deleteObject, input);
                 }
                 client.send(new AWS.DeleteObjectCommand(input))
-                    .then(() => this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Delete success" /* VAL_CLOUD.DELETE_FILE */, location, { ...Cloud.LOG_CLOUD_DELETE }))
-                    .catch(err => this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Delete failed" /* ERR_CLOUD.DELETE_FAIL */, location], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: !!target.active }));
+                    .then(() => this.formatMessage(64, service, "Delete success", location, { ...Cloud.LOG_CLOUD_DELETE }))
+                    .catch(err => this.formatFail(64, service, ["Delete failed", location], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: !!target.active }));
             }
         })
             .catch(err => callback(err));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/aws-v3",
-  "version": "0.5.0",
+  "version": "0.5.3",
   "description": "AWS V3 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/aws-v3"
   },
   "keywords": [
@@ -20,12 +20,12 @@
   "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",
-    "@pi-r/aws": "^0.5.0",
-    "@aws-sdk/client-dynamodb": "^3.468.0",
-    "@aws-sdk/client-s3": "^3.468.0",
-    "@aws-sdk/lib-dynamodb": "^3.468.0"
+    "@e-mc/cloud": "^0.7.3",
+    "@e-mc/module": "^0.7.3",
+    "@e-mc/types": "^0.7.3",
+    "@pi-r/aws": "^0.5.3",
+    "@aws-sdk/client-dynamodb": "^3.540.0",
+    "@aws-sdk/client-s3": "^3.540.0",
+    "@aws-sdk/lib-dynamodb": "^3.540.0"
   }
 }

package/types/index.d.ts

@@ -0,0 +1,41 @@
+import type { CloudDatabase, CloudStorage } from '@e-mc/types/lib/cloud';
+
+import type { AwsAuthInputConfig } from '@aws-sdk/middleware-signing';
+import type { DynamoDBClientConfig, QueryCommandInput, ScanCommandInput } from '@aws-sdk/client-dynamodb';
+import type { BatchGetCommandInput, TranslateConfig, UpdateCommandInput } from '@aws-sdk/lib-dynamodb';
+import type { NativeAttributeValue } from "@aws-sdk/util-dynamodb";
+import type { S3ClientConfig } from '@aws-sdk/client-s3';
+
+export interface AWSBaseCredential extends AwsAuthInputConfig {
+    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>[], PlainObject, UpdateCommandInput, BatchGetCommandInput | ScanCommandInput> {
+    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

@@ -1,5 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const fs = require("fs");
 const stream = require("stream");
@@ -8,7 +7,7 @@ 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("../client");
+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') {
@@ -70,7 +69,7 @@ function upload(credential, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
                 });
             } 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 });
             }
         }
         if (pathname) {
@@ -148,7 +147,7 @@ function upload(credential, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
                         }
                         client.send(new AWS.PutObjectTaggingCommand({ Bucket, Key: params.Key, ExpectedBucketOwner: params.ExpectedBucketOwner, Tagging: { TagSet }, RequestPayer: params.RequestPayer }), error => {
                             if (!error) {
-                                this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Tags created" /* VAL_CLOUD.CREATE_TAG */, Bucket], params.Key, { ...Cloud.LOG_CLOUD_COMMAND });
+                                this.formatMessage(64, service, ["Tags created", Bucket], params.Key, { ...Cloud.LOG_CLOUD_COMMAND });
                             }
                             else {
                                 addLog(error);
@@ -158,7 +157,7 @@ function upload(credential, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
                     else if (tags === false) {
                         client.send(new AWS.DeleteObjectTaggingCommand({ Bucket, Key: params.Key, ExpectedBucketOwner: params.ExpectedBucketOwner }), error => {
                             if (!error) {
-                                this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Tags deleted" /* VAL_CLOUD.DELETE_TAG */, Bucket], params.Key, { ...Cloud.LOG_CLOUD_COMMAND });
+                                this.formatMessage(64, service, ["Tags deleted", Bucket], params.Key, { ...Cloud.LOG_CLOUD_COMMAND });
                             }
                             else {
                                 addLog(error);
@@ -168,7 +167,7 @@ function upload(credential, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
                     cleanup();
                     callback(null, url);
                 }
-                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 });
             })
                 .catch(err => {
                 if (first) {