refactor: improve typings

src/types/Addon.d.ts

@@ -0,0 +1,20 @@
+type AddonManifest = {
+    id: string,
+    version: string,
+    name: string,
+    description: string,
+    contactEmail: string,
+    logo: string,
+    background: string,
+    types: string[],
+};
+
+type Addon = {
+    installed: boolean,
+    manifest: AddonManifest,
+    transportUrl: string,
+};
+
+type AddonsDeepLinks = {
+    addons: string,
+};

src/types/CatalogsWithExtra.d.ts

@@ -1,7 +0,0 @@
-type CatalogsWithExtra = {
-    catalogs: Catalog<Loadable<MetaItem[]>, DiscoverDeepLinks>[] | null,
-    selected: {
-        type: string | null,
-        extra: [string, string][]
-    } | null,
-};

src/types/Discover.d.ts

@@ -1,16 +0,0 @@
-type DiscoverDeepLinks = {
-    discover: string,
-};
-
-type Discover = {
-    catalog: Catalog<Loadable<MetaItem[]>> | null,
-    selectable: {
-        catalogs: DiscoverCatalogOption<DiscoverDeepLinks>,
-        extra: ExtraOption<DiscoverDeepLinks>[],
-        types: TypeOption<DiscoverDeepLinks>[],
-        nextPage: boolean,
-    },
-    selected: {
-        request: ResourceRequest,
-    } | null,
-};

src/types/LibraryItem.d.ts

@@ -0,0 +1,34 @@
+type LibraryItemState = {
+    lastWatched: string,
+    timeWatched: number,
+    timesWatched: number,
+    flaggedWatched: number,
+    overallTimeWatched: number,
+    timeOffset: number,
+    duration: number,
+    video_id: string,
+    watched: string,
+    lastVidReleased: string,
+    noNotif: boolean,
+};
+
+type LibraryItem = {
+    _id: string,
+    name: string,
+    type: string,
+    poster: string,
+    posterShape: PosterShape,
+    removed: number,
+    temp: number,
+    _ctime: string,
+    _mtime: number,
+    state: LibraryItemState,
+    behaviorHints: BehaviorHints,
+};
+
+type LibraryItemDeepLinks = {
+    metaDetailsVideos: string | null,
+    metaDetailsStreams: string | null,
+    player: string | null,
+    externalPlayer: ExternalPlayerLinks | null,
+};

src/types/MetaItem.d.ts

@@ -0,0 +1,32 @@
+type Link = {
+    name: string,
+    category: string,
+    url: string,
+};
+
+type MetaItemPreview = {
+    id: string,
+    type: string,
+    name: string,
+    description: string | null,
+    logo: string | null,
+    background: string | null,
+    poster: string | null,
+    posterShape: PosterShape,
+    releaseInfo: string | null,
+    runtime: string | null,
+    released: string | null,
+    trailerStreams: TrailerStream[],
+    links: Link[],
+    behaviorHints: BehaviorHints,
+};
+
+interface MetaItem extends MetaItemPreview {
+    videos: Video[],
+}
+
+type MetaItemDeepLinks = {
+    metaDetailsVideos: string | null,
+    metaDetailsStreams: string | null,
+    player: string | null,
+};

src/types/Player.d.ts

@@ -1,18 +0,0 @@
-type Player = {
-    addon: Addon | null,
-    libraryItem: LibraryItem | null,
-    metaItem: Loadable<MetaItem> | null,
-    nextVideo: Video | null,
-    selected: {
-        stream: Stream,
-        metaRequest: ResourceRequest,
-        streamRequest: ResourceRequest,
-        subtitlesPath: ResourceRequestPath,
-    } | null,
-    seriesInfo: {
-        season: number,
-        episode: number,
-    } | null,
-    subtitles: Subtitle[],
-    title: string | null,
-};

src/types/Selectable.d.ts

@@ -0,0 +1,27 @@
+type SelectableType<T> = {
+    type: string,
+    selected: boolean,
+    deepLinks: T
+};
+
+type SelectableSort<T> = {
+    sort: string,
+    selected: boolean,
+    deepLinks: T
+};
+
+type SelectableExtra<T> = {
+    isRequired: boolean,
+    name: string,
+    options: {
+        deepLinks: T,
+        selected: boolean,
+        value: string | null,
+    }
+};
+
+type SelectableCatalog<T> = {
+    name: string,
+    selected: boolean,
+    deepLinks: T,
+};

