quidproquo-actionprocessor-awslambda 0.0.43 → 0.0.44

package/lib/getActionProcessor/core/config/getConfigGetParameterActionProcessor.js

@@ -10,12 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const quidproquo_core_1 = require("quidproquo-core");
+const quidproquo_webserver_1 = require("quidproquo-webserver");
 const qpqAwsLambdaRuntimeConfigUtils_1 = require("../../../runtimeConfig/qpqAwsLambdaRuntimeConfigUtils");
 const getParameter_1 = require("../../../logic/parametersManager/getParameter");
 const getProcessConfigGetParameter = (runtimeConfig) => {
     return ({ parameterName }) => __awaiter(void 0, void 0, void 0, function* () {
         const awsParameterKey = (0, qpqAwsLambdaRuntimeConfigUtils_1.resolveParameterKey)(parameterName, runtimeConfig);
-        const parameterValue = yield (0, getParameter_1.getParameter)(awsParameterKey);
+        const parameterValue = yield (0, getParameter_1.getParameter)(awsParameterKey, quidproquo_webserver_1.qpqWebServerUtils.getDeployRegion(runtimeConfig.qpqConfig));
         return (0, quidproquo_core_1.actionResult)(parameterValue);
     });
 };

package/lib/getActionProcessor/core/config/getConfigGetParametersActionProcessor.js

@@ -10,12 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const quidproquo_core_1 = require("quidproquo-core");
+const quidproquo_webserver_1 = require("quidproquo-webserver");
 const qpqAwsLambdaRuntimeConfigUtils_1 = require("../../../runtimeConfig/qpqAwsLambdaRuntimeConfigUtils");
 const getParameters_1 = require("../../../logic/parametersManager/getParameters");
 const getProcessConfigGetParameters = (runtimeConfig) => {
     return ({ parameterNames }) => __awaiter(void 0, void 0, void 0, function* () {
         const awsParameterKeys = parameterNames.map((pn) => (0, qpqAwsLambdaRuntimeConfigUtils_1.resolveParameterKey)(pn, runtimeConfig));
-        const parameterValues = yield (0, getParameters_1.getParameters)(awsParameterKeys);
+        const parameterValues = yield (0, getParameters_1.getParameters)(awsParameterKeys, quidproquo_webserver_1.qpqWebServerUtils.getDeployRegion(runtimeConfig.qpqConfig));
         return (0, quidproquo_core_1.actionResult)(parameterValues);
     });
 };

package/lib/getActionProcessor/core/event/getAPIGatewayEventActionProcessor.d.ts

@@ -3,7 +3,7 @@ import { HTTPEventParams } from 'quidproquo-webserver';
 import { Context, APIGatewayProxyResult } from 'aws-lambda';
 declare const _default: (config: QPQConfig) => {
     "@quidproquo-core/event/TransformEventParams": EventTransformEventParamsActionProcessor<[import("aws-lambda").APIGatewayProxyEvent, Context], HTTPEventParams<any>>;
-    "@quidproquo-core/event/TransformResponseResult": EventTransformResponseResultActionProcessor<APIGatewayProxyResult>;
+    "@quidproquo-core/event/TransformResponseResult": EventTransformResponseResultActionProcessor<any, any, APIGatewayProxyResult>;
     "@quidproquo-core/event/AutoRespond": EventAutoRespondActionProcessor<HTTPEventParams<any>>;
     "@quidproquo-core/event/MatchStory": EventMatchStoryActionProcessor<HTTPEventParams<any>>;
 };

package/lib/getActionProcessor/core/event/getAPIGatewayEventActionProcessor.js

