quidproquo-dev-server 0.0.240 → 0.0.241

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

@@ -0,0 +1,123 @@
+import { qpqCoreUtils, QpqRuntimeType } from 'quidproquo-core';
+import { qpqWebServerUtils, WebSocketEventType } from 'quidproquo-webserver';
+import { createServer } from 'http';
+import { WebSocketServer } from 'ws';
+import { getWsWebsocketEventEventProcessor } from '../../actionProcessor';
+import { processEvent } from '../../logic';
+const getDynamicModuleLoader = (qpqConfig, devServerConfig) => {
+    const serviceName = qpqCoreUtils.getApplicationModuleName(qpqConfig);
+    return async (runtime) => devServerConfig.dynamicModuleLoader(serviceName, runtime);
+};
+const globals = {
+    allServers: [],
+};
+const findConnection = (service, apiName) => {
+    const serverInfo = globals.allServers.find((s) => s.service === service && s.apiName === apiName);
+    return serverInfo;
+};
+export const sendMessageToWebSocketConnection = async (service, websocketApiName, connectionId, payload) => {
+    const wsConnection = findConnection(service, websocketApiName)?.connections?.[connectionId];
+    if (!wsConnection) {
+        return;
+    }
+    wsConnection.send(JSON.stringify(payload));
+};
+const startServer = (settingsMap, devServerConfig) => {
+    const webSocketServer = new WebSocketServer({ noServer: true });
+    console.log(`WebSocket: ws://${devServerConfig.serverDomain}:${devServerConfig.webSocketPort}/${settingsMap.service}/${settingsMap.apiName}`);
+    webSocketServer.on('connection', (ws, req) => {
+        const connectionId = req.headers['sec-websocket-key'] || crypto.randomUUID();
+        const sourceIp = req.socket.remoteAddress === '::1' || !req.socket.remoteAddress ? '127.0.0.1' : req.socket.remoteAddress;
+        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 onConnectEvent = {
+            apiName: settingsMap.apiName,
+            service: settingsMap.service,
+            eventType: WebSocketEventType.Connect,
+            body: undefined,
+            messageId: crypto.randomUUID(),
+            connectionId: connectionId,
+            requestTimeEpoch: Date.now(),
+            sourceIp: sourceIp,
+            userAgent: userAgent,
+        };
+        processWsEvent(onConnectEvent);
+        ws.on('error', console.error);
+        ws.on('message', (data, isBinary) => {
+            console.log('isBinary: ', isBinary);
+            const onMessageEvent = {
+                apiName: settingsMap.apiName,
+                service: settingsMap.service,
+                eventType: WebSocketEventType.Message,
+                body: data,
+                messageId: crypto.randomUUID(),
+                connectionId: connectionId,
+                requestTimeEpoch: Date.now(),
+                sourceIp: sourceIp,
+                userAgent: userAgent,
+            };
+            processWsEvent(onMessageEvent);
+        });
+        ws.on('close', () => {
+            delete server.connections[connectionId];
+            const onCloseEvent = {
+                apiName: settingsMap.apiName,
+                service: settingsMap.service,
+                eventType: WebSocketEventType.Disconnect,
+                body: undefined,
+                messageId: crypto.randomUUID(),
+                connectionId: connectionId,
+                requestTimeEpoch: Date.now(),
+                sourceIp: sourceIp,
+                userAgent: userAgent,
+            };
+            processWsEvent(onCloseEvent);
+        });
+    });
+    return {
+        ...settingsMap,
+        server: webSocketServer,
+        connections: {},
+    };
+};
+const getWebSocketQPQWebServerConfigSettingMaps = (qpqConfigs) => {
+    return qpqConfigs
+        .flatMap((qpqConfig) => {
+        const service = qpqCoreUtils.getApplicationModuleName(qpqConfig);
+        return qpqWebServerUtils.getWebsocketSettings(qpqConfig).flatMap((wsc) => {
+            const item = {
+                apiName: wsc.apiName,
+                service,
+                setting: wsc,
+                qpqConfig,
+            };
+            return item;
+        });
+    })
+        .filter((item, index, arr) => arr[index].apiName !== item.apiName || !item.setting.owner?.module || arr[index].service === item.setting.owner?.module);
+};
+export const webSocketImplementation = async (devServerConfig) => {
+    if (!devServerConfig.webSocketPort) {
+        return;
+    }
+    const webSocketQPQWebServerConfigSettingMaps = getWebSocketQPQWebServerConfigSettingMaps(devServerConfig.qpqConfigs);
+    const server = createServer();
+    globals.allServers = webSocketQPQWebServerConfigSettingMaps.map((x) => startServer(x, devServerConfig));
+    server.on('upgrade', (request, socket, head) => {
+        const { pathname } = new URL(request.url || '', 'wss://base.url');
+        const serverInfo = globals.allServers.find((s) => pathname === `/${s.service}/${s.apiName}`);
+        if (serverInfo) {
+            serverInfo.server.handleUpgrade(request, socket, head, (ws) => {
+                serverInfo.server.emit('connection', ws, request);
+            });
+        }
+        else {
+            socket.destroy();
+        }
+    });
+    server.listen(devServerConfig.webSocketPort, 'localhost');
+    // Never ends
+    await new Promise(() => { });
+};

