diff --git a/src/middleware/userCounter.ts b/src/middleware/userCounter.ts index dff3ab5..eda60a3 100644 --- a/src/middleware/userCounter.ts +++ b/src/middleware/userCounter.ts @@ -14,7 +14,7 @@ export function userCounter(req: Request, res: Response, next: NextFunction): vo method: "post", url: `${config.userCounterURL}/api/v1/addIP?hashedIP=${getIP(req)}`, httpAgent - }).catch(() => Logger.debug(`Failing to connect to user counter at: ${config.userCounterURL}`)); + }).catch(() => /* instanbul skip next */ Logger.debug(`Failing to connect to user counter at: ${config.userCounterURL}`)); } } diff --git a/src/routes/getSkipSegmentsByHash.ts b/src/routes/getSkipSegmentsByHash.ts index eaf7f97..d5b89bd 100644 --- a/src/routes/getSkipSegmentsByHash.ts +++ b/src/routes/getSkipSegmentsByHash.ts @@ -25,13 +25,13 @@ export async function getSkipSegmentsByHash(req: Request, res: Response): Promis try { await getEtag("skipSegmentsHash", hashPrefix, service) .then(etag => res.set("ETag", etag)) - .catch(() => null); + .catch(/* istanbul ignore next */ () => null); const output = Object.entries(segments).map(([videoID, data]) => ({ videoID, segments: data.segments, })); return res.status(output.length === 0 ? 404 : 200).json(output); - } catch(e) { + } catch (e) /* istanbul ignore next */ { Logger.error(`skip segments by hash error: ${e}`); return res.status(500).send("Internal server error"); diff --git a/src/utils/createMemoryCache.ts b/src/utils/createMemoryCache.ts index 9ec2d57..ded7c0b 100644 --- a/src/utils/createMemoryCache.ts +++ b/src/utils/createMemoryCache.ts @@ -1,4 +1,5 @@ export function createMemoryCache(memoryFn: (...args: any[]) => void, cacheTimeMs: number): any { + /* istanbul ignore if */ if (isNaN(cacheTimeMs)) cacheTimeMs = 0; // holds the promise results diff --git a/src/utils/isUserTempVIP.ts b/src/utils/isUserTempVIP.ts index 44bc649..3afeff1 100644 --- a/src/utils/isUserTempVIP.ts +++ b/src/utils/isUserTempVIP.ts @@ -11,7 +11,7 @@ export const isUserTempVIP = async (hashedUserID: HashedUserID, videoID: VideoID try { const reply = await redis.get(tempVIPKey(hashedUserID)); return reply && reply == channelID; - } catch (e) { + } catch (e) /* istanbul ignore next */ { Logger.error(e as string); return false; } diff --git a/src/utils/logger.ts b/src/utils/logger.ts index 8507a46..a637c66 100644 --- a/src/utils/logger.ts +++ b/src/utils/logger.ts @@ -45,6 +45,7 @@ class Logger { }; constructor() { + /* istanbul ignore if */ if (config.mode === "development") { this._settings.INFO = true; this._settings.DEBUG = true; @@ -73,9 +74,11 @@ class Logger { let color = colors.Bright; if (level === LogLevel.ERROR) color = colors.FgRed; + /* istanbul ignore if */ if (level === LogLevel.WARN) color = colors.FgYellow; let levelStr = level.toString(); + /* istanbul ignore if */ if (levelStr.length === 4) { levelStr += " "; // ensure logs are aligned } diff --git a/src/utils/redis.ts b/src/utils/redis.ts index f8be2c7..8ee2a1b 100644 --- a/src/utils/redis.ts +++ b/src/utils/redis.ts @@ -135,17 +135,21 @@ if (config.redis?.enabled) { .then((reply) => resolve(reply)) .catch((err) => reject(err)) ); + /* istanbul ignore next */ client.on("error", function(error) { lastClientFail = Date.now(); Logger.error(`Redis Error: ${error}`); }); + /* istanbul ignore next */ client.on("reconnect", () => { Logger.info("Redis: trying to reconnect"); }); + /* istanbul ignore next */ readClient?.on("error", function(error) { lastReadFail = Date.now(); Logger.error(`Redis Read-Only Error: ${error}`); }); + /* istanbul ignore next */ readClient?.on("reconnect", () => { Logger.info("Redis Read-Only: trying to reconnect"); });