feat: add cloudflared protocol selection for tunnels in settings and UI (#91)

leepood · web-flow · commit 170080479eaf · 2026-01-30T18:40:46.000+03:00
diff --git a/platforms/macos/Sources/AppState.swift b/platforms/macos/Sources/AppState.swift
@@ -12,6 +12,7 @@ extension Defaults.Keys {
     static let useTreeView = Key<Bool>("useTreeView", default: false)
     static let hideSystemProcesses = Key<Bool>("hideSystemProcesses", default: false)
     static let refreshInterval = Key<Int>("refreshInterval", default: 5)
+    static let cloudflaredProtocol = Key<CloudflaredProtocol>("cloudflaredProtocol", default: .http2)
 
     // Kubernetes-related keys
     static let customNamespaces = Key<[String]>("customNamespaces", default: [])
diff --git a/platforms/macos/Sources/Models/CloudflaredProtocol.swift b/platforms/macos/Sources/Models/CloudflaredProtocol.swift
@@ -0,0 +1,15 @@
+import Defaults
+import Foundation
+
+/// Supported transport protocols for cloudflared quick tunnels.
+enum CloudflaredProtocol: String, CaseIterable, Codable, Defaults.Serializable, Sendable {
+    case http2 = "http2"
+    case quic = "quic"
+
+    var displayName: String {
+        switch self {
+        case .http2: return "HTTP/2"
+        case .quic: return "QUIC"
+        }
+    }
+}
diff --git a/platforms/macos/Sources/Services/CloudflaredService.swift b/platforms/macos/Sources/Services/CloudflaredService.swift
@@ -1,5 +1,6 @@
 import Foundation
 import Darwin
+import Defaults
 
 // MARK: - Cloudflared Service Actor
 
@@ -48,7 +49,8 @@ actor CloudflaredService {
 
         let process = Process()
         process.executableURL = URL(fileURLWithPath: cloudflaredPath)
-        process.arguments = ["tunnel", "--url", "localhost:\(port)"]
+        let protocolValue = Defaults[.cloudflaredProtocol].rawValue
+        process.arguments = ["tunnel", "--url", "localhost:\(port)", "--protocol", protocolValue]
 
         let pipe = Pipe()
         process.standardOutput = pipe
diff --git a/platforms/macos/Sources/Views/Settings/CloudflaredSettingsSection.swift b/platforms/macos/Sources/Views/Settings/CloudflaredSettingsSection.swift
@@ -0,0 +1,38 @@
+/// CloudflaredSettingsSection - Cloudflare tunnel preferences
+///
+/// Displays cloudflared settings including:
+/// - Transport protocol selection (HTTP/2 or QUIC)
+
+import SwiftUI
+import Defaults
+
+struct CloudflaredSettingsSection: View {
+    @Default(.cloudflaredProtocol) private var protocolSelection
+
+    var body: some View {
+        SettingsGroup("Cloudflare Tunnels", icon: "cloud.fill") {
+            SettingsRowContainer {
+                HStack {
+                    VStack(alignment: .leading, spacing: 2) {
+                        Text("Tunnel protocol")
+                            .fontWeight(.medium)
+                        Text("Choose how cloudflared connects to Cloudflare (applies to new tunnels)")
+                            .font(.caption)
+                            .foregroundStyle(.secondary)
+                    }
+
+                    Spacer()
+
+                    Picker("", selection: $protocolSelection) {
+                        ForEach(CloudflaredProtocol.allCases, id: \.self) { option in
+                            Text(option.displayName).tag(option)
+                        }
+                    }
+                    .labelsHidden()
+                    .pickerStyle(.segmented)
+                    .frame(width: 160)
+                }
+            }
+        }
+    }
+}
diff --git a/platforms/macos/Sources/Views/Settings/SettingsView.swift b/platforms/macos/Sources/Views/Settings/SettingsView.swift
@@ -36,6 +36,9 @@ struct SettingsView: View {
                 // MARK: - Port Forwarding
                 PortForwardingSettingsSection()
 
+                // MARK: - Cloudflare Tunnels
+                CloudflaredSettingsSection()
+
                 // MARK: - Keyboard Shortcuts
                 ShortcutsSection()
 
diff --git a/platforms/windows/PortKiller/App.xaml.cs b/platforms/windows/PortKiller/App.xaml.cs
@@ -46,7 +46,8 @@ private void ConfigureServices(IServiceCollection services)
         ));
         services.AddSingleton<TunnelViewModel>(sp => new TunnelViewModel(
             sp.GetRequiredService<TunnelService>(),
-            NotificationService.Instance
+            NotificationService.Instance,
+            sp.GetRequiredService<SettingsService>()
         ));
     }
 }
