Add restart command. Closes #235 (#238)

Author: garrytrinder

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added:
 
 - Command: `dev-proxy-toolkit.config-new` - Create new configuration file
+- Command: `dev-proxy-toolkit.restart` - Restart Dev Proxy
 
 ## [0.20.0] - 2025-04-01
 

README.md

@@ -25,6 +25,7 @@ The following sections describe the features that the extension contributes to V
 
 - `Dev Proxy Toolkit: Start` - Only available when Dev Proxy is not running
 - `Dev Proxy Toolkit: Stop` - Only available when Dev Proxy is running
+- `Dev Proxy Toolkit: Restart` - Only available when Dev Proxy is running
 - `Dev Proxy Toolkit: Raise mock request` - Only available when Dev Proxy is running
 - `Dev Proxy Toolkit: Start recording` - Only available when Dev Proxy is running
 - `Dev Proxy Toolkit: Stop recording`- Only available when Dev Proxy is recording

package.json

@@ -35,6 +35,13 @@
         "icon": "$(debug-stop)",
         "enablement": "isDevProxyRunning"
       },
+      {
+        "command": "dev-proxy-toolkit.restart",
+        "title": "Restart",
+        "category": "Dev Proxy Toolkit",
+        "icon": "$(debug-restart)",
+        "enablement": "isDevProxyRunning"
+      },
       {
         "command": "dev-proxy-toolkit.raise-mock",
         "title": "Raise mock request",
@@ -83,6 +90,21 @@
           "group": "navigation@2",
           "when": "!activeEditorIsDirty && isDevProxyConfigFile && isDevProxyRunning"
         },
+        {
+          "command": "dev-proxy-toolkit.restart",
+          "group": "navigation@2",
+          "when": "!activeEditorIsDirty && isDevProxyConfigFile && isDevProxyRunning"
+        },
+        {
+          "command": "dev-proxy-toolkit.config-open",
+          "group": "navigation@3",
+          "when": "!activeEditorIsDirty && isDevProxyConfigFile && !isDevProxyRunning"
+        },
+        {
+          "command": "dev-proxy-toolkit.config-new",
+          "group": "navigation@3",
+          "when": "!activeEditorIsDirty && isDevProxyConfigFile && !isDevProxyRunning"
+        },
         {
           "command": "dev-proxy-toolkit.raise-mock",
           "group": "navigation@3",

src/commands.ts

@@ -2,6 +2,7 @@ import * as vscode from 'vscode';
 import { pluginDocs } from './constants';
 import { VersionExeName, VersionPreference } from './enums';
 import { executeCommand, isConfigFile } from './helpers';
+import { isDevProxyRunning } from './detect';
 
 export const registerCommands = (context: vscode.ExtensionContext, configuration: vscode.WorkspaceConfiguration) => {
     context.subscriptions.push(
@@ -104,6 +105,9 @@ export const registerCommands = (context: vscode.ExtensionContext, configuration
     context.subscriptions.push(
         vscode.commands.registerCommand('dev-proxy-toolkit.stop', async () => {
             const apiPort = configuration.get('apiPort') as number;
+            const versionPreference = configuration.get('version') as VersionPreference;
+            const exeName = versionPreference === VersionPreference.Stable ? VersionExeName.Stable : VersionExeName.Beta;
+
             await fetch(`http://localhost:${apiPort}/proxy/stopproxy`, {
                 method: 'POST',
                 headers: {
@@ -115,8 +119,7 @@ export const registerCommands = (context: vscode.ExtensionContext, configuration
             if (closeTerminal) {
                 const checkProxyStatus = async () => {
                     try {
-                        const response = await fetch(`http://localhost:${apiPort}/proxy`);
-                        return response.ok;
+                        return await isDevProxyRunning(exeName);
                     } catch {
                         return false;
                     }
@@ -142,6 +145,60 @@ export const registerCommands = (context: vscode.ExtensionContext, configuration
             }
         }));
 
+    context.subscriptions.push(
+        vscode.commands.registerCommand('dev-proxy-toolkit.restart', async () => {
+            const apiPort = configuration.get('apiPort') as number;
+            const versionPreference = configuration.get('version') as VersionPreference;
+            const exeName = versionPreference === VersionPreference.Stable ? VersionExeName.Stable : VersionExeName.Beta;
+
+            try {
+                await fetch(`http://localhost:${apiPort}/proxy/stopproxy`, {
+                    method: 'POST',
+                    headers: {
+                        'Content-Type': 'application/json'
+                    }
+                });
+
+                const checkProxyStatus = async () => {
+                    try {
+                        return await isDevProxyRunning(exeName);
+                    } catch {
+                        return false;
+                    }
+                };
+
+                const waitForProxyToStop = async () => {
+                    let isRunning = true;
+                    while (isRunning) {
+                        isRunning = await checkProxyStatus();
+                        if (isRunning) {
+                            await new Promise(resolve => setTimeout(resolve, 1000));
+                        }
+                    }
+                };
+
+                await waitForProxyToStop();
+
+                const showTerminal = configuration.get('showTerminal') as boolean;
+
+                let terminal: vscode.Terminal;
+
+                if (vscode.window.activeTerminal) {
+                    terminal = vscode.window.activeTerminal;
+                } else {
+                    terminal = vscode.window.createTerminal('Dev Proxy');
+
+                    showTerminal ? terminal.show() : terminal.hide();
+                }
+
+                vscode.window.activeTextEditor && isConfigFile(vscode.window.activeTextEditor.document)
+                    ? terminal.sendText(`devproxy --config-file "${vscode.window.activeTextEditor.document.uri.fsPath}"`)
+                    : terminal.sendText('devproxy');
+            } catch {
+                vscode.window.showErrorMessage('Failed to restart Dev Proxy');
+            }
+        }));
+
     context.subscriptions.push(
         vscode.commands.registerCommand('dev-proxy-toolkit.raise-mock', async () => {
             const apiPort = configuration.get('apiPort') as number;

src/detect.ts

@@ -52,9 +52,13 @@ export const isDevProxyRunning = async (devProxyExe: string): Promise<boolean> =
         return processId.trim() !== '';
     };
     if (platform === 'darwin') {
-        const processId = await executeCommand(`$SHELL -c "ps -ef | grep ${devProxyExe} | grep -v grep | awk \'{print $2}\'"`);
+        const processId = await executeCommand(`$SHELL -c "ps -ef | grep ${devProxyExe} | grep -v grep | awk '{print $2}'"`);
         return processId.trim() !== '';
     };
+    if (platform === 'linux') {
+        const processId = await executeCommand(`/bin/bash -c "ps -ef | grep ${devProxyExe} | grep -v grep | awk '{print $2}'"`);
+        return processId.trim() !== '';
+    }
     return false;
 };