quidproquo-dev-server 0.0.253 → 0.0.255

package/lib/esm/implementations/apiImplementation.js

@@ -1,132 +1,129 @@
-import { askProcessEvent, qpqCoreUtils, qpqExecuteLog, QpqRuntimeType } from 'quidproquo-core';
-import { qpqWebServerUtils } from 'quidproquo-webserver';
-import bodyParser from 'body-parser';
-import express from 'express';
-import multer from 'multer';
-import path from 'path';
-import { getExpressApiEventEventProcessor } from '../actionProcessor';
-import { getAllServiceConfigs } from '../allServiceConfig';
-import { processEvent } from '../logic';
-const getServiceBaseDomain = (qpqConfig, devServerConfig) => qpqWebServerUtils.getDomainRoot(`${devServerConfig.serverDomain}:${devServerConfig.serverPort}`, qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig), qpqCoreUtils.getApplicationModuleFeature(qpqConfig));
-const getApiDomainsFromConfig = (qpqConfig, devServerConfig) => {
-    const baseDomain = getServiceBaseDomain(qpqConfig, devServerConfig);
-    const serviceName = qpqCoreUtils.getApplicationModuleName(qpqConfig);
-    // Get apis
-    const apiConfigs = qpqWebServerUtils.getApiConfigs(qpqConfig);
-    const apiDomains = apiConfigs.map((apiConfig) => ({
-        apiName: apiConfig.apiName,
-        service: serviceName,
-        qpqConfig,
-        domain: `${apiConfig.apiSubdomain}.${baseDomain}`,
-        devDomain: baseDomain,
-        devPath: `/${apiConfig.apiSubdomain}/${serviceName}`,
-    }));
-    return apiDomains;
-};
-const getDynamicModuleLoader = (qpqConfig, devServerConfig) => {
-    const serviceName = qpqCoreUtils.getApplicationModuleName(qpqConfig);
-    return async (runtime) => devServerConfig.dynamicModuleLoader(serviceName, runtime);
-};
-export const apiImplementation = async (devServerConfig) => {
-    const allServiceConfig = getAllServiceConfigs(devServerConfig);
-    const app = express();
-    app.use(multer().any());
-    app.use(bodyParser.json({ limit: '50mb' }));
-    const apiConfigs = allServiceConfig.map((qpqConfig) => getApiDomainsFromConfig(qpqConfig, devServerConfig)).flat();
-    console.log(apiConfigs.map((ac) => ac.devPath));
-    const adminFrontend = path.join(__dirname, '../../..', 'node_modules', 'quidproquo-web-admin', 'lib');
-    // Admin page
-    app.use('/admin', express.static(adminFrontend));
-    app.get('/admin/service/log/list', (req, res) => {
-        // Manually set CORS headers
-        res.header('Access-Control-Allow-Headers', '*');
-        res.header('Access-Control-Allow-Methods', '*');
-        res.header('Access-Control-Allow-Origin', '*');
-        res.header('Access-Control-Allow-Credentials', 'false');
-        const serviceList = allServiceConfig.map((qpqConfig) => qpqCoreUtils.getApplicationModuleName(qpqConfig)).map((name) => `api/${name}`);
-        res.json(serviceList);
-    });
-    app.use(express.json());
-    app.options('/admin/service/log/execute', async (req, res) => {
-        // Manually set CORS headers
-        res.header('Access-Control-Allow-Headers', '*');
-        res.header('Access-Control-Allow-Methods', '*');
-        res.header('Access-Control-Allow-Origin', '*');
-        res.header('Access-Control-Allow-Credentials', 'false');
-        res.json({ done: true });
-    });
-    app.get('/mf-manifest-location.json', async (req, res) => {
-        // Manually set CORS headers
-        res.header('Access-Control-Allow-Headers', '*');
-        res.header('Access-Control-Allow-Methods', '*');
-        res.header('Access-Control-Allow-Origin', '*');
-        res.header('Access-Control-Allow-Credentials', 'false');
-        res.json({ location: 'http://localhost:3005/mf-manifest.json' });
-    });
-    app.post('/admin/service/log/execute', async (req, res) => {
-        // Manually set CORS headers
-        res.header('Access-Control-Allow-Headers', '*');
-        res.header('Access-Control-Allow-Methods', '*');
-        res.header('Access-Control-Allow-Origin', '*');
-        res.header('Access-Control-Allow-Credentials', 'false');
-        // TODO: Get list of services from config dynamically
-        const serviceLog = req.body;
-        let runtimeModule = askProcessEvent;
-        if (serviceLog.runtimeType === QpqRuntimeType.EXECUTE_STORY) {
-            const [srcEntry, module] = serviceLog.tags[0].split('::');
-            const loadedModule = await devServerConfig.dynamicModuleLoader(serviceLog.moduleName, srcEntry);
-            runtimeModule = loadedModule[module];
-        }
-        const result = await qpqExecuteLog(serviceLog, runtimeModule);
-        res.json(result);
-    });
-    // Proxy for all services
-    app.all('*', async (req, res) => {
-        const apiConfig = apiConfigs.find((c) => req.url.startsWith(`${c.devPath}/`));
-        if (apiConfig) {
-            console.log(`[${req.method}::${req.socket.remoteAddress}]: ${req.protocol}://${req.get('host')}${req.url}`);
-            const event = {
-                protocol: req.protocol,
-                host: req.get('host') || devServerConfig.serverDomain,
-                path: req.url.substring(apiConfig.devPath.length).split('?')[0],
-                ip: req.socket.remoteAddress || '127.0.0.1',
-                query: req.query,
-                correlation: '',
-                headers: req.headers,
-                method: req.method,
-                isBase64Encoded: false,
-                body: typeof req.body === 'object' ? JSON.stringify(req.body) : req.body,
-            };
-            if (req.files) {
-                event.files = req.files.map((file) => ({
-                    base64Data: file.buffer.toString('base64'),
-                    filename: file.originalname,
-                    mimetype: file.mimetype,
-                }));
-            }
-            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);
-                }
-                if (response.result.isBase64Encoded) {
-                    res.status(response.result.statusCode).send(Buffer.from(response.result.body, 'base64'));
-                }
-                else {
-                    res.status(response.result.statusCode).send(response.result.body);
-                }
-            }
-        }
-        else {
-            console.log(`NotFound::[${req.method}::${req.socket.remoteAddress}]: ${req.protocol}://${req.get('host')}${req.url}`);
-            res.status(500).send({ message: 'resource does not exist' });
-        }
-    });
-    app.listen(devServerConfig.serverPort, '0.0.0.0', () => {
-        const baseDomain = getServiceBaseDomain(allServiceConfig[0], devServerConfig);
-        console.log(`⚡️⚡️⚡️[Qpq - Dev Server]⚡️⚡️⚡️: Server is running at [http://${baseDomain}]`);
-    });
-};
+import { askProcessEvent, qpqCoreUtils, qpqExecuteLog, QpqRuntimeType } from 'quidproquo-core';
+import { qpqWebServerUtils } from 'quidproquo-webserver';
+import bodyParser from 'body-parser';
+import express from 'express';
+import multer from 'multer';
+import path from 'path';
+import { getExpressApiEventEventProcessor } from '../actionProcessor';
+import { getAllServiceConfigs } from '../allServiceConfig';
+import { processEvent } from '../logic';
+const getServiceBaseDomain = (qpqConfig, devServerConfig) => qpqWebServerUtils.getDomainRoot(`${devServerConfig.serverDomain}:${devServerConfig.serverPort}`, qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig), qpqCoreUtils.getApplicationModuleFeature(qpqConfig));
+const getApiDomainsFromConfig = (qpqConfig, devServerConfig) => {
+    const baseDomain = getServiceBaseDomain(qpqConfig, devServerConfig);
+    const serviceName = qpqCoreUtils.getApplicationModuleName(qpqConfig);
+    // Get apis
+    const apiConfigs = qpqWebServerUtils.getApiConfigs(qpqConfig);
+    const apiDomains = apiConfigs.map((apiConfig) => ({
+        apiName: apiConfig.apiName,
+        service: serviceName,
+        qpqConfig,
+        domain: `${apiConfig.apiSubdomain}.${baseDomain}`,
+        devDomain: baseDomain,
+        devPath: `/${apiConfig.apiSubdomain}/${serviceName}`,
+    }));
+    return apiDomains;
+};
+const getDynamicModuleLoader = (qpqConfig, devServerConfig) => {
+    const serviceName = qpqCoreUtils.getApplicationModuleName(qpqConfig);
+    return async (runtime) => devServerConfig.dynamicModuleLoader(serviceName, runtime);
+};
+export const apiImplementation = async (devServerConfig) => {
+    const allServiceConfig = getAllServiceConfigs(devServerConfig);
+    const app = express();
+    app.use(multer().any());
+    app.use(bodyParser.json({ limit: '50mb' }));
+    const apiConfigs = allServiceConfig.map((qpqConfig) => getApiDomainsFromConfig(qpqConfig, devServerConfig)).flat();
+    console.log(apiConfigs.map((ac) => ac.devPath));
+    const adminFrontend = path.join(__dirname, '../../..', 'node_modules', 'quidproquo-web-admin', 'lib');
+    // Admin page
+    app.use('/admin', express.static(adminFrontend));
+    app.get('/admin/service/log/list', (req, res) => {
+        // Manually set CORS headers
+        res.header('Access-Control-Allow-Headers', '*');
+        res.header('Access-Control-Allow-Methods', '*');
+        res.header('Access-Control-Allow-Origin', '*');
+        res.header('Access-Control-Allow-Credentials', 'false');
+        const serviceList = allServiceConfig.map((qpqConfig) => qpqCoreUtils.getApplicationModuleName(qpqConfig)).map((name) => `api/${name}`);
+        res.json(serviceList);
+    });
+    app.use(express.json());
+    app.options('/admin/service/log/execute', async (req, res) => {
+        // Manually set CORS headers
+        res.header('Access-Control-Allow-Headers', '*');
+        res.header('Access-Control-Allow-Methods', '*');
+        res.header('Access-Control-Allow-Origin', '*');
+        res.header('Access-Control-Allow-Credentials', 'false');
+        res.json({ done: true });
+    });
+    app.get('/mf-manifest-location.json', async (req, res) => {
+        // Manually set CORS headers
+        res.header('Access-Control-Allow-Headers', '*');
+        res.header('Access-Control-Allow-Methods', '*');
+        res.header('Access-Control-Allow-Origin', '*');
+        res.header('Access-Control-Allow-Credentials', 'false');
+        res.json({ location: 'http://localhost:3005/mf-manifest.json' });
+    });
+    app.post('/admin/service/log/execute', async (req, res) => {
+        // Manually set CORS headers
+        res.header('Access-Control-Allow-Headers', '*');
+        res.header('Access-Control-Allow-Methods', '*');
+        res.header('Access-Control-Allow-Origin', '*');
+        res.header('Access-Control-Allow-Credentials', 'false');
+        // TODO: Get list of services from config dynamically
+        const serviceLog = req.body;
+        let runtimeModule = serviceLog.qpqFunctionRuntimeInfo
+            ? await devServerConfig.dynamicModuleLoader(serviceLog.moduleName, serviceLog.qpqFunctionRuntimeInfo)
+            : askProcessEvent;
+        const result = await qpqExecuteLog(serviceLog, runtimeModule);
+        res.json(result);
+    });
+    // Proxy for all services
+    app.all('*', async (req, res) => {
+        const apiConfig = apiConfigs.find((c) => req.url.startsWith(`${c.devPath}/`));
+        if (apiConfig) {
+            console.log(`[${req.method}::${req.socket.remoteAddress}]: ${req.protocol}://${req.get('host')}${req.url}`);
+            const event = {
+                protocol: req.protocol,
+                host: req.get('host') || devServerConfig.serverDomain,
+                path: req.url.substring(apiConfig.devPath.length).split('?')[0],
+                ip: req.socket.remoteAddress || '127.0.0.1',
+                query: req.query,
+                correlation: '',
+                headers: req.headers,
+                method: req.method,
+                isBase64Encoded: false,
+                body: typeof req.body === 'object' ? JSON.stringify(req.body) : req.body,
+            };
+            if (req.files) {
+                event.files = req.files.map((file) => ({
+                    base64Data: file.buffer.toString('base64'),
+                    filename: file.originalname,
+                    mimetype: file.mimetype,
+                }));
+            }
+            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);
+                }
+                if (response.result.isBase64Encoded) {
+                    res.status(response.result.statusCode).send(Buffer.from(response.result.body, 'base64'));
+                }
+                else {
+                    res.status(response.result.statusCode).send(response.result.body);
+                }
+            }
+        }
+        else {
+            console.log(`NotFound::[${req.method}::${req.socket.remoteAddress}]: ${req.protocol}://${req.get('host')}${req.url}`);
+            res.status(500).send({ message: 'resource does not exist' });
+        }
+    });
+    app.listen(devServerConfig.serverPort, '0.0.0.0', () => {
+        const baseDomain = getServiceBaseDomain(allServiceConfig[0], devServerConfig);
+        console.log(`⚡️⚡️⚡️[Qpq - Dev Server]⚡️⚡️⚡️: Server is running at [http://${baseDomain}]`);
+    });
+};

