refactor api controller to internalize server fetch

This commit is contained in:
jeffvli
2025-11-02 21:56:35 -08:00
parent 8dbaec3943
commit c7a473d864
79 changed files with 904 additions and 399 deletions
+6 -13
View File
@@ -4,36 +4,31 @@ import { api } from '/@/renderer/api';
import { controller } from '/@/renderer/api/controller';
import { queryKeys } from '/@/renderer/api/query-keys';
import { QueryHookArgs } from '/@/renderer/lib/react-query';
import { getServerById } from '/@/renderer/store';
import { ListCountQuery, SimilarSongsQuery, SongListQuery } from '/@/shared/types/domain-types';
export const songsQueries = {
list: (args: QueryHookArgs<SongListQuery>, imageSize?: number) => {
return queryOptions({
queryFn: ({ signal }) => {
const server = getServerById(args.serverId);
if (!server) throw new Error('Server not found');
return controller.getSongList({
apiClientProps: { server, signal },
apiClientProps: { serverId: args.serverId, signal },
query: { ...args.query, imageSize },
});
},
queryKey: queryKeys.songs.list(args.serverId || '', { ...args.query, imageSize }),
queryKey: queryKeys.songs.list(args.serverId, { ...args.query, imageSize }),
...args.options,
});
},
listCount: (args: QueryHookArgs<ListCountQuery<SongListQuery>>) => {
return queryOptions({
queryFn: ({ signal }) => {
const server = getServerById(args.serverId);
if (!server) throw new Error('Server not found');
return api.controller.getSongListCount({
apiClientProps: { server, signal },
apiClientProps: { serverId: args.serverId, signal },
query: args.query,
});
},
queryKey: queryKeys.songs.count(
args.serverId || '',
args.serverId,
Object.keys(args.query).length === 0 ? undefined : args.query,
),
...args.options,
@@ -42,10 +37,8 @@ export const songsQueries = {
similar: (args: QueryHookArgs<SimilarSongsQuery>) => {
return queryOptions({
queryFn: ({ signal }) => {
const server = getServerById(args.serverId);
if (!server) throw new Error('Server not found');
return api.controller.getSimilarSongs({
apiClientProps: { server, signal },
apiClientProps: { serverId: args.serverId, signal },
query: {
albumArtistIds: args.query.albumArtistIds,
count: args.query.count ?? 50,
@@ -53,7 +46,7 @@ export const songsQueries = {
},
});
},
queryKey: queryKeys.songs.similar(args.serverId || '', args.query),
queryKey: queryKeys.songs.similar(args.serverId, args.query),
...args.options,
});
},