tardis-machine 3.7.6 → 3.7.7

package/dist/tardismachine.d.ts

@@ -2,6 +2,7 @@ export declare class TardisMachine {
     private readonly options;
     private readonly _httpServer;
     private readonly _wsServer;
+    private _eventLoopTimerId;
     constructor(options: Options);
     start(port: number): Promise<void>;
     stop(): Promise<void>;

package/dist/tardismachine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tardismachine.d.ts","sourceRoot":"","sources":["../src/tardismachine.ts"],"names":[],"mappings":"AASA,qBAAa,aAAa;IAIZ,OAAO,CAAC,QAAQ,CAAC,OAAO;IAHpC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAc;gBAEX,OAAO,EAAE,OAAO;IAoEhC,KAAK,CAAC,IAAI,EAAE,MAAM;IAuBlB,IAAI;CAOlB;AAED,aAAK,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":"AAUA,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,CAAsC;gBAElC,OAAO,EAAE,OAAO;IAoEhC,KAAK,CAAC,IAAI,EAAE,MAAM;IAwClB,IAAI;CAWlB;AAED,aAAK,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

@@ -10,11 +10,13 @@ const tardis_dev_1 = require("tardis-dev");
 const uWebSockets_js_1 = require("uWebSockets.js");
 const http_2 = require("./http");
 const ws_1 = require("./ws");
+const debug_1 = require("./debug");
 const pkg = require('../package.json');
 class TardisMachine {
     options;
     _httpServer;
     _wsServer;
+    _eventLoopTimerId = undefined;
     constructor(options) {
         this.options = options;
         (0, tardis_dev_1.init)({
@@ -70,6 +72,19 @@ class TardisMachine {
         });
     }
     async start(port) {
+        let start = process.hrtime();
+        const interval = 500;
+        // based on https://github.com/tj/node-blocked/blob/master/index.js
+        this._eventLoopTimerId = setInterval(() => {
+            const delta = process.hrtime(start);
+            const nanosec = delta[0] * 1e9 + delta[1];
+            const ms = nanosec / 1e6;
+            const n = ms - interval;
+            if (n > 2000) {
+                (0, debug_1.debug)('Tardis-machine server event loop blocked for %d ms.', Math.round(n));
+            }
+            start = process.hrtime();
+        }, interval);
         if (this.options.clearCache) {
             await (0, tardis_dev_1.clearCache)();
         }
@@ -98,6 +113,9 @@ class TardisMachine {
                 err ? reject(err) : resolve();
             });
         });
+        if (this._eventLoopTimerId !== undefined) {
+            clearInterval(this._eventLoopTimerId);
+        }
     }
 }
 exports.TardisMachine = TardisMachine;

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/streamnormalized.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"streamnormalized.d.ts","sourceRoot":"","sources":["../../src/ws/streamnormalized.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAIvD,wBAAsB,kBAAkB,CAAC,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,WAAW,iBAuHvE"}
+{"version":3,"file":"streamnormalized.d.ts","sourceRoot":"","sources":["../../src/ws/streamnormalized.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAIvD,wBAAsB,kBAAkB,CAAC,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,WAAW,iBA6HvE"}

package/dist/ws/streamnormalized.js

@@ -18,6 +18,8 @@ async function streamNormalizedWS(ws, req) {
         (0, debug_1.debug)('WebSocket /ws-stream-normalized started, options: %o', streamNormalizedOptions);
         const options = Array.isArray(streamNormalizedOptions) ? streamNormalizedOptions : [streamNormalizedOptions];
         let subSequentErrorsCount = {};
+        let retries = 0;
+        let bufferedAmount = 0;
         const messagesIterables = options.map((option) => {
             // let's map from provided options to options and normalizers that needs to be added for dataTypes provided in options
             const messages = (0, tardis_dev_1.streamNormalized)({
@@ -61,19 +63,21 @@ async function streamNormalizedWS(ws, req) {
             if (!filterByDataType(message)) {
                 continue;
             }
-            const success = ws.send(JSON.stringify(message));
+            retries = 0;
+            bufferedAmount = 0;
             // handle backpressure in case of slow clients
-            if (!success) {
-                let retries = 0;
-                while (ws.getBufferedAmount() > 0) {
-                    await (0, helpers_1.wait)(20);
-                    retries += 1;
-                    if (retries > 2000) {
-                        ws.end(1008, 'Too much backpressure');
-                        return;
-                    }
+            while ((bufferedAmount = ws.getBufferedAmount()) > 0) {
+                retries += 1;
+                await (0, helpers_1.wait)(10 * retries);
+                if (retries % 20 === 0 || retries === 5) {
+                    (0, debug_1.debug)('Slow client, waiting %d ms, buffered amount: %d', 10 * retries, bufferedAmount);
+                }
+                if (retries > 100) {
+                    ws.end(1008, 'Too much backpressure');
+                    return;
                 }
             }
+            ws.send(JSON.stringify(message));
             if (message.type !== 'disconnect') {
                 subSequentErrorsCount[exchange] = 0;
             }

package/dist/ws/streamnormalized.js.map

@@ -1 +1 @@
-{"version":3,"file":"streamnormalized.js","sourceRoot":"","sources":["../../src/ws/streamnormalized.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"streamnormalized.js","sourceRoot":"","sources":["../../src/ws/streamnormalized.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA4B;AAC5B,2CAAyE;AAEzE,oCAAgC;AAChC,wCAA0H;AAEnH,KAAK,UAAU,kBAAkB,CAAC,EAAa,EAAE,GAAgB;IACtE,IAAI,QAAgD,CAAA;IAEpD,IAAI;QACF,MAAM,cAAc,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAA;QAC3C,MAAM,WAAW,GAAG,qBAAE,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC7C,MAAM,aAAa,GAAG,WAAW,CAAC,SAAS,CAAW,CAAA;QACtD,MAAM,uBAAuB,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAmC,CAAA;QAE3F,IAAA,aAAK,EAAC,sDAAsD,EAAE,uBAAuB,CAAC,CAAA;QAEtF,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAA;QAC5G,IAAI,qBAAqB,GAAmC,EAAE,CAAA;QAE9D,IAAI,OAAO,GAAG,CAAC,CAAA;QACf,IAAI,cAAc,GAAG,CAAC,CAAA;QAEtB,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAC/C,sHAAsH;YACtH,MAAM,QAAQ,GAAG,IAAA,6BAAgB,EAC/B;gBACE,GAAG,MAAM;gBACT,sBAAsB,EAAE,IAAI;gBAC5B,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;oBACjB,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAoB,CAAA;oBAC5C,IAAI,qBAAqB,CAAC,QAAQ,CAAC,KAAK,SAAS,EAAE;wBACjD,qBAAqB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;qBACpC;oBAED,qBAAqB,CAAC,QAAQ,CAAE,EAAE,CAAA;oBAElC,IAAI,MAAM,CAAC,iBAAiB,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE;wBAC1C,EAAE,CAAC,IAAI,CACL,IAAI,CAAC,SAAS,CAAC;4BACb,IAAI,EAAE,OAAO;4BACb,QAAQ;4BACR,cAAc,EAAE,IAAI,IAAI,EAAE;4BAC1B,OAAO,EAAE,KAAK,CAAC,OAAO;yBACvB,CAAC,CACH,CAAA;qBACF;oBAED,IAAA,aAAK,EAAC,4DAA4D,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAA;gBACtF,CAAC;aACF,EACD,GAAG,IAAA,wBAAc,EAAC,MAAM,CAAC,SAAS,CAAC,CACpC,CAAA;YACD,qEAAqE;YACrE,MAAM,WAAW,GAAG,IAAA,wBAAc,EAAC,MAAM,CAAC,SAAS,CAAC,CAAA;YAEpD,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC1B,OAAO,IAAA,oBAAO,EAAC,QAAQ,EAAE,GAAG,WAAW,CAAC,CAAA;aACzC;YAED,OAAO,QAAQ,CAAA;QACjB,CAAC,CAAC,CAAA;QAEF,MAAM,gBAAgB,GAAG,IAAA,iCAAuB,EAAC,OAAO,CAAC,CAAA;QACzD,QAAQ,GAAG,iBAAiB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,oBAAO,EAAC,GAAG,iBAAiB,CAAC,CAAA;QAEhG,IAAI,KAAK,EAAE,MAAM,OAAO,IAAI,QAAQ,EAAE;YACpC,IAAI,EAAE,CAAC,MAAM,EAAE;gBACb,OAAM;aACP;YAED,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAoB,CAAA;YAE7C,IAAI,qBAAqB,CAAC,QAAQ,CAAC,KAAK,SAAS,IAAI,qBAAqB,CAAC,QAAQ,CAAE,IAAI,EAAE,EAAE;gBAC3F,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,kDAAkD,QAAQ,SAAS,CAAC,CAAA;gBACjF,OAAM;aACP;YAED,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE;gBAC9B,SAAQ;aACT;YAED,OAAO,GAAG,CAAC,CAAA;YACX,cAAc,GAAG,CAAC,CAAA;YAClB,8CAA8C;YAC9C,OAAO,CAAC,cAAc,GAAG,EAAE,CAAC,iBAAiB,EAAE,CAAC,GAAG,CAAC,EAAE;gBACpD,OAAO,IAAI,CAAC,CAAA;gBACZ,MAAM,IAAA,cAAI,EAAC,EAAE,GAAG,OAAO,CAAC,CAAA;gBAExB,IAAI,OAAO,GAAG,EAAE,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,EAAE;oBACvC,IAAA,aAAK,EAAC,iDAAiD,EAAE,EAAE,GAAG,OAAO,EAAE,cAAc,CAAC,CAAA;iBACvF;gBACD,IAAI,OAAO,GAAG,GAAG,EAAE;oBACjB,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAA;oBACrC,OAAM;iBACP;aACF;YAED,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;YAEhC,IAAI,OAAO,CAAC,IAAI,KAAK,YAAY,EAAE;gBACjC,qBAAqB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;aACpC;SACF;QAED,OAAO,EAAE,CAAC,iBAAiB,EAAE,GAAG,CAAC,EAAE;YACjC,MAAM,IAAA,cAAI,EAAC,GAAG,CAAC,CAAA;SAChB;QAED,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,+BAA+B,CAAC,CAAA;QAE7C,MAAM,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAA;QAEzC,IAAA,aAAK,EACH,yEAAyE,EACzE,uBAAuB,EACvB,CAAC,YAAY,GAAG,cAAc,CAAC,GAAG,IAAI,CACvC,CAAA;KACF;IAAC,OAAO,CAAM,EAAE;QACf,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE;YACd,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;SAC3B;QAED,IAAA,aAAK,EAAC,4CAA4C,EAAE,CAAC,CAAC,CAAA;QACtD,OAAO,CAAC,KAAK,CAAC,wCAAwC,EAAE,CAAC,CAAC,CAAA;KAC3D;YAAS;QACR,iDAAiD;QACjD,IAAI,QAAQ,KAAK,SAAS,EAAE;YAC1B,QAAS,CAAC,MAAO,EAAE,CAAA;SACpB;KACF;AACH,CAAC;AA7HD,gDA6HC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tardis-machine",
-  "version": "3.7.6",
+  "version": "3.7.7",
   "engines": {
     "node": ">=12"
   },
@@ -57,30 +57,30 @@
   "license": "MPL-2.0",
   "dependencies": {
     "debug": "^4.3.4",
-    "find-my-way": "^5.5.1",
+    "find-my-way": "^6.3.0",
     "is-docker": "^2.2.1",
     "tardis-dev": "^13.4.5",
-    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.8.0",
-    "yargs": "^17.4.1"
+    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.10.0",
+    "yargs": "^17.5.1"
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
-    "@types/jest": "^27.0.3",
-    "@types/node": "^17.0.27",
-    "@types/node-fetch": "^2.5.12",
+    "@types/jest": "^28.1.1",
+    "@types/node": "^17.0.41",
+    "@types/node-fetch": "^2.6.1",
     "@types/split2": "^3.2.1",
     "@types/ws": "^8.5.3",
     "@types/yargs": "^17.0.10",
     "cross-var": "^1.1.0",
-    "husky": "^7.0.4",
-    "jest": "^27.4.5",
-    "lint-staged": "^12.4.0",
+    "husky": "^8.0.1",
+    "jest": "^28.1.1",
+    "lint-staged": "^13.0.1",
     "node-fetch": "^2.6.1",
     "prettier": "^2.6.2",
     "split2": "^4.1.0",
-    "ts-jest": "^27.1.2",
-    "typescript": "^4.6.3",
-    "ws": "^8.5.0"
+    "ts-jest": "^28.0.4",
+    "typescript": "^4.7.3",
+    "ws": "^8.8.0"
   },
   "lint-staged": {
     "*.{ts}": [

package/src/tardismachine.ts

@@ -4,12 +4,14 @@ import { clearCache, init } from 'tardis-dev'
 import { App, DISABLED, TemplatedApp, WebSocket } from 'uWebSockets.js'
 import { replayHttp, replayNormalizedHttp, healthCheck } from './http'
 import { replayNormalizedWS, replayWS, streamNormalizedWS } from './ws'
+import { debug } from './debug'
 
 const pkg = require('../package.json')
 
 export class TardisMachine {
   private readonly _httpServer: http.Server
   private readonly _wsServer: TemplatedApp
+  private _eventLoopTimerId: NodeJS.Timer | undefined = undefined
 
   constructor(private readonly options: Options) {
     init({
@@ -80,6 +82,23 @@ export class TardisMachine {
   }
 
   public async start(port: number) {
+    let start = process.hrtime()
+    const interval = 500
+
+    // based on https://github.com/tj/node-blocked/blob/master/index.js
+    this._eventLoopTimerId = setInterval(() => {
+      const delta = process.hrtime(start)
+      const nanosec = delta[0] * 1e9 + delta[1]
+      const ms = nanosec / 1e6
+      const n = ms - interval
+
+      if (n > 2000) {
+        debug('Tardis-machine server event loop blocked for %d ms.', Math.round(n))
+      }
+
+      start = process.hrtime()
+    }, interval)
+
     if (this.options.clearCache) {
       await clearCache()
     }
@@ -108,6 +127,10 @@ export class TardisMachine {
         err ? reject(err) : resolve()
       })
     })
+
+    if (this._eventLoopTimerId !== undefined) {
+      clearInterval(this._eventLoopTimerId)
+    }
   }
 }
 

package/src/ws/streamnormalized.ts

@@ -18,6 +18,9 @@ export async function streamNormalizedWS(ws: WebSocket, req: HttpRequest) {
     const options = Array.isArray(streamNormalizedOptions) ? streamNormalizedOptions : [streamNormalizedOptions]
     let subSequentErrorsCount: { [key in Exchange]?: number } = {}
 
+    let retries = 0
+    let bufferedAmount = 0
+
     const messagesIterables = options.map((option) => {
       // let's map from provided options to options and normalizers that needs to be added for dataTypes provided in options
       const messages = streamNormalized(
@@ -77,21 +80,24 @@ export async function streamNormalizedWS(ws: WebSocket, req: HttpRequest) {
         continue
       }
 
-      const success = ws.send(JSON.stringify(message))
+      retries = 0
+      bufferedAmount = 0
       // handle backpressure in case of slow clients
-      if (!success) {
-        let retries = 0
-        while (ws.getBufferedAmount() > 0) {
-          await wait(20)
-          retries += 1
-
-          if (retries > 2000) {
-            ws.end(1008, 'Too much backpressure')
-            return
-          }
+      while ((bufferedAmount = ws.getBufferedAmount()) > 0) {
+        retries += 1
+        await wait(10 * retries)
+
+        if (retries % 20 === 0 || retries === 5) {
+          debug('Slow client, waiting %d ms, buffered amount: %d', 10 * retries, bufferedAmount)
+        }
+        if (retries > 100) {
+          ws.end(1008, 'Too much backpressure')
+          return
         }
       }
 
+      ws.send(JSON.stringify(message))
+
       if (message.type !== 'disconnect') {
         subSequentErrorsCount[exchange] = 0
       }