package/lib/esm/implementations/eventBusImplementation.d.ts

@@ -1,2 +1,2 @@
-import { DevServerConfig } from '../types';
-export declare const eventBusImplementation: (devServerConfig: DevServerConfig) => Promise<void>;
+import { DevServerConfig } from '../types';
+export declare const eventBusImplementation: (devServerConfig: DevServerConfig) => Promise<void>;

package/lib/esm/implementations/eventBusImplementation.js

@@ -1,60 +1,60 @@
-// import { EventBusActionType, QPQConfig, qpqCoreUtils, QpqFunctionRuntime, QueueActionType } from 'quidproquo-core';
-/*
-const processQueueEventBusSubscriptions = async (qpqConfig: QPQConfig, ebMessage: AnyEventBusMessageWithSession) => {
-  const allEventBuses = qpqCoreUtils.getAllEventBusConfigs(qpqConfig).filter((ebc) => {
-    const thisService = qpqCoreUtils.getApplicationModuleName(qpqConfig);
-
-    const srcApplication = ebc.owner?.application || qpqCoreUtils.getApplicationName(qpqConfig);
-    const srcEnvironment = ebc.owner?.environment || qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig);
-    const srcFeature = ebc.owner?.feature || qpqCoreUtils.getApplicationModuleFeature(qpqConfig);
-    const srcModule = ebc.owner?.module || qpqCoreUtils.getApplicationModuleName(qpqConfig);
-
-    return (
-      srcApplication === ebMessage.targetApplication &&
-      srcEnvironment === ebMessage.targetEnvironment &&
-      thisService == srcModule &&
-      srcModule === ebMessage.targetModule &&
-      ((!srcFeature && !ebMessage.targetFeature) || srcFeature === ebMessage.targetFeature)
-    );
-  });
-
-  // All the queues that we should publish to
-  const queues = qpqCoreUtils.getQueues(qpqConfig).filter((q) => {
-    return !!q.eventBusSubscriptions.find((ebsub) => {
-      return allEventBuses.some((eb) => ebsub === eb.owner?.resourceNameOverride || (!eb.owner?.resourceNameOverride && ebsub === eb.name));
-    });
-  });
-
-  console.log('allEventBuses: ', queues);
-
-  for (const queue of queues) {
-    const queueMessage: AnyQueueMessageWithSession = {
-      payload: ebMessage.payload,
-      type: ebMessage.type,
-
-      storySession: ebMessage.storySession,
-
-      queueName: queue.name,
-
-      targetApplication: queue.owner?.application || qpqCoreUtils.getApplicationName(qpqConfig),
-      targetEnvironment: queue.owner?.environment || qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig),
-      targetFeature: queue.owner?.feature || qpqCoreUtils.getApplicationModuleFeature(qpqConfig),
-      targetModule: queue.owner?.module || qpqCoreUtils.getApplicationModuleName(qpqConfig),
-
-      messageId: uuidV4(),
-    };
-
-    eventBus.publish(QueueActionType.SendMessages, queueMessage);
-  }
-};
-*/
-export const eventBusImplementation = async (devServerConfig) => {
-    // eventBus.on(EventBusActionType.SendMessages, async (payload: AnyEventBusMessageWithSession, correlation: string) => {
-    //   console.log('Event Buss Ready to process!');
-    //   for (const qpqConfig of devServerConfig.qpqConfigs) {
-    //     await processQueueEventBusSubscriptions(qpqConfig, payload);
-    //   }
-    // });
-    // Never ends
-    await new Promise(() => { });
-};
+// import { EventBusActionType, QPQConfig, qpqCoreUtils, QpqFunctionRuntime, QueueActionType } from 'quidproquo-core';
+/*
+const processQueueEventBusSubscriptions = async (qpqConfig: QPQConfig, ebMessage: AnyEventBusMessageWithSession) => {
+  const allEventBuses = qpqCoreUtils.getAllEventBusConfigs(qpqConfig).filter((ebc) => {
+    const thisService = qpqCoreUtils.getApplicationModuleName(qpqConfig);
+
+    const srcApplication = ebc.owner?.application || qpqCoreUtils.getApplicationName(qpqConfig);
+    const srcEnvironment = ebc.owner?.environment || qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig);
+    const srcFeature = ebc.owner?.feature || qpqCoreUtils.getApplicationModuleFeature(qpqConfig);
+    const srcModule = ebc.owner?.module || qpqCoreUtils.getApplicationModuleName(qpqConfig);
+
+    return (
+      srcApplication === ebMessage.targetApplication &&
+      srcEnvironment === ebMessage.targetEnvironment &&
+      thisService == srcModule &&
+      srcModule === ebMessage.targetModule &&
+      ((!srcFeature && !ebMessage.targetFeature) || srcFeature === ebMessage.targetFeature)
+    );
+  });
+
+  // All the queues that we should publish to
+  const queues = qpqCoreUtils.getQueues(qpqConfig).filter((q) => {
+    return !!q.eventBusSubscriptions.find((ebsub) => {
+      return allEventBuses.some((eb) => ebsub === eb.owner?.resourceNameOverride || (!eb.owner?.resourceNameOverride && ebsub === eb.name));
+    });
+  });
+
+  console.log('allEventBuses: ', queues);
+
+  for (const queue of queues) {
+    const queueMessage: AnyQueueMessageWithSession = {
+      payload: ebMessage.payload,
+      type: ebMessage.type,
+
+      storySession: ebMessage.storySession,
+
+      queueName: queue.name,
+
+      targetApplication: queue.owner?.application || qpqCoreUtils.getApplicationName(qpqConfig),
+      targetEnvironment: queue.owner?.environment || qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig),
+      targetFeature: queue.owner?.feature || qpqCoreUtils.getApplicationModuleFeature(qpqConfig),
+      targetModule: queue.owner?.module || qpqCoreUtils.getApplicationModuleName(qpqConfig),
+
+      messageId: uuidV4(),
+    };
+
+    eventBus.publish(QueueActionType.SendMessages, queueMessage);
+  }
+};
+*/
+export const eventBusImplementation = async (devServerConfig) => {
+    // eventBus.on(EventBusActionType.SendMessages, async (payload: AnyEventBusMessageWithSession, correlation: string) => {
+    //   console.log('Event Buss Ready to process!');
+    //   for (const qpqConfig of devServerConfig.qpqConfigs) {
+    //     await processQueueEventBusSubscriptions(qpqConfig, payload);
+    //   }
+    // });
+    // Never ends
+    await new Promise(() => { });
+};

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

