@furystack/websocket-api 10.0.0 → 12.0.0

package/esm/actions/whoami.d.ts

@@ -1,7 +1,7 @@
 /// <reference path="../../../rest-service/esm/incoming-message-extensions.d.ts" />
 /// <reference path="../../../rest-service/esm/server-response-extensions.d.ts" />
 /// <reference types="node/http.js" />
-import type { Data } from 'ws';
+import type { Data, WebSocket } from 'ws';
 import type { WebSocketAction } from '../models/websocket-action.js';
 import type { IncomingMessage } from 'http';
 /**
@@ -16,8 +16,8 @@ export declare class WhoAmI implements WebSocketAction {
     execute(options: {
         data: Data;
         request: IncomingMessage;
+        socket: WebSocket;
     }): Promise<void>;
     private readonly httpUserContext;
-    private readonly websocket;
 }
 //# sourceMappingURL=whoami.d.ts.map

package/esm/actions/whoami.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"whoami.d.ts","sourceRoot":"","sources":["../../src/actions/whoami.ts"],"names":[],"mappings":";;;AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,IAAI,CAAA;AAE9B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAE3C;;GAEG;AACH,qBACa,MAAO,YAAW,eAAe;IACrC,OAAO;WAGA,UAAU,CAAC,OAAO,EAAE;QAAE,IAAI,EAAE,IAAI,CAAC;QAAC,OAAO,EAAE,eAAe,CAAA;KAAE,GAAG,OAAO;IAIvE,OAAO,CAAC,OAAO,EAAE;QAAE,IAAI,EAAE,IAAI,CAAC;QAAC,OAAO,EAAE,eAAe,CAAA;KAAE;IAUtE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAGlD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAK;CAChC"}
+{"version":3,"file":"whoami.d.ts","sourceRoot":"","sources":["../../src/actions/whoami.ts"],"names":[],"mappings":";;;AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,IAAI,CAAA;AACzC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAE3C;;GAEG;AACH,qBACa,MAAO,YAAW,eAAe;IACrC,OAAO;WAGA,UAAU,CAAC,OAAO,EAAE;QAAE,IAAI,EAAE,IAAI,CAAC;QAAC,OAAO,EAAE,eAAe,CAAA;KAAE,GAAG,OAAO;IAIvE,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

@@ -9,7 +9,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import { HttpUserContext } from '@furystack/rest-service';
 import { Injectable, Injected } from '@furystack/inject';
-import ws from 'ws';
 /**
  * Example action that returns the current user instance
  */
@@ -23,23 +22,17 @@ let WhoAmI = class WhoAmI {
     async execute(options) {
         try {
             const currentUser = await this.httpUserContext.getCurrentUser(options.request);
-            this.websocket.send(JSON.stringify({ currentUser }));
+            options.socket.send(JSON.stringify({ currentUser }));
         }
         catch (error) {
-            this.websocket.send(JSON.stringify({ currentUser: null }));
+            options.socket.send(JSON.stringify({ currentUser: null }));
         }
     }
-    httpUserContext;
-    websocket;
 };
 __decorate([
     Injected(HttpUserContext),
     __metadata("design:type", HttpUserContext)
 ], WhoAmI.prototype, "httpUserContext", void 0);
-__decorate([
-    Injected(ws),
-    __metadata("design:type", ws)
-], WhoAmI.prototype, "websocket", void 0);
 WhoAmI = __decorate([
     Injectable({ lifetime: 'transient' })
 ], WhoAmI);

package/esm/actions/whoami.js.map

@@ -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,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,CAAC;YACH,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;QACtD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;QAC5D,CAAC;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"}
+{"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;AAKxD;;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,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;AAlB9C,MAAM;IADlB,UAAU,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC;GACzB,MAAM,CAmBlB"}

package/esm/actions/whoami.spec.js

@@ -25,7 +25,7 @@ describe('Whoami action', () => {
             injector.setExplicitInstance(contextMock, HttpUserContext);
             injector.setExplicitInstance(wsMock, ws);
             const instance = injector.getInstance(WhoAmI);
-            await instance.execute({ request, data: '' });
+            await instance.execute({ request, data: '', socket: wsMock });
             expect(wsMock.send).toBeCalledWith(JSON.stringify({ currentUser }));
         });
     });

