chore: make ip in Context optional

src/controller/StreamController.ts

@@ -29,7 +29,7 @@ export class StreamController {
 
     const ctx: Context = {
       id: res.getHeader('X-Request-ID') as string,
-      ip: req.ip as string,
+      ...(req.ip && { ip: req.ip }),
       config,
     };
 

src/index.ts

@@ -72,7 +72,7 @@ addon.listen(port, () => {
 });
 
 const cacheWarmup = async () => {
-  const ctx = { id: 'warmup', ip: '127.0.0.1', config: { de: 'on', en: 'on', es: 'on', fr: 'on', it: 'on', mx: 'on' } };
+  const ctx = { id: 'warmup', config: { de: 'on', en: 'on', es: 'on', fr: 'on', it: 'on', mx: 'on' } };
   logger.info(`starting cache warmup`, ctx);
 
   interface ResponsePartial { results: { id: number }[] }

src/test/index.ts

@@ -4,7 +4,6 @@ import { getDefaultConfig } from '../utils';
 export const createTestContext = (config?: Config): Context => {
   return {
     id: 'test',
-    ip: '0.0.0.0',
     config: config ?? getDefaultConfig(),
   };
 };

src/types.ts

@@ -2,7 +2,7 @@ import { Manifest, ManifestConfig } from 'stremio-addon-sdk';
 
 export interface Context {
   id: string;
-  ip: string;
+  ip?: string;
   config: Config;
 }
 

src/utils/Fetcher.test.ts

@@ -8,7 +8,7 @@ fetchMock.mockGlobal();
 const fetcher = new Fetcher(winston.createLogger({ transports: [new winston.transports.Console({ level: 'nope' })] }));
 
 describe('fetch', () => {
-  const ctx = createTestContext();
+  const ctx = { ...createTestContext(), ip: '0.0.0.0' };
 
   afterEach(() => {
     fetchMock.clearHistory();

src/utils/Fetcher.ts

@@ -91,13 +91,15 @@ export class Fetcher {
       headers: {
         'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
         'Accept-Language': 'en',
-        ...(cookieString && { Cookie: cookieString }),
-        'Forwarded': `for=${ctx.ip}`,
         'Priority': 'u=0',
         'User-Agent': this.hostUserAgentMap.get(url.host) ?? 'node',
-        'X-Forwarded-For': ctx.ip,
-        'X-Forwarded-Proto': url.protocol.slice(0, -1),
-        'X-Real-IP': ctx.ip,
+        ...(cookieString && { Cookie: cookieString }),
+        ...(ctx.ip && {
+          'Forwarded': `for=${ctx.ip}`,
+          'X-Forwarded-For': ctx.ip,
+          'X-Forwarded-Proto': url.protocol.slice(0, -1),
+          'X-Real-IP': ctx.ip,
+        }),
         ...init?.headers,
       },
     };