@@ -1,5 +1,5 @@
-export * from './apiImplementation';
-export * from './eventBusImplementation';
-export * from './queueImplementation';
-export * from './serviceFunctionImplementation';
-export * from './webSocket';
+export * from './apiImplementation';
+export * from './eventBusImplementation';
+export * from './queueImplementation';
+export * from './serviceFunctionImplementation';
+export * from './webSocket';

package/lib/esm/implementations/index.js

@@ -1,5 +1,5 @@
-export * from './apiImplementation';
-export * from './eventBusImplementation';
-export * from './queueImplementation';
-export * from './serviceFunctionImplementation';
-export * from './webSocket';
+export * from './apiImplementation';
+export * from './eventBusImplementation';
+export * from './queueImplementation';
+export * from './serviceFunctionImplementation';
+export * from './webSocket';

package/lib/esm/implementations/queueImplementation.d.ts

@@ -1,2 +1,2 @@
-import { DevServerConfig } from '../types';
-export declare const queueImplementation: (devServerConfig: DevServerConfig) => Promise<void>;
+import { DevServerConfig } from '../types';
+export declare const queueImplementation: (devServerConfig: DevServerConfig) => Promise<void>;

package/lib/esm/implementations/queueImplementation.js

@@ -1,78 +1,78 @@
-import { EventBusActionType, qpqCoreUtils, QpqRuntimeType, QueueActionType } from 'quidproquo-core';
-import { v4 as uuidV4 } from 'uuid';
-import { getQueueEventProcessor } from '../actionProcessor/core/event/queue';
-import { eventBus, processEvent } from '../logic';
-const getDynamicModuleLoader = (qpqConfig, devServerConfig) => {
-    const serviceName = qpqCoreUtils.getApplicationModuleName(qpqConfig);
-    return async (runtime) => devServerConfig.dynamicModuleLoader(serviceName, runtime);
-};
-const processQueueMessages = async (qpqConfig, payload, devServerConfig) => {
-    if (payload.targetEnvironment !== qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig)) {
-        return;
-    }
-    if (payload.targetApplication !== qpqCoreUtils.getApplicationName(qpqConfig)) {
-        return;
-    }
-    if (payload.targetModule !== qpqCoreUtils.getApplicationModuleName(qpqConfig)) {
-        return;
-    }
-    const feature = qpqCoreUtils.getApplicationModuleFeature(qpqConfig);
-    if ((!!payload.targetFeature || !!feature) && payload.targetFeature !== feature) {
-        return;
-    }
-    await processEvent(payload, qpqConfig, getDynamicModuleLoader(qpqConfig, devServerConfig), getQueueEventProcessor, QpqRuntimeType.QUEUE_EVENT, (e) => e.storySession);
-};
-const processQueueEventBusSubscriptions = async (qpqConfig, ebMessage) => {
-    const thisServiceName = qpqCoreUtils.getApplicationModuleName(qpqConfig);
-    const allEventBuses = qpqCoreUtils.getAllEventBusConfigs(qpqConfig).filter((ebc) => {
-        const srcApplication = ebc.owner?.application || qpqCoreUtils.getApplicationName(qpqConfig);
-        const srcEnvironment = ebc.owner?.environment || qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig);
-        const srcFeature = ebc.owner?.feature || qpqCoreUtils.getApplicationModuleFeature(qpqConfig);
-        const srcModule = ebc.owner?.module || qpqCoreUtils.getApplicationModuleName(qpqConfig);
-        return (srcApplication === ebMessage.targetApplication &&
-            srcEnvironment === ebMessage.targetEnvironment &&
-            srcModule === ebMessage.targetModule &&
-            ((!srcFeature && !ebMessage.targetFeature) || srcFeature === ebMessage.targetFeature));
-    });
-    // All the queues that we should publish to
-    const queues = qpqCoreUtils
-        .getQueues(qpqConfig)
-        .filter((q) => {
-        return !!q.eventBusSubscriptions.find((ebsub) => {
-            return allEventBuses.some((eb) => ebsub === eb.name);
-        });
-    })
-        .filter((q) => 
-    // The target is this service
-    (!q.owner?.module || q.owner?.module === thisServiceName) &&
-        // And we are subed to the message that its trying to get to
-        q.eventBusSubscriptions.includes(ebMessage.eventBusName));
-    for (const queue of queues) {
-        const queueMessage = {
-            payload: ebMessage.payload,
-            type: ebMessage.type,
-            storySession: ebMessage.storySession,
-            queueName: queue.name,
-            targetApplication: queue.owner?.application || qpqCoreUtils.getApplicationName(qpqConfig),
-            targetEnvironment: queue.owner?.environment || qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig),
-            targetFeature: queue.owner?.feature || qpqCoreUtils.getApplicationModuleFeature(qpqConfig),
-            targetModule: queue.owner?.module || qpqCoreUtils.getApplicationModuleName(qpqConfig),
-            messageId: uuidV4(),
-        };
-        eventBus.publish(QueueActionType.SendMessages, queueMessage);
-    }
-};
-export const queueImplementation = async (devServerConfig) => {
-    eventBus.on(QueueActionType.SendMessages, async (payload, correlation) => {
-        for (const qpqConfig of devServerConfig.qpqConfigs) {
-            await processQueueMessages(qpqConfig, payload, devServerConfig);
-        }
-    });
-    eventBus.on(EventBusActionType.SendMessages, async (payload, correlation) => {
-        for (const qpqConfig of devServerConfig.qpqConfigs) {
-            await processQueueEventBusSubscriptions(qpqConfig, payload);
-        }
-    });
-    // Never ends
-    await new Promise(() => { });
-};
+import { EventBusActionType, qpqCoreUtils, QpqRuntimeType, QueueActionType } from 'quidproquo-core';
+import { v4 as uuidV4 } from 'uuid';
+import { getQueueEventProcessor } from '../actionProcessor/core/event/queue';
+import { eventBus, processEvent } from '../logic';
+const getDynamicModuleLoader = (qpqConfig, devServerConfig) => {
+    const serviceName = qpqCoreUtils.getApplicationModuleName(qpqConfig);
+    return async (runtime) => devServerConfig.dynamicModuleLoader(serviceName, runtime);
+};
+const processQueueMessages = async (qpqConfig, payload, devServerConfig) => {
+    if (payload.targetEnvironment !== qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig)) {
+        return;
+    }
+    if (payload.targetApplication !== qpqCoreUtils.getApplicationName(qpqConfig)) {
+        return;
+    }
+    if (payload.targetModule !== qpqCoreUtils.getApplicationModuleName(qpqConfig)) {
+        return;
+    }
+    const feature = qpqCoreUtils.getApplicationModuleFeature(qpqConfig);
+    if ((!!payload.targetFeature || !!feature) && payload.targetFeature !== feature) {
+        return;
+    }
+    await processEvent(payload, qpqConfig, getDynamicModuleLoader(qpqConfig, devServerConfig), getQueueEventProcessor, QpqRuntimeType.QUEUE_EVENT, (e) => e.storySession);
+};
+const processQueueEventBusSubscriptions = async (qpqConfig, ebMessage) => {
+    const thisServiceName = qpqCoreUtils.getApplicationModuleName(qpqConfig);
+    const allEventBuses = qpqCoreUtils.getAllEventBusConfigs(qpqConfig).filter((ebc) => {
+        const srcApplication = ebc.owner?.application || qpqCoreUtils.getApplicationName(qpqConfig);
+        const srcEnvironment = ebc.owner?.environment || qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig);
+        const srcFeature = ebc.owner?.feature || qpqCoreUtils.getApplicationModuleFeature(qpqConfig);
+        const srcModule = ebc.owner?.module || qpqCoreUtils.getApplicationModuleName(qpqConfig);
+        return (srcApplication === ebMessage.targetApplication &&
+            srcEnvironment === ebMessage.targetEnvironment &&
+            srcModule === ebMessage.targetModule &&
+            ((!srcFeature && !ebMessage.targetFeature) || srcFeature === ebMessage.targetFeature));
+    });
+    // All the queues that we should publish to
+    const queues = qpqCoreUtils
+        .getQueues(qpqConfig)
+        .filter((q) => {
+        return !!q.eventBusSubscriptions.find((ebsub) => {
+            return allEventBuses.some((eb) => ebsub === eb.name);
+        });
+    })
+        .filter((q) => 
+    // The target is this service
+    (!q.owner?.module || q.owner?.module === thisServiceName) &&
+        // And we are subed to the message that its trying to get to
+        q.eventBusSubscriptions.includes(ebMessage.eventBusName));
+    for (const queue of queues) {
+        const queueMessage = {
+            payload: ebMessage.payload,
+            type: ebMessage.type,
+            storySession: ebMessage.storySession,
+            queueName: queue.name,
+            targetApplication: queue.owner?.application || qpqCoreUtils.getApplicationName(qpqConfig),
+            targetEnvironment: queue.owner?.environment || qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig),
+            targetFeature: queue.owner?.feature || qpqCoreUtils.getApplicationModuleFeature(qpqConfig),
+            targetModule: queue.owner?.module || qpqCoreUtils.getApplicationModuleName(qpqConfig),
+            messageId: uuidV4(),
+        };
+        eventBus.publish(QueueActionType.SendMessages, queueMessage);
+    }
+};
+export const queueImplementation = async (devServerConfig) => {
+    eventBus.on(QueueActionType.SendMessages, async (payload, correlation) => {
+        for (const qpqConfig of devServerConfig.qpqConfigs) {
+            await processQueueMessages(qpqConfig, payload, devServerConfig);
+        }
+    });
+    eventBus.on(EventBusActionType.SendMessages, async (payload, correlation) => {
+        for (const qpqConfig of devServerConfig.qpqConfigs) {
+            await processQueueEventBusSubscriptions(qpqConfig, payload);
+        }
+    });
+    // Never ends
+    await new Promise(() => { });
+};