package/esm/actions/whoami.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"whoami.spec.js","sourceRoot":"","sources":["../../src/actions/whoami.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC5C,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAEjD,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,MAAM,WAAW,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAA;IAC5C,MAAM,WAAW,GAAoB,EAAE,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC,WAAW,EAAgC,CAAA;IAE9G,MAAM,OAAO,GAAG,EAAE,GAAG,EAAE,oBAAoB,EAAqB,CAAA;IAEhE,MAAM,MAAM,GAAO;QACjB,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;KACZ,CAAA;IAElB,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACnD,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAA;IACjE,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;QACrC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,CAAA;IACrE,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC7C,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,CAAA;IAC7E,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;QAC9C,MAAM,UAAU,CAAC,IAAI,QAAQ,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YAClD,QAAQ,CAAC,mBAAmB,CAAC,WAAW,EAAE,eAAe,CAAC,CAAA;YAC1D,QAAQ,CAAC,mBAAmB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;YACxC,MAAM,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;YAE7C,MAAM,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAA;YAC7C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAA;QACrE,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
+{"version":3,"file":"whoami.spec.js","sourceRoot":"","sources":["../../src/actions/whoami.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC5C,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAEjD,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,MAAM,WAAW,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAA;IAC5C,MAAM,WAAW,GAAoB,EAAE,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC,WAAW,EAAgC,CAAA;IAE9G,MAAM,OAAO,GAAG,EAAE,GAAG,EAAE,oBAAoB,EAAqB,CAAA;IAEhE,MAAM,MAAM,GAAO;QACjB,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;KACZ,CAAA;IAElB,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACnD,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAA;IACjE,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;QACrC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,CAAA;IACrE,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC7C,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,CAAA;IAC7E,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;QAC9C,MAAM,UAAU,CAAC,IAAI,QAAQ,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YAClD,QAAQ,CAAC,mBAAmB,CAAC,WAAW,EAAE,eAAe,CAAC,CAAA;YAC1D,QAAQ,CAAC,mBAAmB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;YACxC,MAAM,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;YAC7C,MAAM,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;YAC7D,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAA;QACrE,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/esm/models/websocket-action.d.ts

@@ -1,11 +1,17 @@
+/// <reference path="../../../rest-service/esm/incoming-message-extensions.d.ts" />
+/// <reference path="../../../rest-service/esm/server-response-extensions.d.ts" />
+/// <reference types="node/http.js" />
 import type { Disposable } from '@furystack/utils';
-import type { Data } from 'ws';
+import type { Data, WebSocket } from 'ws';
+import type { IncomingMessage } from 'http';
 /**
  * Static methods of a WebSocket Action
  */
 export interface WebSocketActionStatic {
     canExecute(options: {
         data: Data;
+        request: IncomingMessage;
+        socket: WebSocket;
     }): boolean;
 }
 /**
@@ -14,6 +20,8 @@ export interface WebSocketActionStatic {
 export interface WebSocketAction extends Disposable {
     execute(options: {
         data: Data;
+        request: IncomingMessage;
+        socket: WebSocket;
     }): void;
 }
 //# sourceMappingURL=websocket-action.d.ts.map

package/esm/models/websocket-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"websocket-action.d.ts","sourceRoot":"","sources":["../../src/models/websocket-action.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,IAAI,CAAA;AAE9B;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,UAAU,CAAC,OAAO,EAAE;QAAE,IAAI,EAAE,IAAI,CAAA;KAAE,GAAG,OAAO,CAAA;CAC7C;AAED;;GAEG;AACH,MAAM,WAAW,eAAgB,SAAQ,UAAU;IACjD,OAAO,CAAC,OAAO,EAAE;QAAE,IAAI,EAAE,IAAI,CAAA;KAAE,GAAG,IAAI,CAAA;CACvC"}
+{"version":3,"file":"websocket-action.d.ts","sourceRoot":"","sources":["../../src/models/websocket-action.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,IAAI,CAAA;AACzC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAE3C;;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

@@ -3,15 +3,16 @@
 /// <reference types="node/http.js" />
 /// <reference types="node/http.js" />
 import { IncomingMessage } from 'http';
-import { Injector } from '@furystack/inject';
-import type { Disposable } from '@furystack/utils';
+import type { Injector } from '@furystack/inject';
+import { type Disposable } from '@furystack/utils';
 import type { Data } from 'ws';
+import type WebSocket from 'ws';
 import ws from 'ws';
 /**
  * A WebSocket API implementation for FuryStack
  */
 export declare class WebSocketApi implements Disposable {
-    readonly socket: ws.Server<typeof ws, typeof IncomingMessage>;
+    readonly socket: WebSocket.Server<typeof WebSocket, typeof IncomingMessage>;
     private clients;
     private readonly settings;
     private readonly serverManager;
@@ -24,6 +25,6 @@ export declare class WebSocketApi implements Disposable {
         ws: ws;
         message: IncomingMessage;
     }) => void | Promise<void>): Promise<void>;
-    execute(data: Data, injector: Injector): void;
+    execute(data: Data, request: IncomingMessage, injector: Injector, socket: WebSocket): Promise<void>;
 }
 //# sourceMappingURL=websocket-api.d.ts.map

package/esm/websocket-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"websocket-api.d.ts","sourceRoot":"","sources":["../src/websocket-api.ts"],"names":[],"mappings":";;;;AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAEtC,OAAO,EAAwB,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,IAAI,CAAA;AAE9B,OAAO,EAAE,MAAM,IAAI,CAAA;AAMnB;;GAEG;AACH,qBACa,YAAa,YAAW,UAAU;IAC7C,SAAgB,MAAM,+CAA0C;IAEhE,OAAO,CAAC,OAAO,CAA0E;IAGzF,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAuB;IAGhD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAG9C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IAEpC,OAAO,CAAC,aAAa,CAAQ;IACtB,IAAI;IA+BE,OAAO;IAMP,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,QAAQ,EAAE,QAAQ;CAO9C"}
+{"version":3,"file":"websocket-api.d.ts","sourceRoot":"","sources":["../src/websocket-api.ts"],"names":[],"mappings":";;;;AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAEtC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAEjD,OAAO,EAAc,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC9D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,IAAI,CAAA;AAC9B,OAAO,KAAK,SAAS,MAAM,IAAI,CAAA;AAE/B,OAAO,EAAE,MAAM,IAAI,CAAA;AAKnB;;GAEG;AACH,qBACa,YAAa,YAAW,UAAU;IAC7C,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;IACtB,IAAI;IA+BE,OAAO;IAMP,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;IAmB1F,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS;CAQjG"}