diff --git a/platforms/windows/PortKiller/CloudflareTunnelsView.xaml b/platforms/windows/PortKiller/CloudflareTunnelsView.xaml
@@ -91,6 +91,18 @@
                 </StackPanel>
 
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0,0,12,0">
+                        <TextBlock Text="Protocol" FontSize="12" Foreground="#A0A0A0" VerticalAlignment="Center" Margin="0,0,8,0"/>
+                        <ComboBox Width="90"
+                                  ItemsSource="{Binding ProtocolOptions}"
+                                  SelectedValuePath="Value"
+                                  SelectedValue="{Binding CloudflaredProtocol, Mode=TwoWay}"
+                                  DisplayMemberPath="Label"
+                                  Background="#3A3A3A"
+                                  Foreground="#E0E0E0"
+                                  BorderThickness="0"
+                                  Padding="6,2"/>
+                    </StackPanel>
                     <Button Content="Stop All" 
                             Click="StopAllButton_Click"
                             Style="{StaticResource DangerButton}"
diff --git a/platforms/windows/PortKiller/MainWindow.xaml b/platforms/windows/PortKiller/MainWindow.xaml
@@ -613,6 +613,19 @@
                                     <TextBlock Text="Cloudflare Tunnels" FontSize="20" FontWeight="SemiBold" Foreground="#E0E0E0"/>
                                 </StackPanel>
                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0,0,12,0">
+                                        <TextBlock Text="Protocol" FontSize="12" Foreground="#A0A0A0" VerticalAlignment="Center" Margin="0,0,8,0"/>
+                                        <ComboBox x:Name="TunnelProtocolCombo"
+                                                  Width="90"
+                                                  ItemsSource="{Binding ProtocolOptions}"
+                                                  SelectedValuePath="Value"
+                                                  SelectedValue="{Binding CloudflaredProtocol, Mode=TwoWay}"
+                                                  DisplayMemberPath="Label"
+                                                  Background="#3A3A3A"
+                                                  Foreground="#E0E0E0"
+                                                  BorderThickness="0"
+                                                  Padding="6,2"/>
+                                    </StackPanel>
                                     <Button x:Name="StopAllTunnelsButton" 
                                             Content="Stop All" 
                                             Click="StopAllTunnels_Click"
diff --git a/platforms/windows/PortKiller/MainWindow.xaml.cs b/platforms/windows/PortKiller/MainWindow.xaml.cs
@@ -23,6 +23,7 @@ public MainWindow()
 
         _viewModel = App.Services.GetRequiredService<MainViewModel>();
         _tunnelViewModel = App.Services.GetRequiredService<TunnelViewModel>();
+        TunnelProtocolCombo.DataContext = _tunnelViewModel;
         InitializeAsync();
         
         // Setup keyboard shortcuts
diff --git a/platforms/windows/PortKiller/Models/CloudflaredProtocol.cs b/platforms/windows/PortKiller/Models/CloudflaredProtocol.cs
@@ -0,0 +1,27 @@
+namespace PortKiller.Models;
+
+public enum CloudflaredProtocol
+{
+    Http2,
+    Quic
+}
+
+public static class CloudflaredProtocolExtensions
+{
+    public static string ToArgument(this CloudflaredProtocol protocol)
+    {
+        return protocol == CloudflaredProtocol.Quic ? "quic" : "http2";
+    }
+
+    public static string ToDisplayName(this CloudflaredProtocol protocol)
+    {
+        return protocol == CloudflaredProtocol.Quic ? "QUIC" : "HTTP/2";
+    }
+
+    public static CloudflaredProtocol FromString(string? value)
+    {
+        return string.Equals(value, "quic", System.StringComparison.OrdinalIgnoreCase)
+            ? CloudflaredProtocol.Quic
+            : CloudflaredProtocol.Http2;
+    }
+}
diff --git a/platforms/windows/PortKiller/Services/SettingsService.cs b/platforms/windows/PortKiller/Services/SettingsService.cs
@@ -34,6 +34,7 @@ private class SettingsData
         public int RefreshInterval { get; set; } = 5;
         public bool AutoStart { get; set; }
         public bool ShowNotifications { get; set; } = true;
+        public string CloudflaredProtocol { get; set; } = "http2";
     }
 
     private SettingsData LoadSettingsData()
@@ -136,6 +137,20 @@ public void SaveShowNotifications(bool show)
         SaveSettingsData(data);
     }
 
