@furystack/websocket-api 12.0.6 → 13.0.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/README.md +1 -1
- package/esm/actions/whoami.d.ts +2 -5
- package/esm/actions/whoami.d.ts.map +1 -1
- package/esm/actions/whoami.js +2 -2
- package/esm/actions/whoami.js.map +1 -1
- package/esm/helpers.d.ts.map +1 -1
- package/esm/helpers.spec.js +5 -5
- package/esm/helpers.spec.js.map +1 -1
- package/esm/models/websocket-action.d.ts +1 -5
- package/esm/models/websocket-action.d.ts.map +1 -1
- package/esm/websocket-api.d.ts +4 -9
- package/esm/websocket-api.d.ts.map +1 -1
- package/esm/websocket-api.js +6 -7
- package/esm/websocket-api.js.map +1 -1
- package/esm/websocket-api.spec.js +7 -7
- package/esm/websocket-api.spec.js.map +1 -1
- package/esm/websocket-integration.spec.js +6 -7
- package/esm/websocket-integration.spec.js.map +1 -1
- package/package.json +8 -8
- package/src/actions/whoami.ts +3 -3
- package/src/helpers.spec.ts +5 -5
- package/src/models/websocket-action.ts +1 -2
- package/src/websocket-api.spec.ts +10 -10
- package/src/websocket-api.ts +11 -12
- package/src/websocket-integration.spec.ts +12 -7
package/README.md
CHANGED
|
@@ -27,7 +27,7 @@ import { IWebSocketAction } from '../models/IWebSocketAction'
|
|
|
27
27
|
|
|
28
28
|
@Injectable({ lifetime: 'transient' })
|
|
29
29
|
export class WhoAmI implements WebSocketAction {
|
|
30
|
-
public dispose() {
|
|
30
|
+
public [Symbol.dispose]() {
|
|
31
31
|
/** */
|
|
32
32
|
}
|
|
33
33
|
public static canExecute(data: Data): boolean {
|
package/esm/actions/whoami.d.ts
CHANGED
|
@@ -1,14 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
/// <reference path="../../../rest-service/esm/server-response-extensions.d.ts" />
|
|
3
|
-
/// <reference types="node/http.js" />
|
|
1
|
+
import type { IncomingMessage } from 'http';
|
|
4
2
|
import type { Data, WebSocket } from 'ws';
|
|
5
3
|
import type { WebSocketAction } from '../models/websocket-action.js';
|
|
6
|
-
import type { IncomingMessage } from 'http';
|
|
7
4
|
/**
|
|
8
5
|
* Example action that returns the current user instance
|
|
9
6
|
*/
|
|
10
7
|
export declare class WhoAmI implements WebSocketAction {
|
|
11
|
-
dispose(): void;
|
|
8
|
+
[Symbol.dispose](): void;
|
|
12
9
|
static canExecute(options: {
|
|
13
10
|
data: Data;
|
|
14
11
|
request: IncomingMessage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whoami.d.ts","sourceRoot":"","sources":["../../src/actions/whoami.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"whoami.d.ts","sourceRoot":"","sources":["../../src/actions/whoami.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAC3C,OAAO,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,IAAI,CAAA;AACzC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAEpE;;GAEG;AACH,qBACa,MAAO,YAAW,eAAe;IACrC,CAAC,MAAM,CAAC,OAAO,CAAC;WAGT,UAAU,CAAC,OAAO,EAAE;QAAE,IAAI,EAAE,IAAI,CAAC;QAAC,OAAO,EAAE,eAAe,CAAA;KAAE,GAAG,OAAO;IAavE,OAAO,CAAC,OAAO,EAAE;QAAE,IAAI,EAAE,IAAI,CAAC;QAAC,OAAO,EAAE,eAAe,CAAC;QAAC,MAAM,EAAE,SAAS,CAAA;KAAE;IASzF,iBACyB,eAAe,CAAiB;CAC1D"}
|
package/esm/actions/whoami.js
CHANGED
|
@@ -7,13 +7,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
|
-
import { HttpUserContext } from '@furystack/rest-service';
|
|
11
10
|
import { Injectable, Injected } from '@furystack/inject';
|
|
11
|
+
import { HttpUserContext } from '@furystack/rest-service';
|
|
12
12
|
/**
|
|
13
13
|
* Example action that returns the current user instance
|
|
14
14
|
*/
|
|
15
15
|
let WhoAmI = class WhoAmI {
|
|
16
|
-
dispose() {
|
|
16
|
+
[Symbol.dispose]() {
|
|
17
17
|
/** */
|
|
18
18
|
}
|
|
19
19
|
static canExecute(options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../src/actions/whoami.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../src/actions/whoami.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAKzD;;GAEG;AAEI,IAAM,MAAM,GAAZ,MAAM,MAAM;IACV,CAAC,MAAM,CAAC,OAAO,CAAC;QACrB,MAAM;IACR,CAAC;IACM,MAAM,CAAC,UAAU,CAAC,OAAiD;QACxE,MAAM,gBAAgB,GACpB,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ;YAC9B,CAAC,CAAC,OAAO,CAAC,IAAI;YACd,CAAC,CAAC,OAAO,CAAC,IAAI,YAAY,MAAM;gBAC9B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE;gBACzB,CAAC,CAAC,OAAO,CAAC,IAAI,YAAY,WAAW;oBACnC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;oBACtC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAE5D,OAAO,gBAAgB,KAAK,QAAQ,IAAI,gBAAgB,KAAK,gBAAgB,CAAA;IAC/E,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,OAAoE;QACvF,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;YAC9E,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAA;QACtD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;QAC5D,CAAC;IACH,CAAC;CAIF,CAAA;AAD0B;IADxB,QAAQ,CAAC,eAAe,CAAC;8BACgB,eAAe;+CAAA;AA3B9C,MAAM;IADlB,UAAU,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC;GACzB,MAAM,CA4BlB"}
|
package/esm/helpers.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAEjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAElE;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,aAAa,aAAc,QAAQ,aAAa,
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAEjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAElE;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,aAAa,aAAc,QAAQ,aAAa,OAAO,CAAC,oBAAoB,CAAC,SAKzF,CAAA"}
|
package/esm/helpers.spec.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getPort } from '@furystack/core/port-generator';
|
|
2
2
|
import { Injector } from '@furystack/inject';
|
|
3
|
+
import { usingAsync } from '@furystack/utils';
|
|
4
|
+
import { describe, expect, it } from 'vitest';
|
|
3
5
|
import { useWebsockets } from './helpers.js';
|
|
4
|
-
import { describe, it, expect } from 'vitest';
|
|
5
6
|
import { WebSocketApiSettings } from './websocket-api-settings.js';
|
|
6
|
-
import { getPort } from '@furystack/core/port-generator';
|
|
7
7
|
describe('WebSocket Helpers', () => {
|
|
8
|
-
it('Should register the settings', () => {
|
|
9
|
-
|
|
8
|
+
it('Should register the settings', async () => {
|
|
9
|
+
await usingAsync(new Injector(), async (i) => {
|
|
10
10
|
const port = getPort();
|
|
11
11
|
useWebsockets(i, { port });
|
|
12
12
|
const settings = i.getInstance(WebSocketApiSettings);
|
package/esm/helpers.spec.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.spec.js","sourceRoot":"","sources":["../src/helpers.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"helpers.spec.js","sourceRoot":"","sources":["../src/helpers.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAA;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAElE,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,EAAE,CAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;QAC5C,MAAM,UAAU,CAAC,IAAI,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;YAC3C,MAAM,IAAI,GAAG,OAAO,EAAE,CAAA;YACtB,aAAa,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;YAC1B,MAAM,QAAQ,GAAG,CAAC,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAA;YACpD,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAChC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QACvC,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
|
@@ -1,9 +1,5 @@
|
|
|
1
|
-
/// <reference path="../../../rest-service/esm/incoming-message-extensions.d.ts" />
|
|
2
|
-
/// <reference path="../../../rest-service/esm/server-response-extensions.d.ts" />
|
|
3
|
-
/// <reference types="node/http.js" />
|
|
4
|
-
import type { Disposable } from '@furystack/utils';
|
|
5
|
-
import type { Data, WebSocket } from 'ws';
|
|
6
1
|
import type { IncomingMessage } from 'http';
|
|
2
|
+
import type { Data, WebSocket } from 'ws';
|
|
7
3
|
/**
|
|
8
4
|
* Static methods of a WebSocket Action
|
|
9
5
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-action.d.ts","sourceRoot":"","sources":["../../src/models/websocket-action.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"websocket-action.d.ts","sourceRoot":"","sources":["../../src/models/websocket-action.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAC3C,OAAO,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,IAAI,CAAA;AAEzC;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,UAAU,CAAC,OAAO,EAAE;QAAE,IAAI,EAAE,IAAI,CAAC;QAAC,OAAO,EAAE,eAAe,CAAC;QAAC,MAAM,EAAE,SAAS,CAAA;KAAE,GAAG,OAAO,CAAA;CAC1F;AAED;;GAEG;AACH,MAAM,WAAW,eAAgB,SAAQ,UAAU;IACjD,OAAO,CAAC,OAAO,EAAE;QAAE,IAAI,EAAE,IAAI,CAAC;QAAC,OAAO,EAAE,eAAe,CAAC;QAAC,MAAM,EAAE,SAAS,CAAA;KAAE,GAAG,IAAI,CAAA;CACpF"}
|
package/esm/websocket-api.d.ts
CHANGED
|
@@ -1,17 +1,12 @@
|
|
|
1
|
-
/// <reference path="../../rest-service/esm/incoming-message-extensions.d.ts" />
|
|
2
|
-
/// <reference path="../../rest-service/esm/server-response-extensions.d.ts" />
|
|
3
|
-
/// <reference types="node/http.js" />
|
|
4
|
-
/// <reference types="node/http.js" />
|
|
5
|
-
import { IncomingMessage } from 'http';
|
|
6
1
|
import type { Injector } from '@furystack/inject';
|
|
7
|
-
import {
|
|
8
|
-
import type { Data } from 'ws';
|
|
2
|
+
import { IncomingMessage } from 'http';
|
|
9
3
|
import type WebSocket from 'ws';
|
|
4
|
+
import type { Data } from 'ws';
|
|
10
5
|
import ws from 'ws';
|
|
11
6
|
/**
|
|
12
7
|
* A WebSocket API implementation for FuryStack
|
|
13
8
|
*/
|
|
14
|
-
export declare class WebSocketApi implements
|
|
9
|
+
export declare class WebSocketApi implements AsyncDisposable {
|
|
15
10
|
readonly socket: WebSocket.Server<typeof WebSocket, typeof IncomingMessage>;
|
|
16
11
|
private clients;
|
|
17
12
|
private readonly settings;
|
|
@@ -19,7 +14,7 @@ export declare class WebSocketApi implements Disposable {
|
|
|
19
14
|
private readonly injector;
|
|
20
15
|
private isInitialized;
|
|
21
16
|
init(): Promise<void>;
|
|
22
|
-
|
|
17
|
+
[Symbol.asyncDispose](): Promise<void>;
|
|
23
18
|
broadcast(callback: (options: {
|
|
24
19
|
injector: Injector;
|
|
25
20
|
ws: ws;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-api.d.ts","sourceRoot":"","sources":["../src/websocket-api.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"websocket-api.d.ts","sourceRoot":"","sources":["../src/websocket-api.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAIjD,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAGtC,OAAO,KAAK,SAAS,MAAM,IAAI,CAAA;AAC/B,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,IAAI,CAAA;AAC9B,OAAO,EAAuB,MAAM,IAAI,CAAA;AAIxC;;GAEG;AACH,qBACa,YAAa,YAAW,eAAe;IAClD,SAAgB,MAAM,6DAA0C;IAEhE,OAAO,CAAC,OAAO,CAA0E;IAEzF,iBACyB,QAAQ,CAAsB;IAEvD,iBACyB,aAAa,CAAe;IAErD,iBAAyB,QAAQ,CAAU;IAE3C,OAAO,CAAC,aAAa,CAAQ;IAChB,IAAI;IA2CJ,CAAC,MAAM,CAAC,YAAY,CAAC;IAMrB,SAAS,CACpB,QAAQ,EAAE,CAAC,OAAO,EAAE;QAAE,QAAQ,EAAE,QAAQ,CAAC;QAAC,EAAE,EAAE,EAAE,CAAC;QAAC,OAAO,EAAE,eAAe,CAAA;KAAE,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBhG,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS;CAQ3F"}
|
package/esm/websocket-api.js
CHANGED
|
@@ -7,15 +7,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
|
-
import {
|
|
11
|
-
import { IncomingMessage } from 'http';
|
|
12
|
-
import { HttpUserContext, ServerManager } from '@furystack/rest-service';
|
|
10
|
+
import { AggregatedError, IdentityContext } from '@furystack/core';
|
|
13
11
|
import { Injectable, Injected } from '@furystack/inject';
|
|
12
|
+
import { HttpUserContext, ServerManager } from '@furystack/rest-service';
|
|
14
13
|
import { using } from '@furystack/utils';
|
|
15
|
-
import {
|
|
16
|
-
import
|
|
14
|
+
import { IncomingMessage } from 'http';
|
|
15
|
+
import { URL } from 'url';
|
|
16
|
+
import ws, { WebSocketServer } from 'ws';
|
|
17
17
|
import { WebSocketApiSettings } from './websocket-api-settings.js';
|
|
18
|
-
import { AggregatedError, IdentityContext } from '@furystack/core';
|
|
19
18
|
/**
|
|
20
19
|
* A WebSocket API implementation for FuryStack
|
|
21
20
|
*/
|
|
@@ -60,7 +59,7 @@ let WebSocketApi = class WebSocketApi {
|
|
|
60
59
|
throw Error('WebSocket API is already initialized');
|
|
61
60
|
}
|
|
62
61
|
}
|
|
63
|
-
async
|
|
62
|
+
async [Symbol.asyncDispose]() {
|
|
64
63
|
this.socket.clients.forEach((client) => client.close());
|
|
65
64
|
this.socket.clients.forEach((client) => client.terminate());
|
|
66
65
|
await new Promise((resolve, reject) => this.socket.close((err) => (err ? reject(err) : resolve())));
|
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,
|
|
1
|
+
{"version":3,"file":"websocket-api.js","sourceRoot":"","sources":["../src/websocket-api.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,15 +4,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
4
4
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
5
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
6
|
};
|
|
7
|
-
import {
|
|
7
|
+
import { InMemoryStore, User, addStore } from '@furystack/core';
|
|
8
|
+
import { getPort } from '@furystack/core/port-generator';
|
|
9
|
+
import { Injectable, Injector } from '@furystack/inject';
|
|
10
|
+
import { DefaultSession } from '@furystack/rest-service';
|
|
8
11
|
import { usingAsync } from '@furystack/utils';
|
|
9
|
-
import {
|
|
12
|
+
import { describe, expect, it } from 'vitest';
|
|
10
13
|
import { WebSocket } from 'ws';
|
|
11
14
|
import { useWebsockets } from './helpers.js';
|
|
12
|
-
import {
|
|
13
|
-
import { getPort } from '@furystack/core/port-generator';
|
|
14
|
-
import { InMemoryStore, User, addStore } from '@furystack/core';
|
|
15
|
-
import { DefaultSession } from '@furystack/rest-service';
|
|
15
|
+
import { WebSocketApi } from './websocket-api.js';
|
|
16
16
|
describe('WebSocketApi', () => {
|
|
17
17
|
it('Should be built', async () => {
|
|
18
18
|
await usingAsync(new Injector(), async (i) => {
|
|
@@ -58,7 +58,7 @@ describe('WebSocketApi', () => {
|
|
|
58
58
|
expect.assertions(1);
|
|
59
59
|
const data = { value: 'alma' };
|
|
60
60
|
let ExampleWsAction = class ExampleWsAction {
|
|
61
|
-
dispose() {
|
|
61
|
+
[Symbol.dispose]() {
|
|
62
62
|
/** */
|
|
63
63
|
}
|
|
64
64
|
static canExecute() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-api.spec.js","sourceRoot":"","sources":["../src/websocket-api.spec.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"websocket-api.spec.js","sourceRoot":"","sources":["../src/websocket-api.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,11 @@
|
|
|
1
|
+
import { addStore, InMemoryStore, StoreManager, User } from '@furystack/core';
|
|
2
|
+
import { getPort } from '@furystack/core/port-generator';
|
|
1
3
|
import { Injector } from '@furystack/inject';
|
|
2
|
-
import {
|
|
4
|
+
import { DefaultSession, HttpUserContext, ServerManager, useHttpAuthentication, useRestService, } from '@furystack/rest-service';
|
|
5
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
|
3
6
|
import { WebSocket } from 'ws';
|
|
4
|
-
import {
|
|
5
|
-
import { DefaultSession, HttpUserContext, ServerManager, useHttpAuthentication } from '@furystack/rest-service';
|
|
6
|
-
import { useRestService } from '@furystack/rest-service';
|
|
7
|
+
import { WhoAmI } from './actions/whoami.js';
|
|
7
8
|
import { useWebsockets } from './helpers.js';
|
|
8
|
-
import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
|
|
9
|
-
import { getPort } from '@furystack/core/port-generator';
|
|
10
9
|
describe('WebSocket Integration tests', () => {
|
|
11
10
|
const host = 'localhost';
|
|
12
11
|
const path = '/ws';
|
|
@@ -41,7 +40,7 @@ describe('WebSocket Integration tests', () => {
|
|
|
41
40
|
});
|
|
42
41
|
});
|
|
43
42
|
afterEach(async () => {
|
|
44
|
-
await i.
|
|
43
|
+
await i[Symbol.asyncDispose]();
|
|
45
44
|
});
|
|
46
45
|
const getWhoAmIResult = async (subjectClient) => {
|
|
47
46
|
return new Promise((resolve, reject) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-integration.spec.js","sourceRoot":"","sources":["../src/websocket-integration.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"websocket-integration.spec.js","sourceRoot":"","sources":["../src/websocket-integration.spec.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@furystack/websocket-api",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "13.0.0",
|
|
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": "^
|
|
38
|
-
"@furystack/inject": "^
|
|
39
|
-
"@furystack/rest-service": "^
|
|
40
|
-
"@furystack/utils": "^
|
|
41
|
-
"ws": "^8.
|
|
37
|
+
"@furystack/core": "^15.0.0",
|
|
38
|
+
"@furystack/inject": "^12.0.0",
|
|
39
|
+
"@furystack/rest-service": "^10.0.0",
|
|
40
|
+
"@furystack/utils": "^8.0.0",
|
|
41
|
+
"ws": "^8.18.0"
|
|
42
42
|
},
|
|
43
43
|
"devDependencies": {
|
|
44
44
|
"@types/ws": "^8.5.10",
|
|
45
|
-
"typescript": "^5.
|
|
46
|
-
"vitest": "^
|
|
45
|
+
"typescript": "^5.5.3",
|
|
46
|
+
"vitest": "^2.0.0"
|
|
47
47
|
},
|
|
48
48
|
"gitHead": "1045d854bfd8c475b7035471d130d401417a2321"
|
|
49
49
|
}
|
package/src/actions/whoami.ts
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import { HttpUserContext } from '@furystack/rest-service'
|
|
2
1
|
import { Injectable, Injected } from '@furystack/inject'
|
|
2
|
+
import { HttpUserContext } from '@furystack/rest-service'
|
|
3
|
+
import type { IncomingMessage } from 'http'
|
|
3
4
|
import type { Data, WebSocket } from 'ws'
|
|
4
5
|
import type { WebSocketAction } from '../models/websocket-action.js'
|
|
5
|
-
import type { IncomingMessage } from 'http'
|
|
6
6
|
|
|
7
7
|
/**
|
|
8
8
|
* Example action that returns the current user instance
|
|
9
9
|
*/
|
|
10
10
|
@Injectable({ lifetime: 'transient' })
|
|
11
11
|
export class WhoAmI implements WebSocketAction {
|
|
12
|
-
public dispose() {
|
|
12
|
+
public [Symbol.dispose]() {
|
|
13
13
|
/** */
|
|
14
14
|
}
|
|
15
15
|
public static canExecute(options: { data: Data; request: IncomingMessage }): boolean {
|
package/src/helpers.spec.ts
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getPort } from '@furystack/core/port-generator'
|
|
2
2
|
import { Injector } from '@furystack/inject'
|
|
3
|
+
import { usingAsync } from '@furystack/utils'
|
|
4
|
+
import { describe, expect, it } from 'vitest'
|
|
3
5
|
import { useWebsockets } from './helpers.js'
|
|
4
|
-
import { describe, it, expect } from 'vitest'
|
|
5
6
|
import { WebSocketApiSettings } from './websocket-api-settings.js'
|
|
6
|
-
import { getPort } from '@furystack/core/port-generator'
|
|
7
7
|
|
|
8
8
|
describe('WebSocket Helpers', () => {
|
|
9
|
-
it('Should register the settings', () => {
|
|
10
|
-
|
|
9
|
+
it('Should register the settings', async () => {
|
|
10
|
+
await usingAsync(new Injector(), async (i) => {
|
|
11
11
|
const port = getPort()
|
|
12
12
|
useWebsockets(i, { port })
|
|
13
13
|
const settings = i.getInstance(WebSocketApiSettings)
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { InMemoryStore, User, addStore } from '@furystack/core'
|
|
2
|
+
import { getPort } from '@furystack/core/port-generator'
|
|
3
|
+
import { Injectable, Injector } from '@furystack/inject'
|
|
4
|
+
import { DefaultSession } from '@furystack/rest-service'
|
|
2
5
|
import { usingAsync } from '@furystack/utils'
|
|
3
|
-
import {
|
|
6
|
+
import { describe, expect, it } from 'vitest'
|
|
4
7
|
import { WebSocket, type Data } from 'ws'
|
|
5
|
-
import type { WebSocketAction } from './models/websocket-action.js'
|
|
6
8
|
import { useWebsockets } from './helpers.js'
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
9
|
-
import { InMemoryStore, User, addStore } from '@furystack/core'
|
|
10
|
-
import { DefaultSession } from '@furystack/rest-service'
|
|
9
|
+
import type { WebSocketAction } from './models/websocket-action.js'
|
|
10
|
+
import { WebSocketApi } from './websocket-api.js'
|
|
11
11
|
|
|
12
12
|
describe('WebSocketApi', () => {
|
|
13
13
|
it('Should be built', async () => {
|
|
@@ -49,7 +49,7 @@ describe('WebSocketApi', () => {
|
|
|
49
49
|
}),
|
|
50
50
|
)
|
|
51
51
|
client.once('message', (data) => {
|
|
52
|
-
expect(data.toString()).toBe('alma')
|
|
52
|
+
expect((data as Buffer).toString()).toBe('alma')
|
|
53
53
|
})
|
|
54
54
|
await api.broadcast(({ ws }) => {
|
|
55
55
|
ws.send('alma')
|
|
@@ -72,7 +72,7 @@ describe('WebSocketApi', () => {
|
|
|
72
72
|
const data = { value: 'alma' }
|
|
73
73
|
@Injectable()
|
|
74
74
|
class ExampleWsAction implements WebSocketAction {
|
|
75
|
-
public dispose() {
|
|
75
|
+
public [Symbol.dispose]() {
|
|
76
76
|
/** */
|
|
77
77
|
}
|
|
78
78
|
public static canExecute() {
|
|
@@ -80,7 +80,7 @@ describe('WebSocketApi', () => {
|
|
|
80
80
|
}
|
|
81
81
|
|
|
82
82
|
public async execute(incomingData: { data: Data }) {
|
|
83
|
-
expect(JSON.parse(incomingData.data.toString())).toEqual(data)
|
|
83
|
+
expect(JSON.parse((incomingData.data as Buffer).toString())).toEqual(data)
|
|
84
84
|
}
|
|
85
85
|
}
|
|
86
86
|
|
package/src/websocket-api.ts
CHANGED
|
@@ -1,23 +1,22 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import type { Socket } from 'net'
|
|
3
|
-
import { IncomingMessage } from 'http'
|
|
4
|
-
import { HttpUserContext, ServerManager } from '@furystack/rest-service'
|
|
1
|
+
import { AggregatedError, IdentityContext, type User } from '@furystack/core'
|
|
5
2
|
import type { Injector } from '@furystack/inject'
|
|
6
3
|
import { Injectable, Injected } from '@furystack/inject'
|
|
7
|
-
import {
|
|
8
|
-
import
|
|
4
|
+
import { HttpUserContext, ServerManager } from '@furystack/rest-service'
|
|
5
|
+
import { using } from '@furystack/utils'
|
|
6
|
+
import { IncomingMessage } from 'http'
|
|
7
|
+
import type { Socket } from 'net'
|
|
8
|
+
import { URL } from 'url'
|
|
9
9
|
import type WebSocket from 'ws'
|
|
10
|
-
import {
|
|
11
|
-
import ws from 'ws'
|
|
12
|
-
import { WebSocketApiSettings } from './websocket-api-settings.js'
|
|
10
|
+
import type { Data } from 'ws'
|
|
11
|
+
import ws, { WebSocketServer } from 'ws'
|
|
13
12
|
import type { WebSocketAction } from './models/websocket-action.js'
|
|
14
|
-
import {
|
|
13
|
+
import { WebSocketApiSettings } from './websocket-api-settings.js'
|
|
15
14
|
|
|
16
15
|
/**
|
|
17
16
|
* A WebSocket API implementation for FuryStack
|
|
18
17
|
*/
|
|
19
18
|
@Injectable({ lifetime: 'scoped' })
|
|
20
|
-
export class WebSocketApi implements
|
|
19
|
+
export class WebSocketApi implements AsyncDisposable {
|
|
21
20
|
public readonly socket = new WebSocketServer({ noServer: true })
|
|
22
21
|
|
|
23
22
|
private clients = new Map<ws, { injector: Injector; ws: ws; message: IncomingMessage }>()
|
|
@@ -74,7 +73,7 @@ export class WebSocketApi implements Disposable {
|
|
|
74
73
|
throw Error('WebSocket API is already initialized')
|
|
75
74
|
}
|
|
76
75
|
}
|
|
77
|
-
public async
|
|
76
|
+
public async [Symbol.asyncDispose]() {
|
|
78
77
|
this.socket.clients.forEach((client) => client.close())
|
|
79
78
|
this.socket.clients.forEach((client) => client.terminate())
|
|
80
79
|
await new Promise<void>((resolve, reject) => this.socket.close((err) => (err ? reject(err) : resolve())))
|
|
@@ -1,12 +1,17 @@
|
|
|
1
|
+
import { addStore, InMemoryStore, StoreManager, User } from '@furystack/core'
|
|
2
|
+
import { getPort } from '@furystack/core/port-generator'
|
|
1
3
|
import { Injector } from '@furystack/inject'
|
|
2
|
-
import {
|
|
4
|
+
import {
|
|
5
|
+
DefaultSession,
|
|
6
|
+
HttpUserContext,
|
|
7
|
+
ServerManager,
|
|
8
|
+
useHttpAuthentication,
|
|
9
|
+
useRestService,
|
|
10
|
+
} from '@furystack/rest-service'
|
|
11
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
|
3
12
|
import { WebSocket } from 'ws'
|
|
4
|
-
import {
|
|
5
|
-
import { DefaultSession, HttpUserContext, ServerManager, useHttpAuthentication } from '@furystack/rest-service'
|
|
6
|
-
import { useRestService } from '@furystack/rest-service'
|
|
13
|
+
import { WhoAmI } from './actions/whoami.js'
|
|
7
14
|
import { useWebsockets } from './helpers.js'
|
|
8
|
-
import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'
|
|
9
|
-
import { getPort } from '@furystack/core/port-generator'
|
|
10
15
|
|
|
11
16
|
describe('WebSocket Integration tests', () => {
|
|
12
17
|
const host = 'localhost'
|
|
@@ -47,7 +52,7 @@ describe('WebSocket Integration tests', () => {
|
|
|
47
52
|
})
|
|
48
53
|
|
|
49
54
|
afterEach(async () => {
|
|
50
|
-
await i.
|
|
55
|
+
await i[Symbol.asyncDispose]()
|
|
51
56
|
})
|
|
52
57
|
const getWhoAmIResult = async (subjectClient: WebSocket) => {
|
|
53
58
|
return new Promise<{ currentUser: User }>((resolve, reject) => {
|