@pi-r/aws 0.2.2 → 0.2.8

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 An Pham
+Copyright 2023 Mile Square Park
 
 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
+# @pi-r/aws
 
-### LICENSE
+PEP 402 - Forever
+
+## LICENSE
 
 MIT

package/client/index.js

@@ -17,15 +17,15 @@ async function setCannedAcl(S3, Bucket, ACL, service = 'aws', recursive) {
     }
     const callback = (err) => {
         if (!err) {
-            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 });
         }
         else if (!recursive) {
             if (err instanceof Error && err.code === 'OperationAborted') {
-                setTimeout(() => setCannedAcl.call(this, S3, Bucket, ACL, service, true), 60000 /* TIME.m */);
-                this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, [`Grant ${ACL} (delayed)`, Bucket], err, { ...Cloud.LOG_CLOUD_DELAYED });
+                setTimeout(() => setCannedAcl.call(this, S3, Bucket, ACL, service, true), 60000);
+                this.formatMessage(64, service, [`Grant ${ACL} (delayed)`, Bucket], err, { ...Cloud.LOG_CLOUD_DELAYED });
             }
             else {
-                this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ['Unable to grant ' + ACL, Bucket], err, { ...Cloud.LOG_CLOUD_WARN });
+                this.formatMessage(64, service, ['Unable to grant ' + ACL, Bucket], err, { ...Cloud.LOG_CLOUD_WARN });
             }
         }
     };
@@ -189,7 +189,7 @@ function createBucketV2(credential, Bucket, ACL, options, service = 'aws', sdk =
         }
         return S3.createBucket(input).promise()
             .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, S3, Bucket, ACL, service);
             }
@@ -204,7 +204,7 @@ function createBucketV2(credential, Bucket, ACL, options, service = 'aws', sdk =
                     }
                     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;
             }
         });
