feat: Add server switch buttons to movies & series / add LD meta tags

Author: justinhartman

.idea/inspectionProfiles/Project_Default.xml

@@ -7,11 +7,19 @@ import asyncHandler from 'express-async-handler';
 import { Response } from 'express';
 
 import appConfig from '../config/app';
-import { fetchOmdbData, fetchAndUpdatePosters, getSeriesDetail } from '../helpers/appHelper';
+import {
+  buildCanonical,
+  buildSources,
+  fetchAndUpdatePosters,
+  fetchOmdbData,
+  getResumeRedirect,
+  getSeriesDetail,
+  upsertSeriesProgress,
+  upsertMovieWatched,
+} from '../helpers/appHelper';
+import { getLatest, invalidateLatest, setLatest } from '../helpers/cache';
 import http from '../helpers/httpClient';
-import History from '../models/History';
 import type { AuthRequest } from '../types/interfaces';
-import { getLatest, setLatest, invalidateLatest } from '../helpers/cache';
 
 /**
  * @namespace appController
@@ -123,51 +131,36 @@ const appController = {
   getView: asyncHandler(async (req: AuthRequest, res: Response) => {
     const query = req.params.q || '';
     const id = req.params.id;
-    const type = req.params.type;
+    const type = req.params.type as 'movie' | 'series';
 
     if (type === 'series') {
       let season = req.params.season;
       let episode = req.params.episode;
 
       if ((!season || !episode) && req.user) {
-        const history = await History.findOne({
-          userId: req.user.id,
-          imdbId: id,
-        });
-        if (history) {
-          const { lastSeason, lastEpisode } = history as any;
-          if (
-            Number.isInteger(lastSeason) &&
-            Number.isInteger(lastEpisode) &&
-            lastSeason > 0 &&
-            lastEpisode > 0
-          ) {
-            return res.redirect(`/view/${id}/series/${lastSeason}/${lastEpisode}`);
-          }
+        const redirectTo = await getResumeRedirect(req.user.id, id);
+        if (redirectTo) {
+          return res.redirect(redirectTo);
         }
       }
 
       season = season || '1';
       episode = episode || '1';
 
       if (req.user) {
-        await History.findOneAndUpdate(
-          { userId: req.user.id, imdbId: id },
-          { $set: { type: 'series', lastSeason: Number(season), lastEpisode: Number(episode) } },
-          { upsert: true }
-        );
+        await upsertSeriesProgress(req.user.id, id, season, episode);
       }
 
-      const server1Src = `https://${appConfig.VIDSRC_DOMAIN}/embed/tv?imdb=${id}&season=${season}&episode=${episode}`;
-      const server2Src = appConfig.MULTI_DOMAIN
-        ? `https://${appConfig.MULTI_DOMAIN}/?video_id=${id}&s=${season}&e=${episode}`
-        : '';
-      const useMulti = Boolean(appConfig.MULTI_DOMAIN);
-      const iframeSrc = useMulti ? server2Src : server1Src;
-      const currentServer = useMulti ? '2' : '1';
-      const canonical = `${res.locals.APP_URL}/view/${id}/${type}/${season}/${episode}`;
+      const { server1Src, server2Src, iframeSrc, currentServer } = buildSources(
+        id,
+        'series',
+        season,
+        episode
+      );
+      const canonical = buildCanonical(res.locals.APP_URL, id, type, season, episode);
       const data = await fetchOmdbData(id, false);
       const seriesDetail = await getSeriesDetail(id, Number(season));
+
       return res.render('view', {
         data,
         iframeSrc,
@@ -185,23 +178,17 @@ const appController = {
       });
     }
 
+    // movie branch
     let watched = false;
     if (req.user) {
-      const history = await History.findOneAndUpdate(
-        { userId: req.user.id, imdbId: id },
-        { $set: { type: 'movie', watched: true } },
-        { upsert: true, new: true }
-      );
+      const history = await upsertMovieWatched(req.user.id, id);
       watched = history?.watched || false;
     }
 
-    const server1Src = `https://${appConfig.VIDSRC_DOMAIN}/embed/movie/${id}`;
-    const server2Src = appConfig.MULTI_DOMAIN ? `https://${appConfig.MULTI_DOMAIN}/?video_id=${id}` : '';
-    const useMulti = Boolean(appConfig.MULTI_DOMAIN);
-    const iframeSrc = useMulti ? server2Src : server1Src;
-    const currentServer = useMulti ? '2' : '1';
-    const canonical = `${res.locals.APP_URL}/view/${id}/${type}`;
+    const { server1Src, server2Src, iframeSrc, currentServer } = buildSources(id, 'movie');
+    const canonical = buildCanonical(res.locals.APP_URL, id, type);
     const data = await fetchOmdbData(id, false);
+
     res.render('view', {
       data,
       iframeSrc,

controllers/appController.ts

@@ -11,6 +11,7 @@
 import { AxiosRequestConfig } from 'axios';
 import http from './httpClient';
 import appConfig from '../config/app';
+import History from '../models/History';
 import type { EpisodeInfo, SeasonDetail, SeriesDetail } from '../types/interfaces';
 
 /**
@@ -26,6 +27,8 @@ export const __clearCaches = (): void => {
   seriesCache.clear();
 };
 
+const useMulti = Boolean(appConfig.MULTI_DOMAIN);
+
 /**
  * Constructs parameters object for OMDB API requests.
  * @param query - Search term for title search or IMDB ID for specific item lookup
@@ -51,7 +54,7 @@ const constructOmdbParams = (query: string, search: boolean, type: string): obje
  *                        For ID lookups: Detailed movie object or {Response: "False", Error: string}
  * @throws Will throw an error if the API request fails
  */
