Don't use browser-launch default opts for existing chrom*

Author: pimterry

src/browsers.ts

@@ -79,6 +79,8 @@ export const getAvailableBrowsers = async (configPath: string) => {
     return (await getLauncher(configPath)).browsers;
 };
 
+export { LaunchOptions };
+
 export const launchBrowser = async (url: string, options: LaunchOptions, configPath: string) => {
     const launcher = await getLauncher(configPath);
     return await promisify(launcher)(url, options);

src/interceptors/chromium-based-interceptors.ts

@@ -3,7 +3,13 @@ import { generateSPKIFingerprint } from 'mockttp';
 
 import { HtkConfig } from '../config';
 
-import { getAvailableBrowsers, launchBrowser, BrowserInstance, Browser } from '../browsers';
+import {
+    getAvailableBrowsers,
+    launchBrowser,
+    BrowserInstance,
+    Browser,
+    LaunchOptions
+} from '../browsers';
 import { delay, readFile, deleteFolder, listRunningProcesses } from '../util';
 import { HideWarningServer } from '../hide-warning-server';
 import { Interceptor } from '.';
@@ -21,7 +27,7 @@ const getChromiumLaunchOptions = async (
     config: HtkConfig,
     proxyPort: number,
     hideWarningServer: HideWarningServer
-) => {
+): Promise<LaunchOptions & { options: Required<LaunchOptions>['options'] }> => {
     const certificatePem = await readFile(config.https.certPath, 'utf8');
     const spkiFingerprint = generateSPKIFingerprint(certificatePem);
 
@@ -234,13 +240,21 @@ abstract class ExistingChromiumBasedInterceptor implements Interceptor {
             hideWarningServer
         );
 
-        if (existingPid) {
-            // If we killed something, use --restore-last-session to ensure it comes back:
-            launchOptions.options.push('--restore-last-session');
-        }
+        // Remove almost all default arguments. Each of these changes behaviour in maybe unexpected
+        // ways, notably including --disable-restore which actively causes problems.
+        launchOptions.skipDefaults = true;
+        launchOptions.options.push(
+            '--no-default-browser-check',
+            '--no-first-run',
+            '--disable-popup-blocking' // Required for hide-warning -> amiusing hop
+        );
+
+        // If we killed something, use --restore-last-session to ensure it comes back:
+        if (existingPid) launchOptions.options.push('--restore-last-session');
 
         const browser = await launchBrowser(hideWarningServer.hideWarningUrl, {
             ...launchOptions,
+            skipDefaults: true,
             profile: null // Enforce that we use the default profile
         }, this.config.configPath);