Add version preference setting. Closes #71 (#72)

Closes #71

Author: garrytrinder

package.json

@@ -25,7 +25,18 @@
         "language": "json",
         "path": "./dist/snippets.json"
       }
-    ]
+    ],
+    "configuration": {
+      "title": "Dev Proxy Toolkit",
+      "properties": {
+        "devproxytoolkit.versionPreference": {
+          "type": "string",
+          "enum": ["stable", "beta"],
+          "default": "stable",
+          "description": "Select the preferred version to be used when installed side by side."
+        }
+      }
+    }
   },
   "preview": true,
   "pricing": "Free",
@@ -67,4 +78,4 @@
   "dependencies": {
     "json-to-ast": "^2.1.0"
   }
-}
+}

src/detect.ts

@@ -1,10 +1,12 @@
+import * as vscode from 'vscode';
 import { exec } from 'child_process';
 import { DevProxyInstall } from './types';
 import os from 'os';
+import { VersionExeName, VersionPreference } from './enums';
 
-export const getVersion = async () => {
+export const getVersion = async (devProxyExe: string) => {
     try {
-        const version = await executeCommand(`devproxy --version`);
+        const version = await executeCommand(`${devProxyExe} --version`);
         return version.trim();
     } catch (error) {
         return "";
@@ -25,14 +27,15 @@ export const executeCommand = async (cmd: string): Promise<string> => {
     });
 };
 
-export const detectDevProxyInstall = async (): Promise<DevProxyInstall> => {
-    const version = await getVersion();
+export const detectDevProxyInstall = async (versionPreference: VersionPreference): Promise<DevProxyInstall> => {
+    const devProxyExe = getDevProxyExe(versionPreference);
+    const version = await getVersion(devProxyExe);
     const isInstalled = version !== '';
     const isBeta = version.includes('beta');
     const platform = os.platform();
-    const outdatedVersion = await getOutdatedVersion();
+    const outdatedVersion = await getOutdatedVersion(devProxyExe);
     const isOutdated = isInstalled && outdatedVersion !== '';
-    const isRunning = await isDevProxyRunning();
+    const isRunning = await isDevProxyRunning(devProxyExe);
 
     return {
         version,
@@ -45,25 +48,31 @@ export const detectDevProxyInstall = async (): Promise<DevProxyInstall> => {
     };
 };
 
-export const getOutdatedVersion = async (): Promise<string> => {
+export const getOutdatedVersion = async (devProxyExe: string): Promise<string> => {
     try {
-        const outdated = await executeCommand(`devproxy outdated --short`);
+        const outdated = await executeCommand(`${devProxyExe} outdated --short`);
         return outdated ? outdated.trim() : '';
     } catch (error) {
         return "";
     }
 };
 
-export const isDevProxyRunning = async (): Promise<boolean> => {
+export const isDevProxyRunning = async (devProxyExe: string): Promise<boolean> => {
     const platform = os.platform();
 
     if (platform === 'win32') {
-        const processId = await executeCommand('pwsh.exe -c "(Get-Process devproxy -ErrorAction SilentlyContinue).Id"');
+        const processId = await executeCommand(`pwsh.exe -c "(Get-Process ${devProxyExe} -ErrorAction SilentlyContinue).Id"`);
         return processId.trim() !== '';
     };
     if (platform === 'darwin') {
-        const processId = await executeCommand('$SHELL -c "ps -ef | grep devproxy | 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() !== '';
     };
     return false;
+};
+
+export const getDevProxyExe = (versionPreference: VersionPreference) => {
+    return versionPreference === VersionPreference.Stable
+        ? VersionExeName.Stable
+        : VersionExeName.Beta;
 };

src/enums.ts

@@ -0,0 +1,9 @@
+export enum VersionPreference {
+  Stable = 'stable',
+  Beta = 'beta',
+}
+
+export enum VersionExeName {
+    Stable = 'devproxy',
+    Beta = 'devproxy-beta',
+}

src/extension.ts

@@ -6,10 +6,14 @@ import { registerCodeLens } from './codelens';
 import { createStatusBar, statusBarLoop, updateStatusBar } from './statusbar';
 import { registerCodeActions } from './codeactions';
 import { updateGlobalState } from './state';
+import { VersionPreference } from './enums';
 
 export const activate = async (context: vscode.ExtensionContext): Promise<vscode.ExtensionContext> => {
+  const configuration = vscode.workspace.getConfiguration('devproxytoolkit');
+  const versionPreference = configuration.get('versionPreference') as VersionPreference;
+
   const statusBar = createStatusBar(context);
-  await updateGlobalState(context);
+  await updateGlobalState(context, versionPreference);
 
   const collection = vscode.languages.createDiagnosticCollection('Dev Proxy');
 
@@ -20,10 +24,10 @@ export const activate = async (context: vscode.ExtensionContext): Promise<vscode
 
   const notification = handleStartNotification(context);
   processNotification(notification);
-  
+
   updateStatusBar(context, statusBar);
 
-  setInterval(() => statusBarLoop(context, statusBar), 5000);
+  setInterval(() => statusBarLoop(context, statusBar, versionPreference), 5000);
 
   return context;
 };

src/state.ts

@@ -1,6 +1,7 @@
 import * as vscode from 'vscode';
 import { detectDevProxyInstall } from './detect';
+import { VersionPreference } from './enums';
 
-export const updateGlobalState = async (context: vscode.ExtensionContext) => {
-    context.globalState.update('devProxyInstall', await detectDevProxyInstall());
+export const updateGlobalState = async (context: vscode.ExtensionContext, versionPreference: VersionPreference) => {
+    context.globalState.update('devProxyInstall', await detectDevProxyInstall(versionPreference));
 };

src/statusbar.ts

@@ -1,6 +1,7 @@
 import * as vscode from 'vscode';
 import { DevProxyInstall } from './types';
-import { isDevProxyRunning } from './detect';
+import { getDevProxyExe, isDevProxyRunning } from './detect';
+import { VersionPreference } from './enums';
 
 export const createStatusBar = (context: vscode.ExtensionContext): vscode.StatusBarItem => {
     const statusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, 100);
@@ -44,9 +45,10 @@ export const handleStatusBarUpdate = (context: vscode.ExtensionContext, statusBa
     return statusBar;
 };
 
-export const statusBarLoop = async (context: vscode.ExtensionContext, statusBar: vscode.StatusBarItem) => {
-    const isRunning = await isDevProxyRunning();
+export const statusBarLoop = async (context: vscode.ExtensionContext, statusBar: vscode.StatusBarItem, versionPreference: VersionPreference) => {
+    const devProxyExe = getDevProxyExe(versionPreference);
+    const isRunning = await isDevProxyRunning(devProxyExe);
     const globalState = context.globalState.get<DevProxyInstall>('devProxyInstall');
     await context.globalState.update('devProxyInstall', { ...globalState, isRunning });
     updateStatusBar(context, statusBar);
-  };
+};

src/test/extension.test.ts

@@ -15,6 +15,7 @@ import { handleStatusBarUpdate, statusBarLoop } from '../statusbar';
 import * as sinon from 'sinon';
 import * as detect from '../detect';
 import { DevProxyInstall } from '../types';
+import { VersionPreference } from '../enums';
 
 export const testDevProxyInstall: DevProxyInstall = {
   isBeta: false,
@@ -507,7 +508,7 @@ suite('statusbar', () => {
       vscode.StatusBarAlignment.Right,
       100
     );
-    await statusBarLoop(context, statusBar);
+    await statusBarLoop(context, statusBar, VersionPreference.Stable);
 
     const expected = '$(radio-tower) Dev Proxy 0.14.1';
     const actual = statusBar.text;