Merge pull request #56 from justinhartman/develop

Merge persistant server preference

Author: justinhartman

.bun-version

@@ -0,0 +1 @@
+1.3.0

.github/workflows/develop-workflow.yml

@@ -19,15 +19,14 @@ jobs:
         uses: actions/checkout@v5
         with:
           fetch-depth: 0
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
+      - name: Setup Bun package manager
+        uses: oven-sh/setup-bun@v2
         with:
-          node-version: '22.x'
-          cache: 'yarn'
+          bun-version-file: ".bun-version"
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: bun install --frozen-lockfile
       - name: Run tests with coverage
-        run: yarn test:coverage
+        run: bun run test:coverage
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v5
         with:

.github/workflows/main-workflow.yml

@@ -17,15 +17,14 @@ jobs:
         uses: actions/checkout@v5
         with:
           fetch-depth: 0
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
+      - name: Setup Bun package manager
+        uses: oven-sh/setup-bun@v2
         with:
-          node-version: '22.x'
-          cache: 'yarn'
+          bun-version-file: ".bun-version"
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: bun install --frozen-lockfile
       - name: Run tests with coverage
-        run: yarn test:coverage
+        run: bun run test:coverage
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v5
         with:

Gruntfile.js

@@ -78,8 +78,8 @@ module.exports = function (grunt) {
               grep: '^yarn',
             },
             {
-              title: 'NPM Package Updates',
-              grep: '^npm',
+              title: 'Bun Package Updates',
+              grep: '^bun',
             },
             {
               title: 'Branches Merged',

bun.lock

@@ -42,23 +42,24 @@ describe('controllers/appController with MULTI_DOMAIN', () => {
     jest.clearAllMocks();
   });
 
-  test('getView uses multiembed for series', async () => {
+  test('getView defaults to vidsrc for series when no preference set', async () => {
     (fetchOmdbData as jest.Mock).mockResolvedValue({});
     const req: any = { params: { q: '', id: 'tt', type: 'series', season: '1', episode: '1' }, user: { id: 'u1' } };
     const res: any = { locals: { APP_URL: 'http://app' }, render: jest.fn() };
     await appController.getView(req, res, jest.fn());
     expect(res.render).toHaveBeenCalledWith(
       'view',
       expect.objectContaining({
-        iframeSrc: 'https://multi/?video_id=tt&s=1&e=1',
+        iframeSrc: 'https://domain/embed/tv?imdb=tt&season=1&episode=1',
         server1Src: 'https://domain/embed/tv?imdb=tt&season=1&episode=1',
         server2Src: 'https://multi/?video_id=tt&s=1&e=1',
-        currentServer: '2',
+        currentServer: '1',
+        serverPreferenceKey: 'preferredServer',
       })
     );
   });
 
-  test('getView uses multiembed for movie', async () => {
+  test('getView defaults to vidsrc for movie when no preference set', async () => {
     (fetchOmdbData as jest.Mock).mockResolvedValue({});
     (History.findOneAndUpdate as jest.Mock).mockResolvedValue({ watched: false });
     const req: any = { params: { q: '', id: 'tt', type: 'movie' }, user: { id: 'u1' } };
@@ -67,10 +68,51 @@ describe('controllers/appController with MULTI_DOMAIN', () => {
     expect(res.render).toHaveBeenCalledWith(
       'view',
       expect.objectContaining({
-        iframeSrc: 'https://multi/?video_id=tt',
+        iframeSrc: 'https://domain/embed/movie/tt',
         server1Src: 'https://domain/embed/movie/tt',
         server2Src: 'https://multi/?video_id=tt',
+        currentServer: '1',
+        serverPreferenceKey: 'preferredServer',
+      })
+    );
+  });
+
+  test('getView honours preferred server cookie', async () => {
+    (fetchOmdbData as jest.Mock).mockResolvedValue({});
+    (History.findOneAndUpdate as jest.Mock).mockResolvedValue({ watched: false });
+    const req: any = {
+      params: { q: '', id: 'tt', type: 'movie' },
+      user: { id: 'u1' },
+      headers: { cookie: 'preferredServer=1' },
+    };
+    const res: any = { locals: { APP_URL: 'http://app' }, render: jest.fn() };
+    await appController.getView(req, res, jest.fn());
+    expect(res.render).toHaveBeenCalledWith(
+      'view',
+      expect.objectContaining({
+        currentServer: '1',
+        iframeSrc: 'https://domain/embed/movie/tt',
+        serverPreferenceKey: 'preferredServer',
+      })
+    );
+  });
+
+  test('getView parses cookie with additional entries', async () => {
+    (fetchOmdbData as jest.Mock).mockResolvedValue({});
+    (History.findOneAndUpdate as jest.Mock).mockResolvedValue({ watched: false });
+    const req: any = {
+      params: { q: '', id: 'tt', type: 'movie' },
+      user: { id: 'u1' },
+      headers: { cookie: 'foo=bar; preferredServer=2' },
+    };
+    const res: any = { locals: { APP_URL: 'http://app' }, render: jest.fn() };
+    await appController.getView(req, res, jest.fn());
+    expect(res.render).toHaveBeenCalledWith(
+      'view',
+      expect.objectContaining({
         currentServer: '2',
+        iframeSrc: 'https://multi/?video_id=tt',
+        serverPreferenceKey: 'preferredServer',
       })
     );
   });

controllers/appController.multidomain.spec.ts

@@ -142,6 +142,7 @@ describe('controllers/appController', () => {
       server1Src: 'https://domain/embed/tv?imdb=tt&season=1&episode=2',
       server2Src: '',
       currentServer: '1',
+      serverPreferenceKey: 'preferredServer',
     }));
   });
 
@@ -162,6 +163,7 @@ describe('controllers/appController', () => {
     expect(res.render).toHaveBeenCalledWith('view', expect.objectContaining({
       season: '1',
       episode: '1',
+      serverPreferenceKey: 'preferredServer',
     }));
   });
 
@@ -186,6 +188,7 @@ describe('controllers/appController', () => {
         server1Src: 'https://domain/embed/movie/tt',
         server2Src: '',
         currentServer: '1',
+        serverPreferenceKey: 'preferredServer',
       })
     );
   });
@@ -200,7 +203,7 @@ describe('controllers/appController', () => {
 
     expect(res.render).toHaveBeenCalledWith(
       'view',
-      expect.objectContaining({ type: 'movie', watched: false })
+      expect.objectContaining({ type: 'movie', watched: false, serverPreferenceKey: 'preferredServer' })
     );
   });
 
@@ -231,7 +234,7 @@ describe('controllers/appController', () => {
     );
     expect(res.render).toHaveBeenCalledWith(
       'view',
-      expect.objectContaining({ season: '1', episode: '1' })
+      expect.objectContaining({ season: '1', episode: '1', serverPreferenceKey: 'preferredServer' })
     );
   });
 