package/lib/esm/implementations/serviceFunctionImplementation.d.ts

@@ -1,2 +1,2 @@
-import { DevServerConfig } from '../types';
-export declare const serviceFunctionImplementation: (devServerConfig: DevServerConfig) => Promise<void>;
+import { DevServerConfig } from '../types';
+export declare const serviceFunctionImplementation: (devServerConfig: DevServerConfig) => Promise<void>;

package/lib/esm/implementations/serviceFunctionImplementation.js

@@ -1,21 +1,21 @@
-import { qpqCoreUtils, QpqRuntimeType } from 'quidproquo-core';
-import { ServiceFunctionActionType } from 'quidproquo-webserver';
-import { getNodeServiceFunctionEventProcessor } from '../actionProcessor';
-import { eventBus, processEvent } from '../logic';
-const getDynamicModuleLoader = (qpqConfig, devServerConfig) => {
-    const serviceName = qpqCoreUtils.getApplicationModuleName(qpqConfig);
-    return async (runtime) => devServerConfig.dynamicModuleLoader(serviceName, runtime);
-};
-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, (e) => e.storySession);
-        if (correlation) {
-            // Emit the response back on the unique responseEvent channel
-            eventBus.emit(correlation, eventPromise);
-        }
-    });
-    // Never ends
-    await new Promise(() => { });
-};
+import { qpqCoreUtils, QpqRuntimeType } from 'quidproquo-core';
+import { ServiceFunctionActionType } from 'quidproquo-webserver';
+import { getNodeServiceFunctionEventProcessor } from '../actionProcessor';
+import { eventBus, processEvent } from '../logic';
+const getDynamicModuleLoader = (qpqConfig, devServerConfig) => {
+    const serviceName = qpqCoreUtils.getApplicationModuleName(qpqConfig);
+    return async (runtime) => devServerConfig.dynamicModuleLoader(serviceName, runtime);
+};
+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, (e) => e.storySession);
+        if (correlation) {
+            // Emit the response back on the unique responseEvent channel
+            eventBus.emit(correlation, eventPromise);
+        }
+    });
+    // Never ends
+    await new Promise(() => { });
+};