test: instantiate mocked Fetcher with logger consistently

src/extractor/DoodStream.test.ts

@@ -7,8 +7,7 @@ import { DoodStream } from './DoodStream';
 jest.mock('../utils/Fetcher');
 
 const logger = winston.createLogger({ transports: [new winston.transports.Console({ level: 'nope' })] });
-// @ts-expect-error No constructor args needed
-const fetcher = new Fetcher();
+const fetcher = new Fetcher(logger);
 const extractorRegistry = new ExtractorRegistry(logger, [new DoodStream(fetcher)]);
 
 const ctx: Context = { id: 'id', ip: '127.0.0.1', config: {} };

src/extractor/Dropload.test.ts

@@ -7,8 +7,7 @@ import { Dropload } from './Dropload';
 jest.mock('../utils/Fetcher');
 
 const logger = winston.createLogger({ transports: [new winston.transports.Console({ level: 'nope' })] });
-// @ts-expect-error No constructor args needed
-const fetcher = new Fetcher();
+const fetcher = new Fetcher(logger);
 const extractorRegistry = new ExtractorRegistry(logger, [new Dropload(fetcher)]);
 
 const ctx: Context = { id: 'id', ip: '127.0.0.1', config: {} };

src/extractor/ExternalUrl.test.ts

@@ -7,8 +7,7 @@ import { ExternalUrl } from './ExternalUrl';
 jest.mock('../utils/Fetcher');
 
 const logger = winston.createLogger({ transports: [new winston.transports.Console({ level: 'nope' })] });
-// @ts-expect-error No constructor args needed
-const fetcher = new Fetcher();
+const fetcher = new Fetcher(logger);
 const extractorRegistry = new ExtractorRegistry(logger, [new ExternalUrl(fetcher)]);
 
 const ctx: Context = { id: 'id', ip: '127.0.0.1', config: {} };

src/extractor/ExtractorRegistry.test.ts

@@ -3,11 +3,11 @@ import { ExtractorRegistry } from './ExtractorRegistry';
 import { Context, CountryCode } from '../types';
 import { Fetcher } from '../utils';
 import { createExtractors } from './index';
+
 jest.mock('../utils/Fetcher');
 
 const logger = winston.createLogger({ transports: [new winston.transports.Console({ level: 'nope' })] });
