refactor: Switch server to always start with vidsrc server when multi enabled

Author: justinhartman

controllers/appController.multidomain.spec.ts

@@ -42,24 +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' } };
@@ -68,10 +68,10 @@ 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: '2',
+        currentServer: '1',
         serverPreferenceKey: 'preferredServer',
       })
     );

helpers/appHelper.multidomain.spec.ts

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

helpers/appHelper.spec.ts

@@ -195,16 +195,18 @@ describe('helpers/appHelper', () => {
     expect(sources.iframeSrc).toBe('https://domain/embed/tv?imdb=tt-series&season=&episode=');
   });
 
-  test('buildSources prefers MULTI_DOMAIN sources when configured', () => {
+  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', {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('2');
+      expect(movieSources.currentServer).toBe('1');
+      expect(movieSources.iframeSrc).toBe('https://domain/embed/movie/tt2');
     });
     mockAppConfig.MULTI_DOMAIN = '';
   });

helpers/appHelper.ts

@@ -77,7 +77,7 @@ const buildSources = (
     const server2Src = multiDomain
       ? `https://${appConfig.MULTI_DOMAIN}/?video_id=${id}&s=${seasonParam}&e=${episodeParam}`
       : '';
-    const useSecond = Boolean(server2Src) && preferredServer !== '1';
+    const useSecond = Boolean(server2Src) && preferredServer === '2';
     const currentServer = useSecond ? '2' : '1';
     const iframeSrc = currentServer === '2' && server2Src ? server2Src : server1Src;
     return {server1Src, server2Src, iframeSrc, currentServer};
@@ -86,7 +86,7 @@ const buildSources = (
   const multiDomain = Boolean(appConfig.MULTI_DOMAIN);
   const server1Src = `https://${appConfig.VIDSRC_DOMAIN}/embed/movie/${id}`;
   const server2Src = multiDomain ? `https://${appConfig.MULTI_DOMAIN}/?video_id=${id}` : '';
-  const useSecond = Boolean(server2Src) && preferredServer !== '1';
+  const useSecond = Boolean(server2Src) && preferredServer === '2';
   const currentServer = useSecond ? '2' : '1';
   const iframeSrc = currentServer === '2' && server2Src ? server2Src : server1Src;
   return {server1Src, server2Src, iframeSrc, currentServer};