Small code quality tweaks for Chrome & FF interceptors

Author: pimterry

src/interceptors/fresh-chrome.ts

@@ -10,6 +10,7 @@ import { HtkConfig } from '../config';
 import { getAvailableBrowsers, launchBrowser, BrowserInstance } from '../browsers';
 import { delay } from '../util';
 import { HideChromeWarningServer } from '../hide-chrome-warning-server';
+import { Interceptor } from '.';
 
 const readFile = promisify(fs.readFile);
 
@@ -25,7 +26,7 @@ const getChromeBrowserName = async (config: HtkConfig): Promise<string | undefin
         .value()[0];
 };
 
-export class FreshChrome {
+export class FreshChrome implements Interceptor {
     id = 'fresh-chrome';
     version = '1.0.0';
 
@@ -42,7 +43,7 @@ export class FreshChrome {
     async activate(proxyPort: number) {
         if (this.isActive(proxyPort)) return;
 
-        const certificatePem = await readFile(path.join(this.config.configPath, 'ca.pem'), 'utf8');
+        const certificatePem = await readFile(this.config.https.certPath, 'utf8');
         const spkiFingerprint = generateSPKIFingerprint(certificatePem);
 
         const hideWarningServer = new HideChromeWarningServer();

src/interceptors/fresh-firefox.ts

@@ -9,6 +9,7 @@ import { HtkConfig } from '../config';
 import { getAvailableBrowsers, launchBrowser, BrowserInstance } from '../browsers';
 import { CertCheckServer } from '../cert-check-server';
 import { delay } from '../util';
+import { Interceptor } from '.';
 
 const deleteFolder = promisify(rimraf);
 const readFile = promisify(fs.readFile);
@@ -21,7 +22,7 @@ const FIREFOX_PREF_REGEX = /\w+_pref\("([^"]+)", (.*)\);/
 
 let browsers: _.Dictionary<BrowserInstance> = {};
 
-export class FreshFirefox {
+export class FreshFirefox implements Interceptor {
     id = 'fresh-firefox';
     version = '1.0.0';
 
@@ -32,9 +33,9 @@ export class FreshFirefox {
     }
 
     async isActivable() {
-        const browsers = await getAvailableBrowsers(this.config.configPath);
+        const availableBrowsers = await getAvailableBrowsers(this.config.configPath);
 
-        return _(browsers)
+        return _(availableBrowsers)
             .map(b => b.name)
             .includes('firefox')