Fix issue with NFL tokens

README.md

@@ -2,7 +2,7 @@
   <img src="https://i.imgur.com/FIGZdR3.png">
 </p>
 
-Current version: **3.3.2**
+Current version: **3.3.3**
 
 # About
 This takes ESPN/ESPN+, FOX Sports, Paramount+, MSG+, NFL+, B1G+, NESN, Mountain West, FloSports, CBS Sports, 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).

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eplustv",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "",
   "scripts": {
     "start": "ts-node index.ts",

services/launch-channel.ts

@@ -25,7 +25,7 @@ const startChannelStream = async (channelId: string, appUrl: string) => {
 
   checkingStream[channelId] = true;
 
-  let url;
+  let url: string;
   let headers: IHeaders;
 
   const playingNow = await db.entries.findOne<IEntry>({

services/nfl-handler.ts

@@ -281,7 +281,7 @@ class NflHandler {
       return;
     }
 
-    if (!this.expires_at || moment(this.expires_at).isBefore(moment().add(30, 'minutes'))) {
+    if (!this.expires_at || moment(this.expires_at * 1000).isBefore(moment())) {
       await this.extendTokens();
     }
   };
@@ -386,7 +386,7 @@ class NflHandler {
 
   public getEventData = async (id: string): Promise<[string, IHeaders]> => {
     try {
-      await this.extendTokens();
+      await this.refreshTokens();
 
       const event = await db.entries.findOne<IEntry>({id});
 
@@ -438,7 +438,7 @@ class NflHandler {
 
   private checkNetworkAccess = (): boolean => {
     try {
-      const {plans, networks}: INFLJwt = jwt_decode(this.access_token);
+      const {plans, networks}: INFLJwt = jwt_decode(this.tv_access_token);
 
       if (plans) {
         const hasPlus = (this.checkPlusAccess() || networks?.NFLN) && useLinear ? true : false;
@@ -571,7 +571,7 @@ class NflHandler {
           deviceId: this.device_id,
           deviceInfo: Buffer.from(JSON.stringify(TV_DEVICE_INFO), 'utf-8').toString('base64'),
           networkType: 'wifi',
-          refreshToken: this.refresh_token,
+          refreshToken: this.tv_refresh_token,
           uid: this.uid,
           ...(uidSignature && {
             signatureTimestamp,
@@ -605,7 +605,6 @@ class NflHandler {
       this.tv_access_token = data.accessToken;
       this.tv_refresh_token = data.refreshToken;
       this.tv_expires_at = data.expiresIn;
-      this.save();
 
       if (data.additionalInfo) {
         data.additionalInfo.forEach(ai => {
@@ -617,6 +616,8 @@ class NflHandler {
         });
       }
 
+      this.save();
+
       this.checkRedZoneAccess();
       this.checkNetworkAccess();
     } catch (e) {