quidproquo-actionprocessor-awslambda 0.0.231 → 0.0.233

package/lib/esm/getActionProcessor/core/userDirectory/getUserDirectoryReadAccessTokenActionProcessor.js

@@ -1,19 +1,18 @@
-import { actionResult, qpqCoreUtils, UserDirectoryActionType, actionResultError, ErrorTypeEnum, } from 'quidproquo-core';
-import { getCFExportNameUserPoolIdFromConfig } from '../../../awsNamingUtils';
-import { getExportedValue } from '../../../logic/cloudformation/getExportedValue';
-import { decodeValidJwt } from '../../../logic/cognito/decodeValidJwt';
+import { actionResult, actionResultError, ErrorTypeEnum, UserDirectoryActionType, } from 'quidproquo-core';
+import { decodeAccessToken } from '../../../logic/cognito/decodeAccessToken';
 const getProcessReadAccessToken = (qpqConfig) => {
-    return async ({ userDirectoryName, ignoreExpiration }, session) => {
-        const region = qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
-        const userPoolId = await getExportedValue(getCFExportNameUserPoolIdFromConfig(userDirectoryName, qpqConfig), region);
-        const authInfo = await decodeValidJwt(userPoolId, region, ignoreExpiration, session.accessToken);
-        if (!authInfo || !authInfo?.username) {
+    return async ({ userDirectoryName, ignoreExpiration }, { decodedAccessToken, accessToken }) => {
+        if (decodedAccessToken) {
+            if (!ignoreExpiration && decodedAccessToken.exp < Math.floor(Date.now() / 1000)) {
+                return actionResultError(ErrorTypeEnum.Invalid, 'Access has expired');
+            }
+            return actionResult(decodedAccessToken);
+        }
+        const decodedAuthToken = await decodeAccessToken(userDirectoryName, qpqConfig, accessToken, ignoreExpiration);
+        if (!decodedAuthToken || !decodedAuthToken.username) {
             return actionResultError(ErrorTypeEnum.Unauthorized, 'Invalid accessToken');
         }
-        return actionResult({
-            userId: authInfo.userId,
-            username: authInfo.username,
-        });
+        return actionResult(decodedAuthToken);
     };
 };
 export const getUserDirectoryReadAccessTokenActionProcessor = async (qpqConfig) => ({

package/lib/esm/getActionProcessor/core/userDirectory/getUserDirectoryRefreshTokenActionProcessor.js

@@ -1,18 +1,16 @@
-import { actionResult, qpqCoreUtils, UserDirectoryActionType, actionResultError, ErrorTypeEnum, } from 'quidproquo-core';
-import { getCFExportNameUserPoolIdFromConfig, getCFExportNameUserPoolClientIdFromConfig } from '../../../awsNamingUtils';
-import { refreshToken as cognitoRefreshToken } from '../../../logic/cognito/refreshToken';
+import { actionResult, actionResultError, ErrorTypeEnum, qpqCoreUtils, UserDirectoryActionType, } from 'quidproquo-core';
+import { getCFExportNameUserPoolClientIdFromConfig, getCFExportNameUserPoolIdFromConfig } from '../../../awsNamingUtils';
 import { getExportedValue } from '../../../logic/cloudformation/getExportedValue';
-import { decodeValidJwt } from '../../../logic/cognito/decodeValidJwt';
+import { refreshToken as cognitoRefreshToken } from '../../../logic/cognito/refreshToken';
 const getProcessRefreshToken = (qpqConfig) => {
     return async ({ userDirectoryName, refreshToken }, session) => {
         const region = qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
         const userPoolId = await getExportedValue(getCFExportNameUserPoolIdFromConfig(userDirectoryName, qpqConfig), region);
         const userPoolClientId = await getExportedValue(getCFExportNameUserPoolClientIdFromConfig(userDirectoryName, qpqConfig), region);
-        const authInfo = await decodeValidJwt(userPoolId, region, true, session.accessToken);
-        if (!authInfo || !authInfo?.username) {
+        if (!session.decodedAccessToken || !session.decodedAccessToken.username) {
             return actionResultError(ErrorTypeEnum.Unauthorized, 'Invalid accessToken');
         }
-        const authResponse = await cognitoRefreshToken(userPoolId, userPoolClientId, qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig), authInfo?.username, refreshToken);
+        const authResponse = await cognitoRefreshToken(userPoolId, userPoolClientId, qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig), session.decodedAccessToken.username, refreshToken);
         return actionResult(authResponse);
     };
 };

package/lib/esm/getActionProcessor/core/userDirectory/getUserDirectoryRespondToAuthChallengeActionProcessor.js

@@ -1,8 +1,8 @@
-import { actionResult, qpqCoreUtils, UserDirectoryActionType, AuthenticateUserChallenge, } from 'quidproquo-core';
-import { getCFExportNameUserPoolIdFromConfig, getCFExportNameUserPoolClientIdFromConfig } from '../../../awsNamingUtils';
+import { actionResult, AuthenticateUserChallenge, qpqCoreUtils, UserDirectoryActionType, } from 'quidproquo-core';
+import { ChallengeNameType } from '@aws-sdk/client-cognito-identity-provider';
+import { getCFExportNameUserPoolClientIdFromConfig, getCFExportNameUserPoolIdFromConfig } from '../../../awsNamingUtils';
 import { getExportedValue } from '../../../logic/cloudformation/getExportedValue';
 import { respondToAuthChallengeChallenge } from '../../../logic/cognito/respondToAuthChallengeChallenge';
-import { ChallengeNameType } from '@aws-sdk/client-cognito-identity-provider';
 const anyAuthChallengeToCognitoAttributes = (authChallenge) => {
     switch (authChallenge.challenge) {
         case AuthenticateUserChallenge.NEW_PASSWORD_REQUIRED:

package/lib/esm/getActionProcessor/core/userDirectory/getUserDirectorySetAccessTokenActionProcessor.js

@@ -1,10 +1,13 @@
 import { actionResult, UserDirectoryActionType, } from 'quidproquo-core';
+import { decodeAccessToken } from '../../../logic/cognito';
 const getProcessSetAccessToken = (qpqConfig) => {
-    return async ({ accessToken }, session, aps, logger, updateSession) => {
+    return async ({ accessToken, userDirectoryName }, session, apl, logger, updateSession) => {
+        const decodedAccessToken = await decodeAccessToken(userDirectoryName, qpqConfig, accessToken, false);
         updateSession({
+            decodedAccessToken: decodedAccessToken,
             accessToken,
         });
-        return actionResult(void 0);
+        return actionResult(decodedAccessToken);
     };
 };
 export const getUserDirectorySetAccessTokenActionProcessor = async (qpqConfig) => ({

package/lib/esm/getActionProcessor/index.js

@@ -1,6 +1,6 @@
+import { getCoreActionProcessor as getNodeCoreActionProcessor, getWebserverActionProcessor as getNodeWebserverActionProcessor, } from 'quidproquo-actionprocessor-node';
 import { getCoreActionProcessor as getAwsCoreActionProcessor } from './core';
 import { getWebserverActionProcessor as getAwsWebserverActionProcessor } from './webserver';
-import { getCoreActionProcessor as getNodeCoreActionProcessor, getWebserverActionProcessor as getNodeWebserverActionProcessor, } from 'quidproquo-actionprocessor-node';
 export const getAwsActionProcessors = async (qpqConfig, dynamicModuleLoader) => {
     const storyActionProcessor = {
         ...(await getNodeCoreActionProcessor(qpqConfig, dynamicModuleLoader)),

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

@@ -1,5 +1,5 @@
-export * from './webEntry';
 export * from './serviceFunction';
+export * from './webEntry';
 export * from './websocket';
 import { ActionProcessorListResolver } from 'quidproquo-core';
 export declare const getWebserverActionProcessor: ActionProcessorListResolver;

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

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

package/lib/esm/getActionProcessor/webserver/serviceFunction/getServiceFunctionExecuteActionProcessor.js

@@ -1,7 +1,7 @@
 import { actionResult, actionResultError, qpqCoreUtils, } from 'quidproquo-core';
 import { ServiceFunctionActionType } from 'quidproquo-webserver';
-import { executeLambdaByName } from '../../../logic/lambda/executeLambdaByName';
 import { getConfigRuntimeResourceName } from '../../../awsNamingUtils';
+import { executeLambdaByName } from '../../../logic/lambda/executeLambdaByName';
 const getProcessExecute = (qpqConfig) => {
     return async ({ functionName, service, payload, context, isAsync }, session) => {
         const region = qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);

package/lib/esm/getActionProcessor/webserver/webEntry/getWebEntryInvalidateCacheActionProcessor.js

@@ -1,8 +1,8 @@
 import { actionResult, qpqCoreUtils } from 'quidproquo-core';
 import { WebEntryActionType } from 'quidproquo-webserver';
 import { getCFExportNameDistributionIdArnFromConfig } from '../../../awsNamingUtils';
-import { invalidateCache } from '../../../logic/cloudFront/invalidateCache';
 import { getExportedValue } from '../../../logic/cloudformation/getExportedValue';
+import { invalidateCache } from '../../../logic/cloudFront/invalidateCache';
 const getProcessInvalidateCache = (qpqConfig) => {
     return async ({ paths, webEntryName }) => {
         const region = qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);

package/lib/esm/index.d.ts

@@ -1,9 +1,10 @@
-export * from './getActionProcessor';
 export * as awsLambdaUtils from './awsLambdaUtils';
 export * as awsNamingUtils from './awsNamingUtils';
+export * from './getActionProcessor';
 export * from './runtimeConfig/QPQAWSResourceMap';
+export * from './getLambdaEntries';
+export * from './lambdaHandlers';
+export * from './logic';
+export * from './logic/cache/memoFunc';
 export * from './logic/parametersManager/getParameter';
 export * from './logic/parametersManager/getParameters';
-export * from './logic/cache/memoFunc';
-export * from './lambdaHandlers';
-export * from './getLambdaEntries';

package/lib/esm/index.js

@@ -1,9 +1,11 @@
-export * from './getActionProcessor';
 export * as awsLambdaUtils from './awsLambdaUtils';
 export * as awsNamingUtils from './awsNamingUtils';
+export * from './getActionProcessor';
 export * from './runtimeConfig/QPQAWSResourceMap';
+// TODO EXPORT THIS BETTER..
+export * from './getLambdaEntries';
+export * from './lambdaHandlers';
+export * from './logic';
+export * from './logic/cache/memoFunc';
 export * from './logic/parametersManager/getParameter';
 export * from './logic/parametersManager/getParameters';
-export * from './logic/cache/memoFunc';
-export * from './lambdaHandlers';
-export * from './getLambdaEntries';

package/lib/esm/lambdaHandlers/getAnyExecuteServiceFunctionEvent_serviceFunction.d.ts

@@ -1,5 +1,5 @@
-import { ExecuteServiceFunctionEvent } from 'quidproquo-webserver';
 import { DynamicModuleLoader, QPQConfig, StorySession } from 'quidproquo-core';
+import { ExecuteServiceFunctionEvent } from 'quidproquo-webserver';
 type AnyExecuteServiceFunctionEventWithSession = ExecuteServiceFunctionEvent<any[]> & {
     storySession: StorySession;
 };

package/lib/esm/lambdaHandlers/getAnyExecuteServiceFunctionEvent_serviceFunction.js

@@ -1,6 +1,6 @@
 import { QpqRuntimeType } from 'quidproquo-core';
-import { getQpqLambdaRuntimeForEvent } from './helpers/getQpqLambdaRuntimeForEvent';
 import { getLambdaServiceFunctionEventProcessor } from '../getActionProcessor';
+import { getQpqLambdaRuntimeForEvent } from './helpers/getQpqLambdaRuntimeForEvent';
 export const getAnyExecuteServiceFunctionEvent_serviceFunction = (dynamicModuleLoader, qpqConfig) => getQpqLambdaRuntimeForEvent(QpqRuntimeType.SERVICE_FUNCTION_EXE, (event) => {
     return event.storySession;
 }, getLambdaServiceFunctionEventProcessor, dynamicModuleLoader, qpqConfig);

package/lib/esm/lambdaHandlers/getApiGatewayEventHandler.js

@@ -1,14 +1,11 @@
 import { QpqRuntimeType } from 'quidproquo-core';
-import { qpqWebServerUtils } from 'quidproquo-webserver';
 import { getApiGatewayApiEventEventProcessor } from '../getActionProcessor';
 import { getQpqLambdaRuntimeForEvent } from './helpers/getQpqLambdaRuntimeForEvent';
 export const getApiGatewayEventHandler = (dynamicModuleLoader, qpqConfig) => getQpqLambdaRuntimeForEvent(QpqRuntimeType.API, (event) => {
     console.log('event', JSON.stringify(event, null, 2));
     console.log(event);
-    const accessToken = qpqWebServerUtils.getAccessTokenFromHeaders(event.headers);
     return {
         depth: 0,
-        accessToken: accessToken,
         context: {},
     };
 }, getApiGatewayApiEventEventProcessor, dynamicModuleLoader, qpqConfig);

package/lib/esm/lambdaHandlers/getApiGatwayEventWebsocketWithIdentity_websocketEvent.d.ts

@@ -1,5 +1,5 @@
 import { DynamicModuleLoader, QPQConfig } from 'quidproquo-core';
-import { APIGatewayProxyWebsocketEventV2WithRequestContext, APIGatewayEventWebsocketRequestContextV2 } from 'aws-lambda';
+import { APIGatewayEventWebsocketRequestContextV2, APIGatewayProxyWebsocketEventV2WithRequestContext } from 'aws-lambda';
 type ApiGatwayEventWebsocketWithIdentity = APIGatewayProxyWebsocketEventV2WithRequestContext<APIGatewayEventWebsocketRequestContextV2 & {
     identity: {
         sourceIp: string;

package/lib/esm/lambdaHandlers/getApiGatwayEventWebsocketWithIdentity_websocketEvent.js

@@ -1,6 +1,6 @@
 import { QpqRuntimeType } from 'quidproquo-core';
-import { getQpqLambdaRuntimeForEvent } from './helpers/getQpqLambdaRuntimeForEvent';
 import { getApiGatewayWebsocketEventEventProcessor } from '../getActionProcessor';
+import { getQpqLambdaRuntimeForEvent } from './helpers/getQpqLambdaRuntimeForEvent';
 export const getApiGatwayEventWebsocketWithIdentity_websocketEvent = (dynamicModuleLoader, qpqConfig) => getQpqLambdaRuntimeForEvent(QpqRuntimeType.WEBSOCKET_EVENT, (event) => {
     return {
         depth: 0,

package/lib/esm/lambdaHandlers/getCloudFrontRequestEvent_originRequest.js

@@ -1,6 +1,6 @@
 import { QpqRuntimeType } from 'quidproquo-core';
-import { getQpqLambdaRuntimeForEvent } from './helpers/getQpqLambdaRuntimeForEvent';
 import { getCloudFrontOriginRequestEventProcessor } from '../getActionProcessor';
+import { getQpqLambdaRuntimeForEvent } from './helpers/getQpqLambdaRuntimeForEvent';
 export const getCloudFrontRequestEvent_originRequest = (dynamicModuleLoader, qpqConfig) => getQpqLambdaRuntimeForEvent(QpqRuntimeType.EVENT_SEO_OR, (event) => {
     return {
         depth: 0,

package/lib/esm/lambdaHandlers/getCustomMessageTriggerEvent_customMessage.js

@@ -1,6 +1,6 @@
 import { QpqRuntimeType } from 'quidproquo-core';
-import { getQpqLambdaRuntimeForEvent } from './helpers/getQpqLambdaRuntimeForEvent';
 import { getCognitoCustomMessageEventProcessor } from '../getActionProcessor';
+import { getQpqLambdaRuntimeForEvent } from './helpers/getQpqLambdaRuntimeForEvent';
 export const getCustomMessageTriggerEvent_customMessage = (dynamicModuleLoader, qpqConfig) => getQpqLambdaRuntimeForEvent(QpqRuntimeType.SEND_EMAIL_EVENT, (event) => {
     return {
         depth: 0,

package/lib/esm/lambdaHandlers/getCustomMessageTriggerEvent_defineAuthChallenge.js

@@ -1,6 +1,6 @@
 import { QpqRuntimeType } from 'quidproquo-core';
-import { getQpqLambdaRuntimeForEvent } from './helpers/getQpqLambdaRuntimeForEvent';
 import { getCognitoDefineAuthChallengeEventProcessor } from '../getActionProcessor';
+import { getQpqLambdaRuntimeForEvent } from './helpers/getQpqLambdaRuntimeForEvent';
 export const getCustomMessageTriggerEvent_defineAuthChallenge = (dynamicModuleLoader, qpqConfig) => getQpqLambdaRuntimeForEvent(QpqRuntimeType.AUTH_DEFINE_AUTH_CHALLENGE, (event) => {
     return {
         depth: 0,

package/lib/esm/lambdaHandlers/getCustomMessageTriggerEvent_verifyAuthChallenge.js

@@ -1,6 +1,6 @@
 import { QpqRuntimeType } from 'quidproquo-core';
-import { getQpqLambdaRuntimeForEvent } from './helpers/getQpqLambdaRuntimeForEvent';
 import { getCognitoVerifyAuthChallengeEventProcessor } from '../getActionProcessor';
+import { getQpqLambdaRuntimeForEvent } from './helpers/getQpqLambdaRuntimeForEvent';
 export const getCustomMessageTriggerEvent_verifyAuthChallenge = (dynamicModuleLoader, qpqConfig) => getQpqLambdaRuntimeForEvent(QpqRuntimeType.AUTH_VERIFY_AUTH_CHALLENGE, (event) => {
     return {
         depth: 0,

package/lib/esm/lambdaHandlers/getEventBridgeEvent_recurringSchedule.js

@@ -1,6 +1,6 @@
 import { QpqRuntimeType } from 'quidproquo-core';
-import { getQpqLambdaRuntimeForEvent } from './helpers/getQpqLambdaRuntimeForEvent';
 import { getEventBridgeEventActionProcessor } from '../getActionProcessor';
+import { getQpqLambdaRuntimeForEvent } from './helpers/getQpqLambdaRuntimeForEvent';
 export const getEventBridgeEvent_recurringSchedule = (dynamicModuleLoader, qpqConfig) => getQpqLambdaRuntimeForEvent(QpqRuntimeType.RECURRING_SCHEDULE, (event) => {
     return {
         depth: 0,

package/lib/esm/lambdaHandlers/getEventBridgeEvent_stackDeploy.js

@@ -1,6 +1,6 @@
 import { QpqRuntimeType } from 'quidproquo-core';
-import { getQpqLambdaRuntimeForEvent } from './helpers/getQpqLambdaRuntimeForEvent';
 import { getEventBridgeStackDeployEventActionProcessor } from '../getActionProcessor';
+import { getQpqLambdaRuntimeForEvent } from './helpers/getQpqLambdaRuntimeForEvent';
 export const getEventBridgeEvent_stackDeploy = (dynamicModuleLoader, qpqConfig) => getQpqLambdaRuntimeForEvent(QpqRuntimeType.DEPLOY_EVENT, (event) => {
     return {
         depth: 0,

package/lib/esm/lambdaHandlers/getS3Event_fileEvent.js

@@ -1,6 +1,6 @@
 import { QpqRuntimeType } from 'quidproquo-core';
-import { getQpqLambdaRuntimeForEvent } from './helpers/getQpqLambdaRuntimeForEvent';
 import { getS3FileEventEventProcessor } from '../getActionProcessor';
+import { getQpqLambdaRuntimeForEvent } from './helpers/getQpqLambdaRuntimeForEvent';
 export const getS3Event_fileEvent = (dynamicModuleLoader, qpqConfig) => getQpqLambdaRuntimeForEvent(QpqRuntimeType.STORAGEDRIVE_EVENT, (event) => {
     return {
         depth: 0,

package/lib/esm/lambdaHandlers/getSqsEvent_queueEvent.d.ts

@@ -1,3 +1,3 @@
-import { SQSEvent } from 'aws-lambda';
 import { DynamicModuleLoader, QPQConfig } from 'quidproquo-core';
+import { SQSEvent } from 'aws-lambda';
 export declare const getSqsEvent_queueEvent: (dynamicModuleLoader: DynamicModuleLoader, qpqConfig: QPQConfig) => (event: SQSEvent, context: import("aws-lambda").Context) => Promise<any>;

package/lib/esm/lambdaHandlers/getSqsEvent_queueEvent.js

@@ -1,6 +1,6 @@
 import { QpqRuntimeType } from 'quidproquo-core';
-import { getQpqLambdaRuntimeForEvent } from './helpers/getQpqLambdaRuntimeForEvent';
 import { getSqsQueueEventProcessor } from '../getActionProcessor';
+import { getQpqLambdaRuntimeForEvent } from './helpers/getQpqLambdaRuntimeForEvent';
 export const getSqsEvent_queueEvent = (dynamicModuleLoader, qpqConfig) => getQpqLambdaRuntimeForEvent(QpqRuntimeType.QUEUE_EVENT, (event) => {
     return {
         depth: 0,

package/lib/esm/lambdaHandlers/helpers/getQpqLambdaRuntimeForEvent.d.ts

@@ -1,3 +1,3 @@
-import { Context } from 'aws-lambda';
 import { ActionProcessorListResolver, DynamicModuleLoader, QPQConfig, QpqRuntimeType, StorySession } from 'quidproquo-core';
+import { Context } from 'aws-lambda';
 export declare const getQpqLambdaRuntimeForEvent: <E extends unknown>(runtimeType: QpqRuntimeType, getStorySession: (event: E) => StorySession, getActionProcessorList: ActionProcessorListResolver, dynamicModuleLoader: DynamicModuleLoader, qpqConfig: QPQConfig) => (event: E, context: Context) => Promise<any>;

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

@@ -1,9 +1,9 @@
-import { dynamicModuleLoaderWarmer } from './dynamicModuleLoaderWarmer';
-import { getLogger } from './logger';
+import { getCustomActionActionProcessor } from 'quidproquo-actionprocessor-node';
 import { askProcessEvent, createRuntime, } from 'quidproquo-core';
-import { getRuntimeCorrelation } from './getRuntimeCorrelation';
 import { getAwsActionProcessors } from '../../getActionProcessor';
-import { getCustomActionActionProcessor } from 'quidproquo-actionprocessor-node';
+import { dynamicModuleLoaderWarmer } from './dynamicModuleLoaderWarmer';
+import { getRuntimeCorrelation } from './getRuntimeCorrelation';
+import { getLogger } from './logger';
 const isSnsEvent = (event) => {
     if (event && typeof event === 'object') {
         const possibleSnsEvent = event;

package/lib/esm/lambdaHandlers/helpers/logger.d.ts

@@ -1,4 +1,4 @@
-import { StoryResult, QPQConfig, QpqLogger } from 'quidproquo-core';
+import { QPQConfig, QpqLogger, StoryResult } from 'quidproquo-core';
 export declare const storyLogger: (result: StoryResult<any>, bucketName: string, region: string) => Promise<void>;
 export declare const storyLoggerFs: (result: StoryResult<any>) => Promise<void>;
 export declare const moveLogsToPerminateStorage: (bucketName: string, region: string) => Promise<void>;

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

@@ -1,10 +1,10 @@
+import { qpqCoreUtils } from 'quidproquo-core';
 import fs from 'fs';
 import path from 'path';
-import { S3Client, PutObjectCommand } from '@aws-sdk/client-s3';
+import { PutObjectCommand, S3Client } from '@aws-sdk/client-s3';
 import { getConfigRuntimeResourceName } from '../../awsNamingUtils';
-import { qpqCoreUtils } from 'quidproquo-core';
 const tempDirectory = '/tmp/qpqlogs';
-import { getAwsServiceAccountInfoConfig, getAwsServiceAccountInfoByDeploymentInfo } from 'quidproquo-config-aws';
+import { getAwsServiceAccountInfoByDeploymentInfo, getAwsServiceAccountInfoConfig } from 'quidproquo-config-aws';
 export const storyLogger = async (result, bucketName, region) => {
     try {
         const s3Client = new S3Client({ region });

package/lib/esm/lambdaHandlers/index.d.ts

@@ -1,8 +1,6 @@
-export * from './types';
-export * from './helpers';
 export * from './getAnyExecuteServiceFunctionEvent_serviceFunction';
-export * from './getApiGatewayEventHandler_redirect';
 export * from './getApiGatewayEventHandler';
+export * from './getApiGatewayEventHandler_redirect';
 export * from './getApiGatwayEventWebsocketWithIdentity_websocketEvent';
 export * from './getCloudFrontRequestEvent_originRequest';
 export * from './getCloudFrontRequestEvent_viewerRequest';
@@ -14,3 +12,5 @@ export * from './getEventBridgeEvent_recurringSchedule';
 export * from './getEventBridgeEvent_stackDeploy';
 export * from './getS3Event_fileEvent';
 export * from './getSqsEvent_queueEvent';
+export * from './helpers';
+export * from './types';

package/lib/esm/lambdaHandlers/index.js

@@ -1,8 +1,6 @@
-export * from './types';
-export * from './helpers';
 export * from './getAnyExecuteServiceFunctionEvent_serviceFunction';
-export * from './getApiGatewayEventHandler_redirect';
 export * from './getApiGatewayEventHandler';
+export * from './getApiGatewayEventHandler_redirect';
 export * from './getApiGatwayEventWebsocketWithIdentity_websocketEvent';
 export * from './getCloudFrontRequestEvent_originRequest';
 export * from './getCloudFrontRequestEvent_viewerRequest';
@@ -14,3 +12,5 @@ export * from './getEventBridgeEvent_recurringSchedule';
 export * from './getEventBridgeEvent_stackDeploy';
 export * from './getS3Event_fileEvent';
 export * from './getSqsEvent_queueEvent';
+export * from './helpers';
+export * from './types';

package/lib/esm/lambdas/anyExecuteServiceFunctionEvent_serviceFunction.js

@@ -1,4 +1,4 @@
-import { getQpqConfig } from './lambda-utils';
-import { dynamicModuleLoader } from './dynamicModuleLoader';
 import { getAnyExecuteServiceFunctionEvent_serviceFunction } from '../lambdaHandlers';
+import { dynamicModuleLoader } from './dynamicModuleLoader';
+import { getQpqConfig } from './lambda-utils';
 export const anyExecuteServiceFunctionEvent_serviceFunction = getAnyExecuteServiceFunctionEvent_serviceFunction(dynamicModuleLoader, getQpqConfig());

package/lib/esm/lambdas/apiGatewayEventHandler.js

@@ -1,4 +1,4 @@
 import { getApiGatewayEventHandler } from '../lambdaHandlers';
-import { getQpqConfig } from './lambda-utils';
 import { dynamicModuleLoader } from './dynamicModuleLoader';
+import { getQpqConfig } from './lambda-utils';
 export const apiGatewayEventHandler = getApiGatewayEventHandler(dynamicModuleLoader, getQpqConfig());

package/lib/esm/lambdas/apiGatwayEventWebsocketWithIdentity_websocketEvent.js

@@ -1,4 +1,4 @@
-import { getQpqConfig } from './lambda-utils';
 import { getApiGatwayEventWebsocketWithIdentity_websocketEvent } from '../lambdaHandlers';
 import { dynamicModuleLoader } from './dynamicModuleLoader';
+import { getQpqConfig } from './lambda-utils';
 export const apiGatwayEventWebsocketWithIdentity_websocketEvent = getApiGatwayEventWebsocketWithIdentity_websocketEvent(dynamicModuleLoader, getQpqConfig());

package/lib/esm/lambdas/cloudFrontRequestEvent_originRequest.js

@@ -1,4 +1,4 @@
-import { getQpqConfig } from './lambda-utils';
 import { getCloudFrontRequestEvent_originRequest } from '../lambdaHandlers';
 import { dynamicModuleLoader } from './dynamicModuleLoader';
+import { getQpqConfig } from './lambda-utils';
 export const cloudFrontRequestEvent_originRequest = getCloudFrontRequestEvent_originRequest(dynamicModuleLoader, getQpqConfig());

package/lib/esm/lambdas/customMessageTriggerEvent_createAuthChallenge.js

@@ -1,4 +1,4 @@
-import { getQpqConfig } from './lambda-utils';
 import { getCustomMessageTriggerEvent_createAuthChallenge } from '../lambdaHandlers';
 import { dynamicModuleLoader } from './dynamicModuleLoader';
+import { getQpqConfig } from './lambda-utils';
 export const customMessageTriggerEvent_createAuthChallenge = getCustomMessageTriggerEvent_createAuthChallenge(dynamicModuleLoader, getQpqConfig());

package/lib/esm/lambdas/customMessageTriggerEvent_customMessage.js

@@ -1,4 +1,4 @@
-import { getQpqConfig } from './lambda-utils';
 import { getCustomMessageTriggerEvent_customMessage } from '../lambdaHandlers';
 import { dynamicModuleLoader } from './dynamicModuleLoader';
+import { getQpqConfig } from './lambda-utils';
 export const customMessageTriggerEvent_customMessage = getCustomMessageTriggerEvent_customMessage(dynamicModuleLoader, getQpqConfig());

package/lib/esm/lambdas/customMessageTriggerEvent_defineAuthChallenge.js

@@ -1,4 +1,4 @@
-import { getQpqConfig } from './lambda-utils';
 import { getCustomMessageTriggerEvent_defineAuthChallenge } from '../lambdaHandlers';
 import { dynamicModuleLoader } from './dynamicModuleLoader';
+import { getQpqConfig } from './lambda-utils';
 export const customMessageTriggerEvent_defineAuthChallenge = getCustomMessageTriggerEvent_defineAuthChallenge(dynamicModuleLoader, getQpqConfig());

package/lib/esm/lambdas/customMessageTriggerEvent_verifyAuthChallenge.js

@@ -1,4 +1,4 @@
-import { getQpqConfig } from './lambda-utils';
 import { getCustomMessageTriggerEvent_verifyAuthChallenge } from '../lambdaHandlers';
 import { dynamicModuleLoader } from './dynamicModuleLoader';
+import { getQpqConfig } from './lambda-utils';
 export const customMessageTriggerEvent_verifyAuthChallenge = getCustomMessageTriggerEvent_verifyAuthChallenge(dynamicModuleLoader, getQpqConfig());

package/lib/esm/lambdas/dynamicModuleLoader/dynamicModuleLoader.js

@@ -1,4 +1,4 @@
-// @ts-ignore - Special webpack file injected
+// @ts-expect-error - Special webpack file injected
 import { qpqDynamicModuleLoader } from 'quidproquo-dynamic-loader';
 export const dynamicModuleLoader = async (modulePath) => {
     return qpqDynamicModuleLoader(modulePath);

package/lib/esm/lambdas/eventBridgeEvent_recurringSchedule.js

@@ -1,4 +1,4 @@
 import { getEventBridgeEvent_recurringSchedule } from '../lambdaHandlers';
-import { getQpqConfig } from './lambda-utils';
 import { dynamicModuleLoader } from './dynamicModuleLoader';
+import { getQpqConfig } from './lambda-utils';
 export const eventBridgeEvent_recurringSchedule = getEventBridgeEvent_recurringSchedule(dynamicModuleLoader, getQpqConfig());

package/lib/esm/lambdas/eventBridgeEvent_stackDeploy.js

@@ -1,4 +1,4 @@
-import { dynamicModuleLoader } from './dynamicModuleLoader';
 import { getEventBridgeEvent_stackDeploy } from '../lambdaHandlers';
+import { dynamicModuleLoader } from './dynamicModuleLoader';
 import { getQpqConfig } from './lambda-utils';
 export const eventBridgeEvent_stackDeploy = getEventBridgeEvent_stackDeploy(dynamicModuleLoader, getQpqConfig());

package/lib/esm/lambdas/lambda-utils/getQpqConfig.js

@@ -1,4 +1,4 @@
-// @ts-ignore - Special webpack file injected
+// @ts-expect-error - Special webpack file injected
 import { qpqConfig } from 'quidproquo-dynamic-loader';
 export const getQpqConfig = () => {
     return qpqConfig;

package/lib/esm/lambdas/lambda-utils/index.d.ts

@@ -1,2 +1,2 @@
-export * from './logger';
 export * from './getQpqConfig';
+export * from './logger';

package/lib/esm/lambdas/lambda-utils/index.js

@@ -1,2 +1,2 @@
-export * from './logger';
 export * from './getQpqConfig';
+export * from './logger';

package/lib/esm/lambdas/lambda-utils/logger.d.ts

@@ -1,4 +1,4 @@
-import { StoryResult, QPQConfig, QpqLogger } from 'quidproquo-core';
+import { QPQConfig, QpqLogger, StoryResult } from 'quidproquo-core';
 export declare const storyLogger: (result: StoryResult<any>, bucketName: string, region: string) => Promise<void>;
 export declare const storyLoggerFs: (result: StoryResult<any>) => Promise<void>;
 export declare const moveLogsToPerminateStorage: (bucketName: string, region: string) => Promise<void>;

package/lib/esm/lambdas/lambda-utils/logger.js

@@ -1,9 +1,9 @@
+import { qpqCoreUtils } from 'quidproquo-core';
 import fs from 'fs';
 import path from 'path';
-import { S3Client, PutObjectCommand } from '@aws-sdk/client-s3';
-import { qpqCoreUtils } from 'quidproquo-core';
+import { PutObjectCommand, S3Client } from '@aws-sdk/client-s3';
 const tempDirectory = '/tmp/qpqlogs';
-import { getAwsServiceAccountInfoConfig, getAwsServiceAccountInfoByDeploymentInfo } from 'quidproquo-config-aws';
+import { getAwsServiceAccountInfoByDeploymentInfo, getAwsServiceAccountInfoConfig } from 'quidproquo-config-aws';
 import { getConfigRuntimeResourceName } from '../../awsNamingUtils';
 export const storyLogger = async (result, bucketName, region) => {
     try {

package/lib/esm/lambdas/lambdaSQSEvent.js

@@ -1,8 +1,8 @@
 import { QpqRuntimeType } from 'quidproquo-core';
-import { getQpqConfig } from './lambda-utils';
-import { dynamicModuleLoader } from './dynamicModuleLoader';
-import { getQpqLambdaRuntimeForEvent } from '../lambdaHandlers/helpers/getQpqLambdaRuntimeForEvent';
 import { getSqsQueueEventProcessor } from '../getActionProcessor';
+import { getQpqLambdaRuntimeForEvent } from '../lambdaHandlers/helpers/getQpqLambdaRuntimeForEvent';
+import { dynamicModuleLoader } from './dynamicModuleLoader';
+import { getQpqConfig } from './lambda-utils';
 // Default executor
 export const executeSQSEvent = getQpqLambdaRuntimeForEvent(QpqRuntimeType.QUEUE_EVENT, (event) => {
     return {

package/lib/esm/lambdas/sqsEvent_queueEvent.js

@@ -1,4 +1,4 @@
-import { getQpqConfig } from './lambda-utils';
 import { getSqsEvent_queueEvent } from '../lambdaHandlers';
 import { dynamicModuleLoader } from './dynamicModuleLoader';
+import { getQpqConfig } from './lambda-utils';
 export const sqsEvent_queueEvent = getSqsEvent_queueEvent(dynamicModuleLoader, getQpqConfig());

package/lib/esm/logic/acm/findMatchingCertificates.js

@@ -15,8 +15,7 @@ export const findMatchingCertificates = async (domainName, region, retryCount =
             });
             const listResult = await acmClient.send(listCommand);
             for (const certificate of listResult.CertificateSummaryList || []) {
-                if (certificate.CertificateArn &&
-                    certificate.DomainName?.toLowerCase() === lowerCaseDomainName) {
+                if (certificate.CertificateArn && certificate.DomainName?.toLowerCase() === lowerCaseDomainName) {
                     certificateArns.push(certificate.CertificateArn);
                 }
             }

package/lib/esm/logic/apiGateway/getApiKeys.js

@@ -1,4 +1,4 @@
-import { APIGatewayClient, GetApiKeysCommand, } from '@aws-sdk/client-api-gateway';
+import { APIGatewayClient, GetApiKeysCommand } from '@aws-sdk/client-api-gateway';
 import { createAwsClient } from '../createAwsClient';
 export const getApiKeys = async (region, ...keyNames) => {
     const apiGatewayClient = createAwsClient(APIGatewayClient, { region });
@@ -9,5 +9,9 @@ export const getApiKeys = async (region, ...keyNames) => {
     const res = await apiGatewayClient.send(new GetApiKeysCommand(input));
     return (res.items
         ?.filter((i) => keyNames.indexOf(i.name) >= 0)
-        .map((i) => ({ name: i.name, value: i.value, description: i.description })) || []);
+        .map((i) => ({
+        name: i.name,
+        value: i.value,
+        description: i.description,
+    })) || []);
 };

package/lib/esm/logic/apiGateway/websocketSendMessage.js

@@ -1,16 +1,16 @@
-import { ApiGatewayManagementApiClient, PostToConnectionCommand } from "@aws-sdk/client-apigatewaymanagementapi";
+import { ApiGatewayManagementApiClient, PostToConnectionCommand } from '@aws-sdk/client-apigatewaymanagementapi';
 import { createAwsClient } from '../createAwsClient';
 export const sendMessageToWebSocketConnection = async (apiId, connectionId, region, payload) => {
     // Create a new ApiGatewayManagementApiClient
     const apiGatewayManagementApiClient = createAwsClient(ApiGatewayManagementApiClient, {
-        apiVersion: "2018-11-29",
+        apiVersion: '2018-11-29',
         endpoint: `https://${apiId}.execute-api.${region}.amazonaws.com/prod`,
-        region
+        region,
     });
     // Create a new PostToConnectionCommand with the connection ID and payload
     const command = new PostToConnectionCommand({
         ConnectionId: connectionId,
-        Data: JSON.stringify(payload) // Convert payload to string if necessary
+        Data: JSON.stringify(payload), // Convert payload to string if necessary
     });
     await apiGatewayManagementApiClient.send(command);
 };

package/lib/esm/logic/cache/memoFuncAsync.js

@@ -16,14 +16,10 @@ export const memoFuncAsync = (func, ttlInSeconds = 3600) => {
         if (nodeCache.has(cacheKey)) {
             return nodeCache.get(cacheKey);
         }
-        try {
-            // Await the result and then cache it
-            const result = await func(...args);
-            nodeCache.set(cacheKey, result);
-            return result;
-        }
-        catch (err) {
-            throw err; // re-throw the error to be caught by caller
-        }
+        // Await the result
+        const result = await func(...args);
+        // and then cache it
+        nodeCache.set(cacheKey, result);
+        return result;
     });
 };