src/types/Stream.d.ts

@@ -0,0 +1,18 @@
+
+type StreamDeepLinks = {
+    player: string | null,
+    externalPlayer: ExternalPlayerLinks,
+}
+
+type Stream = {
+    ytId?: string,
+    name: string,
+    description: string,
+    infoHash?: string,
+    fileIdx?: string,
+    externalUrl?: string,
+    deepLinks: {
+        player: string,
+        externalPlayer: ExternalPlayerLinks,
+    },
+};

src/types/Video.d.ts

@@ -0,0 +1,17 @@
+type VideoDeepLinks = {
+    metaDetailsStreams: string,
+    player: string | null,
+    externalPlayer: ExternalPlayerLinks | null,
+};
+
+type Video = {
+    id: string,
+    title: string,
+    overview: string | null,
+    released: string | null,
+    thumbnail: string | null,
+    season?: number,
+    episode?: number,
+    streams: Stream[],
+    trailerStreams: TrailerStream[],
+};

src/types/common.d.ts

@@ -1,200 +0,0 @@
-interface UrlParams extends Record<string, string> {
-    path: string,
-}
-
-type LoadableError = string | {
-    type: string,
-    content: {
-        code: number,
-        message: string,
-    }
-};
-
-type Loadable<T> = {
-    type: 'Ready' | 'Loading' | 'Err',
-    content: T | LoadableError,
-};
-
-type ResourceRequestPath = {
-    id: string,
-    type: string,
-    resource: string,
-    extra: [string, string][]
-};
-
-type ResourceRequest = {
-    base: string,
-    path: ResourceRequestPath,
-};
-
-type ExternalPlayerDeepLinks = {
-    androidTv: string | null,
-    download: string | null,
-    fileName: string | null,
-    href: string | null,
-    tizen: string | null,
-    webos: string | null,
-};
-
-type AddonsDeepLinks = {
-    addons: string,
-};
-
-type Torrent = [
-    {
-        extra: any[],
-        id: string,
-        resource: string,
-        type: string,
-    },
-    {
-        metaDetailsStreams: string | null,
-        metaDetailsVideos: string | null,
-        player: string | null,
-    }
-];
-
-type Subtitle = {
-    id: string,
-    lang: string,
-    origin: string,
-    url: string,
-};
-
-type Addon = {
-    installed: boolean,
-    manifest: {
-        id: string,
-        types: string[],
-        name: string,
-        description: string,
-        version: string,
-        logo: string | null,
-        background: string | null,
-    },
-    transportUrl: string,
-};
-
-type Stream = {
-    ytId?: string,
-    name: string,
-    description: string,
-    infoHash?: string,
-    fileIdx?: string,
-    externalUrl?: string,
-    deepLinks: {
-        player: string,
-        externalPlayer: ExternalPlayerDeepLinks,
-    },
-};
-
-type TrailerStream = {
-    ytId: string,
-    description: string,
-    deepLinks: {
-        player: string,
-        externalPlayer: ExternalPlayerDeepLinks,
-    },
-};
-
-type Video = {
-    id: string,
-    title: string,
-    overview: string,
-    released: string,
-    thumbnail: string,
-    season?: number,
-    episode?: number,
-    watched: boolean,
-    deepLinks: {
-        externalPlayer: ExternalPlayerDeepLinks | null,
-        metaDetailsStreams: string | null,
-        player: string | null,
-    }
-};
-
-type Link = {
-    name: string,
-    category: string,
-    url: string,
-};
-
-type Item = {
-    type: string,
-    name: string,
-    poster: string,
-    posterShape: string,
-};
-
-interface LibraryItem extends Item {
-    _id: string,
-    progress: number,
-    state: {
-        timeOffset: number,
-        video_id: string,
-    },
-}
-
-interface MetaItem extends Item {
-    id: string,
-    description: string,
-    logo: string,
-    background: string,
-    releaseInfo: string,
-    released: string,
-    runtime: string,
-    videos: Video[],
-    trailerStreams: TrailerStream[],
-    links: Link[],
-    inLibrary: boolean,
-    watched: boolean,
-    deepLinks: {
-        metaDetailsStreams: string | null,
-        metaDetailsVideos: string | null,
-        player: string | null,
-    }
-}
-
-type Catalog<T, D = any> = {
-    title?: string,
-    content: T,
-    installed?: boolean,
-    deepLinks?: D,
-};
-
-type TypeOption<T> = {
-    type: string,
-    selected: boolean,
-    deepLinks: T
-};
-
-type SortOption<T> = {
-    sort: string,
-    selected: boolean,
-    deepLinks: T
-};
-
-type ExtraOption<T> = {
-    isRequired: boolean,
-    name: string,
-    options: {
-        deepLinks: T,
-        selected: boolean,
-        value: string | null,
-    }
-};
-
-type CatalogOption<T> = {
-    name: string,
-    selected: boolean,
-    deepLinks: T,
-};
-
-interface DiscoverCatalogOption<T> extends CatalogOption<T> {
-    id: string,
-    addon: Addon,
-}
-
-interface AddonCatalogOption<T> extends CatalogOption<T> {
-    id?: string,
-}

