@pi-r/aws-v3 0.2.10 → 0.2.11

package/client/index.js

@@ -54,9 +54,10 @@ function sanitizeCredentials(credential) {
 }
 const isNoSuchBucket = (err) => err instanceof Error && err.name === 'NoSuchBucket';
 function createStorageClient(credential, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
+    var _a;
     try {
         sanitizeCredentials(credential);
-        const expiration = credential.credentials?.expiration;
+        const expiration = (_a = credential.credentials) === null || _a === void 0 ? void 0 : _a.expiration;
         if (expiration && !(expiration instanceof Date)) {
             delete credential.expiration;
         }
@@ -187,7 +188,7 @@ async function deleteObjectsV2(credential, Bucket, recursive = true, service = '
     const [client, AWS] = createStorageClient.call(this, credential, service, sdk);
     return client.send(new AWS.ListObjectsCommand({ Bucket }))
         .then(({ Contents }) => {
-        if (Contents?.length) {
+        if (Contents === null || Contents === void 0 ? void 0 : Contents.length) {
             let Objects = Contents.map(data => ({ Key: data.Key }));
             if (!recursive) {
                 Objects = Objects.filter(value => value.Key.indexOf('/') === -1);
@@ -222,7 +223,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
     const cacheValue = { value: this.valueOfKey(credential, 'cache'), sessionKey };
     let client;
     const createClient = () => client || (client = createDatabaseClient.call(this, length === 1 ? credential : { ...credential }));
-    const closeClient = () => client?.[0].destroy();
+    const closeClient = () => client === null || client === void 0 ? void 0 : client[0].destroy();
     for (let i = 0; i < length; ++i) {
         const item = batch[i];
         const { service, table, id = '', query, partitionKey, key = partitionKey, limit = 0, update, ignoreCache } = item;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/aws-v3",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "description": "AWS V3 cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -23,7 +23,7 @@
     "@e-mc/cloud": "^0.5.6",
     "@e-mc/module": "^0.5.6",
     "@e-mc/types": "^0.5.6",
-    "@pi-r/aws": "^0.2.10",
+    "@pi-r/aws": "^0.2.11",
     "@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

@@ -14,6 +14,7 @@ function upload(credential, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
     const [client, AWS] = client_1.createStorageClient.call(this, credential, service, sdk);
     return async (data, callback) => {
         var _a;
+        var _b;
         const { bucket: Bucket, localUri } = data;
         const { pathname = '', fileGroup, contentType, metadata, endpoint, active, publicRead, acl, admin = {}, overwrite, options } = data.upload;
         let filename = data.upload.filename || path.basename(localUri), bucketKey;
@@ -30,7 +31,7 @@ function upload(credential, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
         };
         if (!BUCKET_SESSION.has(service + Bucket)) {
             const bucketAcl = admin.publicRead ? 'public-read' : admin.acl;
-            const response = BUCKET_RESPONSE[_a = bucketKey = (0, aws_1.getBucketKey)(credential, Bucket, bucketAcl, service, sdk)] || (BUCKET_RESPONSE[_a] = client_1.createBucketV2.call(this, credential, Bucket, bucketAcl, admin.configBucket?.create, service, sdk));
+            const response = BUCKET_RESPONSE[_b = bucketKey = (0, aws_1.getBucketKey)(credential, Bucket, bucketAcl, service, sdk)] || (BUCKET_RESPONSE[_b] = client_1.createBucketV2.call(this, credential, Bucket, bucketAcl, (_a = admin.configBucket) === null || _a === void 0 ? void 0 : _a.create, service, sdk));
             if (!await response) {
                 errorResponse(null);
                 return;