@flexent/ws-proxy 2.14.0 → 2.15.0
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.
- package/out/main/util/pipe.js +20 -7
- package/out/main/util/pipe.js.map +1 -1
- package/out/test/pipe.test.d.ts +1 -0
- package/out/test/pipe.test.js +23 -0
- package/out/test/pipe.test.js.map +1 -0
- package/out/test/ws-proxy.test.js +24 -1
- package/out/test/ws-proxy.test.js.map +1 -1
- package/package.json +1 -1
package/out/main/util/pipe.js
CHANGED
|
@@ -1,16 +1,29 @@
|
|
|
1
1
|
export function pipeBidirectional(left, right) {
|
|
2
|
-
|
|
3
|
-
const
|
|
4
|
-
|
|
2
|
+
let cleaned = false;
|
|
3
|
+
const cleanup = () => {
|
|
4
|
+
if (cleaned) {
|
|
5
|
+
return;
|
|
6
|
+
}
|
|
7
|
+
cleaned = true;
|
|
5
8
|
left.off('error', onLeftError);
|
|
6
9
|
right.off('error', onRightError);
|
|
7
|
-
left.off('close',
|
|
8
|
-
right.off('close',
|
|
10
|
+
left.off('close', onLeftGone);
|
|
11
|
+
right.off('close', onRightGone);
|
|
12
|
+
left.off('end', onLeftGone);
|
|
13
|
+
right.off('end', onRightGone);
|
|
9
14
|
};
|
|
15
|
+
const onLeftGone = () => destroyQuietly(right);
|
|
16
|
+
const onRightGone = () => destroyQuietly(left);
|
|
17
|
+
const onLeftError = (error) => destroyQuietly(right, error);
|
|
18
|
+
const onRightError = (error) => destroyQuietly(left, error);
|
|
10
19
|
left.on('error', onLeftError);
|
|
11
20
|
right.on('error', onRightError);
|
|
12
|
-
left.on('close',
|
|
13
|
-
right.on('close',
|
|
21
|
+
left.on('close', onLeftGone);
|
|
22
|
+
right.on('close', onRightGone);
|
|
23
|
+
left.on('end', onLeftGone);
|
|
24
|
+
right.on('end', onRightGone);
|
|
25
|
+
left.once('close', cleanup);
|
|
26
|
+
right.once('close', cleanup);
|
|
14
27
|
left.pipe(right, { end: false });
|
|
15
28
|
right.pipe(left, { end: false });
|
|
16
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipe.js","sourceRoot":"","sources":["../../../src/main/util/pipe.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,iBAAiB,CAAC,IAAY,EAAE,KAAa;IACzD,MAAM,WAAW,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"pipe.js","sourceRoot":"","sources":["../../../src/main/util/pipe.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,iBAAiB,CAAC,IAAY,EAAE,KAAa;IACzD,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,MAAM,OAAO,GAAG,GAAG,EAAE;QACjB,IAAI,OAAO,EAAE,CAAC;YACV,OAAO;QACX,CAAC;QACD,OAAO,GAAG,IAAI,CAAC;QACf,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAC/B,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QACjC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC9B,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAChC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAC5B,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IAClC,CAAC,CAAC;IACF,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAC/C,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,WAAW,GAAG,CAAC,KAAY,EAAE,EAAE,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACnE,MAAM,YAAY,GAAG,CAAC,KAAY,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACnE,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC9B,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAChC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC/B,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IAC3B,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IAC7B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC5B,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC7B,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;IACjC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,cAAc,CAAC,MAAc,EAAE,KAAa;IACjD,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;QACpB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;AACL,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import assert from 'node:assert/strict';
|
|
2
|
+
import { once } from 'node:events';
|
|
3
|
+
import { PassThrough } from 'node:stream';
|
|
4
|
+
import { pipeBidirectional } from '../main/util/pipe.js';
|
|
5
|
+
describe('pipeBidirectional', () => {
|
|
6
|
+
it('destroys the peer when the left side ends', async () => {
|
|
7
|
+
const left = new PassThrough();
|
|
8
|
+
const right = new PassThrough();
|
|
9
|
+
pipeBidirectional(left, right);
|
|
10
|
+
left.end();
|
|
11
|
+
await once(right, 'close');
|
|
12
|
+
assert.equal(right.destroyed, true);
|
|
13
|
+
});
|
|
14
|
+
it('destroys the peer when the right side ends', async () => {
|
|
15
|
+
const left = new PassThrough();
|
|
16
|
+
const right = new PassThrough();
|
|
17
|
+
pipeBidirectional(left, right);
|
|
18
|
+
right.end();
|
|
19
|
+
await once(left, 'close');
|
|
20
|
+
assert.equal(left.destroyed, true);
|
|
21
|
+
});
|
|
22
|
+
});
|
|
23
|
+
//# sourceMappingURL=pipe.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pipe.test.js","sourceRoot":"","sources":["../../src/test/pipe.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAE/B,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;QACvD,MAAM,IAAI,GAAG,IAAI,WAAW,EAAE,CAAC;QAC/B,MAAM,KAAK,GAAG,IAAI,WAAW,EAAE,CAAC;QAChC,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC/B,IAAI,CAAC,GAAG,EAAE,CAAC;QACX,MAAM,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC3B,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QACxD,MAAM,IAAI,GAAG,IAAI,WAAW,EAAE,CAAC;QAC/B,MAAM,KAAK,GAAG,IAAI,WAAW,EAAE,CAAC;QAChC,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC/B,KAAK,CAAC,GAAG,EAAE,CAAC;QACZ,MAAM,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import assert from 'node:assert/strict';
|
|
2
|
+
import { once } from 'node:events';
|
|
2
3
|
import { PassThrough } from 'node:stream';
|
|
3
4
|
import { WsProxy } from '../main/WsProxy.js';
|
|
4
5
|
describe('WsProxy', () => {
|
|
@@ -35,11 +36,33 @@ describe('WsProxy', () => {
|
|
|
35
36
|
assert.match(payload, /Host: host\.example\r\n/i);
|
|
36
37
|
assert.match(payload, /Sec-Websocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n/i);
|
|
37
38
|
});
|
|
39
|
+
it('destroys outbound when the client disconnects', async () => {
|
|
40
|
+
const outbound = new PassThrough();
|
|
41
|
+
const proxy = new TestProxy(outbound);
|
|
42
|
+
const socket = new PassThrough();
|
|
43
|
+
proxy.onUpgrade({
|
|
44
|
+
method: 'GET',
|
|
45
|
+
httpVersion: '1.1',
|
|
46
|
+
headers: {
|
|
47
|
+
upgrade: 'websocket',
|
|
48
|
+
connection: 'Upgrade',
|
|
49
|
+
'sec-websocket-key': 'dGhlIHNhbXBsZSBub25jZQ==',
|
|
50
|
+
},
|
|
51
|
+
}, socket, Buffer.alloc(0));
|
|
52
|
+
await once(outbound, 'data');
|
|
53
|
+
socket.end();
|
|
54
|
+
await once(outbound, 'close');
|
|
55
|
+
assert.equal(outbound.destroyed, true);
|
|
56
|
+
});
|
|
38
57
|
});
|
|
39
58
|
class TestProxy extends WsProxy {
|
|
59
|
+
constructor(outbound = new PassThrough()) {
|
|
60
|
+
super();
|
|
61
|
+
this.outbound = outbound;
|
|
62
|
+
}
|
|
40
63
|
async processConnection() {
|
|
41
64
|
return {
|
|
42
|
-
outbound:
|
|
65
|
+
outbound: this.outbound,
|
|
43
66
|
upgrade: { path: '/' },
|
|
44
67
|
};
|
|
45
68
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-proxy.test.js","sourceRoot":"","sources":["../../src/test/ws-proxy.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"ws-proxy.test.js","sourceRoot":"","sources":["../../src/test/ws-proxy.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAEnC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IAErB,EAAE,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;QACpD,MAAM,KAAK,GAAG,IAAI,SAAS,EAAE,CAAC;QAC9B,MAAM,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;QACjC,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QAC/C,KAAK,CAAC,SAAS,CAAC;YACZ,MAAM,EAAE,KAAK;YACb,OAAO,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE;SACrB,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/C,MAAM,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACtE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC1C,MAAM,KAAK,GAAG,IAAI,SAAS,EAAE,CAAC;QAC9B,MAAM,OAAO,GAAG,KAAK,CAAC,YAAY,CAAC;YAC/B,MAAM,EAAE,KAAK;YACb,WAAW,EAAE,KAAK;YAClB,GAAG,EAAE,sBAAsB;YAC3B,OAAO,EAAE;gBACL,IAAI,EAAE,iBAAiB;gBACvB,OAAO,EAAE,WAAW;gBACpB,UAAU,EAAE,SAAS;gBACrB,mBAAmB,EAAE,0BAA0B;gBAC/C,uBAAuB,EAAE,IAAI;aAChC;SACe,EAAE;YAClB,IAAI,EAAE,gBAAgB;YACtB,IAAI,EAAE,cAAc;SACvB,CAAC,CAAC;QACH,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,sCAAsC,CAAC,CAAC;QAC9D,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,0BAA0B,CAAC,CAAC;QAClD,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,kDAAkD,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;QAC3D,MAAM,QAAQ,GAAG,IAAI,WAAW,EAAE,CAAC;QACnC,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC,QAAQ,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;QACjC,KAAK,CAAC,SAAS,CAAC;YACZ,MAAM,EAAE,KAAK;YACb,WAAW,EAAE,KAAK;YAClB,OAAO,EAAE;gBACL,OAAO,EAAE,WAAW;gBACpB,UAAU,EAAE,SAAS;gBACrB,mBAAmB,EAAE,0BAA0B;aAClD;SACe,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/C,MAAM,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC7B,MAAM,CAAC,GAAG,EAAE,CAAC;QACb,MAAM,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC9B,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC,CAAC;AAEH,MAAM,SAAU,SAAQ,OAAO;IAE3B,YAA6B,WAAW,IAAI,WAAW,EAAE;QACrD,KAAK,EAAE,CAAC;QADiB,aAAQ,GAAR,QAAQ,CAAoB;IAEzD,CAAC;IAES,KAAK,CAAC,iBAAiB;QAC7B,OAAO;YACH,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE;SACzB,CAAC;IACN,CAAC;IAED,YAAY,CAAC,OAAwB,EAAE,OAAwC;QAC3E,OAAO,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzD,CAAC;CAEJ"}
|