src/types/models/CatalogsWithExtra.d.ts

@@ -0,0 +1,11 @@
+interface MetaItemPreviewCatalogsWithExtra extends MetaItemPreview {
+    deepLinks: MetaItemDeepLinks,
+}
+
+type CatalogsWithExtra = {
+    catalogs: Catalog<Loadable<MetaItemPreviewCatalogsWithExtra[]>, DiscoverDeepLinks>[] | null,
+    selected: {
+        type: string | null,
+        extra: [string, string][]
+    } | null,
+};

src/types/models/Discover.d.ts

@@ -0,0 +1,26 @@
+type DiscoverDeepLinks = {
+    discover: string,
+};
+
+interface MetaItemPreviewDiscover extends MetaItemPreview {
+    inLibrary: boolean,
+    deepLinks: MetaItemDeepLinks,
+}
+
+interface DiscoverCatalogOption<T> extends SelectableCatalog<T> {
+    id: string,
+    addon: Addon,
+}
+
+type Discover = {
+    catalog: Catalog<Loadable<MetaItemPreviewDiscover[]>> | null,
+    selectable: {
+        catalogs: DiscoverCatalogOption<DiscoverDeepLinks>,
+        extra: SelectableExtra<DiscoverDeepLinks>[],
+        types: SelectableType<DiscoverDeepLinks>[],
+        nextPage: boolean,
+    },
+    selected: {
+        request: ResourceRequest,
+    } | null,
+};

src/types/models/InstalledAddons.d.ts

