Add support for Brave & Opera

Author: pimterry

src/interceptors/chromium-based-interceptors.ts

@@ -35,7 +35,8 @@ abstract class ChromiumBasedInterceptor implements Interceptor {
     }
 
     async isActivable() {
-        return !!(await getBrowserDetails(this.config, this.variantName));
+        const browserDetails = await getBrowserDetails(this.config, this.variantName)
+        return !!browserDetails;
     }
 
     async activate(proxyPort: number) {
@@ -76,6 +77,9 @@ abstract class ChromiumBasedInterceptor implements Interceptor {
         browser.process.once('close', () => {
             delete this.activeBrowsers[proxyPort];
 
+            // Opera has a launch proc that exits immediately in Windows, so we can't clear the profile there.
+            if (process.platform === 'win32' && this.variantName === 'opera') return;
+
             if (Object.keys(this.activeBrowsers).length === 0 && browserDetails && _.isString(browserDetails.profile)) {
                 // If we were the last browser, and we have a profile path, and it's in our config
                 // (just in case something's gone wrong) -> delete the profile to reset everything.
@@ -208,4 +212,26 @@ export class FreshEdgeCanary extends ChromiumBasedInterceptor {
         super(config, 'msedge-canary');
     }
 
+};
+
+export class FreshBrave extends ChromiumBasedInterceptor {
+
+    id = 'fresh-brave';
+    version = '1.0.0';
+
+    constructor(config: HtkConfig) {
+        super(config, 'brave');
+    }
+
+};
+
+export class FreshOpera extends ChromiumBasedInterceptor {
+
+    id = 'fresh-opera';
+    version = '1.0.0';
+
+    constructor(config: HtkConfig) {
+        super(config, 'opera');
+    }
+
 };

src/interceptors/index.ts

@@ -12,7 +12,9 @@ import {
     FreshChromiumDev,
     FreshEdge,
     FreshEdgeBeta,
-    FreshEdgeCanary
+    FreshEdgeCanary,
+    FreshBrave,
+    FreshOpera
 } from './chromium-based-interceptors';
 import { FreshTerminalInterceptor } from './terminal/fresh-terminal-interceptor';
 import { ExistingTerminalInterceptor } from './terminal/existing-terminal-interceptor';
@@ -40,15 +42,23 @@ export function buildInterceptors(config: HtkConfig): _.Dictionary<Interceptor>
         new FreshChromeBeta(config),
         new FreshChromeDev(config),
         new FreshChromeCanary(config),
+
         new FreshChromium(config),
         new FreshChromiumDev(config),
+
         new FreshEdge(config),
         new FreshEdgeBeta(config),
         new FreshEdgeCanary(config),
+
+        new FreshOpera(config),
+        new FreshBrave(config),
         new FreshFirefox(config),
+
         new FreshTerminalInterceptor(config),
         new ExistingTerminalInterceptor(config),
+
         new ElectronInterceptor(config),
+
         new AndroidAdbInterceptor(config)
     ];
 

test/integration-test.spec.ts

@@ -158,6 +158,8 @@ describe('Integration test', function () {
             inactivable('fresh-edge'),
             inactivable('fresh-edge-beta'),
             inactivable('fresh-edge-canary'),
+            inactivable('fresh-opera'),
+            inactivable('fresh-brave'),
             activable('fresh-firefox'),
             activable('fresh-terminal'),
             activable('existing-terminal'),