Include a callback in existing terminal scripts to detect errors

Author: pimterry

src/interceptors/terminal/existing-terminal-interceptor.ts

@@ -44,19 +44,22 @@ export class ExistingTerminalInterceptor implements Interceptor {
         await server.start({ startPort: proxyPort + 1, endPort: 65535 });
 
         const envVars = getTerminalEnvVars(proxyPort, this.config.https, 'runtime-inherit');
-        const setupScript = getShellScript(envVars);
+        const setupScript = getShellScript(server.urlFor('/success'), envVars);
 
         const serverState = { server, isActive: false };
-        await server
-            .get('/setup')
-            .thenCallback(() => {
-                serverState.isActive = true;
-                return {
-                    status: 200,
-                    headers: { "content-type": "text/x-shellscript" },
-                    body: setupScript
-                };
-            });
+
+        await server.get('/setup').thenCallback(() => {
+            return {
+                status: 200,
+                headers: { "content-type": "text/x-shellscript" },
+                body: setupScript
+            };
+        });
+
+        await server.post('/success').thenCallback(() => {
+            serverState.isActive = true;
+            return { status: 200 };
+        });
 
         this.servers[proxyPort] = serverState;
         return { port: server.port };

src/interceptors/terminal/terminal-scripts.ts

@@ -70,7 +70,7 @@ end
 ${END_CONFIG_SECTION}`;
 
 // A source-able shell script. Should work for everything except fish, sadly.
-export const getShellScript = (env: { [name: string]: string }) => `${
+export const getShellScript = (callbackUrl: string, env: { [name: string]: string }) => `${
         _.map(env, (value, key) => `    export ${key}="${value.replace(/"/g, '\\"')}"`).join('\n')
     }
 
@@ -80,6 +80,11 @@ export const getShellScript = (env: { [name: string]: string }) => `${
         alias node=node
     fi
 
+    if command -v curl >/dev/null 2>&1; then
+        # Let the HTTP Toolkit app know this ran succesfully
+        (curl --noproxy '*' -X POST "${callbackUrl}" >/dev/null 2>&1 &) &> /dev/null
+    fi
+
     echo 'HTTP Toolkit interception enabled'
 `;
 

test/interceptors/existing-terminal.spec.ts

@@ -36,6 +36,7 @@ describe('Existing terminal interceptor', function () {
         const result = await interceptor.activate(server.port) as { port: number };
         expect(interceptor.isActive(server.port)).to.equal(false);
         await fetch(`http://localhost:${result.port}/setup`);
+        await fetch(`http://localhost:${result.port}/success`, { method: 'POST' });
         expect(interceptor.isActive(server.port)).to.equal(true);
 
         expect(interceptor.isActive(server.port + 1)).to.equal(false);
@@ -51,6 +52,7 @@ describe('Existing terminal interceptor', function () {
 
         const result = await interceptor.activate(server.port) as { port: number };
         await fetch(`http://localhost:${result.port}/setup`);
+        await fetch(`http://localhost:${result.port}/success`, { method: 'POST' });
         expect(interceptor.isActive(server.port)).to.equal(true);
 
         await interceptor.deactivateAll();
@@ -88,6 +90,7 @@ describe('Existing terminal interceptor', function () {
         });
 
         expect(scriptOutput.stdout).to.contain("HTTP Toolkit interception enabled");
+        expect(interceptor.isActive(server.port)).to.equal(true);
 
         const seenRequests = _.concat(...await Promise.all([
             mainRule.getSeenRequests(),