@@ -1,8 +1,8 @@
 type InstalledAddons = {
     catalog: Addon[],
     selectable: {
-        catalogs: CatalogOption<AddonsDeepLinks>[],
-        types: TypeOption<AddonsDeepLinks>[],
+        catalogs: SelectableCatalog<AddonsDeepLinks>[],
+        types: SelectableType<AddonsDeepLinks>[],
     },
     selected: {
         request: {

src/types/models/Library.d.ts

@@ -1,3 +1,8 @@
+interface LibraryItemLibrary extends LibraryItem {
+    progress: number,
+    deepLinks: LibraryItemDeepLinks,
+}
+
 type LibraryDeepLinks = {
     library: string,
 }
@@ -7,12 +12,12 @@ type LibraryPage = {
 } | null;
 
 type Library = {
-    catalog: LibraryItem[],
+    catalog: LibraryItemLibrary[],
     selectable: {
         nextPage: LibraryPage,
         prevPage: LibraryPage,
-        sorts: SortOption<LibraryDeepLinks>[],
-        types: TypeOption<LibraryDeepLinks>[],
+        sorts: SelectableSort<LibraryDeepLinks>[],
+        types: SelectableType<LibraryDeepLinks>[],
     },
     selected: {
         request: {

src/types/models/MetaDetails.d.ts

@@ -1,3 +1,9 @@
+interface MetaItemMetaDetails extends MetaItem {
+    inLibrary: boolean,
+    watched: boolean,
+    deepLinks: MetaItemDeepLinks,
+}
+
 type MetaDetails = {
     metaExtensions: {
         url: string,
@@ -6,7 +12,7 @@ type MetaDetails = {
     }[],
     metaItem: {
         addon: Addon,
-        content: Loadable<MetaItem>,
+        content: Loadable<MetaItemMetaDetails>,
     } | null,
     selected: {
         metaPath: ResourceRequestPath,

src/types/models/Player.d.ts

@@ -0,0 +1,45 @@
+interface PlayerVideo extends Video {
+    upcomming: boolean,
+    watched: boolean,
+    progress: boolean | null,
+    scheduled: boolean,
+    deepLinks: VideoDeepLinks,
+}
+
+interface PlayerMetaItem extends Video {
+    videos: PlayerVideo[],
+}
+
+interface NextVideo extends Video {
+    deepLinks: VideoDeepLinks,
+}
+
+interface SelectedStream extends Stream {
+    deepLinks: StreamDeepLinks,
+}
+
+type Subtitle = {
+    id: string,
+    lang: string,
+    origin: string,
+    url: string,
+};
+
+type Player = {
+    addon: Addon | null,
+    libraryItem: LibraryItem | null,
+    metaItem: Loadable<PlayerMetaItem> | null,
+    nextVideo: NextVideo | null,
+    selected: {
+        stream: SelectedStream,
+        metaRequest: ResourceRequest,
+        streamRequest: ResourceRequest,
+        subtitlesPath: ResourceRequestPath,
+    } | null,
+    seriesInfo: {
+        season: number,
+        episode: number,
+    } | null,
+    subtitles: Subtitle[],
+    title: string | null,
+};

src/types/models/RemoteAddons.d.ts

@@ -1,8 +1,8 @@
 type RemoteAddons = {
     catalog: Catalog<Loadable<Addon[]>>,
     selectable: {
-        catalogs: CatalogOption<AddonsDeepLinks>[],
-        types: TypeOption<AddonsDeepLinks>[],
+        catalogs: SelectableCatalog<AddonsDeepLinks>[],
+        types: SelectableType<AddonsDeepLinks>[],
     },
     selected: {
         request: ResourceRequest,

src/types/models/StremingServer.d.ts

@@ -1,3 +1,17 @@
+type Torrent = [
+    {
+        extra: any[],
+        id: string,
+        resource: string,
+        type: string,
+    },
+    {
+        metaDetailsStreams: string | null,
+        metaDetailsVideos: string | null,
+        player: string | null,
+    }
+];
+
 type StreamingServerSettings = {
     appPath: string,
     btDownloadSpeedHardLimit: number,

src/types/types.d.ts

@@ -0,0 +1,61 @@
+interface UrlParams extends Record<string, string> {
+    path: string,
+}
+
+type LoadableError = string | {
+    type: string,
+    content: {
+        code: number,
+        message: string,
+    }
+};
+
+type Loadable<T> = {
+    type: 'Ready' | 'Loading' | 'Err',
+    content: T | LoadableError,
+};
+
+type ResourceRequestPath = {
+    id: string,
+    type: string,
+    resource: string,
+    extra: [string, string][]
+};
+
+type ResourceRequest = {
+    base: string,
+    path: ResourceRequestPath,
+};
+
+type ExternalPlayerLinks = {
+    androidTv: string | null,
+    download: string | null,
+    fileName: string | null,
+    href: string | null,
+    tizen: string | null,
+    webos: string | null,
+};
+
+type TrailerStream = {
+    ytId: string,
+    description: string,
+    deepLinks: {
+        player: string,
+        externalPlayer: ExternalPlayerLinks,
+    },
+};
+
+type BehaviorHints = {
+    defaultVideoId: string | null,
+    featuredVideoId: string | null,
+    hasScheduledVideos: boolean,
+};
+
+type PosterShape = 'square' | 'landscape' | 'poster' | null; 
+
+type Catalog<T, D = any> = {
+    title?: string,
+    content: T,
+    installed?: boolean,
+    deepLinks?: D,
+};