package/lib/esm/logic/eventBus.js

@@ -24,6 +24,9 @@ class EventBus extends EventEmitter {
         });
     }
     async publish(eventType, payload) {
+        // console.log('------------------------------------------------------------');
+        // console.log('\n\nEventBus - publish: [', eventType, ']', '[', payload?.type, ']');
+        // console.log('------------------------------------------------------------');
         this.emit(eventType, payload);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-dev-server",
-  "version": "0.0.240",
+  "version": "0.0.241",
   "description": "",
   "main": "./lib/commonjs/index.js",
   "module": "./lib/esm/index.js",
@@ -33,15 +33,15 @@
   "homepage": "https://github.com/joe-coady/quidproquo#readme",
   "dependencies": {
     "multer": "^1.4.5-lts.1",
-    "quidproquo-actionprocessor-awslambda": "0.0.240",
-    "quidproquo-actionprocessor-node": "0.0.240",
-    "quidproquo-core": "0.0.240",
-    "quidproquo-webserver": "0.0.240",
+    "quidproquo-actionprocessor-awslambda": "0.0.241",
+    "quidproquo-actionprocessor-node": "0.0.241",
+    "quidproquo-core": "0.0.241",
+    "quidproquo-webserver": "0.0.241",
     "ws": "^8.18.0"
   },
   "devDependencies": {
     "@types/multer": "^1.4.12",
-    "quidproquo-tsconfig": "0.0.240",
+    "quidproquo-tsconfig": "0.0.241",
     "typescript": "^4.9.3"
   }
 }

package/lib/commonjs/implementations/webSocketImplementation.d.ts

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

package/lib/commonjs/implementations/webSocketImplementation.js

@@ -1,63 +0,0 @@
-"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.webSocketImplementation = void 0;
-const http_1 = require("http");
-const ws_1 = require("ws");
-const webSocketImplementation = (devServerConfig) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!devServerConfig.webSocketPort) {
-        return;
-    }
-    console.log('Starting WebSocket Server!');
-    const server = (0, http_1.createServer)();
-    const wss1 = new ws_1.WebSocketServer({ noServer: true });
-    const wss2 = new ws_1.WebSocketServer({ noServer: true });
-    wss1.on('connection', (ws) => {
-        ws.on('error', console.error);
-        ws.on('message', (data) => {
-            console.log('received: %s', data);
-        });
-        ws.on('close', () => {
-            console.log('disconnected');
-        });
-        // ...
-    });
-    wss2.on('connection', (ws) => {
-        ws.on('error', console.error);
-        ws.on('message', (data) => {
-            console.log('received: %s', data);
-        });
-        ws.on('close', () => {
-            console.log('disconnected');
-        });
-        // ...
-    });
-    server.on('upgrade', (request, socket, head) => {
-        const { pathname } = new URL(request.url || '', 'wss://base.url');
-        if (pathname === '/foo') {
-            wss1.handleUpgrade(request, socket, head, (ws) => {
-                wss1.emit('connection', ws, request);
-            });
-        }
-        else if (pathname === '/bar') {
-            wss2.handleUpgrade(request, socket, head, (ws) => {
-                wss2.emit('connection', ws, request);
-            });
-        }
-        else {
-            socket.destroy();
-        }
-    });
-    server.listen(devServerConfig.webSocketPort, 'localhost');
-    // Never ends
-    yield new Promise(() => { });
-});
-exports.webSocketImplementation = webSocketImplementation;

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

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

package/lib/esm/implementations/webSocketImplementation.js

@@ -1,50 +0,0 @@
-import { createServer } from 'http';
-import { WebSocketServer } from 'ws';
-export const webSocketImplementation = async (devServerConfig) => {
-    if (!devServerConfig.webSocketPort) {
-        return;
-    }
-    console.log('Starting WebSocket Server!');
-    const server = createServer();
-    const wss1 = new WebSocketServer({ noServer: true });
-    const wss2 = new WebSocketServer({ noServer: true });
-    wss1.on('connection', (ws) => {
-        ws.on('error', console.error);
-        ws.on('message', (data) => {
-            console.log('received: %s', data);
-        });
-        ws.on('close', () => {
-            console.log('disconnected');
-        });
-        // ...
-    });
-    wss2.on('connection', (ws) => {
-        ws.on('error', console.error);
-        ws.on('message', (data) => {
-            console.log('received: %s', data);
-        });
-        ws.on('close', () => {
-            console.log('disconnected');
-        });
-        // ...
-    });
-    server.on('upgrade', (request, socket, head) => {
-        const { pathname } = new URL(request.url || '', 'wss://base.url');
-        if (pathname === '/foo') {
-            wss1.handleUpgrade(request, socket, head, (ws) => {
-                wss1.emit('connection', ws, request);
-            });
-        }
-        else if (pathname === '/bar') {
-            wss2.handleUpgrade(request, socket, head, (ws) => {
-                wss2.emit('connection', ws, request);
-            });
-        }
-        else {
-            socket.destroy();
-        }
-    });
-    server.listen(devServerConfig.webSocketPort, 'localhost');
-    // Never ends
-    await new Promise(() => { });
-};