@@ -212,20 +212,21 @@ function createBucketV2(credential, Bucket, ACL, options, service = 'aws', sdk =
 }
 exports.createBucketV2 = createBucketV2;
 function setBucketPolicy(credential, Bucket, options, service = 'aws', sdk = 'aws-sdk/clients/s3') {
+    const ibm = service === 'ibm';
     const S3 = createStorageClient.call(this, credential, service, sdk);
     options.Bucket = Bucket;
-    if (service === 'ibm' && 'ACL' in options && options.ACL === 'authenticated-read') {
+    if (ibm && 'ACL' in options && options.ACL === 'authenticated-read') {
         options.AccessControlPolicy = ACP_AUTHENTICATEDREAD;
         delete options.ACL;
     }
-    return ('Policy' in options && (0, types_1.isString)(options.Policy) && service !== 'ibm' ? S3.putBucketPolicy(options) : S3.putBucketAcl(options)).promise()
+    return ('PublicAccessBlockConfiguration' in options ? S3.putPublicAccessBlock(options) : 'Policy' in options && (0, types_1.isString)(options.Policy) && !ibm ? S3.putBucketPolicy(options) : S3.putBucketAcl(options)).promise()
         .then(() => {
-        this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket policy configured" /* VAL_CLOUD.POLICY_BUCKET */, Bucket], '', { ...Cloud.LOG_CLOUD_COMMAND });
+        this.formatMessage(64, service, ["Bucket policy configured", Bucket], '', { ...Cloud.LOG_CLOUD_COMMAND });
         return true;
     })
         .catch(err => {
         if (!(0, exports.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;
     });
@@ -242,12 +243,12 @@ function setBucketWebsite(credential, Bucket, options, service = 'aws', sdk = 'a
     }
     return S3.putBucketWebsite({ Bucket, WebsiteConfiguration }).promise()
         .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 (!(0, exports.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;
     });
@@ -270,17 +271,17 @@ async function deleteObjectsV2(credential, Bucket, recursive = true, service = '
                 .then(data => {
                 if ((0, types_1.isArray)(data.Deleted)) {
                     const files = data.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 (!(0, exports.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 });
         }
     });
 }
@@ -303,7 +304,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         const item = batch[i];
         const { service, table, id = '', query, partitionKey, key = partitionKey, limit = 0, update, ignoreCache } = item;
         if (!table) {
-            throw (0, util_1.formatError)(item, "Missing database table" /* ERR_DB.TABLE */);
+            throw (0, util_1.formatError)(item, "Missing database table");
         }
         const renewCache = ignoreCache === 0;
         const getCache = (value) => {
@@ -348,7 +349,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             }
         }
         else {
-            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,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const client_1 = require("../client");
+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");
@@ -22,10 +22,10 @@ function download(credential, service = 'aws', sdk = 'aws-sdk/clients/s3') {
                 if (deleteObject) {
                     s3.deleteObject((0, types_1.isPlainObject)(deleteObject) ? Object.assign(deleteObject, params) : params, error => {
                         if (!error) {
-                            this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Delete success" /* VAL_CLOUD.DELETE_FILE */, location, { ...Cloud.LOG_CLOUD_DELETE });
+                            this.formatMessage(64, service, "Delete success", location, { ...Cloud.LOG_CLOUD_DELETE });
                         }
                         else {
-                            this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Delete failed" /* ERR_CLOUD.DELETE_FAIL */, location], error, { ...Cloud.LOG_CLOUD_FAIL, fatal: !!target.active });
+                            this.formatFail(64, service, ["Delete failed", location], error, { ...Cloud.LOG_CLOUD_FAIL, fatal: !!target.active });
                         }
                     });
                 }
@@ -36,5 +36,9 @@ function download(credential, service = 'aws', sdk = 'aws-sdk/clients/s3') {
         });
     };
 }
+exports.default = download;
 
-module.exports = download;
+if (exports.default) {
+    module.exports = exports.default;
+    module.exports.default = exports.default;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/aws",
-  "version": "0.2.2",
+  "version": "0.2.8",
   "description": "AWS V2 cloud functions for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -9,7 +9,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"
   },
   "keywords": [
@@ -21,9 +21,9 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.5.3",
-    "@e-mc/module": "^0.5.3",
-    "@e-mc/types": "^0.5.3",
-    "aws-sdk": "^2.1380.0"
+    "@e-mc/cloud": "^0.5.4",
+    "@e-mc/module": "^0.5.4",
+    "@e-mc/types": "^0.5.4",
+    "aws-sdk": "^2.1570.0"
   }
 }

package/types/index.d.ts

@@ -4,11 +4,11 @@ import type { CloudDatabase } from '@e-mc/types/lib/cloud';
 import type { ConfigurationOptions } from 'aws-sdk/lib/core';
 import type { ServiceConfigurationOptions } from 'aws-sdk/lib/service';
 import type { Key, QueryInput, UpdateItemInput } from 'aws-sdk/clients/dynamodb';
-import type { PutBucketAclRequest, PutBucketPolicyRequest } from 'aws-sdk/clients/s3';
+import type { PutBucketAclRequest, PutBucketPolicyRequest, PutPublicAccessBlockRequest } from 'aws-sdk/clients/s3';
 
 export type BucketCannedACL = "authenticated-read" | "private" | "public-read" | "public-read-write";
 export type ObjectCannedACL = BucketCannedACL | "aws-exec-read" | "bucket-owner-full-control" | "bucket-owner-read";
-export type ConfigureBucketOptions = PutBucketAclRequest | PutBucketPolicyRequest;
+export type ConfigureBucketOptions = PutBucketAclRequest | PutBucketPolicyRequest | PutPublicAccessBlockRequest;
 
 export interface AWSStorageCredential extends ConfigurationOptions {
     profile?: string;

package/upload/index.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const fs = require("fs");
-const client_1 = require("../client");
+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");
@@ -56,7 +56,7 @@ function upload(credential, service = 'aws', sdk = 'aws-sdk/clients/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) {
@@ -113,7 +113,7 @@ function upload(credential, service = 'aws', sdk = 'aws-sdk/clients/s3') {
             s3.upload(params, (err, result) => {
                 if (!err) {
                     const url = endpoint ? Module.joinPath(endpoint, result.Key) : result.Location;
-                    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);
@@ -129,5 +129,9 @@ function upload(credential, service = 'aws', sdk = 'aws-sdk/clients/s3') {
         }
     };
 }
+exports.default = upload;
 
-module.exports = upload;
+if (exports.default) {
+    module.exports = exports.default;
+    module.exports.default = exports.default;
+}