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

mac: support bind for server

Browse source
This commit is contained in:
Peter Steinberger 2025-06-23 14:49:27 +02:00
parent 7c41a8cc53
commit b37b9492db
1 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
mac/VibeTunnel/Core/Services/BunServer.swift
View file

@ -99,7 +99,8 @@ final class BunServer {
if fileExists && !isDirectory.boolValue { if fileExists && !isDirectory.boolValue {
let attributes = try FileManager.default.attributesOfItem(atPath: binaryPath) let attributes = try FileManager.default.attributesOfItem(atPath: binaryPath)
if let permissions = attributes[.posixPermissions] as? NSNumber, if let permissions = attributes[.posixPermissions] as? NSNumber,
let fileSize = attributes[.size] as? NSNumber { let fileSize = attributes[.size] as? NSNumber
{
logger logger
.info( .info(
"vibetunnel binary size: \(fileSize.intValue) bytes, permissions: \(String(permissions.intValue, radix: 8))" "vibetunnel binary size: \(fileSize.intValue) bytes, permissions: \(String(permissions.intValue, radix: 8))"
@ -130,7 +131,7 @@ final class BunServer {
} }
// Build the vibetunnel command with all arguments // Build the vibetunnel command with all arguments
var vibetunnelArgs = "--port \(port)" var vibetunnelArgs = "--port \(port) --bind \(bindAddress)"
// Add password flag if password protection is enabled // Add password flag if password protection is enabled
if UserDefaults.standard.bool(forKey: "dashboardPasswordEnabled") && DashboardKeychain.shared.hasPassword() { if UserDefaults.standard.bool(forKey: "dashboardPasswordEnabled") && DashboardKeychain.shared.hasPassword() {
@ -149,19 +150,19 @@ final class BunServer {
// Using a subshell that monitors parent process and kills vibetunnel if parent dies // Using a subshell that monitors parent process and kills vibetunnel if parent dies
let parentPid = ProcessInfo.processInfo.processIdentifier let parentPid = ProcessInfo.processInfo.processIdentifier
let vibetunnelCommand = """ let vibetunnelCommand = """
# Start vibetunnel in background # Start vibetunnel in background
\(binaryPath) \(vibetunnelArgs) & \(binaryPath) \(vibetunnelArgs) &
VIBETUNNEL_PID=$! VIBETUNNEL_PID=$!
# Monitor parent process # Monitor parent process
while kill -0 \(parentPid) 2>/dev/null; do while kill -0 \(parentPid) 2>/dev/null; do
sleep 1 sleep 1
done done
# Parent died, kill vibetunnel # Parent died, kill vibetunnel
kill -TERM $VIBETUNNEL_PID 2>/dev/null kill -TERM $VIBETUNNEL_PID 2>/dev/null
wait $VIBETUNNEL_PID wait $VIBETUNNEL_PID
""" """
process.arguments = ["-l", "-c", vibetunnelCommand] process.arguments = ["-l", "-c", vibetunnelCommand]
logger.info("Executing command: /bin/zsh -l -c \"\(vibetunnelCommand)\"") logger.info("Executing command: /bin/zsh -l -c \"\(vibetunnelCommand)\"")
@ -231,13 +232,12 @@ final class BunServer {
let errorMessage: String let errorMessage: String
if let bunError = error as? BunServerError { if let bunError = error as? BunServerError {
errorMessage = bunError.localizedDescription errorMessage = bunError.localizedDescription
} else if let nsError = error as NSError? { } else if let urlError = error as? URLError {
errorMessage = "\(nsError.localizedDescription) (Code: \(nsError.code), Domain: \(nsError.domain))" errorMessage = "Network error: \(urlError.localizedDescription) (Code: \(urlError.code.rawValue))"
if let underlyingError = nsError.userInfo[NSUnderlyingErrorKey] { } else if let posixError = error as? POSIXError {
logger.error("Underlying error: \(String(describing: underlyingError))") errorMessage = "System error: \(posixError.localizedDescription) (Code: \(posixError.code.rawValue))"
}
} else { } else {
errorMessage = String(describing: error) errorMessage = error.localizedDescription
} }
logger.error("Failed to start Bun server: \(errorMessage)") logger.error("Failed to start Bun server: \(errorMessage)")
@ -480,7 +480,8 @@ final class BunServer {
seconds: TimeInterval, seconds: TimeInterval,
operation: @escaping @Sendable () async -> T operation: @escaping @Sendable () async -> T
) )
async -> T? { async -> T?
{
await withTaskGroup(of: T?.self) { group in await withTaskGroup(of: T?.self) { group in
group.addTask { group.addTask {
await operation() await operation()