Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer

src/utils/getIP.ts

@@ -3,6 +3,9 @@ import { Request } from "express";
 import { IPAddress } from "../types/segments.model";
 
 export function getIP(req: Request): IPAddress {
+    // if in testing mode, return immediately
+    if (config.mode === "test") return "127.0.0.1" as IPAddress;
+
     if (config.behindProxy === true || config.behindProxy === "true") {
         config.behindProxy = "X-Forwarded-For";
     }
@@ -15,6 +18,6 @@ export function getIP(req: Request): IPAddress {
         case "X-Real-IP":
             return req.headers["x-real-ip"] as IPAddress;
         default:
-            return (req.connection?.remoteAddress || req.socket?.remoteAddress) as IPAddress;
+            return req.socket?.remoteAddress as IPAddress;
     }
 }

src/utils/innerTubeAPI.ts

@@ -18,6 +18,7 @@ async function getFromITube (videoID: string): Promise<innerTubeVideoDetails> {
     const result = await axios.post(url, data, {
         timeout: 3500
     });
+    /* istanbul ignore else */
     if (result.status === 200) {
         return result.data.videoDetails;
     } else {
@@ -39,6 +40,7 @@ export async function getPlayerData (videoID: string, ignoreCache = false): Prom
                 return data as innerTubeVideoDetails;
             }
         } catch (err) {
+            /* istanbul ignore next */
             return Promise.reject(err);
         }
     }

src/utils/queryCacher.ts

@@ -1,6 +1,6 @@
 import redis from "../utils/redis";
 import { Logger } from "../utils/logger";
-import { skipSegmentsHashKey, skipSegmentsKey, reputationKey, ratingHashKey, skipSegmentGroupsKey, userFeatureKey } from "./redisKeys";
+import { skipSegmentsHashKey, skipSegmentsKey, reputationKey, ratingHashKey, skipSegmentGroupsKey, userFeatureKey, videoLabelsKey, videoLabelsHashKey } from "./redisKeys";
 import { Service, VideoID, VideoIDHash } from "../types/segments.model";
 import { Feature, HashedUserID, UserID } from "../types/user.model";
 import { config } from "../config";
@@ -81,6 +81,8 @@ function clearSegmentCache(videoInfo: { videoID: VideoID; hashedVideoID: VideoID
         redis.del(skipSegmentsKey(videoInfo.videoID, videoInfo.service)).catch((err) => Logger.error(err));
         redis.del(skipSegmentGroupsKey(videoInfo.videoID, videoInfo.service)).catch((err) => Logger.error(err));
         redis.del(skipSegmentsHashKey(videoInfo.hashedVideoID, videoInfo.service)).catch((err) => Logger.error(err));
+        redis.del(videoLabelsKey(videoInfo.hashedVideoID, videoInfo.service)).catch((err) => Logger.error(err));
+        redis.del(videoLabelsHashKey(videoInfo.hashedVideoID, videoInfo.service)).catch((err) => Logger.error(err));
         if (videoInfo.userID) redis.del(reputationKey(videoInfo.userID)).catch((err) => Logger.error(err));
     }
 }

src/utils/redisKeys.ts

@@ -38,6 +38,16 @@ export function shaHashKey(singleIter: HashedValue): string {
 export const tempVIPKey = (userID: HashedUserID): string =>
     `vip.temp.${userID}`;
 
+export const videoLabelsKey = (videoID: VideoID, service: Service): string =>
+    `labels.v1.${service}.videoID.${videoID}`;
+
+export function videoLabelsHashKey(hashedVideoIDPrefix: VideoIDHash, service: Service): string {
+    hashedVideoIDPrefix = hashedVideoIDPrefix.substring(0, 4) as VideoIDHash;
+    if (hashedVideoIDPrefix.length !== 4) Logger.warn(`Redis skip segment hash-prefix key is not length 4! ${hashedVideoIDPrefix}`);
+
+    return `labels.v1.${service}.${hashedVideoIDPrefix}`;
+}
+
 export function userFeatureKey (userID: HashedUserID, feature: Feature): string {
     return `user.${userID}.feature.${feature}`;
 }

src/utils/tokenUtils.ts

@@ -58,12 +58,11 @@ export async function createAndSaveToken(type: TokenType, code?: string): Promis
 
                     return licenseKey;
                 }
-            } catch (e) {
+                break;
+            } catch (e) /* istanbul ignore next */ {
                 Logger.error(`token creation: ${e}`);
                 return null;
             }
-
-            break;
         }
         case TokenType.local: {
             const licenseKey = generateToken();
@@ -74,7 +73,6 @@ export async function createAndSaveToken(type: TokenType, code?: string): Promis
             return licenseKey;
         }
     }
-
     return null;
 }
 
@@ -102,15 +100,12 @@ export async function refreshToken(type: TokenType, licenseKey: string, refreshT
 
                     return true;
                 }
-            } catch (e) {
+            } catch (e) /* istanbul ignore next */ {
                 Logger.error(`token refresh: ${e}`);
                 return false;
             }
-
-            break;
         }
     }
-
     return false;
 }
 
@@ -136,9 +131,8 @@ export async function getPatreonIdentity(accessToken: string): Promise<PatreonId
         if (identityRequest.status === 200) {
             return identityRequest.data;
         }
-    } catch (e) {
+    } catch (e) /* istanbul ignore next */ {
         Logger.error(`identity request: ${e}`);
     }
-
     return null;
 }