@furystack/websocket-api 9.0.10 → 9.0.12
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/esm/actions/whoami.js +4 -1
- package/esm/actions/whoami.js.map +1 -1
- package/esm/helpers.js +1 -1
- package/esm/helpers.js.map +1 -1
- package/esm/websocket-api-settings.js +6 -6
- package/esm/websocket-api-settings.js.map +1 -1
- package/esm/websocket-api.js +8 -6
- package/esm/websocket-api.js.map +1 -1
- package/esm/websocket-user-context.js +3 -1
- package/esm/websocket-user-context.js.map +1 -1
- package/package.json +7 -7
- package/src/helpers.spec.ts +2 -3
- package/src/helpers.ts +1 -1
- package/src/websocket-api.spec.ts +18 -6
- package/src/websocket-integration.spec.ts +11 -1
package/esm/actions/whoami.js
CHANGED
|
@@ -13,7 +13,7 @@ import ws from 'ws';
|
|
|
13
13
|
/**
|
|
14
14
|
* Example action that returns the current user instance
|
|
15
15
|
*/
|
|
16
|
-
|
|
16
|
+
let WhoAmI = class WhoAmI {
|
|
17
17
|
dispose() {
|
|
18
18
|
/** */
|
|
19
19
|
}
|
|
@@ -29,6 +29,8 @@ export let WhoAmI = class WhoAmI {
|
|
|
29
29
|
this.websocket.send(JSON.stringify({ currentUser: null }));
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
|
+
httpUserContext;
|
|
33
|
+
websocket;
|
|
32
34
|
};
|
|
33
35
|
__decorate([
|
|
34
36
|
Injected(HttpUserContext),
|
|
@@ -41,4 +43,5 @@ __decorate([
|
|
|
41
43
|
WhoAmI = __decorate([
|
|
42
44
|
Injectable({ lifetime: 'transient' })
|
|
43
45
|
], WhoAmI);
|
|
46
|
+
export { WhoAmI };
|
|
44
47
|
//# sourceMappingURL=whoami.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../src/actions/whoami.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAExD,OAAO,EAAE,MAAM,IAAI,CAAA;AAInB;;GAEG;AAEI,
|
|
1
|
+
{"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../src/actions/whoami.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAExD,OAAO,EAAE,MAAM,IAAI,CAAA;AAInB;;GAEG;AAEI,IAAM,MAAM,GAAZ,MAAM,MAAM;IACV,OAAO;QACZ,MAAM;IACR,CAAC;IACM,MAAM,CAAC,UAAU,CAAC,OAAiD;QACxE,OAAO,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,gBAAgB,CAAA;IAC7F,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,OAAiD;QACpE,IAAI;YACF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;YAC9E,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAA;SACrD;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;SAC3D;IACH,CAAC;IAGgB,eAAe,CAAkB;IAGjC,SAAS,CAAK;CAChC,CAAA;AAJkB;IADhB,QAAQ,CAAC,eAAe,CAAC;8BACS,eAAe;+CAAA;AAGjC;IADhB,QAAQ,CAAC,EAAE,CAAC;8BACgB,EAAE;yCAAA;AArBpB,MAAM;IADlB,UAAU,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC;GACzB,MAAM,CAsBlB"}
|
package/esm/helpers.js
CHANGED
|
@@ -16,6 +16,6 @@ export const useWebsockets = (injector, settings) => {
|
|
|
16
16
|
const s = new WebSocketApiSettings();
|
|
17
17
|
Object.assign(s, settings);
|
|
18
18
|
injector.setExplicitInstance(s, WebSocketApiSettings);
|
|
19
|
-
injector.getInstance(WebSocketApi)
|
|
19
|
+
injector.getInstance(WebSocketApi);
|
|
20
20
|
};
|
|
21
21
|
//# sourceMappingURL=helpers.js.map
|
package/esm/helpers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAElE;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,QAAkB,EAAE,QAAwC,EAAE,EAAE;IAC5F,MAAM,CAAC,GAAG,IAAI,oBAAoB,EAAE,CAAA;IACpC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAA;IAC1B,QAAQ,CAAC,mBAAmB,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAA;IACrD,QAAQ,CAAC,WAAW,CAAC,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAElE;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,QAAkB,EAAE,QAAwC,EAAE,EAAE;IAC5F,MAAM,CAAC,GAAG,IAAI,oBAAoB,EAAE,CAAA;IACpC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAA;IAC1B,QAAQ,CAAC,mBAAmB,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAA;IACrD,QAAQ,CAAC,WAAW,CAAC,YAAY,CAAC,CAAA;AACpC,CAAC,CAAA"}
|
|
@@ -9,14 +9,14 @@ import { WhoAmI } from './actions/whoami.js';
|
|
|
9
9
|
/**
|
|
10
10
|
* A configuration object for FuryStack WebSocket API
|
|
11
11
|
*/
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
}
|
|
12
|
+
let WebSocketApiSettings = class WebSocketApiSettings {
|
|
13
|
+
port = 19090;
|
|
14
|
+
host;
|
|
15
|
+
path = '/socket';
|
|
16
|
+
actions = [WhoAmI];
|
|
18
17
|
};
|
|
19
18
|
WebSocketApiSettings = __decorate([
|
|
20
19
|
Injectable({ lifetime: 'scoped' })
|
|
21
20
|
], WebSocketApiSettings);
|
|
21
|
+
export { WebSocketApiSettings };
|
|
22
22
|
//# sourceMappingURL=websocket-api-settings.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-api-settings.js","sourceRoot":"","sources":["../src/websocket-api-settings.ts"],"names":[],"mappings":";;;;;;AACA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAG5C;;GAEG;AAEI,
|
|
1
|
+
{"version":3,"file":"websocket-api-settings.js","sourceRoot":"","sources":["../src/websocket-api-settings.ts"],"names":[],"mappings":";;;;;;AACA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAG5C;;GAEG;AAEI,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IACxB,IAAI,GAAG,KAAK,CAAA;IACZ,IAAI,CAAS;IACb,IAAI,GAAG,SAAS,CAAA;IAChB,OAAO,GAAkE,CAAC,MAAM,CAAC,CAAA;CACzF,CAAA;AALY,oBAAoB;IADhC,UAAU,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;GACtB,oBAAoB,CAKhC"}
|
package/esm/websocket-api.js
CHANGED
|
@@ -19,12 +19,13 @@ import { WebsocketUserContext } from './websocket-user-context.js';
|
|
|
19
19
|
/**
|
|
20
20
|
* A WebSocket API implementation for FuryStack
|
|
21
21
|
*/
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
22
|
+
let WebSocketApi = class WebSocketApi {
|
|
23
|
+
socket = new WebSocketServer({ noServer: true });
|
|
24
|
+
clients = new Map();
|
|
25
|
+
settings;
|
|
26
|
+
serverManager;
|
|
27
|
+
injector;
|
|
28
|
+
isInitialized = false;
|
|
28
29
|
init() {
|
|
29
30
|
if (!this.isInitialized) {
|
|
30
31
|
this.socket.on('connection', (websocket, msg) => {
|
|
@@ -99,4 +100,5 @@ __decorate([
|
|
|
99
100
|
WebSocketApi = __decorate([
|
|
100
101
|
Injectable({ lifetime: 'scoped' })
|
|
101
102
|
], WebSocketApi);
|
|
103
|
+
export { WebSocketApi };
|
|
102
104
|
//# sourceMappingURL=websocket-api.js.map
|
package/esm/websocket-api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-api.js","sourceRoot":"","sources":["../src/websocket-api.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAA;AAEzB,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAGlE,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAA;AACpC,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAElE,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAElE;;GAEG;AAEI,
|
|
1
|
+
{"version":3,"file":"websocket-api.js","sourceRoot":"","sources":["../src/websocket-api.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
import { IncomingMessage } from 'http';
|
|
11
11
|
import { Injectable, Injected, Injector } from '@furystack/inject';
|
|
12
12
|
import { HttpUserContext } from '@furystack/rest-service';
|
|
13
|
-
|
|
13
|
+
let WebsocketUserContext = class WebsocketUserContext {
|
|
14
14
|
async isAuthenticated() {
|
|
15
15
|
try {
|
|
16
16
|
return (await this.getCurrentUser()) ? true : false;
|
|
@@ -39,6 +39,7 @@ export let WebsocketUserContext = class WebsocketUserContext {
|
|
|
39
39
|
.authenticateRequest(this.injector.getInstance(IncomingMessage));
|
|
40
40
|
return user;
|
|
41
41
|
}
|
|
42
|
+
injector;
|
|
42
43
|
};
|
|
43
44
|
__decorate([
|
|
44
45
|
Injected(Injector),
|
|
@@ -47,4 +48,5 @@ __decorate([
|
|
|
47
48
|
WebsocketUserContext = __decorate([
|
|
48
49
|
Injectable({ lifetime: 'scoped' })
|
|
49
50
|
], WebsocketUserContext);
|
|
51
|
+
export { WebsocketUserContext };
|
|
50
52
|
//# sourceMappingURL=websocket-user-context.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-user-context.js","sourceRoot":"","sources":["../src/websocket-user-context.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAEtC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAGlD,
|
|
1
|
+
{"version":3,"file":"websocket-user-context.js","sourceRoot":"","sources":["../src/websocket-user-context.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAEtC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAGlD,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IACxB,KAAK,CAAC,eAAe;QAC1B,IAAI;YACF,OAAO,CAAC,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAA;SACpD;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,KAAK,CAAA;SACb;IACH,CAAC;IACM,KAAK,CAAC,YAAY,CAAC,GAAG,KAAe;QAC1C,IAAI;YACF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;YAC/C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACxB,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,EAAE;oBAC9D,OAAO,KAAK,CAAA;iBACb;aACF;YACD,OAAO,IAAI,CAAA;SACZ;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,KAAK,CAAA;SACb;IACH,CAAC;IACM,KAAK,CAAC,cAAc;QACzB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ;aAC7B,WAAW,CAAC,eAAe,CAAC;aAC5B,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,CAAA;QAClE,OAAO,IAAa,CAAA;IACtB,CAAC;IAGgB,QAAQ,CAAW;CACrC,CAAA;AADkB;IADhB,QAAQ,CAAC,QAAQ,CAAC;8BACS,QAAQ;sDAAA;AA7BzB,oBAAoB;IADhC,UAAU,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;GACtB,oBAAoB,CA8BhC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@furystack/websocket-api",
|
|
3
|
-
"version": "9.0.
|
|
3
|
+
"version": "9.0.12",
|
|
4
4
|
"description": "HTTP Api FuryStack package",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"scripts": {
|
|
@@ -34,16 +34,16 @@
|
|
|
34
34
|
},
|
|
35
35
|
"homepage": "https://github.com/furystack/furystack",
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@furystack/core": "^12.0.
|
|
38
|
-
"@furystack/inject": "^8.0
|
|
39
|
-
"@furystack/rest-service": "^7.0.
|
|
40
|
-
"@furystack/utils": "^4.0.
|
|
37
|
+
"@furystack/core": "^12.0.10",
|
|
38
|
+
"@furystack/inject": "^8.1.0",
|
|
39
|
+
"@furystack/rest-service": "^7.0.12",
|
|
40
|
+
"@furystack/utils": "^4.0.9",
|
|
41
41
|
"ws": "^8.13.0"
|
|
42
42
|
},
|
|
43
43
|
"devDependencies": {
|
|
44
44
|
"@types/ws": "^8.5.5",
|
|
45
|
-
"typescript": "^5.
|
|
46
|
-
"vitest": "^0.34.
|
|
45
|
+
"typescript": "^5.2.2",
|
|
46
|
+
"vitest": "^0.34.3"
|
|
47
47
|
},
|
|
48
48
|
"gitHead": "1045d854bfd8c475b7035471d130d401417a2321"
|
|
49
49
|
}
|
package/src/helpers.spec.ts
CHANGED
|
@@ -1,15 +1,14 @@
|
|
|
1
1
|
import { usingAsync } from '@furystack/utils'
|
|
2
2
|
import { Injector } from '@furystack/inject'
|
|
3
3
|
import { useWebsockets } from './helpers'
|
|
4
|
-
import {
|
|
4
|
+
import { WebSocketApiSettings } from '.'
|
|
5
5
|
import { describe, it, expect } from 'vitest'
|
|
6
6
|
|
|
7
7
|
describe('WebSocket Helpers', () => {
|
|
8
|
-
it('Should register the
|
|
8
|
+
it('Should register the settings', async () => {
|
|
9
9
|
await usingAsync(new Injector(), async (i) => {
|
|
10
10
|
useWebsockets(i)
|
|
11
11
|
expect(i.cachedSingletons.has(WebSocketApiSettings)).toBeTruthy()
|
|
12
|
-
expect(i.cachedSingletons.has(WebSocketApi)).toBeTruthy()
|
|
13
12
|
})
|
|
14
13
|
})
|
|
15
14
|
})
|
package/src/helpers.ts
CHANGED
|
@@ -18,5 +18,5 @@ export const useWebsockets = (injector: Injector, settings?: Partial<WebSocketAp
|
|
|
18
18
|
const s = new WebSocketApiSettings()
|
|
19
19
|
Object.assign(s, settings)
|
|
20
20
|
injector.setExplicitInstance(s, WebSocketApiSettings)
|
|
21
|
-
injector.getInstance(WebSocketApi)
|
|
21
|
+
injector.getInstance(WebSocketApi)
|
|
22
22
|
}
|
|
@@ -6,28 +6,39 @@ import type { WebSocketAction } from './models'
|
|
|
6
6
|
import { useWebsockets } from './helpers'
|
|
7
7
|
import { describe, it, expect } from 'vitest'
|
|
8
8
|
|
|
9
|
+
const portGenerator = function* () {
|
|
10
|
+
const initialPort = 19998
|
|
11
|
+
let port = initialPort
|
|
12
|
+
while (true) {
|
|
13
|
+
yield port++
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
const getPort = () => portGenerator().next().value
|
|
18
|
+
|
|
9
19
|
describe('WebSocketApi', () => {
|
|
10
20
|
it('Should be built', async () => {
|
|
11
21
|
await usingAsync(new Injector(), async (i) => {
|
|
12
|
-
useWebsockets(i, { port:
|
|
22
|
+
useWebsockets(i, { port: getPort() })
|
|
13
23
|
expect(i.getInstance(WebSocketApi)).toBeInstanceOf(WebSocketApi)
|
|
14
24
|
})
|
|
15
25
|
})
|
|
16
26
|
it('Should be built with settings', async () => {
|
|
17
27
|
await usingAsync(new Injector(), async (i) => {
|
|
18
|
-
useWebsockets(i, { path: '/web-socket', port:
|
|
28
|
+
useWebsockets(i, { path: '/web-socket', port: getPort() })
|
|
19
29
|
expect(i.getInstance(WebSocketApi)).toBeInstanceOf(WebSocketApi)
|
|
20
30
|
})
|
|
21
31
|
})
|
|
22
32
|
|
|
23
33
|
it('Should broadcast messages', async () => {
|
|
34
|
+
const port = getPort()
|
|
24
35
|
await usingAsync(new Injector(), async (i) => {
|
|
25
36
|
expect.assertions(4) // All 4 clients should receive the message
|
|
26
|
-
useWebsockets(i, { path: '/web-socket', port
|
|
37
|
+
useWebsockets(i, { path: '/web-socket', port })
|
|
27
38
|
const api = i.getInstance(WebSocketApi)
|
|
28
39
|
await Promise.all(
|
|
29
40
|
[1, 2, 3, 4, 5].map(async (idx) => {
|
|
30
|
-
const client = new WebSocket(
|
|
41
|
+
const client = new WebSocket(`ws://localhost:${port}/web-socket`)
|
|
31
42
|
await new Promise<void>((resolve) =>
|
|
32
43
|
client.once('open', () => {
|
|
33
44
|
if (idx === 5) {
|
|
@@ -51,6 +62,7 @@ describe('WebSocketApi', () => {
|
|
|
51
62
|
})
|
|
52
63
|
|
|
53
64
|
it('Should receive client messages', async () => {
|
|
65
|
+
const port = getPort()
|
|
54
66
|
await usingAsync(new Injector(), async (i) => {
|
|
55
67
|
expect.assertions(1)
|
|
56
68
|
const data = { value: 'alma' }
|
|
@@ -68,8 +80,8 @@ describe('WebSocketApi', () => {
|
|
|
68
80
|
}
|
|
69
81
|
}
|
|
70
82
|
|
|
71
|
-
useWebsockets(i, { path: '/web-socket', port
|
|
72
|
-
const client = new WebSocket(
|
|
83
|
+
useWebsockets(i, { path: '/web-socket', port, actions: [ExampleWsAction] })
|
|
84
|
+
const client = new WebSocket(`ws://localhost:${port}/web-socket`)
|
|
73
85
|
await new Promise<void>((resolve) => client.once('open', () => resolve()))
|
|
74
86
|
|
|
75
87
|
await new Promise<void>((resolve, reject) =>
|
|
@@ -7,15 +7,25 @@ import { useRestService } from '@furystack/rest-service'
|
|
|
7
7
|
import { useWebsockets } from './helpers'
|
|
8
8
|
import { describe, it, expect, beforeEach, afterEach } from 'vitest'
|
|
9
9
|
|
|
10
|
+
const portGenerator = function* () {
|
|
11
|
+
const initialPort = 19000
|
|
12
|
+
let port = initialPort
|
|
13
|
+
while (true) {
|
|
14
|
+
yield port++
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
const getPort = () => portGenerator().next().value
|
|
19
|
+
|
|
10
20
|
describe('WebSocket Integration tests', () => {
|
|
11
21
|
const host = 'localhost'
|
|
12
|
-
const port = 9999
|
|
13
22
|
const path = '/ws'
|
|
14
23
|
let i!: Injector
|
|
15
24
|
let client: ws
|
|
16
25
|
|
|
17
26
|
beforeEach(async () => {
|
|
18
27
|
i = new Injector()
|
|
28
|
+
const port = getPort()
|
|
19
29
|
useRestService({
|
|
20
30
|
injector: i,
|
|
21
31
|
api: {},
|