olaven
/
nrss
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

refactor: Use correct types 

Signed-off-by: Tim Hårek Andreassen <tim@harek.no>
This commit is contained in:
Tim Hårek Andreassen 2024-03-30 13:16:40 +01:00
parent f4ec8f8d36
commit eef098a593
No known key found for this signature in database
GPG Key ID: E59C7734F0E10EB5
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/nrk.ts
View File

@ -4,9 +4,13 @@ import { components as catalogComponents } from "./nrk-catalog.ts";
import { z } from "zod";
type ArrayElement<A> = A extends readonly (infer T)[] ? T : never;
type PodcastEpisodes = catalogComponents["schemas"]["EpisodesHalResource"];
type Podcast = catalogComponents["schemas"]["SeriesHalResource"];
type PodcastEpisodesSingle = catalogComponents["schemas"]["EpisodeHalResource"];
export type Serie = catalogComponents["schemas"]["SeriesViewModel"];
type _OriginalEpisode = catalogComponents["schemas"]["EpisodeHalResource"];
export type OriginalEpisode = _OriginalEpisode & { url: string };
export type OriginalEpisode = PodcastEpisodesSingle & { url: string };
export type PodcastEpisode = catalogComponents["schemas"]["PodcastEpisodeHalResource"];
export type SearchResultList = searchComponents["schemas"]["seriesResult"]["results"];
export type SearchResult = ArrayElement<SearchResultList> & {
description?: string;
@ -32,7 +36,7 @@ type Manifest = z.infer<typeof manifestSchema>;
const nrkAPI = `https://psapi.nrk.no`;
async function withDownloadLink(
episode: _OriginalEpisode,
episode: PodcastEpisodesSingle,
): Promise<OriginalEpisode> {
// getting stream link
const [playbackStatus, playbackResponseRaw] = await get<Manifest>(
@ -63,10 +67,10 @@ export const nrkRadio = {
[episodeStatus, episodeResponse],
[seriesStatus, serieResponse],
] = await Promise.all([
get<catalogComponents["schemas"]["EpisodesHalResource"]>(
get<PodcastEpisodes>(
`${nrkAPI}/radio/catalog/podcast/${seriesId}/episodes`,
),
get<catalogComponents["schemas"]["SeriesHalResource"]>(
get<Podcast>(
`${nrkAPI}/radio/catalog/podcast/${seriesId}`,
),
]);
@ -85,9 +89,9 @@ export const nrkRadio = {
}
throw `Error getting episodes for ${seriesId}: EpisodeStatus: ${episodeStatus}. SerieStatus: ${seriesStatus}`;
},
getEpisode: async (seriesId: string, episodeId: string): Promise<OriginalEpisode | null> => {
getEpisode: async (seriesId: string, episodeId: string): Promise<PodcastEpisode | null> => {
const url = `${nrkAPI}/radio/catalog/podcast/${seriesId}/episodes/${episodeId}`;
const [status, episode] = await get<OriginalEpisode>(url);
const [status, episode] = await get<PodcastEpisode>(url);
if (status === OK && episode) {
return episode;
}

7
routes/api/feeds/[seriesId]/[episodeId]/chapters.ts
View File

@ -1,13 +1,16 @@
import { FreshContext } from "$fresh/server.ts";
import { parse, toSeconds } from "https://esm.sh/iso8601-duration@2.1.1";
import { nrkRadio, OriginalEpisode } from "../../../../../lib/nrk.ts";
import { nrkRadio, PodcastEpisode } from "../../../../../lib/nrk.ts";
type Chapter = {
title: string | undefined;
startTime: number | undefined;
};
function toChapters(episode: OriginalEpisode): Chapter[] {
function toChapters(episode: PodcastEpisode): Chapter[] | null {
if (!episode.indexPoints) {
return null;
}
return episode.indexPoints.map((indexPoint) => ({
title: indexPoint.title,
startTime: indexPoint.startPoint ? toSeconds(parse(indexPoint.startPoint)) : undefined,