@furystack/websocket-api 8.0.3 → 8.0.6

package/dist/actions/whoami.js

@@ -9,10 +9,6 @@ const ws_1 = tslib_1.__importDefault(require("ws"));
  * Example action that returns the current user instance
  */
 let WhoAmI = class WhoAmI {
-    constructor(httpUserContext, websocket) {
-        this.httpUserContext = httpUserContext;
-        this.websocket = websocket;
-    }
     dispose() {
         /** */
     }
@@ -29,9 +25,16 @@ let WhoAmI = class WhoAmI {
         }
     }
 };
+tslib_1.__decorate([
+    (0, inject_1.Injected)(rest_service_1.HttpUserContext),
+    tslib_1.__metadata("design:type", rest_service_1.HttpUserContext)
+], WhoAmI.prototype, "httpUserContext", void 0);
+tslib_1.__decorate([
+    (0, inject_1.Injected)(ws_1.default),
+    tslib_1.__metadata("design:type", ws_1.default)
+], WhoAmI.prototype, "websocket", void 0);
 WhoAmI = tslib_1.__decorate([
-    (0, inject_1.Injectable)({ lifetime: 'transient' }),
-    tslib_1.__metadata("design:paramtypes", [rest_service_1.HttpUserContext, ws_1.default])
+    (0, inject_1.Injectable)({ lifetime: 'transient' })
 ], WhoAmI);
 exports.WhoAmI = WhoAmI;
 //# sourceMappingURL=whoami.js.map

package/dist/actions/whoami.js.map

@@ -1 +1 @@
-{"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../src/actions/whoami.ts"],"names":[],"mappings":";;;;AAAA,0DAAyD;AACzD,8CAA8C;AAC9C,oDAA6B;AAI7B;;GAEG;AAEH,IAAa,MAAM,GAAnB,MAAa,MAAM;IAiBjB,YAAoB,eAAgC,EAAU,SAAa;QAAvD,oBAAe,GAAf,eAAe,CAAiB;QAAU,cAAS,GAAT,SAAS,CAAI;IAAG,CAAC;IAhBxE,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;CAGF,CAAA;AAlBY,MAAM;IADlB,IAAA,mBAAU,EAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC;6CAkBC,8BAAe,EAAqB,YAAE;GAjBhE,MAAM,CAkBlB;AAlBY,wBAAM"}
+{"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../src/actions/whoami.ts"],"names":[],"mappings":";;;;AAAA,0DAAyD;AACzD,8CAAwD;AACxD,oDAA6B;AAI7B;;GAEG;AAEH,IAAa,MAAM,GAAnB,MAAa,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;CAOF,CAAA;AAJC;IADC,IAAA,iBAAQ,EAAC,8BAAe,CAAC;sCACS,8BAAe;+CAAA;AAGlD;IADC,IAAA,iBAAQ,EAAC,YAAE,CAAC;sCACgB,YAAE;yCAAA;AArBpB,MAAM;IADlB,IAAA,mBAAU,EAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC;GACzB,MAAM,CAsBlB;AAtBY,wBAAM"}

package/dist/actions/whoami.spec.js

@@ -1,7 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 const whoami_1 = require("./whoami");
+const rest_service_1 = require("@furystack/rest-service");
+const ws_1 = tslib_1.__importDefault(require("ws"));
 const utils_1 = require("@furystack/utils");
