@pi-r/aws 0.5.0 → 0.6.1

package/client/index.d.ts

@@ -6,7 +6,7 @@ import type { AWSDatabaseCredential, AWSDatabaseQuery, AWSStorageCredential, Buc
 
 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 { AttributeValue, DocumentClient } from 'aws-sdk/clients/dynamodb';
 import type { DynamoDBClientConfig } from '@aws-sdk/client-dynamodb';
 import type { CreateBucketRequest } from 'aws-sdk/clients/s3';
 
@@ -32,6 +32,7 @@ declare namespace AWS {
     function setDatabaseEndpoint(config: ServiceConfigurationOptions | DynamoDBClientConfig): void;
     function checkBucketCannedACL(value: unknown): BucketCannedACL | undefined;
     function writeMessageDefaultRetention(this: IModule, bucket: string, retention: s3.DefaultRetention, service?: string): void;
+    function parseAttributeValue(value: unknown): AttributeValue;
     function getBucketKey(credential: unknown, Bucket: string, acl: string | undefined, service: string, sdk: string): string;
     function isNoSuchBucket(err: unknown): boolean;
 }

package/client/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isNoSuchBucket = exports.getBucketKey = exports.writeMessageDefaultRetention = exports.checkBucketCannedACL = exports.setDatabaseEndpoint = exports.executeBatchQuery = exports.executeQuery = exports.deleteObjectsV2 = exports.deleteObjects = exports.setBucketWebsite = exports.setBucketPolicy = exports.createBucketV2 = exports.createBucket = exports.createDatabaseClient = exports.createStorageClient = exports.validateDatabase = exports.validateStorage = exports.getPrivatePolicy = exports.getBucketPublicReadPolicy = exports.getPublicReadPolicy = exports.isDatabaseDefined = exports.isEnvDefined = exports.isAccessDefined = void 0;
+exports.isNoSuchBucket = exports.getBucketKey = exports.parseAttributeValue = exports.writeMessageDefaultRetention = exports.checkBucketCannedACL = exports.setDatabaseEndpoint = exports.executeBatchQuery = exports.executeQuery = exports.deleteObjectsV2 = exports.deleteObjects = exports.setBucketWebsite = exports.setBucketPolicy = exports.createBucketV2 = exports.createBucket = exports.createDatabaseClient = exports.createStorageClient = exports.validateDatabase = exports.validateStorage = exports.getPrivatePolicy = exports.getBucketPublicReadPolicy = exports.getPublicReadPolicy = exports.isDatabaseDefined = exports.isEnvDefined = exports.isAccessDefined = void 0;
 const aws = require("aws-sdk");
 const types_1 = require("@e-mc/types");
 const util_1 = require("@e-mc/cloud/util");
@@ -22,7 +22,7 @@ async function setCannedAcl(S3, Bucket, ACL, service = 'aws', recursive) {
         }
         else if (!recursive) {
             if (err instanceof Error && err.code === 'OperationAborted') {
-                setTimeout(() => setCannedAcl.call(this, S3, Bucket, ACL, service, true), 60000 /* TIME.m */);
+                setTimeout(async () => 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 });
             }
             else {
@@ -158,11 +158,11 @@ function createDatabaseClient(credential) {
     return new aws.DynamoDB.DocumentClient(options);
 }
 exports.createDatabaseClient = createDatabaseClient;
-function createBucket(credential, Bucket, publicRead, service = 'aws', sdk = 'aws-sdk/clients/s3') {
+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;
-function createBucketV2(credential, Bucket, ACL, options, service = 'aws', sdk = 'aws-sdk/clients/s3') {
+async function createBucketV2(credential, Bucket, ACL, options, service = 'aws', sdk = 'aws-sdk/clients/s3') {
     ACL = ACL === 1 ? 1 : checkBucketCannedACL(ACL);
     const S3 = createStorageClient.call(this, credential, service, sdk);
     return S3.headBucket({ Bucket }).promise()
@@ -172,7 +172,7 @@ function createBucketV2(credential, Bucket, ACL, options, service = 'aws', sdk =
         }
         return true;
     })
-        .catch(() => {
+        .catch(async () => {
         const input = { ...options, Bucket };
         const region = credential.region;
         if (region && (region !== 'us-east-1' || service !== 'aws')) {
@@ -202,7 +202,7 @@ function createBucketV2(credential, Bucket, ACL, options, service = 'aws', sdk =
     });
 }
 exports.createBucketV2 = createBucketV2;
-function setBucketPolicy(credential, Bucket, options, service = 'aws', sdk = 'aws-sdk/clients/s3') {
+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);
     options.Bucket = Bucket;
@@ -223,7 +223,7 @@ function setBucketPolicy(credential, Bucket, options, service = 'aws', sdk = 'aw
     });
 }
 exports.setBucketPolicy = setBucketPolicy;
-function setBucketWebsite(credential, Bucket, options, service = 'aws', sdk = 'aws-sdk/clients/s3') {
+async function setBucketWebsite(credential, Bucket, options, service = 'aws', sdk = 'aws-sdk/clients/s3') {
     const S3 = createStorageClient.call(this, credential, service, sdk);
     const WebsiteConfiguration = {};
     const { indexPage: Suffix, errorPage: Key } = options;
@@ -246,18 +246,18 @@ function setBucketWebsite(credential, Bucket, options, service = 'aws', sdk = 'a
     });
 }
 exports.setBucketWebsite = setBucketWebsite;
-function deleteObjects(credential, Bucket, service = 'aws', sdk = 'aws-sdk/clients/s3') {
+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()
-        .then(({ Contents }) => {
+        .then(async ({ Contents }) => {
         if (Contents?.length) {
             let Objects = Contents.map(data => ({ Key: data.Key }));
             if (!recursive) {
-                Objects = Objects.filter(value => value.Key.indexOf('/') === -1);
+                Objects = Objects.filter(value => !value.Key.includes('/'));
             }
             return S3.deleteObjects({ Bucket, Delete: { Objects } }).promise()
                 .then(data => {
@@ -284,40 +284,39 @@ async function executeQuery(credential, data, sessionKey) {
 }
 exports.executeQuery = executeQuery;
 async function executeBatchQuery(credential, batch, sessionKey) {
+    var _a;
     const length = batch.length;
     const result = new Array(length);
     const caching = length > 0 && this.hasCache(batch[0].service, sessionKey);
     const cacheValue = { value: this.valueOfKey(credential, 'cache'), sessionKey };
     let client;
-    const createClient = () => {
-        setDatabaseEndpoint(credential);
-        return client || (client = createDatabaseClient.call(this, length === 1 ? credential : { ...credential }));
-    };
+    const createClient = () => client || (client = createDatabaseClient.call(this, credential));
+    setDatabaseEndpoint(credential);
     for (let i = 0; i < length; ++i) {
         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 */);
-        }
-        const renewCache = ignoreCache === 0;
+        let { service, table: TableName, id, query, partitionKey, key = partitionKey, limit = 0, update, ignoreCache } = item;
+        const useCache = caching && ignoreCache !== true;
         const getCache = (value) => {
-            if (ignoreCache === 1) {
-                return;
+            if (ignoreCache !== 1) {
+                cacheValue.renewCache = ignoreCache === 0;
+                return this.getQueryResult(service, credential, value, cacheValue);
             }
-            cacheValue.renewCache = renewCache;
-            return this.getQueryResult(service, credential, value, cacheValue);
         };
-        let rows, queryString = caching && ignoreCache !== true || ignoreCache === false || ignoreCache === 1 || renewCache ? table + '_' : '';
+        cacheValue.exclusiveOf = Array.isArray(ignoreCache) ? ignoreCache : undefined;
+        let rows, queryString = '';
         if (key && (id || (0, types_1.isPlainObject)(key))) {
-            if (queryString) {
-                queryString += Module.asString(key, true) + id;
+            if (!TableName) {
+                throw (0, util_1.formatError)(item, "Missing database table" /* ERR_DB.TABLE */);
+            }
+            if (useCache) {
+                queryString = TableName + '_' + Module.asString(key, true) + (id !== undefined ? '_' + Module.asString(id, true) : '');
                 if (!update && (rows = getCache(queryString))) {
                     result[i] = rows;
                     continue;
                 }
             }
-            const Key = (0, types_1.isPlainObject)(key) ? key : { [key]: id };
-            const command = { TableName: table, Key };
+            const Key = (0, types_1.isPlainObject)(key) ? key : { [key]: parseAttributeValue(id) };
+            const command = { TableName, Key };
             client = createClient();
             if (update) {
                 await client.update({ ...command, ...update }).promise();
@@ -328,19 +327,63 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             }
         }
         else if ((0, types_1.isPlainObject)(query)) {
-            if (queryString && (rows = getCache(queryString += Module.asString(query, true) + limit))) {
-                result[i] = rows;
-                continue;
+            if (TableName) {
+                query.TableName = TableName;
             }
-            query.TableName = table;
             if (limit > 0) {
                 query.Limit = limit;
             }
+            if (!TableName) {
+                throw (0, util_1.formatError)(item, "Missing database table" /* ERR_DB.TABLE */);
+            }
+            if (useCache && (rows = getCache(queryString = Module.asString(query, true)))) {
+                result[i] = rows;
+                continue;
+            }
             const { Count, Items } = await createClient().query(query).promise();
             if (Count && Items) {
                 rows = Items;
             }
         }
+        else if ((0, types_1.isArray)(query)) {
+            let params = (item.params || {});
+            if (!(0, types_1.isPlainObject)(params.RequestItems)) {
+                params.RequestItems = {};
+            }
+            TableName || (TableName = Object.keys(params.RequestItems)[0]);
+            if (!TableName) {
+                throw (0, util_1.formatError)(item, "Missing database table" /* ERR_DB.TABLE */);
+            }
+            // @ts-ignore
+            const Item = (_a = params.RequestItems)[TableName] || (_a[TableName] = {});
+            Item.Keys = query;
+            params = { RequestItems: { [TableName]: Item } };
+            if (useCache && (rows = getCache(queryString = Module.asString(params, true)))) {
+                result[i] = rows;
+                continue;
+            }
+            const { Responses } = await createClient().batchGet(params).promise();
+            if (Responses) {
+                rows = Responses[TableName];
+            }
+        }
+        else if (TableName) {
+            let params = item.params;
+            if ((0, types_1.isPlainObject)(params)) {
+                params.TableName = TableName;
+            }
+            else {
+                params = { TableName };
+            }
+            if (useCache && (rows = getCache(queryString = Module.asString(params, true)))) {
+                result[i] = rows;
+                continue;
+            }
+            const { Count, Items } = await createClient().scan(params).promise();
+            if (Count && Items) {
+                rows = Items;
+            }
+        }
         else {
             throw (0, util_1.formatError)(item, "Missing database query" /* ERR_DB.QUERY */);
         }
@@ -385,6 +428,36 @@ function writeMessageDefaultRetention(bucket, retention, service = 'aws') {
     this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket configured" /* VAL_CLOUD.CONFIGURE_BUCKET */ + ' (retention policy)', bucket], status.join(' '), { ...Cloud.LOG_CLOUD_COMMAND });
 }
 exports.writeMessageDefaultRetention = writeMessageDefaultRetention;
+function parseAttributeValue(value) {
+    switch (typeof value) {
+        case 'string':
+            return { S: value };
+        case 'number':
+            return { N: value.toString() };
+        case 'boolean':
+            return { BOOL: value };
+        case 'object':
+            if (value !== null) {
+                if ('S' in value || 'N' in value || 'BOOL' in value || 'B' in value || 'SS' in value || 'NS' in value || 'BS' in value || 'L' in value || 'M' in value || 'NULL' in value) {
+                    return value;
+                }
+                if (Buffer.isBuffer(value)) {
+                    return { B: value.toString('base64') };
+                }
+                if (Array.isArray(value)) {
+                    return value.every(item => typeof item === 'string') ? { SS: value } : value.every(item => typeof item === 'number') ? { NS: value.map((item) => item.toString()) } : value.every(item => Buffer.isBuffer(item)) ? { BS: value.map((item) => item.toString('base64')) } : { L: value.map(item => parseAttributeValue(item)) };
+                }
+                const M = {};
+                for (const attr in value) {
+                    M[attr] = parseAttributeValue(value[attr]);
+                }
+                return { M };
+            }
+            break;
+    }
+    return { NULL: true };
+}
+exports.parseAttributeValue = parseAttributeValue;
 const getBucketKey = (credential, Bucket, acl, service, sdk) => Module.asString(credential, true) + Bucket + '_' + (acl || '') + service + sdk;
 exports.getBucketKey = getBucketKey;
 const isNoSuchBucket = (err) => err instanceof Error && err.code === 'NoSuchBucket';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/aws",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "description": "AWS V2 cloud functions for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -21,9 +21,9 @@
   "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",
-    "aws-sdk": "^2.1514.0"
+    "@e-mc/cloud": "^0.8.1",
+    "@e-mc/module": "^0.8.1",
+    "@e-mc/types": "^0.8.1",
+    "aws-sdk": "^2.1531.0"
   }
 }

package/types/index.d.ts

@@ -3,7 +3,7 @@ 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 { Key, BatchGetItemInput, QueryInput, ScanInput, UpdateItemInput } from 'aws-sdk/clients/dynamodb';
 import type { PutBucketAclRequest, PutBucketPolicyRequest, PutPublicAccessBlockRequest } from 'aws-sdk/clients/s3';
 
 export type BucketCannedACL = "authenticated-read" | "private" | "public-read" | "public-read-write";
@@ -15,7 +15,7 @@ export interface AWSStorageCredential extends ConfigurationOptions {
     fromPath?: string;
 }
 
-export interface AWSDatabaseQuery extends CloudDatabase<QueryInput, PlainObject, UpdateItemInput> {
+export interface AWSDatabaseQuery extends CloudDatabase<QueryInput | Key[], PlainObject, UpdateItemInput, BatchGetItemInput | ScanInput> {
     key?: string | Key;
     partitionKey?: string | Key;
 }

package/upload/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
-const fs = require("fs");
 const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
 const Module = require("@e-mc/module");
@@ -26,7 +25,7 @@ function upload(credential, service = 'aws', sdk = 'aws-sdk/clients/s3') {
             cleanup();
             callback(err);
         };
-        const addLog = (err) => err instanceof Error && this.addLog(this.statusType.WARN, err.message, service + ': ' + Bucket);
+        const addLog = (err) => 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;
@@ -81,15 +80,10 @@ function upload(credential, service = 'aws', sdk = 'aws-sdk/clients/s3') {
         const Body = [data.buffer];
         const ContentType = [contentType];
         if (fileGroup) {
-            for (const [content, ext, localFile] of fileGroup) {
-                try {
-                    Body.push(typeof content === 'string' ? fs.readFileSync(content) : content);
-                    Key.push(ext === '.map' && localFile ? path.basename(localFile) : filename + ext);
-                }
-                catch (err) {
-                    addLog(err);
-                }
-            }
+            const [key, body, type] = (0, util_1.createKeyAndBody)(filename, fileGroup, addLog);
+            Key.push(...key);
+            Body.push(...body);
+            ContentType.push(...type);
         }
         for (let i = 0; i < Key.length; ++i) {
             const first = i === 0;