sjs/vibetunnel
1
0
Fork 0
mirror of https://github.com/samsonjs/vibetunnel.git synced 2026-04-27 15:17:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ensure tailscale can be disabled when not running

Browse source
This commit is contained in:
Peter Steinberger 2025-08-01 00:45:22 +02:00
parent 8814f2623f
commit 459cf52ef6
2 changed files with 160 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
mac/VibeTunnel/Presentation/Views/Settings/RemoteAccessSettingsView.swift
View file

@ -311,7 +311,59 @@ private struct TailscaleIntegrationSection: View {
.buttonStyle(.link)
.controlSize(.small)
}
} else if tailscaleService.isRunning {
} else if !tailscaleService.isRunning {
// Show Tailscale preferences even when not running
VStack(alignment: .leading, spacing: 12) {
// Tailscale Serve toggle - always available when installed
HStack {
Toggle("Enable Tailscale Serve Integration", isOn: $tailscaleServeEnabled)
.onChange(of: tailscaleServeEnabled) { _, newValue in
logger.info("Tailscale Serve integration \(newValue ? "enabled" : "disabled")")
// Restart server to apply the new setting
Task {
await serverManager.restart()
}
}
Spacer()
// Show status when enabled but not running
if tailscaleServeEnabled {
HStack(spacing: 4) {
Image(systemName: "exclamationmark.triangle.fill")
.foregroundColor(.orange)
Text("Tailscale not running")
.font(.caption)
.foregroundColor(.orange)
}
.frame(height: 16)
}
}
// Show action button to start Tailscale
if tailscaleService.isInstalled && !tailscaleService.isRunning {
Button(action: {
tailscaleService.openTailscaleApp()
}, label: {
HStack(spacing: 4) {
Image(systemName: "play.circle")
Text("Start Tailscale")
}
})
.buttonStyle(.borderedProminent)
.controlSize(.small)
}
// Show help text about what will happen when enabled
if tailscaleServeEnabled {
Text("Tailscale Serve will activate automatically when Tailscale is running.")
.font(.caption)
.foregroundColor(.secondary)
}
}
} else {
// Tailscale is running - show full interface
VStack(alignment: .leading, spacing: 12) {
// Tailscale Serve toggle
HStack {
Toggle("Enable Tailscale Serve Integration", isOn: $tailscaleServeEnabled)
@ -410,6 +462,7 @@ private struct TailscaleIntegrationSection: View {
}
}
}
}
} header: {
Text("Tailscale Integration")
.font(.headline)

33
mac/VibeTunnel/Presentation/Views/Settings/ServerConfigurationComponents.swift
View file

@ -88,6 +88,11 @@ struct AccessModeView: View {
@AppStorage(AppConstants.UserDefaultsKeys.tailscaleServeEnabled)
private var tailscaleServeEnabled = false
@Environment(TailscaleService.self)
private var tailscaleService
@Environment(TailscaleServeStatusService.self)
private var tailscaleServeStatus
var body: some View {
VStack(alignment: .leading, spacing: 8) {
HStack {
@ -95,14 +100,14 @@ struct AccessModeView: View {
.font(.callout)
Spacer()
if tailscaleServeEnabled {
// When Tailscale Serve is enabled, force localhost mode
if shouldLockToLocalhost {
// Only lock when Tailscale Serve is actually working
Text("Localhost")
.foregroundColor(.secondary)
Image(systemName: "lock.shield.fill")
.foregroundColor(.blue)
.help("Tailscale Serve requires localhost binding for security")
.help("Tailscale Serve active - locked to localhost for security")
} else {
Picker("", selection: $accessModeString) {
ForEach(DashboardAccessMode.allCases, id: \.rawValue) { mode in
@ -117,7 +122,20 @@ struct AccessModeView: View {
}
}
if tailscaleServeEnabled && accessMode == .network {
// Show warning when Tailscale Serve is enabled but not working
if tailscaleServeEnabled && !shouldLockToLocalhost {
HStack(spacing: 4) {
Image(systemName: "exclamationmark.triangle.fill")
.foregroundColor(.orange)
.font(.caption)
Text("Tailscale Serve enabled but not active - using selected access mode")
.font(.caption)
.foregroundColor(.secondary)
}
}
// Show info when Tailscale Serve is active and locked
if shouldLockToLocalhost && accessMode == .network {
HStack(spacing: 4) {
Image(systemName: "info.circle.fill")
.foregroundColor(.blue)
@ -129,6 +147,13 @@ struct AccessModeView: View {
}
}
}
/// Only lock to localhost when Tailscale Serve is enabled AND actually working
private var shouldLockToLocalhost: Bool {
tailscaleServeEnabled &&
tailscaleService.isRunning &&
tailscaleServeStatus.isRunning
}
}
// MARK: - Port Configuration View