@furystack/websocket-api 9.0.12 → 9.0.13

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=whoami.spec.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"whoami.spec.d.ts","sourceRoot":"","sources":["../../src/actions/whoami.spec.ts"],"names":[],"mappings":""}

package/esm/actions/whoami.spec.js

@@ -0,0 +1,33 @@
+import { WhoAmI } from './whoami.js';
+import { HttpUserContext } from '@furystack/rest-service';
+import ws from 'ws';
+import { usingAsync } from '@furystack/utils';
+import { Injector } from '@furystack/inject';
+import { describe, it, expect, vi } from 'vitest';
+describe('Whoami action', () => {
+    const currentUser = { username: 'testuser' };
+    const contextMock = { getCurrentUser: async () => currentUser };
+    const request = { url: 'https://google.com' };
+    const wsMock = {
+        send: vi.fn(() => undefined),
+    };
+    it('cannot be executed if data does not match', () => {
+        expect(WhoAmI.canExecute({ request, data: 'asd' })).toBeFalsy();
+    });
+    it('can be executed with whoami', () => {
+        expect(WhoAmI.canExecute({ request, data: 'whoami' })).toBeTruthy();
+    });
+    it('can be executed with whoami /claims', () => {
+        expect(WhoAmI.canExecute({ request, data: 'whoami /claims' })).toBeTruthy();
+    });
+    it('Should return the current user', async () => {
+        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 }));
+        });
+    });
+});
+//# sourceMappingURL=whoami.spec.js.map

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

@@ -0,0 +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"}

package/esm/helpers.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=helpers.spec.d.ts.map

package/esm/helpers.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"helpers.spec.d.ts","sourceRoot":"","sources":["../src/helpers.spec.ts"],"names":[],"mappings":""}

package/esm/helpers.spec.js

@@ -0,0 +1,14 @@
+import { usingAsync } from '@furystack/utils';
+import { Injector } from '@furystack/inject';
+import { useWebsockets } from './helpers.js';
+import { describe, it, expect } from 'vitest';
+import { WebSocketApiSettings } from './websocket-api-settings.js';
+describe('WebSocket Helpers', () => {
+    it('Should register the settings', async () => {
+        await usingAsync(new Injector(), async (i) => {
+            useWebsockets(i);
+            expect(i.cachedSingletons.has(WebSocketApiSettings)).toBeTruthy();
+        });
+    });
+});
+//# sourceMappingURL=helpers.spec.js.map

package/esm/helpers.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"helpers.spec.js","sourceRoot":"","sources":["../src/helpers.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC7C,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,aAAa,CAAC,CAAC,CAAC,CAAA;YAChB,MAAM,CAAC,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC,UAAU,EAAE,CAAA;QACnE,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=websocket-api.spec.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"websocket-api.spec.d.ts","sourceRoot":"","sources":["../src/websocket-api.spec.ts"],"names":[],"mappings":""}

package/esm/websocket-api.spec.js

@@ -0,0 +1,84 @@
+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;
+};
+import { Injector, Injectable } from '@furystack/inject';
+import { usingAsync } from '@furystack/utils';
+import { WebSocketApi } from './websocket-api.js';
+import WebSocket from 'ws';
+import { useWebsockets } from './helpers.js';
+import { describe, it, expect } from 'vitest';
+const portGenerator = function* () {
+    const initialPort = 19998;
+    let port = initialPort;
+    while (true) {
+        yield port++;
+    }
+};
+const getPort = () => portGenerator().next().value;
+describe('WebSocketApi', () => {
+    it('Should be built', async () => {
+        await usingAsync(new Injector(), async (i) => {
+            useWebsockets(i, { port: getPort() });
+            expect(i.getInstance(WebSocketApi)).toBeInstanceOf(WebSocketApi);
+        });
+    });
+    it('Should be built with settings', async () => {
+        await usingAsync(new Injector(), async (i) => {
+            useWebsockets(i, { path: '/web-socket', port: getPort() });
+            expect(i.getInstance(WebSocketApi)).toBeInstanceOf(WebSocketApi);
+        });
+    });
+    it('Should broadcast messages', async () => {
+        const port = getPort();
+        await usingAsync(new Injector(), async (i) => {
+            expect.assertions(5); // All 5 clients should receive the message
+            useWebsockets(i, { path: '/web-socket', port });
+            const api = i.getInstance(WebSocketApi);
+            await Promise.all([1, 2, 3, 4, 5].map(async () => {
+                const client = new WebSocket(`ws://localhost:${port}/web-socket`);
+                await new Promise((resolve) => client.once('open', () => {
+                    resolve();
+                }));
+                client.once('message', (data) => {
+                    expect(data.toString()).toBe('alma');
+                });
+                await api.broadcast(({ ws }) => {
+                    ws.send('alma');
+                });
+                client.close();
+                await new Promise((resolve) => client.once('close', () => resolve()));
+            }));
+        });
+    });
+    it('Should receive client messages', async () => {
+        const port = getPort();
+        await usingAsync(new Injector(), async (i) => {
+            expect.assertions(1);
+            const data = { value: 'alma' };
+            let ExampleWsAction = class ExampleWsAction {
+                dispose() {
+                    /** */
+                }
+                static canExecute() {
+                    return true;
+                }
+                async execute(incomingData) {
+                    expect(JSON.parse(incomingData.data.toString())).toEqual(data);
+                }
+            };
+            ExampleWsAction = __decorate([
+                Injectable()
+            ], ExampleWsAction);
+            useWebsockets(i, { path: '/web-socket', port, actions: [ExampleWsAction] });
+            const client = new WebSocket(`ws://localhost:${port}/web-socket`);
+            await new Promise((resolve) => client.once('open', () => resolve()));
+            await new Promise((resolve, reject) => client.send(JSON.stringify(data), (err) => (err ? reject(err) : resolve())));
+            client.close();
+            await new Promise((resolve) => client.once('close', () => resolve()));
+        });
+    });
+});
+//# sourceMappingURL=websocket-api.spec.js.map