package/esm/websocket-api.js

@@ -9,22 +9,19 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import { URL } from 'url';
 import { IncomingMessage } from 'http';
-import { ServerManager } from '@furystack/rest-service';
-import { Injectable, Injected, Injector } from '@furystack/inject';
+import { HttpUserContext, ServerManager } from '@furystack/rest-service';
+import { Injectable, Injected } from '@furystack/inject';
+import { usingAsync } from '@furystack/utils';
 import { WebSocketServer } from 'ws';
 import ws from 'ws';
 import { WebSocketApiSettings } from './websocket-api-settings.js';
 import { AggregatedError, IdentityContext } from '@furystack/core';
-import { WebsocketUserContext } from './websocket-user-context.js';
 /**
  * A WebSocket API implementation for FuryStack
  */
 let WebSocketApi = class WebSocketApi {
     socket = new WebSocketServer({ noServer: true });
     clients = new Map();
-    settings;
-    serverManager;
-    injector;
     isInitialized = false;
     init() {
         if (!this.isInitialized) {
@@ -32,10 +29,10 @@ let WebSocketApi = class WebSocketApi {
                 const connectionInjector = this.injector.createChild({ owner: msg });
                 connectionInjector.setExplicitInstance(websocket, ws);
                 connectionInjector.setExplicitInstance(msg, IncomingMessage);
-                connectionInjector.setExplicitInstance(connectionInjector.getInstance(WebsocketUserContext), IdentityContext);
+                connectionInjector.setExplicitInstance(connectionInjector.getInstance(HttpUserContext), IdentityContext);
                 this.clients.set(websocket, { injector: connectionInjector, message: msg, ws: websocket });
                 websocket.on('message', (message) => {
-                    this.execute(message, connectionInjector);
+                    this.execute(message, msg, connectionInjector, websocket);
                 });
                 websocket.on('close', () => {
                     this.clients.delete(websocket);
@@ -77,11 +74,12 @@ let WebSocketApi = class WebSocketApi {
             throw new AggregatedError('The Broadcast operation encountered some errors', errors);
         }
     }
-    execute(data, injector) {
-        const action = this.settings.actions.find((a) => a.canExecute({ data }));
-        if (action) {
-            const actionInstance = injector.getInstance(action);
-            actionInstance.execute({ data });
+    async execute(data, request, injector, socket) {
+        const Action = this.settings.actions.find((a) => a.canExecute({ data, request, socket }));
+        if (Action) {
+            await usingAsync(injector.getInstance(Action), async (action) => {
+                await action.execute({ data, request, socket });
+            });
         }
     }
 };
@@ -93,10 +91,6 @@ __decorate([
     Injected(ServerManager),
     __metadata("design:type", ServerManager)
 ], WebSocketApi.prototype, "serverManager", void 0);
-__decorate([
-    Injected(Injector),
-    __metadata("design:type", Injector)
-], WebSocketApi.prototype, "injector", void 0);
 WebSocketApi = __decorate([
     Injectable({ lifetime: 'scoped' })
 ], WebSocketApi);

package/esm/websocket-api.js.map

@@ -1 +1 @@
-{"version":3,"file":"websocket-api.js","sourceRoot":"","sources":["../src/websocket-api.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"websocket-api.js","sourceRoot":"","sources":["../src/websocket-api.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@furystack/websocket-api",
-  "version": "10.0.0",
+  "version": "12.0.0",
   "description": "HTTP Api FuryStack package",
   "type": "module",
   "scripts": {
@@ -34,15 +34,15 @@
   },
   "homepage": "https://github.com/furystack/furystack",
   "dependencies": {
-    "@furystack/core": "^13.0.0",
-    "@furystack/inject": "^9.0.0",
-    "@furystack/rest-service": "^8.0.0",
-    "@furystack/utils": "^5.0.0",
+    "@furystack/core": "^14.0.1",
+    "@furystack/inject": "^11.0.0",
+    "@furystack/rest-service": "^9.0.1",
+    "@furystack/utils": "^6.0.1",
     "ws": "^8.16.0"
   },
   "devDependencies": {
     "@types/ws": "^8.5.10",
-    "typescript": "^5.4.2",
+    "typescript": "^5.4.3",
     "vitest": "^1.4.0"
   },
   "gitHead": "1045d854bfd8c475b7035471d130d401417a2321"

package/src/actions/whoami.spec.ts

@@ -33,8 +33,7 @@ describe('Whoami action', () => {
       injector.setExplicitInstance(contextMock, HttpUserContext)
       injector.setExplicitInstance(wsMock, ws)
       const instance = injector.getInstance(WhoAmI)
-
-      await instance.execute({ request, data: '' })
+      await instance.execute({ request, data: '', socket: wsMock })
       expect(wsMock.send).toBeCalledWith(JSON.stringify({ currentUser }))
     })
   })

package/src/actions/whoami.ts

@@ -1,7 +1,6 @@
 import { HttpUserContext } from '@furystack/rest-service'
 import { Injectable, Injected } from '@furystack/inject'
-import type { Data } from 'ws'
-import ws from 'ws'
+import type { Data, WebSocket } from 'ws'
 import type { WebSocketAction } from '../models/websocket-action.js'
 import type { IncomingMessage } from 'http'
 
@@ -17,18 +16,15 @@ export class WhoAmI implements WebSocketAction {
     return options.data.toString() === 'whoami' || options.data.toString() === 'whoami /claims'
   }
 
-  public async execute(options: { data: Data; request: IncomingMessage }) {
+  public async execute(options: { data: Data; request: IncomingMessage; socket: WebSocket }) {
     try {
       const currentUser = await this.httpUserContext.getCurrentUser(options.request)
-      this.websocket.send(JSON.stringify({ currentUser }))
+      options.socket.send(JSON.stringify({ currentUser }))
     } catch (error) {
-      this.websocket.send(JSON.stringify({ currentUser: null }))
+      options.socket.send(JSON.stringify({ currentUser: null }))
     }
   }
 
   @Injected(HttpUserContext)
-  private readonly httpUserContext!: HttpUserContext
-
-  @Injected(ws)
-  private readonly websocket!: ws
+  private declare readonly httpUserContext: HttpUserContext
 }

package/src/models/websocket-action.ts

@@ -1,16 +1,17 @@
 import type { Disposable } from '@furystack/utils'
-import type { Data } from 'ws'
+import type { Data, WebSocket } from 'ws'
+import type { IncomingMessage } from 'http'
 
 /**
  * Static methods of a WebSocket Action
  */
 export interface WebSocketActionStatic {
-  canExecute(options: { data: Data }): boolean
+  canExecute(options: { data: Data; request: IncomingMessage; socket: WebSocket }): boolean
 }
 
 /**
  * A WebSocket action implementaion
  */
 export interface WebSocketAction extends Disposable {
-  execute(options: { data: Data }): void
+  execute(options: { data: Data; request: IncomingMessage; socket: WebSocket }): void
 }

package/src/websocket-api.ts

@@ -1,16 +1,17 @@
 import { URL } from 'url'
 import type { Socket } from 'net'
 import { IncomingMessage } from 'http'
-import { ServerManager } from '@furystack/rest-service'
-import { Injectable, Injected, Injector } from '@furystack/inject'
-import type { Disposable } from '@furystack/utils'
+import { HttpUserContext, ServerManager } from '@furystack/rest-service'
+import type { Injector } from '@furystack/inject'
+import { Injectable, Injected } from '@furystack/inject'
+import { usingAsync, type Disposable } from '@furystack/utils'
 import type { Data } from 'ws'
+import type WebSocket from 'ws'
 import { WebSocketServer } from 'ws'
 import ws from 'ws'
 import { WebSocketApiSettings } from './websocket-api-settings.js'
 import type { WebSocketAction } from './models/websocket-action.js'
 import { AggregatedError, IdentityContext } from '@furystack/core'
-import { WebsocketUserContext } from './websocket-user-context.js'
 
 /**
  * A WebSocket API implementation for FuryStack
@@ -22,13 +23,12 @@ export class WebSocketApi implements Disposable {
   private clients = new Map<ws, { injector: Injector; ws: ws; message: IncomingMessage }>()
 
   @Injected(WebSocketApiSettings)
-  private readonly settings!: WebSocketApiSettings
+  private declare readonly settings: WebSocketApiSettings
 
   @Injected(ServerManager)
-  private readonly serverManager!: ServerManager
+  private declare readonly serverManager: ServerManager
 
-  @Injected(Injector)
-  private readonly injector!: Injector
+  private declare readonly injector: Injector
 
   private isInitialized = false
   public init() {
@@ -37,10 +37,10 @@ export class WebSocketApi implements Disposable {
         const connectionInjector = this.injector.createChild({ owner: msg })
         connectionInjector.setExplicitInstance(websocket, ws)
         connectionInjector.setExplicitInstance(msg, IncomingMessage)
-        connectionInjector.setExplicitInstance(connectionInjector.getInstance(WebsocketUserContext), IdentityContext)
+        connectionInjector.setExplicitInstance(connectionInjector.getInstance(HttpUserContext), IdentityContext)
         this.clients.set(websocket, { injector: connectionInjector, message: msg, ws: websocket })
         websocket.on('message', (message) => {
-          this.execute(message, connectionInjector)
+          this.execute(message, msg, connectionInjector, websocket)
         })
 
         websocket.on('close', () => {
@@ -88,11 +88,12 @@ export class WebSocketApi implements Disposable {
     }
   }
 
-  public execute(data: Data, injector: Injector) {
-    const action = this.settings.actions.find((a) => a.canExecute({ data }))
-    if (action) {
-      const actionInstance = injector.getInstance<WebSocketAction>(action)
-      actionInstance.execute({ data })
+  public async execute(data: Data, request: IncomingMessage, injector: Injector, socket: WebSocket) {
+    const Action = this.settings.actions.find((a) => a.canExecute({ data, request, socket }))
+    if (Action) {
+      await usingAsync(injector.getInstance<WebSocketAction>(Action), async (action) => {
+        await action.execute({ data, request, socket })
+      })
     }
   }
 }

package/esm/websocket-user-context.d.ts

@@ -1,8 +0,0 @@
-import type { IdentityContext, User } from '@furystack/core';
-export declare class WebsocketUserContext implements IdentityContext {
-    isAuthenticated(): Promise<boolean>;
-    isAuthorized(...roles: string[]): Promise<boolean>;
-    getCurrentUser<TUser extends User>(): Promise<TUser>;
-    private readonly injector;
-}
-//# sourceMappingURL=websocket-user-context.d.ts.map

package/esm/websocket-user-context.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"websocket-user-context.d.ts","sourceRoot":"","sources":["../src/websocket-user-context.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAI5D,qBACa,oBAAqB,YAAW,eAAe;IAC7C,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC;IAOnC,YAAY,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAalD,cAAc,CAAC,KAAK,SAAS,IAAI,KAAK,OAAO,CAAC,KAAK,CAAC;IAQjE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;CACrC"}

package/esm/websocket-user-context.js

@@ -1,52 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    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;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-import { IncomingMessage } from 'http';
-import { Injectable, Injected, Injector } from '@furystack/inject';
-import { HttpUserContext } from '@furystack/rest-service';
-let WebsocketUserContext = class WebsocketUserContext {
-    async isAuthenticated() {
-        try {
-            return (await this.getCurrentUser()) ? true : false;
-        }
-        catch (error) {
-            return false;
-        }
-    }
-    async isAuthorized(...roles) {
-        try {
-            const currentUser = await this.getCurrentUser();
-            for (const role of roles) {
-                if (!currentUser || !currentUser.roles.some((c) => c === role)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-        catch (error) {
-            return false;
-        }
-    }
-    async getCurrentUser() {
-        const user = await this.injector
-            .getInstance(HttpUserContext)
-            .authenticateRequest(this.injector.getInstance(IncomingMessage));
-        return user;
-    }
-    injector;
-};
-__decorate([
-    Injected(Injector),
-    __metadata("design:type", Injector)
-], WebsocketUserContext.prototype, "injector", void 0);
-WebsocketUserContext = __decorate([
-    Injectable({ lifetime: 'scoped' })
-], WebsocketUserContext);
-export { WebsocketUserContext };
-//# sourceMappingURL=websocket-user-context.js.map

package/esm/websocket-user-context.js.map

@@ -1 +0,0 @@
-{"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,CAAC;YACH,OAAO,CAAC,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAA;QACrD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,KAAK,CAAA;QACd,CAAC;IACH,CAAC;IACM,KAAK,CAAC,YAAY,CAAC,GAAG,KAAe;QAC1C,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;YAC/C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,EAAE,CAAC;oBAC/D,OAAO,KAAK,CAAA;gBACd,CAAC;YACH,CAAC;YACD,OAAO,IAAI,CAAA;QACb,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,KAAK,CAAA;QACd,CAAC;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/esm/websocket-user-context.spec.d.ts

@@ -1,2 +0,0 @@
-import '.';
-//# sourceMappingURL=websocket-user-context.spec.d.ts.map

package/esm/websocket-user-context.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"websocket-user-context.spec.d.ts","sourceRoot":"","sources":["../src/websocket-user-context.spec.ts"],"names":[],"mappings":"AAEA,OAAO,GAAG,CAAA"}

package/esm/websocket-user-context.spec.js

@@ -1,68 +0,0 @@
-import { Injector } from '@furystack/inject';
-import { IncomingMessage } from 'http';
-import '.';
-import { HttpUserContext } from '@furystack/rest-service';
-import { usingAsync } from '@furystack/utils';
-import { WebsocketUserContext } from './websocket-user-context.js';
-import { describe, it, expect, vi } from 'vitest';
-describe('WebSocket User Context', () => {
-    const mockUser = { username: 'mock@gmail.com', roles: [] };
-    const mockAdmin = { username: 'mock@gmail.com', roles: ['admin'] };
-    describe('isAuthenticated', () => {
-        it('should authenticate with HttpUserContext and the IncomingMessage', async () => {
-            await usingAsync(new Injector(), async (i) => {
-                const authFn = vi.fn(async () => mockUser);
-                const incomingMessage = {};
-                i.setExplicitInstance(incomingMessage, IncomingMessage);
-                i.setExplicitInstance({ authenticateRequest: authFn }, HttpUserContext);
-                const authResult = await i.getInstance(WebsocketUserContext).isAuthenticated();
-                expect(authResult).toBeTruthy();
-                expect(authFn).toBeCalledWith(incomingMessage);
-            });
-        });
-        it('should return false if HttpUserContext throws', async () => {
-            await usingAsync(new Injector(), async (i) => {
-                const authFn = vi.fn(() => Promise.reject('Hey! No user here!'));
-                const incomingMessage = {};
-                i.setExplicitInstance(incomingMessage, IncomingMessage);
-                i.setExplicitInstance({ authenticateRequest: authFn }, HttpUserContext);
-                const authResult = await i.getInstance(WebsocketUserContext).isAuthenticated();
-                expect(authResult).toBeFalsy();
-                expect(authFn).toBeCalledWith(incomingMessage);
-            });
-        });
-    });
-    describe('isAuthorized', () => {
-        it('should return true if the user has the role', async () => {
-            await usingAsync(new Injector(), async (i) => {
-                const authFn = vi.fn(async () => mockAdmin);
-                const incomingMessage = {};
-                i.setExplicitInstance(incomingMessage, IncomingMessage);
-                i.setExplicitInstance({ authenticateRequest: authFn }, HttpUserContext);
-                const authResult = await i.getInstance(WebsocketUserContext).isAuthorized('admin');
-                expect(authResult).toBe(true);
-            });
-        });
-        it('should return false if the user does not have the role', async () => {
-            await usingAsync(new Injector(), async (i) => {
-                const authFn = vi.fn(async () => mockUser);
-                const incomingMessage = {};
-                i.setExplicitInstance(incomingMessage, IncomingMessage);
-                i.setExplicitInstance({ authenticateRequest: authFn }, HttpUserContext);
-                const authResult = await i.getInstance(WebsocketUserContext).isAuthorized('admin');
-                expect(authResult).toBe(false);
-            });
-        });
-        it('should return false if getting the current user throws', async () => {
-            await usingAsync(new Injector(), async (i) => {
-                const authFn = vi.fn(() => Promise.reject('Hey! No user here!'));
-                const incomingMessage = {};
-                i.setExplicitInstance(incomingMessage, IncomingMessage);
-                i.setExplicitInstance({ authenticateRequest: authFn }, HttpUserContext);
-                const authResult = await i.getInstance(WebsocketUserContext).isAuthorized('admin');
-                expect(authResult).toBe(false);
-            });
-        });
-    });
-});
-//# sourceMappingURL=websocket-user-context.spec.js.map

package/esm/websocket-user-context.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"websocket-user-context.spec.js","sourceRoot":"","sources":["../src/websocket-user-context.spec.ts"],"names":[],"mappings":"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"}

package/src/websocket-user-context.spec.ts

@@ -1,73 +0,0 @@
-import { Injector } from '@furystack/inject'
-import { IncomingMessage } from 'http'
-import '.'
-import { HttpUserContext } from '@furystack/rest-service'
-import { usingAsync } from '@furystack/utils'
-import { WebsocketUserContext } from './websocket-user-context.js'
-import { describe, it, expect, vi } from 'vitest'
-
-describe('WebSocket User Context', () => {
-  const mockUser = { username: 'mock@gmail.com', roles: [] }
-  const mockAdmin = { username: 'mock@gmail.com', roles: ['admin'] }
-
-  describe('isAuthenticated', () => {
-    it('should authenticate with HttpUserContext and the IncomingMessage', async () => {
-      await usingAsync(new Injector(), async (i) => {
-        const authFn = vi.fn(async () => mockUser)
-        const incomingMessage = {}
-        i.setExplicitInstance(incomingMessage, IncomingMessage)
-        i.setExplicitInstance({ authenticateRequest: authFn }, HttpUserContext)
-        const authResult = await i.getInstance(WebsocketUserContext).isAuthenticated()
-        expect(authResult).toBeTruthy()
-        expect(authFn).toBeCalledWith(incomingMessage)
-      })
-    })
-
-    it('should return false if HttpUserContext throws', async () => {
-      await usingAsync(new Injector(), async (i) => {
-        const authFn = vi.fn(() => Promise.reject('Hey! No user here!'))
-        const incomingMessage = {}
-        i.setExplicitInstance(incomingMessage, IncomingMessage)
-        i.setExplicitInstance({ authenticateRequest: authFn }, HttpUserContext)
-        const authResult = await i.getInstance(WebsocketUserContext).isAuthenticated()
-        expect(authResult).toBeFalsy()
-        expect(authFn).toBeCalledWith(incomingMessage)
-      })
-    })
-  })
-
-  describe('isAuthorized', () => {
-    it('should return true if the user has the role', async () => {
-      await usingAsync(new Injector(), async (i) => {
-        const authFn = vi.fn(async () => mockAdmin)
-        const incomingMessage = {}
-        i.setExplicitInstance(incomingMessage, IncomingMessage)
-        i.setExplicitInstance({ authenticateRequest: authFn }, HttpUserContext)
-        const authResult = await i.getInstance(WebsocketUserContext).isAuthorized('admin')
-        expect(authResult).toBe(true)
-      })
-    })
-
-    it('should return false if the user does not have the role', async () => {
-      await usingAsync(new Injector(), async (i) => {
-        const authFn = vi.fn(async () => mockUser)
-        const incomingMessage = {}
-        i.setExplicitInstance(incomingMessage, IncomingMessage)
-        i.setExplicitInstance({ authenticateRequest: authFn }, HttpUserContext)
-        const authResult = await i.getInstance(WebsocketUserContext).isAuthorized('admin')
-        expect(authResult).toBe(false)
-      })
-    })
-
-    it('should return false if getting the current user throws', async () => {
-      await usingAsync(new Injector(), async (i) => {
-        const authFn = vi.fn(() => Promise.reject('Hey! No user here!'))
-        const incomingMessage = {}
-        i.setExplicitInstance(incomingMessage, IncomingMessage)
-        i.setExplicitInstance({ authenticateRequest: authFn }, HttpUserContext)
-        const authResult = await i.getInstance(WebsocketUserContext).isAuthorized('admin')
-        expect(authResult).toBe(false)
-      })
-    })
-  })
-})

package/src/websocket-user-context.ts

@@ -1,37 +0,0 @@
-import { IncomingMessage } from 'http'
-import type { IdentityContext, User } from '@furystack/core'
-import { Injectable, Injected, Injector } from '@furystack/inject'
-import { HttpUserContext } from '@furystack/rest-service'
-
-@Injectable({ lifetime: 'scoped' })
-export class WebsocketUserContext implements IdentityContext {
-  public async isAuthenticated(): Promise<boolean> {
-    try {
-      return (await this.getCurrentUser()) ? true : false
-    } catch (error) {
-      return false
-    }
-  }
-  public async isAuthorized(...roles: string[]): Promise<boolean> {
-    try {
-      const currentUser = await this.getCurrentUser()
-      for (const role of roles) {
-        if (!currentUser || !currentUser.roles.some((c) => c === role)) {
-          return false
-        }
-      }
-      return true
-    } catch (error) {
-      return false
-    }
-  }
-  public async getCurrentUser<TUser extends User>(): Promise<TUser> {
-    const user = await this.injector
-      .getInstance(HttpUserContext)
-      .authenticateRequest(this.injector.getInstance(IncomingMessage))
-    return user as TUser
-  }
-
-  @Injected(Injector)
-  private readonly injector!: Injector
-}