-export const fetchOmdbData = async (
+const fetchOmdbData = async (
   query: string,
   search = true,
   type = ''
@@ -86,7 +89,7 @@ export const fetchOmdbData = async (
  *              If poster isn't available or request fails, sets default 'no-binger' image.
  *              Updates are performed in parallel using Promise.all
  */
-export const fetchAndUpdatePosters = async (show: any[]): Promise<void> => {
+const fetchAndUpdatePosters = async (show: any[]): Promise<void> => {
   const fallback = `${appConfig.APP_URL}/images/no-binger.jpg`;
   await Promise.all(
     show.map(async (x: any) => {
@@ -112,7 +115,7 @@ export const fetchAndUpdatePosters = async (show: any[]): Promise<void> => {
  * @param season - Season number to retrieve
  * @returns {Promise<SeriesDetail>} Object containing total seasons and cached season details
  */
-export const getSeriesDetail = async (id: string, season: number): Promise<SeriesDetail> => {
+const getSeriesDetail = async (id: string, season: number): Promise<SeriesDetail> => {
   if (!id) return { totalSeasons: 0, currentSeason: { season: 0, episodes: [] } };
 
   const buildOptions = (s: number): AxiosRequestConfig => ({
@@ -171,6 +174,113 @@ export const getSeriesDetail = async (id: string, season: number): Promise<Serie
   };
 };
 
+/**
+ * Builds canonical URL for a movie/series.
+ * @param {string} appUrl - Base application URL
+ * @param {string} id - IMDB ID of the movie/show
+ * @param {string} type - Type of content ('movie' or 'series')
+ * @param {string} [season] - Season number (for series)
+ * @param {string} [episode] - Episode number (for series)
+ * @returns {string} Canonical URL for the content
+ */
+const buildCanonical = (
+  appUrl: string,
+  id: string,
+  type: string,
+  season?: string,
+  episode?: string
+) => {
+  return season && episode
+    ? `${appUrl}/view/${id}/${type}/${season}/${episode}`
+    : `${appUrl}/view/${id}/${type}`;
+};
+
+/**
+ * Builds video source URLs for movie/series iframe embedding.
+ * @param {string} id - IMDB ID of the movie/show
+ * @param {'movie' | 'series'} kind - Type of content ('movie' or 'series')
+ * @param {string} [season] - Season number (required for series)
+ * @param {string} [episode] - Episode number (required for series)
+ * @returns {Object} Object containing source URLs and current server
+ */
+const buildSources = (
+  id: string,
+  kind: 'movie' | 'series',
+  season?: string,
+  episode?: string
+) => {
+  if (kind === 'series') {
+    const server1Src = `https://${appConfig.VIDSRC_DOMAIN}/embed/tv?imdb=${id}&season=${season}&episode=${episode}`;
+    const server2Src = useMulti
+      ? `https://${appConfig.MULTI_DOMAIN}/?video_id=${id}&s=${season}&e=${episode}`
+      : '';
+    const iframeSrc = useMulti ? server2Src : server1Src;
+    const currentServer = useMulti ? '2' : '1';
+    return {server1Src, server2Src, iframeSrc, currentServer};
+  }
+
+  const server1Src = `https://${appConfig.VIDSRC_DOMAIN}/embed/movie/${id}`;
+  const server2Src = useMulti ? `https://${appConfig.MULTI_DOMAIN}/?video_id=${id}` : '';
+  const iframeSrc = useMulti ? server2Src : server1Src;
+  const currentServer = useMulti ? '2' : '1';
+  return {server1Src, server2Src, iframeSrc, currentServer};
+};
+
+/**
+ * Gets resume redirect URL for a series based on last watched episode.
+ * @param {string} userId - User ID
+ * @param {string} imdbId - IMDB ID of the series
+ * @returns {Promise<string|null>} Redirect URL if valid progress exists, null otherwise
+ */
+const getResumeRedirect = async (userId: string, imdbId: string): Promise<string | null> => {
+  const history = await History.findOne({userId, imdbId});
+  if (!history) return null;
+
+  const {lastSeason, lastEpisode} = history as any;
+  const valid =
+    Number.isInteger(lastSeason) &&
+    Number.isInteger(lastEpisode) &&
+    lastSeason > 0 &&
+    lastEpisode > 0;
+
+  return valid ? `/view/${imdbId}/series/${lastSeason}/${lastEpisode}` : null;
+};
+
+/**
+ * Updates or creates a movie watched record.
+ * @param {string} userId - User ID
+ * @param {string} imdbId - IMDB ID of the movie
+ * @returns {Promise<any>} The updated or created history record
+ */
+const upsertMovieWatched = async (userId: string, imdbId: string) => {
+  return History.findOneAndUpdate(
+    {userId, imdbId},
+    {$set: {type: 'movie', watched: true}},
+    {upsert: true, new: true}
+  );
+};
+
+/**
+ * Updates or creates a series progress record.
+ * @param {string} userId - User ID
+ * @param {string} imdbId - IMDB ID of the series
+ * @param {string} season - Season number
+ * @param {string} episode - Episode number
+ * @returns {Promise<void>}
+ */
+const upsertSeriesProgress = async (
+  userId: string,
+  imdbId: string,
+  season: string,
+  episode: string
+) => {
+  await History.findOneAndUpdate(
+    {userId, imdbId},
+    {$set: {type: 'series', lastSeason: Number(season), lastEpisode: Number(episode)}},
+    {upsert: true}
+  );
+};
+
 /**
  * Configuration flag indicating if authentication should be enabled.
  * @type {boolean}
@@ -182,4 +292,16 @@ export const getSeriesDetail = async (id: string, season: number): Promise<Serie
  *   app.use(passport.session());
  * }
  */
-export const useAuth = appConfig.MONGO_DB_URI !== '';
+const useAuth = appConfig.MONGO_DB_URI !== '';
+
+export {
+  buildCanonical,
+  buildSources,
+  fetchAndUpdatePosters,
+  fetchOmdbData,
+  getResumeRedirect,
+  getSeriesDetail,
+  upsertMovieWatched,
+  upsertSeriesProgress,
+  useAuth,
+};

helpers/appHelper.ts

@@ -1,2 +1,21 @@
 </body>
+<script>
+  (function() {
+    const btn = document.getElementById('server-toggle');
+    const player = document.getElementById('player');
+    if (!btn || !player) return;
+    btn.addEventListener('click', function(e) {
+      e.preventDefault();
+      if (this.dataset.current === '1') {
+        player.src = this.dataset.server2;
+        this.dataset.current = '2';
+        this.innerHTML = '<i class="bi bi-hdd-stack"></i> Server 1';
+      } else {
+        player.src = this.dataset.server1;
+        this.dataset.current = '1';
+        this.innerHTML = '<i class="bi bi-hdd-stack"></i> Server 2';
+      }
+    });
+  })();
+</script>
 </html>