quidproquo-actionprocessor-awslambda 0.1.0 → 0.1.2

package/lib/esm/getActionProcessor/core/apiKeyValidation/getApiKeyValidationValidateActionProcessor.js

@@ -1,5 +1,5 @@
 import { qpqConfigAwsUtils } from 'quidproquo-config-aws';
-import { actionResult, qpqCoreUtils, } from 'quidproquo-core';
+import { actionResult, qpqCoreUtils } from 'quidproquo-core';
 import { ApiKeyValidationActionType } from 'quidproquo-webserver';
 import { timingSafeEqual } from 'crypto';
 import { getConfigRuntimeResourceName } from '../../../awsNamingUtils';

package/lib/esm/getActionProcessor/core/eventBus/getEventBusSendMessagesActionProcessor.js

@@ -3,7 +3,7 @@ import { actionResult, actionResultError, actionResultErrorFromCaughtError, Erro
 import { getEventBusSnsTopicArn } from '../../../awsNamingUtils';
 import { publishMessage } from '../../../logic/sns/publishMessage';
 const getProcessEventBusSendMessage = (qpqConfig) => {
-    return async ({ eventBusName, eventBusMessages, }, session) => {
+    return async ({ eventBusName, eventBusMessages }, session) => {
         const region = qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig);
         const eventBusConfig = qpqCoreUtils.getEventBusConfigByName(eventBusName, qpqConfig);
         if (!eventBusConfig) {

package/lib/esm/getActionProcessor/core/file/getFileDeleteActionProcessor.js

@@ -1,5 +1,5 @@
 import { qpqConfigAwsUtils } from 'quidproquo-config-aws';
-import { actionResult, actionResultError, actionResultErrorFromCaughtError, FileActionType, FileDeleteErrorTypeEnum } from 'quidproquo-core';
+import { actionResult, actionResultError, actionResultErrorFromCaughtError, FileActionType, FileDeleteErrorTypeEnum, } from 'quidproquo-core';
 import { deleteFiles } from '../../../logic/s3/s3Utils';
 import { resolveStorageDriveBucketName } from './utils';
 const getProcessFileDelete = (qpqConfig) => {

package/lib/esm/getActionProcessor/core/file/getFileGenerateTemporarySecureUrlActionProcessor.js

@@ -1,6 +1,6 @@
 import { qpqConfigAwsUtils } from 'quidproquo-config-aws';
 import { actionResultError, ErrorTypeEnum } from 'quidproquo-core';
-import { actionResult, FileActionType, FileGenerateTemporarySecureUrlErrorTypeEnum } from 'quidproquo-core';
+import { actionResult, FileActionType, FileGenerateTemporarySecureUrlErrorTypeEnum, } from 'quidproquo-core';
 import { generatePresignedUrl } from '../../../logic/s3/generatePresignedUrl';
 import { resolveStorageDriveBucketName } from './utils';
 // SigV4 presigned URLs cannot expire more than 7 days in the future

package/lib/esm/getActionProcessor/core/file/getFileGenerateTemporaryUploadSecureUrlActionProcessor.js

@@ -1,6 +1,6 @@
 import { qpqConfigAwsUtils } from 'quidproquo-config-aws';
 import { actionResultError, ErrorTypeEnum } from 'quidproquo-core';
-import { actionResult, FileActionType, FileGenerateTemporaryUploadSecureUrlErrorTypeEnum } from 'quidproquo-core';
+import { actionResult, FileActionType, FileGenerateTemporaryUploadSecureUrlErrorTypeEnum, } from 'quidproquo-core';
 import { generatePresignedUploadUrl } from '../../../logic/s3/generatePresignedUploadUrl';
 import { resolveStorageDriveBucketName } from './utils';
 // SigV4 presigned URLs cannot expire more than 7 days in the future

package/lib/esm/getActionProcessor/core/file/getFileStreamOpenActionProcessor.js

@@ -34,9 +34,7 @@ const getProcessFileStreamOpen = (qpqConfig) => {
             const streamId = `s3-${randomGuid()}`;
             const isText = encoding === 'text';
             const size = chunkSize ?? 65536;
-            const transform = isText
-                ? (buf) => buf.toString('utf8')
-                : (buf) => buf.toString('base64');
+            const transform = isText ? (buf) => buf.toString('utf8') : (buf) => buf.toString('base64');
             const iterator = chunkedReadableIterator(response.Body, size, transform);
             streamRegistry.register(streamId, iterator);
             return actionResult({ id: streamId, encoding });

package/lib/esm/getActionProcessor/core/keyValueStore/getKeyValueStoreDeleteActionProcessor.js

@@ -1,6 +1,6 @@
 import { qpqConfigAwsUtils } from 'quidproquo-config-aws';
 import { qpqCoreUtils } from 'quidproquo-core';
-import { actionResult, actionResultError, actionResultErrorFromCaughtError, KeyValueStoreActionType, KeyValueStoreDeleteErrorTypeEnum } from 'quidproquo-core';
+import { actionResult, actionResultError, actionResultErrorFromCaughtError, KeyValueStoreActionType, KeyValueStoreDeleteErrorTypeEnum, } from 'quidproquo-core';
 import { getKvsDynamoTableNameFromConfig } from '../../../awsNamingUtils';
 import { deleteItem } from '../../../logic/dynamo';
 const getProcessKeyValueStoreDelete = (qpqConfig) => {

package/lib/esm/getActionProcessor/core/keyValueStore/getKeyValueStoreGetActionProcessor.js

@@ -1,5 +1,5 @@
 import { qpqConfigAwsUtils } from 'quidproquo-config-aws';
-import { actionResult, actionResultError, actionResultErrorFromCaughtError, KeyValueStoreActionType, KeyValueStoreGetErrorTypeEnum } from 'quidproquo-core';
+import { actionResult, actionResultError, actionResultErrorFromCaughtError, KeyValueStoreActionType, KeyValueStoreGetErrorTypeEnum, } from 'quidproquo-core';
 import { getKvsDynamoTableNameFromConfig } from '../../../awsNamingUtils';
 import { getItem } from '../../../logic/dynamo';
 const getProcessKeyValueStoreGet = (qpqConfig) => {

package/lib/esm/getActionProcessor/core/keyValueStore/getKeyValueStoreGetAllActionProcessor.js

@@ -1,5 +1,5 @@
 import { qpqConfigAwsUtils } from 'quidproquo-config-aws';
-import { actionResult, actionResultError, actionResultErrorFromCaughtError, KeyValueStoreActionType, KeyValueStoreGetAllErrorTypeEnum } from 'quidproquo-core';
+import { actionResult, actionResultError, actionResultErrorFromCaughtError, KeyValueStoreActionType, KeyValueStoreGetAllErrorTypeEnum, } from 'quidproquo-core';
 import { getKvsDynamoTableNameFromConfig } from '../../../awsNamingUtils';
 import { getAllItems } from '../../../logic/dynamo';
 const getProcessKeyValueStoreGetAll = (qpqConfig) => {

package/lib/esm/getActionProcessor/core/keyValueStore/getKeyValueStoreQueryActionProcessor.js

@@ -1,5 +1,5 @@
 import { qpqConfigAwsUtils } from 'quidproquo-config-aws';
-import { actionResultError, actionResultErrorFromCaughtError, ErrorTypeEnum, qpqCoreUtils } from 'quidproquo-core';
+import { actionResultError, actionResultErrorFromCaughtError, ErrorTypeEnum, qpqCoreUtils, } from 'quidproquo-core';
 import { actionResult, KeyValueStoreActionType, KeyValueStoreQueryErrorTypeEnum } from 'quidproquo-core';
 import { getKvsDynamoTableNameFromConfig } from '../../../awsNamingUtils';
 import { query } from '../../../logic/dynamo';

package/lib/esm/getActionProcessor/core/keyValueStore/getKeyValueStoreScanActionProcessor.js

@@ -1,5 +1,5 @@
 import { qpqConfigAwsUtils } from 'quidproquo-config-aws';
-import { actionResultError, actionResultErrorFromCaughtError } from 'quidproquo-core';
+import { actionResultError, actionResultErrorFromCaughtError, } from 'quidproquo-core';
 import { actionResult, KeyValueStoreActionType, KeyValueStoreScanErrorTypeEnum } from 'quidproquo-core';
 import { getKvsDynamoTableNameFromConfig } from '../../../awsNamingUtils';
 import { scan } from '../../../logic/dynamo/scan';

package/lib/esm/getActionProcessor/core/keyValueStore/getKeyValueStoreUpdateActionProcessor.js

@@ -1,6 +1,6 @@
 import { qpqConfigAwsUtils } from 'quidproquo-config-aws';
 import { qpqCoreUtils } from 'quidproquo-core';
-import { actionResult, actionResultError, actionResultErrorFromCaughtError, KeyValueStoreActionType, KeyValueStoreUpdateErrorTypeEnum } from 'quidproquo-core';
+import { actionResult, actionResultError, actionResultErrorFromCaughtError, KeyValueStoreActionType, KeyValueStoreUpdateErrorTypeEnum, } from 'quidproquo-core';
 import { getKvsDynamoTableNameFromConfig } from '../../../awsNamingUtils';
 import { updateItem } from '../../../logic/dynamo';
 const getProcessKeyValueStoreUpdate = (qpqConfig) => {

package/lib/esm/getActionProcessor/core/keyValueStore/getKeyValueStoreUpsertActionProcessor.js

@@ -20,6 +20,7 @@ const getProcessKeyValueStoreUpsert = (qpqConfig) => {
         try {
             await putItem(dynamoTableName, item, keys, {
                 expires: options?.ttlInSeconds,
+                ifNotExistsAttribute: options?.ifNotExists ? storeConfig.partitionKey.key : undefined,
             }, region);
             return actionResult(void 0);
         }
@@ -27,6 +28,7 @@ const getProcessKeyValueStoreUpsert = (qpqConfig) => {
             return actionResultErrorFromCaughtError(error, {
                 InternalServerError: () => actionResultError(KeyValueStoreUpsertErrorTypeEnum.ServiceUnavailable, 'KVS Service Unavailable'),
                 ResourceNotFoundException: () => actionResultError(KeyValueStoreUpsertErrorTypeEnum.ResourceNotFound, 'KVS Resource Not Found'),
+                ConditionalCheckFailedException: () => actionResultError(KeyValueStoreUpsertErrorTypeEnum.Conflict, 'KVS item already exists'),
             });
         }
     };

package/lib/esm/getActionProcessor/core/queue/getQueueSendMessageActionProcessor.js

@@ -1,5 +1,5 @@
 import { qpqConfigAwsUtils } from 'quidproquo-config-aws';
-import { actionResult, actionResultError, actionResultErrorFromCaughtError, QueueActionType, QueueSendMessagesErrorTypeEnum, toCrossServiceSession } from 'quidproquo-core';
+import { actionResult, actionResultError, actionResultErrorFromCaughtError, QueueActionType, QueueSendMessagesErrorTypeEnum, toCrossServiceSession, } from 'quidproquo-core';
 import { sendMessages } from '../../../logic/sqs/sendMessages';
 import { resolveResourceName } from '../../../runtimeConfig/qpqAwsLambdaRuntimeConfigUtils';
 const getProcessQueueSendMessage = (qpqConfig) => {

package/lib/esm/getActionProcessor/webserver/index.d.ts

@@ -1,4 +1,3 @@
-export * from './extract';
 export * from './serviceFunction';
 export * from './webEntry';
 export * from './websocket';

package/lib/esm/getActionProcessor/webserver/index.js

@@ -1,13 +1,10 @@
-import { getExtractActionProcessor } from './extract';
 import { getServiceFunctionActionProcessor } from './serviceFunction';
 import { getWebEntryActionProcessor } from './webEntry';
 import { getWebsocketActionProcessor } from './websocket';
-export * from './extract';
 export * from './serviceFunction';
 export * from './webEntry';
 export * from './websocket';
 export const getWebserverActionProcessor = async (qpqConfig, dynamicModuleLoader) => ({
-    ...(await getExtractActionProcessor(qpqConfig, dynamicModuleLoader)),
     ...(await getWebEntryActionProcessor(qpqConfig, dynamicModuleLoader)),
     ...(await getServiceFunctionActionProcessor(qpqConfig, dynamicModuleLoader)),
     ...(await getWebsocketActionProcessor(qpqConfig, dynamicModuleLoader)),

package/lib/esm/lambdaHandlers/helpers/logger.js

@@ -76,9 +76,7 @@ const createBufferedLogger = (bucketName, regionForBucket, ship) => {
     let disabledLogCorrelations = [];
     return {
         enableLogs: async (enable, reason, correlation) => {
-            disabledLogCorrelations = enable
-                ? disabledLogCorrelations.filter((dlc) => dlc !== correlation)
-                : [...disabledLogCorrelations, correlation];
+            disabledLogCorrelations = enable ? disabledLogCorrelations.filter((dlc) => dlc !== correlation) : [...disabledLogCorrelations, correlation];
         },
         log: (result) => {
             // Defer all work (including JSON.stringify) to a microtask so the caller is not blocked.

package/lib/esm/logic/cognito/utils/transformCognitoResponse.js

@@ -1,10 +1,10 @@
-import { AuthenticateUserChallenge } from 'quidproquo-core';
+import { AuthenticateUserChallenge, getQpqIsoDateTimeFromDate } from 'quidproquo-core';
 import { ChallengeNameType } from '@aws-sdk/client-cognito-identity-provider';
 export const cognitoAuthenticationResultTypeToQpqAuthenticationInfo = (authResult, issueDateTime) => {
     // Parse the issueDateTime and add the expiresIn to get the expiration date
     let issueDate = new Date(issueDateTime);
     issueDate.setSeconds(issueDate.getSeconds() + (authResult.ExpiresIn || 0));
-    const expiresAt = issueDate.toISOString();
+    const expiresAt = getQpqIsoDateTimeFromDate(issueDate);
     return {
         accessToken: authResult.AccessToken,
         idToken: authResult.IdToken,

package/lib/esm/logic/dynamo/putItem.d.ts

@@ -1,5 +1,6 @@
 import { KvsKey } from 'quidproquo-core';
 export interface PutItemOptions {
     expires?: number;
+    ifNotExistsAttribute?: string;
 }
 export declare function putItem<Item, T extends object = any>(tableName: string, item: Item, attributes: KvsKey[], options: PutItemOptions, region: string): Promise<void>;

package/lib/esm/logic/dynamo/putItem.js

@@ -29,5 +29,11 @@ export async function putItem(tableName, item, attributes, options, region) {
     await dynamoDBClient.send(new PutItemCommand({
         TableName: tableName,
         Item: convertObjectToDynamoItem(item),
+        ...(options.ifNotExistsAttribute
+            ? {
+                ConditionExpression: 'attribute_not_exists(#ineAttr)',
+                ExpressionAttributeNames: { '#ineAttr': options.ifNotExistsAttribute },
+            }
+            : {}),
     }));
 }

package/lib/esm/logic/dynamo/qpqDynamoOrm/buildDynamoUpdate.js

@@ -115,11 +115,7 @@ const buildDynamoUpdateExpressionPart = (update, updateIndex) => {
     }
 };
 // Types that generate SET expressions
-const SET_ACTION_TYPES = [
-    KvsUpdateActionType.Set,
-    KvsUpdateActionType.SetIfNotExists,
-    KvsUpdateActionType.Increment
-];
+const SET_ACTION_TYPES = [KvsUpdateActionType.Set, KvsUpdateActionType.SetIfNotExists, KvsUpdateActionType.Increment];
 const buildDynamoUpdateExpressionForClause = (clause, actionTypes, kvsUpdate) => {
     const actions = kvsUpdate.filter((update) => actionTypes.includes(update.action));
     if (actions.length === 0) {

package/lib/esm/logic/s3/generatePresignedUploadUrl.js

@@ -3,9 +3,9 @@ import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 // import { createPresignedPost } from '@aws-sdk/s3-presigned-post';
 import { createAwsClient } from '../createAwsClient';
 // export const generatePresignedUploadFormUrl = async (
-//   bucketName: string, 
-//   objectKey: string, 
-//   region: string, 
+//   bucketName: string,
+//   objectKey: string,
+//   region: string,
 //   expirationMs: number,
 //   contentType: string | undefined,
 //   maxSizeBytes?: number | undefined
@@ -46,8 +46,8 @@ export const generatePresignedUploadUrl = async (bucketName, objectKey, region,
         ContentType: contentType,
         Metadata: {
             ...(correlationId && { 'correlation-id': correlationId }),
-            'upload-timestamp': Date.now().toString()
-        }
+            'upload-timestamp': Date.now().toString(),
+        },
     });
     const url = await getSignedUrl(s3Client, putObjectCommand, {
         expiresIn: expirationMs / 1000,