feat(webui): expose shell status in root context

- add a shared shell client and root /status query
- attach shell status to the TanStack root context for React routes
- keep the shell bridge types and test setup aligned with the new status data
pull/590/head
Antti Kettunen 5 days ago
parent ca84aa2e65
commit fec66e4de8
No known key found for this signature in database
GPG Key ID: C6B2A3D250359BD7

@ -6,12 +6,21 @@ const apiBaseUrl =
typeof globalThis.location === 'object'
? new URL('/api/', globalThis.location.origin).toString()
: 'http://localhost/api/';
const shellBaseUrl =
typeof globalThis.location === 'object'
? new URL('/', globalThis.location.origin).toString()
: 'http://localhost/';
export const apiClient = ky.create({
baseUrl: apiBaseUrl,
retry: 0,
});
export const shellClient = ky.create({
baseUrl: shellBaseUrl,
retry: 0,
});
export async function readJson<T>(promise: ResponsePromise<T>): Promise<T> {
try {
return await promise.json<T>();

@ -1,5 +1,7 @@
import type { AnyRouter } from '@tanstack/react-router';
import type { ShellStatusPayload } from './status';
import {
getShellRouteByPageId,
normalizeShellPath,
@ -17,6 +19,7 @@ export interface ShellProfileContext {
export interface ShellContext {
bridge: ShellBridge;
profile: ShellProfileContext;
status?: ShellStatusPayload | null;
}
export type ShellBridge = NonNullable<typeof window.SoulSyncWebShellBridge>;
@ -95,7 +98,8 @@ export function bindWindowWebRouter(router: AnyRouter) {
let href: `/${string}` = route.path;
if (pageId === 'artist-detail' && options?.artistId) {
const source = options.artistSource ? String(options.artistSource) : 'library';
href = `/artist-detail/${encodeURIComponent(source)}/${encodeURIComponent(String(options.artistId))}` as `/${string}`;
href =
`/artist-detail/${encodeURIComponent(source)}/${encodeURIComponent(String(options.artistId))}` as `/${string}`;
}
await router.navigate({ href, replace: options?.replace === true });

@ -21,6 +21,10 @@ export function useProfile() {
return useShellContext().profile;
}
export function useShellStatus() {
return useShellContext().status ?? null;
}
export function LegacyRouteController({ pathname }: { pathname: string }) {
const bridge = useShellBridge();

@ -0,0 +1,19 @@
import { describe, expect, it } from 'vitest';
import { HttpResponse, http, server } from '@/test/msw';
import { fetchShellStatus } from './status';
describe('shell status', () => {
it('fetches the shell status payload', async () => {
server.use(
http.get('/status', () =>
HttpResponse.json({ media_server: { type: 'plex', connected: true } }),
),
);
await expect(fetchShellStatus()).resolves.toEqual({
media_server: { type: 'plex', connected: true },
});
});
});

@ -0,0 +1,25 @@
import { queryOptions } from '@tanstack/react-query';
import { readJson, shellClient } from '@/app/api-client';
export interface ShellStatusMediaServer {
type?: string | null;
connected?: boolean | null;
}
export interface ShellStatusPayload {
media_server?: ShellStatusMediaServer | null;
}
export async function fetchShellStatus(): Promise<ShellStatusPayload> {
return await readJson<ShellStatusPayload>(shellClient.get('status'));
}
export function shellStatusQueryOptions() {
return queryOptions({
queryKey: ['shell', 'status'] as const,
queryFn: fetchShellStatus,
staleTime: 30_000,
retry: false,
});
}

@ -3,13 +3,18 @@ import { Outlet, createRootRouteWithContext } from '@tanstack/react-router';
import type { AppRouterContext } from '@/app/router';
import { waitForShellContext } from '@/platform/shell/bridge';
import { shellStatusQueryOptions } from '@/platform/shell/status';
import { IssueDomainHost } from './issues/-ui/issue-domain-host';
export const Route = createRootRouteWithContext<AppRouterContext>()({
beforeLoad: async () => {
const shell = await waitForShellContext();
return { shell };
beforeLoad: async ({ context }) => {
const [shell, status] = await Promise.all([
waitForShellContext(),
context.queryClient.fetchQuery(shellStatusQueryOptions()).catch(() => undefined),
]);
return { shell: { ...shell, status } };
},
component: () => (
<>

@ -1,12 +1,20 @@
import '@testing-library/jest-dom/vitest';
import { afterAll, afterEach, beforeAll, vi } from 'vitest';
import { afterAll, afterEach, beforeAll, beforeEach, vi } from 'vitest';
import { server } from './src/test/msw';
import { HttpResponse, http, server } from './src/test/msw';
beforeAll(() => {
server.listen({ onUnhandledRequest: 'error' });
});
beforeEach(() => {
server.use(
http.get('/status', () =>
HttpResponse.json({ media_server: { type: 'plex', connected: true } }),
),
);
});
afterEach(() => {
server.resetHandlers();
});

Loading…
Cancel
Save