package/esm/websocket-api.spec.js.map

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

package/esm/websocket-integration.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=websocket-integration.spec.d.ts.map

package/esm/websocket-integration.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"websocket-integration.spec.d.ts","sourceRoot":"","sources":["../src/websocket-integration.spec.ts"],"names":[],"mappings":""}

package/esm/websocket-integration.spec.js

@@ -0,0 +1,62 @@
+import { Injector } from '@furystack/inject';
+import { WhoAmI } from './actions/whoami.js';
+import ws from 'ws';
+import { addStore, InMemoryStore, User } from '@furystack/core';
+import { DefaultSession, ServerManager, useHttpAuthentication } from '@furystack/rest-service';
+import { useRestService } from '@furystack/rest-service';
+import { useWebsockets } from './helpers.js';
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+const portGenerator = function* () {
+    const initialPort = 19000;
+    let port = initialPort;
+    while (true) {
+        yield port++;
+    }
+};
+const getPort = () => portGenerator().next().value;
+describe('WebSocket Integration tests', () => {
+    const host = 'localhost';
+    const path = '/ws';
+    let i;
+    let client;
+    beforeEach(async () => {
+        i = new Injector();
+        const port = getPort();
+        useRestService({
+            injector: i,
+            api: {},
+            root: '',
+            port,
+            hostName: host,
+        });
+        addStore(i, new InMemoryStore({ model: User, primaryKey: 'username' })).addStore(new InMemoryStore({ model: DefaultSession, primaryKey: 'sessionId' }));
+        useHttpAuthentication(i, {});
+        useWebsockets(i, { actions: [WhoAmI], path, port, host });
+        await new Promise((done, reject) => {
+            i.getInstance(ServerManager)
+                .getOrCreate({ port })
+                .then(() => {
+                client = new ws(`ws://${host}:${port}/ws`);
+                client
+                    .on('open', () => {
+                    done();
+                })
+                    .on('error', reject);
+            });
+        });
+    });
+    afterEach(async () => {
+        await i.dispose();
+    });
+    it('Should be connected', async () => {
+        await new Promise((done) => {
+            client.on('message', (data) => {
+                expect(data.toString()).toBe('{"currentUser":null}');
+                client.close();
+                done();
+            });
+            client.send('whoami');
+        });
+    });
+});
+//# sourceMappingURL=websocket-integration.spec.js.map