@@ -246,7 +249,7 @@ describe('controllers/appController', () => {
     expect(History.findOneAndUpdate).not.toHaveBeenCalled();
     expect(res.render).toHaveBeenCalledWith(
       'view',
-      expect.objectContaining({ season: '1', episode: '1' })
+      expect.objectContaining({ season: '1', episode: '1', serverPreferenceKey: 'preferredServer' })
     );
   });
 

controllers/appController.spec.ts

@@ -21,6 +21,8 @@ import { getLatest, invalidateLatest, setLatest } from '../helpers/cache';
 import http from '../helpers/httpClient';
 import type { AuthRequest } from '../types/interfaces';
 
+const SERVER_PREF_COOKIE = 'preferredServer';
+
 /**
  * @namespace appController
  * @description Controller object containing methods for handling web application routes and views.
@@ -133,6 +135,13 @@ const appController = {
     const id = req.params.id;
     const type = req.params.type as 'movie' | 'series';
 
+    const cookieHeader =
+      typeof req.headers?.cookie === 'string' ? req.headers.cookie : '';
+    const match = cookieHeader.match(
+      new RegExp(`(?:^|;\\s*)${SERVER_PREF_COOKIE}=(1|2)(?:;|$)`)
+    );
+    const preferredServer = match ? (match[1] as '1' | '2') : undefined;
+
     if (type === 'series') {
       let season = req.params.season;
       let episode = req.params.episode;
@@ -151,12 +160,11 @@ const appController = {
         await upsertSeriesProgress(req.user.id, id, season, episode);
       }
 
-      const { server1Src, server2Src, iframeSrc, currentServer } = buildSources(
-        id,
-        'series',
+      const { server1Src, server2Src, iframeSrc, currentServer } = buildSources(id, 'series', {
         season,
-        episode
-      );
+        episode,
+        preferredServer,
+      });
       const canonical = buildCanonical(res.locals.APP_URL, id, type, season, episode);
       const data = await fetchOmdbData(id, false);
       const seriesDetail = await getSeriesDetail(id, Number(season));
@@ -167,6 +175,7 @@ const appController = {
         server1Src,
         server2Src,
         currentServer,
+        serverPreferenceKey: SERVER_PREF_COOKIE,
         query,
         id,
         type,
@@ -185,7 +194,9 @@ const appController = {
       watched = history?.watched || false;
     }
 
-    const { server1Src, server2Src, iframeSrc, currentServer } = buildSources(id, 'movie');
+    const { server1Src, server2Src, iframeSrc, currentServer } = buildSources(id, 'movie', {
+      preferredServer,
+    });
     const canonical = buildCanonical(res.locals.APP_URL, id, type);
     const data = await fetchOmdbData(id, false);
 
@@ -195,6 +206,7 @@ const appController = {
       server1Src,
       server2Src,
       currentServer,
+      serverPreferenceKey: SERVER_PREF_COOKIE,
       query,
       id,
       type,

controllers/appController.ts

@@ -38,15 +38,27 @@ jest.mock('../config/app', () => multiConfig);
 import { buildSources } from './appHelper';
 
 describe('appHelper buildSources with MULTI_DOMAIN', () => {
-  test('series sources prefer multi domain', () => {
-    const result = buildSources('tt123', 'series', '1', '5');
+  test('series sources default to vidsrc when no preference is stored', () => {
+    const result = buildSources('tt123', 'series', {season: '1', episode: '5'});
     expect(result.server2Src).toBe('https://multi.example/?video_id=tt123&s=1&e=5');
-    expect(result.currentServer).toBe('2');
+    expect(result.currentServer).toBe('1');
+    expect(result.iframeSrc).toBe('https://domain/embed/tv?imdb=tt123&season=1&episode=5');
   });
 
-  test('movie sources prefer multi domain', () => {
+  test('movie sources default to vidsrc when no preference is stored', () => {
     const result = buildSources('tt123', 'movie');
     expect(result.server2Src).toBe('https://multi.example/?video_id=tt123');
+    expect(result.currentServer).toBe('1');
+    expect(result.iframeSrc).toBe('https://domain/embed/movie/tt123');
+  });
+
+  test('preferred server overrides default when set to multi domain', () => {
+    const result = buildSources('tt123', 'series', {
+      season: '1',
+      episode: '5',
+      preferredServer: '2',
+    });
     expect(result.currentServer).toBe('2');
+    expect(result.iframeSrc).toBe('https://multi.example/?video_id=tt123&s=1&e=5');
   });
 });

helpers/appHelper.multidomain.spec.ts

@@ -187,16 +187,55 @@ describe('helpers/appHelper', () => {
     expect(sources.currentServer).toBe('1');
   });
 
-  test('buildSources prefers MULTI_DOMAIN sources when configured', () => {
+  test('buildSources fills blank season and episode for series without params', () => {
+    const sources = helper.buildSources('tt-series', 'series');
+    expect(sources.server1Src).toBe('https://domain/embed/tv?imdb=tt-series&season=&episode=');
+    expect(sources.server2Src).toBe('');
+    expect(sources.currentServer).toBe('1');
+    expect(sources.iframeSrc).toBe('https://domain/embed/tv?imdb=tt-series&season=&episode=');
+  });
+
+  test('buildSources exposes MULTI_DOMAIN sources but defaults to vidsrc', () => {
     jest.isolateModules(() => {
       mockAppConfig.MULTI_DOMAIN = 'multi.example';
       const mod = require('./appHelper');
-      const seriesSources = mod.buildSources('tt2', 'series', '1', '3');
+      const seriesSources = mod.buildSources('tt2', 'series', {season: '1', episode: '3'});
       expect(seriesSources.server2Src).toBe('https://multi.example/?video_id=tt2&s=1&e=3');
-      expect(seriesSources.currentServer).toBe('2');
+      expect(seriesSources.currentServer).toBe('1');
+      expect(seriesSources.iframeSrc).toBe('https://domain/embed/tv?imdb=tt2&season=1&episode=3');
       const movieSources = mod.buildSources('tt2', 'movie');
       expect(movieSources.server2Src).toBe('https://multi.example/?video_id=tt2');
+      expect(movieSources.currentServer).toBe('1');
+      expect(movieSources.iframeSrc).toBe('https://domain/embed/movie/tt2');
+    });
+    mockAppConfig.MULTI_DOMAIN = '';
+  });
+
+  test('buildSources honours preferred server when provided', () => {
+    jest.isolateModules(() => {
+      mockAppConfig.MULTI_DOMAIN = 'multi.example';
+      const mod = require('./appHelper');
+      const movieSources = mod.buildSources('tt2', 'movie', {preferredServer: '1'});
+      expect(movieSources.currentServer).toBe('1');
+      expect(movieSources.iframeSrc).toBe('https://domain/embed/movie/tt2');
+      const seriesSources = mod.buildSources('tt2', 'series', {
+        season: '2',
+        episode: '5',
+        preferredServer: '1',
+      });
+      expect(seriesSources.currentServer).toBe('1');
+      expect(seriesSources.iframeSrc).toBe('https://domain/embed/tv?imdb=tt2&season=2&episode=5');
+    });
+    mockAppConfig.MULTI_DOMAIN = '';
+  });
+
+  test('buildSources keeps preferred server 2 when provided', () => {
+    jest.isolateModules(() => {
+      mockAppConfig.MULTI_DOMAIN = 'multi.example';
+      const mod = require('./appHelper');
+      const movieSources = mod.buildSources('tt2', 'movie', {preferredServer: '2'});
       expect(movieSources.currentServer).toBe('2');
+      expect(movieSources.iframeSrc).toBe('https://multi.example/?video_id=tt2');
     });
     mockAppConfig.MULTI_DOMAIN = '';
   });