mirror of
https://github.com/samsonjs/vibetunnel.git
synced 2026-04-27 15:17:38 +00:00
* feat: add secure Tailscale Serve integration support - Add --enable-tailscale-serve flag to bind server to localhost - Implement Tailscale identity header authentication - Add security validations for localhost origin and proxy headers - Create TailscaleServeService to manage tailscale serve process - Fix dev script to properly pass arguments through pnpm - Add comprehensive auth middleware tests for all auth methods - Ensure secure integration with Tailscale's reverse proxy * refactor: use isFromLocalhostAddress helper for Tailscale auth - Extract localhost checking logic into dedicated helper function - Makes the code clearer and addresses review feedback - Maintains the same security checks for Tailscale authentication * feat(web): Add Tailscale Serve integration support - Add TailscaleServeService to manage background tailscale serve process - Add --enable-tailscale-serve and --use-tailscale-serve flags - Force localhost binding when Tailscale Serve is enabled - Enhance auth middleware to support Tailscale identity headers - Add isFromLocalhostAddress helper for secure localhost validation - Fix dev script to properly pass CLI arguments through pnpm - Add comprehensive auth middleware tests (17 tests) - Use 'tailscale serve reset' for thorough cleanup The server now automatically manages the Tailscale Serve proxy process, providing secure HTTPS access through Tailscale networks without manual configuration. * feat(mac): Add Tailscale Serve toggle in Remote Access settings - Add 'Enable Tailscale Serve Integration' toggle in RemoteAccessSettingsView - Pass --use-tailscale-serve flag from both BunServer and DevServerManager - Show HTTPS URL when Tailscale Serve is enabled, HTTP when disabled - Fix URL copy bug in ServerInfoSection for Tailscale addresses - Update authentication documentation with new integration mode - Server automatically restarts when toggle is changed The macOS app now provides a user-friendly toggle to enable secure Tailscale Serve integration without manual configuration. * fix(security): Remove dangerous --allow-tailscale-auth flag - Remove --allow-tailscale-auth flag that allowed header spoofing - Remove --use-tailscale-serve alias for consistency - Keep only --enable-tailscale-serve which safely manages everything - Update all references in server.ts to use enableTailscaleServe - Update macOS app to use --enable-tailscale-serve flag - Update documentation to remove manual setup mode The --allow-tailscale-auth flag was dangerous because it allowed users to enable Tailscale header authentication while binding to network interfaces, which would allow anyone on the network to spoof the Tailscale headers. Now there's only one safe way to use Tailscale integration: --enable-tailscale-serve, which forces localhost binding and manages the proxy automatically. * fix: address PR feedback from Peter and Cursor - Fix Promise hang bug in TailscaleServeService when process exits with code 0 - Move tailscaleServeEnabled string to AppConstants.UserDefaultsKeys - Create TailscaleURLHelper for URL construction logic - Add Linux support to TailscaleServeService with common Tailscale paths - Update all references to use centralized constants - Fix code formatting issues * feat: Add Tailscale Serve status monitoring and error visibility * fix: Correct pass-through argument logic for boolean flags and duplicates - Track processed argument indices instead of checking if arg already exists in serverArgs - Add set of known boolean flags that don't take values - Allow duplicate arguments to be passed through - Only treat non-dash arguments as values for non-boolean flags This fixes issues where: 1. Boolean flags like --verbose were incorrectly consuming the next argument 2. Duplicate flags couldn't be passed through to the server * fix: Resolve promise hanging and orphaned processes in Tailscale serve - Add settled flag to prevent multiple promise resolutions - Handle exit code 0 as a failure case during startup - Properly terminate child process in cleanup method - Add timeout for graceful shutdown before force killing This fixes: 1. Promise hanging when tailscale serve exits with code 0 2. Orphaned processes when startup fails or cleanup is called --------- Co-authored-by: Peter Steinberger <steipete@gmail.com>
405 lines
13 KiB
Swift
405 lines
13 KiB
Swift
import AppKit
|
|
import Observation
|
|
import SwiftUI
|
|
|
|
#if !SWIFT_PACKAGE
|
|
/// gross hack: https://stackoverflow.com/questions/26004684/nsstatusbarbutton-keep-highlighted?rq=4
|
|
/// Didn't manage to keep the highlighted state reliable active with any other way.
|
|
/// DO NOT CHANGE THIS! Yes, accessing AppDelegate is ugly, but it's the ONLY reliable way
|
|
/// to maintain button highlight state. All other approaches have been tried and failed.
|
|
extension NSStatusBarButton {
|
|
override public func mouseDown(with event: NSEvent) {
|
|
super.mouseDown(with: event)
|
|
self.highlight(true)
|
|
DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(100)) {
|
|
self
|
|
.highlight(
|
|
AppDelegate.shared?.statusBarController?.menuManager.customWindow?
|
|
.isWindowVisible ?? false
|
|
)
|
|
}
|
|
}
|
|
}
|
|
#endif
|
|
|
|
/// Manages status bar menu behavior, providing left-click custom view and right-click context menu functionality.
|
|
///
|
|
/// Coordinates between the status bar button, custom popover window, and context menu,
|
|
/// handling mouse events and window state transitions. Provides special handling for
|
|
/// maintaining button highlight state during custom window display.
|
|
@MainActor
|
|
@Observable
|
|
final class StatusBarMenuManager: NSObject {
|
|
// MARK: - Menu State Management
|
|
|
|
private enum MenuState {
|
|
case none
|
|
case customWindow
|
|
case contextMenu
|
|
}
|
|
|
|
// MARK: - Private Properties
|
|
|
|
private var sessionMonitor: SessionMonitor?
|
|
private var serverManager: ServerManager?
|
|
private var ngrokService: NgrokService?
|
|
private var tailscaleService: TailscaleService?
|
|
private var terminalLauncher: TerminalLauncher?
|
|
private var gitRepositoryMonitor: GitRepositoryMonitor?
|
|
private var repositoryDiscovery: RepositoryDiscoveryService?
|
|
private var configManager: ConfigManager?
|
|
private var worktreeService: WorktreeService?
|
|
|
|
// Custom window management
|
|
fileprivate var customWindow: CustomMenuWindow?
|
|
private weak var statusBarButton: NSStatusBarButton?
|
|
private weak var currentStatusItem: NSStatusItem?
|
|
|
|
/// State management
|
|
private var menuState: MenuState = .none
|
|
|
|
/// Track new session state
|
|
private var isNewSessionActive = false {
|
|
didSet {
|
|
// Update window when state changes
|
|
customWindow?.isNewSessionActive = isNewSessionActive
|
|
}
|
|
}
|
|
|
|
// MARK: - Initialization
|
|
|
|
override init() {
|
|
super.init()
|
|
}
|
|
|
|
// MARK: - Setup
|
|
|
|
func setup(with configuration: StatusBarMenuConfiguration) {
|
|
self.sessionMonitor = configuration.sessionMonitor
|
|
self.serverManager = configuration.serverManager
|
|
self.ngrokService = configuration.ngrokService
|
|
self.tailscaleService = configuration.tailscaleService
|
|
self.terminalLauncher = configuration.terminalLauncher
|
|
self.gitRepositoryMonitor = configuration.gitRepositoryMonitor
|
|
self.repositoryDiscovery = configuration.repositoryDiscovery
|
|
self.configManager = configuration.configManager
|
|
self.worktreeService = configuration.worktreeService
|
|
}
|
|
|
|
// MARK: - State Management
|
|
|
|
private func updateMenuState(_ newState: MenuState, button: NSStatusBarButton? = nil) {
|
|
// Update state
|
|
menuState = newState
|
|
|
|
// Update button reference if provided
|
|
if let button {
|
|
statusBarButton = button
|
|
}
|
|
|
|
// Reset button state when no menu is active
|
|
if newState == .none {
|
|
statusBarButton?.state = .off
|
|
}
|
|
}
|
|
|
|
// MARK: - Left-Click Custom Window Management
|
|
|
|
func toggleCustomWindow(relativeTo button: NSStatusBarButton) {
|
|
if let window = customWindow, window.isVisible {
|
|
hideCustomWindow()
|
|
} else {
|
|
showCustomWindow(relativeTo: button)
|
|
}
|
|
}
|
|
|
|
func showCustomWindow(relativeTo button: NSStatusBarButton) {
|
|
guard let sessionMonitor,
|
|
let serverManager,
|
|
let ngrokService,
|
|
let tailscaleService,
|
|
let terminalLauncher,
|
|
let gitRepositoryMonitor,
|
|
let repositoryDiscovery,
|
|
let configManager,
|
|
let worktreeService else { return }
|
|
|
|
// Update menu state to custom window FIRST before any async operations
|
|
updateMenuState(.customWindow, button: button)
|
|
|
|
// Create SessionService instance
|
|
let sessionService = SessionService(serverManager: serverManager, sessionMonitor: sessionMonitor)
|
|
|
|
// Create the main view with all dependencies and binding
|
|
let sessionBinding = Binding(
|
|
get: { [weak self] in self?.isNewSessionActive ?? false },
|
|
set: { [weak self] in self?.isNewSessionActive = $0 }
|
|
)
|
|
let mainView = VibeTunnelMenuView(isNewSessionActive: sessionBinding)
|
|
.environment(sessionMonitor)
|
|
.environment(serverManager)
|
|
.environment(ngrokService)
|
|
.environment(tailscaleService)
|
|
.environment(terminalLauncher)
|
|
.environment(sessionService)
|
|
.environment(gitRepositoryMonitor)
|
|
.environment(repositoryDiscovery)
|
|
.environment(configManager)
|
|
.environment(worktreeService)
|
|
|
|
// Wrap in custom container for proper styling
|
|
let containerView = CustomMenuContainer {
|
|
mainView
|
|
}
|
|
|
|
// Hide and cleanup old window before creating new one
|
|
customWindow?.hide()
|
|
customWindow = nil
|
|
customWindow = CustomMenuWindow(contentView: containerView)
|
|
|
|
// Set up callbacks for window show/hide
|
|
customWindow?.onShow = { [weak self] in
|
|
// Start monitoring git repositories for updates every 5 seconds
|
|
self?.gitRepositoryMonitor?.startMonitoring()
|
|
}
|
|
|
|
customWindow?.onHide = { [weak self] in
|
|
self?.statusBarButton?.highlight(false)
|
|
|
|
// Stop monitoring git repositories when menu closes
|
|
self?.gitRepositoryMonitor?.stopMonitoring()
|
|
|
|
// Ensure state is reset on main thread
|
|
Task { @MainActor in
|
|
self?.updateMenuState(.none)
|
|
}
|
|
}
|
|
|
|
// Sync the new session state with the window
|
|
if let window = customWindow {
|
|
window.isNewSessionActive = isNewSessionActive
|
|
}
|
|
|
|
// Show the custom window
|
|
customWindow?.show(relativeTo: button)
|
|
statusBarButton?.highlight(true)
|
|
}
|
|
|
|
func hideCustomWindow() {
|
|
if customWindow?.isWindowVisible ?? false {
|
|
customWindow?.hide()
|
|
}
|
|
// Reset new session state when hiding
|
|
isNewSessionActive = false
|
|
// Button state will be reset by updateMenuState(.none) in the onHide callback
|
|
}
|
|
|
|
var isCustomWindowVisible: Bool {
|
|
customWindow?.isWindowVisible ?? false
|
|
}
|
|
|
|
// MARK: - Menu State Management
|
|
|
|
func hideAllMenus() {
|
|
hideCustomWindow()
|
|
// If there's a context menu showing, dismiss it
|
|
if menuState == .contextMenu, let statusItem = currentStatusItem {
|
|
statusItem.menu = nil
|
|
}
|
|
// Reset state to none
|
|
updateMenuState(.none)
|
|
}
|
|
|
|
var isAnyMenuVisible: Bool {
|
|
// Check both the menu state and the actual window visibility
|
|
menuState != .none || (customWindow?.isWindowVisible ?? false)
|
|
}
|
|
|
|
// MARK: - Right-Click Context Menu
|
|
|
|
func showContextMenu(for button: NSStatusBarButton, statusItem: NSStatusItem) {
|
|
// Hide custom window first if it's visible
|
|
hideCustomWindow()
|
|
|
|
// Store status item reference
|
|
currentStatusItem = statusItem
|
|
|
|
// Set the button's state to on for context menu
|
|
button.state = .on
|
|
|
|
// Update menu state to context menu
|
|
updateMenuState(.contextMenu, button: button)
|
|
|
|
let menu = NSMenu()
|
|
menu.delegate = self
|
|
|
|
// Server status
|
|
if let serverManager {
|
|
let statusText = serverManager.isRunning ? "Server running" : "Server stopped"
|
|
let statusItem = NSMenuItem(title: statusText, action: nil, keyEquivalent: "")
|
|
statusItem.isEnabled = false
|
|
menu.addItem(statusItem)
|
|
|
|
menu.addItem(NSMenuItem.separator())
|
|
|
|
// Restart server
|
|
let restartItem = NSMenuItem(title: "Restart", action: #selector(restartServer), keyEquivalent: "")
|
|
restartItem.target = self
|
|
menu.addItem(restartItem)
|
|
|
|
menu.addItem(NSMenuItem.separator())
|
|
}
|
|
|
|
// Open Dashboard
|
|
if let serverManager, serverManager.isRunning {
|
|
let dashboardItem = NSMenuItem(title: "Open Dashboard", action: #selector(openDashboard), keyEquivalent: "")
|
|
dashboardItem.target = self
|
|
menu.addItem(dashboardItem)
|
|
|
|
menu.addItem(NSMenuItem.separator())
|
|
}
|
|
|
|
// Help submenu
|
|
let helpMenu = NSMenu()
|
|
|
|
let tutorialItem = NSMenuItem(title: "Show Tutorial", action: #selector(showTutorial), keyEquivalent: "")
|
|
tutorialItem.target = self
|
|
helpMenu.addItem(tutorialItem)
|
|
|
|
helpMenu.addItem(NSMenuItem.separator())
|
|
|
|
let websiteItem = NSMenuItem(title: "Website", action: #selector(openWebsite), keyEquivalent: "")
|
|
websiteItem.target = self
|
|
helpMenu.addItem(websiteItem)
|
|
|
|
let issueItem = NSMenuItem(title: "Report Issue", action: #selector(reportIssue), keyEquivalent: "")
|
|
issueItem.target = self
|
|
helpMenu.addItem(issueItem)
|
|
|
|
helpMenu.addItem(NSMenuItem.separator())
|
|
|
|
let updateItem = NSMenuItem(title: "Check for Updates…", action: #selector(checkForUpdates), keyEquivalent: "")
|
|
updateItem.target = self
|
|
helpMenu.addItem(updateItem)
|
|
|
|
let versionItem = NSMenuItem(title: "Version \(appVersion)", action: nil, keyEquivalent: "")
|
|
versionItem.isEnabled = false
|
|
helpMenu.addItem(versionItem)
|
|
|
|
helpMenu.addItem(NSMenuItem.separator())
|
|
|
|
let aboutItem = NSMenuItem(title: "About VibeTunnel", action: #selector(showAbout), keyEquivalent: "")
|
|
aboutItem.target = self
|
|
helpMenu.addItem(aboutItem)
|
|
|
|
let helpMenuItem = NSMenuItem(title: "Help", action: nil, keyEquivalent: "")
|
|
helpMenuItem.submenu = helpMenu
|
|
menu.addItem(helpMenuItem)
|
|
|
|
// Settings
|
|
let settingsItem = NSMenuItem(title: "Settings...", action: #selector(openSettings), keyEquivalent: ",")
|
|
settingsItem.target = self
|
|
menu.addItem(settingsItem)
|
|
|
|
menu.addItem(NSMenuItem.separator())
|
|
|
|
// Quit
|
|
let quitItem = NSMenuItem(title: "Quit VibeTunnel", action: #selector(quitApp), keyEquivalent: "q")
|
|
quitItem.target = self
|
|
menu.addItem(quitItem)
|
|
|
|
// Show the context menu
|
|
// Use popUpMenu for proper context menu display that doesn't interfere with button highlighting
|
|
menu.popUp(positioning: nil, at: NSPoint(x: 0, y: button.bounds.height + 5), in: button)
|
|
}
|
|
|
|
// MARK: - Context Menu Actions
|
|
|
|
@objc
|
|
private func openDashboard() {
|
|
guard let serverManager else { return }
|
|
if let url = DashboardURLBuilder.dashboardURL(port: serverManager.port) {
|
|
NSWorkspace.shared.open(url)
|
|
}
|
|
}
|
|
|
|
@objc
|
|
private func restartServer() {
|
|
guard let serverManager else { return }
|
|
Task {
|
|
await serverManager.restart()
|
|
}
|
|
}
|
|
|
|
@objc
|
|
private func showTutorial() {
|
|
#if !SWIFT_PACKAGE
|
|
AppDelegate.showWelcomeScreen()
|
|
#endif
|
|
}
|
|
|
|
@objc
|
|
private func openWebsite() {
|
|
if let url = URL(string: "http://vibetunnel.sh") {
|
|
NSWorkspace.shared.open(url)
|
|
}
|
|
}
|
|
|
|
@objc
|
|
private func reportIssue() {
|
|
if let url = URL(string: "https://github.com/amantus-ai/vibetunnel/issues") {
|
|
NSWorkspace.shared.open(url)
|
|
}
|
|
}
|
|
|
|
@objc
|
|
private func checkForUpdates() {
|
|
SparkleUpdaterManager.shared.checkForUpdates()
|
|
}
|
|
|
|
@objc
|
|
private func showAbout() {
|
|
SettingsOpener.openSettings()
|
|
Task {
|
|
try? await Task.sleep(for: .milliseconds(100))
|
|
NotificationCenter.default.post(
|
|
name: .openSettingsTab,
|
|
object: SettingsTab.about
|
|
)
|
|
}
|
|
}
|
|
|
|
@objc
|
|
private func openSettings() {
|
|
SettingsOpener.openSettings()
|
|
}
|
|
|
|
@objc
|
|
private func quitApp() {
|
|
NSApplication.shared.terminate(nil)
|
|
}
|
|
|
|
private var appVersion: String {
|
|
Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String ?? "0.0.0"
|
|
}
|
|
}
|
|
|
|
// MARK: - NSMenuDelegate
|
|
|
|
extension StatusBarMenuManager: NSMenuDelegate {
|
|
func menuDidClose(_ menu: NSMenu) {
|
|
// Reset button state
|
|
statusBarButton?.state = .off
|
|
|
|
// Reset menu state when context menu closes
|
|
updateMenuState(.none)
|
|
|
|
// Clean up the menu from status item
|
|
if let statusItem = currentStatusItem {
|
|
statusItem.menu = nil
|
|
}
|
|
|
|
// Clear the stored reference
|
|
currentStatusItem = nil
|
|
}
|
|
}
|