Initial work for Gotham Sports done

Author: Your Name

README.md

@@ -2,7 +2,7 @@
   <img src="https://i.imgur.com/FIGZdR3.png">
 </p>
 
-Current version: **4.0.4**
+Current version: **4.1.0**
 
 # About
 This takes ESPN+, ESPN, FOX Sports, CBS Sports, Paramount+, MSG+, NFL, B1G+, NESN, Mountain West, FloSports, or MLB.tv programming and transforms it into a "live TV" experience with virtual linear channels. It will discover what is on, and generate a schedule of channels that will give you M3U and XMLTV files that you can import into something like [Jellyfin](https://jellyfin.org) or [Channels](https://getchannels.com).

index.tsx

@@ -17,7 +17,7 @@ import {b1gHandler} from './services/b1g-handler';
 import {floSportsHandler} from './services/flo-handler';
 import {paramountHandler} from './services/paramount-handler';
 import {nflHandler} from './services/nfl-handler';
-import {msgHandler} from './services/msg-handler';
+import {gothamHandler} from './services/gotham-handler';
 import {mwHandler} from './services/mw-handler';
 import {nesnHandler} from './services/nesn-handler';
 import {cbsHandler} from './services/cbs-handler';
@@ -49,6 +49,7 @@ import {B1G} from './services/providers/b1g/views';
 import {NFL} from './services/providers/nfl/views';
 import {ESPN} from './services/providers/espn/views';
 import {ESPNPlus} from './services/providers/espn-plus/views';
+import {Gotham} from './services/providers/gotham/views';
 
 const notFound = (c: Context<BlankEnv, '', BlankInput>) => {
   return c.text('404 not found', 404, {
@@ -80,7 +81,7 @@ const schedule = async () => {
   await mwHandler.getSchedule();
   await nflHandler.getSchedule();
   await paramountHandler.getSchedule();
-  await msgHandler.getSchedule();
+  await gothamHandler.getSchedule();
   await nesnHandler.getSchedule();
   await cbsHandler.getSchedule();
 
@@ -117,6 +118,7 @@ app.get('/', async c => {
             <ESPN />
             <Paramount />
             <Nesn />
+            <Gotham />
             <B1G />
             <FloSports />
             <MntWest />
@@ -316,6 +318,28 @@ app.get('/channels/:id/:part{.+\\.ts$}', async c => {
   });
 });
 
+app.get('/channels/:id/:part{.+\\.m4i$}', async c => {
+  const id = c.req.param('id');
+  const part = c.req.param('part').split('.m4i')[0];
+
+  let contents: ArrayBuffer | undefined;
+
+  try {
+    contents = await appStatus.channels[id].player?.getSegmentOrKey(part);
+  } catch (e) {
+    return notFound(c);
+  }
+
+  if (!contents) {
+    return notFound(c);
+  }
+
+  return c.body(contents, 200, {
+    'Cache-Control': 'no-cache',
+    'Content-Type': 'video/MP2T',
+  });
+});
+
 // 404 Handler
 app.notFound(notFound);
 
@@ -347,8 +371,8 @@ process.on('SIGINT', shutDown);
   await paramountHandler.initialize();
   await paramountHandler.refreshTokens();
 
-  await msgHandler.initialize();
-  await msgHandler.refreshTokens();
+  await gothamHandler.initialize();
+  await gothamHandler.refreshTokens();
 
   await nesnHandler.initialize();
   await nesnHandler.refreshTokens();
@@ -384,7 +408,7 @@ setInterval(async () => {
   await floSportsHandler.refreshTokens();
   await nflHandler.refreshTokens();
   await paramountHandler.refreshTokens();
-  await msgHandler.refreshTokens();
+  await gothamHandler.refreshTokens();
   await nesnHandler.refreshTokens();
   await cbsHandler.refreshTokens();
 }, 1000 * 60 * 30);

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "eplustv",
-  "version": "4.0.4",
+  "version": "4.1.0",
   "description": "",
   "scripts": {
     "start": "ts-node -r tsconfig-paths/register index.tsx",
@@ -33,6 +33,7 @@
     "xml": "^1.0.1"
   },
   "devDependencies": {
+    "@types/axios-curlirize": "^1.3.5",
     "@types/crypto-js": "^4.2.1",
     "@types/express": "^4.17.13",
     "@types/lodash": "^4.14.174",

package.json

@@ -1,6 +1,5 @@
 import _ from 'lodash';
 
-import {useMsgPlus} from './networks';
 import {db} from './database';
 import {IProvider} from './shared-interfaces';
 
@@ -220,37 +219,50 @@ export const CHANNELS = {
         tvgName: 'NESNPLD',
       },
       60: {
-        canUse: useMsgPlus,
+        canUse: undefined,
+        checkChannelEnabled: () => checkChannelEnabled('gotham', 'MSG'),
         id: 'MSG',
         logo: 'https://tmsimg.fancybits.co/assets/s10979_ll_h15_ab.png?w=360&h=270',
         name: 'MSG',
         stationId: '10979',
         tvgName: 'MSG',
       },
       61: {
-        canUse: useMsgPlus,
+        canUse: undefined,
+        checkChannelEnabled: () => checkChannelEnabled('gotham', 'MSGSN'),
         id: 'MSGSN',
         logo: 'https://tmsimg.fancybits.co/assets/s11105_ll_h15_ac.png?w=360&h=270',
         name: 'MSG Sportsnet HD',
         stationId: '15273',
         tvgName: 'MSGSNNP',
       },
       62: {
-        canUse: useMsgPlus,
+        canUse: undefined,
+        checkChannelEnabled: () => checkChannelEnabled('gotham', 'MSG2'),
         id: 'MSG2',
         logo: 'https://tmsimg.fancybits.co/assets/s70283_ll_h15_aa.png?w=360&h=270',
         name: 'MSG2 HD',
         stationId: '70283',
         tvgName: 'MSG2HD',
       },
       63: {
-        canUse: useMsgPlus,
+        canUse: undefined,
+        checkChannelEnabled: () => checkChannelEnabled('gotham', 'MSGSN2'),
         id: 'MSGSN2',
         logo: 'https://tmsimg.fancybits.co/assets/s70285_ll_h15_ab.png?w=360&h=270',
         name: 'MSG Sportsnet 2 HD',
         stationId: '70285',
         tvgName: 'MSG2SNH',
       },
+      64: {
+        canUse: undefined,
+        checkChannelEnabled: () => checkChannelEnabled('gotham', 'YES'),
+        id: 'YES',
+        logo: 'https://tmsimg.fancybits.co/assets/s30017_ll_h15_aa.png?w=360&h=270',
+        name: 'Yes Network',
+        stationId: '30017',
+        tvgName: 'YES',
+      },
     };
   },
 };

services/channels.ts

@@ -385,13 +385,13 @@ const isEnabled = async (which?: string): Promise<boolean> => {
   } else if (which === 'plus') {
     return espnPlusEnabled;
   } else if (which === 'ppv') {
-    return plusMeta?.use_ppv ? true : false;
+    return (plusMeta?.use_ppv ? true : false) && espnPlusEnabled;
   } else if (which === 'espn3') {
-    return linearMeta?.espn3 ? true : false;
+    return (linearMeta?.espn3 ? true : false) && espnLinearEnabled;
   } else if (which === 'sec_plus') {
-    return linearMeta?.sec_plus ? true : false;
+    return (linearMeta?.sec_plus ? true : false) && espnLinearEnabled;
   } else if (which === 'accnx') {
-    return linearMeta?.accnx ? true : false;
+    return (linearMeta?.accnx ? true : false) && espnLinearEnabled;
   }
 
   return espnPlusEnabled || (espnLinearEnabled && _.some(linear_channels, c => c.enabled));
@@ -578,7 +578,8 @@ class EspnHandler {
 
     const {linear_channels} = await db.providers.findOne<IProvider>({name: 'espn'});
 
-    const isChannelEnabled = (channelId: string): boolean => linear_channels.some(c => c.id === channelId && c.enabled);
+    const isChannelEnabled = (channelId: string): boolean =>
+      espnLinearEnabled && linear_channels.some(c => c.id === channelId && c.enabled);
 
     let entries = [];