-// @ts-expect-error No constructor args needed
-const fetcher = new Fetcher();
+const fetcher = new Fetcher(logger);
 const extractorRegistry = new ExtractorRegistry(logger, createExtractors(fetcher));
 
 describe('ExtractorRegistry', () => {

src/extractor/Fsst.test.ts

@@ -7,8 +7,7 @@ import { Fsst } from './Fsst';
 jest.mock('../utils/Fetcher');
 
 const logger = winston.createLogger({ transports: [new winston.transports.Console({ level: 'nope' })] });
-// @ts-expect-error No constructor args needed
-const fetcher = new Fetcher();
+const fetcher = new Fetcher(logger);
 const extractorRegistry = new ExtractorRegistry(logger, [new Fsst(fetcher)]);
 
 const ctx: Context = { id: 'id', ip: '127.0.0.1', config: {} };

src/extractor/KinoGer.test.ts

@@ -7,8 +7,7 @@ import { KinoGer } from './KinoGer';
 jest.mock('../utils/Fetcher');
 
 const logger = winston.createLogger({ transports: [new winston.transports.Console({ level: 'nope' })] });
-// @ts-expect-error No constructor args needed
-const fetcher = new Fetcher();
+const fetcher = new Fetcher(logger);
 const extractorRegistry = new ExtractorRegistry(logger, [new KinoGer(fetcher)]);
 
 const ctx: Context = { id: 'id', ip: '127.0.0.1', config: {} };

src/extractor/Soaper.test.ts

@@ -7,8 +7,7 @@ import { Soaper } from './Soaper';
 jest.mock('../utils/Fetcher');
 
 const logger = winston.createLogger({ transports: [new winston.transports.Console({ level: 'nope' })] });
-// @ts-expect-error No constructor args needed
-const fetcher = new Fetcher();
+const fetcher = new Fetcher(logger);
 const extractorRegistry = new ExtractorRegistry(logger, [new Soaper(fetcher)]);
 
 const ctx: Context = { id: 'id', ip: '127.0.0.1', config: {} };

src/extractor/SuperVideo.test.ts

@@ -7,8 +7,7 @@ import { SuperVideo } from './SuperVideo';
 jest.mock('../utils/Fetcher');
 
 const logger = winston.createLogger({ transports: [new winston.transports.Console({ level: 'nope' })] });
-// @ts-expect-error No constructor args needed
-const fetcher = new Fetcher();
+const fetcher = new Fetcher(logger);
 const extractorRegistry = new ExtractorRegistry(logger, [new SuperVideo(fetcher)]);
 
 const ctx: Context = { id: 'id', ip: '127.0.0.1', config: {} };

src/extractor/VidSrc.test.ts

@@ -7,8 +7,7 @@ import { VidSrc } from './VidSrc';
 jest.mock('../utils/Fetcher');
 
 const logger = winston.createLogger({ transports: [new winston.transports.Console({ level: 'nope' })] });
-// @ts-expect-error No constructor args needed
-const fetcher = new Fetcher();
+const fetcher = new Fetcher(logger);
 const extractorRegistry = new ExtractorRegistry(logger, [new VidSrc(fetcher)]);
 
 const ctx: Context = { id: 'id', ip: '127.0.0.1', config: {} };

src/source/CineHDPlus.test.ts

@@ -1,10 +1,12 @@
+import winston from 'winston';
 import { CineHDPlus } from './CineHDPlus';
 import { Fetcher, ImdbId } from '../utils';
 import { Context } from '../types';
+
 jest.mock('../utils/Fetcher');
 
-// @ts-expect-error No constructor args needed
-const fetcher = new Fetcher();
+const logger = winston.createLogger({ transports: [new winston.transports.Console({ level: 'nope' })] });
+const fetcher = new Fetcher(logger);
 const ctx: Context = { id: 'id', ip: '127.0.0.1', config: { es: 'on', mx: 'on' } };
 
 describe('CineHDPlus', () => {

src/source/Eurostreaming.test.ts

@@ -1,10 +1,12 @@
+import winston from 'winston';
 import { Eurostreaming } from './Eurostreaming';
 import { Fetcher, ImdbId } from '../utils';
 import { Context } from '../types';
+
 jest.mock('../utils/Fetcher');
 
-// @ts-expect-error No constructor args needed
-const fetcher = new Fetcher();
+const logger = winston.createLogger({ transports: [new winston.transports.Console({ level: 'nope' })] });
+const fetcher = new Fetcher(logger);
 const ctx: Context = { id: 'id', ip: '127.0.0.1', config: { it: 'on' } };
 
 describe('Eurostreaming', () => {

src/source/Frembed.test.ts

@@ -1,10 +1,12 @@
+import winston from 'winston';
 import { Frembed } from './Frembed';
 import { Fetcher, ImdbId, TmdbId } from '../utils';
 import { Context } from '../types';
+
 jest.mock('../utils/Fetcher');
 
-// @ts-expect-error No constructor args needed
-const fetcher = new Fetcher();
+const logger = winston.createLogger({ transports: [new winston.transports.Console({ level: 'nope' })] });
+const fetcher = new Fetcher(logger);
 const ctx: Context = { id: 'id', ip: '127.0.0.1', config: { fr: 'on' } };
 
 describe('Frembed', () => {

src/source/FrenchCloud.test.ts

@@ -1,10 +1,12 @@
+import winston from 'winston';
 import { FrenchCloud } from './FrenchCloud';
 import { Fetcher, ImdbId } from '../utils';
 import { Context } from '../types';
+
 jest.mock('../utils/Fetcher');
 
-// @ts-expect-error No constructor args needed
-const fetcher = new Fetcher();
+const logger = winston.createLogger({ transports: [new winston.transports.Console({ level: 'nope' })] });
+const fetcher = new Fetcher(logger);
 const ctx: Context = { id: 'id', ip: '127.0.0.1', config: { fr: 'on' } };
 
 describe('FrenchCloud', () => {

src/source/KinoGer.test.ts

@@ -1,10 +1,12 @@
+import winston from 'winston';
 import { KinoGer } from './KinoGer';
 import { Fetcher, ImdbId } from '../utils';
 import { Context } from '../types';
+
 jest.mock('../utils/Fetcher');
 
-// @ts-expect-error No constructor args needed
-const fetcher = new Fetcher();
+const logger = winston.createLogger({ transports: [new winston.transports.Console({ level: 'nope' })] });
+const fetcher = new Fetcher(logger);
 const ctx: Context = { id: 'id', ip: '127.0.0.1', config: { de: 'on' } };
 
 describe('KinoGer', () => {

src/source/MeineCloud.test.ts

@@ -1,10 +1,12 @@
+import winston from 'winston';
 import { MeineCloud } from './MeineCloud';
 import { Fetcher, ImdbId } from '../utils';
 import { Context } from '../types';
+
 jest.mock('../utils/Fetcher');
 
-// @ts-expect-error No constructor args needed
-const fetcher = new Fetcher();
+const logger = winston.createLogger({ transports: [new winston.transports.Console({ level: 'nope' })] });
+const fetcher = new Fetcher(logger);
 const ctx: Context = { id: 'id', ip: '127.0.0.1', config: { de: 'on' } };
 
 describe('MeineCloud', () => {

src/source/MostraGuarda.test.ts

@@ -1,10 +1,12 @@
+import winston from 'winston';
 import { MostraGuarda } from './MostraGuarda';
 import { Fetcher, ImdbId } from '../utils';
 import { Context } from '../types';
+
 jest.mock('../utils/Fetcher');
 
-// @ts-expect-error No constructor args needed
-const fetcher = new Fetcher();
+const logger = winston.createLogger({ transports: [new winston.transports.Console({ level: 'nope' })] });
+const fetcher = new Fetcher(logger);
 const ctx: Context = { id: 'id', ip: '127.0.0.1', config: { it: 'on' } };
 
 describe('MostraGuarda', () => {

src/source/Soaper.test.ts

@@ -1,10 +1,12 @@
+import winston from 'winston';
 import { Soaper } from './Soaper';
 import { Fetcher, ImdbId, TmdbId } from '../utils';
 import { Context } from '../types';
+
 jest.mock('../utils/Fetcher');
 
-// @ts-expect-error No constructor args needed
-const fetcher = new Fetcher();
+const logger = winston.createLogger({ transports: [new winston.transports.Console({ level: 'nope' })] });
+const fetcher = new Fetcher(logger);
 const ctx: Context = { id: 'id', ip: '127.0.0.1', config: { en: 'on' } };
 
 describe('Soaper', () => {

src/source/StreamKiste.test.ts

@@ -1,10 +1,12 @@
+import winston from 'winston';
 import { StreamKiste } from './StreamKiste';
 import { Fetcher, ImdbId } from '../utils';
 import { Context } from '../types';
+
 jest.mock('../utils/Fetcher');
 
-// @ts-expect-error No constructor args needed
-const fetcher = new Fetcher();
+const logger = winston.createLogger({ transports: [new winston.transports.Console({ level: 'nope' })] });
+const fetcher = new Fetcher(logger);
 const ctx: Context = { id: 'id', ip: '127.0.0.1', config: { de: 'on' } };
 
 describe('StreamKiste', () => {

src/source/VerHdLink.test.ts

@@ -1,10 +1,12 @@
+import winston from 'winston';
 import { VerHdLink } from './VerHdLink';
 import { Fetcher, ImdbId } from '../utils';
 import { Context } from '../types';
+
 jest.mock('../utils/Fetcher');
 
-// @ts-expect-error No constructor args needed
-const fetcher = new Fetcher();
+const logger = winston.createLogger({ transports: [new winston.transports.Console({ level: 'nope' })] });
+const fetcher = new Fetcher(logger);
 const ctx: Context = { id: 'id', ip: '127.0.0.1', config: { es: 'on', mx: 'on' } };
 
 describe('VerHdLink', () => {

src/source/VidSrc.test.ts

@@ -1,10 +1,12 @@
+import winston from 'winston';
 import { VidSrc } from './VidSrc';
 import { Fetcher, ImdbId } from '../utils';
 import { Context } from '../types';
+
 jest.mock('../utils/Fetcher');
 
-// @ts-expect-error No constructor args needed
-const fetcher = new Fetcher();
+const logger = winston.createLogger({ transports: [new winston.transports.Console({ level: 'nope' })] });
+const fetcher = new Fetcher(logger);
 const ctx: Context = { id: 'id', ip: '127.0.0.1', config: { en: 'on' } };
 
 describe('VidSrc', () => {

src/utils/StreamResolver.test.ts

@@ -11,8 +11,7 @@ import { ImdbId } from './id';
 jest.mock('../utils/Fetcher');
 
 const logger = winston.createLogger({ transports: [new winston.transports.Console({ level: 'nope' })] });
-// @ts-expect-error No constructor args needed
-const fetcher = new Fetcher();
+const fetcher = new Fetcher(logger);
 const ctx: Context = { id: 'id', ip: '127.0.0.1', config: { de: 'on', it: 'on' } };
 
 const meineCloud = new MeineCloud(fetcher);

src/utils/__mocks__/Fetcher.ts

@@ -9,8 +9,8 @@ const { Fetcher } = jest.requireActual('../Fetcher');
 class MockedFetcher {
   private readonly fetcher: typeof Fetcher;
 
-  public constructor() {
-    this.fetcher = new Fetcher(winston.createLogger({ transports: [new winston.transports.Console()] }));
+  public constructor(logger: winston.Logger) {
+    this.fetcher = new Fetcher(logger);
   }
 
   public readonly text = async (ctx: Context, url: URL, init?: RequestInit): Promise<string> => {

src/utils/manifest.test.ts

@@ -1,10 +1,12 @@
+import winston from 'winston';
 import { buildManifest } from './manifest';
 import { StreamKiste, MeineCloud, VerHdLink } from '../source';
 import { Fetcher } from './Fetcher';
+
 jest.mock('../utils/Fetcher');
 
-// @ts-expect-error No constructor args needed
-const fetcher = new Fetcher();
+const logger = winston.createLogger({ transports: [new winston.transports.Console({ level: 'nope' })] });
+const fetcher = new Fetcher(logger);
 
 describe('buildManifest', () => {
   test('has unchecked source without a config', () => {

src/utils/tmdb.test.ts

@@ -2,10 +2,12 @@ import { getImdbIdFromTmdbId, getTmdbIdFromImdbId } from './tmdb';
 import { Fetcher } from './Fetcher';
 import { Context } from '../types';
 import { ImdbId, TmdbId } from './id';
+import winston from 'winston';
+
 jest.mock('../utils/Fetcher');
 
-// @ts-expect-error No constructor args needed
-const fetcher = new Fetcher();
+const logger = winston.createLogger({ transports: [new winston.transports.Console({ level: 'nope' })] });
+const fetcher = new Fetcher(logger);
 const ctx: Context = { id: 'id', ip: '127.0.0.1', config: { de: 'on' } };
 
 describe('getTmdbIdFromImdbId', () => {