@@ -15,7 +15,6 @@ const awsLambdaUtils_1 = require("../../../awsLambdaUtils");
 const getProcessTransformEventParams = (appName) => {
     return ({ eventParams: [apiGatewayEvent, context] }) => __awaiter(void 0, void 0, void 0, function* () {
         const path = (apiGatewayEvent.path || '').replace(new RegExp(`^(\/${appName})/`), '/');
-        console.log('getProcessTransformEventParams', JSON.stringify(apiGatewayEvent));
         return (0, quidproquo_core_1.actionResult)({
             path,
             query: Object.assign(Object.assign({}, (apiGatewayEvent.multiValueQueryStringParameters || {})), (apiGatewayEvent.queryStringParameters || {})),
@@ -30,13 +29,11 @@ const getProcessTransformEventParams = (appName) => {
 const getProcessTransformResponseResult = (configs) => {
     // We might need to JSON.stringify the body.
     return (payload) => __awaiter(void 0, void 0, void 0, function* () {
-        // Validate response
-        // if !valid actionResultError
-        console.log('getProcessTransformResponseResult', JSON.stringify(payload));
+        var _a;
         return (0, quidproquo_core_1.actionResult)({
-            statusCode: payload.response.result.statusCode,
-            body: payload.response.result.body,
-            headers: Object.assign(Object.assign({ 'Content-Type': 'application/json' }, quidproquo_webserver_1.qpqWebServerUtils.getCorsHeaders(configs, {}, payload.transformedEventParams.headers)), (payload.response.headers || {})),
+            statusCode: payload.response.statusCode,
+            body: payload.response.body,
+            headers: Object.assign(Object.assign({ 'Content-Type': 'application/json' }, quidproquo_webserver_1.qpqWebServerUtils.getCorsHeaders(configs, {}, payload.transformedEventParams.headers)), (((_a = payload === null || payload === void 0 ? void 0 : payload.response) === null || _a === void 0 ? void 0 : _a.headers) || {})),
         });
     });
 };

package/lib/getActionProcessor/core/event/getCloudFrontOriginRequestEventActionProcessor.d.ts

@@ -0,0 +1,10 @@
+import { QPQConfig, EventMatchStoryActionProcessor, EventTransformEventParamsActionProcessor, EventTransformResponseResultActionProcessor, EventAutoRespondActionProcessor } from 'quidproquo-core';
+import { SeoEventParams, SeoEventResponse } from 'quidproquo-webserver';
+import { CloudFrontRequestEvent, Context } from 'aws-lambda';
+declare const _default: (config: QPQConfig) => {
+    "@quidproquo-core/event/TransformEventParams": EventTransformEventParamsActionProcessor<[CloudFrontRequestEvent, Context], SeoEventParams<any>>;
+    "@quidproquo-core/event/TransformResponseResult": EventTransformResponseResultActionProcessor<SeoEventResponse, SeoEventParams<any>, SeoEventResponse>;
+    "@quidproquo-core/event/AutoRespond": EventAutoRespondActionProcessor<SeoEventParams<any>>;
+    "@quidproquo-core/event/MatchStory": EventMatchStoryActionProcessor<SeoEventParams<any>>;
+};
+export default _default;

package/lib/getActionProcessor/core/event/getCloudFrontOriginRequestEventActionProcessor.js

@@ -0,0 +1,77 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const quidproquo_core_1 = require("quidproquo-core");
+const quidproquo_webserver_1 = require("quidproquo-webserver");
+const awsLambdaUtils_1 = require("../../../awsLambdaUtils");
+const getProcessTransformEventParams = () => {
+    return ({ eventParams: [cloudFrontRequestEvent, context] }) => __awaiter(void 0, void 0, void 0, function* () {
+        const cfRecordRequest = cloudFrontRequestEvent.Records[0].cf.request;
+        const headers = Object.keys(cfRecordRequest.headers).reduce((acc, header) => (Object.assign(Object.assign({}, acc), { [header]: cfRecordRequest.headers[header][0].value })), {});
+        return (0, quidproquo_core_1.actionResult)({
+            body: cfRecordRequest.body,
+            correlation: context.awsRequestId,
+            method: cfRecordRequest.method,
+            path: cfRecordRequest.uri,
+            sourceIp: cfRecordRequest.clientIp,
+            headers: headers,
+            // TODO: query string support
+            query: {},
+        });
+    });
+};
+const getProcessTransformResponseResult = (configs) => {
+    return ({ response }) => __awaiter(void 0, void 0, void 0, function* () {
+        return (0, quidproquo_core_1.actionResult)(response);
+    });
+};
+const getProcessAutoRespond = () => {
+    return (payload) => __awaiter(void 0, void 0, void 0, function* () {
+        return (0, quidproquo_core_1.actionResult)(null);
+    });
+};
+const getProcessMatchStory = (seoConfigs) => {
+    return (payload) => __awaiter(void 0, void 0, void 0, function* () {
+        /// Sort the routes by string length
+        // Note: We may need to filter variable routes out {} as the variables are length independent
+        const sortedSeoConfigs = seoConfigs.sort((a, b) => {
+            if (a.path.length < b.path.length)
+                return -1;
+            if (a.path.length > b.path.length)
+                return 1;
+            return 0;
+        });
+        // Find the most relevant match
+        const matchedSeoConfig = sortedSeoConfigs
+            .map((r) => ({
+            match: (0, awsLambdaUtils_1.matchUrl)(r.path, payload.transformedEventParams.path),
+            route: r,
+        }))
+            .find((m) => m.match.didMatch);
+        if (!matchedSeoConfig) {
+            return (0, quidproquo_core_1.actionResultError)(quidproquo_core_1.ErrorTypeEnum.NotFound, 'seo not found');
+        }
+        return (0, quidproquo_core_1.actionResult)({
+            src: matchedSeoConfig.route.src,
+            runtime: matchedSeoConfig.route.runtime,
+            options: matchedSeoConfig.match.params || {},
+        });
+    });
+};
+exports.default = (config) => {
+    const seoConfigs = quidproquo_webserver_1.qpqWebServerUtils.getAllSeo(config);
+    return {
+        [quidproquo_core_1.EventActionType.TransformEventParams]: getProcessTransformEventParams(),
+        [quidproquo_core_1.EventActionType.TransformResponseResult]: getProcessTransformResponseResult(config),
+        [quidproquo_core_1.EventActionType.AutoRespond]: getProcessAutoRespond(),
+        [quidproquo_core_1.EventActionType.MatchStory]: getProcessMatchStory(seoConfigs),
+    };
+};

package/lib/getActionProcessor/core/event/getEventBridgeEventActionProcessor.d.ts

@@ -3,7 +3,7 @@ import { QPQAWSLambdaConfig } from '../../../runtimeConfig/QPQAWSLambdaConfig';
 import { EventBridgeEvent, Context } from 'aws-lambda';
 declare const _default: (runtimeConfig: QPQAWSLambdaConfig) => {
     "@quidproquo-core/event/TransformEventParams": EventTransformEventParamsActionProcessor<[EventBridgeEvent<any, any>, Context], ScheduledEventParams<any>>;
-    "@quidproquo-core/event/TransformResponseResult": EventTransformResponseResultActionProcessor<any>;
+    "@quidproquo-core/event/TransformResponseResult": EventTransformResponseResultActionProcessor<any, any, any>;
     "@quidproquo-core/event/AutoRespond": EventAutoRespondActionProcessor<ScheduledEventParams<any>>;
     "@quidproquo-core/event/MatchStory": EventMatchStoryActionProcessor<ScheduledEventParams<any>>;
 };

package/lib/getActionProcessor/core/event/getEventBridgeEventActionProcessor.js

@@ -29,8 +29,6 @@ const getProcessAutoRespond = () => {
 };
 const getProcessMatchStory = (lambdaRuntimeConfig) => {
     return (payload) => __awaiter(void 0, void 0, void 0, function* () {
-        console.log('Trying to match story');
-        console.log(JSON.stringify(lambdaRuntimeConfig));
         if (!lambdaRuntimeConfig) {
             return (0, quidproquo_core_1.actionResultError)(quidproquo_core_1.ErrorTypeEnum.NotFound, 'event runtime not found');
         }

package/lib/getActionProcessor/core/index.d.ts

@@ -2,6 +2,7 @@ export { default as getConfigGetSecretActionProcessor } from './config/getConfig
 export { default as getConfigGetParameterActionProcessor } from './config/getConfigGetParameterActionProcessor';
 export { default as getConfigGetParametersActionProcessor } from './config/getConfigGetParametersActionProcessor';
 export { default as getAPIGatewayEventActionProcessor } from './event/getAPIGatewayEventActionProcessor';
+export { default as getCloudFrontOriginRequestEventActionProcessor } from './event/getCloudFrontOriginRequestEventActionProcessor';
 export { default as getEventBridgeEventActionProcessor } from './event/getEventBridgeEventActionProcessor';
 export { default as getSystemActionProcessor } from './system';
 export { default as getFileActionProcessor } from './file';

package/lib/getActionProcessor/core/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFileActionProcessor = exports.getSystemActionProcessor = exports.getEventBridgeEventActionProcessor = exports.getAPIGatewayEventActionProcessor = exports.getConfigGetParametersActionProcessor = exports.getConfigGetParameterActionProcessor = exports.getConfigGetSecretActionProcessor = void 0;
+exports.getFileActionProcessor = exports.getSystemActionProcessor = exports.getEventBridgeEventActionProcessor = exports.getCloudFrontOriginRequestEventActionProcessor = exports.getAPIGatewayEventActionProcessor = exports.getConfigGetParametersActionProcessor = exports.getConfigGetParameterActionProcessor = exports.getConfigGetSecretActionProcessor = void 0;
 var getConfigGetSecretActionProcessor_1 = require("./config/getConfigGetSecretActionProcessor");
 Object.defineProperty(exports, "getConfigGetSecretActionProcessor", { enumerable: true, get: function () { return __importDefault(getConfigGetSecretActionProcessor_1).default; } });
 var getConfigGetParameterActionProcessor_1 = require("./config/getConfigGetParameterActionProcessor");
@@ -12,6 +12,8 @@ var getConfigGetParametersActionProcessor_1 = require("./config/getConfigGetPara
 Object.defineProperty(exports, "getConfigGetParametersActionProcessor", { enumerable: true, get: function () { return __importDefault(getConfigGetParametersActionProcessor_1).default; } });
 var getAPIGatewayEventActionProcessor_1 = require("./event/getAPIGatewayEventActionProcessor");
 Object.defineProperty(exports, "getAPIGatewayEventActionProcessor", { enumerable: true, get: function () { return __importDefault(getAPIGatewayEventActionProcessor_1).default; } });
+var getCloudFrontOriginRequestEventActionProcessor_1 = require("./event/getCloudFrontOriginRequestEventActionProcessor");
+Object.defineProperty(exports, "getCloudFrontOriginRequestEventActionProcessor", { enumerable: true, get: function () { return __importDefault(getCloudFrontOriginRequestEventActionProcessor_1).default; } });
 var getEventBridgeEventActionProcessor_1 = require("./event/getEventBridgeEventActionProcessor");
 Object.defineProperty(exports, "getEventBridgeEventActionProcessor", { enumerable: true, get: function () { return __importDefault(getEventBridgeEventActionProcessor_1).default; } });
 var system_1 = require("./system");

package/lib/getActionProcessor/core/system/getExecuteStoryActionProcessor.js

@@ -32,10 +32,7 @@ const getProcessExecuteStory = (dynamicModuleLoader) => {
         if (storyResult.error) {
             return (0, quidproquo_core_1.actionResultError)(storyResult.error.errorType, `story error! in ${payload.src}::${payload.runtime} -> [${storyResult.error.errorText}]`, storyResult.error.errorStack);
         }
-        return (0, quidproquo_core_1.actionResult)({
-            result: storyResult.result,
-            session: storyResult.session,
-        });
+        return (0, quidproquo_core_1.actionResult)(storyResult.result);
     });
 };
 exports.default = (dynamicModuleLoader) => {

package/lib/index.d.ts

@@ -2,3 +2,4 @@ export * from './getActionProcessor';
 export * as awsLambdaUtils from './awsLambdaUtils';
 export * from './runtimeConfig/QPQAWSLambdaConfig';
 export * from './types/DynamicLoader';
+export * from './logic/parametersManager/getParameter';

package/lib/index.js

@@ -31,3 +31,4 @@ __exportStar(require("./getActionProcessor"), exports);
 exports.awsLambdaUtils = __importStar(require("./awsLambdaUtils"));
 __exportStar(require("./runtimeConfig/QPQAWSLambdaConfig"), exports);
 __exportStar(require("./types/DynamicLoader"), exports);
+__exportStar(require("./logic/parametersManager/getParameter"), exports);

package/lib/logic/parametersManager/getParameter.d.ts

@@ -1 +1 @@
-export declare const getParameter: (parameterName: string) => Promise<string>;
+export declare const getParameter: (parameterName: string, region: string) => Promise<string>;

package/lib/logic/parametersManager/getParameter.js

@@ -11,9 +11,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getParameter = void 0;
 const client_ssm_1 = require("@aws-sdk/client-ssm");
-const smClient = new client_ssm_1.SSMClient({});
-const getParameter = (parameterName) => __awaiter(void 0, void 0, void 0, function* () {
+const getParameter = (parameterName, region) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
+    const smClient = new client_ssm_1.SSMClient({
+        region,
+    });
     const response = yield smClient.send(new client_ssm_1.GetParameterCommand({
         Name: parameterName,
     }));

package/lib/logic/parametersManager/getParameters.d.ts

@@ -1 +1 @@
-export declare const getParameters: (parameterNames: string[]) => Promise<string[]>;
+export declare const getParameters: (parameterNames: string[], region: string) => Promise<string[]>;

package/lib/logic/parametersManager/getParameters.js

@@ -11,8 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getParameters = void 0;
 const client_ssm_1 = require("@aws-sdk/client-ssm");
-const smClient = new client_ssm_1.SSMClient({});
-const getParameters = (parameterNames) => __awaiter(void 0, void 0, void 0, function* () {
+const getParameters = (parameterNames, region) => __awaiter(void 0, void 0, void 0, function* () {
+    const smClient = new client_ssm_1.SSMClient({ region });
     const response = yield smClient.send(new client_ssm_1.GetParametersCommand({
         Names: parameterNames,
     }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-actionprocessor-awslambda",
-  "version": "0.0.43",
+  "version": "0.0.44",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.js",
@@ -11,7 +11,7 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "clean": "npx rimraf lib",
     "build": "npm run clean && tsc",
-    "watch": "npm run clean && tsc -w"
+    "watch": "tsc -w"
   },
   "repository": {
     "type": "git",