Rewrote the handling of headers being passed into the playlisthandler class. This enables being able to fetch and update rotating keys. The fixed an issue that was happening with P+. Added in 4 new features into the UI, migrated them from env variable

Author: Your Name

README.md

@@ -2,7 +2,7 @@
   <img src="https://i.imgur.com/FIGZdR3.png">
 </p>
 
-Current version: **4.1.7**
+Current version: **4.1.8**
 
 # About
 This takes ESPN+, ESPN, FOX Sports, CBS Sports, Paramount+, Gotham Sports, 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).
@@ -18,20 +18,16 @@ The server exposes 4 main endpoints:
 |---|---|
 | /channels.m3u | The channel list you'll import into your client |
 | /xmltv.xml | The schedule that you'll import into your client |
-| /linear-channels.m3u | The linear channel list you'll import into your client (only used when using `LINEAR_CHANNELS` variable) |
-| /linear-xmltv.xml | The linear schedule that you'll import into your client (only used when using `LINEAR_CHANNELS` variable) - Not needed for Channels DVR |
+| /linear-channels.m3u | The linear channel list you'll import into your client (only used when using the dedicated linear channels option) |
+| /linear-xmltv.xml | The linear schedule that you'll import into your client (only used when using the dedicated linear channels option) - Not needed for Channels DVR |
 
 # Running
 The recommended way of running is to pull the image from [Docker Hub](https://hub.docker.com/r/m0ngr31/eplustv).
 
 ## Environment Variables
 | Environment Variable | Description | Required? | Default |
 |---|---|---|---|
-| START_CHANNEL | What the first channel number should be. | No | 1 |
-| NUM_OF_CHANNELS | How many channels to create? This is dependent on the networks you are using. A good number to start with is >= 200 if you are using ESPN+. | No | 200 |
-| LINEAR_CHANNELS | Break out dedicated linear channels (see Endpoints above to use) | No | False |
-| BASE_URL | If using a reverse proxy, m3u will be generated with this uri base. | No | - |
-| PROXY_SEGMENTS | Proxy keyed `*.ts` files. | No | False |
+| BASE_URL | If using a reverse proxy, m3u will be generated with this as the base. | No | - |
 | PUID | Current user ID. Use if you have permission issues. Needs to be combined with PGID. | No | - |
 | PGID | Current group ID. Use if you have permission issues. Needs to be combined with PUID. | No | - |
 | PORT | Port the API will be served on. You can set this if it conflicts with another service in your environment. | No | 8000 |
@@ -53,7 +49,7 @@ Available to login with TV Provider
 
 ##### Linear Channels
 
-Will create dedicated linear channels if using `LINEAR_CHANNELS`, otherwise will schedule events normally
+Will create dedicated linear channels if using dedicated linear channels, otherwise will schedule events normally
 
 | Network Name | Description |
 |---|---|
@@ -78,7 +74,7 @@ Available to login with TV Provider
 
 ##### Linear Channels
 
-Some events are on linear channels and some aren't. If you use `LINEAR_CHANNELS`, only events that are on FOX will be scheduled normally. All other events will be scheduled to linear channels
+Some events are on linear channels and some aren't. If you use dedicated linear channels, only events that are on FOX will be scheduled normally. All other events will be scheduled to linear channels
 
 | Network Name |
 |---|
@@ -93,7 +89,7 @@ Available to login with Paramount+ credentials
 
 ##### Linear Channels
 
-Dedicated linear channels - Will only schedule when `LINEAR_CHANNELS` is set
+Dedicated linear channels - Will only schedule when dedicated linear channels is set
 
 | Network Name | Description |
 |---|---|
@@ -123,7 +119,7 @@ If you don't have an NFL+ subscription, you can use these providers to access ga
 
 ##### Linear Channels
 
-If you have access to NFL RedZone, it will be scheduled. If `LINEAR_CHANNELS` is set, it will be on its own channel
+If you have access to NFL RedZone, it will be scheduled. If dedicated linear channels is set, it will be on its own channel
 
 | Network Name | Description |
 |---|---|
@@ -137,7 +133,7 @@ Available to login with NESN+ or TV Provider
 
 ##### Linear Channels
 
-Will create dedicated linear channels if using `LINEAR_CHANNELS`, otherwise will schedule events normally
+Will create dedicated linear channels if using dedicated linear channels, otherwise will schedule events normally
 
 | Network Name | Description |
 |---|---|
@@ -150,7 +146,7 @@ Available to login with Gotham Sports or TV Provider
 
 ##### Linear Channels
 
-Will create dedicated linear channels if using `LINEAR_CHANNELS`, otherwise will schedule events normally
+Will create dedicated linear channels if using dedicated linear channels, otherwise will schedule events normally
 
 | Network Name | Description |
 |---|---|
@@ -183,7 +179,7 @@ Available to login with MLB.tv credentials
 
 ##### Linear Channels
 
-Will create a dedicated linear channel if using `LINEAR_CHANNELS`, otherwise will schedule Big Inning normally
+Will create a dedicated linear channel if using dedicated linear channels, otherwise will schedule Big Inning normally
 
 | Network Name |
 |---|

index.tsx

@@ -4,6 +4,7 @@ import {serveStatic} from '@hono/node-server/serve-static';
 import {BlankEnv, BlankInput} from 'hono/types';
 import {html} from 'hono/html';
 import moment from 'moment';
+import _ from 'lodash';
 import axios from 'axios';
 
 import {generateM3u} from './services/generate-m3u';
@@ -22,10 +23,9 @@ import {gothamHandler} from './services/gotham-handler';
 import {mwHandler} from './services/mw-handler';
 import {nesnHandler} from './services/nesn-handler';
 import {cbsHandler} from './services/cbs-handler';
-import {cleanEntries, clearChannels, removeAllEntries, removeChannelStatus} from './services/shared-helpers';
+import {cleanEntries, clearChannels, removeAllEntries, removeChannelStatus, resetSchedule} from './services/shared-helpers';
 import {appStatus} from './services/app-status';
 import {SERVER_PORT} from './services/port';
-import {useLinear} from './services/channels';
 import { providers } from './services/providers';
 
 import {version} from './package.json';
@@ -38,6 +38,7 @@ import { Style } from './views/Style';
 import { Providers } from './views/Providers';
 import { Script } from './views/Script';
 import {Tools} from './views/Tools';
+import {Options} from './views/Options';
 
 import {CBSSports} from './services/providers/cbs-sports/views';
 import { MntWest } from './services/providers/mw/views';
@@ -51,6 +52,7 @@ 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';
+import { initMiscDb, resetLinearStartChannel, setLinear, setNumberofChannels, setProxySegments, setStartChannel, usesLinear } from './services/misc-db-service';
 
 // Set timeout of requests to 1 minute
 axios.defaults.timeout = 1000 * 60;
@@ -113,6 +115,7 @@ app.get('/', async c => {
         <Main>
           <Links baseUrl={getUri(c)} />
           <Tools />
+          <Options />
           <Providers>
             <ESPNPlus />
             <NFL />
@@ -152,6 +155,107 @@ app.post('/reset-channels', async c => {
   });
 });
 
+app.post('/start-channel', async c => {
+  const body = await c.req.parseBody();
+  const startChannel = _.toNumber(body['start-channel']);
+
+  if (_.isNaN(startChannel) || startChannel < 1 || startChannel > 10000) {
+    return c.html(<Options />, 200, {
+      'HX-Trigger': `{"HXToast":{"type":"error","body":"Starting channel must be a valid number"}}`,
+    });
+  }
+
+  await setStartChannel(startChannel);
+  await resetLinearStartChannel();
+  await resetSchedule();
+  await scheduleEntries();
+
+  return c.html(<Options />, 200, {
+    'HX-Trigger': `{"HXToast":{"type":"success","body":"Successfully saved starting channel number"}}`,
+  });
+});
+
+app.post('/num-of-channels', async c => {
+  const body = await c.req.parseBody();
+  const numChannels = _.toNumber(body['num-of-channels']);
+
+  if (_.isNaN(numChannels) || numChannels < 0 || numChannels > 5000) {
+    return c.html(<Options />, 200, {
+      'HX-Trigger': `{"HXToast":{"type":"error","body":"Number of channels must be a valid number"}}`,
+    });
+  }
+
+  await setNumberofChannels(numChannels);
+  await resetLinearStartChannel();
+  await resetSchedule();
+  await scheduleEntries();
+
+  return c.html(<Options />, 200, {
+    'HX-Trigger': `{"HXToast":{"type":"success","body":"Successfully saved number of channels"}}`,
+  });
+});
+
+app.post('/linear-channels', async c => {
+  const body = await c.req.parseBody();
+  const enabled = body['linear-channels'] === 'on';
+
+  await setLinear(enabled);
+
+  if (enabled) {
+    await removeAllEntries();
+    await schedule();
+  } else {
+    await scheduleEntries();
+  }
+
+  return c.html(
+    <input
+      hx-target="this"
+      hx-swap="outerHTML"
+      hx-trigger="change"
+      hx-post="/linear-channels"
+      name="linear-channels"
+      type="checkbox"
+      role="switch"
+      checked={enabled}
+      data-enabled={enabled ? 'true' : 'false'}
+    />,
+    200,
+    {
+      'HX-Trigger': `{"HXRefresh": true, "HXToast":{"type":"success","body":"Successfully ${
+        enabled ? 'enabled' : 'disabled'
+      } dedicated linear channels. Page will refresh momentarily"}}`,
+    },
+  );
+});
+
+app.post('/proxy-segments', async c => {
+  const body = await c.req.parseBody();
+  const enabled = body['proxy-segments'] === 'on';
+
+  await setProxySegments(enabled);
+
+  return c.html(
+    <input
+      hx-post="/proxy-segments"
+      hx-target="this"
+      hx-swap="outerHTML"
+      hx-trigger="change"
+      name="proxy-segments"
+      type="checkbox"
+      role="switch"
+      checked={enabled}
+      data-enabled={enabled ? 'true' : 'false'}
+    />,
+    200,
+    {
+      'HX-Trigger': `{"HXToast":{"type":"success","body":"Successfully ${
+        enabled ? 'enabled' : 'disabled'
+      } proxying of segment files"}}`,
+    },
+  );
+});
+
 app.get('/channels.m3u', async c => {
   const m3uFile = await generateM3u(getUri(c));
 
@@ -165,6 +269,8 @@ app.get('/channels.m3u', async c => {
 });
 
 app.get('/linear-channels.m3u', async c => {
+  const useLinear = await usesLinear();
+
   if (!useLinear) {
     return notFound(c);
   }
@@ -193,6 +299,8 @@ app.get('/xmltv.xml', async c => {
 });
 
 app.get('/linear-xmltv.xml', async c => {
+  const useLinear = await usesLinear();
+
   if (!useLinear) {
     return notFound(c);
   }
@@ -354,6 +462,8 @@ process.on('SIGINT', shutDown);
   console.log(`=== E+TV v${version} starting ===`);
   initDirectories();
 
+  await initMiscDb();
+
   await espnHandler.initialize();
   await espnHandler.refreshTokens();
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "eplustv",
-  "version": "4.1.7",
+  "version": "4.1.8",
   "description": "",
   "scripts": {
     "start": "ts-node -r tsconfig-paths/register index.tsx",

package.json

@@ -8,7 +8,7 @@ import jwt_decode from 'jwt-decode';
 import {b1gUserAgent, okHttpUserAgent} from './user-agent';
 import {configPath} from './config';
 import {useB1GPlus} from './networks';
-import {ClassTypeWithoutMethods, IEntry, IHeaders, IProvider} from './shared-interfaces';
+import {ClassTypeWithoutMethods, IEntry, IProvider, TChannelPlaybackInfo} from './shared-interfaces';
 import {db} from './database';
 import {debug} from './debug';
 
@@ -261,7 +261,7 @@ class B1GHandler {
     }
   };
 
-  public getEventData = async (eventId: string): Promise<[string, IHeaders]> => {
+  public getEventData = async (eventId: string): Promise<TChannelPlaybackInfo> => {
     const id = eventId.replace('b1g-', '');
 
     try {

services/b1g-handler.ts

@@ -1,12 +1,12 @@
-import {NUM_OF_CHANNELS, START_CHANNEL, useLinear} from './channels';
 import {db, IDocument} from './database';
+import {getNumberOfChannels, getStartChannel, usesLinear} from './misc-db-service';
 import {IChannel, IEntry} from './shared-interfaces';
 
 export const removeEntriesProvider = async (providerName: string): Promise<void> => {
   await db.entries.remove({from: providerName}, {multi: true});
 };
 
-const scheduleEntry = async (entry: IEntry & IDocument, startChannel: number): Promise<void> => {
+const scheduleEntry = async (entry: IEntry & IDocument, startChannel: number, numOfChannels: number): Promise<void> => {
   let channelNum: number;
 
   const availableChannels = await db.schedule
@@ -16,7 +16,7 @@ const scheduleEntry = async (entry: IEntry & IDocument, startChannel: number): P
   if (!availableChannels || !availableChannels.length) {
     const channelNums = await db.schedule.count({});
 
-    if (channelNums > NUM_OF_CHANNELS - 1) {
+    if (channelNums > numOfChannels - 1) {
       return;
     }
 
@@ -38,6 +38,10 @@ const scheduleEntry = async (entry: IEntry & IDocument, startChannel: number): P
 export const scheduleEntries = async (): Promise<void> => {
   let needReschedule = false;
 
+  const useLinear = await usesLinear();
+  const startChannel = await getStartChannel();
+  const numOfChannels = await getNumberOfChannels();
+
   if (!useLinear) {
     const linearEntries = await db.entries.count({linear: {$exists: true}});
 
@@ -50,7 +54,7 @@ export const scheduleEntries = async (): Promise<void> => {
     console.log('');
     console.log('====================================================================');
     console.log('===                                                              ===');
-    console.log('===   Need to rebuild the schedule because the LINEAR_CHANNELS   ===');
+    console.log('===   Need to rebuild the schedule because the linear channels   ===');
     console.log('===            variable is no longer being used.                 ===');
     console.log('===                                                              ===');
     console.log('====================================================================');
@@ -63,7 +67,7 @@ export const scheduleEntries = async (): Promise<void> => {
 
     // Remove all dedicated linear channel entries
     await db.entries.remove(
-      {$or: [{channel: 'cbssportshq'}, {channel: 'golazo'}, {channel: 'NFLNETWORK'}]},
+      {$or: [{channel: 'cbssportshq'}, {channel: 'golazo'}, {channel: 'NFLNETWORK'}, {channel: 'NFLDIGITAL1_OO_v3'}]},
       {multi: true},
     );
 
@@ -78,6 +82,6 @@ export const scheduleEntries = async (): Promise<void> => {
   unscheduledEntries.length > 0 && console.log(`Scheduling ${unscheduledEntries.length} entries...`);
 
   for (const entry of unscheduledEntries) {
-    await scheduleEntry(entry, START_CHANNEL);
+    await scheduleEntry(entry, startChannel, numOfChannels);
   }
 };

services/build-schedule.ts

@@ -9,7 +9,7 @@ import crypto from 'crypto';
 import {cbsSportsUserAgent, userAgent} from './user-agent';
 import {configPath} from './config';
 import {useCBSSports} from './networks';
-import {ClassTypeWithoutMethods, IEntry, IHeaders, IProvider} from './shared-interfaces';
+import {ClassTypeWithoutMethods, IEntry, IProvider, TChannelPlaybackInfo} from './shared-interfaces';
 import {db} from './database';
 import {getRandomUUID} from './shared-helpers';
 import {createAdobeAuthHeader} from './adobe-helpers';
@@ -402,7 +402,7 @@ class CBSHandler {
     await parseAirings(entries);
   };
 
-  public getEventData = async (eventId: string): Promise<[string, IHeaders]> => {
+  public getEventData = async (eventId: string): Promise<TChannelPlaybackInfo> => {
     const event = await db.entries.findOne<IEntry>({id: eventId});
 
     try {