tardis-machine 3.12.0 → 3.12.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +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,
|
|
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,iBAkIvE"}
|
|
@@ -69,14 +69,16 @@ async function streamNormalizedWS(ws, req) {
|
|
|
69
69
|
// handle backpressure in case of slow clients
|
|
70
70
|
while ((bufferedAmount = ws.getBufferedAmount()) > 0) {
|
|
71
71
|
retries += 1;
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
72
|
+
const isState = new Date().valueOf() - message.localTimestamp.valueOf() >= 6;
|
|
73
|
+
// log stale messages, stale meaning message was not sent in 6 ms or more (2 retries)
|
|
74
|
+
if (isState) {
|
|
75
|
+
(0, debug_1.debug)('Slow client, waiting %d ms, buffered amount: %d', 3 * retries, bufferedAmount);
|
|
75
76
|
}
|
|
76
|
-
if (retries >
|
|
77
|
+
if (retries > 300) {
|
|
77
78
|
ws.end(1008, 'Too much backpressure');
|
|
78
79
|
return;
|
|
79
80
|
}
|
|
81
|
+
await (0, helpers_1.wait)(3 * retries);
|
|
80
82
|
}
|
|
81
83
|
ws.send(JSON.stringify(message));
|
|
82
84
|
if (message.type !== 'disconnect') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streamnormalized.js","sourceRoot":"","sources":["../../src/ws/streamnormalized.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"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;4BACtB,qBAAqB,EAAE,qBAAqB,CAAC,QAAQ,CAAC;yBACvD,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,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;gBAE5E,qFAAqF;gBAErF,IAAI,OAAO,EAAE;oBACX,IAAA,aAAK,EAAC,iDAAiD,EAAE,CAAC,GAAG,OAAO,EAAE,cAAc,CAAC,CAAA;iBACtF;gBACD,IAAI,OAAO,GAAG,GAAG,EAAE;oBACjB,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAA;oBACrC,OAAM;iBACP;gBAED,MAAM,IAAA,cAAI,EAAC,CAAC,GAAG,OAAO,CAAC,CAAA;aACxB;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;AAlID,gDAkIC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "tardis-machine",
|
|
3
|
-
"version": "3.12.
|
|
3
|
+
"version": "3.12.2",
|
|
4
4
|
"engines": {
|
|
5
5
|
"node": ">=12"
|
|
6
6
|
},
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
"debug": "^4.3.4",
|
|
60
60
|
"find-my-way": "^6.3.0",
|
|
61
61
|
"is-docker": "^2.2.1",
|
|
62
|
-
"tardis-dev": "^13.10.
|
|
62
|
+
"tardis-dev": "^13.10.2",
|
|
63
63
|
"uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.10.0",
|
|
64
64
|
"yargs": "^17.5.1"
|
|
65
65
|
},
|
|
@@ -86,15 +86,19 @@ export async function streamNormalizedWS(ws: WebSocket, req: HttpRequest) {
|
|
|
86
86
|
// handle backpressure in case of slow clients
|
|
87
87
|
while ((bufferedAmount = ws.getBufferedAmount()) > 0) {
|
|
88
88
|
retries += 1
|
|
89
|
-
|
|
89
|
+
const isState = new Date().valueOf() - message.localTimestamp.valueOf() >= 6
|
|
90
90
|
|
|
91
|
-
|
|
92
|
-
|
|
91
|
+
// log stale messages, stale meaning message was not sent in 6 ms or more (2 retries)
|
|
92
|
+
|
|
93
|
+
if (isState) {
|
|
94
|
+
debug('Slow client, waiting %d ms, buffered amount: %d', 3 * retries, bufferedAmount)
|
|
93
95
|
}
|
|
94
|
-
if (retries >
|
|
96
|
+
if (retries > 300) {
|
|
95
97
|
ws.end(1008, 'Too much backpressure')
|
|
96
98
|
return
|
|
97
99
|
}
|
|
100
|
+
|
|
101
|
+
await wait(3 * retries)
|
|
98
102
|
}
|
|
99
103
|
|
|
100
104
|
ws.send(JSON.stringify(message))
|