consolidate socketpair

Author: swhitty

FlyingFox/Tests/AsyncSocketTests.swift

@@ -48,17 +48,6 @@ extension AsyncSocket {
         try await makePair(pool: .client)
     }
 
-    static func makePair(pool: some AsyncSocketPool) throws -> (AsyncSocket, AsyncSocket) {
-        let (file1, file2) = Socket.socketpair(AF_UNIX, Socket.stream, 0)
-        guard file1.rawValue > -1, file2.rawValue > -1 else {
-            throw SocketError.makeFailed("SocketPair")
-        }
-
-        let s1 = try AsyncSocket(socket: Socket(file: file1), pool: pool)
-        let s2 = try AsyncSocket(socket: Socket(file: file2), pool: pool)
-        return (s1, s2)
-    }
-
     func writeString(_ string: String) async throws {
         try await write(string.data(using: .utf8)!)
     }

FlyingFox/XCTests/AsyncSocketTests.swift

@@ -48,17 +48,6 @@ extension AsyncSocket {
         try await makePair(pool: .client)
     }
 
-    static func makePair(pool: some AsyncSocketPool) throws -> (AsyncSocket, AsyncSocket) {
-        let (file1, file2) = Socket.socketpair(AF_UNIX, Socket.stream, 0)
-        guard file1.rawValue > -1, file2.rawValue > -1 else {
-            throw SocketError.makeFailed("SocketPair")
-        }
-
-        let s1 = try AsyncSocket(socket: Socket(file: file1), pool: pool)
-        let s2 = try AsyncSocket(socket: Socket(file: file2), pool: pool)
-        return (s1, s2)
-    }
-
     func writeString(_ string: String) async throws {
         try await write(string.data(using: .utf8)!)
     }

FlyingSocks/Sources/AsyncSocket.swift

@@ -176,6 +176,16 @@ public struct AsyncSocket: Sendable {
     }
 }
 
+package extension AsyncSocket {
+
+    static func makePair(pool: some AsyncSocketPool) throws -> (AsyncSocket, AsyncSocket) {
+        let (s1, s2) = try Socket.makePair()
+        let a1 = try AsyncSocket(socket: s1, pool: pool)
+        let a2 = try AsyncSocket(socket: s2, pool: pool)
+        return (a1, a2)
+    }
+}
+
 private extension AsyncSocketPool {
 
     func loopUntilReady<T>(for events: Socket.Events, on socket: Socket, body: () throws -> T) async throws -> T {

FlyingSocks/Sources/Socket+Darwin.swift

@@ -94,6 +94,12 @@ extension Socket {
         Darwin.socket(domain, type, `protocol`)
     }
 
+    static func socketpair(_ domain: Int32, _ type: Int32, _ protocol: Int32) -> (FileDescriptorType, FileDescriptorType) {
+        var sockets: [Int32] = [-1, -1]
+        _ = Darwin.socketpair(domain, type, `protocol`, &sockets)
+        return (sockets[0], sockets[1])
+    }
+
     static func fcntl(_ fd: FileDescriptorType, _ cmd: Int32) -> Int32 {
         Darwin.fcntl(fd, cmd)
     }

FlyingSocks/Sources/Socket+Glibc.swift

@@ -86,10 +86,16 @@ extension Socket {
         return addr
     }
 
-    static func socket(_ domain: Int32, _ type: Int32, _ protocol: Int32) -> Int32 {
+    static func socket(_ domain: Int32, _ type: Int32, _ protocol: Int32) -> FileDescriptorType {
         Glibc.socket(domain, type, `protocol`)
     }
 
+    static func socketpair(_ domain: Int32, _ type: Int32, _ protocol: Int32) -> (FileDescriptorType, FileDescriptorType) {
+        var sockets: [Int32] = [-1, -1]
+        _ = Glibc.socketpair(domain, type, `protocol`, &sockets)
+        return (sockets[0], sockets[1])
+    }
+
     static func fcntl(_ fd: Int32, _ cmd: Int32) -> Int32 {
         Glibc.fcntl(fd, cmd)
     }

FlyingSocks/Sources/Socket+Pair.swift

@@ -112,6 +112,10 @@ extension Socket {
         WinSDK.socket(domain, type, `protocol`)
     }
 
+    static func socketpair(_ domain: Int32, _ type: Int32, _ protocol: Int32) -> (FileDescriptorType, FileDescriptorType) {
+        (-1, -1) // no supported
+    }
+
     static func setsockopt(_ fd: FileDescriptorType, _ level: Int32, _ name: Int32,
                            _ value: UnsafeRawPointer!, _ len: socklen_t) -> Int32 {
         WinSDK.setsockopt(fd, level, name, value.assumingMemoryBound(to: CChar.self), len)

FlyingSocks/Sources/Socket+WinSock2.swift

@@ -344,3 +344,25 @@ public extension SocketOption where Self == Int32SocketOption {
         Int32SocketOption(name: SO_RCVBUF)
     }
 }
+
+package extension Socket {
+
+    static func makePair(flags: Flags? = nil) throws -> (Socket, Socket) {
+        let (file1, file2) = Socket.socketpair(AF_UNIX, Socket.stream, 0)
+        guard file1 > -1, file2 > -1 else {
+            throw SocketError.makeFailed("SocketPair")
+        }
+        let s1 = Socket(file: .init(rawValue: file1))
+        let s2 = Socket(file: .init(rawValue: file2))
+
+        if let flags {
+            try s1.setFlags(flags)
+            try s2.setFlags(flags)
+        }
+        return (s1, s2)
+    }
+
+    static func makeNonBlockingPair() throws -> (Socket, Socket) {
+        try Socket.makePair(flags: .nonBlocking)
+    }
+}

FlyingSocks/Sources/Socket.swift

@@ -214,17 +214,6 @@ extension AsyncSocket {
         try await makePair(pool: .client)
     }
 
-    static func makePair(pool: some AsyncSocketPool) throws -> (AsyncSocket, AsyncSocket) {
-        let (file1, file2) = Socket.socketpair(AF_UNIX, Socket.stream, 0)
-        guard file1.rawValue > -1, file2.rawValue > -1 else {
-            throw SocketError.makeFailed("SocketPair")
-        }
-
-        let s1 = try AsyncSocket(socket: Socket(file: file1), pool: pool)
-        let s2 = try AsyncSocket(socket: Socket(file: file2), pool: pool)
-        return (s1, s2)
-    }
-
     func writeString(_ string: String) async throws {
         try await write(string.data(using: .utf8)!)
     }

FlyingSocks/Tests/AsyncSocketTests.swift

@@ -183,17 +183,6 @@ extension AsyncSocket {
         try await makePair(pool: .client)
     }
 
-    static func makePair(pool: some AsyncSocketPool) throws -> (AsyncSocket, AsyncSocket) {
-        let (file1, file2) = Socket.socketpair(AF_UNIX, Socket.stream, 0)
-        guard file1.rawValue > -1, file2.rawValue > -1 else {
-            throw SocketError.makeFailed("SocketPair")
-        }
-
-        let s1 = try AsyncSocket(socket: Socket(file: file1), pool: pool)
-        let s2 = try AsyncSocket(socket: Socket(file: file2), pool: pool)
-        return (s1, s2)
-    }
-
     func writeString(_ string: String) async throws {
         try await write(string.data(using: .utf8)!)
     }