Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer into mute-skip

package.json

@@ -9,8 +9,8 @@
     "dev:bash": "nodemon -x 'npm test ; npm start'",
     "start": "ts-node src/index.ts",
     "tsc": "tsc -p tsconfig.json",
-    "lint": "eslint src",
+    "lint": "eslint src test",
-    "lint:fix": "eslint src --fix"
+    "lint:fix": "eslint src test --fix"
   },
   "author": "Ajay Ramachandran",
   "license": "MIT",

src/config.ts

@@ -84,7 +84,6 @@ addDefaults(config, {
 function addDefaults(config: SBSConfig, defaults: SBSConfig) {
     for (const key in defaults) {
         if (!Object.prototype.hasOwnProperty.call(config, key)) {
-            // @ts-ignore
             config[key] = defaults[key];
         }
     }

src/types/config.model.ts

@@ -3,6 +3,7 @@ import * as redis from 'redis';
 import { CacheOptions } from "@ajayyy/lru-diskcache";
 
 export interface SBSConfig {
+    [index: string]: any
     port: number;
     mockPort?: number;
     globalSalt: string;

src/utils/createMemoryCache.ts

@@ -1,4 +1,4 @@
-export function createMemoryCache(memoryFn: (...args: any[]) => void, cacheTimeMs: number) {
+export function createMemoryCache(memoryFn: (...args: any[]) => void, cacheTimeMs: number): any {
     if (isNaN(cacheTimeMs)) cacheTimeMs = 0;
 
     // holds the promise results
@@ -22,8 +22,8 @@ export function createMemoryCache(memoryFn: (...args: any[]) => void, cacheTimeM
                 }
             }
             // create new promise
-            const promise = new Promise(async (resolve) => {
+            const promise = new Promise((resolve) => {
-                resolve((await memoryFn(...args)));
+                resolve(memoryFn(...args));
             });
             // store promise reference until fulfilled
             promiseMemory.set(cacheKey, promise);

src/utils/diskCache.ts

@@ -8,6 +8,7 @@ if (config.diskCache) {
     DiskCache.init();
 } else {
     DiskCache = {
+        /* eslint-disable @typescript-eslint/no-unused-vars */
         // constructor(rootPath, options): {};
 
         init(): void { return; },
@@ -16,16 +17,17 @@ if (config.diskCache) {
 
         has(key: string): boolean { return false; },
 
-        get(key: string, opts): string { return null; },
+        get(key: string, opts?: {encoding?: string}): string { return null; },
 
         // Returns size
-        set(key: string, dataOrSteam): Promise<number> { return new Promise(() => 0); },
+        set(key: string, dataOrSteam: string): Promise<number> { return new Promise(() => 0); },
 
         del(key: string): void { return; },
 
         size(): number { return 0; },
 
         prune(): void {return; },
+        /* eslint-enable @typescript-eslint/no-unused-vars */
     };
 }
 

test/cases/getSkipSegments.ts

@@ -326,7 +326,7 @@ describe('getSkipSegments', () => {
                 else done();
             }
         })
-        .catch(err => done("Couldn't call endpoint"));
+        .catch(() => done("Couldn't call endpoint"));
     });
 
     it('Should be able to get specific segments with repeating requiredSegment', (done: Done) => {
@@ -341,6 +341,6 @@ describe('getSkipSegments', () => {
                 else done();
             }
         })
-        .catch(err => done("Couldn't call endpoint"));
+        .catch(() => done("Couldn't call endpoint"));
     });
 });

test/cases/getSkipSegmentsByHash.ts

@@ -252,7 +252,7 @@ describe('getSegmentsByHash', () => {
                 }
             }
         })
-        .catch(err => ("Couldn't call endpoint"));
+        .catch(() => ("Couldn't call endpoint"));
     });
 
     it('Should be able to get specific segments with requiredSegments', (done: Done) => {
@@ -268,7 +268,7 @@ describe('getSegmentsByHash', () => {
                 else done();
             }
         })
-        .catch(err => done("Couldn't call endpoint"));
+        .catch(() => done("Couldn't call endpoint"));
     });
 
     it('Should be able to get specific segments with repeating requiredSegment', (done: Done) => {
@@ -284,6 +284,6 @@ describe('getSegmentsByHash', () => {
                 else done();
             }
         })
-        .catch(err => done("Couldn't call endpoint"));
+        .catch(() => done("Couldn't call endpoint"));
     });
 });

test/cases/getUserInfo.ts

@@ -165,7 +165,7 @@ describe('getUserInfo', () => {
             const data = await res.json();
             for (const value in data) {
                 if (data[value] === null && value !== "lastSegmentID")  {
-                    done(`returned null for ${value}`)
+                    done(`returned null for ${value}`);
                 }
             }
             done(); // pass

test/cases/setUsername.ts

@@ -46,6 +46,7 @@ async function getLastLogUserNameChange(userID: string) {
 }
 
 function wellFormatUserName(userName: string) {
+    // eslint-disable-next-line no-control-regex
     return userName.replace(/[\u0000-\u001F\u007F-\u009F]/g, '');
 }
 

test/mocks.ts

@@ -1,5 +1,6 @@
 import express from 'express';
 import {config} from '../src/config';
+import { Server } from 'http';
 
 const app = express();
 
@@ -46,6 +47,6 @@ app.post('/CustomWebhook', (req, res) => {
     res.sendStatus(200);
 });
 
-export function createMockServer(callback: () => void) {
+export function createMockServer(callback: () => void): Server {
     return app.listen(config.mockPort, callback);
 }

test/test.ts

@@ -18,15 +18,15 @@ async function init() {
     }));
 
     // delete old test database
-    if (fs.existsSync(config.db)) fs.unlinkSync(config.db)
+    if (fs.existsSync(config.db)) fs.unlinkSync(config.db);
     if (fs.existsSync(config.privateDB)) fs.unlinkSync(config.privateDB);
 
     await initDb();
 
     const dbMode = config.mysql ? 'mysql'
         : config.postgres ? 'postgres'
-        : 'sqlite'
+        : 'sqlite';
-    Logger.info('Database Mode: ' + dbMode)
+    Logger.info('Database Mode: ' + dbMode);
 
     // Instantiate a Mocha instance.
     const mocha = new Mocha();