quidproquo-actionprocessor-awslambda 0.0.17 → 0.0.18

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

@@ -1,8 +1,9 @@
-import { QPQConfig } from 'quidproquo-core';
+import { QPQConfig, EventTransformEventParamsActionPayload, EventTransformResponseResultActionPayload, EventMatchStoryActionPayload, EventAutoRespondActionPayload, StorySession } from 'quidproquo-core';
 import { RouteQPQWebServerConfigSetting, HTTPEventParams } from 'quidproquo-webserver';
+import { Context } from 'aws-lambda';
 declare const _default: (config: QPQConfig) => {
-    "@quidproquo-core/event/TransformEventParams": (payload: any, session: any) => Promise<HTTPEventParams<any>>;
-    "@quidproquo-core/event/TransformResponseResult": (payload: any, session: any) => Promise<{
+    "@quidproquo-core/event/TransformEventParams": (payload: EventTransformEventParamsActionPayload<[import("aws-lambda").APIGatewayProxyEvent, Context]>, session: StorySession) => Promise<HTTPEventParams<any>>;
+    "@quidproquo-core/event/TransformResponseResult": (payload: EventTransformResponseResultActionPayload, session: StorySession) => Promise<{
         statusCode: any;
         body: any;
         headers: {
@@ -12,7 +13,7 @@ declare const _default: (config: QPQConfig) => {
             'Access-Control-Allow-Origin': string;
         };
     }>;
-    "@quidproquo-core/event/AutoRespond": (payload: any, session: any) => Promise<{
+    "@quidproquo-core/event/AutoRespond": (payload: EventAutoRespondActionPayload<HTTPEventParams<any>>, session: StorySession) => Promise<{
         statusCode: number;
         headers: {
             'Content-Type': string;
@@ -21,6 +22,6 @@ declare const _default: (config: QPQConfig) => {
             'Access-Control-Allow-Origin': string;
         };
     } | null>;
-    "@quidproquo-core/event/MatchStory": (payload: any, session: any) => Promise<RouteQPQWebServerConfigSetting | undefined>;
+    "@quidproquo-core/event/MatchStory": (payload: EventMatchStoryActionPayload<HTTPEventParams<any>>, session: StorySession) => Promise<RouteQPQWebServerConfigSetting | undefined>;
 };
 export default _default;

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

@@ -14,15 +14,15 @@ const quidproquo_webserver_1 = require("quidproquo-webserver");
 const awsLambdaUtils_1 = require("../../../awsLambdaUtils");
 const getProcessTransformEventParams = (appName) => {
     return (payload, session) => __awaiter(void 0, void 0, void 0, function* () {
-        const { params: [event], } = payload;
-        const path = (event.path || '').replace(new RegExp(`^(\/${appName})/`), '/');
+        const [apiGatewayEvent, context] = payload.eventParams;
+        const path = (apiGatewayEvent.path || '').replace(new RegExp(`^(\/${appName})/`), '/');
         return {
             path,
-            query: Object.assign(Object.assign({}, (event.multiValueQueryStringParameters || {})), (event.queryStringParameters || {})),
-            body: event.body ? JSON.parse(event.body) : undefined,
-            headers: event.headers || {},
-            method: event.httpMethod,
-            correlation: (0, awsLambdaUtils_1.randomGuid)(),
+            query: Object.assign(Object.assign({}, (apiGatewayEvent.multiValueQueryStringParameters || {})), (apiGatewayEvent.queryStringParameters || {})),
+            body: apiGatewayEvent.body ? JSON.parse(apiGatewayEvent.body) : undefined,
+            headers: apiGatewayEvent.headers,
+            method: apiGatewayEvent.httpMethod,
+            correlation: context.awsRequestId,
         };
     });
 };
@@ -42,7 +42,7 @@ const getProcessTransformResponseResult = (domainName) => {
 };
 const getProcessAutoRespond = (domainName) => {
     return (payload, session) => __awaiter(void 0, void 0, void 0, function* () {
-        if (payload.http === 'OPTIONS') {
+        if (payload.transformedEventParams.method === 'OPTIONS') {
             return {
                 statusCode: 200,
                 headers: {
@@ -60,7 +60,7 @@ const getProcessMatchStory = (routes) => (payload, session) => __awaiter(void 0,
     // Sort the routes by string length
     // Note: We may need to filter variable routes out {} as the variables are length independent
     const sortedRoutes = routes
-        .filter((r) => r.method === payload.method)
+        .filter((r) => r.method === payload.transformedEventParams.method)
         .sort((a, b) => {
         if (a.path.length < b.path.length)
             return -1;
@@ -69,7 +69,7 @@ const getProcessMatchStory = (routes) => (payload, session) => __awaiter(void 0,
         return 0;
     });
     // Find the most relevant match
-    return sortedRoutes.find((r) => (0, awsLambdaUtils_1.matchUrl)(r.path, payload.path).didMatch);
+    return sortedRoutes.find((r) => (0, awsLambdaUtils_1.matchUrl)(r.path, payload.transformedEventParams.path).didMatch);
 });
 exports.default = (config) => {
     const routes = quidproquo_webserver_1.qpqWebServerUtils.getAllRoutes(config);

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

@@ -1 +1,2 @@
 export { default as getAPIGatewayEventActionProcessor } from './event/getAPIGatewayEventActionProcessor';
+export { default as getExecuteStoryActionProcessor } from './system/getExecuteStoryActionProcessor';

package/lib/getActionProcessor/core/index.js

@@ -3,6 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAPIGatewayEventActionProcessor = void 0;
+exports.getExecuteStoryActionProcessor = exports.getAPIGatewayEventActionProcessor = void 0;
 var getAPIGatewayEventActionProcessor_1 = require("./event/getAPIGatewayEventActionProcessor");
 Object.defineProperty(exports, "getAPIGatewayEventActionProcessor", { enumerable: true, get: function () { return __importDefault(getAPIGatewayEventActionProcessor_1).default; } });
+var getExecuteStoryActionProcessor_1 = require("./system/getExecuteStoryActionProcessor");
+Object.defineProperty(exports, "getExecuteStoryActionProcessor", { enumerable: true, get: function () { return __importDefault(getExecuteStoryActionProcessor_1).default; } });

package/lib/getActionProcessor/core/system/getExecuteStoryActionProcessor.d.ts

@@ -0,0 +1,6 @@
+import { QPQConfig, SystemExecuteStoryActionPayload, StorySession } from 'quidproquo-core';
+export declare const getDateNow: () => string;
+declare const _default: (config: QPQConfig) => {
+    "@quidproquo-core/System/ExecuteStory": (payload: SystemExecuteStoryActionPayload<any[]>, session: StorySession) => Promise<any>;
+};
+export default _default;

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

@@ -0,0 +1,53 @@
+"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 });
+exports.getDateNow = void 0;
+const quidproquo_core_1 = require("quidproquo-core");
+const getDateNow = () => new Date().toISOString();
+exports.getDateNow = getDateNow;
+const getProcessExecuteStory = (appName) => {
+    return (payload, session) => __awaiter(void 0, void 0, void 0, function* () {
+        // const module = require(payload.src);
+        // const story = module[payload.runtime];
+        // const logger = async (result: any) => {
+        //   // return await addResult(service, getDateNow(), payload.params[0][0].path, 'user-route', payload.src, payload.runtime, result);
+        // };
+        // const actionProcessors = {
+        //   ...coreActionProcessor,
+        //   ...webserverActionProcessor,
+        // };
+        // const result = await resolveStory(
+        //   story,
+        //   payload.params,
+        //   session,
+        //   actionProcessors,
+        //   getDateNow,
+        //   logger,
+        //   randomGuid,
+        // );
+        // return {
+        //   result: result.result,
+        //   session: result.session,
+        // };
+        // statusCode: payload.response.result.statusCode,
+        // body: payload.response.result.body,
+        return {
+            result: { statusCode: 200, body: { omg: 'wtf bbq' } },
+            session: {},
+        };
+    });
+};
+exports.default = (config) => {
+    const appName = quidproquo_core_1.qpqCoreUtils.getAppName(config);
+    return {
+        [quidproquo_core_1.SystemActionTypeEnum.ExecuteStory]: getProcessExecuteStory(appName),
+    };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-actionprocessor-awslambda",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.js",
@@ -29,6 +29,7 @@
     "quidproquo-webserver": "*"
   },
   "devDependencies": {
+    "@types/aws-lambda": "^8.10.109",
     "@types/node": "^18.11.9",
     "quidproquo-tsconfig": "*",
     "typescript": "^4.9.3"