Support Electron .app bundles on Mac

Author: pimterry

custom-typings/osx-find-executable.d.ts

@@ -27,7 +27,7 @@
   "bugs": "https://github.com/httptoolkit/httptoolkit-server/issues",
   "dependencies": {
     "@httptoolkit/browser-launcher": "^1.6.0",
-    "@httptoolkit/osx-find-executable": "^1.1.2",
+    "@httptoolkit/osx-find-executable": "^2.0.0",
     "@oclif/command": "^1.5.4",
     "@oclif/config": "^1.13.3",
     "@oclif/plugin-help": "^2.1.3",

package-lock.json

@@ -13,9 +13,15 @@ import { HtkConfig } from '../config';
 import { delay } from '../util';
 import { getTerminalEnvVars } from './terminal/terminal-env-overrides';
 import { reportError, addBreadcrumb } from '../error-tracking';
+import { findExecutableInApp } from '@httptoolkit/osx-find-executable';
 
 const readFile = util.promisify(fs.readFile);
 
+const isAppBundle = (path: string) => {
+    return process.platform === "darwin" &&
+        path.endsWith(".app");
+};
+
 export class ElectronInterceptor implements Interceptor {
     readonly id = 'electron';
     readonly version = '1.0.0';
@@ -41,8 +47,13 @@ export class ElectronInterceptor implements Interceptor {
         pathToApplication: string
     }): Promise<void | {}> {
         const debugPort = await getPort({ port: proxyPort });
+        const { pathToApplication } = options;
+
+        const cmd = isAppBundle(pathToApplication)
+            ? await findExecutableInApp(pathToApplication)
+            : pathToApplication;
 
-        spawn(options.pathToApplication, [`--inspect-brk=${debugPort}`], {
+        spawn(cmd, [`--inspect-brk=${debugPort}`], {
             stdio: 'inherit',
             env: Object.assign({},
                 process.env,

package.json

@@ -5,8 +5,7 @@ import { spawn, ChildProcess, SpawnOptions } from 'child_process';
 import * as GSettings from 'node-gsettings-wrapper';
 import * as ensureCommandExists from 'command-exists';
 
-import findOsxExecutableCb = require('@httptoolkit/osx-find-executable');
-const findOsxExecutable = util.promisify(findOsxExecutableCb);
+import { findExecutableById } from '@httptoolkit/osx-find-executable';
 
 import { Interceptor } from '..';
 import { HtkConfig } from '../../config';
@@ -84,7 +83,7 @@ const getOSXTerminalCommand = async (): Promise<SpawnArgs | null> => {
             'com.googlecode.iterm',
             'com.apple.Terminal'
         ].map(
-            (bundleId) => findOsxExecutable(bundleId).catch(() => null)
+            (bundleId) => findExecutableById(bundleId).catch(() => null)
         )
     )).filter((executablePath) => !!executablePath);