package/esm/websocket-integration.spec.js.map

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

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

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

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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,68 @@
+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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@furystack/websocket-api",
-  "version": "9.0.12",
+  "version": "9.0.13",
   "description": "HTTP Api FuryStack package",
   "type": "module",
   "scripts": {
@@ -34,16 +34,16 @@
   },
   "homepage": "https://github.com/furystack/furystack",
   "dependencies": {
-    "@furystack/core": "^12.0.10",
-    "@furystack/inject": "^8.1.0",
-    "@furystack/rest-service": "^7.0.12",
-    "@furystack/utils": "^4.0.9",
-    "ws": "^8.13.0"
+    "@furystack/core": "^12.0.11",
+    "@furystack/inject": "^8.1.1",
+    "@furystack/rest-service": "^7.0.13",
+    "@furystack/utils": "^4.0.10",
+    "ws": "^8.14.2"
   },
   "devDependencies": {
-    "@types/ws": "^8.5.5",
+    "@types/ws": "^8.5.8",
     "typescript": "^5.2.2",
-    "vitest": "^0.34.3"
+    "vitest": "^0.34.6"
   },
   "gitHead": "1045d854bfd8c475b7035471d130d401417a2321"
 }

package/src/actions/whoami.spec.ts

@@ -1,4 +1,4 @@
-import { WhoAmI } from './whoami'
+import { WhoAmI } from './whoami.js'
 import { HttpUserContext } from '@furystack/rest-service'
 import ws from 'ws'
 import { usingAsync } from '@furystack/utils'

package/src/helpers.spec.ts

@@ -1,8 +1,8 @@
 import { usingAsync } from '@furystack/utils'
 import { Injector } from '@furystack/inject'
-import { useWebsockets } from './helpers'
-import { WebSocketApiSettings } from '.'
+import { useWebsockets } from './helpers.js'
 import { describe, it, expect } from 'vitest'
+import { WebSocketApiSettings } from './websocket-api-settings.js'
 
 describe('WebSocket Helpers', () => {
   it('Should register the settings', async () => {

package/src/websocket-api.spec.ts

@@ -1,9 +1,9 @@
 import { Injector, Injectable } from '@furystack/inject'
 import { usingAsync } from '@furystack/utils'
-import { WebSocketApi } from './websocket-api'
+import { WebSocketApi } from './websocket-api.js'
 import WebSocket from 'ws'
-import type { WebSocketAction } from './models'
-import { useWebsockets } from './helpers'
+import type { WebSocketAction } from './models/websocket-action.js'
+import { useWebsockets } from './helpers.js'
 import { describe, it, expect } from 'vitest'
 
 const portGenerator = function* () {
@@ -33,18 +33,14 @@ describe('WebSocketApi', () => {
   it('Should broadcast messages', async () => {
     const port = getPort()
     await usingAsync(new Injector(), async (i) => {
-      expect.assertions(4) // All 4 clients should receive the message
+      expect.assertions(5) // All 5 clients should receive the message
       useWebsockets(i, { path: '/web-socket', port })
       const api = i.getInstance(WebSocketApi)
       await Promise.all(
-        [1, 2, 3, 4, 5].map(async (idx) => {
+        [1, 2, 3, 4, 5].map(async () => {
           const client = new WebSocket(`ws://localhost:${port}/web-socket`)
           await new Promise<void>((resolve) =>
             client.once('open', () => {
-              if (idx === 5) {
-                client.close()
-                client.terminate()
-              }
               resolve()
             }),
           )

package/src/websocket-integration.spec.ts

@@ -1,10 +1,10 @@
 import { Injector } from '@furystack/inject'
-import { WhoAmI } from './actions/whoami'
+import { WhoAmI } from './actions/whoami.js'
 import ws from 'ws'
 import { addStore, InMemoryStore, User } from '@furystack/core'
 import { DefaultSession, ServerManager, useHttpAuthentication } from '@furystack/rest-service'
 import { useRestService } from '@furystack/rest-service'
-import { useWebsockets } from './helpers'
+import { useWebsockets } from './helpers.js'
 import { describe, it, expect, beforeEach, afterEach } from 'vitest'
 
 const portGenerator = function* () {

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

@@ -3,7 +3,7 @@ import { IncomingMessage } from 'http'
 import '.'
 import { HttpUserContext } from '@furystack/rest-service'
 import { usingAsync } from '@furystack/utils'
-import { WebsocketUserContext } from './websocket-user-context'
+import { WebsocketUserContext } from './websocket-user-context.js'
 import { describe, it, expect, vi } from 'vitest'
 
 describe('WebSocket User Context', () => {