+const inject_1 = require("@furystack/inject");
 describe('Whoami action', () => {
     const currentUser = { username: 'testuser' };
     const contextMock = { getCurrentUser: async () => currentUser };
@@ -19,7 +23,10 @@ describe('Whoami action', () => {
         expect(whoami_1.WhoAmI.canExecute({ request, data: 'whoami /claims' })).toBeTruthy();
     });
     it('Should return the current user', async () => {
-        await (0, utils_1.usingAsync)(new whoami_1.WhoAmI(contextMock, wsMock), async (instance) => {
+        await (0, utils_1.usingAsync)(new inject_1.Injector(), async (injector) => {
+            injector.setExplicitInstance(contextMock, rest_service_1.HttpUserContext);
+            injector.setExplicitInstance(wsMock, ws_1.default);
+            const instance = injector.getInstance(whoami_1.WhoAmI);
             await instance.execute({ request, data: '' });
             expect(wsMock.send).toBeCalledWith(JSON.stringify({ currentUser }));
         });

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

@@ -1 +1 @@
-{"version":3,"file":"whoami.spec.js","sourceRoot":"","sources":["../../src/actions/whoami.spec.ts"],"names":[],"mappings":";;AAAA,qCAAiC;AAGjC,4CAA6C;AAG7C,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,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;KACd,CAAA;IAElB,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACnD,MAAM,CAAC,eAAM,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,eAAM,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,eAAM,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,IAAA,kBAAU,EAAC,IAAI,eAAM,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YACnE,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,qCAAiC;AACjC,0DAAyD;AACzD,oDAAmB;AACnB,4CAA6C;AAE7C,8CAA4C;AAE5C,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,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;KACd,CAAA;IAElB,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACnD,MAAM,CAAC,eAAM,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,eAAM,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,eAAM,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,IAAA,kBAAU,EAAC,IAAI,iBAAQ,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YAClD,QAAQ,CAAC,mBAAmB,CAAC,WAAW,EAAE,8BAAe,CAAC,CAAA;YAC1D,QAAQ,CAAC,mBAAmB,CAAC,MAAM,EAAE,YAAE,CAAC,CAAA;YACxC,MAAM,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,eAAM,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"}

package/dist/helpers.js

@@ -12,6 +12,7 @@ const websocket_api_settings_1 = require("./websocket-api-settings");
  *    actions: [...my custom actions]
  * })
  * ````
+ *
  * @param injector The injector instance
  * @param settings The Settings object for the WebSocket API
  */
@@ -19,7 +20,7 @@ const useWebsockets = (injector, settings) => {
     const s = new websocket_api_settings_1.WebSocketApiSettings();
     Object.assign(s, settings);
     injector.setExplicitInstance(s, websocket_api_settings_1.WebSocketApiSettings);
-    injector.getInstance(websocket_api_1.WebSocketApi);
+    injector.getInstance(websocket_api_1.WebSocketApi).init();
 };
 exports.useWebsockets = useWebsockets;
 //# sourceMappingURL=helpers.js.map

package/dist/helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":";;;AACA,mDAA8C;AAC9C,qEAA+D;AAE/D;;;;;;;;;;;GAWG;AACI,MAAM,aAAa,GAAG,CAAC,QAAkB,EAAE,QAAwC,EAAE,EAAE;IAC5F,MAAM,CAAC,GAAG,IAAI,6CAAoB,EAAE,CAAA;IACpC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAA;IAC1B,QAAQ,CAAC,mBAAmB,CAAC,CAAC,EAAE,6CAAoB,CAAC,CAAA;IACrD,QAAQ,CAAC,WAAW,CAAC,4BAAY,CAAC,CAAA;AACpC,CAAC,CAAA;AALY,QAAA,aAAa,iBAKzB"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":";;;AACA,mDAA8C;AAC9C,qEAA+D;AAE/D;;;;;;;;;;;;GAYG;AACI,MAAM,aAAa,GAAG,CAAC,QAAkB,EAAE,QAAwC,EAAE,EAAE;IAC5F,MAAM,CAAC,GAAG,IAAI,6CAAoB,EAAE,CAAA;IACpC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAA;IAC1B,QAAQ,CAAC,mBAAmB,CAAC,CAAC,EAAE,6CAAoB,CAAC,CAAA;IACrD,QAAQ,CAAC,WAAW,CAAC,4BAAY,CAAC,CAAC,IAAI,EAAE,CAAA;AAC3C,CAAC,CAAA;AALY,QAAA,aAAa,iBAKzB"}

package/dist/websocket-api-settings.js

@@ -1,16 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketApiSettings = void 0;
+const tslib_1 = require("tslib");
+const inject_1 = require("@furystack/inject");
 const whoami_1 = require("./actions/whoami");
 /**
  * A configuration object for FuryStack WebSocket API
  */
-class WebSocketApiSettings {
+let WebSocketApiSettings = class WebSocketApiSettings {
     constructor() {
         this.port = 19090;
         this.path = '/socket';
         this.actions = [whoami_1.WhoAmI];
     }
-}
+};
+WebSocketApiSettings = tslib_1.__decorate([
+    (0, inject_1.Injectable)({ lifetime: 'scoped' })
+], WebSocketApiSettings);
 exports.WebSocketApiSettings = WebSocketApiSettings;
 //# sourceMappingURL=websocket-api-settings.js.map

package/dist/websocket-api-settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"websocket-api-settings.js","sourceRoot":"","sources":["../src/websocket-api-settings.ts"],"names":[],"mappings":";;;AACA,6CAAyC;AAGzC;;GAEG;AACH,MAAa,oBAAoB;IAAjC;QACS,SAAI,GAAG,KAAK,CAAA;QAEZ,SAAI,GAAG,SAAS,CAAA;QAChB,YAAO,GAAkE,CAAC,eAAM,CAAC,CAAA;IAC1F,CAAC;CAAA;AALD,oDAKC"}
+{"version":3,"file":"websocket-api-settings.js","sourceRoot":"","sources":["../src/websocket-api-settings.ts"],"names":[],"mappings":";;;;AAAA,8CAA6D;AAC7D,6CAAyC;AAGzC;;GAEG;AAEH,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAAjC;QACS,SAAI,GAAG,KAAK,CAAA;QAEZ,SAAI,GAAG,SAAS,CAAA;QAChB,YAAO,GAAkE,CAAC,eAAM,CAAC,CAAA;IAC1F,CAAC;CAAA,CAAA;AALY,oBAAoB;IADhC,IAAA,mBAAU,EAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;GACtB,oBAAoB,CAKhC;AALY,oDAAoB"}

package/dist/websocket-api.js

@@ -14,35 +14,40 @@ const websocket_user_context_1 = require("./websocket-user-context");
  * A WebSocket API implementation for FuryStack
  */
 let WebSocketApi = class WebSocketApi {
-    constructor(settings, serverManager, parentInjector) {
-        this.settings = settings;
-        this.serverManager = serverManager;
-        this.clients = new Map();
+    constructor() {
         this.socket = new ws_1.Server({ noServer: true });
-        this.injector = parentInjector.createChild({ owner: this });
-        this.socket.on('connection', (websocket, msg) => {
-            const connectionInjector = this.injector.createChild({ owner: msg });
-            connectionInjector.setExplicitInstance(websocket, ws_1.default);
-            connectionInjector.setExplicitInstance(msg, http_1.IncomingMessage);
-            connectionInjector.setExplicitInstance(new websocket_user_context_1.WebsocketUserContext(connectionInjector), core_1.IdentityContext);
-            this.clients.set(websocket, { injector: connectionInjector, message: msg, ws: websocket });
-            websocket.on('message', (message) => {
-                this.execute(message, connectionInjector);
-            });
-            websocket.on('close', () => {
-                this.clients.delete(websocket);
+        this.clients = new Map();
+        this.isInitialized = false;
+    }
+    init() {
+        if (!this.isInitialized) {
+            this.socket.on('connection', (websocket, msg) => {
+                const connectionInjector = this.injector.createChild({ owner: msg });
+                connectionInjector.setExplicitInstance(websocket, ws_1.default);
+                connectionInjector.setExplicitInstance(msg, http_1.IncomingMessage);
+                connectionInjector.setExplicitInstance(connectionInjector.getInstance(websocket_user_context_1.WebsocketUserContext), core_1.IdentityContext);
+                this.clients.set(websocket, { injector: connectionInjector, message: msg, ws: websocket });
+                websocket.on('message', (message) => {
+                    this.execute(message, connectionInjector);
+                });
+                websocket.on('close', () => {
+                    this.clients.delete(websocket);
+                });
             });
-        });
-        serverManager.getOrCreate({ port: this.settings.port, hostName: this.settings.host }).then((server) => {
-            server.server.on('upgrade', (request, socket, head) => {
-                const { pathname } = new url_1.URL(request.url, `http://${request.headers.host}`);
-                if (pathname === this.settings.path) {
-                    this.socket.handleUpgrade(request, socket, head, (websocket) => {
-                        this.socket.emit('connection', websocket, request);
-                    });
-                }
+            this.serverManager.getOrCreate({ port: this.settings.port, hostName: this.settings.host }).then((server) => {
+                server.server.on('upgrade', (request, socket, head) => {
+                    const { pathname } = new url_1.URL(request.url, `http://${request.headers.host}`);
+                    if (pathname === this.settings.path) {
+                        this.socket.handleUpgrade(request, socket, head, (websocket) => {
+                            this.socket.emit('connection', websocket, request);
+                        });
+                    }
+                });
             });
-        });
+        }
+        else {
+            throw Error('WebSocket API is already initialized');
+        }
     }
     async dispose() {
         this.socket.clients.forEach((client) => client.close());
@@ -73,9 +78,20 @@ let WebSocketApi = class WebSocketApi {
         }
     }
 };
+tslib_1.__decorate([
+    (0, inject_1.Injected)(websocket_api_settings_1.WebSocketApiSettings),
+    tslib_1.__metadata("design:type", websocket_api_settings_1.WebSocketApiSettings)
+], WebSocketApi.prototype, "settings", void 0);
+tslib_1.__decorate([
+    (0, inject_1.Injected)(rest_service_1.ServerManager),
+    tslib_1.__metadata("design:type", rest_service_1.ServerManager)
+], WebSocketApi.prototype, "serverManager", void 0);
+tslib_1.__decorate([
+    (0, inject_1.Injected)(inject_1.Injector),
+    tslib_1.__metadata("design:type", inject_1.Injector)
+], WebSocketApi.prototype, "injector", void 0);
 WebSocketApi = tslib_1.__decorate([
-    (0, inject_1.Injectable)({ lifetime: 'scoped' }),
-    tslib_1.__metadata("design:paramtypes", [websocket_api_settings_1.WebSocketApiSettings, rest_service_1.ServerManager, inject_1.Injector])
+    (0, inject_1.Injectable)({ lifetime: 'scoped' })
 ], WebSocketApi);
 exports.WebSocketApi = WebSocketApi;
 //# sourceMappingURL=websocket-api.js.map

package/dist/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/dist/websocket-user-context.js

@@ -6,9 +6,6 @@ const http_1 = require("http");
 const inject_1 = require("@furystack/inject");
 const rest_service_1 = require("@furystack/rest-service");
 let WebsocketUserContext = class WebsocketUserContext {
-    constructor(injector) {
-        this.injector = injector;
-    }
     async isAuthenticated() {
         try {
             return (await this.getCurrentUser()) ? true : false;
@@ -38,9 +35,12 @@ let WebsocketUserContext = class WebsocketUserContext {
         return user;
     }
 };
+tslib_1.__decorate([
+    (0, inject_1.Injected)(inject_1.Injector),
+    tslib_1.__metadata("design:type", inject_1.Injector)
+], WebsocketUserContext.prototype, "injector", void 0);
 WebsocketUserContext = tslib_1.__decorate([
-    (0, inject_1.Injectable)({ lifetime: 'scoped' }),
-    tslib_1.__metadata("design:paramtypes", [inject_1.Injector])
+    (0, inject_1.Injectable)({ lifetime: 'scoped' })
 ], WebsocketUserContext);
 exports.WebsocketUserContext = WebsocketUserContext;
 //# sourceMappingURL=websocket-user-context.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"websocket-user-context.js","sourceRoot":"","sources":["../src/websocket-user-context.ts"],"names":[],"mappings":";;;;AAAA,+BAAsC;AAEtC,8CAAwD;AACxD,0DAAyD;AAGzD,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IA4B/B,YAA6B,QAAkB;QAAlB,aAAQ,GAAR,QAAQ,CAAU;IAAG,CAAC;IA3B5C,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,8BAAe,CAAC;aAC5B,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,sBAAe,CAAC,CAAC,CAAA;QAClE,OAAO,IAAa,CAAA;IACtB,CAAC;CAGF,CAAA;AA7BY,oBAAoB;IADhC,IAAA,mBAAU,EAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;6CA6BM,iBAAQ;GA5BpC,oBAAoB,CA6BhC;AA7BY,oDAAoB"}
+{"version":3,"file":"websocket-user-context.js","sourceRoot":"","sources":["../src/websocket-user-context.ts"],"names":[],"mappings":";;;;AAAA,+BAAsC;AAEtC,8CAAkE;AAClE,0DAAyD;AAGzD,IAAa,oBAAoB,GAAjC,MAAa,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,8BAAe,CAAC;aAC5B,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,sBAAe,CAAC,CAAC,CAAA;QAClE,OAAO,IAAa,CAAA;IACtB,CAAC;CAIF,CAAA;AADC;IADC,IAAA,iBAAQ,EAAC,iBAAQ,CAAC;sCACS,iBAAQ;sDAAA;AA7BzB,oBAAoB;IADhC,IAAA,mBAAU,EAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;GACtB,oBAAoB,CA8BhC;AA9BY,oDAAoB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@furystack/websocket-api",
-  "version": "8.0.3",
+  "version": "8.0.6",
   "description": "HTTP Api FuryStack package",
   "main": "dist/index.js",
   "files": [
@@ -26,16 +26,16 @@
   },
   "homepage": "https://github.com/furystack/furystack",
   "dependencies": {
-    "@furystack/core": "^11.0.3",
-    "@furystack/inject": "^6.0.3",
-    "@furystack/logging": "^3.0.3",
-    "@furystack/rest-service": "^6.0.3",
-    "@furystack/utils": "^3.0.3",
+    "@furystack/core": "^11.0.5",
+    "@furystack/inject": "^7.0.1",
+    "@furystack/logging": "^3.0.5",
+    "@furystack/rest-service": "^6.0.6",
+    "@furystack/utils": "^3.0.5",
     "tslib": "^2.4.0",
-    "ws": "^8.6.0"
+    "ws": "^8.8.0"
   },
   "devDependencies": {
-    "@types/jest": "^27.5.0",
+    "@types/jest": "^28.1.4",
     "@types/ws": "^8.5.3"
   },
   "typings": "./types/index.d.ts",

package/src/actions/whoami.spec.ts

@@ -3,6 +3,7 @@ import { HttpUserContext } from '@furystack/rest-service'
 import ws from 'ws'
 import { usingAsync } from '@furystack/utils'
 import { IncomingMessage } from 'http'
+import { Injector } from '@furystack/inject'
 
 describe('Whoami action', () => {
   const currentUser = { username: 'testuser' }
@@ -27,7 +28,11 @@ describe('Whoami action', () => {
   })
 
   it('Should return the current user', async () => {
-    await usingAsync(new WhoAmI(contextMock, wsMock), async (instance) => {
+    await usingAsync(new Injector(), async (injector) => {
+      injector.setExplicitInstance(contextMock, HttpUserContext)
+      injector.setExplicitInstance(wsMock, ws)
+      const instance = injector.getInstance(WhoAmI)
+
       await instance.execute({ request, data: '' })
       expect(wsMock.send).toBeCalledWith(JSON.stringify({ currentUser }))
     })

package/src/actions/whoami.ts

@@ -1,5 +1,5 @@
 import { HttpUserContext } from '@furystack/rest-service'
-import { Injectable } from '@furystack/inject'
+import { Injectable, Injected } from '@furystack/inject'
 import ws, { Data } from 'ws'
 import { WebSocketAction } from '../models/websocket-action'
 import { IncomingMessage } from 'http'
@@ -25,5 +25,9 @@ export class WhoAmI implements WebSocketAction {
     }
   }
 
-  constructor(private httpUserContext: HttpUserContext, private websocket: ws) {}
+  @Injected(HttpUserContext)
+  private readonly httpUserContext!: HttpUserContext
+
+  @Injected(ws)
+  private readonly websocket!: ws
 }

package/src/helpers.ts

@@ -11,6 +11,7 @@ import { WebSocketApiSettings } from './websocket-api-settings'
  *    actions: [...my custom actions]
  * })
  * ````
+ *
  * @param injector The injector instance
  * @param settings The Settings object for the WebSocket API
  */
@@ -18,5 +19,5 @@ export const useWebsockets = (injector: Injector, settings?: Partial<WebSocketAp
   const s = new WebSocketApiSettings()
   Object.assign(s, settings)
   injector.setExplicitInstance(s, WebSocketApiSettings)
-  injector.getInstance(WebSocketApi)
+  injector.getInstance(WebSocketApi).init()
 }

package/src/websocket-api-settings.ts

@@ -1,10 +1,11 @@
-import { Constructable } from '@furystack/inject'
+import { Constructable, Injectable } from '@furystack/inject'
 import { WhoAmI } from './actions/whoami'
 import { WebSocketAction, WebSocketActionStatic } from '.'
 
 /**
  * A configuration object for FuryStack WebSocket API
  */
+@Injectable({ lifetime: 'scoped' })
 export class WebSocketApiSettings {
   public port = 19090
   public host?: string

package/src/websocket-api.ts

@@ -2,7 +2,7 @@ import { URL } from 'url'
 import { Socket } from 'net'
 import { IncomingMessage } from 'http'
 import { ServerManager } from '@furystack/rest-service'
-import { Injectable, Injector } from '@furystack/inject'
+import { Injectable, Injected, Injector } from '@furystack/inject'
 import { Disposable } from '@furystack/utils'
 import ws, { Data, Server as WebSocketServer } from 'ws'
 import { WebSocketApiSettings } from './websocket-api-settings'
@@ -15,39 +15,50 @@ import { WebsocketUserContext } from './websocket-user-context'
  */
 @Injectable({ lifetime: 'scoped' })
 export class WebSocketApi implements Disposable {
-  public readonly socket: WebSocketServer
-  private readonly injector: Injector
+  public readonly socket = new WebSocketServer({ noServer: true })
 
   private clients = new Map<ws, { injector: Injector; ws: ws; message: IncomingMessage }>()
 
-  constructor(private settings: WebSocketApiSettings, public serverManager: ServerManager, parentInjector: Injector) {
-    this.socket = new WebSocketServer({ noServer: true })
-    this.injector = parentInjector.createChild({ owner: this })
-    this.socket.on('connection', (websocket, msg) => {
-      const connectionInjector = this.injector.createChild({ owner: msg })
-      connectionInjector.setExplicitInstance(websocket, ws)
-      connectionInjector.setExplicitInstance(msg, IncomingMessage)
-      connectionInjector.setExplicitInstance(new WebsocketUserContext(connectionInjector), IdentityContext)
-      this.clients.set(websocket, { injector: connectionInjector, message: msg, ws: websocket })
-      websocket.on('message', (message) => {
-        this.execute(message, connectionInjector)
-      })
+  @Injected(WebSocketApiSettings)
+  private readonly settings!: WebSocketApiSettings
+
+  @Injected(ServerManager)
+  private readonly serverManager!: ServerManager
+
+  @Injected(Injector)
+  private readonly injector!: Injector
 
-      websocket.on('close', () => {
-        this.clients.delete(websocket)
+  private isInitialized = false
+  public init() {
+    if (!this.isInitialized) {
+      this.socket.on('connection', (websocket, msg) => {
+        const connectionInjector = this.injector.createChild({ owner: msg })
+        connectionInjector.setExplicitInstance(websocket, ws)
+        connectionInjector.setExplicitInstance(msg, IncomingMessage)
+        connectionInjector.setExplicitInstance(connectionInjector.getInstance(WebsocketUserContext), IdentityContext)
+        this.clients.set(websocket, { injector: connectionInjector, message: msg, ws: websocket })
+        websocket.on('message', (message) => {
+          this.execute(message, connectionInjector)
+        })
+
+        websocket.on('close', () => {
+          this.clients.delete(websocket)
+        })
       })
-    })
 
-    serverManager.getOrCreate({ port: this.settings.port, hostName: this.settings.host }).then((server) => {
-      server.server.on('upgrade', (request: IncomingMessage, socket: Socket, head: Buffer) => {
-        const { pathname } = new URL(request.url as string, `http://${request.headers.host}`)
-        if (pathname === this.settings.path) {
-          this.socket.handleUpgrade(request, socket, head, (websocket) => {
-            this.socket.emit('connection', websocket, request)
-          })
-        }
+      this.serverManager.getOrCreate({ port: this.settings.port, hostName: this.settings.host }).then((server) => {
+        server.server.on('upgrade', (request: IncomingMessage, socket: Socket, head: Buffer) => {
+          const { pathname } = new URL(request.url as string, `http://${request.headers.host}`)
+          if (pathname === this.settings.path) {
+            this.socket.handleUpgrade(request, socket, head, (websocket) => {
+              this.socket.emit('connection', websocket, request)
+            })
+          }
+        })
       })
-    })
+    } else {
+      throw Error('WebSocket API is already initialized')
+    }
   }
   public async dispose() {
     this.socket.clients.forEach((client) => client.close())

package/src/websocket-user-context.ts

@@ -1,6 +1,6 @@
 import { IncomingMessage } from 'http'
 import { IdentityContext, User } from '@furystack/core'
-import { Injectable, Injector } from '@furystack/inject'
+import { Injectable, Injected, Injector } from '@furystack/inject'
 import { HttpUserContext } from '@furystack/rest-service'
 
 @Injectable({ lifetime: 'scoped' })
@@ -32,5 +32,6 @@ export class WebsocketUserContext implements IdentityContext {
     return user as TUser
   }
 
-  constructor(private readonly injector: Injector) {}
+  @Injected(Injector)
+  private readonly injector!: Injector
 }

package/types/actions/whoami.d.ts

@@ -1,13 +1,10 @@
-import { HttpUserContext } from '@furystack/rest-service';
-import ws, { Data } from 'ws';
+import { Data } from 'ws';
 import { WebSocketAction } from '../models/websocket-action';
 import { IncomingMessage } from 'http';
 /**
  * Example action that returns the current user instance
  */
 export declare class WhoAmI implements WebSocketAction {
-    private httpUserContext;
-    private websocket;
     dispose(): void;
     static canExecute(options: {
         data: Data;
@@ -17,6 +14,7 @@ export declare class WhoAmI implements WebSocketAction {
         data: Data;
         request: IncomingMessage;
     }): Promise<void>;
-    constructor(httpUserContext: HttpUserContext, websocket: ws);
+    private readonly httpUserContext;
+    private readonly websocket;
 }
 //# sourceMappingURL=whoami.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"whoami.d.ts","sourceRoot":"","sources":["../../src/actions/whoami.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAEzD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,IAAI,CAAA;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAEtC;;GAEG;AACH,qBACa,MAAO,YAAW,eAAe;IAiBhC,OAAO,CAAC,eAAe;IAAmB,OAAO,CAAC,SAAS;IAhBhE,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;gBASlD,eAAe,EAAE,eAAe,EAAU,SAAS,EAAE,EAAE;CAC5E"}
+{"version":3,"file":"whoami.d.ts","sourceRoot":"","sources":["../../src/actions/whoami.ts"],"names":[],"mappings":"AAEA,OAAW,EAAE,IAAI,EAAE,MAAM,IAAI,CAAA;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAEtC;;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"}

package/types/helpers.d.ts

@@ -9,8 +9,9 @@ import { WebSocketApiSettings } from './websocket-api-settings';
  *    actions: [...my custom actions]
  * })
  * ````
+ *
  * @param injector The injector instance
  * @param settings The Settings object for the WebSocket API
  */
-export declare const useWebsockets: (injector: Injector, settings?: Partial<WebSocketApiSettings> | undefined) => void;
+export declare const useWebsockets: (injector: Injector, settings?: Partial<WebSocketApiSettings>) => void;
 //# sourceMappingURL=helpers.d.ts.map

package/types/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAE5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAA;AAE/D;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,aAAa,aAAc,QAAQ,+DAK/C,CAAA"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAE5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAA;AAE/D;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,aAAa,aAAc,QAAQ,aAAa,QAAQ,oBAAoB,CAAC,SAKzF,CAAA"}

package/types/websocket-api-settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"websocket-api-settings.d.ts","sourceRoot":"","sources":["../src/websocket-api-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAEjD,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,GAAG,CAAA;AAE1D;;GAEG;AACH,qBAAa,oBAAoB;IACxB,IAAI,SAAQ;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,SAAY;IAChB,OAAO,EAAE,KAAK,CAAC,aAAa,CAAC,eAAe,CAAC,GAAG,qBAAqB,CAAC,CAAW;CACzF"}
+{"version":3,"file":"websocket-api-settings.d.ts","sourceRoot":"","sources":["../src/websocket-api-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAc,MAAM,mBAAmB,CAAA;AAE7D,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,GAAG,CAAA;AAE1D;;GAEG;AACH,qBACa,oBAAoB;IACxB,IAAI,SAAQ;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,SAAY;IAChB,OAAO,EAAE,KAAK,CAAC,aAAa,CAAC,eAAe,CAAC,GAAG,qBAAqB,CAAC,CAAW;CACzF"}

package/types/websocket-api.d.ts

@@ -1,19 +1,18 @@
 import { IncomingMessage } from 'http';
-import { ServerManager } from '@furystack/rest-service';
 import { Injector } from '@furystack/inject';
 import { Disposable } from '@furystack/utils';
-import ws, { Data, Server as WebSocketServer } from 'ws';
-import { WebSocketApiSettings } from './websocket-api-settings';
+import ws, { Data } from 'ws';
 /**
  * A WebSocket API implementation for FuryStack
  */
 export declare class WebSocketApi implements Disposable {
-    private settings;
-    serverManager: ServerManager;
-    readonly socket: WebSocketServer;
-    private readonly injector;
+    readonly socket: ws.Server<ws.WebSocket>;
     private clients;
-    constructor(settings: WebSocketApiSettings, serverManager: ServerManager, parentInjector: Injector);
+    private readonly settings;
+    private readonly serverManager;
+    private readonly injector;
+    private isInitialized;
+    init(): void;
     dispose(): Promise<void>;
     broadcast(callback: (options: {
         injector: Injector;

package/types/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;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AACvD,OAAO,EAAc,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,IAAI,eAAe,EAAE,MAAM,IAAI,CAAA;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAA;AAK/D;;GAEG;AACH,qBACa,YAAa,YAAW,UAAU;IAMjC,OAAO,CAAC,QAAQ;IAA+B,aAAa,EAAE,aAAa;IALvF,SAAgB,MAAM,EAAE,eAAe,CAAA;IACvC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAU;IAEnC,OAAO,CAAC,OAAO,CAA0E;gBAErE,QAAQ,EAAE,oBAAoB,EAAS,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,QAAQ;IA6BpG,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,EAAwB,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,EAAE,EAAE,IAAI,EAA6B,MAAM,IAAI,CAAA;AAMxD;;GAEG;AACH,qBACa,YAAa,YAAW,UAAU;IAC7C,SAAgB,MAAM,0BAA0C;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"}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"websocket-user-context.d.ts","sourceRoot":"","sources":["../src/websocket-user-context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACvD,OAAO,EAAc,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAGxD,qBACa,oBAAqB,YAAW,eAAe;IA4B9C,OAAO,CAAC,QAAQ,CAAC,QAAQ;IA3BxB,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;gBAOpC,QAAQ,EAAE,QAAQ;CAChD"}
+{"version":3,"file":"websocket-user-context.d.ts","sourceRoot":"","sources":["../src/websocket-user-context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAIvD,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"}