feat(frontend-core): add WebSocket API URL helper

packages/core/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@websdr/core",
-    "version": "0.6.0",
+    "version": "0.6.1",
     "description": "This is the core package for WebSDR",
     "author": "Timur Davydov <dtv.comp@gmail.com>",
     "license": "MIT",

packages/frontend-core/README.md

@@ -57,6 +57,14 @@ const profile = await apiFetch<Profile>('/api/auth/profile');
 
 If `setApiBase()` is not called, the helper tries `globalThis.__API_BASE__`, then `process.env.VITE_API_URL` / `process.env.API_URL`, then `import.meta.env.VITE_API_URL` / `import.meta.env.API_URL`, and finally falls back to `/`.
 
+For WebSocket endpoints that share the same API base, use `apiWsUrl()`. It resolves the `/` fallback against `globalThis.location` and converts `http:` / `https:` to `ws:` / `wss:`.
+
+```ts
+import { apiWsUrl } from '@websdr/frontend-core/services';
+
+const rpcUrl = apiWsUrl('/rpc');
+```
+
 You can also set the API base via a global variable (useful for `index.html` deployments):
 
 ```ts

packages/frontend-core/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@websdr/frontend-core",
-    "version": "0.6.0",
+    "version": "0.6.1",
     "description": "This is the core frontend package for WebSDR",
     "author": "Timur Davydov <dtv.comp@gmail.com>",
     "license": "MIT",
@@ -37,7 +37,7 @@
         "postpack": "rm -f ./LICENSE"
     },
     "dependencies": {
-        "@websdr/core": "^0.6.0",
+        "@websdr/core": "^0.6.1",
         "usb": "^2.17.0"
     },
     "devDependencies": {

packages/frontend-core/src/services/api.ts

@@ -47,6 +47,31 @@ export function apiUrl(path = ''): string {
     return `${base.replace(/\/+$/, '')}/${path.replace(/^\/+/, '')}`;
 }
 
+export function apiWsUrl(path = '', port?: number): string {
+    const httpUrl = apiUrl(path);
+    const baseUrl = typeof globalThis.location === 'object'
+        ? globalThis.location.href
+        : undefined;
+
+    if (!baseUrl && httpUrl.startsWith('/')) {
+        throw new Error('Cannot build a WebSocket API URL from a relative API base without globalThis.location');
+    }
+
+    const url = new URL(httpUrl, baseUrl);
+
+    if (url.protocol === 'https:') {
+        url.protocol = 'wss:';
+    } else if (url.protocol === 'http:') {
+        url.protocol = 'ws:';
+    }
+
+    if (port !== undefined) {
+        url.port = String(port);
+    }
+
+    return url.toString();
+}
+
 export async function apiFetch<T = any>(path: string, init?: RequestInit): Promise<T> {
     const url = apiUrl(path);
     const res = await fetch(url, { ...init, credentials: 'include' });
@@ -77,5 +102,6 @@ export default {
     setApiBase,
     getApiBase,
     apiUrl,
+    apiWsUrl,
     apiFetch,
 };

packages/frontend-core/src/services/index.ts

@@ -1,2 +1,2 @@
-export { setApiBase, getApiBase, apiUrl, apiFetch } from "./api";
-export { login, logout, getProfile } from "./auth";
+export { setApiBase, getApiBase, apiUrl, apiWsUrl, apiFetch } from "./api";
+export { login, logout, getProfile } from "./auth";

packages/frontend-core/src/tests/services/api.test.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { apiFetch, setApiBase } from '@/services/api';
+import { apiFetch, apiWsUrl, setApiBase } from '@/services/api';
 
 describe('apiFetch', () => {
     let originalFetch: typeof fetch | undefined;
@@ -100,6 +100,49 @@ describe('apiFetch', () => {
     });
 
 });
+
+describe('apiWsUrl', () => {
+    let originalLocation: Location | undefined;
+
+    beforeEach(() => {
+        originalLocation = globalThis.location;
+        setApiBase(undefined);
+    });
+
+    afterEach(() => {
+        if (originalLocation === undefined) {
+            delete (globalThis as { location?: Location }).location;
+        } else {
+            Object.defineProperty(globalThis, 'location', {
+                value: originalLocation,
+                configurable: true,
+            });
+        }
+        setApiBase(undefined);
+    });
+
+    it('builds a websocket URL from an absolute HTTPS API base', () => {
+        setApiBase('https://api.example.com');
+
+        expect(apiWsUrl('/rpc')).toBe('wss://api.example.com/rpc');
+    });
+
+    it('overrides the websocket URL port when provided', () => {
+        setApiBase('https://api.example.com');
+
+        expect(apiWsUrl('/rpc', 8080)).toBe('wss://api.example.com:8080/rpc');
+    });
+
+    it('builds a websocket URL from the current origin when API base falls back to "/"', () => {
+        Object.defineProperty(globalThis, 'location', {
+            value: new URL('https://app.example.com/current/page'),
+            configurable: true,
+        });
+
+        expect(apiWsUrl('/rpc')).toBe('wss://app.example.com/rpc');
+    });
+});
+
 // Tests for getEnvApiBase (indirectly via the public getApiBase)
 describe('getEnvApiBase via getApiBase', () => {
     let originalApiBaseGlobal: any;

packages/frontend-core/src/webusb/streaming/webUsbSourceSink.ts

@@ -97,6 +97,7 @@ export class WebUsbSourceSink extends WebUsbDeviceControlBase {
     }
 
     close() {
+        this.stopStream();
         void this.closeDevice();
         this._streamMeterData?.down();
     }

packages/nestjs-microservice/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@websdr/nestjs-microservice",
-    "version": "0.6.0",
+    "version": "0.6.1",
     "description": "This is a NestJS microservice for WebSDR",
     "author": "Timur Davydov <dtv.comp@gmail.com>",
     "license": "MIT",
@@ -33,7 +33,7 @@
         "postpack": "rm -f ./LICENSE"
     },
     "dependencies": {
-        "@websdr/core": "^0.6.0",
+        "@websdr/core": "^0.6.1",
         "class-transformer": "^0.5.1",
         "class-validator": "^0.15.1",
         "passport-jwt": "^4.0.1",

packages/vue3-components/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@websdr/vue3-components",
-    "version": "0.6.0",
+    "version": "0.6.1",
     "description": "This is a Vue 3 components package for WebSDR",
     "author": "Timur Davydov <dtv.comp@gmail.com>",
     "license": "MIT",
@@ -37,8 +37,8 @@
         "postpack": "rm -f ./LICENSE"
     },
     "dependencies": {
-        "@websdr/core": "^0.6.0",
-        "@websdr/frontend-core": "^0.6.0"
+        "@websdr/core": "^0.6.1",
+        "@websdr/frontend-core": "^0.6.1"
     },
     "devDependencies": {
         "@vitejs/plugin-vue": "^6.0.7",