quidproquo-dev-server 0.0.249 → 0.0.251

package/lib/commonjs/implementations/apiImplementation.js

@@ -119,7 +119,10 @@ const apiImplementation = (devServerConfig) => __awaiter(void 0, void 0, void 0,
                     mimetype: file.mimetype,
                 }));
             }
-            const response = yield (0, logic_1.processEvent)(event, apiConfig.qpqConfig, getDynamicModuleLoader(apiConfig.qpqConfig, devServerConfig), actionProcessor_1.getExpressApiEventEventProcessor, quidproquo_core_1.QpqRuntimeType.API);
+            const response = yield (0, logic_1.processEvent)(event, apiConfig.qpqConfig, getDynamicModuleLoader(apiConfig.qpqConfig, devServerConfig), actionProcessor_1.getExpressApiEventEventProcessor, quidproquo_core_1.QpqRuntimeType.API, () => ({
+                depth: 0,
+                context: {},
+            }));
             if (response.result) {
                 for (const [header, value] of Object.entries(response.result.headers)) {
                     res.set(header, value);

package/lib/commonjs/implementations/queueImplementation.js

@@ -32,7 +32,7 @@ const processQueueMessages = (qpqConfig, payload, devServerConfig) => __awaiter(
     if ((!!payload.targetFeature || !!feature) && payload.targetFeature !== feature) {
         return;
     }
-    yield (0, logic_1.processEvent)(payload, qpqConfig, getDynamicModuleLoader(qpqConfig, devServerConfig), queue_1.getQueueEventProcessor, quidproquo_core_1.QpqRuntimeType.QUEUE_EVENT);
+    yield (0, logic_1.processEvent)(payload, qpqConfig, getDynamicModuleLoader(qpqConfig, devServerConfig), queue_1.getQueueEventProcessor, quidproquo_core_1.QpqRuntimeType.QUEUE_EVENT, (e) => e.storySession);
 });
 const processQueueEventBusSubscriptions = (qpqConfig, ebMessage) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b, _c, _d;

package/lib/commonjs/implementations/serviceFunctionImplementation.js

@@ -22,7 +22,7 @@ const serviceFunctionImplementation = (devServerConfig) => __awaiter(void 0, voi
     logic_1.eventBus.on(quidproquo_webserver_1.ServiceFunctionActionType.Execute, (payload, correlation) => __awaiter(void 0, void 0, void 0, function* () {
         // We need to find the qpqConfig for this service.
         const qpqConfig = devServerConfig.qpqConfigs.find((qpqConfig) => quidproquo_core_1.qpqCoreUtils.getApplicationModuleName(qpqConfig) === payload.serviceName);
-        const eventPromise = yield (0, logic_1.processEvent)(payload, qpqConfig, getDynamicModuleLoader(qpqConfig, devServerConfig), actionProcessor_1.getNodeServiceFunctionEventProcessor, quidproquo_core_1.QpqRuntimeType.SERVICE_FUNCTION_EXE);
+        const eventPromise = yield (0, logic_1.processEvent)(payload, qpqConfig, getDynamicModuleLoader(qpqConfig, devServerConfig), actionProcessor_1.getNodeServiceFunctionEventProcessor, quidproquo_core_1.QpqRuntimeType.SERVICE_FUNCTION_EXE, (e) => e.storySession);
         if (correlation) {
             // Emit the response back on the unique responseEvent channel
             logic_1.eventBus.emit(correlation, eventPromise);

package/lib/commonjs/implementations/webSocket/webSocketImplementation.js

@@ -45,7 +45,10 @@ const startServer = (settingsMap, devServerConfig) => {
         const userAgent = req.headers['user-agent'] || 'unknown agent';
         const server = findConnection(settingsMap.service, settingsMap.apiName);
         server.connections[connectionId] = ws;
-        const processWsEvent = (wsEvent) => (0, logic_1.processEvent)(wsEvent, settingsMap.qpqConfig, getDynamicModuleLoader(settingsMap.qpqConfig, devServerConfig), actionProcessor_1.getWsWebsocketEventEventProcessor, quidproquo_core_1.QpqRuntimeType.WEBSOCKET_EVENT);
+        const processWsEvent = (wsEvent) => (0, logic_1.processEvent)(wsEvent, settingsMap.qpqConfig, getDynamicModuleLoader(settingsMap.qpqConfig, devServerConfig), actionProcessor_1.getWsWebsocketEventEventProcessor, quidproquo_core_1.QpqRuntimeType.WEBSOCKET_EVENT, () => ({
+            depth: 0,
+            context: {},
+        }));
         const onConnectEvent = {
             apiName: settingsMap.apiName,
             service: settingsMap.service,

package/lib/commonjs/index.d.ts

@@ -1,2 +1,3 @@
 export * from './config';
 export * from './main';
+export * from './types';

package/lib/commonjs/index.js

@@ -16,3 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./config"), exports);
 __exportStar(require("./main"), exports);
+__exportStar(require("./types"), exports);

package/lib/commonjs/logic/processEvent.d.ts

@@ -1,2 +1,2 @@
-import { ActionProcessorListResolver, DynamicModuleLoader, QPQConfig, QpqRuntimeType, StoryResult } from 'quidproquo-core';
-export declare const processEvent: <E, ER>(expressEvent: E, qpqConfig: QPQConfig, dynamicModuleLoader: DynamicModuleLoader, getActionProcessors: ActionProcessorListResolver, qpqRuntimeType: QpqRuntimeType) => Promise<StoryResult<[E], ER>>;
+import { ActionProcessorListResolver, DynamicModuleLoader, QPQConfig, QpqRuntimeType, StoryResult, StorySession } from 'quidproquo-core';
+export declare const processEvent: <E, ER>(expressEvent: E, qpqConfig: QPQConfig, dynamicModuleLoader: DynamicModuleLoader, getActionProcessors: ActionProcessorListResolver, qpqRuntimeType: QpqRuntimeType, getStorySession: (event: E) => StorySession) => Promise<StoryResult<[E], ER>>;

package/lib/commonjs/logic/processEvent.js

@@ -11,19 +11,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processEvent = void 0;
 const quidproquo_actionprocessor_awslambda_1 = require("quidproquo-actionprocessor-awslambda");
+const quidproquo_actionprocessor_node_1 = require("quidproquo-actionprocessor-node");
 const quidproquo_core_1 = require("quidproquo-core");
 const crypto_1 = require("crypto");
 const actionProcessor_1 = require("../actionProcessor");
 // TODO: Make this a util or something based on server time or something..
 const getDateNow = () => new Date().toISOString();
-const processEvent = (expressEvent, qpqConfig, dynamicModuleLoader, getActionProcessors, qpqRuntimeType) => __awaiter(void 0, void 0, void 0, function* () {
+const processEvent = (expressEvent, qpqConfig, dynamicModuleLoader, getActionProcessors, qpqRuntimeType, getStorySession) => __awaiter(void 0, void 0, void 0, function* () {
     const serviceName = quidproquo_core_1.qpqCoreUtils.getApplicationModuleName(qpqConfig);
     const logger = (0, quidproquo_actionprocessor_awslambda_1.getLogger)(qpqConfig);
-    const resolveStory = (0, quidproquo_core_1.createRuntime)(qpqConfig, {
-        depth: 0,
-        context: {},
-    }, () => __awaiter(void 0, void 0, void 0, function* () {
-        return (Object.assign(Object.assign({}, (yield (0, actionProcessor_1.getDevServerActionProcessors)(qpqConfig, dynamicModuleLoader))), (yield getActionProcessors(qpqConfig, dynamicModuleLoader))));
+    const resolveStory = (0, quidproquo_core_1.createRuntime)(qpqConfig, getStorySession(expressEvent), () => __awaiter(void 0, void 0, void 0, function* () {
+        return (Object.assign(Object.assign(Object.assign({}, (yield (0, actionProcessor_1.getDevServerActionProcessors)(qpqConfig, dynamicModuleLoader))), (yield getActionProcessors(qpqConfig, dynamicModuleLoader))), (yield (0, quidproquo_actionprocessor_node_1.getCustomActionActionProcessor)(qpqConfig, dynamicModuleLoader))));
     }), getDateNow, logger, `${serviceName}::${(0, crypto_1.randomUUID)()}`, qpqRuntimeType, dynamicModuleLoader, []);
     const result = yield resolveStory(quidproquo_core_1.askProcessEvent, [expressEvent]);
     yield logger.waitToFinishWriting();

package/lib/commonjs/main.d.ts

@@ -1,3 +1,5 @@
-import { DevServerConfig } from './types';
+import { QPQConfig } from 'quidproquo-core';
+import { DevServerConfig, DevServerConfigOverrides } from './types';
 export * from './implementations';
-export declare const startDevServer: (devServerConfig: DevServerConfig) => Promise<void>;
+export declare const getDevConfigs: (qpqConfigs: QPQConfig[], devServerConfigOverrides?: DevServerConfigOverrides) => QPQConfig[];
+export declare const startDevServer: (devServerConfig: DevServerConfig, devServerConfigOverrides?: DevServerConfigOverrides) => Promise<void>;

package/lib/commonjs/main.js

@@ -23,17 +23,33 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.startDevServer = void 0;
+exports.startDevServer = exports.getDevConfigs = void 0;
+const quidproquo_core_1 = require("quidproquo-core");
 const implementations_1 = require("./implementations");
 __exportStar(require("./implementations"), exports);
-const startDevServer = (devServerConfig) => __awaiter(void 0, void 0, void 0, function* () {
+const getDevConfigs = (qpqConfigs, devServerConfigOverrides) => {
+    return qpqConfigs.map((qpqConfig) => {
+        return [
+            // Base config
+            ...qpqConfig,
+            // all service override
+            ...((devServerConfigOverrides === null || devServerConfigOverrides === void 0 ? void 0 : devServerConfigOverrides.allServices) || []),
+            // specific service override
+            ...(((devServerConfigOverrides === null || devServerConfigOverrides === void 0 ? void 0 : devServerConfigOverrides.byService) || {})[quidproquo_core_1.qpqCoreUtils.getApplicationModuleName(qpqConfig)] || []),
+        ];
+    });
+};
+exports.getDevConfigs = getDevConfigs;
+const startDevServer = (devServerConfig, devServerConfigOverrides) => __awaiter(void 0, void 0, void 0, function* () {
     console.log('Starting QPQ Dev Server!!!');
+    // Add ovverrides for dev server
+    const updatedDevServerConfig = Object.assign(Object.assign({}, devServerConfig), { qpqConfigs: (0, exports.getDevConfigs)(devServerConfig.qpqConfigs) });
     yield Promise.all([
-        (0, implementations_1.apiImplementation)(devServerConfig),
-        (0, implementations_1.serviceFunctionImplementation)(devServerConfig),
-        (0, implementations_1.eventBusImplementation)(devServerConfig),
-        (0, implementations_1.queueImplementation)(devServerConfig),
-        (0, implementations_1.webSocketImplementation)(devServerConfig),
+        (0, implementations_1.apiImplementation)(updatedDevServerConfig),
+        (0, implementations_1.serviceFunctionImplementation)(updatedDevServerConfig),
+        (0, implementations_1.eventBusImplementation)(updatedDevServerConfig),
+        (0, implementations_1.queueImplementation)(updatedDevServerConfig),
+        (0, implementations_1.webSocketImplementation)(updatedDevServerConfig),
     ]);
 });
 exports.startDevServer = startDevServer;

package/lib/commonjs/types/DevServerConfig.d.ts

@@ -6,3 +6,9 @@ export type DevServerConfig = {
     dynamicModuleLoader: <T = any>(serviceName: string, modulePath: QpqFunctionRuntime) => Promise<T>;
     qpqConfigs: QPQConfig[];
 };
+export type DevServerConfigOverrides = {
+    allServices?: QPQConfig;
+    byService?: {
+        [key: string]: QPQConfig;
+    };
+};

package/lib/esm/implementations/apiImplementation.js

@@ -104,7 +104,10 @@ export const apiImplementation = async (devServerConfig) => {
                     mimetype: file.mimetype,
                 }));
             }
-            const response = await processEvent(event, apiConfig.qpqConfig, getDynamicModuleLoader(apiConfig.qpqConfig, devServerConfig), getExpressApiEventEventProcessor, QpqRuntimeType.API);
+            const response = await processEvent(event, apiConfig.qpqConfig, getDynamicModuleLoader(apiConfig.qpqConfig, devServerConfig), getExpressApiEventEventProcessor, QpqRuntimeType.API, () => ({
+                depth: 0,
+                context: {},
+            }));
             if (response.result) {
                 for (const [header, value] of Object.entries(response.result.headers)) {
                     res.set(header, value);

package/lib/esm/implementations/queueImplementation.js

@@ -20,7 +20,7 @@ const processQueueMessages = async (qpqConfig, payload, devServerConfig) => {
     if ((!!payload.targetFeature || !!feature) && payload.targetFeature !== feature) {
         return;
     }
-    await processEvent(payload, qpqConfig, getDynamicModuleLoader(qpqConfig, devServerConfig), getQueueEventProcessor, QpqRuntimeType.QUEUE_EVENT);
+    await processEvent(payload, qpqConfig, getDynamicModuleLoader(qpqConfig, devServerConfig), getQueueEventProcessor, QpqRuntimeType.QUEUE_EVENT, (e) => e.storySession);
 };
 const processQueueEventBusSubscriptions = async (qpqConfig, ebMessage) => {
     const thisServiceName = qpqCoreUtils.getApplicationModuleName(qpqConfig);

package/lib/esm/implementations/serviceFunctionImplementation.js

@@ -10,7 +10,7 @@ export const serviceFunctionImplementation = async (devServerConfig) => {
     eventBus.on(ServiceFunctionActionType.Execute, async (payload, correlation) => {
         // We need to find the qpqConfig for this service.
         const qpqConfig = devServerConfig.qpqConfigs.find((qpqConfig) => qpqCoreUtils.getApplicationModuleName(qpqConfig) === payload.serviceName);
-        const eventPromise = await processEvent(payload, qpqConfig, getDynamicModuleLoader(qpqConfig, devServerConfig), getNodeServiceFunctionEventProcessor, QpqRuntimeType.SERVICE_FUNCTION_EXE);
+        const eventPromise = await processEvent(payload, qpqConfig, getDynamicModuleLoader(qpqConfig, devServerConfig), getNodeServiceFunctionEventProcessor, QpqRuntimeType.SERVICE_FUNCTION_EXE, (e) => e.storySession);
         if (correlation) {
             // Emit the response back on the unique responseEvent channel
             eventBus.emit(correlation, eventPromise);

package/lib/esm/implementations/webSocket/webSocketImplementation.js

@@ -31,7 +31,10 @@ const startServer = (settingsMap, devServerConfig) => {
         const userAgent = req.headers['user-agent'] || 'unknown agent';
         const server = findConnection(settingsMap.service, settingsMap.apiName);
         server.connections[connectionId] = ws;
-        const processWsEvent = (wsEvent) => processEvent(wsEvent, settingsMap.qpqConfig, getDynamicModuleLoader(settingsMap.qpqConfig, devServerConfig), getWsWebsocketEventEventProcessor, QpqRuntimeType.WEBSOCKET_EVENT);
+        const processWsEvent = (wsEvent) => processEvent(wsEvent, settingsMap.qpqConfig, getDynamicModuleLoader(settingsMap.qpqConfig, devServerConfig), getWsWebsocketEventEventProcessor, QpqRuntimeType.WEBSOCKET_EVENT, () => ({
+            depth: 0,
+            context: {},
+        }));
         const onConnectEvent = {
             apiName: settingsMap.apiName,
             service: settingsMap.service,

package/lib/esm/index.d.ts

@@ -1,2 +1,3 @@
 export * from './config';
 export * from './main';
+export * from './types';

package/lib/esm/index.js

@@ -1,2 +1,3 @@
 export * from './config';
 export * from './main';
+export * from './types';

package/lib/esm/logic/processEvent.d.ts

@@ -1,2 +1,2 @@
-import { ActionProcessorListResolver, DynamicModuleLoader, QPQConfig, QpqRuntimeType, StoryResult } from 'quidproquo-core';
-export declare const processEvent: <E, ER>(expressEvent: E, qpqConfig: QPQConfig, dynamicModuleLoader: DynamicModuleLoader, getActionProcessors: ActionProcessorListResolver, qpqRuntimeType: QpqRuntimeType) => Promise<StoryResult<[E], ER>>;
+import { ActionProcessorListResolver, DynamicModuleLoader, QPQConfig, QpqRuntimeType, StoryResult, StorySession } from 'quidproquo-core';
+export declare const processEvent: <E, ER>(expressEvent: E, qpqConfig: QPQConfig, dynamicModuleLoader: DynamicModuleLoader, getActionProcessors: ActionProcessorListResolver, qpqRuntimeType: QpqRuntimeType, getStorySession: (event: E) => StorySession) => Promise<StoryResult<[E], ER>>;

package/lib/esm/logic/processEvent.js

@@ -1,18 +1,18 @@
 import { getLogger } from 'quidproquo-actionprocessor-awslambda';
+import { getCustomActionActionProcessor } from 'quidproquo-actionprocessor-node';
 import { askProcessEvent, createRuntime, qpqCoreUtils, } from 'quidproquo-core';
 import { randomUUID } from 'crypto';
 import { getDevServerActionProcessors } from '../actionProcessor';
 // TODO: Make this a util or something based on server time or something..
 const getDateNow = () => new Date().toISOString();
-export const processEvent = async (expressEvent, qpqConfig, dynamicModuleLoader, getActionProcessors, qpqRuntimeType) => {
+export const processEvent = async (expressEvent, qpqConfig, dynamicModuleLoader, getActionProcessors, qpqRuntimeType, getStorySession) => {
     const serviceName = qpqCoreUtils.getApplicationModuleName(qpqConfig);
     const logger = getLogger(qpqConfig);
-    const resolveStory = createRuntime(qpqConfig, {
-        depth: 0,
-        context: {},
-    }, async () => ({
+    const resolveStory = createRuntime(qpqConfig, getStorySession(expressEvent), async () => ({
         ...(await getDevServerActionProcessors(qpqConfig, dynamicModuleLoader)),
         ...(await getActionProcessors(qpqConfig, dynamicModuleLoader)),
+        // Always done last, so they can ovveride the default ones if the user wants.
+        ...(await getCustomActionActionProcessor(qpqConfig, dynamicModuleLoader)),
     }), getDateNow, logger, `${serviceName}::${randomUUID()}`, qpqRuntimeType, dynamicModuleLoader, []);
     const result = await resolveStory(askProcessEvent, [expressEvent]);
     await logger.waitToFinishWriting();

package/lib/esm/main.d.ts

@@ -1,3 +1,5 @@
-import { DevServerConfig } from './types';
+import { QPQConfig } from 'quidproquo-core';
+import { DevServerConfig, DevServerConfigOverrides } from './types';
 export * from './implementations';
-export declare const startDevServer: (devServerConfig: DevServerConfig) => Promise<void>;
+export declare const getDevConfigs: (qpqConfigs: QPQConfig[], devServerConfigOverrides?: DevServerConfigOverrides) => QPQConfig[];
+export declare const startDevServer: (devServerConfig: DevServerConfig, devServerConfigOverrides?: DevServerConfigOverrides) => Promise<void>;

package/lib/esm/main.js

@@ -1,12 +1,30 @@
+import { qpqCoreUtils } from 'quidproquo-core';
 import { apiImplementation, eventBusImplementation, queueImplementation, serviceFunctionImplementation, webSocketImplementation, } from './implementations';
 export * from './implementations';
-export const startDevServer = async (devServerConfig) => {
+export const getDevConfigs = (qpqConfigs, devServerConfigOverrides) => {
+    return qpqConfigs.map((qpqConfig) => {
+        return [
+            // Base config
+            ...qpqConfig,
+            // all service override
+            ...(devServerConfigOverrides?.allServices || []),
+            // specific service override
+            ...((devServerConfigOverrides?.byService || {})[qpqCoreUtils.getApplicationModuleName(qpqConfig)] || []),
+        ];
+    });
+};
+export const startDevServer = async (devServerConfig, devServerConfigOverrides) => {
     console.log('Starting QPQ Dev Server!!!');
+    // Add ovverrides for dev server
+    const updatedDevServerConfig = {
+        ...devServerConfig,
+        qpqConfigs: getDevConfigs(devServerConfig.qpqConfigs),
+    };
     await Promise.all([
-        apiImplementation(devServerConfig),
-        serviceFunctionImplementation(devServerConfig),
-        eventBusImplementation(devServerConfig),
-        queueImplementation(devServerConfig),
-        webSocketImplementation(devServerConfig),
+        apiImplementation(updatedDevServerConfig),
+        serviceFunctionImplementation(updatedDevServerConfig),
+        eventBusImplementation(updatedDevServerConfig),
+        queueImplementation(updatedDevServerConfig),
+        webSocketImplementation(updatedDevServerConfig),
     ]);
 };

package/lib/esm/types/DevServerConfig.d.ts

@@ -6,3 +6,9 @@ export type DevServerConfig = {
     dynamicModuleLoader: <T = any>(serviceName: string, modulePath: QpqFunctionRuntime) => Promise<T>;
     qpqConfigs: QPQConfig[];
 };
+export type DevServerConfigOverrides = {
+    allServices?: QPQConfig;
+    byService?: {
+        [key: string]: QPQConfig;
+    };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-dev-server",
-  "version": "0.0.249",
+  "version": "0.0.251",
   "description": "",
   "main": "./lib/commonjs/index.js",
   "module": "./lib/esm/index.js",
@@ -34,15 +34,15 @@
   "dependencies": {
     "chalk": "^4.1.2",
     "multer": "^1.4.5-lts.1",
-    "quidproquo-actionprocessor-awslambda": "0.0.249",
-    "quidproquo-actionprocessor-node": "0.0.249",
-    "quidproquo-core": "0.0.249",
-    "quidproquo-webserver": "0.0.249",
+    "quidproquo-actionprocessor-awslambda": "0.0.251",
+    "quidproquo-actionprocessor-node": "0.0.251",
+    "quidproquo-core": "0.0.251",
+    "quidproquo-webserver": "0.0.251",
     "ws": "^8.18.0"
   },
   "devDependencies": {
     "@types/multer": "^1.4.12",
-    "quidproquo-tsconfig": "0.0.249",
+    "quidproquo-tsconfig": "0.0.251",
     "typescript": "^4.9.3"
   }
 }