+    // Cloudflared Protocol
+    public CloudflaredProtocol GetCloudflaredProtocol()
+    {
+        var data = LoadSettingsData();
+        return CloudflaredProtocolExtensions.FromString(data.CloudflaredProtocol);
+    }
+
+    public void SaveCloudflaredProtocol(CloudflaredProtocol protocol)
+    {
+        var data = LoadSettingsData();
+        data.CloudflaredProtocol = protocol.ToArgument();
+        SaveSettingsData(data);
+    }
+
     // Clear all settings
     public void ClearAllSettings()
     {
diff --git a/platforms/windows/PortKiller/Services/TunnelService.cs b/platforms/windows/PortKiller/Services/TunnelService.cs
@@ -80,18 +80,19 @@ public string? CloudflaredPath
     /// <summary>
     /// Starts a tunnel for the specified port
     /// </summary>
-    public async Task<Process> StartTunnelAsync(CloudflareTunnel tunnel)
+    public async Task<Process> StartTunnelAsync(CloudflareTunnel tunnel, CloudflaredProtocol protocol)
     {
         var cloudflaredPath = CloudflaredPath;
         if (cloudflaredPath == null)
             throw new InvalidOperationException("cloudflared is not installed");
 
+        var protocolArg = protocol.ToArgument();
         var process = new Process
         {
             StartInfo = new ProcessStartInfo
             {
                 FileName = cloudflaredPath,
-                Arguments = $"tunnel --url localhost:{tunnel.Port}",
+                Arguments = $"tunnel --url localhost:{tunnel.Port} --protocol {protocolArg}",
                 RedirectStandardOutput = true,
                 RedirectStandardError = true,
                 UseShellExecute = false,
diff --git a/platforms/windows/PortKiller/ViewModels/TunnelViewModel.cs b/platforms/windows/PortKiller/ViewModels/TunnelViewModel.cs
@@ -16,10 +16,13 @@ public class TunnelViewModel : INotifyPropertyChanged
 {
     private readonly TunnelService _tunnelService;
     private readonly NotificationService _notificationService;
+    private readonly SettingsService _settings;
     private readonly DispatcherTimer _uptimeTimer;
     private bool _isCloudflaredInstalled;
+    private CloudflaredProtocol _cloudflaredProtocol;
 
     public ObservableCollection<CloudflareTunnel> Tunnels { get; }
+    public IReadOnlyList<CloudflaredProtocolOption> ProtocolOptions { get; }
 
     public bool IsCloudflaredInstalled
     {
@@ -29,14 +32,33 @@ public bool IsCloudflaredInstalled
 
     public int ActiveTunnelCount => Tunnels.Count(t => t.Status == TunnelStatus.Active);
 
-    public TunnelViewModel(TunnelService tunnelService, NotificationService notificationService)
+    public CloudflaredProtocol CloudflaredProtocol
+    {
+        get => _cloudflaredProtocol;
+        set
+        {
+            if (SetField(ref _cloudflaredProtocol, value))
+            {
+                _settings.SaveCloudflaredProtocol(value);
+            }
+        }
+    }
+
+    public TunnelViewModel(TunnelService tunnelService, NotificationService notificationService, SettingsService settings)
     {
         _tunnelService = tunnelService;
         _notificationService = notificationService;
+        _settings = settings;
         Tunnels = new ObservableCollection<CloudflareTunnel>();
+        ProtocolOptions = new List<CloudflaredProtocolOption>
+        {
+            new(CloudflaredProtocol.Http2, "HTTP/2"),
+            new(CloudflaredProtocol.Quic, "QUIC")
+        };
 
         // Check if cloudflared is installed
         IsCloudflaredInstalled = _tunnelService.IsCloudflaredInstalled;
+        CloudflaredProtocol = _settings.GetCloudflaredProtocol();
 
         // Set up timer to update uptime every second
         _uptimeTimer = new DispatcherTimer
@@ -123,7 +145,7 @@ public async Task StartTunnelAsync(int port)
 
         try
         {
-            await _tunnelService.StartTunnelAsync(tunnel);
+            await _tunnelService.StartTunnelAsync(tunnel, CloudflaredProtocol);
 
             // Wait a bit to see if URL is detected
             await Task.Delay(3000);
@@ -279,3 +301,15 @@ protected bool SetField<T>(ref T field, T value, [CallerMemberName] string? prop
         return true;
     }
 }
+
+public sealed class CloudflaredProtocolOption
+{
+    public CloudflaredProtocolOption(CloudflaredProtocol value, string label)
+    {
+        Value = value;
+        Label = label;
+    }
+
+    public CloudflaredProtocol Value { get; }
+    public string Label { get; }
+}

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,8 @@ private void ConfigureServices(IServiceCollection services)`
`46`	`46`	`));`
`47`	`47`	`services.AddSingleton<TunnelViewModel>(sp => new TunnelViewModel(`
`48`	`48`	`sp.GetRequiredService<TunnelService>(),`
`49`		`- NotificationService.Instance`
	`49`	`+ NotificationService.Instance,`
	`50`	`+ sp.GetRequiredService<SettingsService>()`
`50`	`51`	`));`
`51`	`52`	`}`
`52`	`53`	`}`