Use different socket paths for different users

#370

Author: nikitabobko

Sources/AppBundle/server.swift

@@ -5,7 +5,7 @@ import Common
 func startServer() {
     let socket = Result { try Socket.create(family: .unix, type: .stream, proto: .unix) }
         .getOrThrow("Can't create socket ")
-    let socketFile = "/tmp/\(Bundle.appId).sock"
+    let socketFile = "/tmp/\(Bundle.appId)-\(unixUserName).sock"
     Result { try socket.listen(on: socketFile) }.getOrThrow("Can't listen to socket \(socketFile) ")
     DispatchQueue.global().async {
         while true {
@@ -21,7 +21,7 @@ func sendCommandToReleaseServer(args: [String]) {
     defer {
         socket.close()
     }
-    let socketFile = "/tmp/bobko.aerospace.sock"
+    let socketFile = "/tmp/bobko.aerospace-\(unixUserName).sock"
     if (try? socket.connect(to: socketFile)) == nil { // Can't connect, AeroSpace.app is not running
         return
     }

Sources/Cli/main.swift

@@ -58,9 +58,12 @@ func run(_ args: [String], stdin: String) -> ServerAnswer {
     Result { try socket.read(into: &answer) }.getOrThrow()
     return Result { try JSONDecoder().decode(ServerAnswer.self, from: answer) }.getOrThrow()
 }
-let socketFile = "/tmp/\(appId).sock"
+let socketFile = "/tmp/\(appId)-\(unixUserName).sock"
+let socketFileCompat = "/tmp/\(appId).sock" // Compatibility. Drop after a few versions
 
-if let e: Error = Result(catching: { try socket.connect(to: socketFile) }).errorOrNil {
+if let e: Error = Result(catching: { try socket.connect(to: socketFile) })
+        .flatMapError({ _ in Result(catching: { try socket.connect(to: socketFileCompat) }) })
+        .errorOrNil {
     if isVersion {
         printVersionAndExit(serverVersion: nil)
     } else {

Sources/Common/util/commonUtil.swift

@@ -1,6 +1,7 @@
 import Foundation
 import AppKit
 
+public let unixUserName = NSUserName()
 public let mainModeId = "main"
 private var recursionDetectorDuringFailure: Bool = false