@n1k1t/mock-server 0.1.40 → 0.1.42

package/lib/src/server/transports/ws/index.js

@@ -7,47 +7,63 @@ const meta_1 = require("../../../meta");
 const executor_1 = require("./executor");
 const logger_1 = require("../../../logger");
 const logger = logger_1.Logger.build('Server.Transports.Ws');
+const signals = {
+    close: Symbol('close'),
+    break: Symbol('break'),
+};
+const handle = async (event, socket, request, match, data) => {
+    const context = await match.transport
+        .compileContext(match.provider, socket, request, event, data)
+        .catch((error) => logger.error(`Got error while [ws:${event}] context compilation`, error?.stack ?? error));
+    if (!context) {
+        return signals.close;
+    }
+    if (!context.hasStatus('handling')) {
+        return signals.break;
+    }
+    const expectation = await meta_1.metaStorage
+        .wrap(context.meta, () => match.transport.executor.match(context))
+        .catch((error) => logger.error(`Got error while [ws:${event}] expectation matching`, error?.stack ?? error));
+    if (!context.hasStatus('handling')) {
+        return signals.break;
+    }
+    if (!expectation) {
+        return null;
+    }
+    await meta_1.metaStorage
+        .wrap(context.meta, () => match.transport.executor.exec(context, { expectation }))
+        .catch((error) => logger.error(`Got error while [ws:${event}] execution`, error?.stack ?? error));
+    return signals.close;
+};
 const buildWsListener = (router) => async (socket, request) => {
     if (request.url?.startsWith('/socket.io')) {
         return socket.terminate();
     }
-    const { provider, transport } = router.match('ws', request.url ?? '');
-    const context = await transport
-        .compileContext(provider, socket, request, 'connection')
-        .catch((error) => logger.error('Got error while [ws:connection] context compilation', error?.stack ?? error));
-    if (!context) {
-        return socket.close(1011);
-    }
-    const provided = await meta_1.metaStorage
-        .wrap(context.meta, () => transport.executor.exec(context, {
-        spareExpectationsStorage: provider !== router.defaults.provider
-            ? router.defaults.provider.storages.expectations
-            : undefined,
-    }))
-        .catch((error) => logger.error('Get error while [ws:connection] execution', error?.stack ?? error));
-    if (!provided) {
-        return socket.close(1011);
-    }
-    if (socket.readyState === socket.OPEN) {
-        socket.on('message', async (data) => {
-            const context = await transport
-                .compileContext(provider, socket, request, 'message', data)
-                .catch((error) => logger.error('Got error while [ws:message] context compilation', error?.stack ?? error));
-            if (!context) {
-                return socket.close(1011);
-            }
-            meta_1.metaStorage
-                .wrap(context.meta, () => transport.executor.exec(context, {
-                spareExpectationsStorage: provider !== router.defaults.provider
-                    ? router.defaults.provider.storages.expectations
-                    : undefined,
-            }))
-                .catch((error) => {
-                logger.error('Get error while handling incoming request', error?.stack ?? error);
-                socket.close(1011);
-            });
-        });
+    const matches = [];
+    for (const match of router.match('ws', request.url ?? '')) {
+        matches.push(match);
+        const signal = await handle('connection', socket, request, match);
+        if (signal === signals.close) {
+            return socket.close();
+        }
+        if (signal === signals.break) {
+            break;
+        }
     }
+    if (!matches.length || socket.readyState !== socket.OPEN) {
+        return socket.close();
+    }
+    socket.on('message', async (data) => {
+        for (const match of matches) {
+            const signal = await handle('message', socket, request, match, data);
+            if (signal === signals.close) {
+                return socket.close();
+            }
+            if (signal === signals.break) {
+                break;
+            }
+        }
+    });
 };
 exports.buildWsListener = buildWsListener;
 class WsTransport extends models_1.Transport {

package/lib/src/server/transports/ws/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/server/transports/ws/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/server/transports/ws/index.ts"],"names":[],"mappings":"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"}