tardis-machine 18.0.0 → 18.1.0

package/benchmark.js

@@ -1,21 +1,38 @@
-import { createRequire } from 'node:module'
-
-const require = createRequire(import.meta.url)
-const fetch = require('node-fetch')
-const split2 = require('split2')
-const WebSocket = require('ws')
-
 const serialize = (options) => {
   return encodeURIComponent(JSON.stringify(options))
 }
 
+async function* responseLines(response) {
+  if (response.body === null) {
+    throw new Error('Response does not have a body')
+  }
+
+  const decoder = new TextDecoder()
+  let buffered = ''
+
+  for await (const chunk of response.body) {
+    buffered += decoder.decode(chunk, { stream: true })
+
+    let newlineIndex
+    while ((newlineIndex = buffered.indexOf('\n')) !== -1) {
+      const line = buffered.slice(0, newlineIndex)
+      buffered = buffered.slice(newlineIndex + 1)
+      if (line !== '') yield line
+    }
+  }
+
+  buffered += decoder.decode()
+  if (buffered !== '') yield buffered
+}
+
 class SimpleWebsocketClient {
   constructor(url, onMessageCB, onOpen) {
     this._socket = new WebSocket(url)
-    this._socket.on('open', onOpen)
-    this._socket.on('message', onMessageCB)
-    this._socket.on('error', (err) => {
-      console.log('SimpleWebsocketClient error', err)
+    this._socket.binaryType = 'arraybuffer'
+    this._socket.addEventListener('open', onOpen)
+    this._socket.addEventListener('message', (event) => onMessageCB(webSocketMessageToString(event.data)))
+    this._socket.addEventListener('error', (event) => {
+      console.log('SimpleWebsocketClient error', new Error('WebSocket connection failed', { cause: event }))
     })
   }
 
@@ -25,13 +42,17 @@ class SimpleWebsocketClient {
 
   async closed() {
     await new Promise((resolve) => {
-      this._socket.on('close', () => {
+      this._socket.addEventListener('close', () => {
         resolve()
       })
     })
   }
 }
 
+function webSocketMessageToString(data) {
+  return typeof data === 'string' ? data : Buffer.from(data).toString()
+}
+
 const EXCHANGE = 'bitmex'
 const SYMBOL = 'XBTUSD'
 
@@ -64,7 +85,7 @@ async function httpReplayBenchmark({ JSONParseResponse }) {
   }
 
   const response = await fetch(`http://localhost:8000/replay?options=${serialize(options)}`)
-  const messagesStream = response.body.pipe(split2())
+  const messagesStream = responseLines(response)
 
   let messagesCount = 0
   let startTime = new Date()
@@ -100,7 +121,7 @@ async function httpReplayNormalizedBenchmark({ computeTBTBookSnapshots }) {
   }
 
   const response = await fetch(`http://localhost:8000/replay-normalized?options=${serialize(options)}`)
-  const messagesStream = response.body.pipe(split2())
+  const messagesStream = responseLines(response)
 
   let messagesCount = 0
   let startTime = new Date()

package/bin/tardis-machine.js

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-process.env.UWS_HTTP_MAX_HEADERS_SIZE = '20000'
 import { createRequire } from 'node:module'
 import { parseArgs } from 'node:util'
 import os from 'node:os'

package/dist/tardismachine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tardismachine.d.ts","sourceRoot":"","sources":["../src/tardismachine.ts"],"names":[],"mappings":"AAWA,qBAAa,aAAa;IAKZ,OAAO,CAAC,QAAQ,CAAC,OAAO;IAJpC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAc;IACxC,OAAO,CAAC,iBAAiB,CAAwC;gBAEpC,OAAO,EAAE,OAAO;IA6EhC,KAAK,CAAC,IAAI,EAAE,MAAM;IAwClB,IAAI;CAWlB;AAED,KAAK,OAAO,GAAG;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB,CAAA"}
+{"version":3,"file":"tardismachine.d.ts","sourceRoot":"","sources":["../src/tardismachine.ts"],"names":[],"mappings":"AAWA,qBAAa,aAAa;IAKZ,OAAO,CAAC,QAAQ,CAAC,OAAO;IAJpC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAwB;IAClD,OAAO,CAAC,iBAAiB,CAAwC;gBAEpC,OAAO,EAAE,OAAO;IAoChC,KAAK,CAAC,IAAI,EAAE,MAAM;IAsClB,IAAI;CAalB;AAED,KAAK,OAAO,GAAG;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB,CAAA"}

package/dist/tardismachine.js

@@ -1,9 +1,9 @@
 import http from 'node:http';
 import { createRequire } from 'module';
 import { clearCache, init } from 'tardis-dev';
-import { App, DISABLED } from 'uWebSockets.js';
 import { healthCheck, replayHttp, replayNormalizedHttp } from "./http/index.js";
 import { replayNormalizedWS, replayWS, streamNormalizedWS } from "./ws/index.js";
+import { MachineWebSocketServer } from "./ws/server.js";
 import { debug } from "./debug.js";
 const require = createRequire(import.meta.url);
 const packageJson = require('../package.json');
@@ -36,45 +36,30 @@ export class TardisMachine {
         });
         // set timeout to 0 meaning infinite http timout - streaming may take some time expecially for longer date ranges
         this._httpServer.timeout = 0;
-        const wsRoutes = {
+        this._wsServer = new MachineWebSocketServer({
             '/ws-replay': replayWS,
             '/ws-replay-normalized': replayNormalizedWS,
             '/ws-stream-normalized': streamNormalizedWS
-        };
-        this._wsServer = App().ws('/*', {
-            compression: DISABLED,
-            maxPayloadLength: 512 * 1024,
-            idleTimeout: 60,
-            maxBackpressure: 5 * 1024 * 1024,
-            closeOnBackpressureLimit: true,
-            upgrade: (res, req, context) => {
-                res.upgrade({ req }, req.getHeader('sec-websocket-key'), req.getHeader('sec-websocket-protocol'), req.getHeader('sec-websocket-extensions'), context);
-            },
-            open: (ws) => {
-                const path = ws.req.getUrl().toLocaleLowerCase();
-                ws.closed = false;
-                const matchingRoute = wsRoutes[path];
-                if (matchingRoute !== undefined) {
-                    matchingRoute(ws, ws.req);
-                }
-                else {
-                    ws.end(1008);
-                }
-            },
-            message: (ws, message) => {
-                if (ws.onmessage !== undefined) {
-                    ws.onmessage(message);
-                }
-            },
-            close: (ws) => {
-                ws.closed = true;
-                if (ws.onclose !== undefined) {
-                    ws.onclose();
-                }
-            }
         });
     }
     async start(port) {
+        if (this.options.clearCache) {
+            await clearCache();
+        }
+        await new Promise((resolve, reject) => {
+            this._httpServer.once('error', reject);
+            this._httpServer.listen(port, () => {
+                this._httpServer.removeListener('error', reject);
+                resolve();
+            });
+        });
+        try {
+            await this._wsServer.listen(port + 1);
+        }
+        catch (error) {
+            await new Promise((resolve) => this._httpServer.close(() => resolve()));
+            throw error;
+        }
         let start = process.hrtime();
         const interval = 500;
         // based on https://github.com/tj/node-blocked/blob/master/index.js
@@ -88,29 +73,9 @@ export class TardisMachine {
             }
             start = process.hrtime();
         }, interval);
-        if (this.options.clearCache) {
-            await clearCache();
-        }
-        await new Promise((resolve, reject) => {
-            try {
-                this._httpServer.on('error', reject);
-                this._httpServer.listen(port, () => {
-                    this._wsServer.listen(port + 1, (listenSocket) => {
-                        if (listenSocket) {
-                            resolve();
-                        }
-                        else {
-                            reject(new Error('ws server did not start'));
-                        }
-                    });
-                });
-            }
-            catch (e) {
-                reject(e);
-            }
-        });
     }
     async stop() {
+        await this._wsServer.close();
         await new Promise((resolve, reject) => {
             this._httpServer.close((err) => {
                 err ? reject(err) : resolve();

package/dist/tardismachine.js.map

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

package/dist/ws/replay.d.ts

@@ -1,3 +1,3 @@
-import type { HttpRequest } from 'uWebSockets.js';
-export declare function replayWS(ws: any, req: HttpRequest): void;
+import type { MachineWebSocket } from './server.ts';
+export declare function replayWS(ws: MachineWebSocket, query: string): void;
 //# sourceMappingURL=replay.d.ts.map

package/dist/ws/replay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replay.d.ts","sourceRoot":"","sources":["../../src/ws/replay.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAQjD,wBAAgB,QAAQ,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,QAkCjD"}
+{"version":3,"file":"replay.d.ts","sourceRoot":"","sources":["../../src/ws/replay.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAMnD,wBAAgB,QAAQ,CAAC,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,QAkC3D"}

package/dist/ws/replay.js

@@ -5,8 +5,8 @@ import { wait } from "../helpers.js";
 import { subscriptionsMappers } from "./subscriptionsmappers.js";
 const replaySessions = {};
 let sessionsCounter = 0;
-export function replayWS(ws, req) {
-    const parsedQuery = decode(req.getQuery());
+export function replayWS(ws, query) {
+    const parsedQuery = decode(query);
     const from = parsedQuery['from'];
     const to = parsedQuery['to'];
     const exchange = parsedQuery['exchange'];
@@ -70,10 +70,12 @@ class ReplaySession {
                     withDisconnects: false
                 });
                 for await (const { message } of messages) {
+                    if (connection.ws.closed)
+                        break;
                     const success = connection.ws.send(message);
                     // handle backpressure in case of slow clients
                     if (!success) {
-                        while (connection.ws.getBufferedAmount() > 0) {
+                        while (!connection.ws.closed && connection.ws.getBufferedAmount() > 0) {
                             await wait(1);
                         }
                     }
@@ -97,10 +99,14 @@ class ReplaySession {
                     }
                 });
                 for await (const { ws, message } of combine(...messagesWithConnections)) {
+                    if (this._connections.every((connection) => connection.ws.closed))
+                        break;
+                    if (ws.closed)
+                        continue;
                     const success = ws.send(message);
                     // handle backpressure in case of slow clients
                     if (!success) {
-                        while (ws.getBufferedAmount() > 0) {
+                        while (!ws.closed && ws.getBufferedAmount() > 0) {
                             await wait(1);
                         }
                     }
@@ -124,7 +130,7 @@ class ReplaySession {
                 continue;
             }
             // let's wait until buffer is empty before closing normal connections
-            while (!error && connection.ws.getBufferedAmount() > 0) {
+            while (!error && !connection.ws.closed && connection.ws.getBufferedAmount() > 0) {
                 await wait(100);
             }
             connection.close(error);

package/dist/ws/replay.js.map

@@ -1 +1 @@
-{"version":3,"file":"replay.js","sourceRoot":"","sources":["../../src/ws/replay.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,OAAO,EAAY,MAAM,EAAiB,MAAM,YAAY,CAAA;AAErE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AACpC,OAAO,EAAsB,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAEpF,MAAM,cAAc,GAAwD,EAAE,CAAA;AAC9E,IAAI,eAAe,GAAG,CAAC,CAAA;AAEvB,MAAM,UAAU,QAAQ,CAAC,EAAO,EAAE,GAAgB;IAChD,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAA;IAC1C,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,CAAW,CAAA;IAC1C,MAAM,EAAE,GAAG,WAAW,CAAC,IAAI,CAAW,CAAA;IACtC,MAAM,QAAQ,GAAG,WAAW,CAAC,UAAU,CAAa,CAAA;IAEpD,oFAAoF;IACpF,kCAAkC;IAClC,6HAA6H;IAC7H,uCAAuC;IAEvC,MAAM,gBAAgB,GAAI,WAAW,CAAC,SAAS,CAAY,IAAI,QAAQ,GAAG,eAAe,EAAE,CAAA;IAE3F,IAAI,yBAAyB,GAAG,cAAc,CAAC,gBAAgB,CAAC,IAAI,cAAc,CAAC,gBAAgB,CAAC,CAAA;IAEpG,IAAI,yBAAyB,KAAK,SAAS,EAAE,CAAC;QAC5C,MAAM,gBAAgB,GAAG,IAAI,aAAa,EAAE,CAAA;QAE5C,cAAc,CAAC,gBAAgB,CAAC,GAAG,gBAAgB,CAAA;QACnD,yBAAyB,GAAG,gBAAgB,CAAA;QAE5C,gBAAgB,CAAC,UAAU,CAAC,GAAG,EAAE;YAC/B,cAAc,CAAC,gBAAgB,CAAC,GAAG,SAAS,CAAA;QAC9C,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACzC,MAAM,OAAO,GAAG,wEAAwE,CAAA;QACxF,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QACrB,OAAM;IACR,CAAC;IAED,yBAAyB,CAAC,YAAY,CAAC,IAAI,mBAAmB,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAA;AACzF,CAAC;AAED,MAAM,aAAa;IACA,YAAY,GAA0B,EAAE,CAAA;IACjD,WAAW,GAAY,KAAK,CAAA;IAEpC;QACE,MAAM,sBAAsB,GAAG,IAAI,CAAA;QAEnC,KAAK,CAAC,4BAA4B,CAAC,CAAA;QAEnC,UAAU,CAAC,GAAG,EAAE;YACd,IAAI,CAAC,MAAM,EAAE,CAAA;QACf,CAAC,EAAE,sBAAsB,CAAC,CAAA;IAC5B,CAAC;IAEM,YAAY,CAAC,mBAAwC;QAC1D,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;QACnD,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;QAC3C,KAAK,CAAC,2CAA2C,EAAE,mBAAmB,CAAC,CAAA;IACzE,CAAC;IAED,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,WAAW,CAAA;IACzB,CAAC;IAEO,mBAAmB,GAAe,GAAG,EAAE,GAAE,CAAC,CAAA;IAE1C,KAAK,CAAC,MAAM;QAClB,IAAI,CAAC;YACH,KAAK,CAAC,4BAA4B,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;YACjE,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;YAEvB,MAAM,+BAA+B,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,kBAAkB,KAAK,CAAC,CAAC,CAAA;YACnG,IAAI,+BAA+B,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/C,MAAM,IAAI,KAAK,CAAC,sDAAsD,+BAA+B,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;YAC7G,CAAC;YAED,sFAAsF;YACtF,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACnC,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;gBAEvC,MAAM,QAAQ,GAAG,MAAM,CAAC;oBACtB,GAAG,UAAU,CAAC,aAAa;oBAC3B,YAAY,EAAE,IAAI;oBAClB,eAAe,EAAE,KAAK;iBACvB,CAAC,CAAA;gBAEF,IAAI,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,QAAQ,EAAE,CAAC;oBACzC,MAAM,OAAO,GAAG,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;oBAC3C,8CAA8C;oBAC9C,IAAI,CAAC,OAAO,EAAE,CAAC;wBACb,OAAO,UAAU,CAAC,EAAE,CAAC,iBAAiB,EAAE,GAAG,CAAC,EAAE,CAAC;4BAC7C,MAAM,IAAI,CAAC,CAAC,CAAC,CAAA;wBACf,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,iFAAiF;gBACjF,iGAAiG;gBACjG,MAAM,uBAAuB,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC,EAAE,UAAU;oBAC/E,MAAM,QAAQ,GAAG,MAAM,CAAC;wBACtB,GAAG,UAAU,CAAC,aAAa;wBAC3B,YAAY,EAAE,IAAI;wBAClB,eAAe,EAAE,KAAK;qBACvB,CAAC,CAAA;oBAEF,IAAI,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,QAAQ,EAAE,CAAC;wBACzD,MAAM;4BACJ,EAAE,EAAE,UAAU,CAAC,EAAE;4BACjB,cAAc,EAAE,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;4BACnD,OAAO;yBACR,CAAA;oBACH,CAAC;gBACH,CAAC,CAAC,CAAA;gBAEF,IAAI,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,OAAO,CAAC,GAAG,uBAAuB,CAAC,EAAE,CAAC;oBACxE,MAAM,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;oBAChC,8CAA8C;oBAC9C,IAAI,CAAC,OAAO,EAAE,CAAC;wBACb,OAAO,EAAE,CAAC,iBAAiB,EAAE,GAAG,CAAC,EAAE,CAAC;4BAClC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAA;wBACf,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;YAED,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAA;YAEjC,KAAK,CACH,gDAAgD,EAChD,IAAI,CAAC,YAAY,CAAC,MAAM,EACxB,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAC3C,CAAA;QACH,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,KAAK,CAAC,qCAAqC,EAAE,CAAC,CAAC,CAAA;YAC/C,MAAM,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAA;QACpC,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,mBAAmB,EAAE,CAAA;QAC5B,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,QAA2B,SAAS;QACrE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAClD,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;YACvC,IAAI,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC;gBACzB,SAAQ;YACV,CAAC;YAED,qEAAqE;YACrE,OAAO,CAAC,KAAK,IAAI,UAAU,CAAC,EAAE,CAAC,iBAAiB,EAAE,GAAG,CAAC,EAAE,CAAC;gBACvD,MAAM,IAAI,CAAC,GAAG,CAAC,CAAA;YACjB,CAAC;YAED,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QACzB,CAAC;IACH,CAAC;IAEM,UAAU,CAAC,kBAA8B;QAC9C,IAAI,CAAC,mBAAmB,GAAG,kBAAkB,CAAA;IAC/C,CAAC;CACF;AAED,MAAM,mBAAmB;IAML;IALF,aAAa,CAAoB;IAChC,oBAAoB,CAAoB;IAClD,kBAAkB,GAAG,CAAC,CAAA;IAE7B,YACkB,EAAO,EACvB,QAAkB,EAClB,IAAY,EACZ,EAAU;QAHM,OAAE,GAAF,EAAE,CAAK;QAKvB,IAAI,CAAC,aAAa,GAAG;YACnB,QAAQ;YACR,IAAI;YACJ,EAAE;YACF,OAAO,EAAE,EAAE;SACZ,CAAA;QAED,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CAAC,YAAY,QAAQ,wFAAwF,CAAC,CAAA;QAC/H,CAAC;QAED,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC,QAAQ,CAAE,CAAA;QAC3D,IAAI,CAAC,EAAE,CAAC,SAAS,GAAG,IAAI,CAAC,gCAAgC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACtE,CAAC;IAEM,KAAK,CAAC,QAA2B,SAAS;QAC/C,IAAI,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC;YACnB,OAAM;QACR,CAAC;QAED,IAAI,KAAK,EAAE,CAAC;YACV,KAAK,CAAC,2CAA2C,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;YAC/D,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;QACrC,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,gCAAgC,EAAE,IAAI,CAAC,CAAA;YAC7C,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAA;QACzC,CAAC;IACH,CAAC;IAEM,QAAQ;QACb,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAA;IAChD,CAAC;IAEO,gCAAgC,CAAC,UAAuB;QAC9D,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAA;QAClD,IAAI,CAAC;YACH,MAAM,mBAAmB,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YAE/C,IAAI,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,mBAAmB,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;gBAChG,0FAA0F;gBAC1F,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,mBAAmB,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAA;gBACrG,KAAK,CAAC,8DAA8D,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;gBACvF,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAA;gBAC3C,IAAI,CAAC,kBAAkB,EAAE,CAAA;YAC3B,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,8BAA8B,EAAE,OAAO,CAAC,CAAA;YAChD,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,uCAAuC,EAAE,CAAC,CAAC,CAAA;YACzD,KAAK,CAAC,wCAAwC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;QAC7D,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"replay.js","sourceRoot":"","sources":["../../src/ws/replay.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,OAAO,EAAY,MAAM,EAAiB,MAAM,YAAY,CAAA;AACrE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAEpC,OAAO,EAAsB,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAEpF,MAAM,cAAc,GAAwD,EAAE,CAAA;AAC9E,IAAI,eAAe,GAAG,CAAC,CAAA;AAEvB,MAAM,UAAU,QAAQ,CAAC,EAAoB,EAAE,KAAa;IAC1D,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;IACjC,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,CAAW,CAAA;IAC1C,MAAM,EAAE,GAAG,WAAW,CAAC,IAAI,CAAW,CAAA;IACtC,MAAM,QAAQ,GAAG,WAAW,CAAC,UAAU,CAAa,CAAA;IAEpD,oFAAoF;IACpF,kCAAkC;IAClC,6HAA6H;IAC7H,uCAAuC;IAEvC,MAAM,gBAAgB,GAAI,WAAW,CAAC,SAAS,CAAY,IAAI,QAAQ,GAAG,eAAe,EAAE,CAAA;IAE3F,IAAI,yBAAyB,GAAG,cAAc,CAAC,gBAAgB,CAAC,IAAI,cAAc,CAAC,gBAAgB,CAAC,CAAA;IAEpG,IAAI,yBAAyB,KAAK,SAAS,EAAE,CAAC;QAC5C,MAAM,gBAAgB,GAAG,IAAI,aAAa,EAAE,CAAA;QAE5C,cAAc,CAAC,gBAAgB,CAAC,GAAG,gBAAgB,CAAA;QACnD,yBAAyB,GAAG,gBAAgB,CAAA;QAE5C,gBAAgB,CAAC,UAAU,CAAC,GAAG,EAAE;YAC/B,cAAc,CAAC,gBAAgB,CAAC,GAAG,SAAS,CAAA;QAC9C,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACzC,MAAM,OAAO,GAAG,wEAAwE,CAAA;QACxF,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QACrB,OAAM;IACR,CAAC;IAED,yBAAyB,CAAC,YAAY,CAAC,IAAI,mBAAmB,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAA;AACzF,CAAC;AAED,MAAM,aAAa;IACA,YAAY,GAA0B,EAAE,CAAA;IACjD,WAAW,GAAY,KAAK,CAAA;IAEpC;QACE,MAAM,sBAAsB,GAAG,IAAI,CAAA;QAEnC,KAAK,CAAC,4BAA4B,CAAC,CAAA;QAEnC,UAAU,CAAC,GAAG,EAAE;YACd,IAAI,CAAC,MAAM,EAAE,CAAA;QACf,CAAC,EAAE,sBAAsB,CAAC,CAAA;IAC5B,CAAC;IAEM,YAAY,CAAC,mBAAwC;QAC1D,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;QACnD,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;QAC3C,KAAK,CAAC,2CAA2C,EAAE,mBAAmB,CAAC,CAAA;IACzE,CAAC;IAED,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,WAAW,CAAA;IACzB,CAAC;IAEO,mBAAmB,GAAe,GAAG,EAAE,GAAE,CAAC,CAAA;IAE1C,KAAK,CAAC,MAAM;QAClB,IAAI,CAAC;YACH,KAAK,CAAC,4BAA4B,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;YACjE,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;YAEvB,MAAM,+BAA+B,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,kBAAkB,KAAK,CAAC,CAAC,CAAA;YACnG,IAAI,+BAA+B,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/C,MAAM,IAAI,KAAK,CAAC,sDAAsD,+BAA+B,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;YAC7G,CAAC;YAED,sFAAsF;YACtF,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACnC,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;gBAEvC,MAAM,QAAQ,GAAG,MAAM,CAAC;oBACtB,GAAG,UAAU,CAAC,aAAa;oBAC3B,YAAY,EAAE,IAAI;oBAClB,eAAe,EAAE,KAAK;iBACvB,CAAC,CAAA;gBAEF,IAAI,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,QAAQ,EAAE,CAAC;oBACzC,IAAI,UAAU,CAAC,EAAE,CAAC,MAAM;wBAAE,MAAK;oBAE/B,MAAM,OAAO,GAAG,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;oBAC3C,8CAA8C;oBAC9C,IAAI,CAAC,OAAO,EAAE,CAAC;wBACb,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,MAAM,IAAI,UAAU,CAAC,EAAE,CAAC,iBAAiB,EAAE,GAAG,CAAC,EAAE,CAAC;4BACtE,MAAM,IAAI,CAAC,CAAC,CAAC,CAAA;wBACf,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,iFAAiF;gBACjF,iGAAiG;gBACjG,MAAM,uBAAuB,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC,EAAE,UAAU;oBAC/E,MAAM,QAAQ,GAAG,MAAM,CAAC;wBACtB,GAAG,UAAU,CAAC,aAAa;wBAC3B,YAAY,EAAE,IAAI;wBAClB,eAAe,EAAE,KAAK;qBACvB,CAAC,CAAA;oBAEF,IAAI,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,QAAQ,EAAE,CAAC;wBACzD,MAAM;4BACJ,EAAE,EAAE,UAAU,CAAC,EAAE;4BACjB,cAAc,EAAE,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;4BACnD,OAAO;yBACR,CAAA;oBACH,CAAC;gBACH,CAAC,CAAC,CAAA;gBAEF,IAAI,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,OAAO,CAAC,GAAG,uBAAuB,CAAC,EAAE,CAAC;oBACxE,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,MAAM,CAAC;wBAAE,MAAK;oBACxE,IAAI,EAAE,CAAC,MAAM;wBAAE,SAAQ;oBAEvB,MAAM,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;oBAChC,8CAA8C;oBAC9C,IAAI,CAAC,OAAO,EAAE,CAAC;wBACb,OAAO,CAAC,EAAE,CAAC,MAAM,IAAI,EAAE,CAAC,iBAAiB,EAAE,GAAG,CAAC,EAAE,CAAC;4BAChD,MAAM,IAAI,CAAC,CAAC,CAAC,CAAA;wBACf,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;YAED,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAA;YAEjC,KAAK,CACH,gDAAgD,EAChD,IAAI,CAAC,YAAY,CAAC,MAAM,EACxB,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAC3C,CAAA;QACH,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,KAAK,CAAC,qCAAqC,EAAE,CAAC,CAAC,CAAA;YAC/C,MAAM,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAA;QACpC,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,mBAAmB,EAAE,CAAA;QAC5B,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,QAA2B,SAAS;QACrE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAClD,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;YACvC,IAAI,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC;gBACzB,SAAQ;YACV,CAAC;YAED,qEAAqE;YACrE,OAAO,CAAC,KAAK,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,MAAM,IAAI,UAAU,CAAC,EAAE,CAAC,iBAAiB,EAAE,GAAG,CAAC,EAAE,CAAC;gBAChF,MAAM,IAAI,CAAC,GAAG,CAAC,CAAA;YACjB,CAAC;YAED,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QACzB,CAAC;IACH,CAAC;IAEM,UAAU,CAAC,kBAA8B;QAC9C,IAAI,CAAC,mBAAmB,GAAG,kBAAkB,CAAA;IAC/C,CAAC;CACF;AAED,MAAM,mBAAmB;IAML;IALF,aAAa,CAAoB;IAChC,oBAAoB,CAAoB;IAClD,kBAAkB,GAAG,CAAC,CAAA;IAE7B,YACkB,EAAoB,EACpC,QAAkB,EAClB,IAAY,EACZ,EAAU;QAHM,OAAE,GAAF,EAAE,CAAkB;QAKpC,IAAI,CAAC,aAAa,GAAG;YACnB,QAAQ;YACR,IAAI;YACJ,EAAE;YACF,OAAO,EAAE,EAAE;SACZ,CAAA;QAED,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CAAC,YAAY,QAAQ,wFAAwF,CAAC,CAAA;QAC/H,CAAC;QAED,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC,QAAQ,CAAE,CAAA;QAC3D,IAAI,CAAC,EAAE,CAAC,SAAS,GAAG,IAAI,CAAC,gCAAgC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACtE,CAAC;IAEM,KAAK,CAAC,QAA2B,SAAS;QAC/C,IAAI,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC;YACnB,OAAM;QACR,CAAC;QAED,IAAI,KAAK,EAAE,CAAC;YACV,KAAK,CAAC,2CAA2C,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;YAC/D,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;QACrC,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,gCAAgC,EAAE,IAAI,CAAC,CAAA;YAC7C,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAA;QACzC,CAAC;IACH,CAAC;IAEM,QAAQ;QACb,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAA;IAChD,CAAC;IAEO,gCAAgC,CAAC,UAAkB;QACzD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAA;QAClD,IAAI,CAAC;YACH,MAAM,mBAAmB,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YAE/C,IAAI,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,mBAAmB,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;gBAChG,0FAA0F;gBAC1F,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,mBAAmB,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAA;gBACrG,KAAK,CAAC,8DAA8D,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;gBACvF,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAA;gBAC3C,IAAI,CAAC,kBAAkB,EAAE,CAAA;YAC3B,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,8BAA8B,EAAE,OAAO,CAAC,CAAA;YAChD,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,uCAAuC,EAAE,CAAC,CAAC,CAAA;YACzD,KAAK,CAAC,wCAAwC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;QAC7D,CAAC;IACH,CAAC;CACF"}

package/dist/ws/replaynormalized.d.ts

@@ -1,3 +1,3 @@
-import type { HttpRequest } from 'uWebSockets.js';
-export declare function replayNormalizedWS(ws: any, req: HttpRequest): Promise<void>;
+import type { MachineWebSocket } from './server.ts';
+export declare function replayNormalizedWS(ws: MachineWebSocket, query: string): Promise<void>;
 //# sourceMappingURL=replaynormalized.d.ts.map

package/dist/ws/replaynormalized.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replaynormalized.d.ts","sourceRoot":"","sources":["../../src/ws/replaynormalized.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAIjD,wBAAsB,kBAAkB,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,iBAoEjE"}
+{"version":3,"file":"replaynormalized.d.ts","sourceRoot":"","sources":["../../src/ws/replaynormalized.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAEnD,wBAAsB,kBAAkB,CAAC,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,iBAsE3E"}

package/dist/ws/replaynormalized.js

@@ -2,11 +2,11 @@ import { decode } from 'node:querystring';
 import { combine, compute, replayNormalized } from 'tardis-dev';
 import { debug } from "../debug.js";
 import { constructDataTypeFilter, getComputables, getNormalizers, wait } from "../helpers.js";
-export async function replayNormalizedWS(ws, req) {
+export async function replayNormalizedWS(ws, query) {
     let messages;
     try {
         const startTimestamp = new Date().getTime();
-        const parsedQuery = decode(req.getQuery());
+        const parsedQuery = decode(query);
         const optionsString = parsedQuery['options'];
         const replayNormalizedOptions = JSON.parse(optionsString);
         debug('WebSocket /ws-replay-normalized started, options: %o', replayNormalizedOptions);
@@ -24,18 +24,20 @@ export async function replayNormalizedWS(ws, req) {
         const filterByDataType = constructDataTypeFilter(options);
         messages = messagesIterables.length === 1 ? messagesIterables[0] : combine(...messagesIterables);
         for await (const message of messages) {
+            if (ws.closed)
+                return;
             if (!filterByDataType(message)) {
                 continue;
             }
             const success = ws.send(JSON.stringify(message));
             // handle backpressure in case of slow clients
             if (!success) {
-                while (ws.getBufferedAmount() > 0) {
+                while (!ws.closed && ws.getBufferedAmount() > 0) {
                     await wait(1);
                 }
             }
         }
-        while (ws.getBufferedAmount() > 0) {
+        while (!ws.closed && ws.getBufferedAmount() > 0) {
             await wait(100);
         }
         ws.end(1000, 'WS replay-normalized finished');
@@ -45,7 +47,7 @@ export async function replayNormalizedWS(ws, req) {
     catch (e) {
         // this will underlying open WS connections
         if (messages !== undefined) {
-            messages.return();
+            await messages.return?.();
         }
         if (!ws.closed) {
             ws.end(1011, e.toString());

package/dist/ws/replaynormalized.js.map

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

package/dist/ws/server.d.ts

@@ -0,0 +1,20 @@
+export type MachineWebSocket = {
+    closed: boolean;
+    onmessage?: (message: Buffer) => void;
+    send(message: string | ArrayBuffer | Buffer): boolean;
+    getBufferedAmount(): number;
+    end(code?: number, reason?: string): void;
+};
+export type MachineWebSocketRoute = (socket: MachineWebSocket, query: string) => void | Promise<void>;
+export declare class MachineWebSocketServer {
+    private readonly routes;
+    private readonly httpServer;
+    private readonly server;
+    private readonly connections;
+    private heartbeatTimer;
+    constructor(routes: Record<string, MachineWebSocketRoute>);
+    listen(port: number): Promise<void>;
+    close(): Promise<void>;
+    private connect;
+}
+//# sourceMappingURL=server.d.ts.map

package/dist/ws/server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/ws/server.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,OAAO,CAAA;IACf,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;IACrC,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,GAAG,MAAM,GAAG,OAAO,CAAA;IACrD,iBAAiB,IAAI,MAAM,CAAA;IAC3B,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAC1C,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG,CAAC,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;AAErG,qBAAa,sBAAsB;IAYrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAXnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAEzB;IACF,OAAO,CAAC,QAAQ,CAAC,MAAM,CAIrB;IACF,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAwC;IACpE,OAAO,CAAC,cAAc,CAA4B;gBAErB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC;IAM7D,MAAM,CAAC,IAAI,EAAE,MAAM;IAcnB,KAAK;IAiBlB,OAAO,CAAC,OAAO;CAyBhB"}

package/dist/ws/server.js

@@ -0,0 +1,154 @@
+import http from 'node:http';
+import WebSocket, { WebSocketServer } from 'ws';
+const IDLE_TIMEOUT_MS = 60_000;
+const HEARTBEAT_INTERVAL_MS = IDLE_TIMEOUT_MS / 2;
+const MAX_HEADER_BYTES = 20_000;
+const MAX_PAYLOAD_BYTES = 512 * 1024;
+const MAX_BACKPRESSURE_BYTES = 5 * 1024 * 1024;
+const MAX_CLOSE_REASON_BYTES = 123;
+export class MachineWebSocketServer {
+    routes;
+    httpServer = http.createServer({ maxHeaderSize: MAX_HEADER_BYTES }, (_, response) => {
+        response.writeHead(426).end();
+    });
+    server = new WebSocketServer({
+        server: this.httpServer,
+        perMessageDeflate: false,
+        maxPayload: MAX_PAYLOAD_BYTES
+    });
+    connections = new Set();
+    heartbeatTimer;
+    constructor(routes) {
+        this.routes = routes;
+        // `ws` re-emits errors from the supplied HTTP server; `listen` reports the same error to its caller.
+        this.server.on('error', () => { });
+        this.server.on('connection', (webSocket, request) => this.connect(webSocket, request.url));
+    }
+    async listen(port) {
+        await new Promise((resolve, reject) => {
+            this.httpServer.once('error', reject);
+            this.httpServer.listen(port, () => {
+                this.httpServer.removeListener('error', reject);
+                resolve();
+            });
+        });
+        this.heartbeatTimer = setInterval(() => {
+            for (const connection of this.connections)
+                connection.checkHeartbeat();
+        }, HEARTBEAT_INTERVAL_MS);
+    }
+    async close() {
+        if (this.heartbeatTimer !== undefined) {
+            clearInterval(this.heartbeatTimer);
+            this.heartbeatTimer = undefined;
+        }
+        for (const connection of this.connections)
+            connection.terminate();
+        await Promise.all([
+            new Promise((resolve, reject) => {
+                this.server.close((error) => (error === undefined ? resolve() : reject(error)));
+            }),
+            new Promise((resolve, reject) => {
+                this.httpServer.close((error) => (error === undefined ? resolve() : reject(error)));
+            })
+        ]);
+    }
+    connect(webSocket, requestUrl) {
+        const connection = new MachineWebSocketConnection(webSocket, () => this.connections.delete(connection));
+        this.connections.add(connection);
+        let url;
+        try {
+            url = new URL(requestUrl ?? '/', 'http://localhost');
+        }
+        catch {
+            connection.end(1008);
+            return;
+        }
+        const route = this.routes[url.pathname.toLowerCase()];
+        if (route === undefined) {
+            connection.end(1008);
+            return;
+        }
+        try {
+            const result = route(connection, url.search.slice(1));
+            if (result !== undefined)
+                void result.catch((error) => connection.end(1011, String(error)));
+        }
+        catch (error) {
+            connection.end(1011, String(error));
+        }
+    }
+}
+class MachineWebSocketConnection {
+    socket;
+    remove;
+    closed = false;
+    onmessage;
+    receivedHeartbeat = true;
+    constructor(socket, remove) {
+        this.socket = socket;
+        this.remove = remove;
+        socket.on('message', (message) => {
+            this.receivedHeartbeat = true;
+            this.onmessage?.(Buffer.isBuffer(message) ? message : Buffer.from(message));
+        });
+        socket.on('pong', () => (this.receivedHeartbeat = true));
+        // `ws` closes the connection after protocol and transport errors; cleanup happens in `close`.
+        socket.on('error', () => { });
+        socket.on('close', () => {
+            this.closed = true;
+            this.remove();
+        });
+    }
+    send(message) {
+        if (this.socket.readyState !== WebSocket.OPEN)
+            return false;
+        try {
+            // uWebSockets.js sent replay payload buffers as text frames by default.
+            this.socket.send(message, { binary: false, compress: false });
+        }
+        catch {
+            this.terminate();
+            return false;
+        }
+        if (this.socket.bufferedAmount > MAX_BACKPRESSURE_BYTES) {
+            this.end(1008, 'Too much backpressure');
+            return false;
+        }
+        return this.socket.bufferedAmount === 0;
+    }
+    getBufferedAmount() {
+        return this.socket.bufferedAmount;
+    }
+    end(code = 1000, reason = '') {
+        if (this.socket.readyState !== WebSocket.OPEN)
+            return;
+        try {
+            this.socket.close(code, truncateCloseReason(reason));
+        }
+        catch {
+            this.terminate();
+        }
+    }
+    checkHeartbeat() {
+        if (!this.receivedHeartbeat) {
+            this.terminate();
+            return;
+        }
+        this.receivedHeartbeat = false;
+        if (this.socket.readyState === WebSocket.OPEN)
+            this.socket.ping();
+    }
+    terminate() {
+        if (this.socket.readyState !== WebSocket.CLOSED)
+            this.socket.terminate();
+    }
+}
+function truncateCloseReason(reason) {
+    const encodedReason = Buffer.from(reason);
+    if (encodedReason.length <= MAX_CLOSE_REASON_BYTES)
+        return reason;
+    // Leave room for the UTF-8 replacement character if truncation splits a code point.
+    return encodedReason.subarray(0, MAX_CLOSE_REASON_BYTES - 3).toString();
+}
+//# sourceMappingURL=server.js.map

package/dist/ws/server.js.map

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

package/dist/ws/streamnormalized.d.ts

@@ -1,3 +1,3 @@
-import type { HttpRequest } from 'uWebSockets.js';
-export declare function streamNormalizedWS(ws: any, req: HttpRequest): Promise<void>;
+import type { MachineWebSocket } from './server.ts';
+export declare function streamNormalizedWS(ws: MachineWebSocket, query: string): Promise<void>;
 //# sourceMappingURL=streamnormalized.d.ts.map

package/dist/ws/streamnormalized.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"streamnormalized.d.ts","sourceRoot":"","sources":["../../src/ws/streamnormalized.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAIjD,wBAAsB,kBAAkB,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,iBAkIjE"}
+{"version":3,"file":"streamnormalized.d.ts","sourceRoot":"","sources":["../../src/ws/streamnormalized.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAEnD,wBAAsB,kBAAkB,CAAC,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,iBAoI3E"}