@pi-r/aws 0.7.3 → 0.8.1

package/client/index.js

@@ -1,15 +1,32 @@
 "use strict";
-exports.CLOUD_UPLOAD_CHUNK = exports.CLOUD_UPLOAD_STREAM = exports.isNoSuchBucket = exports.parseAttributeValue = exports.executeBatchQuery = exports.executeQuery = exports.deleteObjectsV2 = exports.deleteObjects = exports.setBucketWebsite = exports.setBucketTagging = exports.setBucketPolicy = exports.createBucketV2 = exports.createBucket = exports.createDatabaseClient = exports.createStorageClient = exports.validateDatabase = exports.validateStorage = void 0;
+exports.CLOUD_UPLOAD_CHUNK = exports.CLOUD_UPLOAD_STREAM = void 0;
+exports.validateStorage = validateStorage;
+exports.validateDatabase = validateDatabase;
+exports.createStorageClient = createStorageClient;
+exports.createDatabaseClient = createDatabaseClient;
+exports.createBucket = createBucket;
+exports.createBucketV2 = createBucketV2;
+exports.setBucketPolicy = setBucketPolicy;
+exports.setBucketTagging = setBucketTagging;
+exports.setBucketWebsite = setBucketWebsite;
+exports.deleteObjects = deleteObjects;
+exports.deleteObjectsV2 = deleteObjectsV2;
+exports.executeQuery = executeQuery;
+exports.executeBatchQuery = executeBatchQuery;
+exports.parseAttributeValue = parseAttributeValue;
+exports.isNoSuchBucket = isNoSuchBucket;
 const aws = require("aws-sdk");
 const Cloud = require("@e-mc/cloud");
 const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
 const aws_lib_1 = require("@pi-r/aws-lib");
 const ACP_AUTHENTICATEDREAD = {
-    Grants: [{
+    Grants: [
+        {
             Grantee: { Type: 'Group', URI: 'http://acs.amazonaws.com/groups/global/AuthenticatedUsers' },
             Permission: 'READ'
-        }]
+        }
+    ]
 };
 async function setCannedAcl(S3, Bucket, ACL, service = "aws", recursive) {
     if (service === "oci") {
@@ -21,7 +38,9 @@ async function setCannedAcl(S3, Bucket, ACL, service = "aws", recursive) {
         }
         else if (!recursive) {
             if (err instanceof Error && err.code === 'OperationAborted') {
-                setTimeout(async () => setCannedAcl.call(this, S3, Bucket, ACL, service, true), 60000);
+                setTimeout(() => {
+                    void setCannedAcl.call(this, S3, Bucket, ACL, service, true);
+                }, 60000);
                 this.formatMessage(64, service, [`Grant ${ACL} (delayed)`, Bucket], err, { ...Cloud.LOG_CLOUD_DELAYED });
             }
             else {
@@ -55,16 +74,17 @@ async function setCannedAcl(S3, Bucket, ACL, service = "aws", recursive) {
                 break;
         }
     }
-    return promise.then(() => callback(null)).catch((err) => callback(err));
+    return promise.then(() => {
+        callback(null);
+    })
+        .catch(callback);
 }
 function validateStorage(credential) {
     return !!((0, aws_lib_1.isAccessDefined)(credential) || (0, aws_lib_1.isEnvDefined)() || credential.fromPath || credential.profile || (0, aws_lib_1.isProviderChainDefined)());
 }
-exports.validateStorage = validateStorage;
 function validateDatabase(credential, data) {
     return (0, aws_lib_1.isDatabaseDefined)(credential, data) && validateStorage(credential);
 }
-exports.validateDatabase = validateDatabase;
 function createStorageClient(credential, service = "aws", sdk = "aws-sdk/clients/s3") {
     try {
         if (service === "aws") {
@@ -86,7 +106,6 @@ function createStorageClient(credential, service = "aws", sdk = "aws-sdk/clients
         throw err;
     }
 }
-exports.createStorageClient = createStorageClient;
 function createDatabaseClient(credential) {
     const { profile, fromPath } = credential;
     let options;
@@ -108,11 +127,9 @@ function createDatabaseClient(credential) {
     }
     return new aws.DynamoDB.DocumentClient(options);
 }
-exports.createDatabaseClient = createDatabaseClient;
 async function createBucket(credential, Bucket, publicRead, service = "aws", sdk = "aws-sdk/clients/s3") {
     return createBucketV2.call(this, credential, Bucket, publicRead ? "public-read" : undefined, undefined, service, sdk);
 }
-exports.createBucket = createBucket;
 async function createBucketV2(credential, Bucket, ACL, options, service = "aws", sdk = "aws-sdk/clients/s3") {
     ACL = ACL === 1 ? 1 : (0, aws_lib_1.checkBucketCannedACL)(ACL);
     const S3 = createStorageClient.call(this, credential, service, sdk);
@@ -152,7 +169,6 @@ async function createBucketV2(credential, Bucket, ACL, options, service = "aws",
         });
     });
 }
-exports.createBucketV2 = createBucketV2;
 async function setBucketPolicy(credential, Bucket, options, service = "aws", sdk = "aws-sdk/clients/s3") {
     const ibm = service === "ibm";
     const S3 = createStorageClient.call(this, credential, service, sdk);
@@ -167,13 +183,12 @@ async function setBucketPolicy(credential, Bucket, options, service = "aws", sdk
         return true;
     })
         .catch((err) => {
-        if (!(0, exports.isNoSuchBucket)(err)) {
+        if (!isNoSuchBucket(err)) {
             this.formatFail(64, service, ["Unable to update bucket policy", Bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
         }
         return false;
     });
 }
-exports.setBucketPolicy = setBucketPolicy;
 async function setBucketTagging(credential, Bucket, options, service = "aws", sdk = "aws-sdk/clients/s3") {
     if (!(0, types_1.isPlainObject)(options) || !Array.isArray(options.Tagging?.TagSet)) {
         return false;
@@ -185,7 +200,7 @@ async function setBucketTagging(credential, Bucket, options, service = "aws", sd
         return true;
     };
     const error = (err) => {
-        if (!(0, exports.isNoSuchBucket)(err)) {
+        if (!isNoSuchBucket(err)) {
             this.formatFail(64, service, ["Unable to update bucket tagging", Bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
         }
         return false;
@@ -196,7 +211,6 @@ async function setBucketTagging(credential, Bucket, options, service = "aws", sd
     options.Bucket = Bucket;
     return S3.putBucketTagging(options).promise().then(command).catch((err) => error(err));
 }
-exports.setBucketTagging = setBucketTagging;
 async function setBucketWebsite(credential, Bucket, options, service = "aws", sdk = "aws-sdk/clients/s3") {
     const S3 = createStorageClient.call(this, credential, service, sdk);
     const WebsiteConfiguration = {};
@@ -213,17 +227,15 @@ async function setBucketWebsite(credential, Bucket, options, service = "aws", sd
         return true;
     })
         .catch((err) => {
-        if (!(0, exports.isNoSuchBucket)(err)) {
+        if (!isNoSuchBucket(err)) {
             this.formatFail(64, service, ["Unable to set bucket website", Bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
         }
         return false;
     });
 }
-exports.setBucketWebsite = setBucketWebsite;
 async function deleteObjects(credential, Bucket, service = "aws", sdk = "aws-sdk/clients/s3") {
     return deleteObjectsV2.call(this, credential, Bucket, true, service, sdk);
 }
-exports.deleteObjects = deleteObjects;
 async function deleteObjectsV2(credential, Bucket, recursive = true, service = "aws", sdk = "aws-sdk/clients/s3") {
     const S3 = createStorageClient.call(this, credential, service, sdk);
     return S3.listObjects({ Bucket }).promise()
@@ -247,16 +259,14 @@ async function deleteObjectsV2(credential, Bucket, recursive = true, service = "
         }
     })
         .catch((err) => {
-        if (!(0, exports.isNoSuchBucket)(err)) {
+        if (!isNoSuchBucket(err)) {
             this.formatFail(64, service, ["Unable to list bucket", Bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
         }
     });
 }
-exports.deleteObjectsV2 = deleteObjectsV2;
 async function executeQuery(credential, data, sessionKey) {
     return (await executeBatchQuery.call(this, credential, [data], sessionKey))[0] || [];
 }
-exports.executeQuery = executeQuery;
 async function executeBatchQuery(credential, batch, sessionKey) {
     const length = batch.length;
     const result = new Array(length);
@@ -269,12 +279,6 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         const item = batch[i];
         let { service, table: TableName, id, query, key, limit = 0, update, ignoreCache } = item;
         const useCache = caching && ignoreCache !== true;
-        const getCache = (value) => {
-            if (ignoreCache !== 1) {
-                cacheValue.renewCache = ignoreCache === 0;
-                return this.getQueryResult(service, credential, value, cacheValue);
-            }
-        };
         cacheValue.exclusiveOf = Array.isArray(ignoreCache) ? ignoreCache : undefined;
         let rows, queryString = '';
         if (key && (id || (0, types_1.isPlainObject)(key))) {
@@ -283,7 +287,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             }
             if (useCache) {
                 queryString = TableName + '_' + Cloud.asString(key, true) + (id !== undefined ? '_' + Cloud.asString(id, true) : '');
-                if (!update && (rows = getCache(queryString))) {
+                if (!update && (rows = this.getCacheResult(service, credential, queryString, cacheValue, ignoreCache))) {
                     result[i] = rows;
                     continue;
                 }
@@ -309,7 +313,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             if (limit > 0) {
                 query.Limit = limit;
             }
-            if (useCache && (rows = getCache(queryString = Cloud.asString(query, true)))) {
+            if (useCache && (rows = this.getCacheResult(service, credential, queryString = Cloud.asString(query, true), cacheValue, ignoreCache))) {
                 result[i] = rows;
                 continue;
             }
@@ -330,7 +334,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             const Item = params.RequestItems[TableName] ||= {};
             Item.Keys = query;
             params = { RequestItems: { [TableName]: Item } };
-            if (useCache && (rows = getCache(queryString = Cloud.asString(params, true)))) {
+            if (useCache && (rows = this.getCacheResult(service, credential, queryString = Cloud.asString(params, true), cacheValue, ignoreCache))) {
                 result[i] = rows;
                 continue;
             }
@@ -347,7 +351,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             else {
                 params = { TableName };
             }
-            if (useCache && (rows = getCache(queryString = Cloud.asString(params, true)))) {
+            if (useCache && (rows = this.getCacheResult(service, credential, queryString = Cloud.asString(params, true), cacheValue, ignoreCache))) {
                 result[i] = rows;
                 continue;
             }
@@ -363,7 +367,6 @@ async function executeBatchQuery(credential, batch, sessionKey) {
     }
     return result;
 }
-exports.executeBatchQuery = executeBatchQuery;
 function parseAttributeValue(value) {
     switch (typeof value) {
         case 'string':
@@ -393,8 +396,8 @@ function parseAttributeValue(value) {
     }
     return { NULL: true };
 }
-exports.parseAttributeValue = parseAttributeValue;
-const isNoSuchBucket = (err) => err instanceof Error && err.code === 'NoSuchBucket';
-exports.isNoSuchBucket = isNoSuchBucket;
+function isNoSuchBucket(err) {
+    return err instanceof Error && err.code === 'NoSuchBucket';
+}
 exports.CLOUD_UPLOAD_STREAM = true;
 exports.CLOUD_UPLOAD_CHUNK = true;

package/download/index.js

@@ -2,7 +2,7 @@
 const types_1 = require("@e-mc/types");
 const Cloud = require("@e-mc/cloud");
 const client_1 = require("@pi-r/aws");
-module.exports = function download(credential, service = "aws", sdk = "aws-sdk/clients/s3") {
+function download(credential, service = "aws", sdk = "aws-sdk/clients/s3") {
     const s3 = client_1.createStorageClient.call(this, credential, service, sdk);
     return (data, callback) => {
         const { bucket: Bucket, download: target } = data;
@@ -35,4 +35,5 @@ module.exports = function download(credential, service = "aws", sdk = "aws-sdk/c
             }
         });
     };
-};
+}
+module.exports = download;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/aws",
-  "version": "0.7.3",
+  "version": "0.8.1",
   "description": "AWS V2 cloud functions for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -21,10 +21,10 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.9.6",
-    "@e-mc/module": "^0.9.6",
-    "@e-mc/types": "^0.9.6",
-    "@pi-r/aws-lib": "^0.7.3",
-    "aws-sdk": "^2.1663.0"
+    "@e-mc/cloud": "^0.10.0",
+    "@e-mc/module": "^0.10.0",
+    "@e-mc/types": "^0.10.0",
+    "@pi-r/aws-lib": "^0.8.1",
+    "aws-sdk": "^2.1682.0"
   }
 }

package/types/index.d.ts

@@ -1,8 +1,7 @@
 import type { CloudDatabase, CloudStorage } from '@e-mc/types/lib/cloud';
 
 import type { ConfigurationOptions } from 'aws-sdk/lib/core';
-import type { ServiceConfigurationOptions } from 'aws-sdk/lib/service';
-import type { DocumentClient } from 'aws-sdk/clients/dynamodb';
+import type { DocumentClient, Types } from 'aws-sdk/clients/dynamodb';
 import type { PutBucketAclRequest, PutBucketPolicyRequest, PutPublicAccessBlockRequest } from 'aws-sdk/clients/s3';
 
 export type ConfigureBucketOptions = PutBucketAclRequest | PutBucketPolicyRequest | PutPublicAccessBlockRequest;
@@ -12,6 +11,7 @@ export type QueryInput = DocumentClient.QueryInput;
 export type UpdateItemInput = DocumentClient.UpdateItemInput;
 export type ScanInput = DocumentClient.ScanInput;
 export type BatchGetItemInput = DocumentClient.BatchGetItemInput;
+export type DynamoDBClientConfig = Types.ClientConfiguration & DocumentClient.DocumentClientOptions;
 
 export type AWSStorage = CloudStorage<AWSStorageCredential, "aws">;
 
@@ -26,4 +26,4 @@ export interface AWSDatabaseQuery extends CloudDatabase<QueryInput | Key[], Reco
     key?: string | Key;
 }
 
-export interface AWSDatabaseCredential extends AWSStorageCredential, ServiceConfigurationOptions {}
+export interface AWSDatabaseCredential extends AWSStorageCredential, DynamoDBClientConfig {}

package/upload/index.js

@@ -3,6 +3,7 @@ const path = require("path");
 const fs = require("fs");
 const stream = require("stream");
 const aws = require("aws-sdk");
+const crypto_1 = require("crypto");
 const Cloud = require("@e-mc/cloud");
 const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
@@ -10,7 +11,7 @@ const aws_lib_1 = require("@pi-r/aws-lib");
 const client_1 = require("@pi-r/aws");
 const BUCKET_SESSION = new Set();
 const BUCKET_RESPONSE = {};
-module.exports = function upload(credential, service = "aws", sdk = "aws-sdk/clients/s3") {
+function upload(credential, service = "aws", sdk = "aws-sdk/clients/s3") {
     const s3 = client_1.createStorageClient.call(this, credential, service, sdk);
     return async (data, callback) => {
         const { bucket: Bucket, localUri } = data;
@@ -26,7 +27,11 @@ module.exports = function upload(credential, service = "aws", sdk = "aws-sdk/cli
             cleanup();
             callback(err);
         };
-        const addLog = (err) => err instanceof Error && this.addLog(this.statusType.WARN, err, service, Bucket);
+        const addLog = (err) => {
+            if (err instanceof Error) {
+                this.addLog(this.statusType.WARN, err, service, Bucket);
+            }
+        };
         const configBucket = admin.configBucket;
         if (!BUCKET_SESSION.has(service + Bucket)) {
             const bucketAcl = admin.publicRead ? "public-read" : admin.acl;
@@ -40,7 +45,9 @@ module.exports = function upload(credential, service = "aws", sdk = "aws-sdk/cli
         if (configBucket && service !== "oci") {
             const { cors: CORSConfiguration, lifecycle: LifecycleConfiguration, retentionPolicy: DefaultRetention } = configBucket;
             const ExpectedBucketOwner = options?.ExpectedBucketOwner;
-            const commandMessage = (feature, message) => this.formatMessage(64, service, ["Bucket configured" + ` (${feature})`, Bucket], message || ExpectedBucketOwner, { ...Cloud[message === 'delete' ? 'LOG_CLOUD_WARN' : 'LOG_CLOUD_COMMAND'] });
+            const commandMessage = (feature, message) => {
+                this.formatMessage(64, service, ["Bucket configured" + ` (${feature})`, Bucket], message || ExpectedBucketOwner, { ...Cloud[message === 'delete' ? 'LOG_CLOUD_WARN' : 'LOG_CLOUD_COMMAND'] });
+            };
             if (service !== "ibm") {
                 if ((0, types_1.isPlainObject)(DefaultRetention)) {
                     s3.putObjectLockConfiguration({ Bucket, ObjectLockConfiguration: { ObjectLockEnabled: 'Enabled', Rule: { DefaultRetention } }, ExpectedBucketOwner, RequestPayer: options?.RequestPayer }, err => {
@@ -113,7 +120,7 @@ module.exports = function upload(credential, service = "aws", sdk = "aws-sdk/cli
                     .then(() => true)
                     .catch((err) => {
                     if (err instanceof Error && err.code !== 'NotFound') {
-                        filename = (0, types_1.generateUUID)() + path.extname(current);
+                        filename = (0, crypto_1.randomUUID)() + path.extname(current);
                     }
                     return false;
                 });
@@ -233,4 +240,5 @@ module.exports = function upload(credential, service = "aws", sdk = "aws-sdk/cli
             });
         }
     };
-};
+}
+module.exports = upload;